Index: itattributes
===================================================================
--- .gitattributes	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-*.xml filter=dater
Index: itignore
===================================================================
--- .gitignore	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,5 +1,0 @@
-conditional.ent
-version.ent
-blfs-bootscripts*
-xxx
-*.swp
Index: INSTALL
===================================================================
--- INSTALL	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ INSTALL	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,16 +1,114 @@
 Ok, so you have downloaded the XML source. Now what? You are probably
-wanting to convert these XML files to easier to read HTML.
+wanting to convert these XML files to easier to read HTML, PS, PDF, TXT
+or other formatted files. All that can be read below.
 
-To install the programs you need to generate html, you need
-to have or install the following packages:
+Let's start by downloading some software.
 
-libxml2
-libxslt
-docbook-xsl-nons-1.79.2
-docbook-4.5-dtd
-tidy
+If all you want to do is being able to convert XML to HTML download the
+following:
 
-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.
+OpenJade                  - http://openjade.sourceforge.net/
+DocBook-XML DTD           - http://www.docbook.org/xml/4.1.2/
+Modified DocBook Entities - 
+	http://ftp.linuxfromscratch.org/misc/docbook-4.1.2-newent.tar.bz2
+DSSSL DocBook Stylesheets - http://www.nwalsh.com/docbook/dsssl/
 
+As the DocBook DTD and Stylesheets are made available as a zip achives you 
+may need to download the unzip package as well if your Linux system doesn't 
+have one:
+
+Unzip                     - ftp://ftp.uu.net/pub/archiving/zip/src/
+
+If you want to be able to convert the book into PS and PDF as well I
+recommend using the Htmldoc program. This takes a html file (created
+with openjade which you already downloaded) and converts it to PS or
+PDF:
+
+HTMLDOC                   - http://www.easysw.com/htmldoc/
+FLTK (X front-end)        - http://sourceforge.net/projects/fltk
+
+If you want to be able to convert the book into TXT as well I recommend
+using lynx to convert HTML to TXT using the -dump option to lynx.
+
+Lynx					  - http://lynx.browser.org
+
+You have everything you need now. Let's install this stuff.
+
+Create the /usr/share/docbook directory, cd into it and unpack the
+docbook-xml dtd archive there. Move all the files and directories from
+the newly created subdirectory to the current directory
+(/usr/share/docbook). We don't really need a
+/usr/share/docbook/docbook-<version> subdir for our purposes.
+
+Remove the ent directory and unpack the docbook-4.1.2-newent.tar.bz2 file.
+This will create a new ent directory with entity files that work better
+with XML.
+
+Create the /usr/share/dsssl directory, cd into it and unpack the dsssl
+stylesheet archive in there. Rename the directory that's created by tar
+into 'docbook'. Now create a symlink to the blfs.dsl file you will find
+in the BLFS-BOOK XML archive in /usr/share/dsssl/docbook/html
+
+The last step is installing OpenJade.
+
+In order for openjade to be able to convert the DocBook based documents
+into other formats, it needs to know where the DocBook DTD related
+files are located. This is sort of the DocBook equivalent for the $PATH 
+variable. You have two ways of doing this:
+
+1) You can set the $SGML_CATALOG_FILES variable and include the full
+paths to the catalog files in it
+   or
+2) You can hard-code the paths into the openjade binary.
+
+If you choose option 1, add the following to your bash configuration
+file, system wide profile or wherever you wish to include it:
+
+export SGML_CATALOG_FILES=/usr/share/docbook/docbook.cat:/usr/share/dsssl/docbook/catalog:/usr/share/dsssl/openjade/catalog
+
+Followed by installing openjade by running:
+	./configure --prefix=/usr
+	make
+	make install
+	cp -av dsssl /usr/share/dsssl/openjade
+
+If you choose option 2, install OpenJade as follows:
+
+	./configure --prefix=/usr \
+	 --enable-default-catalog=/usr/share/docbook/docbook.cat:/usr/share/dsssl/docbook/catalog:/usr/share/dsssl/openjade/catalog
+	make
+	make install
+	cp -av dsssl /usr/share/dsssl/openjade
+
+And you don't have to worry about the $SGML_CATALOG_FILES variable in
+this case.
+
+
+You're all set to convert XML to HTML (among a few other formats
+supported by openjade) now. If you want to convert to PS and PDF as
+well, install the following two packages.
+
+FLTK (you can skip this one if you don't want the X front-end):
+	./configure --prefix=/usr
+	make
+	make install
+
+HTMLDOC:
+Install by running:
+
+	./configure --prefix=/usr
+	make
+	make install
+
+
+
+The last package is Lynx which will be used for the HTML to TXT
+conversion. Install it by running:
+
+	./configure --prefix=/usr
+	make
+	make install
+
+There, all set now. Go back to the README file for some examples how to
+convert this XML to the various other formats.
+
Index: kefile
===================================================================
--- Makefile	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,275 +1,0 @@
-# vim:ts=3
-# Makefile for BLFS Book generation.
-# By Tushar Teredesai <tushar@linuxfromscratch.org>
-# 2004-01-31
-
-# Adjust these to suit your installation
-RENDERTMP   ?= $(HOME)/tmp
-CHUNK_QUIET  = 1
-ROOT_ID      =
-SHELL        = /bin/bash
-
-ALLXML := $(filter-out $(RENDERTMP)/%, \
-	$(wildcard *.xml */*.xml */*/*.xml */*/*/*.xml */*/*/*/*.xml))
-ALLXSL := $(filter-out $(RENDERTMP)/%, \
-	$(wildcard *.xsl */*.xsl */*/*.xsl */*/*/*.xsl */*/*/*/*.xsl))
-
-ifdef V
-  Q =
-else
-  Q = @
-endif
-
-ifndef REV
-  REV = sysv
-endif
-
-ifneq ($(REV), sysv)
-  ifneq ($(REV), systemd)
-    $(error REV must be 'sysv' (default) or 'systemd'.)
-  endif
-endif
-
-ifeq ($(REV), sysv)
-  BASEDIR         ?= $(HOME)/public_html/blfs-book
-  NOCHUNKS_OUTPUT ?= blfs-book.html
-  DUMPDIR         ?= ~/blfs-commands
-  BLFSHTML        ?= blfs-html.xml
-  BLFSHTML2       ?= blfs-html2.xml
-  BLFSFULL        ?= blfs-full.xml
-else
-  BASEDIR         ?= $(HOME)/public_html/blfs-systemd
-  NOCHUNKS_OUTPUT ?= blfs-sysd-book.html
-  DUMPDIR         ?= ~/blfs-sysd-commands
-  BLFSHTML        ?= blfs-systemd-html.xml
-  BLFSHTML2       ?= blfs-systemd-html2.xml
-  BLFSFULL        ?= blfs-systemd-full.xml
-
-endif
-
-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
-	@echo "Generating chunked XHTML files..."
-	$(Q)xsltproc --nonet                                    \
-                --stringparam chunk.quietly $(CHUNK_QUIET) \
-                --stringparam rootid "$(ROOT_ID)"          \
-                --stringparam base.dir $(BASEDIR)/         \
-                stylesheets/blfs-chunked.xsl               \
-                $(RENDERTMP)/$(BLFSHTML)
-
-	@echo "Copying CSS code and images..."
-	$(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
-      mkdir -p $(BASEDIR)/stylesheets;          \
-   fi;
-
-	$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-	$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
-
-	$(Q)if [ ! -e $(BASEDIR)/images ]; then \
-      mkdir -p $(BASEDIR)/images;          \
-   fi;
-	$(Q)cp images/*.png $(BASEDIR)/images
-
-	$(Q)cd $(BASEDIR)/; sed -e "s@../images@images@g"           \
-                           -i *.html
-
-	@echo "Running Tidy and obfuscate.sh on chunked XHTML..."
-	$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do       \
-      tidy -config tidy.conf $$filename;                          \
-      true;                                                       \
-      bash obfuscate.sh $$filename;                               \
-      sed -i -e "1,20s@text/html@application/xhtml+xml@g" $$filename; \
-   done;
-
-nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML) version
-	@echo "Generating non-chunked XHTML file..."
-	$(Q)xsltproc --nonet                                \
-                --stringparam rootid "$(ROOT_ID)"      \
-                --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
-                stylesheets/blfs-nochunks.xsl          \
-                $(RENDERTMP)/$(BLFSHTML)
-
-	@echo "Running Tidy and obfuscate.sh on non-chunked XHTML..."
-	$(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)
-
-tmpdir: $(RENDERTMP)
-$(RENDERTMP):
-	@echo "Creating $(RENDERTMP)"
-	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
-
-clean:
-	@echo "Cleaning $(RENDERTMP)"
-	$(Q)rm -f $(RENDERTMP)/blfs*
-
-validate: $(RENDERTMP)/$(BLFSFULL)
-$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL) version
-	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
-
-	@echo "Adjusting for revision $(REV)..."
-	$(Q)xsltproc --nonet                               \
-                --xinclude                            \
-                --output $(RENDERTMP)/$(BLFSHTML2)    \
-                --stringparam profile.revision $(REV) \
-                stylesheets/lfs-xsl/profile.xsl       \
-                index.xml
-
-	@echo "Validating the book..."
-	$(Q)xmllint --nonet                             \
-               --noent                             \
-               --postvalid                         \
-               --output $(RENDERTMP)/$(BLFSFULL)   \
-               $(RENDERTMP)/$(BLFSHTML2)
-
-profile-html: $(RENDERTMP)/$(BLFSHTML)
-$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL) version
-	@echo "Generating profiled XML for XHTML..."
-	$(Q)xsltproc --nonet                              \
-                --stringparam profile.condition html \
-                --output $(RENDERTMP)/$(BLFSHTML)    \
-                stylesheets/lfs-xsl/profile.xsl      \
-                $(RENDERTMP)/$(BLFSFULL)
-
-blfs-patch-list: blfs-patches.sh
-	@echo "Generating blfs patch list..."
-	$(Q)awk '{if ($$1 == "copy") {sub(/.*\//, "", $$2); print $$2}}' \
-	  blfs-patches.sh > blfs-patch-list
-
-blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL) version
-	@echo "Generating blfs patch script..."
-	$(Q)xsltproc --nonet                     \
-                --output blfs-patches.sh    \
-                stylesheets/patcheslist.xsl \
-                $(RENDERTMP)/$(BLFSFULL)
-
-wget-list: $(BASEDIR)/wget-list
-$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL) version
-	@echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
-	$(Q)mkdir -p $(BASEDIR)
-	$(Q)xsltproc --nonet                       \
-                --output $(BASEDIR)/wget-list \
-                stylesheets/wget-list.xsl     \
-                $(RENDERTMP)/$(BLFSFULL)
-
-test-links: $(BASEDIR)/test-links
-$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL) version
-	@echo "Generating test-links file..."
-	$(Q)mkdir -p $(BASEDIR)
-	$(Q)xsltproc --nonet                        \
-                --stringparam list_mode full   \
-                --output $(BASEDIR)/test-links \
-                stylesheets/wget-list.xsl      \
-                $(RENDERTMP)/$(BLFSFULL)
-
-	@echo "Checking URLs, first pass..."
-	$(Q)rm -f $(BASEDIR)/{good,bad,true_bad}_urls
-	$(Q)for URL in `cat $(BASEDIR)/test-links`; do                     \
-         wget --spider --tries=2 --timeout=60 $$URL >>/dev/null 2>&1; \
-         if test $$? -ne 0 ; then                                     \
-            echo $$URL >> $(BASEDIR)/bad_urls ;                       \
-         else                                                         \
-            echo $$URL >> $(BASEDIR)/good_urls 2>&1;                  \
-         fi;                                                          \
-   done
-
-	@echo "Checking URLs, second pass..."
-	$(Q)for URL2 in `cat $(BASEDIR)/bad_urls`; do                       \
-         wget --spider --tries=2 --timeout=60 $$URL2 >>/dev/null 2>&1; \
-         if test $$? -ne 0 ; then                                      \
-           echo $$URL2 >> $(BASEDIR)/true_bad_urls ;                   \
-         else                                                          \
-           echo $$URL2 >> $(BASEDIR)/good_urls 2>&1;                   \
-         fi; \
-   done
-
-bootscripts:
-	@VERSION=`grep "bootscripts-version " general.ent | cut -d\" -f2`; \
-   BOOTSCRIPTS="blfs-bootscripts-$$VERSION";                          \
-   if [ ! -e $$BOOTSCRIPTS.tar.xz ]; then                             \
-     rm -rf $(RENDERTMP)/$$BOOTSCRIPTS;                               \
-     mkdir $(RENDERTMP)/$$BOOTSCRIPTS;                                \
-     cp -a ../bootscripts/* $(RENDERTMP)/$$BOOTSCRIPTS;               \
-     rm -rf ../bootscripts/archive;                                   \
-     tar  -cJhf $$BOOTSCRIPTS.tar.xz -C $(RENDERTMP) $$BOOTSCRIPTS;   \
-   fi
-
-systemd-units:
-	@VERSION=`grep "systemd-units-version " general.ent | cut -d\" -f2`; \
-   UNITS="blfs-systemd-units-$$VERSION";                                \
-   if [ ! -e $$UNITS.tar.xz ]; then                                     \
-     rm -rf $(RENDERTMP)/$$UNITS;                                       \
-     mkdir $(RENDERTMP)/$$UNITS;                                        \
-     cp -a ../systemd-units/* $(RENDERTMP)/$$UNITS;                     \
-     tar -cJhf $$UNITS.tar.xz -C $(RENDERTMP) $$UNITS;                  \
-   fi
-
-test-options:
-	$(Q)xsltproc --xinclude --nonet stylesheets/test-options.xsl index.xml
-
-dump-commands: $(DUMPDIR)
-$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL) version
-	@echo "Dumping book commands..."
-	$(Q)xsltproc --output $(DUMPDIR)/          \
-                stylesheets/dump-commands.xsl \
-                $(RENDERTMP)/$(BLFSFULL)
-	$(Q)touch $(DUMPDIR)
-
-.PHONY: blfs all world html nochunks tmpdir clean             \
-   validate profile-html blfs-patch-list wget-list test-links \
-   dump-commands  bootscripts systemd-units version test-options
-
-version:
-	$(Q)./git-version.sh $(REV)
Index: README
===================================================================
--- README	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ README	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,18 +1,48 @@
-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
-determine what programs you need to install and where to get instructions to
-install that software.
+How do I convert these XML files to other formats like HTML, PF, PS
+and TXT? You need to have some software installed that deal with these
+conversions. Please read the INSTALL file how to install that software.
+Then come back to this file for examples how to convert these files
+into various other formats.
 
-After that, you can build the html with a simple 'make' command.
-The default target builds the html in $(HOME)/public_html/blfs-book.
+XML to HTML:
+------------
+Create a directory in which you want to store the HTML files and cd into 
+that directory. Now run:
+    mkdir introduction postlfs general connect basicnet server \
+              content x kde gnome xsoft multimedia pst preface \
+              appendices other
+	/usr/bin/openjade -t xml \
+		-d /usr/share/dsssl/docbook/html/blfs.dsl \
+		/usr/share/dsssl/docbook/dtds/decls/xml.dcl \
+		/path/to/index.xml
 
-For all targets, setting the parameter REV=systemd is needed to build the
-systemd version of the book.
 
-Other Makefile targets are: nochunks, validate, and blfs-patch-list.
 
-nochunks: builds BLFS in one huge file.
+XML to NOCHUNKS-HTML:
+--------------------
+The NOCHUNKS HTML version is one big HTML file:
+	/usr/bin/openjade -t sgml \
+		-V nochunks \
+		-d /usr/share/dsssl/docbook/html/blfs.dsl \
+		/usr/share/dsssl/docbook/dtds/decls/xml.dcl \
+		/path/to/index.xml > nochunks.html
 
-validate:  does an extensive check for xml errors in the book.
+XML to TXT:
+-----------
+First create the NOCHUNKS HTML file, then convert by running:
+	/usr/bin/lynx -dump nochunks.html > output.txt
 
-blfs-patch-list: generates a list of all blfs controlled patches in the book.
+XML to PS and PDF:
+------------------
+First create the NOCHUNKS HTML file, then convert by starting
+htmldoc. You can use the GUI and select the options. If you're
+satisfied with the default options you can run this command:
+
+	/usr/bin/htmldoc --book --firstpage p1 -v -t <type> \
+		-f <output> nochunks.html
+
+replace <type> by pdf13 to create a pdf file or replace <type> by ps3 to
+create a ps file. There are other pdf and ps levels, see the man page for
+possible other options. Replace <output> with the filename of the ps or
+pdf file that is to be generated.
+
Index: appendices/appendices.ent
===================================================================
--- appendices/appendices.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/appendices.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY appendices SYSTEM "appendices.xml">
+
+<!ENTITY appendices-symlinks SYSTEM "symlinks/symlinks.xml">
+<!ENTITY appendices-symlinks-rc0 SYSTEM "symlinks/rc0.xml">
+<!ENTITY appendices-symlinks-rc1 SYSTEM "symlinks/rc1.xml">
+<!ENTITY appendices-symlinks-rc2 SYSTEM "symlinks/rc2.xml">
+<!ENTITY appendices-symlinks-rc3 SYSTEM "symlinks/rc3.xml">
+<!ENTITY appendices-symlinks-rc4 SYSTEM "symlinks/rc4.xml">
+<!ENTITY appendices-symlinks-rc5 SYSTEM "symlinks/rc5.xml">
+<!ENTITY appendices-symlinks-rc6 SYSTEM "symlinks/rc6.xml">
Index: appendices/appendices.xml
===================================================================
--- appendices/appendices.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/appendices.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,6 @@
+<part id="appendices">
+<title>Appendices</title>
+
+&appendices-symlinks;
+
+</part>
Index: pendices/creat-comm.xml
===================================================================
--- appendices/creat-comm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,514 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix 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;
-]>
-
-<appendix id="CC" xreflabel="Creative Commons License">
-  <?dbhtml filename="creat-comm.html" dir="appendices"?>
-
-  <appendixinfo>
-    <date>$Date$</date>
-  </appendixinfo>
-
-  <title>Creative Commons License</title>
-
-  <para role='title'>
-    Creative Commons Legal Code
-  </para>
-
-  <para role='title'>
-    Attribution-NonCommercial-ShareAlike 2.0
-  </para>
-
-  <important>
-    <para>
-      CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-      LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-      ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-      INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-      REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES
-      RESULTING FROM ITS USE.
-    </para>
-  </important>
-
-  <para role='title'>
-    License
-  </para>
-
-  <para>
-    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-    COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-    COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-    AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-  </para>
-
-  <para>
-    BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-    TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
-    RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
-    AND CONDITIONS.
-  </para>
-
-  <orderedlist>
-    <?dbfo label-width="1.5em"?>
-    <listitem>
-      <para>
-        Definitions
-      </para>
-
-      <orderedlist>
-        <listitem>
-          <para>
-            "Collective Work" means a work, such as a periodical issue,
-            anthology or encyclopedia, in which the Work in its entirety in
-            unmodified form, along with a number of other contributions,
-            constituting separate and independent works in themselves,
-            are assembled into a collective whole. A work that constitutes a
-            Collective Work will not be considered a Derivative Work (as
-            defined below) for the purposes of this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            "Derivative Work" means a work based upon the Work or upon the
-            Work and other pre-existing works, such as a translation, musical
-            arrangement, dramatization, fictionalization, motion picture
-            version, sound recording, art reproduction, abridgment,
-            condensation, or any other form in which the Work may be recast,
-            transformed, or adapted, except that a work that constitutes a
-            Collective Work will not be considered a Derivative Work for the
-            purpose of this License. For the avoidance of doubt, where the
-            Work is a musical composition or sound recording, the
-            synchronization of the Work in timed-relation with a moving image
-            ("synching") will be considered a Derivative Work for the purpose
-            of this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            "Licensor" means the individual or entity that offers the
-            Work under the terms of this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            "Original Author" means the individual or entity who created
-            the Work.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            "Work" means the copyrightable work of authorship offered
-            under the terms of this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            "You" means an individual or entity exercising rights under this
-            License who has not previously violated the terms of this License
-            with respect to the Work, or who has received express permission
-            from the Licensor to exercise rights under this License despite a
-            previous violation.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            "License Elements" means the following high-level license
-            attributes as selected by Licensor and indicated in the title of
-            this License: Attribution, Noncommercial, ShareAlike.
-          </para>
-        </listitem>
-
-      </orderedlist>
-    </listitem>
-
-    <listitem>
-      <para>
-        Fair Use Rights. Nothing in this license is intended to reduce, limit,
-        or restrict any rights arising from fair use, first sale or other
-        limitations on the exclusive rights of the copyright owner under
-        copyright law or other applicable laws.
-      </para>
-    </listitem>
-
-
-    <listitem>
-      <para>
-        License Grant. Subject to the terms and conditions of this License,
-        Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-        perpetual (for the duration of the applicable copyright) license to
-        exercise the rights in the Work as stated below:
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            to reproduce the Work, to incorporate the Work into one or more
-            Collective Works, and to reproduce the Work as incorporated in the
-            Collective Works;
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            to create and reproduce Derivative Works;
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            to distribute copies or phonorecords of, display publicly, perform
-            publicly, and perform publicly by means of a digital audio
-            transmission the Work including as incorporated in Collective
-            Works;
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            to distribute copies or phonorecords of, display publicly,
-            perform publicly, and perform publicly by means of a digital audio
-            transmission Derivative Works;
-          </para>
-        </listitem>
-
-      </orderedlist>
-
-      <para>
-        The above rights may be exercised in all media and formats whether now
-        known or hereafter devised. The above rights include the right to make
-        such modifications as are technically necessary to exercise the rights
-        in other media and formats. All rights not expressly granted by
-        Licensor are hereby reserved, including but not limited to the rights
-        set forth in Sections 4(e) and 4(f).
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Restrictions.The license granted in Section 3 above is
-        expressly made subject to and limited by the following
-        restrictions:
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            You may distribute, publicly display, publicly perform, or publicly
-            digitally perform the Work only under the terms of this License,
-            and You must include a copy of, or the Uniform Resource Identifier
-            for, this License with every copy or phonorecord of the Work You
-            distribute, publicly display, publicly perform, or publicly
-            digitally perform. You may not offer or impose any terms on the
-            Work that alter or restrict the terms of this License or the
-            recipients' exercise of the rights granted hereunder. You may not
-            sublicense the Work. You must keep intact all notices that refer
-            to this License and to the disclaimer of warranties. You may not
-            distribute, publicly display, publicly perform, or publicly
-            digitally perform the Work with any technological measures that
-            control access or use of the Work in a manner inconsistent with
-            the terms of this License Agreement. The above applies to the Work
-            as incorporated in a Collective Work, but this does not require
-            the Collective Work apart from the Work itself to be made subject
-            to the terms of this License. If You create a Collective Work,
-            upon notice from any Licensor You must, to the extent practicable,
-            remove from the Collective Work any reference to such Licensor or
-            the Original Author, as requested. If You create a Derivative Work,
-            upon notice from any Licensor You must, to the extent practicable,
-            remove from the Derivative Work any reference to such Licensor or
-            the Original Author, as requested.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            You may distribute, publicly display, publicly perform, or publicly
-            digitally perform a Derivative Work only under the terms of this
-            License, a later version of this License with the same License
-            Elements as this License, or a Creative Commons iCommons license
-            that contains the same License Elements as this License (e.g.
-            Attribution-NonCommercial-ShareAlike 2.0 Japan). You must include
-            a copy of, or the Uniform Resource Identifier for, this License or
-            other license specified in the previous sentence with every copy
-            or phonorecord of each Derivative Work You distribute, publicly
-            display, publicly perform, or publicly digitally perform. You may
-            not offer or impose any terms on the Derivative Works that alter
-            or restrict the terms of this License or the recipients' exercise
-            of the rights granted hereunder, and You must keep intact all
-            notices that refer to this License and to the disclaimer of
-            warranties. You may not distribute, publicly display, publicly
-            perform, or publicly digitally perform the Derivative Work with
-            any technological measures that control access or use of the Work
-            in a manner inconsistent with the terms of this License Agreement.
-            The above applies to the Derivative Work as incorporated in a
-            Collective Work, but this does not require the Collective Work
-            apart from the Derivative Work itself to be made subject to the
-            terms of this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            You may not exercise any of the rights granted to You in Section 3
-            above in any manner that is primarily intended for or directed
-            toward commercial advantage or private monetary compensation. The
-            exchange of the Work for other copyrighted works by means of
-            digital file-sharing or otherwise shall not be considered to be
-            intended for or directed toward commercial advantage or private
-            monetary compensation, provided there is no payment of any monetary
-            compensation in connection with the exchange of copyrighted works.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you distribute, publicly display, publicly perform, or publicly
-            digitally perform the Work or any Derivative Works or Collective
-            Works, You must keep intact all copyright notices for the Work and
-            give the Original Author credit reasonable to the medium or means
-            You are utilizing by conveying the name (or pseudonym if
-            applicable) of the Original Author if supplied; the title of the
-            Work if supplied; to the extent reasonably practicable, the Uniform
-            Resource Identifier, if any, that Licensor specifies to be
-            associated with the Work, unless such URI does not refer to the
-            copyright notice or licensing information for the Work; and in the
-            case of a Derivative Work, a credit identifying the use of the Work
-            in the Derivative Work (e.g., "French translation of the Work by
-            Original Author," or "Screenplay based on original Work by Original
-            Author"). Such credit may be implemented in any reasonable manner;
-            provided, however, that in the case of a Derivative Work or
-            Collective Work, at a minimum such credit will appear where any
-            other comparable authorship credit appears and in a manner at least
-            as prominent as such other comparable authorship credit.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            For the avoidance of doubt, where the Work is a musical
-            composition:
-          </para>
-
-          <orderedlist>
-
-            <listitem>
-              <para>
-                Performance Royalties Under Blanket Licenses. Licensor reserves
-                the exclusive right to collect, whether individually or via a
-                performance rights society (e.g. ASCAP, BMI, SESAC), royalties
-                for the public performance or public digital performance (e.g.
-                webcast) of the Work if that performance is primarily intended
-                for or directed toward commercial advantage or private monetary
-                compensation.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Mechanical Rights and Statutory Royalties. Licensor reserves
-                the exclusive right to collect, whether individually or via a
-                music rights agency or designated agent (e.g. Harry Fox
-                Agency), royalties    for any phonorecord You create from the
-                Work ("cover version") and distribute, subject to the
-                compulsory license created by 17 USC Section 115 of the US
-                Copyright Act (or the equivalent in other jurisdictions), if
-                Your distribution of such cover version is primarily intended
-                for or directed toward commercial advantage or private monetary
-                compensation.  6. Webcasting Rights and Statutory Royalties.
-                For the avoidance of doubt, where the Work is a sound
-                recording, Licensor reserves the exclusive right to collect,
-                whether individually or via a performance-rights society (e.g.
-                SoundExchange), royalties for the public digital performance
-                (e.g. webcast) of the Work, subject to the compulsory license
-                created by 17 USC Section 114 of the US Copyright Act (or the
-                equivalent in other jurisdictions), if Your public digital
-                performance is primarily intended for or directed toward
-                commercial advantage or private monetary compensation.
-              </para>
-            </listitem>
-
-          </orderedlist>
-        </listitem>
-
-        <listitem>
-          <para>
-            Webcasting Rights and Statutory Royalties. For the avoidance of
-            doubt, where the Work is a sound recording, Licensor reserves the
-            exclusive right to collect, whether individually or via a
-            performance-rights society (e.g.  SoundExchange), royalties for
-            the public digital performance (e.g. webcast) of the Work, subject
-            to the compulsory license created by 17 USC Section 114 of the US
-            Copyright Act (or the equivalent in other jurisdictions), if Your
-            public digital performance is primarily intended for or directed
-            toward commercial advantage or private monetary compensation.
-          </para>
-        </listitem>
-
-      </orderedlist>
-    </listitem>
-
-    <listitem>
-      <para>
-        Representations, Warranties and Disclaimer
-      </para>
-
-      <para>
-        UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-        OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-        KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-        INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-        FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-        LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
-        ERRORS, WHETHER OR NOT DISCOVERABLE.  SOME JURISDICTIONS DO NOT ALLOW
-        THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
-        TO YOU.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-        LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY
-        FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
-        DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
-        LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Termination
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            This License and the rights granted hereunder will terminate
-            automatically upon any breach by You of the terms of this License.
-            Individuals or entities who have received Derivative Works or
-            Collective Works from You under this License, however, will not
-            have their licenses terminated provided such individuals or
-            entities remain in full compliance with those licenses. Sections 1,
-            2, 5, 6, 7, and 8 will survive any termination of this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Subject to the above terms and conditions, the license granted
-             here is perpetual (for the duration of the applicable copyright
-             in the Work).  Notwithstanding the above, Licensor reserves the
-             right to release the Work under different license terms or to
-             stop distributing the Work at any time; provided, however that
-             any such election will not serve to withdraw this License (or any
-             other license that has been, or is required to be, granted under
-             the terms of this License), and this License will continue in
-             full force and effect unless terminated as stated above.
-          </para>
-        </listitem>
-
-      </orderedlist>
-    </listitem>
-
-    <listitem>
-      <para>
-        Miscellaneous
-      </para>
-
-      <orderedlist>
-
-        <listitem>
-          <para>
-            Each time You distribute or publicly digitally perform the Work or
-            a Collective Work, the Licensor offers to the recipient a license
-            to the Work on the same terms and conditions as the license granted
-            to You under this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Each time You distribute or publicly digitally perform a Derivative
-            Work, Licensor offers to the recipient a license to the original
-            Work on the same terms and conditions as the license granted to
-            You under this License.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If any provision of this License is invalid or unenforceable under
-            applicable law, it shall not affect the validity or enforceability
-            of the remainder of the terms of this License, and without further
-            action by the parties to this agreement, such provision shall be
-            reformed to the minimum extent necessary to make such provision
-            valid and enforceable.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            No term or provision of this License shall be deemed waived and no
-            breach consented to unless such waiver or consent shall be in
-            writing and signed by the party to be charged with such waiver or
-            consent.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            This License constitutes the entire agreement between the parties
-            with respect to the Work licensed here. There are no
-            understandings, agreements or representations with respect to the
-            Work not specified here.  Licensor shall not be bound by any
-            additional provisions that may appear in any communication from
-            You. This License may not be modified without the mutual written
-            agreement of the Licensor and You.
-          </para>
-        </listitem>
-
-
-      </orderedlist>
-    </listitem>
-  </orderedlist>
-
-  <important>
-    <para>
-      Creative Commons is not a party to this License, and makes no warranty
-      whatsoever in connection with the Work. Creative Commons will not be
-      liable to You or any party on any legal theory for any damages
-      whatsoever, including without limitation any general, special, incidental
-      or consequential damages arising in connection to this license.
-      Notwithstanding the foregoing two (2) sentences, if Creative Commons has
-      expressly identified itself as the Licensor hereunder, it shall have all
-      rights and obligations of Licensor.
-    </para>
-
-    <para>
-      Except for the limited purpose of indicating to the public that the Work
-      is licensed under the CCPL, neither party will use the trademark
-      "Creative Commons" or any related trademark or logo of Creative Commons
-      without the prior written consent of Creative Commons. Any permitted use
-      will be in compliance with Creative Commons' then-current trademark
-      usage guidelines, as may be published on its website or otherwise made
-      available upon request from time to time.
-    </para>
-
-    <para>
-      Creative Commons may be contacted at <ulink url=
-      'http://creativecommons.org/'/>.
-    </para>
-  </important>
-
-</appendix>
Index: pendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2789 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glossary 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;
-]>
-
-<glossary id="appendices-glossary">
-  <glossaryinfo>
-    <date>$Date$</date>
-  </glossaryinfo>
-  <?dbhtml filename="glossary.html" dir="appendices"?>
-  <title>Glossary</title>
-
-  <glossdiv>
-    <title>Acronyms</title>
-
-    <glossentry id="g669">
-      <glossterm>
-        <acronym>669</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          UNIS/Composer 669 Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gABI">
-      <glossterm>
-        <acronym>ABI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Application Binary Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gADSL">
-      <glossterm>
-        <acronym>ADSL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Asymmetric Digital Subscriber Line
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAFS">
-      <glossterm>
-        <acronym>AFS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Andrew File System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAGESA">
-      <glossterm>
-        <acronym>AGESA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          AMD Generic Encapsulated Software Architecture
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAIFF">
-      <glossterm>
-        <acronym>AIFF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Audio Interchange File Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gALSA">
-      <glossterm>
-        <acronym>ALSA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Advanced Linux Sound Architecture
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gANSI">
-      <glossterm>
-        <acronym>ANSI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          American National Standards Institute
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAPI">
-      <glossterm>
-        <acronym>API</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Application Programming Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAPR">
-      <glossterm>
-        <acronym>APR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Apache Portable Runtime
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gARP">
-      <glossterm>
-        <acronym>ARP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Address Resolution Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gASCII">
-      <glossterm>
-        <acronym>ASCII</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          American Standard Code for Information Interchange
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gASLR">
-      <glossterm>
-        <acronym>ASLR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Address Space Layout Randomization
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gASN">
-      <glossterm>
-        <acronym>ASN</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Abstract Syntax Notation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gASF">
-      <glossterm>
-        <acronym>ASF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Advanced Streaming Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gATA">
-      <glossterm>
-        <acronym>ATA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Advanced Technology Attachment
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gATSC">
-      <glossterm>
-        <acronym>ATSC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Advanced Television Systems Committee
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gATK">
-      <glossterm>
-        <acronym>ATK</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Accessibility ToolKit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAVI">
-      <glossterm>
-        <acronym>AVI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Audio Video Interleave
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gAWT">
-      <glossterm>
-        <acronym>AWT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Abstract Window Toolkit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gBER">
-      <glossterm>
-        <acronym>BER</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Basic Encoding Rules
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gBIND">
-      <glossterm>
-        <acronym>BIND</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Berkeley Internet Name Domain
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gBIOS">
-      <glossterm>
-        <acronym>BIOS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Basic Input/Output System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gBLFS">
-      <glossterm>
-        <acronym>BLFS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Beyond Linux From Scratch
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gBMP">
-      <glossterm>
-        <acronym>BMP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Bit MaP
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCD">
-      <glossterm>
-        <acronym>CD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Compact Disk
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCDDA">
-      <glossterm>
-        <acronym>CDDA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Compact Disc Digital Audio
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCIFS">
-      <glossterm>
-        <acronym>CIFS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Common Internet File System
-        </para>
-        <glossseealso otherterm="gSMB">SMB</glossseealso>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCMS">
-      <glossterm>
-        <acronym>CMS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Cryptographic Message Syntax
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCODEC">
-      <glossterm>
-        <acronym>CODEC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          COmpression/DECompression module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCORBA">
-      <glossterm>
-        <acronym>CORBA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Common Object Request Broker Architecture
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCPU">
-      <glossterm>
-        <acronym>CPU</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Central Processing Unit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCRD">
-      <glossterm>
-        <acronym>CRD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Color Rendering Dictionary
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCSA">
-      <glossterm>
-        <acronym>CSA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Color Space Array
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCSSdvd">
-      <glossterm>
-        <acronym>CSS</acronym> (on DVD)
-      </glossterm>
-      <glossdef>
-        <para>
-          Contents Scrambling System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCSS">
-      <glossterm>
-        <acronym>CSS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Cascading Style Sheets
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCUPS">
-      <glossterm>
-        <acronym>CUPS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Common Unix Printing System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gCVS">
-      <glossterm>
-        <acronym>CVS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Concurrent Versions System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDAO">
-      <glossterm>
-        <acronym>DAO</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Disc At Once
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDARPA">
-      <glossterm>
-        <acronym>DARPA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Directory Address Resolution Protocol Allocation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDEC">
-      <glossterm>
-        <acronym>DEC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Digital Equipment Corporation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDER">
-      <glossterm>
-        <acronym>DER</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Distinguished Encoding Rules
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDES">
-      <glossterm>
-        <acronym>DES</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Data Encryption Standard
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDHCP">
-      <glossterm>
-        <acronym>DHCP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Dynamic Host Configuration Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDICT">
-      <glossterm>
-        <acronym>DICT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Dictionary Server Protocol (RFC 2229)
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDIN">
-      <glossterm>
-        <acronym>DIN</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          German Industrial Norm
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDNS">
-      <glossterm>
-        <acronym>DNS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Domain Name Service
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDOS">
-      <glossterm>
-        <acronym>DOS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Disk Operating System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDRI">
-      <glossterm>
-        <acronym>DRI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Direct Rendering Infrastructure
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDSC">
-      <glossterm>
-        <acronym>DSC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Document Structuring Conventions
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDSO">
-      <glossterm>
-        <acronym>DSO</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Dynamic Shared Objects
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDSSSL">
-      <glossterm>
-        <acronym>DSSSL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Document Style Semantics and Specification Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDV">
-      <glossterm>
-        <acronym>DV</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Digital Video
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDVD">
-      <glossterm>
-        <acronym>DVD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Digital Versatile Disk (also Digital Video Disk)
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gDVI">
-      <glossterm>
-        <acronym>DVI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          DeVice Independent
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gELF">
-      <glossterm>
-        <acronym>ELF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Executable and Linking Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gEPP">
-      <glossterm>
-        <acronym>EPP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Enhanced Parallel Port
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gEPS">
-      <glossterm>
-        <acronym>EPS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Encapsulated PostScript
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gESD">
-      <glossterm>
-        <acronym>ESD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Enlighten Sound Daemon
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gESMTP">
-      <glossterm>
-        <acronym>ESMTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Extended Simple Mail Transfer Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFAM">
-      <glossterm>
-        <acronym>FAM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          File Alteration Monitor
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFAME">
-      <glossterm>
-        <acronym>FAME</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Fast Assembly Mpeg Encoder
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFAQ">
-      <glossterm>
-        <acronym>FAQ</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Frequently Asked Questions
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFAX">
-      <glossterm>
-        <acronym>FAX</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Facsimile
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFB">
-      <glossterm>
-        <acronym>FB</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Frame Buffer
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFHS">
-      <glossterm>
-        <acronym>FHS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          File Hierarchy Standard
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFLAC">
-      <glossterm>
-        <acronym>FLAC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Free Lossless Audio <acronym>CODEC</acronym>
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFO">
-      <glossterm>
-        <acronym>FO</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Formatted Objects
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gFTP">
-      <glossterm>
-        <acronym>FTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          File Transfer Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGCC">
-      <glossterm>
-        <acronym>GCC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNU</acronym> Compiler Collection
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGDBM">
-      <glossterm>
-        <acronym>GDBM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNU</acronym> DataBase Manager
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGDK">
-      <glossterm>
-        <acronym>GDK</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GTK</acronym>+ Drawing Kit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGDM">
-      <glossterm>
-        <acronym>GDM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNOME</acronym> Display Manager
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGID">
-      <glossterm>
-        <acronym>GID</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Group IDentity
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGIF">
-      <glossterm>
-        <acronym>GIF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Graphics Interchange Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGLUT">
-      <glossterm>
-        <acronym>GLUT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          OpenGL Utility Toolkit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGMP">
-      <glossterm>
-        <acronym>GMP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNU</acronym> Multiple Precision Arithmetic
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGNAT">
-      <glossterm>
-        <acronym>GNAT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNU</acronym> NYU Ada 9x Translator
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGNOME">
-      <glossterm>
-        <acronym>GNOME</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNU</acronym> Network Object Model Environment
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGNU">
-      <glossterm>
-        <acronym>GNU</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GNU</acronym>'s Not Unix
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGPL">
-      <glossterm>
-        <acronym>GPL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          General Public License
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGPM">
-      <glossterm>
-        <acronym>GPM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          General Purpose Mouse
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGSS">
-      <glossterm>
-        <acronym>GSS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Generic Security Service
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGSSAPI">
-      <glossterm>
-        <acronym>GSSAPI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Generic Security Service Application Programming Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGTK">
-      <glossterm>
-        <acronym>GTK</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>GIMP</acronym> ToolKit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gGUI">
-      <glossterm>
-        <acronym>GUI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Graphical User Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gHFS">
-      <glossterm>
-        <acronym>HFS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Hierarchical File System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gHTML">
-      <glossterm>
-        <acronym>HTML</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          HyperText Markup Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gHTTP">
-      <glossterm>
-        <acronym>HTTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          HyperText Transfer Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gHTTPS">
-      <glossterm>
-        <acronym>HTTPS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          HyperText Transfer Protocol Secured
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gHUP">
-      <glossterm>
-        <acronym>HUP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Hang UP
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIANA">
-      <glossterm>
-        <acronym>IANA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Assigned Numbers Authority
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gICC">
-      <glossterm>
-        <acronym>ICC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          International Color Consortium
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gICMP">
-      <glossterm>
-        <acronym>ICMP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Control Message Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIDE">
-      <glossterm>
-        <acronym>IDE</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Integrated Drive Electronics
-        </para>
-      </glossdef>
-      <glossdef>
-        <para>
-          Integrated Development Environment
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIDL">
-      <glossterm>
-        <acronym>IDL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Interface Definition Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIJS">
-      <glossterm>
-        <acronym>IJS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Ink Jet Systems
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gILS">
-      <glossterm>
-        <acronym>ILS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Location Server
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIMAP">
-      <glossterm>
-        <acronym>IMAP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Message Access Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="IMON">
-      <glossterm>
-        <abbrev>IMON</abbrev>
-      </glossterm>
-      <glossdef>
-        <para>
-          Inode MONitor
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIP">
-      <glossterm>
-        <acronym>IP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Protocol
-        </para>
-        <glossseealso otherterm="gTCP">TCP</glossseealso>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIPX">
-      <glossterm>
-        <acronym>IPX</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internetwork Packet eXchange
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIRC">
-      <glossterm>
-        <acronym>IRC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Relay Chat
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gISDN">
-      <glossterm>
-        <acronym>ISDN</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Integrated Services Digital Network
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gISO">
-      <glossterm>
-        <acronym>ISO</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          International Standards Organisation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gISP">
-      <glossterm>
-        <acronym>ISP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Internet Service Provider
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gIT">
-      <glossterm>
-        <acronym>IT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          ImpulseTracker Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gJAI">
-      <glossterm>
-        <acronym>JAI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Java Advanced Imaging
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gJAR">
-      <glossterm>
-        <acronym>JAR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Java ARchive
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gJDK">
-      <glossterm>
-        <acronym>JDK</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Java Development Kit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gJFIF">
-      <glossterm>
-        <acronym>JFIF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          <acronym>JPEG</acronym> File Interchange Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gJPEG">
-      <glossterm>
-        <acronym>JPEG</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Joint Photographic Experts Group
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gKDC">
-      <glossterm>
-        <acronym>KDC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Key Distribution Center
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gKDE">
-      <glossterm>
-        <acronym>KDE</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          KDesktop Environment
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLAME">
-      <glossterm>
-        <acronym>LAME</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Lame Ain't an MP3 Encoder
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLAN">
-      <glossterm>
-        <acronym>LAN</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Local Area Network
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLDAP">
-      <glossterm>
-        <acronym>LDAP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Lightweight Directory Access Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLDIF">
-      <glossterm>
-        <acronym>LDIF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Lightweight Data Interchange Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLFS">
-      <glossterm>
-        <acronym>LFS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Linux From Scratch
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLGPL">
-      <glossterm>
-        <acronym>LGPL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Library General Public License
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLPR">
-      <glossterm>
-        <acronym>LPR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Line PRinter
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLZO">
-      <glossterm>
-        <acronym>LZO</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Lempel-Ziv-Oberhumer
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gLZW">
-      <glossterm>
-        <acronym>LZW</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Lempel-Ziv-Welch
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMAC">
-      <glossterm>
-        <acronym>MAC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Media Access Control
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMCOP">
-      <glossterm>
-        <acronym>MCOP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Multimedia COmmunication Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMCU">
-      <glossterm>
-        <acronym>MCU</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Multipoint Control Unit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMD">
-      <glossterm>
-        <acronym>MD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Message-Digest
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMDA">
-      <glossterm>
-        <acronym>MDA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Mail Delivery Agent
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMED">
-      <glossterm>
-        <acronym>MED</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          MED/OctaMED Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMIDI">
-      <glossterm>
-        <acronym>MIDI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Musical Instrument Digital Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMIF">
-      <glossterm>
-        <acronym>MIF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Maker Interchange Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMII">
-      <glossterm>
-        <acronym>MII</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Media Independent Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMIME">
-      <glossterm>
-        <acronym>MIME</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Multipurpose Internet Mail Extensions
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMIT">
-      <glossterm>
-        <acronym>MIT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Massachusetts Institute of Technology
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMNG">
-      <glossterm>
-        <acronym>MNG</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Multiple-image Network Graphics
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMOD">
-      <glossterm>
-        <acronym>MOD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          ProTracker Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMP3">
-      <glossterm>
-        <acronym>MP3</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          MPEG-1 audio layer 3
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMPEG">
-      <glossterm>
-        <acronym>MPEG</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Moving Picture Experts Group
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMSL">
-      <glossterm>
-        <acronym>MSL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Magick Scripting Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMTA">
-      <glossterm>
-        <acronym>MTA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Mail Transport Agent
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMTM">
-      <glossterm>
-        <acronym>MTM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          MultiTracker Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gMUA">
-      <glossterm>
-        <acronym>MUA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Mail User Agent
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNASM">
-      <glossterm>
-        <acronym>NASM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Netwide ASseMbler
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNNTP">
-      <glossterm>
-        <acronym>NNTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Network News Transfer Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNFS">
-      <glossterm>
-        <acronym>NFS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Network File System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNIS">
-      <glossterm>
-        <acronym>NIS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Network Information Service
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNPTL">
-      <glossterm>
-        <acronym>NPTL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Native Posix Thread Library
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNSPR">
-      <glossterm>
-        <acronym>NSPR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Netscape Portable Runtime
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNSS">
-      <glossterm>
-        <acronym>NSS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Network Security Services
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gNTP">
-      <glossterm>
-        <acronym>NTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Network Time Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gOAF">
-      <glossterm>
-        <acronym>OAF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Object Activation Framework
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gODBC">
-      <glossterm>
-        <acronym>ODBC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Open DataBase Connectivity
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gOMF">
-      <glossterm>
-        <acronym>OMF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Open Metadata Framework
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gORB">
-      <glossterm>
-        <acronym>ORB</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Object Request Broker
-        </para>
-        <glossseealso otherterm="gCORBA">CORBA</glossseealso>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gORDBMS">
-      <glossterm>
-        <acronym>ORDBMS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Object Relational Database Management System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gOS">
-      <glossterm>
-        <acronym>OS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Operating System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gOSF">
-      <glossterm>
-        <acronym>OSF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Open Software Foundation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gOSS">
-      <glossterm>
-        <acronym>OSS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Open Sound System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPAM">
-      <glossterm>
-        <acronym>PAM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Pluggable authentication Modules
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPBM">
-      <glossterm>
-        <acronym>PBM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Portable BitMap
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPCI">
-      <glossterm>
-        <acronym>PCI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Peripheral Component Interconnect
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPCL">
-      <glossterm>
-        <acronym>PCL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Printer Control Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPCM">
-      <glossterm>
-        <acronym>PCM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Pulse Code Modulation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPDC">
-      <glossterm>
-        <acronym>PDC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Primary Domain Controller
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPDF">
-      <glossterm>
-        <acronym>PDF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Portable Document Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPEAR">
-      <glossterm>
-        <acronym>PEAR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          PHP Extension and Application Repository
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPGM">
-      <glossterm>
-        <acronym>PGM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Portable Grey Map
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPGP">
-      <glossterm>
-        <acronym>PGP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Pretty Good Privacy
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPHP">
-      <glossterm>
-        <acronym>PHP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          PHP Hypertext Preprocessor
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPIE">
-      <glossterm>
-        <acronym>PIE</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Position Independent Executable
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPIM">
-      <glossterm>
-        <acronym>PIM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Personal Information Manager
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPLIP">
-      <glossterm>
-        <acronym>PLIP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Parallel Line Internet Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPNG">
-      <glossterm>
-        <acronym>PNG</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Portable Network Graphics
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPO">
-      <glossterm>
-        <acronym>PO</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Portable Object
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPOD">
-      <glossterm>
-        <acronym>POD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Plain Old Documentation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPOP">
-      <glossterm>
-        <acronym>POP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Post Office Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPPD">
-      <glossterm>
-        <acronym>PPD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          PostScript Printer Description
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPPM">
-      <glossterm>
-        <acronym>PPM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Portable Pixel Map
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPPP">
-      <glossterm>
-        <acronym>PPP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Point-to-Point Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPPPoE">
-      <glossterm>
-        <acronym>PPPoE</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Point-to-Point Protocol over Ethernet
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gPS">
-      <glossterm>
-        <acronym>PS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          PostScript
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRADIUS">
-      <glossterm>
-        <acronym>RADIUS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Remote Authentication Dial-In User Service
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRAM">
-      <glossterm>
-        <acronym>RAM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Random Access Memory
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRARP">
-      <glossterm>
-        <acronym>RARP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Reverse Address Resolution Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRCS">
-      <glossterm>
-        <acronym>RCS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Revision Control System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRFC">
-      <glossterm>
-        <acronym>RFC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Request For Comments
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRGB">
-      <glossterm>
-        <acronym>RGB</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Red Green Blue
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRGBA">
-      <glossterm>
-        <acronym>RGBA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Red Green Blue Alpha
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gROM">
-      <glossterm>
-        <acronym>ROM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Read-Only Memory
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRP">
-      <glossterm>
-        <acronym>RP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Roaring Penguin
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRPC">
-      <glossterm>
-        <acronym>RPC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Remote Procedure Call
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRTC">
-      <glossterm>
-        <acronym>RTC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Real Time Clock
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRTP">
-      <glossterm>
-        <acronym>RTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Real Time Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gRW">
-      <glossterm>
-        <acronym>RW</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Read Write
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gS3M">
-      <glossterm>
-        <acronym>S3M</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          ScreamTracker Version 3 Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSMIME">
-      <glossterm>
-        <acronym>S/MIME</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Secure/<acronym>MIME</acronym>
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSANE">
-      <glossterm>
-        <acronym>SANE</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Scanner Access Now Easy
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSASL">
-      <glossterm>
-        <acronym>SASL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Simple Authentication and Security Layer
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSATA">
-      <glossterm>
-        <acronym>SATA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Serial Advanced Technology Attachment
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSBU">
-      <glossterm>
-        <acronym>SBU</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Standard Build Unit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSCSI">
-      <glossterm>
-        <acronym>SCSI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Small Computer System Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSDK">
-      <glossterm>
-        <acronym>SDK</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Software Development Kit
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSGML">
-      <glossterm>
-        <acronym>SGML</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Standard Generalized Markup Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSMART">
-      <glossterm>
-        <acronym>SMART</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Self Monitoring Analysis and Reporting Technology
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSMB">
-      <glossterm>
-        <acronym>SMB</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Server Message Block
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSMIL">
-      <glossterm>
-        <acronym>SMIL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Synchronized Multimedia Integration Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSMTP">
-      <glossterm>
-        <acronym>SMTP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Simple Mail Transfer Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSQL">
-      <glossterm>
-        <acronym>SQL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Structured Query Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSSH">
-      <glossterm>
-        <acronym>SSH</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Secure SHell
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSSL">
-      <glossterm>
-        <acronym>SSL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Secure Sockets Layer
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSSP">
-      <glossterm>
-        <acronym>SSP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Stack Smash Protection
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSUID">
-      <glossterm>
-        <acronym>SUID</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Set User IDentity
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSVG">
-      <glossterm>
-        <acronym>SVG</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Scalable Vector Graphics
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gSVGA">
-      <glossterm>
-        <acronym>SVGA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Super Video Graphics Array
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTCL">
-      <glossterm>
-        <acronym>TCL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Tool Command Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTCP">
-      <glossterm>
-        <acronym>TCP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Transmission Control Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTGT">
-      <glossterm>
-        <acronym>TGT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Ticket-Granting Ticket
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTIFF">
-      <glossterm>
-        <acronym>TIFF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Tag(ged) Image File Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTLS">
-      <glossterm>
-        <acronym>TLS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Transport Layer Security
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTTF">
-      <glossterm>
-        <acronym>TTF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          TrueType Font
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gTTS">
-      <glossterm>
-        <acronym>TTS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Text To Speech
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUCS">
-      <glossterm>
-        <acronym>UCS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Universal Character Set
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUDF">
-      <glossterm>
-        <acronym>UDF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Universal Disk Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUID">
-      <glossterm>
-        <acronym>UID</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          User IDentity
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUDP">
-      <glossterm>
-        <acronym>UDP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          User Datagram Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUI">
-      <glossterm>
-        <acronym>UI</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          User Interface
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUML">
-      <glossterm>
-        <acronym>UML</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Unified Modelling Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gURL">
-      <glossterm>
-        <acronym>URL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Uniform Resource Locator
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUSB">
-      <glossterm>
-        <acronym>USB</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Universal Serial Bus
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUSR">
-      <glossterm>
-        <acronym>USR</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Upstream Ready
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUTF">
-      <glossterm>
-        <acronym>UTF</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          UCS Transformation Format
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gUUCP">
-      <glossterm>
-        <acronym>UUCP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Unix-to-Unix Copy Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVCD">
-      <glossterm>
-        <acronym>VCD</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Video Compact Disk
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVCS">
-      <glossterm>
-        <acronym>VCS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Version Control System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVESA">
-      <glossterm>
-        <acronym>VESA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Video Electronics Standards Association
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVGA">
-      <glossterm>
-        <acronym>VGA</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Video Graphics Array
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVNC">
-      <glossterm>
-        <acronym>VNC</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Virtual Network Computer
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVOB">
-      <glossterm>
-        <acronym>VOB</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Video OBject
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gVOIP">
-      <glossterm>
-        <acronym>VOIP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Voice Over IP
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gW3C">
-      <glossterm>
-        <acronym>W3C</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          World Wide Web Consortium
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gWAV">
-      <glossterm>
-        <acronym>WAV</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Waveform Audio
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gWWW">
-      <glossterm>
-        <acronym>WWW</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          World Wide Web
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXDMCP">
-      <glossterm>
-        <acronym>XDMCP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          XDisplay Manager Control Protocol
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXM">
-      <glossterm>
-        <acronym>XM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          FastTracker Module
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXML">
-      <glossterm>
-        <acronym>XML</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          eXtensible Markup Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXSL">
-      <glossterm>
-        <acronym>XSL</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          eXtensible Style Language
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXSLT">
-      <glossterm>
-        <acronym>XSLT</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          eXtensible Style Language Transformation
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXSM">
-      <glossterm>
-        <acronym>XSM</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          X/Open System Management
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gXMMS">
-      <glossterm>
-        <acronym>XMMS</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          XMultiMedia System
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gYP">
-      <glossterm>
-        <acronym>YP</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Yellow Pages
-        </para>
-      </glossdef>
-    </glossentry>
-
-    <glossentry id="gYUV">
-      <glossterm>
-        <acronym>YUV</acronym>
-      </glossterm>
-      <glossdef>
-        <para>
-          Luminance-Bandwidth-Chrominance
-        </para>
-      </glossdef>
-    </glossentry>
-
-  </glossdiv>
-
-</glossary>
Index: pendices/mit-lic.xml
===================================================================
--- appendices/mit-lic.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix 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;
-]>
-
-<appendix id="MIT" xreflabel="MIT License">
-  <?dbhtml filename="mit.html" ?>
-
-  <appendixinfo>
-    <date>$Date$</date>
-  </appendixinfo>
-
-  <title>The MIT License</title>
-
-  <para>
-    Copyright &copy; &copyrightdate; &copyholder;
-  </para>
-
-  <para>
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-  </para>
-
-  <para>
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-  </para>
-
-  <para>
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </para>
-
-</appendix>
Index: appendices/symlinks/rc0.xml
===================================================================
--- appendices/symlinks/rc0.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc0.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,111 @@
+<sect2>
+
+<title>rc0.d</title>
+
+<table frame="none">
+<title>rc0.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K10</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Shut down General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+<row>
+<entry>K25</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Shut down Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>K30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Shut down Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>K35</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Save volume settings: <xref linkend="alsa"/></entry>
+</row>
+
+<row>
+<entry>K40</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Stop system and kernel logging: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K45</entry>
+<entry>random</entry>
+<entry><filename>../init.d/random</filename></entry>
+<entry>Save random seed: <xref linkend="postlfs-config-random"/></entry>
+</row>
+
+<row>
+<entry>K50</entry>
+<entry>sendsignals</entry>
+<entry><filename>../init.d/sendsignals</filename></entry>
+<entry>Kill processes: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K60</entry>
+<entry>mountfs</entry>
+<entry><filename>../init.d/mountfs</filename></entry>
+<entry>Unmount all filesystems: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K70</entry>
+<entry>swap</entry>
+<entry><filename>../init.d/swap</filename></entry>
+<entry>Turn off swap: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K80</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Shut down networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K90</entry>
+<entry>localnet</entry>
+<entry><filename>../init.d/localnet</filename></entry>
+<entry>Remove loopback interface: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K99</entry>
+<entry>halt</entry>
+<entry><filename>../init.d/halt</filename></entry>
+<entry>Shut down system: Part of LFS base.</entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/rc1.xml
===================================================================
--- appendices/symlinks/rc1.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc1.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,69 @@
+<sect2>
+
+<title>rc1.d</title>
+
+<table frame="none">
+<title>rc1.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K10</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Shut down General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+<row>
+<entry>K25</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Shut down Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>K30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Shut down Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>K35</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Save volume settings: <xref linkend="alsa"/></entry>
+</row>
+
+<row>
+<entry>K80</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Shut down networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K90</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Shut down networking: Part of LFS base.</entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/rc2.xml
===================================================================
--- appendices/symlinks/rc2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,76 @@
+<sect2>
+
+<title>rc2.d</title>
+
+<table frame="none">
+<title>rc2.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K10</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Shut down General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+<row>
+<entry>K25</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Shut down Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>K30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Shut down Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>K90</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Shut down networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S10</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Start system and kernel logging: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S25</entry>
+<entry>random</entry>
+<entry><filename>../init.d/random</filename></entry>
+<entry>Restore random seed: <xref linkend="postlfs-config-random"/></entry>
+</row>
+
+<row>
+<entry>S40</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Start up sound system: <xref linkend="alsa"/></entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/rc3.xml
===================================================================
--- appendices/symlinks/rc3.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc3.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,76 @@
+<sect2>
+
+<title>rc3.d</title>
+
+<table frame="none">
+<title>rc3.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>S10</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Start system and kernel logging: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S20</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Start networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S25</entry>
+<entry>random</entry>
+<entry><filename>../init.d/random</filename></entry>
+<entry>Restore random seed: <xref linkend="postlfs-config-random"/></entry>
+</row>
+
+<row>
+<entry>S30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Start Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>S35</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Start Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>S40</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Start up sound system: <xref linkend="alsa"/></entry>
+</row>
+
+<row>
+<entry>S70</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Start the General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/rc4.xml
===================================================================
--- appendices/symlinks/rc4.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc4.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,76 @@
+<sect2>
+
+<title>rc4.d</title>
+
+<table frame="none">
+<title>rc4.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>S10</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Start system and kernel logging: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S20</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Start networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S25</entry>
+<entry>random</entry>
+<entry><filename>../init.d/random</filename></entry>
+<entry>Restore random seed: <xref linkend="postlfs-config-random"/></entry>
+</row>
+
+<row>
+<entry>S30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Start Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>S35</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Start Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>S40</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Start up sound system: <xref linkend="alsa"/></entry>
+</row>
+
+<row>
+<entry>S70</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Start the General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/rc5.xml
===================================================================
--- appendices/symlinks/rc5.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc5.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,76 @@
+<sect2>
+
+<title>rc5.d</title>
+
+<table frame="none">
+<title>rc5.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>S10</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Start system and kernel logging: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S20</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Start networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>S25</entry>
+<entry>random</entry>
+<entry><filename>../init.d/random</filename></entry>
+<entry>Restore random seed: <xref linkend="postlfs-config-random"/></entry>
+</row>
+
+<row>
+<entry>S30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Start Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>S35</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Start Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>S40</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Start up sound system: <xref linkend="alsa"/></entry>
+</row>
+
+<row>
+<entry>S70</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Start the General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/rc6.xml
===================================================================
--- appendices/symlinks/rc6.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/rc6.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,111 @@
+<sect2>
+
+<title>rc6.d</title>
+
+<table frame="none">
+<title>rc6.d symlinks</title>
+
+<tgroup cols="4">
+<colspec colnum="1" colwidth="1*" align="left"/>
+<colspec colnum="2" colwidth="7*" align="left"/>
+<colspec colnum="3" colwidth="21*" align="left"/>
+<colspec colnum="4" colwidth="30*" align="left"/>
+
+<tbody>
+
+<row>
+<entry><emphasis>Number</emphasis></entry>
+<entry><emphasis>Title</emphasis></entry>
+<entry><emphasis>Link</emphasis></entry>
+<entry><emphasis>Explanation</emphasis></entry>
+</row>
+
+<row>
+<entry>K10</entry>
+<entry>gpm</entry>
+<entry><filename>../init.d/gpm</filename></entry>
+<entry>Shut down General Purpose Mouse Daemon: <xref linkend="gpm"/></entry>
+</row>
+
+<row>
+<entry>K25</entry>
+<entry>postfix</entry>
+<entry><filename>../init.d/postfix</filename></entry>
+<entry>Shut down Postfix MTA: <xref linkend="postfix"/></entry>
+</row>
+
+<row>
+<entry>K30</entry>
+<entry>sshd</entry>
+<entry><filename>../init.d/sshd</filename></entry>
+<entry>Shut down Secure Shell Daemon: <xref linkend="openssh"/></entry>
+</row>
+
+<row>
+<entry>K35</entry>
+<entry>alsa</entry>
+<entry><filename>../init.d/alsa</filename></entry>
+<entry>Save volume settings: <xref linkend="alsa"/></entry>
+</row>
+
+<row>
+<entry>K40</entry>
+<entry>sysklogd</entry>
+<entry><filename>../init.d/sysklogd</filename></entry>
+<entry>Stop system and kernel logging: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K45</entry>
+<entry>random</entry>
+<entry><filename>../init.d/random</filename></entry>
+<entry>Save random seed: <xref linkend="postlfs-config-random"/></entry>
+</row>
+
+<row>
+<entry>K50</entry>
+<entry>sendsignals</entry>
+<entry><filename>../init.d/sendsignals</filename></entry>
+<entry>Kill processes: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K60</entry>
+<entry>mountfs</entry>
+<entry><filename>../init.d/mountfs</filename></entry>
+<entry>Unmount all filesystems: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K70</entry>
+<entry>swap</entry>
+<entry><filename>../init.d/swap</filename></entry>
+<entry>Turn off swap: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K80</entry>
+<entry>network</entry>
+<entry><filename>../init.d/network</filename></entry>
+<entry>Shut down networking: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K90</entry>
+<entry>localnet</entry>
+<entry><filename>../init.d/localnet</filename></entry>
+<entry>Remove loopback interface: Part of LFS base.</entry>
+</row>
+
+<row>
+<entry>K99</entry>
+<entry>reboot</entry>
+<entry><filename>../init.d/halt</filename></entry>
+<entry>Reboot system: Part of LFS base.</entry>
+</row>
+
+</tbody>
+</tgroup>
+</table>
+
+</sect2>
Index: appendices/symlinks/symlinks.xml
===================================================================
--- appendices/symlinks/symlinks.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ appendices/symlinks/symlinks.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<appendix id="appendices-symlinks">
+<?dbhtml filename="symlinks.html" dir="appendices"?>
+<title>List of symlinks</title>
+
+<sect1 id="appendices-symlinks-main">
+<?dbhtml filename="links.html" dir="appendices"?>
+<title>List of rc?.d symlinks used in LFS/BLFS</title>
+
+<para>This page lists all of the symlinks used by the lfs-bootscripts
+package (correct as of version <userinput>1.9</userinput>) and all of
+the scripts in the BLFS book.  This is for two reasons:  first, so that
+you can see at a glance which number we have used for each package, and
+second so that <emphasis>we</emphasis> can see which number we have
+used for each package!  Without this, it would make our lives more
+difficult (as we'd probably end up with conflicts).</para>
+
+<para>It should go without saying that this is <emphasis>not</emphasis>
+the only (or some would argue even optimal) setup for the symlinks.  In
+the LFS tradition, you should find what suits <emphasis>you</emphasis>
+and use that; our recommendations are only a template.</para>
+
+&appendices-symlinks-rc0;
+&appendices-symlinks-rc1;
+&appendices-symlinks-rc2;
+&appendices-symlinks-rc3;
+&appendices-symlinks-rc4;
+&appendices-symlinks-rc5;
+&appendices-symlinks-rc6;
+
+</sect1>
+
+</appendix>
Index: chive/DeviceKit.xml
===================================================================
--- archive/DeviceKit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 DeviceKit-download-http "http://hal.freedesktop.org/releases/DeviceKit-&DeviceKit-version;.tar.gz">
-  <!ENTITY DeviceKit-download-ftp  " ">
-  <!ENTITY DeviceKit-md5sum        "8b311547f4a2c8c6b6598e3318d66cd7">
-  <!ENTITY DeviceKit-size          "375 KB">
-  <!ENTITY DeviceKit-buildsize     "3 MB">
-  <!ENTITY DeviceKit-time          "0.1 SBU">
-]>
-
-<sect1 id="DeviceKit" xreflabel="DeviceKit-&DeviceKit-version;">
-  <?dbhtml filename="DeviceKit.html"?>
-
-
-  <title>DeviceKit-&DeviceKit-version;</title>
-
-  <indexterm zone="DeviceKit">
-    <primary sortas="a-DeviceKit">DeviceKit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DeviceKit</title>
-
-    <para>The <application>DeviceKit</application> is a modular HAL designed for
-    use in Linux systems that is designed to simplify device management and
-    replace the current monolithic Linux <application>HAL</application>.
-    DeviceKit includes the ability to enumerate system devices and send
-    notifications when hardware is added or removed from the computer
-    system.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&DeviceKit-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&DeviceKit-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &DeviceKit-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &DeviceKit-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &DeviceKit-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &DeviceKit-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DeviceKit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/> and
-    <xref linkend="docbook-xsl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/DeviceKit"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DeviceKit</title>
-
-    <para>Install <application>DeviceKit</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/DeviceKit &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>devkit and devkit-daemon</seg>
-        <seg>libdevkit-gobject.{so,a}</seg>
-        <seg>/usr/{include/DeviceKit/devkit-gobject,lib/DeviceKit},
-        /var/run/devkit</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="devkit">
-        <term><command>devkit</command></term>
-        <listitem>
-          <para>is a simple command line client for the
-          <application>DeviceKit</application> daemon.</para>
-          <indexterm zone="DeviceKit devkit">
-            <primary sortas="b-devkit">devkit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="devkit-daemon">
-        <term><command>devkit-daemon</command></term>
-        <listitem>
-          <para>provides the org.freedesktop.DeviceKit service on the system
-          message bus.</para>
-          <indexterm zone="DeviceKit devkit-daemon">
-            <primary sortas="b-devkit-daemon">devkit-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdevkit-gobject">
-        <term><filename class='libraryfile'>libdevkit-gobject.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>DeviceKit</application> API
-          functions.</para>
-          <indexterm zone="DeviceKit libdevkit-gobject">
-            <primary sortas="c-libdevkit-gobject">libdevkit-gobject.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/a2ps.xml
===================================================================
--- archive/a2ps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,415 +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 a2ps-download-http "&gnu-http;/a2ps/a2ps-&a2ps-version;.tar.gz">
-  <!ENTITY a2ps-download-ftp  "&gnu-ftp;/a2ps/a2ps-&a2ps-version;.tar.gz">
-  <!ENTITY a2ps-md5sum        "781ac3d9b213fa3e1ed0d79f986dc8c7">
-  <!ENTITY a2ps-size          "2.6 MB">
-  <!ENTITY a2ps-buildsize     "22 MB">
-  <!ENTITY a2ps-time          "0.3 SBU">
-
-  <!ENTITY i18n-fonts-version "0.1">
-]>
-
-<sect1 id="a2ps" xreflabel="a2ps-&a2ps-version;">
-  <?dbhtml filename="a2ps.html"?>
-
-
-  <title>a2ps-&a2ps-version;</title>
-
-  <indexterm zone="a2ps">
-    <primary sortas="a-a2ps">a2ps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to a2ps</title>
-
-    <para>
-      <application>a2ps</application> is a filter utilized mainly
-      in the background and primarily by printing scripts to convert almost
-      every input format into PostScript output. The application's name
-      expands appropriately to <quote>all to PostScript</quote>.
-    </para>
-
-    &lfs91_checked;
-
-    <caution>
-      <para>
-        <application>a2ps</application> cannot convert UTF-8 encoded
-        text to PostScript. The issue is discussed in detail in the
-        <xref linkend="locale-not-valid-option"/> section of the
-        <xref linkend="locale-issues"/> page.
-        The solution is to use <xref linkend="paps"/> instead of
-        <application>a2ps</application> for converting
-        UTF-8 encoded text to PostScript.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&a2ps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&a2ps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &a2ps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &a2ps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &a2ps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &a2ps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          International fonts: <ulink url=
-            "&sources-anduin-http;/i18n-fonts/i18n-fonts-&i18n-fonts-version;.tar.bz2"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">a2ps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="psutils"/>, and
-      <xref linkend="cups"/>
-      (otherwise, <application>a2ps</application> will use the
-      <command>cat &gt;/dev/lp0</command> command instead of <command>lpr</command>
-      for sending its output to the printer)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      <xref linkend="x-window-system"/>,
-      <ulink url="http://www.adobe.com/products/acrobat/readstep2.html">Adobe Reader</ulink>, and
-      <ulink url="http://www.gnu.org/software/ghostview/ghostview.html">Ghostview</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/A2PS"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of a2ps</title>
-
-    <para>
-      Install <application>a2ps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoconf &amp;&amp;
-sed -i -e "s/GPERF --version |/&amp; head -n 1 |/" \
-       -e "s|/usr/local/share|/usr/share|" configure &amp;&amp;
-
-./configure --prefix=/usr  \
-    --sysconfdir=/etc/a2ps \
-    --enable-shared        \
-    --with-medium=letter   &amp;&amp;
-make                       &amp;&amp;
-touch doc/*.info</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      The <filename>printers.tst</filename> test will fail, as there is no
-      default test printer.  The <filename>styles.tst</filename> may also
-      fail, as the tests report some inconsistencies between the generated
-      postscript and the reference sets.  This is caused by version number
-      differences between the postscript test files and those generated by
-      the tests &mdash; these do not affect the operation of the program
-      and can be ignored.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If desired, install the downloaded i18n-fonts by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>tar -xf ../i18n-fonts-&i18n-fonts-version;.tar.bz2 &amp;&amp;
-cp -v i18n-fonts-&i18n-fonts-version;/fonts/* /usr/share/a2ps/fonts               &amp;&amp;
-cp -v i18n-fonts-&i18n-fonts-version;/afm/* /usr/share/a2ps/afm                   &amp;&amp;
-pushd /usr/share/a2ps/afm    &amp;&amp;
-  ./make_fonts_map.sh        &amp;&amp;
-  mv fonts.map.new fonts.map &amp;&amp;
-popd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>autoconf</command>: This command is used to recreate the
-      <command>configure</command> script. This is required because there is
-      an issue in the mktime test which causes the
-      <command>configure</command> script to hang for 60 seconds and then
-      report that there is no working mktime function.
-    </para>
-
-    <para>
-      <command>sed -i "s/GPERF --version |/&amp; head -n 1 |/" configure</command>:
-      This fixes a bug in the handling of the version output of
-      <command>gperf</command>.
-    </para>
-
-    <para>
-      <command>sed -i "s|/usr/local/share|/usr/share|" configure</command>:
-      This command modifies the <command>configure</command> script to search
-      for <application>Ghostscript</application> fonts at the location where
-      they were installed by the BLFS instructions.
-    </para>
-
-    <para>
-      <parameter>--sysconfdir=/etc/a2ps</parameter>: Configuration data is
-      installed in <filename class="directory">/etc/a2ps</filename> instead of
-      <filename class="directory">/usr/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch enables building
-      the dynamic <filename class='libraryfile'>liba2ps</filename> library.
-    </para>
-
-    <para>
-      <parameter>--with-medium=letter</parameter>: This switch changes the
-      default paper format to US letter. It can either be given here or set
-      in <filename>/etc/a2ps/a2ps-site.cfg</filename> after installation. The
-      default is A4, but there are several other options, in particular: A4dj
-      or letterdj are good settings for HP Deskjet and other printers that need
-      wider paper-handling margins. See <filename>/etc/a2ps/a2ps.cfg</filename>
-      after installation.
-    </para>
-
-    <para>
-      <command>touch doc/*.info</command>: This command avoids trying to
-      regenerate the info files. This is an older package and the current
-      <filename class="extension">.texi</filename> files will produce errors
-      preventing <command>make install</command> from working properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring a2ps</title>
-
-    <sect3 id="a2ps-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/a2ps/a2ps.cfg</filename> and
-        <filename>/etc/a2ps/a2ps-site.cfg</filename>
-      </para>
-
-      <indexterm zone="a2ps a2ps-config">
-        <primary sortas="e-etc-a2ps-a2ps.cfg">/etc/a2ps/a2ps.cfg</primary>
-      </indexterm>
-
-      <indexterm zone="a2ps a2ps-config">
-        <primary sortas="e-etc-a2ps-a2ps-site.cfg">/etc/a2ps/a2ps-site.cfg</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Information about configuring <application>a2ps</application>
-        can be found in the comments contained in the above files, and also
-        by running <command>info a2ps</command>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>a2ps, card, composeglyphs, fixnt, fixps, ogonkify,
-        pdiff, psmandup, psset, and texi2dvi4a2ps</seg>
-        <seg>liba2ps.{so,a} and filter data</seg>
-        <seg>/etc/a2ps and /usr/share/a2ps</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a2ps-prog">
-        <term><command>a2ps</command></term>
-        <listitem>
-          <para>
-            is a filter, utilized primarily by printing scripts,
-            that converts standard input or supported files to PostScript.
-          </para>
-          <indexterm zone="a2ps a2ps-prog">
-            <primary sortas="b-a2ps">a2ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="card">
-        <term><command>card</command></term>
-        <listitem>
-          <para>
-            prints a reference card of a given program's options.
-          </para>
-          <indexterm zone="a2ps card">
-            <primary sortas="b-card">card</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="composeglyphs">
-        <term><command>composeglyphs</command></term>
-        <listitem>
-          <para>
-            creates a composite font program.
-          </para>
-          <indexterm zone="a2ps composeglyphs">
-            <primary sortas="b-composeglyphs">composeglyphs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fixnt">
-        <term><command>fixnt</command></term>
-        <listitem>
-          <para>
-            is supposed to fix the problems in the PostScript files
-            generated by the Microsoft PostScript driver under Windows NT
-            (3.5 and 4.0).
-          </para>
-          <indexterm zone="a2ps fixnt">
-            <primary sortas="b-fixnt">fixnt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fixps">
-        <term><command>fixps</command></term>
-        <listitem>
-          <para>
-            tries to fix common PostScript problems that break
-            postprocessing.
-          </para>
-          <indexterm zone="a2ps fixps">
-            <primary sortas="b-fixps">fixps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ogonkify">
-        <term><command>ogonkify</command></term>
-        <listitem>
-          <para>
-            provides international support for Postscript by performing various
-            munging of PostScript files related to printing in different
-            languages.
-          </para>
-          <indexterm zone="a2ps ogonkify">
-            <primary sortas="b-ogonkify">ogonkify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdiff">
-        <term><command>pdiff</command></term>
-        <listitem>
-          <para>
-            produces a pretty comparison between files.
-          </para>
-          <indexterm zone="a2ps pdiff">
-            <primary sortas="b-pdiff">pdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psmandup">
-        <term><command>psmandup</command></term>
-        <listitem>
-          <para>
-            tries to produce a version of a given PostScript file to
-            print in manual duplex.
-          </para>
-          <indexterm zone="a2ps psmandup">
-            <primary sortas="b-psmandup">psmandup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psset">
-        <term><command>psset</command></term>
-        <listitem>
-          <para>
-            produces a version of a given PostScript file with a
-            protected call to the PostScript operator 'setpagedevice'.
-            Typical use is making a file print duplex, or on the manual
-            tray, etc.
-          </para>
-          <indexterm zone="a2ps psset">
-            <primary sortas="b-psset">psset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texi2dvi4a2ps">
-        <term><command>texi2dvi4a2ps</command></term>
-        <listitem>
-          <para>
-            compiles Texinfo and LaTeX files to DVI or PDF.
-          </para>
-          <indexterm zone="a2ps texi2dvi4a2ps">
-            <primary sortas="b-texi2dvi4a2ps">texi2dvi4a2ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/accountsservice.xml
===================================================================
--- archive/accountsservice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,197 +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 accountsservice-download-http
-           "http://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
-  <!ENTITY accountsservice-download-ftp  " ">
-  <!ENTITY accountsservice-md5sum        "dbf4323b688a314b4bf76890ad6d5279">
-  <!ENTITY accountsservice-size          "352 KB">
-  <!ENTITY accountsservice-buildsize     "12 MB">
-  <!ENTITY accountsservice-time          "0.1 SBU">
-]>
-
-<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;">
-  <?dbhtml filename="accountsservice.html"?>
-
-
-  <title>AccountsService-&accountsservice-version;</title>
-
-  <indexterm zone="accountsservice">
-    <primary sortas="a-AccountsService">AccountsService</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AccountsService</title>
-
-    <para>
-      The <application>AccountsService</application> package provides a set
-      of <application>D-Bus</application> interfaces for querying and manipulating
-      user account information and an implementation of these interfaces based on
-      the usermod(8), useradd(8) and userdel(8) commands.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&accountsservice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&accountsservice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &accountsservice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &accountsservice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &accountsservice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &accountsservice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AccountsService Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxslt"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/accountsservice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AccountsService</title>
-
-    <para>
-      Install <application>AccountsService</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --localstatedir=/var     \
-            --enable-admin-group=adm \
-            --disable-static         \
-            --libexecdir=/usr/lib/accountsservice &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-admin-group=adm</parameter>: This switch sets
-      group for administrator accounts.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accounts-daemon
-        </seg>
-        <seg>
-          libaccountsservice.so
-        </seg>
-        <seg>
-          /usr/include/accountsservice-1.0,
-          /usr/lib/accountsservice,
-          /usr/share/gtk-doc/html/libaccountsservice, and
-          /var/lib/AccountsService
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accounts-daemon">
-        <term><command>accounts-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>AccountsService</application> daemon.
-          </para>
-          <indexterm zone="accountsservice accounts-daemon">
-            <primary sortas="b-accounts-daemon">accounts-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaccountsservice">
-        <term><filename class="libraryfile">libaccountsservice.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>AccountsService</application> API functions.
-          </para>
-          <indexterm zone="accountsservice libaccountsservice">
-            <primary sortas="c-libaccountsservice">libaccountsservice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/acl.xml
===================================================================
--- archive/acl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,223 +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 acl-download-http "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
-  <!ENTITY acl-download-ftp  " ">
-  <!ENTITY acl-md5sum        "a61415312426e9c2212bd7dc7929abda">
-  <!ENTITY acl-size          "384 KB">
-  <!ENTITY acl-buildsize     "9.1 MB">
-  <!ENTITY acl-time          "0.1 SBU">
-]>
-
-<sect1 id="acl" xreflabel="acl-&acl-version;">
-  <?dbhtml filename="acl.html"?>
-
-
-  <title>acl-&acl-version;</title>
-
-  <indexterm zone="acl">
-    <primary sortas="a-acl">acl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to acl</title>
-
-    <para>The <application>acl</application> package contains utilities to
-    administer Access Control Lists, which are used to define more fine-grained
-    discretionary access rights for files and directories.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&acl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&acl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &acl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &acl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &acl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &acl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">acl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="attr"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/acl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of acl</title>
-
-    <para>Install <application>acl</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' \
-     include/builddefs.in &amp;&amp;
-
-INSTALL_USER=root  \
-INSTALL_GROUP=root \
-./configure --prefix=/usr --libexecdir=/usr/lib --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>For meaningful results, the tests need to be carried out on a file
-    system that supports extended attributes. It is also required that
-    <application>Coreutils</application> is re-installed after
-    <application>acl</application> is installed so that the extra acl bit
-    displays correctly on a <command>ls</command> command.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- Package uses DIST_ROOT instead of DESTDIR -->
-<screen role="root"><userinput>make install install-dev install-lib             &amp;&amp;
-chmod -v 755 /usr/lib/libacl.so                  &amp;&amp;
-mv -v /usr/lib/libacl.so.* /lib                  &amp;&amp;
-ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so &amp;&amp;
-install -v -m644 doc/*.txt /usr/share/doc/acl-&acl-version;</userinput></screen>
-
-    <para>You should now re-install <application><ulink
-    url="&lfs-root;/chapter06/coreutils.html">Coreutils</ulink>
-    </application> and proceed to run the test suite.</para>
-
-    <para>There are three sets of tests that come with this package. The local
-    partition where the tests are run must be mounted with acl configured as
-    described below.  Additionally, the users <systemitem
-    class="username">bin</systemitem> and <systemitem
-    class="username">daemon</systemitem> must be created or modified to have a
-    proper shell and home directory and the group <systemitem
-    class="groupname">daemon</systemitem> must be a member of the <systemitem
-    class="groupname">bin</systemitem> group.  The kernel must also be
-    configured with the appropriate ACL options (there are nine different
-    options).</para>
-
-    <para>To run the standard tests run <command>make tests </command>.  As
-    <systemitem class="username">root</systemitem> user, run <command>make
-    root-tests</command>.</para>
-
-    <para>The third set of tests are Network File System (NFS) specific.  See
-    the contents of the test files in the test/nfs/ directory for the setup
-    requirements.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ... include/builddefs.in</command>: This command
-    modifies the documentation directory so that it is a versioned
-    directory.</para>
-
-    <para><command>--libexecdir=/usr/lib</command>: This switch ensures that
-    <filename class="libraryfile">libacl.la</filename> is installed in the correct
-    directory, and that a spurious
-    <filename class="libraryfile">libacl.so</filename> symlink is not created in
-    <filename class="directory">/usr/libexec/</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring acl</title>
-    <sect3><title>Configuration Information</title>
-
-      <para>There is no configuration to <application>acl</application> itself,
-      but to get any use out of <application>acl</application>, a filesystem
-      needs to support access control lists.</para>
-
-      <para>One way to achieve this is to add the acl option to an ext3
-      filesystem in the <filename>/etc/fstab</filename> file as shown
-      below:</para>
-
-<screen># file system  mount-point  type   options                 dump  fsck
-#                                                                order
-
-/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>chacl, getfacl, and setfacl</seg>
-        <seg>libacl.{so,a}</seg>
-        <seg>/usr/{include/acl,share/doc/acl-&acl-version;}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chacl">
-        <term><command>chacl</command></term>
-        <listitem>
-          <para>changes the access control list of a file or directory.</para>
-          <indexterm zone="acl chacl">
-            <primary sortas="b-chacl">chacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfacl">
-        <term><command>getfacl</command></term>
-        <listitem>
-          <para>gets file access control lists.</para>
-          <indexterm zone="acl getfacl">
-            <primary sortas="b-getfacl">getfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfacl">
-        <term><command>setfacl</command></term>
-        <listitem>
-          <para>sets file access control lists.</para>
-          <indexterm zone="acl setfacl">
-            <primary sortas="b-setfacl">setfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libacl">
-        <term><filename class='libraryfile'>libacl.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>acl</application> API functions.</para>
-          <indexterm zone="acl libacl">
-            <primary sortas="c-libacl">libacl.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/add-pkgs.xml
===================================================================
--- archive/add/add-pkgs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,75 +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="kde-add-pkgs" xreflabel="Further KDE4 packages">
-  <?dbhtml filename="add-pkgs.html"?>
-
-
-  <title>Further KDE4 packages</title>
-
-  <para>This section did not provide instructions for all of the available
-  packages in the KDE4 Software Compilation. The included packages were selected
-  based on what most people would want to use on a standard desktop computer.</para>
-
-  <para>For a full list of available packages, have a look on the KDE4 servers at
-  <ulink url="&kde-download-http;applications/&kde-version;/src/">
-              &kde-download-http;applications/&kde-version;/src/</ulink>
-  or <ulink url="&kde-download-ftp;applications/&kde-apps-version;/src/">
-                 &kde-download-ftp;applications/&kde-apps-version;/src/</ulink>.</para>
-
-  <note><para>Some packages, such as konsole, kate, and gwenview listed in the
-  links above are only for the new KDE Frameworks 5 and cannot be used
-  with KDE4.</para></note>
-
-  <para>Some additional packages worth mentioning are:</para>
-
-      <itemizedlist>
-         <listitem>
-          <para>Kdeartwork: Collection of wallpapers, icon themes, screensavers, widget styles etc.</para>
-        </listitem>
-        <listitem>
-          <para>Juk: A lightweight music player.</para>
-        </listitem>
-        <listitem>
-          <para>Dragon: A video player.</para>
-        </listitem>
-        <listitem>
-          <para>Kcalc: A scientific calculator.</para>
-        </listitem>
-        <listitem>
-          <para>PyKDE4: Python bindings.</para>
-        </listitem>
-        <listitem>
-          <para>Kaccessible: Accessibility utilities.</para>
-        </listitem>
-        <listitem>
-          <para>Kwalletmanager: Credentials management application.</para>
-        </listitem>
-        <listitem>
-          <para>Marble: A global map program.</para>
-        </listitem>
-        <listitem id="audiocd-kio" xreflabel="audiocd-kio">
-          <para>audiocd-kio: A library to access CD-ROM audio files.</para>
-        </listitem>
-        <listitem id="libkcompactdisk" xreflabel="libkcompactdisc">
-          <para>libkcompactdisc: A library to control CD-ROM drives.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>Most of these packages can be built with the standard KDE4 instructions:</para>
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-<para>And as the <systemitem class="username">root</systemitem> user:</para>
-<screen role="root"><userinput>make install</userinput></screen>
-
-</sect1>
Index: chive/add/add.xml
===================================================================
--- archive/add/add.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kde-add">
-  <?dbhtml filename="add.html"?>
-
-  <title>KDE4 Additional Packages</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konsole.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ark.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmix.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkcddb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim-runtime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeplasma-addons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="okular.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkdcraw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gwenview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add-pkgs.xml"/>
-</chapter>
Index: chive/add/ark.xml
===================================================================
--- archive/add/ark.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +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 ark-download-http "&kde-download-attic;/&ark-version;/src/ark-&ark-version;.tar.xz">
-  <!ENTITY ark-download-ftp  " ">
-  <!ENTITY ark-md5sum        "e262d982aa4ce30da47a416d76c0c96e">
-  <!ENTITY ark-size          "236 KB">
-  <!ENTITY ark-buildsize     "10.1 MB">
-  <!ENTITY ark-time          "0.4 SBU">
-]>
-
-<sect1 id="ark" xreflabel="ark-&ark-version;">
-  <?dbhtml filename="ark.html"?>
-
-
-  <title>Ark-&ark-version;</title>
-
-  <indexterm zone="ark">
-    <primary sortas="a-ark">ark</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ark</title>
-
-    <para>This package provides an archiving utility for KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ark-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ark-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ark-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ark-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ark-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ark-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ark Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kde-baseapps"/> and
-    <xref linkend="libarchive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qjson"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ark"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ark</title>
-
-    <para>Install <application>Ark</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <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>ark</seg>
-        <seg>libkerfuffle.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ark-prog">
-        <term><command>ark</command></term>
-        <listitem>
-          <para>is the KDE archiving utility.</para>
-          <indexterm zone="ark ark-prog">
-            <primary sortas="b-ark">ark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/gwenview.xml
===================================================================
--- archive/add/gwenview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +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 gwenview-download-http "&kde-download-http;&kde-old-version;/src/gwenview-&kde-old-version;.tar.xz">
-  <!ENTITY gwenview-download-ftp  " ">
-  <!ENTITY gwenview-md5sum        "a609256023f7b6e786fe7728ba299544">
-  <!ENTITY gwenview-size          "2.8 MB">
-  <!ENTITY gwenview-buildsize     "32 MB">
-  <!ENTITY gwenview-time          "1.2 SBU">
-]>
-
-<sect1 id="gwenview" xreflabel="gwenview-&kde-old-version;">
-  <?dbhtml filename="gwenview.html"?>
-
-
-  <title>Gwenview-&kde-old-version;</title>
-
-  <indexterm zone="gwenview">
-    <primary sortas="a-gwenview">gwenview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gwenview</title>
-
-    <para>Gwenview is a fast and easy-to-use image viewer for KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gwenview-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gwenview-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gwenview-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gwenview-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gwenview-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gwenview-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/gwenview-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Gwenview Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-       <xref linkend="libkdcraw"/> and
-       <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-      <para role="recommended">
-      <xref linkend="kactivities"/>,
-      <xref linkend="kde-baseapps"/>,
-      <xref linkend="libkexiv2"/>, and
-      <xref linkend="libjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lcms2"/> and
-      <ulink url="http://kde-apps.org/content/show.php/Kipi-Plugins?content=16061">
-      Kipi-Plugins</ulink> (a collection of image manipulation plugins)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gwenview"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gwenview</title>
-
-    <para>Install <application>Gwenview</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gwenview and gwenview_importer</seg>
-        <seg>libgwenviewlib.so and gvpart.so</seg>
-        <seg>several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gwenview-prog">
-        <term><command>gwenview</command></term>
-        <listitem>
-          <para>is the KDE image viewer.</para>
-          <indexterm zone="gwenview gwenview-prog">
-            <primary sortas="b-gwenview">gwenview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gwenview_importer">
-        <term><command>gwenview_importer</command></term>
-        <listitem>
-          <para>
-            is a tool to download photos with <command>gwenview</command>.
-          </para>
-          <indexterm zone="gwenview gwenview_importer">
-            <primary sortas="b-gwenview_importer">gwenview_importer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/kate.xml
===================================================================
--- archive/add/kate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,169 +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 kate-download-http "&kde-download-http;&kde-old-version;/src/kate-&kde-old-version;.tar.xz">
-  <!ENTITY kate-download-ftp  " ">
-  <!ENTITY kate-md5sum        "bf7e13e6454de354ff6b4f1905179311">
-  <!ENTITY kate-size          "1.4 MB">
-  <!ENTITY kate-buildsize     "36 MB">
-  <!ENTITY kate-time          "3.0 SBU">
-]>
-
-<sect1 id="kate" xreflabel="kate-&kde-old-version;">
-  <?dbhtml filename="kate.html"?>
-
-
-  <title>Kate-&kde-old-version;</title>
-
-  <indexterm zone="kate">
-    <primary sortas="a-kate">kate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kate</title>
-
-    <para>This package provides two text editors: Kate and KWrite. Kate is a
-    powerful programmer's text editor with syntax highlighting for many
-    programming and scripting languages. KWrite is the lightweight cousin of
-    Kate.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kate-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kate-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kate-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kate-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kate-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kate-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kate-&kdeutils-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="kactivities"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qjson"/> and
-      <ulink url="&kde-download-http;&kde-old-version;/src/">PyKDE4</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kate"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kate</title>
-
-    <para>Install <application>Kate</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
-      -Wno-dev .. &amp;&amp;
-make</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><option>-DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE</option>: This option is
-    set to install the KDE Python objects in the correct place.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kate and kwrite</seg>
-        <seg>libkateinterfaces.so, libkatepartinterfaces.so,
-        libkdeinit4_kate.so, libkdeinit4_kwrite.so and several in
-        &kde-dir;/lib/kde4</seg>
-        <seg>&kde-dir;/include/kate and several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kate-prog">
-        <term><command>kate</command></term>
-        <listitem>
-          <para>is the KDE text editor.</para>
-          <indexterm zone="kate kate-prog">
-            <primary sortas="b-kate">kate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwrite">
-        <term><command>kwrite</command></term>
-        <listitem>
-          <para>
-            is a text editor for KDE, that is a light version of
-            <command>kate</command>.
-          </para>
-          <indexterm zone="kate kwrite">
-            <primary sortas="b-kwrite">kwrite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/kdepim-runtime.xml
===================================================================
--- archive/add/kdepim-runtime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,256 +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 kdepim-runtime-download-http "&kde-download-attic;/15.04.3/src/kdepim-runtime-&kdepim-version;.tar.xz">
-  <!ENTITY kdepim-runtime-download-ftp  " ">
-  <!ENTITY kdepim-runtime-md5sum        "7dd2063acf9b6920920d0118f5576db6">
-  <!ENTITY kdepim-runtime-size          "1.1 MB">
-  <!ENTITY kdepim-runtime-buildsize     "126 MB">
-  <!ENTITY kdepim-runtime-time          "7.4 SBU">
-]>
-
-<sect1 id="kdepim-runtime" xreflabel="kdepim-runtime-&kdepim-version;">
-  <?dbhtml filename="kdepim-runtime.html"?>
-
-
-  <title>Kdepim-runtime-&kdepim-version;</title>
-
-  <indexterm zone="kdepim-runtime">
-    <primary sortas="a-kdepim-runtime">kdepim-runtime</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdepim-runtime</title>
-
-    <para>This package provides additional resources for <application>Akonadi</application>.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdepim-runtime-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdepim-runtime-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdepim-runtime-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdepim-runtime-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdepim-runtime-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdepim-runtime-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdepim-runtime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdepimlibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="http://git.kolab.org">KolabLibraries</ulink> (for Kolab Groupware Resource),
-    <ulink url="http://projects.kde.org/libkgapi">libKGAPI</ulink> (to access Google services), and
-    <ulink url="http://projects.kde.org/libkfbapi">libKFbAPI</ulink> (to access Facebook services)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdepim-runtime"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdepim-runtime</title>
-
-    <para>Install <application>Kdepim-runtime</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>accountwizard, akonadi_nepomuk_feeder, akonadi_*_agent,
-        akonadi_*_resource, akonaditray, gidmigrator,
-        kaddressbookmigrator, kjotsmigrator, kmail-migrator,
-        knotes-migrator, and kres-migrator</seg>
-        <seg>libakonadi-xml.so, libkdepim-copy.so, libkmindexreader.so,
-        libmaildir.so, and several in &kde-dir;/lib/kde4</seg>
-        <seg>several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="accountwizard">
-        <term><command>accountwizard</command></term>
-        <listitem>
-          <para>
-             is a tool to create an email account.
-          </para>
-          <indexterm zone="kdepim-runtime accountwizard">
-            <primary sortas="b-accountwizard">accountwizard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-     <varlistentry id="akonadi_nepomuk_feeder">
-        <term><command>akonadi_nepomuk_feeder</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim-runtime akonadi_nepomuk_feeder">
-            <primary sortas="b-akonadi_nepomuk_feeder">akonadi_nepomuk_feeder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akonadi_*_agent">
-        <term><command>akonadi_*_agent</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim-runtime akonadi_*_agent">
-            <primary sortas="b-akonadi_*_agent">akonadi_*_agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="akonadi_*_resource">
-        <term><command>akonadi_*_resource</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim-runtime akonadi_*_resource">
-            <primary sortas="b-akonadi_*_resource">akonadi_*_resource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="akonaditray">
-        <term><command>akonaditray</command></term>
-        <listitem>
-          <para>
-             launch the account wizard to configure PIM accounts.
-          </para>
-          <indexterm zone="kdepim-runtime akonaditray">
-            <primary sortas="b-akonaditray">akonaditray</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="gidmigrator">
-        <term><command>gidmigrator</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim-runtime gidmigrator">
-            <primary sortas="b-gidmigrator">gidmigrator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="kaddressbookmigrator">
-        <term><command>kaddressbookmigrator</command></term>
-        <listitem>
-          <para>
-            is a migration tool for the KDE address book.
-          </para>
-          <indexterm zone="kdepim-runtime kaddressbookmigrator">
-            <primary sortas="b-kaddressbookmigrator">kaddressbookmigrator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjotsmigrator">
-        <term><command>kjotsmigrator</command></term>
-        <listitem>
-          <para>
-            is a migration tool for KJots, the KDE note taker.
-          </para>
-          <indexterm zone="kdepim-runtime kjotsmigrator">
-            <primary sortas="b-kjotsmigrator">kjotsmigrator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmail-migrator">
-        <term><command>kmail-migrator</command></term>
-        <listitem>
-          <para>
-            is a migration tool for kmail.
-          </para>
-          <indexterm zone="kdepim-runtime kmail-migrator">
-            <primary sortas="b-kmail-migrator">kmail-migrator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="knotes-migrator">
-        <term><command>knotes-migrator</command></term>
-        <listitem>
-          <para>
-            is a migration tool for knotes.
-          </para>
-          <indexterm zone="kdepim-runtime knotes-migrator">
-            <primary sortas="b-knotes-migrator">knotes-migrator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
- <!--
-      <varlistentry id="kres-migrator">
-        <term><command>kres-migrator</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim-runtime kres-migrator">
-            <primary sortas="b-kres-migrator">kres-migrator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/kdepim.xml
===================================================================
--- archive/add/kdepim.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,676 +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 kdepim-download-http "&kde-download-attic;/15.04.3/src/kdepim-&kdepim-version;.tar.xz">
-  <!ENTITY kdepim-download-ftp  " ">
-  <!ENTITY kdepim-md5sum        "a09c9bd838cd71c16e9993e57653a7ad">
-  <!ENTITY kdepim-size          "13.9 MB">
-  <!ENTITY kdepim-buildsize     "493 MB">
-  <!ENTITY kdepim-time          "28 SBU">
-]>
-
-<sect1 id="kdepim" xreflabel="kdepim-&kdepim-version;">
-  <?dbhtml filename="kdepim.html"?>
-
-
-  <title>Kdepim-&kdepim-version;</title>
-
-  <indexterm zone="kdepim">
-    <primary sortas="a-kdepim">kdepim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdepim</title>
-
-    <para>This package provides several KDE programs for managing
-    personal information. Programs include a contact manager,
-    calendar, mail client, newsreader, X.509 certificate manager
-    and sticky notes.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdepim-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdepim-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdepim-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdepim-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdepim-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdepim-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdepim Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="grantlee"/>, and
-      <xref linkend="kdepim-runtime"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libassuan"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&kde-download-http;&kde-version;/src">nepomuk-widgets</ulink>,
-      <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>,
-      <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>, and
-      <ulink url="http://www.abisource.com/projects/link-grammar/">LinkGrammar</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/kdepim"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdepim</title>
-
-    <para>Install <application>Kdepim</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DSYSCONF_INSTALL_DIR=/etc           \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>akonadi_archivemail_agent, akonadi_followupreminder_agent,
-        akonadi_mailfilter_agent, akonadi_notes_agent, akonadi_sendlater_agent,
-        akonadiconsole, akregator, akregatorstorageexporter,
-        calendarjanitor, contactthemeeditor, headerthemeeditor,
-        ical2vcal, importwizard, kabc2mutt, kabcclient, kaddressbook,
-        kaddressbook-mobile, kalarm, kalarmautostart, karm,
-        kgpgconf, kincidenceeditor, kjotes, kleopatra, kmail, kmail-mobile,
-        kmail_antivir.sh, kmail_clamav.sh, kmail_fprot.sh, kmail_sav.sh,
-        kmailcvt, knode, knotes, konsolekalendar, kontact, korgac, korganizer,
-        korganizer-mobile, ksendemail, ktimetracker, ktnef, kwatchgnupg,
-        mboximporter, notes-mobile, pimsettingexporter, sieveeditor, storageservicemanger,
-        and tasks-mobile</seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="akonadi_archivemail_agent">
-        <term><command>akonadi_archivemail_agent</command></term>
-        <listitem>
-          <para>
-            is an Akonadi agent which allows to archive mail folders automatically.
-          </para>
-          <indexterm zone="kdepim akonadi_archivemail_agent">
-            <primary sortas="b-akonadi_archivemail_agent">akonadi_archivemail_agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akonadi_followupreminder_agent">
-        <term><command>akonadi_followupreminder_agent</command></term>
-        <listitem>
-          <para>
-            is an akonadi agent which follow up reminder mail.
-          </para>
-          <indexterm zone="kdepim akonadi_followupreminder_agent">
-            <primary sortas="b-akonadi_followupreminder_agent">akonadi_followupreminder_agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akonadi_mailfilter_agent">
-        <term><command>akonadi_mailfilter_agent</command></term>
-        <listitem>
-          <para>
-            is an Akonadi agent which allows to filter mails.
-          </para>
-          <indexterm zone="kdepim akonadi_mailfilter_agent">
-            <primary sortas="b-akonadi_mailfilter_agent">akonadi_mailfilter_agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akonadi_notes_agent">
-        <term><command>akonadi_notes_agent</command></term>
-        <listitem>
-          <para>
-            is an Akonadi agent which allows to manage notes.            
-          </para>
-          <indexterm zone="kdepim akonadi_notes_agent">
-            <primary sortas="b-akonadi_notes_agent">akonadi_notes_agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akonadi_sendlater_agent">
-        <term><command>akonadi_sendlater_agent</command></term>
-        <listitem>
-          <para>
-            is an Akonadi agent which allows to send mails later.
-          </para>
-          <indexterm zone="kdepim akonadi_sendlater_agent">
-            <primary sortas="b-akonadi_sendlater_agent">akonadi_sendlater_agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akonadiconsole">
-        <term><command>akonadiconsole</command></term>
-        <listitem>
-          <para>
-            
-          </para>
-          <indexterm zone="kdepim akonadiconsole">
-            <primary sortas="b-akonadiconsole">akonadiconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="akregator">
-        <term><command>akregator</command></term>
-        <listitem>
-          <para>
-            is a feed reader.
-          </para>
-          <indexterm zone="kdepim akregator">
-            <primary sortas="b-akregator">akregator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-     <varlistentry id="akregatorstorageexporter">
-        <term><command>akregatorstorageexporter</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim akregatorstorageexporter">
-            <primary sortas="b-akregatorstorageexporter">akregatorstorageexporter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="calendarjanitor">
-        <term><command>calendarjanitor</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim calendarjanitor">
-            <primary sortas="b-calendarjanitor">calendarjanitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-     <varlistentry id="contactthemeeditor">
-        <term><command>contactthemeeditor</command></term>
-        <listitem>
-          <para>
-            is a contact theme editor for KAddressBook.
-          </para>
-          <indexterm zone="kdepim contactthemeeditor">
-            <primary sortas="b-contactthemeeditor">contactthemeeditor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="headerthemeeditor">
-        <term><command>headerthemeeditor</command></term>
-        <listitem>
-          <para>
-            is an editor for KMail headers.
-          </para>
-          <indexterm zone="kdepim headerthemeeditor">
-            <primary sortas="b-headerthemeeditor">headerthemeeditor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="ical2vcal">
-        <term><command>ical2vcal</command></term>
-        <listitem>
-          <para>
-            is a tool to convert calendars from iCal to Versit
-            vCal format
-          </para>
-          <indexterm zone="kdepim ical2vcal">
-            <primary sortas="b-ical2vcal">ical2vcal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="importwizard">
-        <term><command>importwizard</command></term>
-        <listitem>
-          <para>
-            allows to import emails, settings, addressbook and
-            calendar data in your user account from others mailers.
-          </para>
-          <indexterm zone="kdepim importwizard">
-            <primary sortas="b-importwizard">importwizard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kabc2mutt">
-        <term><command>kabc2mutt</command></term>
-        <listitem>
-          <para>
-            converts the KDE address book's entries to Mutt format.
-          </para>
-          <indexterm zone="kdepim kabc2mutt">
-            <primary sortas="b-kabc2mutt">kabc2mutt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kabcclient">
-        <term><command>kabcclient</command></term>
-        <listitem>
-          <para>
-            allows commandline access to the KDE addressbook.
-          </para>
-          <indexterm zone="kdepim kabcclient">
-            <primary sortas="b-kabcclient">kabcclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kaddressbook">
-        <term><command>kaddressbook</command></term>
-        <listitem>
-          <para>
-            keeps your addresses on file.
-          </para>
-          <indexterm zone="kdepim kaddressbook">
-            <primary sortas="b-kaddressbook">kaddressbook</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kaddressbook-mobile">
-        <term><command>kaddressbook-mobile</command></term>
-        <listitem>
-          <para>
-            is the address book and contact data manager mobile version.
-          </para>
-          <indexterm zone="kdepim kaddressbook-mobile">
-            <primary sortas="b-kaddressbook-mobile">kaddressbook-mobile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kalarm">
-        <term><command>kalarm</command></term>
-        <listitem>
-          <para>
-            is a personal alarm message, command and email scheduler.
-          </para>
-          <indexterm zone="kdepim kalarm">
-            <primary sortas="b-kalarm">kalarm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kalarmautostart">
-        <term><command>kalarmautostart</command></term>
-        <listitem>
-          <para>
-            is a little helper program whose function is to autostart
-            KAlarm at login.
-          </para>
-          <indexterm zone="kdepim kalarmautostart">
-            <primary sortas="b-kalarmautostart">kalarmautostart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="karm">
-        <term><command>karm</command></term>
-        <listitem>
-          <para>
-            tracks time spent on various tasks.
-          </para>
-          <indexterm zone="kdepim karm">
-            <primary sortas="b-karm">karm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-     <varlistentry id="kgpgconf">
-        <term><command>kgpgconf</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim kgpgconf">
-            <primary sortas="b-kgpgconf">kgpgconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kincidenceeditor">
-        <term><command>kincidenceeditor</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim kincidenceeditor">
-            <primary sortas="b-kincidenceeditor">kincidenceeditor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-     <varlistentry id="kjotes">
-        <term><command>kjotes</command></term>
-        <listitem>
-          <para>
-            is a note taker.
-          </para>
-          <indexterm zone="kdepim kjotes">
-            <primary sortas="b-kjotes">kjotes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kleopatra">
-        <term><command>kleopatra</command></term>
-        <listitem>
-          <para>
-            is a KDE key manager.
-          </para>
-          <indexterm zone="kdepim kleopatra">
-            <primary sortas="b-kleopatra">kleopatra</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kmail">
-        <term><command>kmail</command></term>
-        <listitem>
-          <para>
-            is a fully featured emails client.
-          </para>
-          <indexterm zone="kdepim kmail">
-            <primary sortas="b-kmail">kmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kmail-mobile">
-        <term><command>kmail-mobile</command></term>
-        <listitem>
-          <para>
-            is the mobile version of KMail.
-          </para>
-          <indexterm zone="kdepim kmail-mobile">
-            <primary sortas="b-kmail-mobile">kmail-mobile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kmailcvt">
-        <term><command>kmailcvt</command></term>
-        <listitem>
-          <para>
-            provides a frontend to import mail folders into kmail.
-          </para>
-          <indexterm zone="kdepim kmailcvt">
-            <primary sortas="b-kmailcvt">kmailcvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="knode">
-        <term><command>knode</command></term>
-        <listitem>
-          <para>
-            is a KDE news (Usenet) reader.
-          </para>
-          <indexterm zone="kdepim knode">
-            <primary sortas="b-knode">knode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="knotes">
-        <term><command>knotes</command></term>
-        <listitem>
-          <para>
-            is a program that lets you write the computer equivalent
-            of sticky notes.
-          </para>
-          <indexterm zone="kdepim knotes">
-            <primary sortas="b-knotes">knotes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="konsolekalendar">
-        <term><command>konsolekalendar</command></term>
-        <listitem>
-          <para>
-            is a command line interface to KDE calendars.
-          </para>
-          <indexterm zone="kdepim konsolekalendar">
-            <primary sortas="b-konsolekalendar">konsolekalendar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kontact">
-        <term><command>kontact</command></term>
-        <listitem>
-          <para>
-            brings together all the KDE PIM applications under one roof.
-          </para>
-          <indexterm zone="kdepim kontact">
-            <primary sortas="b-kontact">kontact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="korgac">
-        <term><command>korgac</command></term>
-        <listitem>
-          <para>
-            is the reminder daemon for korganizer.
-          </para>
-          <indexterm zone="kdepim korgac">
-            <primary sortas="b-korgac">korgac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="korganizer">
-        <term><command>korganizer</command></term>
-        <listitem>
-          <para>
-            is the KDE Calendar and scheduling.
-          </para>
-          <indexterm zone="kdepim korganizer">
-            <primary sortas="b-korganizer">korganizer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="korganizer-mobile">
-        <term><command>korganizer-mobile</command></term>
-        <listitem>
-          <para>
-            is the mobile version of korganizer.
-          </para>
-          <indexterm zone="kdepim korganizer-mobile">
-            <primary sortas="b-korganizer-mobile">korganizer-mobile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-     <varlistentry id="ksendemail">
-        <term><command>ksendemail</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim ksendemail">
-            <primary sortas="b-ksendemail">ksendemail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-     <varlistentry id="ktimetracker">
-        <term><command>ktimetracker</command></term>
-        <listitem>
-          <para>
-            is a time tracker.
-          </para>
-          <indexterm zone="kdepim ktimetracker">
-            <primary sortas="b-ktimetracker">ktimetracker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="ktnef">
-        <term><command>ktnef</command></term>
-        <listitem>
-          <para>
-            is a viewer for mail attachments using TNEF format.
-          </para>
-          <indexterm zone="kdepim ktnef">
-            <primary sortas="b-ktnef">ktnef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kwatchgnupg">
-        <term><command>kwatchgnupg</command></term>
-        <listitem>
-          <para>
-            is a simple GnuPG log viewer.
-          </para>
-          <indexterm zone="kdepim kwatchgnupg">
-            <primary sortas="b-kwatchgnupg">kwatchgnupg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="mboximporter">
-        <term><command>mboximporter</command></term>
-        <listitem>
-          <para>
-            is a tool that allow to import files using mbox format..
-          </para>
-          <indexterm zone="kdepim mboximporter">
-            <primary sortas="b-mboximporter">mboximporter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="notes-mobile">
-        <term><command>notes-mobile</command></term>
-        <listitem>
-          <para>
-            is the notes application for mobile environments.
-          </para>
-          <indexterm zone="kdepim notes-mobile">
-            <primary sortas="b-notes-mobile">notes-mobile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="pimsettingexporter">
-        <term><command>pimsettingexporter</command></term>
-        <listitem>
-          <para>
-            allows to export and import pim settings and local mail.
-          </para>
-          <indexterm zone="kdepim pimsettingexporter">
-            <primary sortas="b-pimsettingexporter">pimsettingexporter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sieveeditor">
-        <term><command>sieveeditor</command></term>
-        <listitem>
-          <para>
-            is an sieve script editor.
-          </para>
-          <indexterm zone="kdepim sieveeditor">
-            <primary sortas="b-sieveeditor">sieveeditor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-     <varlistentry id="storageservicemanger">
-        <term><command>storageservicemanger</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="kdepim storageservicemanger">
-            <primary sortas="b-storageservicemanger">storageservicemanger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-     <varlistentry id="tasks-mobile">
-        <term><command>tasks-mobile</command></term>
-        <listitem>
-          <para>
-            is the task managment for mobile devices.
-          </para>
-          <indexterm zone="kdepim tasks-mobile">
-            <primary sortas="b-tasks-mobile">tasks-mobile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/kdeplasma-addons.xml
===================================================================
--- archive/add/kdeplasma-addons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +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 kdeplasma-addons-download-http "&kde-download-http;&kde-old-version;/src/kdeplasma-addons-&kde-old-version;.tar.xz">
-  <!ENTITY kdeplasma-addons-download-ftp  " ">
-  <!ENTITY kdeplasma-addons-md5sum        "bf98d9bf1502ab4ff392fdd9b4703664">
-  <!ENTITY kdeplasma-addons-size          "1.7 MB">
-  <!ENTITY kdeplasma-addons-buildsize     "91 MB">
-  <!ENTITY kdeplasma-addons-time          "3.0 SBU">
-]>
-
-<sect1 id="kdeplasma-addons" xreflabel="kdeplasma-addons-&kde-old-version;">
-  <?dbhtml filename="kdeplasma-addons.html"?>
-
-
-  <title>Kdeplasma-addons-&kde-old-version;</title>
-
-  <indexterm zone="kdeplasma-addons">
-    <primary sortas="a-kdeplasma-addons">kdeplasma-addons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeplasma-addons</title>
-
-    <para>This package provides extra Plasma applets and engines like
-    lancelot, calculator, wallpapers etc.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeplasma-addons-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeplasma-addons-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeplasma-addons-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdeplasma-addons-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeplasma-addons-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeplasma-addons-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdeplasma-addons-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdeplasma-addons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kde-workspace"/> and
-      <xref linkend="kdepimlibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libkexiv2"/>,
-      <xref linkend="qjson"/>,
-      <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin),
-      <ulink url="https://github.com/ibus/ibus/wiki">ibus</ulink>,
-      <ulink url="&kde-download-http;&kde-version;/src/">Nepomuk</ulink>,
-      <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),and
-      <ulink url="https://github.com/ayoy/qoauth">QOAuth</ulink> (needed for the Plasma microblog dataengine)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeplasma-addons"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeplasma-addons</title>
-
-    <para>Install <application>Kdeplasma-addons</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>lancelot</seg>
-        <seg>liblancelot-datamodels.so, liblancelot.so, libplasma_groupingcontainment.so,
-        libplasmacomicprovidercore.so, libplasmapotdprovidercore.so, libplasmaweather.so,
-        librtm.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/kmix.xml
===================================================================
--- archive/add/kmix.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +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 kmix-download-http "&kde-download-http;applications/&kde-version;/src/kmix-&kde-version;.tar.xz">
-  <!ENTITY kmix-download-ftp  " ">
-  <!ENTITY kmix-md5sum        "924ec015cb9e39ecb3833c071969c07b">
-  <!ENTITY kmix-size          "384 KB">
-  <!ENTITY kmix-buildsize     "10.0 MB">
-  <!ENTITY kmix-time          "1.0 SBU">
-]>
-
-<sect1 id="kmix" xreflabel="kmix-&kde-version;">
-  <?dbhtml filename="kmix.html"?>
-
-
-  <title>Kmix-&kde-version;</title>
-
-  <indexterm zone="kmix">
-    <primary sortas="a-kmix">kmix</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kmix</title>
-
-    <para>This packages provides an audio mixer application for KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kmix-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kmix-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kmix-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kmix-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kmix-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kmix-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kmix Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="pulseaudio"/> and
-    <xref linkend="libcanberra"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kmix"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kmix</title>
-
-    <para>Install <application>Kmix</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DCMAKE_AUTOMOC=TRUE               \
-      -Wno-dev .. &amp;&amp;
-make</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><option>-DCMAKE_AUTOMOC=TRUE</option>: This switch is used to avoid
-    an invalid error return in cmake-3.3 and later.</para>
-
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kmix and kmixctrl</seg>
-        <seg>libkdeinit4_kmix.so, libkdeinit4_kmixctrl.so, kded_kmixd.so
-        and plasma_engine_mixer.so</seg>
-        <seg>several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kmix-prog">
-        <term><command>kmix</command></term>
-        <listitem>
-          <para>is the KDE Volume Control.</para>
-          <indexterm zone="kmix kmix-prog">
-            <primary sortas="b-kmix">kmix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kmixctrl">
-        <term><command>kmixctrl</command></term>
-        <listitem>
-          <para>
-            is used to save or restore the settings of
-            <command>kmix</command>.
-          </para>
-          <indexterm zone="kmix kmixctrl">
-            <primary sortas="b-kmixctrl">kmixctrl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/konsole.xml
===================================================================
--- archive/add/konsole.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +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 konsole-download-http "&kde-download-http;&kde-old-version;/src/konsole-&kde-old-version;.tar.xz">
-  <!ENTITY konsole-download-ftp  " ">
-  <!ENTITY konsole-md5sum        "1c81a9a2c073f7992671e168b7285a2a">
-  <!ENTITY konsole-size          "448 KB">
-  <!ENTITY konsole-buildsize     "18 MB">
-  <!ENTITY konsole-time          "0.6 SBU">
-]>
-
-<sect1 id="konsole" xreflabel="konsole-&kde-old-version;">
-  <?dbhtml filename="konsole.html"?>
-
-
-  <title>Konsole-&kde-old-version;</title>
-
-  <indexterm zone="konsole">
-    <primary sortas="a-konsole">konsole</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Konsole</title>
-
-    <para>This package provides a terminal emulator for KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&konsole-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&konsole-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &konsole-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &konsole-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &konsole-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &konsole-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Konsole Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kde-baseapps"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/konsole"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Konsole</title>
-
-    <para>Install <application>Konsole</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>konsole and konsoleprofile</seg>
-        <seg>libkdeinit4_konsole.so, libkonsolepart.so and libkonsoleprivate.so
-        </seg>
-        <seg>&kde-dir;/share/apps/konsole and
-        &kde-dir;/share/doc/HTML/en/konsole</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="konsole-prog">
-        <term><command>konsole</command></term>
-        <listitem>
-          <para>is the KDE terminal emulator.</para>
-          <indexterm zone="konsole konsole-prog">
-            <primary sortas="b-konsole">konsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="konsoleprofile">
-        <term><command>konsoleprofile</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to change the current tab's profile
-            options.
-          </para>
-          <indexterm zone="konsole konsoleprofile">
-            <primary sortas="b-konsoleprofile">konsoleprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/libkdcraw.xml
===================================================================
--- archive/add/libkdcraw.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +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 libkdcraw-download-http "&kde-download-http;applications/&libkdcraw-version;/src/libkdcraw-&libkdcraw-version;.tar.xz">
-  <!ENTITY libkdcraw-download-ftp  " ">
-  <!ENTITY libkdcraw-md5sum        "ce2c520d99b0ff8108c6944e1ec287bd">
-  <!ENTITY libkdcraw-size          "100 KB">
-  <!ENTITY libkdcraw-buildsize     "2.9 MB">
-  <!ENTITY libkdcraw-time          "0.1 SBU">
-]>
-
-<sect1 id="libkdcraw" xreflabel="libkdcraw-&libkdcraw-version;">
-  <?dbhtml filename="libkdcraw.html"?>
-
-
-  <title>libkdcraw-&libkdcraw-version;</title>
-
-  <indexterm zone="libkdcraw">
-    <primary sortas="a-libkdcraw">libkdcraw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkdcraw</title>
-
-    <para>Libkdcraw is a C++ interface around the LibRaw library used to decode RAW
-    picture files.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libkdcraw-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libkdcraw-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libkdcraw-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libkdcraw-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libkdcraw-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libkdcraw-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libkdcraw Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/> and
-      <xref linkend="libraw"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openssl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libkdcraw"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkdcraw</title>
-
-    <para>Install <application>libkdcraw</application> by running
-    the following commands:</para>
-
-<screen><userinput>sed -e '/3/a add_definitions(${KDE4_ENABLE_EXCEPTIONS})' \
-        -i libkdcraw/CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</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>
-      <command>sed ... libkdcraw/CMakeLists.txt</command>: Allow C++ exceptions
-      that are needed for libraw-0.16.2 headers.
-    </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>libkdcraw.so</seg>
-        <seg>&kde-dir;/include/libkdcraw and &kde-dir;/share/apps/libkdcraw</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libkdcraw-prog">
-        <term><command>libkdcraw</command></term>
-        <listitem>
-          <para>is the KDE image viewer.</para>
-          <indexterm zone="libkdcraw libkdcraw-prog">
-            <primary sortas="b-libkdcraw">libkdcraw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: chive/add/libkexiv2.xml
===================================================================
--- archive/add/libkexiv2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,117 +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 libkexiv2-download-http "&kde-download-http;applications/&libkexiv2-version;/src/libkexiv2-&libkexiv2-version;.tar.xz">
-  <!ENTITY libkexiv2-download-ftp  " ">
-  <!ENTITY libkexiv2-md5sum        "2c30e2ac942e02a9d07e08f42958598e">
-  <!ENTITY libkexiv2-size          "136 KB">
-  <!ENTITY libkexiv2-buildsize     "5.3 MB">
-  <!ENTITY libkexiv2-time          "0.3 SBU">
-]>
-
-<sect1 id="libkexiv2" xreflabel="libkexiv2-&libkexiv2-version;">
-  <?dbhtml filename="libkexiv2.html"?>
-
-
-  <title>libkexiv2-&libkexiv2-version;</title>
-
-  <indexterm zone="libkexiv2">
-    <primary sortas="a-libkexiv2">libkexiv2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkexiv2</title>
-
-    <para>Libkexiv2 is a KDE wrapper around the <application>Exiv2</application>
-    library for manipulating image metadata.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libkexiv2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libkexiv2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libkexiv2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libkexiv2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libkexiv2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libkexiv2-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libkexiv2-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libkexiv2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/> and
-    <xref linkend="exiv2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libkexiv2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkexiv2</title>
-
-    <para>Install <application>libkexiv2</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>libkexiv2.so</seg>
-        <seg>&kde-dir;/include/libkexiv2 and &kde-dir;/share/apps/libkexiv2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/add/okular.xml
===================================================================
--- archive/add/okular.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +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 okular-download-http "&kde-download-http;applications/&kde-apps-version;/src/okular-&kde-apps-version;.tar.xz">
-  <!ENTITY okular-download-ftp  " ">
-  <!ENTITY okular-md5sum        "43b50082de50dc1c1db607858a030c05">
-  <!ENTITY okular-size          "1.7 MB">
-  <!ENTITY okular-buildsize     "32 MB">
-  <!ENTITY okular-time          "1.4 SBU">
-]>
-
-<sect1 id="okular" xreflabel="okular-&kde-apps-version;">
-  <?dbhtml filename="okular.html"?>
-
-
-  <title>Okular-&kde-apps-version;</title>
-
-  <indexterm zone="okular">
-    <primary sortas="a-okular">okular</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Okular</title>
-
-    <para>Okular is a document viewer for KDE. It can view documents of many types
-    including PDF, PostScript, TIFF, Microsoft CHM, DjVu, DVI, XPS and ePub.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&okular-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&okular-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &okular-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &okular-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &okular-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &okular-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Okular Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kactivities"/>,
-    <xref linkend="freetype2"/>,
-    <xref linkend="qimageblitz"/>,
-    <xref linkend="libtiff"/>,
-    <xref linkend="libjpeg"/>, and
-    <xref linkend="poppler"/> (required for PDF support)
-    </para>
-
-    <note><para>For PDF support in <application>Okular</application> you need to
-    configure <application>Poppler</application> using <option>--enable-xpdf-headers
-    </option>.</para></note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libkexiv2"/>,
-      <ulink url="https://projects.kde.org/projects/extragear/base/plasma-mobile">ActiveApp</ulink>
-      (for developing applications for Plasma Active),
-      <ulink url="http://libspectre.freedesktop.org/">libspectre</ulink> (for PostScript support),
-      <ulink url="http://www.jedrea.com/chmlib">libchm</ulink>,
-      <ulink url="http://djvu.org/">DjVuLibre</ulink>,
-      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink>, and
-      <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/okular"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Okular</title>
-
-    <para>Install <application>Okular</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>okular</seg>
-        <seg>libokularcore.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>&kde-dir;/include/okular and several in &kde-dir;/lib and
-        &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="okular-prog">
-        <term><command>okular</command></term>
-        <listitem>
-          <para>is the KDE document viewer.</para>
-          <indexterm zone="okular okular-prog">
-            <primary sortas="b-okular">okular</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/agg.xml
===================================================================
--- archive/agg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +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 agg-download-http
-    "http://www.antigrain.com/agg-&agg-version;.tar.gz">-->
-  <!ENTITY agg-download-http
-    "http://pkgs.fedoraproject.org/repo/pkgs/agg/agg-&agg-version;.tar.gz/&agg-md5sum;/agg-&agg-version;.tar.gz">
-  <!ENTITY agg-download-ftp  " ">
-  <!ENTITY agg-md5sum        "0229a488bc47be10a2fee6cf0b2febd6">
-  <!ENTITY agg-size          "552 KB">
-  <!ENTITY agg-buildsize     "122 MB">
-  <!ENTITY agg-time          "1.2 SBU">
-]>
-
-<sect1 id="agg" xreflabel="agg-&agg-version;">
-  <?dbhtml filename="agg.html"?>
-
-
-  <title>agg-&agg-version;</title>
-
-  <indexterm zone="agg">
-    <primary sortas="a-agg">agg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to agg</title>
-
-    <para>
-      The Anti-Grain Geometry (AGG) package contains a general purpose C++
-      graphical toolkit. It can be used in many areas of computer programming
-      where high quality 2D graphics is an essential part of the project.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&agg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&agg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &agg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &agg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &agg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &agg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">agg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sdl"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/agg"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of agg</title>
-
-    <para>
-      Install <application>agg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's:  -L@x_libraries@::' src/platform/X11/Makefile.am &amp;&amp;
-sed -i '/^AM_C_PROTOTYPES/d'   configure.in                 &amp;&amp;
-
-bash autogen.sh --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's:  -L@x_libraries@::'
-      src/platform/X11/Makefile.am</command>: This fixes compiling with the
-      current Xorg Libraries.
-    </para>
-
-    <para>
-      <command>sed -i '/^AM_C_PROTOTYPES/d' configure.in</command>: this fixes
-      reconfiguring with the current version of <command>automake</command>.
-    </para>
-
-    <para>
-      <command>bash autogen.sh</command>: This script uses autotools to create
-      the configure script, then it runs configure with the given arguments.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-	<seg>
-	  None
-	</seg>
-        <seg>
-          libagg.so,
-          libaggfontfreetype.so,
-          libaggplatformsdl.so, and
-          libaggplatformX11.so
-        </seg>
-        <seg>/usr/include/agg2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libagg">
-        <term><filename class="libraryfile">libagg.so</filename></term>
-        <listitem>
-          <para>contains the AGG API functions.</para>
-          <indexterm zone="agg libagg">
-            <primary sortas="c-libagg">libagg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaggfontfreetype">
-        <term><filename class="libraryfile">libaggfontfreetype.so</filename></term>
-        <listitem>
-          <para>contains the AGG freetype font API functions.</para>
-          <indexterm zone="agg libaggfontfreetype">
-            <primary sortas="c-libaggfontfreetype">libaggfontfreetype.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaggplatformsdl">
-        <term><filename class="libraryfile">libaggplatformsdl.so</filename></term>
-        <listitem>
-          <para>contains the AGG SDL API functions that.</para>
-          <indexterm zone="agg libaggplatformsdl">
-            <primary sortas="c-libaggplatformsdl">libaggplatformsdl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaggplatformX11">
-        <term><filename class="libraryfile">libaggplatformX11.so</filename></term>
-        <listitem>
-          <para>contains the AGG LibX11 API functions.</para>
-          <indexterm zone="agg libaggplatformX11">
-            <primary sortas="c-libaggplatformX11">libaggplatformX11.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/alpine.xml
===================================================================
--- archive/alpine.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,229 +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 alpine-download-http "&sources-anduin-http;/alpine/alpine-&alpine-version;.tar.xz">
-  <!ENTITY alpine-download-ftp  " ">
-  <!ENTITY alpine-md5sum        "02dad85c1be80ce020206f222ecf5ac8">
-  <!ENTITY alpine-size          "4.6 MB">
-  <!ENTITY alpine-buildsize     "122 MB">
-  <!ENTITY alpine-time          "1.0 SBU">
-]>
-
-<sect1 id="alpine" xreflabel="Alpine-&alpine-version;">
-  <?dbhtml filename="alpine.html"?>
-
-
-  <title>Alpine-&alpine-version;</title>
-
-  <indexterm zone="alpine">
-    <primary sortas="a-alpine">alpine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Alpine</title>
-
-    <para><application>Alpine</application> is a text-based email client
-    developed by the University of Washington.</para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&alpine-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&alpine-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &alpine-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &alpine-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &alpine-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &alpine-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Alpine Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="openldap"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="tcl"/>, and
-    <xref linkend="linux-pam"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/alpine"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Alpine</title>
-
-    <para>Install <application>Alpine</application> by running the following
-    commands:</para>
-
-<screen><userinput>LIBS+="-lcrypto" ./configure --prefix=/usr       \
-                             --sysconfdir=/etc   \
-                             --without-ldap      \
-                             --without-krb5      \
-                             --without-pam       \
-                             --without-tcl       \
-                             --with-ssl-dir=/usr \
-                             --with-passfile=.pine-passfile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>LIBS+="-lcrypto"</command>: Enable linking to
-    openssl. Additional linker flags are required for 
-    <xref linkend="linux-pam"/>, <option>-lpam</option>, and for
-    <xref linkend="mitkrb"/>, <option>-lkrb5</option>.</para>
-
-    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
-
-    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
-
-    <para><parameter>--without-pam</parameter>: Disables Linux-PAM
-    support.</para>
-
-    <para><parameter>--without-tcl</parameter>: Disables TCL support.</para>
-
-    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
-    OpenSSL libraries and include files.</para>
-
-    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
-    password cache file.</para>
-
-    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Alpine</title>
-
-    <sect3 id="alpine-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.pinerc</filename></para>
-
-      <indexterm zone="alpine alpine-config">
-        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>It is not required to manually edit any configuration files to use
-      the <application>Alpine</application> email client. Users can configure
-      <application>Alpine</application> using the graphical configuration menu,
-      which stores the changes in <filename>~/.pinerc</filename>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
-        <seg>none</seg>
-        <seg>none</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="alpine-bin">
-        <term><command>alpine</command></term>
-        <listitem>
-          <para>is the Alpine mailer.</para>
-          <indexterm zone="alpine alpine-bin">
-            <primary sortas="b-alpine-bin">alpine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pico">
-        <term><command>pico</command></term>
-        <listitem>
-          <para>is a standalone text editor similar to the Alpine message composer.</para>
-          <indexterm zone="alpine pico">
-            <primary sortas="b-pico">pico</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pilot">
-        <term><command>pilot</command></term>
-        <listitem>
-          <para>is a standalone file system navigator.</para>
-          <indexterm zone="alpine pilot">
-            <primary sortas="b-pilot">pilot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpdump">
-        <term><command>rpdump</command></term>
-        <listitem>
-          <para>is a utility for downloading a pinerc or address book to the
-          local machine.</para>
-          <indexterm zone="alpine rpdump">
-            <primary sortas="b-rpdump">rpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpload">
-        <term><command>rpload</command></term>
-        <listitem>
-          <para> is a utility for uploading a local pinerc or address book to
-          an IMAP server.</para>
-          <indexterm zone="alpine rpload">
-            <primary sortas="b-rpload">rpload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/alsa-oss.xml
===================================================================
--- archive/alsa-oss.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 alsa-oss-download-http "&alsa-download-http;/oss-lib/alsa-oss-&alsa-oss-version;.tar.bz2">
-  <!ENTITY alsa-oss-download-ftp  " ">
-  <!ENTITY alsa-oss-md5sum        "9ec4bb783fdce19032aace086d65d874">
-  <!ENTITY alsa-oss-size          "288 KB">
-  <!ENTITY alsa-oss-buildsize     "3.0 MB">
-  <!ENTITY alsa-oss-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="alsa-oss" xreflabel="ALSA OSS-&alsa-oss-version;">
-  <?dbhtml filename="alsa-oss.html"?>
-
-
-  <title>alsa-oss-&alsa-oss-version;</title>
-
-  <indexterm zone="alsa-oss">
-    <primary sortas="a-alsa-oss">alsa-oss</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to alsa-oss</title>
-
-    <para>
-      The <application>alsa-oss</application> package contains
-      the alsa-oss compatibility library. This is used by programs
-      which wish to use the alsa-oss sound interface.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-oss-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-oss-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-oss-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-oss-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-oss-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-oss-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA OSS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA OSS</title>
-
-    <para>
-      Install <application>ALSA OSS</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aoss
-        </seg>
-        <seg>
-          libalsatoss.so, libaoss.so, and libossredir.a
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aoss">
-        <term><command>aoss</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="alsa-oss aoss">
-            <primary sortas="b-aoss">aoss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/amarok.xml
===================================================================
--- archive/amarok.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +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 amarok-download-http "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
-  <!ENTITY amarok-download-ftp  "&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
-  <!ENTITY amarok-md5sum        "53cfcb4819668b10e13b061478c7b32a">
-  <!ENTITY amarok-size          "38.1 MB">
-  <!ENTITY amarok-buildsize     "223 MB">
-  <!ENTITY amarok-time          "9.2 SBU">
-]>
-
-<sect1 id="amarok" xreflabel="amarok-&amarok-version;">
-  <?dbhtml filename="amarok.html"?>
-
-
-  <title>Amarok-&amarok-version;</title>
-
-  <indexterm zone="amarok">
-    <primary sortas="a-Amarok">Amarok</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Amarok</title>
-
-    <para>
-      <application>Amarok</application> is a powerful audio player for
-      the KDE environment. Features include a context browser, integration
-      with many online music  services and support for management of
-      several digital music players including Apple's iPod.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&amarok-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&amarok-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &amarok-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &amarok-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &amarok-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &amarok-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Amarok Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>, and
-      <xref linkend="taglib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libkcompactdisk"/> and
-      <xref linkend="audiocd-kio"/> (for CD-ROM accesa and control) and
-      <xref linkend="ffmpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/> (for MP3tunes integration),
-      <xref linkend="libxml2"/> (for MP3tunes integration),
-      <xref linkend="openssl"/> (for MP3tunes integration),
-      <xref linkend="qjson"/>,
-      <ulink url="&kde-download-http;&kde-version;/src/">nepomuk-core</ulink>,
-      <ulink url="http://kollide.net/~jefferai/">Taglib-extras</ulink>,
-      <ulink url="http://code.google.com/p/clamz/">Clamz</ulink> (For Amazon integration),
-      <ulink url="http://www.gtkpod.org/libgpod.html">libgpod</ulink> (for iPod support),
-      <ulink url="https://github.com/lastfm/liblastfm">liblastfm</ulink> (for Last.fm integration),
-      <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink> (for MTP device support),
-      <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt">libmygpo-qt</ulink> (for gpodder.net podcast support),
-      <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
-      <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink> (for MP3tunes integration),
-      <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>, and
-      <ulink url="http://code.google.com/p/googlemock/">Google Mock</ulink> (for tests)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/amarok"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Amarok</title>
-
-    <note><para>Amarok depends strongly on $KDE_PREFIX.  If a new version of
-    KDE is installed in a different location (for instance installing kde in a
-    versioned directory of /opt), then this package will need to be
-    reinstalled.</para></note>
-
-    <para>
-      Install <application>Amarok</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i '/set.TAGLIB_MIN_VERSION/s/7/10/' CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DKDE4_BUILD_TESTS=OFF             \
-      -Wno-dev .. &amp;&amp;
-make</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>
-      <command>sed ... CMakeLists.txt</command>: Change the minimum
-      requirement for taglib to allow it to be found.
-    </para>
-
-    <para>
-      <option>-DKDE4_BUILD_TESTS=OFF</option>: This switch disables the
-      integrated tests. The test suite requires Google Mock.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          amarok, amarok_afttagger, amarokcollectionscanner,
-          amarokpkg, and amzdownloader
-        </seg>
-        <seg>
-          libamarokcore.so, libamaroklib.so, libamarokocsclient.so, libamarokpud.so,
-          libamarok_service_lastfm_shared.so, libamarok-sqlcollection.so,
-          libamarok-transcoding.so, libampache_account_login.so, and several
-          libraries in &kde-dir;/lib/kde4
-        </seg>
-        <seg>
-          several in &kde-dir;/share
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="amarok-prog">
-        <term><command>amarok</command></term>
-        <listitem>
-          <para>
-            Is a powerful music player and organizer built on top of
-            KDE development platform.
-          </para>
-          <indexterm zone="amarok amarok-prog">
-            <primary sortas="b-amarok">amarok</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/appdata-tools.xml
===================================================================
--- archive/appdata-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +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 appdata-tools-download-http "http://people.freedesktop.org/~hughsient/releases/appdata-tools-&appdata-tools-version;.tar.xz">
-  <!ENTITY appdata-tools-download-ftp  " ">
-  <!ENTITY appdata-tools-md5sum        "47d8500b7b96fac6667c3173c77c1e66">
-  <!ENTITY appdata-tools-size          "248 KB">
-  <!ENTITY appdata-tools-buildsize     "2.3 MB">
-  <!ENTITY appdata-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="appdata-tools" xreflabel="appdata-tools-&appdata-tools-version;">
-  <?dbhtml filename="appdata-tools.html"?>
-
-
-  <title>appdata-tools-&appdata-tools-version;</title>
-
-  <indexterm zone="appdata-tools">
-    <primary sortas="a-appdata-tools">appdata-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to appdata-tools</title>
-
-    <para>
-      The <application>appdata-tools</application> is used to validate AppData
-      files to conform to standard specification.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appdata-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appdata-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appdata-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appdata-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appdata-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appdata-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">appdata-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="appstream-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <ulink url="http://www.thaiopensource.com/download/old/relaxng/20030619/trang.html">trang</ulink>, and
-      <ulink url="http://lxml.de/index.html">lxml</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/appdata-tools"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of appdata-tools</title>
-
-    <para>
-      Install <application>appdata-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 Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          appdata-validate
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appdata-validate">
-        <term><command>appdata-validate</command></term>
-        <listitem>
-          <para>
-            validates AppData metadata.
-          </para>
-          <indexterm zone="appdata-tools appdata-validate">
-            <primary sortas="b-appdata-validate">appdata-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/appstream-glib-new.xml
===================================================================
--- archive/appstream-glib-new.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,233 +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 appstream-glib-download-http 
-           "https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
-  <!ENTITY appstream-glib-download-ftp  " ">
-  <!ENTITY appstream-glib-md5sum        "2122471fff15bb9421313d2110ce538a">
-  <!ENTITY appstream-glib-size          "1.9 MB">
-  <!ENTITY appstream-glib-buildsize     "26 MB (with tests)">
-  <!ENTITY appstream-glib-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="appstream-glib" xreflabel="Appstream-GLib-&appstream-glib-version;" revision="systemd">
-  <?dbhtml filename="appstream-glib.html"?>
-
-
-  <title>Appstream-GLib-&appstream-glib-version;</title>
-
-  <indexterm zone="appstream-glib">
-    <primary sortas="a-Appstream-GLib">Appstream-GLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Appstream-GLib</title>
-
-    <para>
-      The <application>Appstream-GLib</application> package contains a library
-      that provides GObjects and helper methods to make it easy to read and
-      write AppStream metadata. It also provides a simple DOM implementation
-      that makes it easy to edit nodes and convert to and from the
-      standardized XML representation.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appstream-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appstream-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appstream-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appstream-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appstream-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appstream-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Appstream-GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libsoup"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gcab"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="yaml"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (to build manual pages) and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/appstream-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Appstream-GLib</title>
-
-    <para>
-      Install <application>Appstream-GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--disable-builder</option>: Use this switch if
-      you have not installed <xref linkend="gcab"/> and
-      <xref linkend="gtk3"/>.
-    </para>
-
-    <para>
-      <option>--disable-dep11</option>: Use this switch if you
-      have not installed <xref linkend="yaml"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          appstream-builder, appstream-compose, and appstream-util
-        </seg>
-        <seg>
-          libappstream-builder.so and libappstream-glib.so
-        </seg>
-        <seg>
-          /usr/include/libappstream-builder,
-          /usr/include/libappstream-glib,
-          /usr/lib/asb-plugins-5,
-          /usr/share/gtk-doc/html/appstream-glib, and
-          /usr/share/installed-tests/appstream-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appdata-validate">
-        <term><command>appdata-validate</command></term>
-        <listitem>
-          <para>
-            is used to validate AppData for formatting and style guidelines.
-          </para>
-          <indexterm zone="appstream-glib appdata-validate">
-            <primary sortas="b-appdata-validate">appdata-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="appstream-builder">
-        <term><command>appstream-builder</command></term>
-        <listitem>
-          <para>
-            is a developers tool to build metadata.
-          </para>
-          <indexterm zone="appstream-glib appstream-builder">
-            <primary sortas="b-appstream-builder">appstream-builder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="appstream-util">
-        <term><command>appstream-util</command></term>
-        <listitem>
-          <para>
-            is a management tool for <command>appstream-builder</command>.
-          </para>
-          <indexterm zone="appstream-glib appstream-util">
-            <primary sortas="b-appstream-util">appstream-util</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libappstream-glib">
-        <term><filename class="libraryfile">libappstream-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains objects and helper methods to help with reading and writing
-            AppStream metadata.
-          </para>
-          <indexterm zone="appstream-glib libappstream-glib">
-            <primary sortas="c-libappstream-glib">libappstream-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
- 
-   </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/appstream-glib.xml
===================================================================
--- archive/appstream-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,262 +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;
-
-  <!-- Place this in the packages.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
-
-  <!ENTITY appstream-glib-download-http
-   "http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
-  <!ENTITY appstream-glib-download-ftp  " ">
-  <!ENTITY appstream-glib-md5sum        "25f261265b71a4a9944028d4304ebc0d">
-  <!ENTITY appstream-glib-size          "1.8 MB">
-  <!ENTITY appstream-glib-buildsize     "17 MB (with tests)">
-  <!ENTITY appstream-glib-time          "0.1 SBU (with tests)">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="appstream-glib" xreflabel="appstream-glib-&appstream-glib-version;">
-  <?dbhtml filename="appstream-glib.html"?>
-
-
-  <!-- No other tags inside any title.
-       Use Title Case in All Titles -->
-  <title>appstream-glib-&appstream-glib-version;</title>
-
-  <indexterm zone="appstream-glib">
-    <primary sortas="a-appstream-glib">appstream-glib</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to appstream-glib</title>
-
-    <para>
-      The <application>appstream-glib</application> provides GObjects and
-      helper methods to make it easy to read and write AppStream metadata.
-      It also provides a simple DOM implementation that makes it easy to
-      edit nodes and convert to and from the standardized XML representation.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appstream-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appstream-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appstream-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appstream-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appstream-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appstream-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">appstream-glib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libarchive"/>
-      <xref linkend="libsoup"/>, and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</ulink>, and
-      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/appstream-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of appstream-glib</title>
-
-    <para>
-      Install <application>appstream-glib</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>./configure --prefix=/usr     \
-            --disable-dep11   \
-            --disable-builder \
-            --disable-static  &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. One test
-      fails, if <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
-      is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <parameter>--disable-builder</parameter>: Remove this switch, if you have
-       <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</ulink> installed.
-    </para>
-
-    <para>
-      <parameter>--disable-dep11</parameter>: Remove this switch, if you have
-      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- If there were no programs, libraries, or directories created, then
-           we would list the section as "None". However, a decision must have
-           been made to change the "None" to just removing the whole section
-           because I've noticed that many packages have had the "None"
-           removed and the section completely removed as well. The reasoning
-           was that by putting "None", it appears as we know there are none.
-           Without anything it appears as we are not sure. -->
-
-      <seglistitem>
-        <seg>
-          appdata-validate and appstream-util
-        </seg>
-        <seg>
-          libappstream-glib.so
-        </seg>
-        <seg>
-          /usr/include/libappstream-glib,
-          /usr/share/gtk-doc/html/appstream-glib and
-          /usr/share/installed-tests/appstream-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-<!--      <varlistentry id="appstream-builder">
-        <term><command>appstream-builder</command></term>
-        <listitem>
-          <para>
-            Is a developers tool to build metadata.
-          </para>
-          <indexterm zone="appstream-glib appstream-builder">
-            <primary sortas="b-appstream-builder">appstream-builder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="appdata-validate">
-        <term><command>appdata-validate</command></term>
-        <listitem>
-          <para>
-            validates AppData metadata.
-          </para>
-          <indexterm zone="appstream-glib appdata-validate">
-            <primary sortas="b-appdata-validate">appdata-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="appstream-util">
-        <term><command>appstream-util</command></term>
-        <listitem>
-          <para>
-            Is a management tool for appstream-builder.
-          </para>
-          <indexterm zone="appstream-glib appstream-util">
-            <primary sortas="b-appstream-util">appstream-util</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="libappstream-builder">
-        <term><filename class="libraryfile">libappstream-builder.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that aid the developers tool appstream-builder.
-          </para>
-          <indexterm zone="appstream-glib libappstream-builder">
-            <primary sortas="c-libappstream-builder">libappstream-builder.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libappstream-glib">
-        <term><filename class="libraryfile">libappstream-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the api functions.
-          </para>
-          <indexterm zone="appstream-glib libappstream-glib">
-            <primary sortas="c-libappstream-glib">libappstream-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/arts.xml
===================================================================
--- archive/arts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,29 +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="arts" xreflabel="aRts-&trinity-version;">
-  <?dbhtml filename="arts.html"?>
-
-
-  <title>aRts-&trinity-version;</title>
-
-  <para>The Analog Real-time Synthesizer (<application>aRts</application>)
-  provides software that can simulate a complete <quote>modular analog
-  synthesizer</quote> on your computer. It creates sounds and music using
-  small modules like oscillators for creating waveforms, various filters, modules
-  for playing data on your speakers, mixers, and faders. You can build a
-  complete setup with the GUI of the system, using the modules: generators,
-  effects and output &mdash; connected to each other.</para>
-
-  <para><application>aRts</application> provides necessary libraries
-  for <application>KDE</application>, however it can be installed as a
-  standalone package. The installation instructions for
-  <application>aRts</application> can be found in the
-  <xref linkend="aRts"/> portion of the <application>KDE</application>
-  installation instructions.</para>
-
-</sect1>
Index: chive/ash.xml
===================================================================
--- archive/ash.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +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 ash-download-http " ">
-  <!ENTITY ash-download-ftp  "ftp://slackware.mirrors.tds.net/pub/slackware/slackware_source/ap/ash/ash-&ash-version;.tar.gz">
-  <!ENTITY ash-md5sum        "1c59f5b62a081cb0cb3b053c01d79529">
-  <!ENTITY ash-size          "118 KB">
-  <!ENTITY ash-buildsize     "2.2 MB">
-  <!ENTITY ash-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="ash" xreflabel="ASH-&ash-version;">
-  <?dbhtml filename="ash.html"?>
-
-
-  <title>ASH-&ash-version;</title>
-
-  <indexterm zone="ash">
-    <primary sortas="a-ASH">ASH</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ASH</title>
-
-    <para><command>ash</command> is a shell that is the most compliant with
-    the Bourne Shell (not to be confused with Bourne Again SHell i.e.,
-    <application>Bash</application> installed in LFS) without any additional
-    features. Bourne Shell is available on most commercial UNIX systems.
-    Hence <command>ash</command> is useful for testing scripts to be
-    <command>sh</command>-compliant. It also has small memory and space
-    requirements compared to the other <command>sh</command>-compliant
-    shells.</para>
-
-    <caution>
-      <para><application>Ash</application> has problems with command line
-      editing in multibyte locales. The issue is discussed in more detail
-      in the <xref linkend="locale-wrong-multibyte-characters"/> section
-      of the <xref linkend="locale-issues"/> page.</para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ash-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ash-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ash-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ash-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ash-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ash-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/ash-&ash-version;-cumulative_fixes-2.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ash"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ASH</title>
-
-    <para>Install <application>ASH</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../ash-0.4.0-cumulative_fixes-2.patch &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>install -v -m 755 sh /bin/ash &amp;&amp;
-install -v -m 644 sh.1 /usr/share/man/man1/ash.1</userinput></screen>
-
-    <para>If you would like to make <command>ash</command> the default
-    <command>sh</command> shell, make a symlink.</para>
-
-<screen role="root"><userinput>ln -v -sf ash /bin/sh</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ASH</title>
-
-    <sect3 id="ash-config">
-      <title>Config Files</title>
-
-      <para><application>ASH</application> sources
-      <filename>/etc/profile</filename> and
-      <filename>$HOME/.profile</filename></para>
-
-      <indexterm zone="ash ash-config">
-        <primary sortas="e-etc-profile">/etc/profile</primary>
-      </indexterm>
-
-      <indexterm zone="ash ash-config">
-        <primary sortas="e-AHOME-.profile">$HOME/.profile</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ash</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ash-prog">
-        <term><command>ash</command></term>
-        <listitem>
-          <para>is a <command>sh</command>-compliant shell.</para>
-          <indexterm zone="ash ash-prog">
-            <primary sortas="b-ash">ash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/at-spi2-atk.xml
===================================================================
--- archive/at-spi2-atk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +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 at-spi2-atk-download-http
-           "&gnome-download-http;/at-spi2-atk/2.38/at-spi2-atk-&at-spi2-atk-version;.tar.xz">
-  <!ENTITY at-spi2-atk-download-ftp
-           "&gnome-download-ftp;/at-spi2-atk/2.38/at-spi2-atk-&at-spi2-atk-version;.tar.xz">
-  <!ENTITY at-spi2-atk-md5sum        "aed95be54ef213d210331dda88298b92">
-  <!ENTITY at-spi2-atk-size          "96 KB">
-  <!ENTITY at-spi2-atk-buildsize     "8.5 MB (with tests)">
-  <!ENTITY at-spi2-atk-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="at-spi2-atk" xreflabel="at-spi2-atk-&at-spi2-atk-version;">
-  <?dbhtml filename="at-spi2-atk.html"?>
-
-
-  <title>at-spi2-atk-&at-spi2-atk-version;</title>
-
-  <indexterm zone="at-spi2-atk">
-    <primary sortas="a-at-spi2-atk">at-spi2-atk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to At-Spi2 Atk</title>
-
-    <para>
-      The <application>At-Spi2 Atk</application> package contains a library
-      that bridges <application>ATK</application> to At-Spi2 D-Bus service.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&at-spi2-atk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&at-spi2-atk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &at-spi2-atk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &at-spi2-atk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &at-spi2-atk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &at-spi2-atk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">At-Spi2 Atk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/> and
-      <xref linkend="atk"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/at-spi2-atk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of At-Spi2 Atk</title>
-
-    <para>
-      Install <application>At-Spi2 Atk</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>. An already
-      active graphical session with bus address is necessary to run the tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-           libatk-bridge-2.0.so and /usr/lib/gtk-2.0/modules/libatk-bridge.so
-        </seg>
-        <seg>
-           /usr/include/at-spi2-atk and
-           /usr/lib/gnome-settings-daemon-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatk-bridge">
-        <term><filename class="libraryfile">libatk-bridge.so</filename></term>
-        <listitem>
-          <para>
-            is the Accessibility Toolkit <application>GTK+</application> module
-          </para>
-          <indexterm zone="at-spi2-atk libatk-bridge">
-            <primary sortas="c-libatk-bridge">libatk-bridge.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatk-bridge-2">
-        <term><filename class="libraryfile">libatk-bridge-2.0.so</filename></term>
-        <listitem>
-          <para>
-            Contains the common functions used by <application>GTK+</application>
-            Accessibility Toolkit Bridge
-          </para>
-          <indexterm zone="at-spi2-atk libatk-bridge-2">
-            <primary sortas="c-libatk-bridge-2">libatk-bridge-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/atk.xml
===================================================================
--- archive/atk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,169 +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 atk-download-http "&gnome-download-http;/atk/&atk-minor;/atk-&atk-version;.tar.xz">
-  <!ENTITY atk-download-ftp  "&gnome-download-ftp;/atk/&atk-minor;/atk-&atk-version;.tar.xz">
-  <!ENTITY atk-md5sum        "4dcea15cbf166706c166fc4fee05e3f8">
-  <!ENTITY atk-size          "300 KB">
-  <!ENTITY atk-buildsize     "8.6 MB">
-  <!ENTITY atk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="atk" xreflabel="ATK-&atk-version;">
-  <?dbhtml filename="atk.html" ?>
-
-
-  <title>ATK-&atk-version;</title>
-
-  <indexterm zone="atk">
-    <primary sortas="a-ATK">ATK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ATK</title>
-
-    <para>
-      <application>ATK</application> provides the set of accessibility
-      interfaces that are implemented by other toolkits and applications.
-      Using the <application>ATK</application> interfaces, accessibility
-      tools have full access to view and control running applications.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&atk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&atk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &atk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &atk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &atk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &atk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ATK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </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="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/atk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ATK</title>
-
-    <para>
-      Install <application>ATK</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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/atk-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatk">
-        <term><filename class="libraryfile">libatk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that are used by assistive technologies
-            to interact with the desktop applications
-          </para>
-          <indexterm zone="atk libatk">
-            <primary sortas="c-libatk">libatk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/attr.xml
===================================================================
--- archive/attr.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 attr-download-http "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
-  <!ENTITY attr-download-ftp  " ">
-  <!ENTITY attr-md5sum        "84f58dec00b60f2dc8fd1c9709291cc7">
-  <!ENTITY attr-size          "336 KB">
-  <!ENTITY attr-buildsize     "3.5 MB">
-  <!ENTITY attr-time          "0.1 SBU">
-]>
-
-<sect1 id="attr" xreflabel="attr-&attr-version;">
-  <?dbhtml filename="attr.html"?>
-
-
-  <title>attr-&attr-version;</title>
-
-  <indexterm zone="attr">
-    <primary sortas="a-attr">attr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to attr</title>
-
-    <para>The <application>attr</application> package contains utilities to
-    administer the extended attributes on filesystem objects.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&attr-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&attr-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &attr-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &attr-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &attr-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &attr-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/attr"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of attr</title>
-
-    <para>Install <application>attr</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in &amp;&amp;
-
-INSTALL_USER=root  \
-INSTALL_GROUP=root \
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>There are three sets of tests that come with this package. Issue the
-    following to execute all three:
-    <command>make tests root-tests ext-tests</command>.  For meaningful results,
-    the tests need to be carried out on a file system that supports extended
-    attributes.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- Package uses DIST_ROOT instead of DESTDIR -->
-<screen role="root"><userinput>make install install-dev install-lib &amp;&amp;
-chmod -v 755 /usr/lib/libattr.so &amp;&amp;
-mv -v /usr/lib/libattr.so.* /lib &amp;&amp;
-ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed ... include/builddefs.in</command>: This command
-    modifies the documentation directory so that it is a versioned
-    directory.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring attr</title>
-    <sect3><title>Configuration Information</title>
-
-      <para>There is no configuration to <application>attr</application> itself,
-      but to get any use out of <application>attr</application>, a filesystem
-      needs to support extended attributes.</para>
-
-      <para>One way to achieve this is to add the user_xattr option to an ext3
-      filesystem in the <filename>/etc/fstab</filename> file as shown
-      below:</para>
-
-<screen># file system  mount-point  type   options                 dump  fsck
-#                                                                order
-
-/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>attr, getfattr, and setfattr</seg>
-        <seg>libattr.so</seg>
-        <seg>/usr/{include/attr,share/doc/attr-&attr-version;}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="attr-prog">
-        <term><command>attr</command></term>
-        <listitem>
-          <para>extends attributes on filesystem objects.</para>
-          <indexterm zone="attr attr">
-            <primary sortas="b-attr">attr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfattr">
-        <term><command>getfattr</command></term>
-        <listitem>
-          <para>gets the extended attributes of filesystem objects.</para>
-          <indexterm zone="attr getfattr">
-            <primary sortas="b-getfattr">getfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfattr">
-        <term><command>setfattr</command></term>
-        <listitem>
-          <para>sets the extended attributes of filesystem objects.</para>
-          <indexterm zone="attr setfattr">
-            <primary sortas="b-setfattr">setfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libattr">
-        <term><filename class='libraryfile'>libattr.so</filename></term>
-        <listitem>
-          <para>contains the <application>attr</application> API functions.</para>
-          <indexterm zone="attr libattr">
-            <primary sortas="c-libattr">libattr.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/autoconf213.xml
===================================================================
--- archive/autoconf213.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,274 +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 autoconf213-download-http "&gnu-http;/autoconf/autoconf-&autoconf213-version;.tar.gz">
-  <!ENTITY autoconf213-download-ftp  " ">
-  <!ENTITY autoconf213-md5sum        "9de56d4a161a723228220b0f425dc711">
-  <!ENTITY autoconf213-size          "434 KB">
-  <!ENTITY autoconf213-buildsize     "2.8 MB">
-  <!ENTITY autoconf213-time          "less than 0.1 SBU (additional 0.1 SBU for the tests)">
-]>
-
-<sect1 id="autoconf213" xreflabel="Autoconf-&autoconf213-version;">
-  <?dbhtml filename="autoconf213.html"?>
-
-
-  <title>Autoconf&autoconf213-version;</title>
-
-  <indexterm zone="autoconf213">
-    <primary sortas="a-Autoconf213">Autoconf213</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Autoconf2.13</title>
-
-    <para>
-      <application>Autoconf2.13</application> is an old version of
-      <application>Autoconf</application> . This old version accepts switches
-      which are not valid in more recent versions and Mozilla applications
-      still need these switches now, so they require this old version for
-      regenerating the configure scripts.  Unlike other Mozilla
-      applications, <application>SeaMonkey</application> release tarballs
-      do not contain the pre-generated configure scripts, so this old
-      version is required even if configure files have not been changed.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&autoconf213-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&autoconf213-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &autoconf213-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &autoconf213-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &autoconf213-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &autoconf213-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/autoconf-&autoconf213-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Autoconf2.13 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dejagnu"/> (Required for the tests)
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Autoconf2.13</title>
-
-    <para>
-      Install <application>Autoconf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../autoconf-&autoconf213-version;-consolidated_fixes-1.patch &amp;&amp;
-mv -v autoconf.texi autoconf213.texi                      &amp;&amp;
-rm -v autoconf.info                                       &amp;&amp;
-./configure --prefix=/usr --program-suffix=2.13           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the installation <!--, if you have installed <xref linkend="dejagnu"/>,-->
-      issue <command>make check</command> (all 253 tests should pass).
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                      &amp;&amp;
-install -v -m644 autoconf213.info /usr/share/info &amp;&amp;
-install-info --info-dir=/usr/share/info autoconf213.info</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mv -v autoconf.texi autoconf213.texi</command>: ensure that the
-      info file added by this package will not overwrite the more recent version.
-    </para>
-
-    <para>
-      <command>rm -v autoconf.info</command>: ensure that the info file will be
-      created by the current version of texinfo.
-    </para>
-
-    <para>
-      <command>--program-suffix=2.13</command>: ensure that the installed
-      programs have the version added to their names, so that only a script
-      which specifically looks for these old versions will find them.
-    </para>
-
-    <para>
-      <command>install -v -m644 ...</command>: the patch removes install-info
-      from the Makefile because that would install (and if necessary recreate)
-      standards.info which is an old version, so now
-      <filename>autoconf213.info</filename> has to be manually installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          autoconf2.13,
-          autoheader2.13,
-          autoreconf2.13,
-          autoscan2.13,
-          autoupdate2.13, and
-          ifnames2.13
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/autoconf-2.13
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autoconf2.13">
-        <term><command>autoconf2.13</command></term>
-        <listitem>
-          <para>
-            Produces shell scripts that automatically configure software source
-            code packages to adapt to many kinds of Unix-like systems
-          </para>
-          <indexterm zone="autoconf213 autoconf2.13">
-            <primary sortas="b-autoconf2.13">autoconf2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoheader2.13">
-        <term><command>autoheader2.13</command></term>
-        <listitem>
-          <para>
-           is a  tool for creating template files of C
-           <emphasis>#define</emphasis> statements for configure to use
-          </para>
-          <indexterm zone="autoconf213 autoheader2.13">
-            <primary sortas="b-autoheader2.13">autoheader2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoreconf2.13">
-        <term><command>autoreconf2.13</command></term>
-        <listitem>
-          <para>
-           This automatically runs <command>autoconf2.13</command>,
-           <command>autoheader2.13</command>, <command>aclocal</command>,
-           <command>automake</command>, <command>gettextize</command> and
-           <command>libtoolize</command> in the right order when changes
-           have been made to <command>autoconf</command> or
-           <command>automake</command> template files
-          </para>
-          <indexterm zone="autoconf213 autoreconf2.13">
-            <primary sortas="b-autoreconf2.13">autoreconf2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoscan2.13">
-        <term><command>autoscan2.13</command></term>
-        <listitem>
-          <para>
-            Can be used as a preliminary step in creating a
-            <filename>configure.in</filename> file
-          </para>
-          <indexterm zone="autoconf213 autoscan2.13">
-            <primary sortas="b-autoscan2.13">autoscan2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoupdate2.13">
-        <term><command>autoupdate2.13</command></term>
-        <listitem>
-          <para>
-            Modifies a <filename>configure.in</filename> file that still
-            calls <command>autoconf</command> macros by their old names
-            to use the current macro names
-          </para>
-          <indexterm zone="autoconf213 autoupdate2.13">
-            <primary sortas="b-autoupdate2.13">autoupdate2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifnames2.13">
-        <term><command>ifnames2.13</command></term>
-        <listitem>
-          <para>
-            Prints the identifiers that the package uses in C preprocessor
-            conditionals [If a package has already been set up to have some
-            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]
-          </para>
-          <indexterm zone="autoconf213 ifnames2.13">
-            <primary sortas="b-ifnames2.13">ifnames2.13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/autogen.xml
===================================================================
--- archive/autogen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,226 +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 autogen-download-http
-           "http://ftp.gnu.org/gnu/autogen/rel&autogen-version;/autogen-&autogen-version;.tar.xz">
-  <!ENTITY autogen-download-ftp
-           "ftp://ftp.gnu.org/gnu/autogen/rel&autogen-version;/autogen-&autogen-version;.tar.xz">
-  <!ENTITY autogen-md5sum        "0871304953d219f7ad91a60fb1376271">
-  <!ENTITY autogen-size          "920 KB">
-  <!ENTITY autogen-buildsize     "15 MB">
-  <!ENTITY autogen-time          "0.7 SBU">
-]>
-
-<sect1 id="autogen" xreflabel="AutoGen-&autogen-version;">
-  <?dbhtml filename="autogen.html"?>
-
-
-  <title>AutoGen-&autogen-version;</title>
-
-  <indexterm zone="autogen">
-    <primary sortas="a-AutoGen">AutoGen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AutoGen</title>
-
-    <para>
-      <application>AutoGen</application> is a tool designed to simplify the
-      creation and maintenance of programs that contain large amounts of
-      repetitious text. It is especially valuable in programs that have
-      several blocks of text that must be kept synchronized.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&autogen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&autogen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &autogen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &autogen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &autogen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &autogen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AutoGen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="guile"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/autogen"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AutoGen</title>
-
-    <para>
-      Install <application>AutoGen</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          autogen, autoopts-config, columns, getdefs and xml2ag
-        </seg>
-        <seg>
-          libopts.so
-        </seg>
-        <seg>
-          /usr/include/autoopts and
-          /usr/share/autogen
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autogen-prog">
-        <term><command>autogen</command></term>
-        <listitem>
-          <para>
-            is designed for generating program files that contain
-            repetitive text with varied substitutions.
-          </para>
-          <indexterm zone="autogen autogen-prog">
-            <primary sortas="b-autogen">autogen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoopts-config">
-        <term><command>autoopts-config</command></term>
-        <listitem>
-          <para>
-            is a tool that is used by configure to determine the compiler and
-            linker flags that should be used to compile and link programs that
-            use <application>AutoOpts</application>.
-          </para>
-          <indexterm zone="autogen autoopts-config">
-            <primary sortas="b-autoopts-config">autoopts-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="columns">
-        <term><command>columns</command></term>
-        <listitem>
-          <para>
-            is used to columnize input text.
-          </para>
-          <indexterm zone="autogen columns">
-            <primary sortas="b-columns">columns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getdefs">
-        <term><command>getdefs</command></term>
-        <listitem>
-          <para>
-            is used to extract <application>AutoGen</application> definitions
-            from a list of source files.
-          </para>
-          <indexterm zone="autogen getdefs">
-            <primary sortas="b-getdefs">getdefs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xml2ag">
-        <term><command>xml2ag</command></term>
-        <listitem>
-          <para>
-            is used to convert any arbitrary XML file into equivalent
-            <application>AutoGen</application> definitions.
-          </para>
-          <indexterm zone="autogen xml2ag">
-            <primary sortas="b-xml2ag">xml2ag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopts">
-        <term><filename class='libraryfile'>libopts.so</filename></term>
-        <listitem>
-          <para>
-            is an automated option processing library based on
-            <application>AutoGen</application>.
-          </para>
-          <indexterm zone="autogen libopts">
-            <primary sortas="c-libopts">libopts.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/avifile.xml
===================================================================
--- archive/avifile.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,287 +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 avifile-main-version  "0.7">
-  <!ENTITY avifile-download-http "&sourceforge-repo;/avifile/avifile-&avifile-main-version;-&avifile-version;.tar.bz2">
-  <!ENTITY avifile-download-ftp  " ">
-  <!ENTITY avifile-md5sum        "7da94802f120d1b69e04a13170dcd21d">
-  <!ENTITY avifile-size          "3.2 MB">
-  <!ENTITY avifile-buildsize     "57.5 MB">
-  <!ENTITY avifile-time          "2.5 SBU">
-
-  <!ENTITY codec-download        "&sourceforge-repo;/avifile/binaries-011002.tgz">
-  <!ENTITY codec-md5sum          "4db4edeeceefb9353b15b047207fa6d3">
-  <!ENTITY codec-size            "4.3 MB">
-  <!ENTITY codec-installsize     "13 MB">
-]>
-
-<sect1 id="avifile" xreflabel="Avifile-&avifile-version;">
-  <?dbhtml filename="avifile.html"?>
-
-
-  <title>Avifile-&avifile-version;</title>
-
-  <indexterm zone="avifile">
-    <primary sortas="a-Avifile">Avifile</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Avifile</title>
-
-    <para>The <application>Avifile</application> package contains an AVI video
-    file player, tools and support libraries. This is useful for viewing and
-    editing AVI files.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&avifile-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&avifile-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &avifile-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &avifile-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &avifile-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &avifile-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-    <title>Patches</title>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/avifile-&avifile-main-version;-&avifile-version;-gcc41-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Codecs</title>
-      <listitem>
-        <para>Required CODEC: <ulink url="&codec-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &codec-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &codec-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &codec-installsize;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Avifile Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><!-- <xref linkend="qt"/> and -->
-    <xref linkend="sdl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libvorbis"/>,
-    <xref linkend="liba52"/>,
-    <xref linkend="lame"/>,
-    <xref linkend="libmad"/>,
-    <xref linkend="xvid"/>,
-    <xref linkend="faad2"/>,
-    <!-- Adding this comment in case this package gets any momentum and
-         actually get an updated DivX. Here is the new URL to the new codec:
-         http://labs.divx.com/DivXLinuxCodec -->
-    <ulink url="http://sourceforge.net/project/showfiles.php?group_id=11050">
-    DivX4Linux</ulink>, and
-    <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/avifile"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Avifile</title>
-
-    <para>Install the required CODECs as the <systemitem
-    class="username">root</systemitem> user using
-    the following commands:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/lib/avifile-&avifile-main-version;/win32 &amp;&amp;
-tar -xvf ../binaries-011002.tgz -C /usr/lib/avifile-&avifile-main-version;</userinput></screen>
-
-    <para>Install <application>Avifile</application> by running the
-    following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../avifile-&avifile-main-version;-&avifile-version;-gcc41-1.patch &amp;&amp;
-./configure --prefix=/usr \
-    --with-win32-path=/usr/lib/avifile-&avifile-main-version;/win32 &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>avibench, avicap, avicat, avifile-config, avimake, aviplay, avirec,
-        avirecompress, avitype and kv41setup</seg>
-        <seg>libaviplay.so, libaviplayavcodec.so, libaviplayavformat.so,
-        libaviplayavutil.so, libaviplaydha.so, libaviplayvidix, libqavm.so and
-        numerous CODEC plugins and video extensions.</seg>
-        <seg>/usr/include/avifile-&avifile-main-version;,
-        /usr/lib/avifile-&avifile-main-version;, and
-        /usr/share/avifile-&avifile-main-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="avibench">
-        <term><command>avibench</command></term>
-        <listitem>
-          <para>performs a measurement of the AVI file
-          support library's performance for a file.</para>
-          <indexterm zone="avifile avibench">
-            <primary sortas="b-avibench">avibench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avicap">
-        <term><command>avicap</command></term>
-        <listitem>
-          <para>is a widget that displays acquired video from a Video For
-          Windows (VFW) compatible device, like a webcam or a TV-tuner.</para>
-          <indexterm zone="avifile avicap">
-            <primary sortas="b-avicap">avicap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avicat">
-        <term><command>avicat</command></term>
-        <listitem>
-          <para>takes a set of AVI files and combines them into a single
-          file.</para>
-          <indexterm zone="avifile avicat">
-            <primary sortas="b-avicat">avicat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avifile-config">
-        <term><command>avifile-config</command></term>
-        <listitem>
-          <para>is a script used to get information about the installed version
-          of <application>Avifile</application>.</para>
-          <indexterm zone="avifile avifile-config">
-            <primary sortas="b-avifile-config">avifile-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avimake">
-        <term><command>avimake</command></term>
-        <listitem>
-          <para>takes a set of JPG images and creates a movie.</para>
-          <indexterm zone="avifile avimake">
-            <primary sortas="b-avimake">avimake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aviplay">
-        <term><command>aviplay</command></term>
-        <listitem>
-          <para> manages the input formats, the CODECs and the output formats
-          to display AVI video files on your screen.</para>
-          <indexterm zone="avifile aviplay">
-            <primary sortas="b-aviplay">aviplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avirec">
-        <term><command>avirec</command></term>
-        <listitem>
-          <para>is a command-line video recording tool.</para>
-          <indexterm zone="avifile avirec">
-            <primary sortas="b-avirec">avirec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avirecompress">
-        <term><command>avirecompress</command></term>
-        <listitem>
-          <para>is a widget that takes an input file of one CODEC type
-          and converts it into a video file of another CODEC.</para>
-          <indexterm zone="avifile avirecompress">
-            <primary sortas="b-avirecompress">avirecompress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avitype">
-        <term><command>avitype</command></term>
-        <listitem>
-          <para>will read and display AVI file header information.</para>
-          <indexterm zone="avifile avitype">
-            <primary sortas="b-avitype">avitype</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kv41setup">
-        <term><command>kv41setup</command></term>
-        <listitem>
-          <para>is a small tool which tells
-          <application>video4linux</application> about the current video
-          mode.</para>
-          <indexterm zone="avifile kv41setup">
-            <primary sortas="b-kv41setup">kv41setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaviplay">
-        <term><filename class='libraryfile'>libaviplay*.so</filename></term>
-        <listitem>
-          <para>libraries contain the functions required by the various
-          <application>Avifile</application> programs for encoding, decoding
-          and to interface with the various plugins and video extensions.</para>
-          <indexterm zone="avifile libaviplay">
-            <primary sortas="c-libaviplay">libaviplay*.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/bazaar.xml
===================================================================
--- archive/bazaar.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 bazaar-download-http
-  "https://launchpad.net/bzr/2.5/&bazaar-version;/+download/bzr-&bazaar-version;.tar.gz">
-  <!ENTITY bazaar-download-ftp  " ">
-  <!ENTITY bazaar-md5sum        "ac5079858364a046071000d5cdccb67b">
-  <!ENTITY bazaar-size          "10 MB">
-  <!ENTITY bazaar-buildsize     "69 MB">
-  <!ENTITY bazaar-time          "0.2 SBU">
-]>
-
-<sect1 id="bazaar" xreflabel="Bazaar-&bazaar-version;">
-  <?dbhtml filename="bazaar.html"?>
-
-
-  <title>Bazaar-&bazaar-version;</title>
-
-  <indexterm zone="bazaar">
-    <primary sortas="a-bazaar">Bazaar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Bazaar</title>
-
-    <para><application>Bazaar</application> is a version control system that
-    helps track project history over time and collaborate with others.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&bazaar-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&bazaar-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &bazaar-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &bazaar-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &bazaar-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &bazaar-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bazaar Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cacerts"/>,
-      <ulink url="http://www.python.org/pypi/paramiko/">paramiko</ulink> with
-      <xref linkend="openssh"/> or
-      <ulink url="http://www.python.org/pypi/pycrypto/">PyCrypto</ulink> (to access branches over SSH), and
-      <ulink url="http://wiki.bazaar.canonical.com/BzrTools">BzrTools</ulink> (for rsync support and other extra functionality)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/bazaar"/></para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bazaar</title>
-
-    <para>
-      Install <application>Bazaar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i -e 's|man/man1|share/&amp;|' setup.py &amp;&amp;
-python setup.py build</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>python setup.py install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>bzr</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/python&python2-majorver;/site-packages/bzrlib</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bazaar-prog">
-        <term><command>bzr</command></term>
-        <listitem>
-          <para>is a command-line client program used to access bcr repositories.</para>
-          <indexterm zone="bazaar bazaar-prog">
-            <primary sortas="b-bzr">bzr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-</sect1>
Index: chive/bc.xml
===================================================================
--- archive/bc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY bc-download-http "&gnu-alpha-http;bc/bc-&bc-version;.tar.bz2">
-  <!ENTITY bc-download-ftp "&gnu-alpha-ftp;bc/bc-&bc-version;.tar.bz2">
-  <!ENTITY bc-md5sum "5126a721b73f97d715bb72c13c889035">
-  <!ENTITY bc-size "288 KB">
-  <!ENTITY bc-buildsize "3 MB">
-  <!ENTITY bc-time "less than 0.1 SBU (0.2 SBU if running the testsuite)">
-]>
-
-<sect1 id="bc" xreflabel="bc-&bc-version;">
-  <?dbhtml filename="bc.html"?>
-
-
-  <title>bc-&bc-version;</title>
-
-  <indexterm zone="bc">
-    <primary sortas="a-Bc">Bc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to bc</title>
-
-    <para>The <application>bc</application> package contains
-    an arbitrary precision numeric processing language.</para>
-
-    <note><para>Starting with linux-3.9 the <command>bc</command>
-    program is needed to build the linux kernel.  It is been moved
-    to LFS for LFS-7.4.</para></note>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&bc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&bc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &bc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &bc-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &bc-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &bc-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/bc"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bc</title>
-
-    <para>Install <application>bc</application> by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-readline &amp;&amp;
-make</userinput></screen>
-
-    <para>To test <application>bc</application>, run the commands below.
-    There is quite a bit of output, so you may want to redirect it to a file.
-    There are a very small percentage of tests (10 of 12,144) that will
-    indicate a roundoff error at the last digit.</para>
-
-<screen><userinput>echo "quit" | ./bc/bc -l Test/checklib.b</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><command>sed -i '/PROTO.*readline/d' bc/scan.l</command>: This
-    command fixes the <application>Readline</application> library call.</para>
-
-    <para><command>sed -i '/flex -I8/s/8//' configure</command>: This
-    command fixes the <application>Flex</application> invocation.</para>
-
-    <para><command>sed -i '/stdlib/a #include &lt;string.h&gt;' lib/number.c</command>:
-    This command inserts a missing header.</para>
-
-    <para><command>sed -i 's/program.*save/static &amp;/' bc/load.c</command>:
-    This command fixes a segfault when running <application>bc</application>
-    with <command>bc -l</command>.</para>
--->
-    <para><parameter>--with-readline</parameter>: This option enables
-    <application>Readline</application> support in interactive mode.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bc and dc</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bc-prog">
-        <term><command>bc</command></term>
-        <listitem>
-          <para>is a calculator.</para>
-          <indexterm zone="bc bc-prog">
-            <primary sortas="b-bc">bc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dc">
-        <term><command>dc</command></term>
-        <listitem>
-          <para>is a reverse-polish calculator.</para>
-          <indexterm zone="bc dc">
-            <primary sortas="b-dc">dc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
-
Index: chive/beaker.xml
===================================================================
--- archive/beaker.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,145 +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 Beaker-download-http "&pymodules-dl;/B/Beaker/Beaker-&Beaker-version;.tar.gz">
-  <!ENTITY Beaker-download-ftp  " ">
-  <!ENTITY Beaker-md5sum        "c07254713337b7a1b404ef37ad880b07">
-  <!ENTITY Beaker-size          "44 KB">
-  <!ENTITY Beaker-buildsize     "916 KB">
-  <!ENTITY Beaker-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Beaker -->
-  <sect2 id="Beaker" xreflabel="Beaker-&Beaker-version;">
-
-    <title>Beaker-&Beaker-version;</title>
-
-    <indexterm zone="Beaker">
-      <primary sortas="a-Beaker">Beaker</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Beaker Module</title>
-
-      <para>
-        <application>Beaker</application> is a <application>Python</application>
-        module that implements caching and sessions WSGI middleware for use with
-        web applications and stand-alone Python scripts and applications.
-      </para>
-
-      &lfs83_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Beaker-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Beaker-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Beaker-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Beaker-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Beaker-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Beaker-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Beaker Dependencies</bridgehead>
-<!-- OBSOLETE
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools"/>
-      </para>
--->
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="funcsigs"/> (required for Python-2.7)
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Beaker"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Beaker</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>
-        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>python setup.py install --optimize=1</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>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/beaker,
-            /usr/lib/python&python2-majorver;/site-packages/Beaker-&Beaker-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/beaker,
-            /usr/lib/python&python3-majorver;/site-packages/Beaker-&Beaker-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Beaker -->
Index: chive/blueman.xml
===================================================================
--- archive/blueman.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,253 +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 blueman-download-http "http://download.tuxfamily.org/blueman/blueman-&blueman-version;.tar.gz">
-  <!ENTITY blueman-download-ftp  " ">
-  <!ENTITY blueman-md5sum        "f0bee59589f4c23e35bf08c2ef8acaef">
-  <!ENTITY blueman-size          "1.2 MB">
-  <!ENTITY blueman-buildsize     "16 MB">
-  <!ENTITY blueman-time          "0.2 SBU">
-]>
-
-<sect1 id="blueman" xreflabel="Blueman-&blueman-version;">
-  <?dbhtml filename="blueman.html"?>
-
-
-  <title>Blueman-&blueman-version;</title>
-
-  <indexterm zone="blueman">
-    <primary sortas="a-Blueman">Blueman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Blueman</title>
-
-    <para>
-      <application>Blueman</application> is full featured GTK+
-      Bluetooth manager.
-    </para>
-
-    &lfs74_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&blueman-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&blueman-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &blueman-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &blueman-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &blueman-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &blueman-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Blueman Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="bluez"/>,
-      <xref linkend="dbus-python"/>,
-      <xref linkend="gtk2"/>,
-      <!-- <xref linkend="notify-python"/>, -->
-      <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support),
-      <!--<xref linkend="pyrex"/>, --> and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&gnome-download-http;/nautilus-sendto/">Nautilus SendTo</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref linkend="obex-data-server"/> and
-      <xref linkend="polkit-gnome"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/blueman"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Blueman</title>
-
-    <para>
-      Install <application>Blueman</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/blueman \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          blueman-adapters, blueman-applet, blueman-assistant, blueman-browse,
-          blueman-manager, blueman-sendto, and blueman-services
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/blueman,
-          /usr/lib/python&python2-majorver;/site-packages/blueman, and
-          /usr/share/blueman
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="blueman-adapters">
-        <term><command>blueman-adapters</command></term>
-        <listitem>
-          <para>
-            is a utility used to set adapter properties.
-          </para>
-          <indexterm zone="blueman blueman-adapters">
-            <primary sortas="b-blueman-adapters">blueman-adapters</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blueman-applet">
-        <term><command>blueman-applet</command></term>
-        <listitem>
-          <para>
-            is a tray applet used to manage bluetooth.
-          </para>
-          <indexterm zone="blueman blueman-applet">
-            <primary sortas="b-blueman-applet">blueman-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blueman-assistant">
-        <term><command>blueman-assistant</command></term>
-        <listitem>
-          <para>
-            is an application used for configuring and pairing bluetooth devices.
-          </para>
-          <indexterm zone="blueman blueman-assistant">
-            <primary sortas="b-blueman-assistant">blueman-assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blueman-browse">
-        <term><command>blueman-browse</command></term>
-        <listitem>
-          <para>
-            is used to start obex browser for specified device.
-          </para>
-          <indexterm zone="blueman blueman-browse">
-            <primary sortas="b-blueman-browse">blueman-browse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blueman-manager">
-        <term><command>blueman-manager</command></term>
-        <listitem>
-          <para>
-            is the bluetooth device manager.
-          </para>
-          <indexterm zone="blueman blueman-manager">
-            <primary sortas="b-blueman-manager">blueman-manager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blueman-sendto">
-        <term><command>blueman-sendto</command></term>
-        <listitem>
-          <para>
-            is an application used for sending files to bluetooth devices.
-          </para>
-          <indexterm zone="blueman blueman-sendto">
-            <primary sortas="b-blueman-sendto">blueman-sendto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blueman-services">
-        <term><command>blueman-services</command></term>
-        <listitem>
-          <para>
-            is a graphical dialog used for configuring local bluetooth services.
-          </para>
-          <indexterm zone="blueman blueman-services">
-            <primary sortas="b-blueman-services">blueman-services</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/bootscripts_blfs_sysconfig_bluetooth
===================================================================
--- archive/bootscripts_blfs_sysconfig_bluetooth	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,30 +1,0 @@
-# Begin /etc/sysconfig/bluetooth
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-# Note: You need to pass coressponding options to the daemon
-# since it does not run without any options.
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-# Note: You need to pass coressponding options to the daemon
-# since it does not run without any options.
-#PAND_ENABLE="true"
-
-# Options for hidd, dund and pand (default: none)
-
-# See man 1 hidd for available options.
-#HIDD_OPTIONS=""
-
-# See man 1 dund for available options.
-#DUND_OPTIONS=""
-
-# See man 1 pand for available options.
-#PAND_OPTIONS=""
-
-# End /etc/sysconfig/bluetooth
Index: chive/cairomm.xml
===================================================================
--- archive/cairomm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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"?>
-
-
-  <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: chive/cargo.xml
===================================================================
--- archive/cargo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,259 +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 cargo-download-http "https://github.com/rust-lang/cargo/archive/&cargo-version;/cargo-&cargo-version;.tar.gz">
-  <!ENTITY cargo-download-ftp  " ">
-  <!ENTITY cargo-md5sum        "c0bdbfdeead6a7cdfd7fbfe2183bfc61">
-  <!ENTITY cargo-size          "624 KB">
-  <!ENTITY cargo-buildsize     "129 MB plus extra 115 MB in ~/.cargo and 2.2GB for the testsuite">
-  <!ENTITY cargo-time          "1.8 SBU plus 2.4 SBU for the testsuite on a machine with 4 cores">
-
-  <!-- RUSTIDATE is deined in packages.ent -->
-  <!-- temporarily at higgs so people can download it -->
-  <!ENTITY rusti-download-http "&sources-anduin-http;/rust/rust-installer-&RUSTIDATE;.tar.xz">
-  <!ENTITY rusti-md5sum        "8fb6c87f12d735b0a8bc1304d7640c69">
-  <!ENTITY rusti-size          "18 KB">
-
-  <!-- similarly, CARGOPREV is defined in packages.ent -->
-  <!ENTITY cargoprev64-download-http "https://static.rust-lang.org/dist/cargo-&CARGOPREV;-x86_64-unknown-linux-gnu.tar.gz">
-  <!ENTITY cargoprev64-md5sum  "ad2b513d591f35271f1041e2e04f484c">
-  <!ENTITY cargoprev64-size    "4.4 MB">
-  <!ENTITY cargoprev32-download-http "https://static.rust-lang.org/dist/cargo-&CARGOPREV;-i686-unknown-linux-gnu.tar.gz">
-  <!ENTITY cargoprev32-md5sum  "24d4eda62991bfbaecb3a6d1e09df143">
-  <!ENTITY cargoprev32-size    "4.3 MB">
-]>
-
-<sect1 id="cargo" xreflabel="cargo-&cargo-version;">
-  <?dbhtml filename="cargo.html"?>
-
-
-  <title>Cargo-&cargo-version;</title>
-
-  <indexterm zone="cargo">
-    <primary sortas="a-cargo">Cargo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cargo</title>
-
-    <para>
-      <application>Cargo</application> is the Package Manager for
-      <application>Rust</application>. Like that, during the build it uses
-      <command>curl</command> to download <filename>cargo</filename> files
-      which are actually <filename>.tar.gz</filename> source archives.
-    </para>
-
-    <para>
-      This package requires internet access to build and at runtime (when
-      <command>rust</command> is compiling another package). It will use all
-      available cores. It also needs the current or previous version to compile
-      itself, so here a binary of the previous version is used to bootstrap.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cargo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cargo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cargo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cargo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cargo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cargo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Rust Installer:
-        <ulink url="&rusti-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Installer MD5 sum: &rusti-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Installer size: &rusti-size;</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (x86_64):
-        <ulink url="&cargoprev64-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Binary x86_64 MD5 sum: &cargoprev64-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Binary x86_64 download size: &cargoprev64-size;</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (i686):
-        <ulink url="&cargoprev32-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Binary i686 MD5 sum: &cargoprev32-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Binary i686 download size: &cargoprev32-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cargo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="rust"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/>,
-      <xref linkend="openssl"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/cargo"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cargo</title>
-
-    <para>
-      Install <application>cargo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>tar -xf ../rust-installer-&RUSTIDATE;.tar.xz \
-    --strip-components=1 --directory src/rust-installer &amp;&amp;
-
-case $(uname -m) in
-    x86_64) tar -xf ../cargo-&CARGOPREV;-x86_64-unknown-linux-gnu.tar.gz
-    ;;
-    i686) tar -xf ../cargo-&CARGOPREV;-i686-unknown-linux-gnu.tar.gz
-    ;;
-esac                                                 &amp;&amp;
-
-./configure --prefix=/usr                        \
-            --sysconfdir=/etc                    \
-            --docdir=/usr/share/doc/cargo-&cargo-version; \
-            --cargo=./cargo-nightly*/cargo/bin/cargo &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>CFG_DISABLE_CROSS_TESTS=1
-      ./target/*-unknown-linux-gnu/release/cargo test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mv -v /usr/etc/bash_completion.d/cargo /etc/bash_completion.d</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>tar -xf ../rust-installer-&RUSTIDATE;.tar.xz ...</command>:
-      The rust-installer is needed, but not shipped with
-      <application>cargo</application>, so BLFS provides a repackaged git
-      snapshot.
-    </para>
-
-    <para>
-      <parameter>--cargo=</parameter>: This points to the binary of the previous
-      version, so that the package can be bootstrapped. When upgrading, or if
-      rebuilding, it is possible to use the current installed version without
-      this switch, but that takes longer and uses more space.
-    </para>
-
-    <para>
-      <command>CFG_DISABLE_CROSS_TESTS=1 ...</command>: By default the tests
-      will try to cover cross-builds for other architectures, but BLFS only
-      installs <command>rust</command> for the host architecture. This switch
-      also points to where cargo has been created, using a wildcard to match the
-      one target-triple directory which has been created.
-    </para>
-
-    <para>
-      <command>mv -v /usr/etc/bash_completion.d/cargo ...</command>: Cargo
-      accepts the sysconfdir switch but does not respect it. This fixes up the
-      misplaced file.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program(s)</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <seglistitem>
-        <seg>
-          cargo
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/cargo-&cargo-version; and
-          /usr/share/zsh/site-functions.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cargo-prog">
-        <term><command>cargo</command></term>
-        <listitem>
-          <para>
-            is the Package Manager for Rust.
-          </para>
-          <indexterm zone="cargo cargo-prog">
-            <primary sortas="b-cargo">cargo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/celt051.xml
===================================================================
--- archive/celt051.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +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 celt051-download-http "http://downloads.xiph.org/releases/celt/celt-&celt051-version;.tar.gz">
-  <!ENTITY celt051-download-ftp  " ">
-  <!ENTITY celt051-md5sum        "67e7b5e45db57a6f1f0a6962f5ecb190">
-  <!ENTITY celt051-size          "432 KB">
-  <!ENTITY celt051-buildsize     "5.5 MB">
-  <!ENTITY celt051-time          "0.1 SBU">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="celt051" xreflabel="Celt-&celt051-version;">
-  <?dbhtml filename="celt051.html"?>
-
-
-  <title>Celt-&celt051-version;</title>
-
-  <indexterm zone="celt051">
-    <primary sortas="a-celt051">celt051</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Celt</title>
-
-    <para>
-      CELT is a very low delay audio codec designed for high-quality
-      communications. Its potential uses include video-conferencing and
-      network music performance.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&celt051-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&celt051-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &celt051-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &celt051-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &celt051-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &celt051-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Celt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libogg"/> (For encoder/decoder tools).
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/celt051"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Celt</title>
-
-    <para>
-      Install <application>Celt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          celtdec051 and celtenc051
-        </seg>
-        <seg>
-          libcelt051.so
-        </seg>
-        <seg>
-          /usr/include/celt051
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="celtdec051">
-        <term><command>celtdec051</command></term>
-        <listitem>
-          <para>
-            is CELT decoder.
-          </para>
-          <indexterm zone="celt051 celtdec051">
-            <primary sortas="b-celtdec051">celtdec051</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="celtenc051">
-        <term><command>celtenc051</command></term>
-        <listitem>
-          <para>
-            is CELT encoder.
-          </para>
-          <indexterm zone="celt051 celtenc051">
-            <primary sortas="b-celtenc051">celtenc051</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcelt051">
-        <term><filename class="libraryfile">libcelt051.so</filename></term>
-        <listitem>
-          <para>
-            contains CELT API functions.
-          </para>
-          <indexterm zone="celt051 libcelt051">
-            <primary sortas="c-libcelt051">libcelt051.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/check.xml
===================================================================
--- archive/check.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 check-download-http "https://github.com/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
-  <!ENTITY check-download-ftp  " ">
-  <!ENTITY check-md5sum        "31b17c6075820a434119592941186f70">
-  <!ENTITY check-size          "748 KB">
-  <!ENTITY check-buildsize     "9.7 MB (add 1.2 MB for the tests)">
-  <!ENTITY check-time          "0.1 SBU (add 3.6 SBU for the tests)">
-]>
-
-<sect1 id="check" xreflabel="Check-&check-version;">
-  <?dbhtml filename="check.html"?>
-
-
-  <title>Check-&check-version;</title>
-
-  <indexterm zone="check">
-    <primary sortas="a-Check">Check</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Check</title>
-
-    <para>
-      <application>Check</application> is a unit testing framework for C.
-      It was installed by LFS in the temporary /tools directory. These
-      instructions install it permanently.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&check-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&check-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &check-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &check-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &check-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &check-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/check"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Check</title>
-
-    <para>
-      Install <application>Check</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-<!-- Under LFS 8.1-rc2, the tests do not cause segfaults any longer. -->
-    <para>
-      To test the installation, issue <command>make check</command>.
-      <!-- Several tests cause segmentation faults that are harmless and can be
-      ignored. -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/check-&check-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          checkmk
-        </seg>
-        <seg>
-          libcheck.so
-        </seg>
-        <seg>
-          /usr/share/doc/check-&check-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkmk">
-        <term><command>checkmk</command></term>
-        <listitem>
-          <para>
-            is an <application>Awk</application> script used for
-            generating C unit tests for use with the
-            <application>Check</application> unit testing framework.
-          </para>
-          <indexterm zone="check checkmk">
-            <primary sortas="b-checkmk">checkmk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcheck">
-        <term><filename class="libraryfile">libcheck.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Check</application> API functions.
-          </para>
-          <indexterm zone="check libcheck">
-            <primary sortas="c-libcheck">libcheck.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/cheese-kernel.xml
===================================================================
--- archive/cheese-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,16 +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">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  &lt;*/M&gt; M<emphasis role='blue'>u</emphasis>ltimedia support ---&gt;                                  [MEDIA_SUPPORT]
-    [*] <emphasis role='blue'>A</emphasis>utoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)
-                                                  ...  [MEDIA_SUBDRV_AUTOSELECT]
-    M<emphasis role='blue'>e</emphasis>dia device types ---&gt;
-      [*] <emphasis role='blue'>C</emphasis>ameras and video grabbers                      [MEDIA_CAMERA_SUPPORT]
-    M<emphasis role='blue'>e</emphasis>dia drivers ---&gt;
-      [ /*] M<emphasis role='blue'>e</emphasis>dia USB Adapters ---&gt;                          [MEDIA_USB_SUPPORT]
-        # Most modern USB camera needs this.
-        # For other devices you need to figure it out yourself:
-        &lt; /*/M&gt; <emphasis role='blue'>U</emphasis>SB Video Class (UVC)                          [USB_VIDEO_CLASS]</screen>
Index: chive/cheese.xml
===================================================================
--- archive/cheese.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,234 +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 cheese-download-http "&gnome-download-http;/cheese/&gnome-44;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/&gnome-44;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-md5sum        "99d2a400a8876956a0c378e1ce172a40">
-  <!ENTITY cheese-size          "1.0 MB">
-  <!ENTITY cheese-buildsize     "14 MB">
-  <!ENTITY cheese-time          "0.2 SBU">
-]>
-
-<sect1 id="cheese" xreflabel="Cheese-&cheese-version;">
-  <?dbhtml filename="cheese.html"?>
-
-
-  <title>Cheese-&cheese-version;</title>
-
-  <indexterm zone="cheese">
-    <primary sortas="a-Cheese">Cheese</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cheese</title>
-
-    <para>
-      <application>Cheese</application> is used to take
-      photos and videos with fun graphical effects.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cheese-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cheese-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cheese-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cheese-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cheese-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cheese-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cheese Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gst"/>,
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="gst10-plugins-good"/> (built with <xref linkend="v4l-utils"/>),
-      <xref linkend="libcanberra"/>, and
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="gnome-video-effects"/> (at runtime, for video effects),
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>,
-      <ulink url="https://ltp.sourceforge.net/coverage/lcov.php"> LCOV </ulink>, and
-      <ulink url="&gnome-download-http;/nautilus-sendto/">Nautilus SendTo</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="cheese-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Depending on your camera, enable the appropriate options and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="cheese-kernel.xml"/>
-
-    <indexterm zone="cheese cheese-kernel">
-      <primary sortas="d-cheese">cheese</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cheese</title>
-
-    <para>
-      Install <application>Cheese</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr        \
-            --buildtype=release  \
-            -Dgtk_doc=false      \
-            -Dtests=true         \
-            ..                   &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: This switch prevents the build
-      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.
-    </para>
-
-    <para>
-      <parameter>-Dtests=true</parameter>: This switch allows building the
-      tests so that the test suite can be run. Remove this switch if you are
-      not going to run the tests.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cheese
-        </seg>
-        <seg>
-          libcheese.so and libcheese-gtk.so
-        </seg>
-        <seg>
-          /usr/{include,share/gtk-doc/html,share/help/*}/cheese
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cheese-prog">
-        <term><command>cheese</command></term>
-        <listitem>
-          <para>
-            is a webcam tool with graphical effects
-          </para>
-          <indexterm zone="cheese cheese-prog">
-            <primary sortas="b-cheese">cheese</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcheese">
-        <term><filename class="libraryfile">libcheese.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cheese</application> API functions
-          </para>
-          <indexterm zone="cheese libcheese">
-            <primary sortas="c-libcheese">libcheese.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcheese-gtk">
-        <term><filename class="libraryfile">libcheese-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cheese</application>
-            <application>GTK+</application> widgets
-          </para>
-          <indexterm zone="cheese libcheese-gtk">
-            <primary sortas="c-libcheese-gtk">libcheese-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/chromium.xml
===================================================================
--- archive/chromium.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,476 +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 chromium-download-http "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-&chromium-version;.tar.xz">
-  <!ENTITY chromium-download-ftp  " ">
-  <!ENTITY chromium-md5sum        "0c361a429c5dcea568cbc7b001a82d92">
-  <!ENTITY chromium-size          "460 MB">
-  <!ENTITY chromium-buildsize     "6.0 GB">
-  <!ENTITY chromium-time          "120 SBU (with parallelism=4)">
-  <!-- Ninja defaults to parallel build unless supplying -jx, SBU measured on
-  dual core, hyperthreaded CPU (4 threads).
-  
-  I measured with -j4. - Bruce
-  
-  -->
-]>
-
-<sect1 id="chromium" xreflabel="Chromium-&chromium-version;">
-  <?dbhtml filename="chromium.html"?>
-
-
-  <title>Chromium-&chromium-version;</title>
-
-  <indexterm zone="chromium">
-    <primary sortas="a-Chromium">Chromium</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Chromium</title>
-
-    <para><application>Chromium</application> is an open-source browser project
-    that aims to build a safer, faster, and more stable way for all users to
-    experience the web.</para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&chromium-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&chromium-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &chromium-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &chromium-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &chromium-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &chromium-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <bridgehead renderas="sect4">Required patch:</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <ulink url="&patch-root;/chromium-&chromium-version;-constexpr-1.patch"/>
-        </para>
-      </listitem>
-<!--      <listitem>
-        <para>
-          <ulink url="&patch-root;/chromium-&chromium-version;-glibc-2.26-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <ulink url="&patch-root;/chromium-&chromium-version;-gn_bootstrap-1.patch"/>
-        </para>
-      </listitem> -->
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Optional Chrome binaries to extract the
-    <application>WideVine</application> plug-in (Netflix) support:</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP):
-          <ulink url="http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_&chromium-version;-1_amd64.deb"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: 1caee436e3dc8fda6560a421e60717e4</para>
-      </listitem>
-      <listitem>
-        <para>Download size: 49.1 MB</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP):
-          <ulink url="http://mirror.retrosnub.co.uk/apt/google/pool/main/g/google-chrome-stable/google-chrome-stable_48.0.2564.116-1_i386.deb"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: 895e877b9bfe5da05a061369c2078626</para>
-      </listitem>
-      <listitem>
-        <para>Download size: 45.3 MB</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Chromium Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="perl-file-basedir"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="nodejs"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="usbutils"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="make-ca"/> (runtime),
-<!--      <xref linkend="ffmpeg"/>, -->
-      <xref linkend="flac"/>,
-      <xref linkend="git"/>,
-<!--      <xref linkend="icu"/>, -->
-<!--      <xref linkend="libevent"/>, -->
-      <xref linkend="liberation-fonts"/>
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-<!--      <xref linkend="libpng"/>, -->
-      <xref linkend="libsecret"/>,
-<!--      <xref linkend="libvpx"/>, -->
-      <xref linkend="libwebp"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="xdg-utils"/>, and
-      <xref linkend="yasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="ffmpeg"/> (currently broken),<!-- https://crbug.com/731766 -->
-      <xref linkend="GConf"/>,
-      <xref linkend="icu"/> (currently broken),<!-- Review comments at https://chromium.googlesource.com/chromium/src/+/e58fa0ba66272c5f28828b15d06c7e42a9882b3b to verify fitness for BLFS's ICU build -->
-      <xref linkend="gnome-keyring"/>,
-      <xref linkend="libevent"/>,
-      <xref linkend="libpng"/> (currently broken),<!-- https://crbug.com/75240 -->
-      <xref linkend="libvpx"/> (currently broken),<!-- https://bugs.gentoo.org/611394 -->
-      <xref linkend="libxml2"/> (currently broken),<!-- https://crbug.com/736026 -->
-      <xref linkend="upower"/> (runtime),
-      <ulink url="https://devel.freebsoft.org/speechd">speech-dispatcher</ulink>
-      (for the screen reader), and
-      <ulink url="https://google.github.io/snappy">snappy</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/chromium"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Chromium</title>
-
-    <para>Enable the use of the
-    <ulink url="http://www.widevine.com/">WideVine</ulink> plugin, needed for
-    Netflix support (see the WideVine section below). Define an
-    available product name ("Pinkie Pie" in this case) with the following
-    command:</para>
-
-<screen><userinput>line='#define WIDEVINE_CDM_VERSION_STRING "Pinkie Pie"' 
-sed "/WIDEVINE_CDM_AVAILABLE/a$line" \
-    -i third_party/widevine/cdm/stub/widevine_cdm_version.h</userinput></screen>
-
-    <para>Optionally silence several (2000+) invalid warnings:</para>
-
-<screen><userinput>sed '/static_assert/s:^://:' \
-    -i third_party/WebKit/Source/platform/wtf/text/TextCodec.h</userinput></screen>
-
-    <para>Fix a build issue with recent versions of GCC:</para>
-
-<screen><userinput>patch -Np1 -i ../chromium-&chromium-version;-constexpr-1.patch</userinput></screen>
-
-    <para>Remove third-party build files that interfere with system versions:</para>
-
-    <note>
-      <para>
-        Chromium uses many external projects, the selections below are not set
-        in stone, however they have been tested thoroughly. With Chromium
-        &chromium-version;, system versions of libvpx, libxml2,
-        and zlib are known to break the build at this time.
-        <!-- icu: Now at 59 internally - seems to work now -->
-        <!-- icu: Now at 60 - is broken -->
-        <!-- libevent: needs internal headers - seems to work now -->
-        <!-- libvpx: breaks build in gfx -->
-        <!-- libxml2: breaks build with ui - seems to work now -->
-        <!-- zlib requires libminizip -->
-      </para>
-    </note>
-
-<!-- Again, thanks to Arch, this is much better than listing all the needed
-shipped libs required to use the remove_bundled_files.py script -->
-<screen><userinput>for LIB in <!--ffmpeg -->flac freetype harfbuzz-ng<!-- icu libevent--> libjpeg \
-           libjpeg_turbo<!-- libpng--> libwebp <!-- libxml libvpx-->libxslt yasm; do
-    find -type f -path "*third_party/$LIB/*"      \
-        \! -path "*third_party/$LIB/chromium/*"   \
-        \! -path "*third_party/$LIB/google/*"     \
-        \! -path "*base/third_party/icu/*"        \
-        \! -path './third_party/yasm/run_yasm.py' \
-        \! -regex '.*\.\(gn\|gni\|isolate\|py\)'  \
-        \! -path './third_party/freetype/src/src/psnames/pstables.h' \
-        -delete
-done &amp;&amp;
-
-python build/linux/unbundle/replace_gn_files.py     \
-    --system-libraries<!-- ffmpeg--> flac <!-- harfbuzz-ng -->libjpeg libxml libevent \
-                       <!--libpng -->libwebp libxslt opus yasm <!-- freetype libxml libvpx-->    &amp;&amp;
-
-python third_party/libaddressinput/chromium/tools/update-strings.py</userinput></screen>
-
-    <para><application>Chromium</application> uses an internal tool, <ulink
-    url="https://chromium.googlesource.com/chromium/src/tools/gn">gn</ulink>,
-    to generate the <application>Ninja</application> build files. Complete
-    configuration of the build using the following commands:</para>
-
-    <note>
-      <para>
-        <!-- Taken from Arch Linux - an immensely helpful link - Thanks -->
-        The Google API Key and OAuth tokens 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"/>.
-        <!-- 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>GN_CONFIG=('google_api_key="AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ"'
-'google_default_client_id="595013732528-llk8trb03f0ldpqq6nprjp1s79596646.apps.googleusercontent.com"'
-'google_default_client_secret="5ntt6GbbkjnTVXx-MSxbmx5e"'
-'clang_use_chrome_plugins=false'
-'enable_hangout_services_extension=true'
-'enable_nacl=false'
-'enable_nacl_nonsfi=false'
-'enable_swiftshader=false'
-'enable_widevine=true'
-'fatal_linker_warnings=false'
-'ffmpeg_branding="Chrome"'
-'fieldtrial_testing_like_official_build=true'
-'is_debug=false'
-'is_clang=false'
-'link_pulseaudio=true'
-'linux_use_bundled_binutils=false'
-'proprietary_codecs=true'
-'remove_webcore_debug_symbols=true'
-'symbol_level=0'
-'treat_warnings_as_errors=false'
-'use_allocator="none"'
-'use_cups=true'
-'use_gconf=false'
-'use_gnome_keyring=false'
-'use_gold=false'
-'use_gtk3=true'
-'use_kerberos=true'
-'use_pulseaudio=true'
-'use_sysroot=false'
-'use_system_freetype=true'
-'use_system_harfbuzz=true')</userinput></screen>
-
-    <para>Build <application>gn</application> and use it to prepare the
-    <application>Ninja</application> build files:</para>
-
-<screen><userinput>python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}" &amp;&amp;
-out/Release/gn gen out/Release --args="${GN_CONFIG[*]}"</userinput></screen>
-
-    <warning>
-      <para>Ninja, by default, sets the number of jobs to the number of
-      available threads. If your machine is memory constrained, with regard to
-      number of threads, you should reduce the number of jobs by passing the 
-      <parameter>-j#</parameter> switch to the <command>ninja</command> command
-      below. Plan for roughly 1.25GB per thread while linking
-      <application>WebKit</application> to avoid out of memory errors.</para>
-    </warning>
-
-    <para>Build <application>Chromium</application> using the following
-    commands:</para>
-
-<screen><userinput>mkdir -p third_party/node/linux/node-linux-x64/bin &amp;&amp;
-ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ &amp;&amp;
-ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter</userinput></screen>
-
-    <para>This package was already tested as part of the build.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    install the package:</para>
-
-<screen role="root"><userinput>install -vDm755  out/Release/chrome \
-                 /usr/lib/chromium/chromium                   &amp;&amp;
-
-install -vDm4755 out/Release/chrome_sandbox \
-                 /usr/lib/chromium/chrome-sandbox             &amp;&amp;
-
-install -vDm755  out/Release/chromedriver \
-                 /usr/lib/chromium/chromedriver               &amp;&amp;
-
-ln -svf /usr/lib/chromium/chromium     /usr/bin               &amp;&amp;
-ln -svf /usr/lib/chromium/chromedriver /usr/bin               &amp;&amp;
-
-install -vDm644 out/Release/gen/content/content_resources.pak \
-                /usr/lib/chromium/                            &amp;&amp;
-<!-- This is needed if using internal icu -->
-install -vDm644 out/Release/icudtl.dat \
-                /usr/lib/chromium/icudtl.dat                  &amp;&amp;
-
-install -vDm644 out/Release/{*.pak,*.bin} \
-                /usr/lib/chromium/                            &amp;&amp;
-
-sed -i \
-    -e "s/@@MENUNAME@@/Chromium/g" \
-    -e "s/@@PACKAGE@@/chromium/g" \
-    -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
-    chrome/installer/linux/common/desktop.template \
-    chrome/app/resources/manpage.1.in                         &amp;&amp;
-
-install -vDm644 chrome/installer/linux/common/desktop.template \
-                /usr/share/applications/chromium.desktop      &amp;&amp;
-
-install -vDm644 chrome/app/resources/manpage.1.in \
-                /usr/share/man/man1/chromium.1                &amp;&amp;
-
-cp -av out/Release/locales /usr/lib/chromium/                 &amp;&amp;
-chown -Rv root:root /usr/lib/chromium/locales                 &amp;&amp;
-
-for size in 16 32; do
-    install -vDm644 \
-        "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
-        "/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-done &amp;&amp;
-
-for size in 22 24 48 64 128 256; do
-    install -vDm644 "chrome/app/theme/chromium/product_logo_$size.png" \
-        "/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-done</userinput></screen>
-
-    <note>
-      <para>If upgrading from a previous build of chromium using gtk+-2.x, you
-      may need to remove the <filename
-      class="directory">~/.config/chromium</filename> directory.</para>
-    </note>
-
-    <bridgehead renderas="sect3">Extracting the WideVine plugin from Chrome</bridgehead>
-
-    <para>Extract the downloaded deb file with the following commands:</para>
-
-<screen><userinput>mkdir temp                                         &amp;&amp;
-cd temp                                            &amp;&amp;
-case $(uname -m) in
-    x86_64) ar -x ../../google-chrome-stable_&chromium-version;-1_amd64.deb
-    ;;
-    i?86)   ar -x ../../google-chrome-stable_48.0.2564.116-1_i386.deb
-    ;;
-esac</userinput></screen>
-
-    <para>As the <systemitem class="username">root</systemitem> user, enable
-    the WideVine plugin with the following commands:</para>
-
-<!-- Note that libwidevinecdmadapter.so is not in the tarball.  It is
-created only if enable_widevine=true i sset in GN_CONFIG -->
-
-<screen role="root"><userinput>tar -xf data.tar.xz                                                        &amp;&amp;
-install -vm755 ../out/Release/libwidevinecdmadapter.so /usr/lib/chromium/  &amp;&amp;
-install -vm755 opt/google/chrome/libwidevinecdm.so  /usr/lib/chromium/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>GN_CONFIG=(...)</command>: this array contains
-    all of the defines used in the build.</para>
-
-    <para><command>python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}"</command>:
-    this command replaces defines in the gn files with the values contained in 
-    <envar>${GN_CONFIG[@]}</envar>.</para>
-
-    <para><command>out/Release/gn gen out/Release --args="${GN_CONFIG[*]}"</command>:
-    this command runs a Google provided configuration script
-    <application>gn</application> on the source tree to produce
-    a <application>Ninja</application> configuration suitable for the build
-    machine.</para>
-
-    <para><command>mkdir...ln -s /usr/bin/node
-    third_party/node/linux/node-linux-x64/bin/</command>: these commands
-    replaced the local <application>Node.js</application> (no longer available)
-    with the system installed <application>Node.js</application>.</para>
-
-    <para><command>ar -x ../../google-chrome-stable*.deb</command>:
-    the <command>ar</command> utility is used to extract Debian archives.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>/usr/lib/chromium/chromium,
-        /usr/lib/chromium/chromedriver, and
-        /usr/lib/chromium/chrome-sandbox</seg>
-        <seg>none</seg>
-        <seg>/usr/lib/chromium</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chromium-lib">
-        <term><command>/usr/lib/chromium/chromium</command></term>
-        <listitem>
-          <para> is the main chromium executable.</para>
-          <indexterm zone="chromium chromium-lib">
-            <primary sortas="b-chromiumlib">chromium</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chromedriver">
-        <term><command>/usr/lib/chromium/chromedriver</command></term>
-        <listitem>
-          <para> is a
-          <ulink url="http://www.seleniumhq.org/projects/webdriver/">
-          WebDriver</ulink> for Chromium.</para>
-          <indexterm zone="chromium chromedriver">
-            <primary sortas="b-chromedriver">chromedriver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chrome-sandbox">
-        <term><command>/usr/lib/chromium/chrome-sandbox</command></term>
-        <listitem>
-          <para> creates a sandboxed environment for running untrusted
-          code (plugins).</para>
-          <indexterm zone="chromium chrome-sandbox">
-            <primary sortas="b-chrome-sandbox">chrome-sandbox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/chrpath.xml
===================================================================
--- archive/chrpath.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +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 chrpath-download-http "https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-&chrpath-version;.tar.gz">
-  <!ENTITY chrpath-download-ftp  " ">
-  <!ENTITY chrpath-md5sum        "2bf8d1d1ee345fc8a7915576f5649982">
-  <!ENTITY chrpath-size          "132 KB">
-  <!ENTITY chrpath-buildsize     "1 MB">
-  <!ENTITY chrpath-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="chrpath" xreflabel="chrpath-&chrpath-version;">
-  <?dbhtml filename="chrpath.html"?>
-
-
-  <title>chrpath-&chrpath-version;</title>
-
-  <indexterm zone="chrpath">
-    <primary sortas="a-chrpath">chrpath</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to chrpath</title>
-
-    <para>
-      The <application>chrpath</application> modify the dynamic library load
-      path (rpath and runpath) of compiled programs and libraries.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&chrpath-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&chrpath-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &chrpath-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &chrpath-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &chrpath-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &chrpath-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/chrpath"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of chrpath</title>
-
-    <para>
-      Install <application>chrpath</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 docdir=/usr/share/doc/chrpath-&chrpath-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          chrpath
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/chrpath-&chrpath-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chrpath-prog">
-        <term><command>chrpath</command></term>
-        <listitem>
-          <para>
-            changes the rpath or runpath in ELF files.
-          </para>
-          <indexterm zone="chrpath chrpath-prog">
-            <primary sortas="b-chrpath">chrpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/clutter-gst.xml
===================================================================
--- archive/clutter-gst.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +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 clutter-gst-download-http
-           "&gnome-download-http;/clutter-gst/3.0/clutter-gst-&clutter-gst-version;.tar.xz">
-  <!ENTITY clutter-gst-download-ftp
-           "&gnome-download-ftp;/clutter-gst/3.0/clutter-gst-&clutter-gst-version;.tar.xz">
-  <!ENTITY clutter-gst-md5sum        "2bf9d7ca146c9d71e86c45cd00e9a28e">
-  <!ENTITY clutter-gst-size          "396 KB">
-  <!ENTITY clutter-gst-buildsize     "10 MB">
-  <!ENTITY clutter-gst-time          "0.2 SBU">
-]>
-
-<sect1 id="clutter-gst" xreflabel="clutter-gst-&clutter-gst-version;">
-  <?dbhtml filename="clutter-gst.html"?>
-
-
-  <title>clutter-gst-&clutter-gst-version;</title>
-
-  <indexterm zone="clutter-gst">
-    <primary sortas="a-clutter-gst">clutter-gst</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Clutter Gst</title>
-
-    <para>
-      The <application>Clutter Gst</application> package contains an
-      integration library for using <application>GStreamer</application> with
-      <application>Clutter</application>. Its purpose is to implement the
-      ClutterMedia interface using <application>GStreamer</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clutter-gst-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clutter-gst-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clutter-gst-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clutter-gst-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clutter-gst-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clutter-gst-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Clutter Gst Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/>,
-      <xref linkend="gst10-plugins-base"/>, and
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gst10-plugins-bad"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/castano/cgc-opensrc">Cgc</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Clutter Gst</title>
-
-    <para>
-      Install <application>Clutter Gst</application> by running the following
-      commands:
-    </para>
-<!--
-    <note><para>
-      This package<!- -must be built from an Xterm.  It will- -> fails to build
-      over an ssh session.
-    </para></note>
-Seems to work now 20151016. - Bruce
--->
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libclutter-gst-3.0.so and /usr/lib/gstreamer-1.0/libcluttergst3.so
-        </seg>
-        <seg>
-          /usr/include/clutter-gst-3.0 and
-          /usr/share/gtk-doc/html/clutter-gst-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libclutter-gst-3">
-        <term><filename class="libraryfile">libclutter-gst-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Clutter Gst</application> API functions
-          </para>
-          <indexterm zone="clutter-gst libclutter-gst-3">
-            <primary sortas="c-libclutter-gst-3">libclutter-gst-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/clutter-gtk.xml
===================================================================
--- archive/clutter-gtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 clutter-gtk-download-http
-           "&gnome-download-http;/clutter-gtk/1.8/clutter-gtk-&clutter-gtk-version;.tar.xz">
-  <!ENTITY clutter-gtk-download-ftp
-           "&gnome-download-ftp;/clutter-gtk/1.8/clutter-gtk-&clutter-gtk-version;.tar.xz">
-  <!ENTITY clutter-gtk-md5sum        "b363ac9878e2337be887b8ee9e1da00e">
-  <!ENTITY clutter-gtk-size          "324 KB">
-  <!ENTITY clutter-gtk-buildsize     "5.2 MB">
-  <!ENTITY clutter-gtk-time          "0.1 SBU">
-]>
-
-<sect1 id="clutter-gtk" xreflabel="clutter-gtk-&clutter-gtk-version;">
-  <?dbhtml filename="clutter-gtk.html"?>
-
-
-  <title>clutter-gtk-&clutter-gtk-version;</title>
-
-  <indexterm zone="clutter-gtk">
-    <primary sortas="a-clutter-gtk">clutter-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Clutter Gtk</title>
-
-    <para>
-      The <application>Clutter Gtk</application> package is a library
-      providing facilities to integrate <application>Clutter</application>
-      into <application>GTK+</application> applications.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clutter-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clutter-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clutter-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clutter-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clutter-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clutter-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Clutter Gtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Clutter Gtk</title>
-
-    <para>
-      Install <application>Clutter Gtk</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libclutter-gtk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/clutter-gtk-1.0 and
-          /usr/share/gtk-doc/html/clutter-gtk-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libclutter-gtk-1">
-        <term><filename class="libraryfile">libclutter-gtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Clutter Gtk</application> API functions
-          </para>
-          <indexterm zone="clutter-gtk libclutter-gtk-1">
-            <primary sortas="c-libclutter-gtk-1">libclutter-gtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/clutter.xml
===================================================================
--- archive/clutter.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,221 +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 clutter-download-http "&gnome-download-http;/clutter/1.26/clutter-&clutter-version;.tar.xz">
-  <!ENTITY clutter-download-ftp  "&gnome-download-ftp;/clutter/1.26/clutter-&clutter-version;.tar.xz">
-  <!ENTITY clutter-md5sum        "624dd776a5159de0267587b1df6b97b2">
-  <!ENTITY clutter-size          "5.2 MB">
-  <!ENTITY clutter-buildsize     "93 MB (with tests)">
-  <!ENTITY clutter-time          "0.7 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="clutter" xreflabel="Clutter-&clutter-version;">
-  <?dbhtml filename="clutter.html"?>
-
-
-  <title>Clutter-&clutter-version;</title>
-
-  <indexterm zone="clutter">
-    <primary sortas="a-Clutter">Clutter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Clutter</title>
-
-    <para>
-      The <application>Clutter</application> package contains an open
-      source software library used for creating fast, visually rich
-      and animated graphical user interfaces.
-    </para>
-
-    &lfs120_checked;
-
-    <note>
-      <para>
-        Anything built with this toolkit needs hardware 3D acceleration from
-        the graphics driver at runtime. This is provided by
-        <application>Mesa</application> (or by proprietary graphics drivers),
-        but is not available for every graphics card nor for all virtual
-        machines. You may wish to review <xref linkend="checking-dri"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clutter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clutter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clutter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clutter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clutter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clutter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Clutter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="cogl"/>, and
-      <xref linkend="json-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="libxkbcommon"/>, and
-      <xref linkend="wayland"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Clutter</title>
-<!--
-    <para>
-      If you wish to run the tests, the following commands disable two tests
-      that fail.
-    </para>
-
-<screen><userinput>sed -i '/actor-offscreen-redirect/d' \
-       tests/conform/Makefile.am tests/conform/Makefile.in &amp;&amp;
-autoreconf -f -i</userinput></screen>
--->
-    <para>
-      Install <application>Clutter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr               \
-            --sysconfdir=/etc           \
-            --enable-egl-backend        \
-            --enable-evdev-input        \
-            --enable-wayland-backend    \
-            --enable-wayland-compositor &amp;&amp;
-make</userinput></screen>
-
-    <!-- https://gitlab.gnome.org/GNOME/clutter/-/issues/6 -->
-    <para>
-      The test suite is not recommended because some tests may
-      hang forever. If you want to test the results anyway,
-      issue: <command>make -j1 -k check</command>. You must be
-      in an xterm or similar, because it launches some windows. Two tests,
-      <filename>actor-destroy 1 /actor/destruction</filename> and
-      <filename>actor-paint-opacity 1 /actor/opacity/text</filename>, are known
-      to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-egl-backend</parameter>: This switch enables
-      the experimental EGL windowing backend.
-    </para>
-
-    <para>
-      <parameter>--enable-evdev-input</parameter>: This switch enables
-      the experimental Evdev input backend which is required for
-      <application>GNOME</application> Wayland support.
-    </para>
-
-    <para>
-      <parameter>--enable-wayland-backend</parameter> and
-      <parameter>--enable-wayland-compositor</parameter>: These
-      switches enable the experimental <application>Wayland</application> API
-      in <application>Clutter</application> which is required for
-      <application>GNOME</application> Wayland support.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libclutter-1.0.so and libclutter-glx-1.0.so
-        </seg>
-        <seg>
-          /usr/include/clutter-1.0 and
-          /usr/share/gtk-doc/html/{cally,clutter}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libclutter-1">
-        <term><filename class="libraryfile">libclutter-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Clutter</application> API functions
-          </para>
-          <indexterm zone="clutter libclutter-1">
-            <primary sortas="c-libclutter-1">libclutter-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/cogl.xml
===================================================================
--- archive/cogl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,265 +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;
-
-  <!-- Editors, update this for new releases as needed -->
-  <!ENTITY cogl-minor "1.22">
-
-  <!ENTITY cogl-download-http "&gnome-download-http;/cogl/&cogl-minor;/cogl-&cogl-version;.tar.xz">
-  <!ENTITY cogl-download-ftp  "&gnome-download-ftp;/cogl/&cogl-minor;/cogl-&cogl-version;.tar.xz">
-  <!ENTITY cogl-md5sum        "7dd8b2e24171ef7399f851cea144b569">
-  <!ENTITY cogl-size          "1.7 MB">
-  <!ENTITY cogl-buildsize     "69 MB (add 2 MB for tests)">
-  <!ENTITY cogl-time          "0.3 SBU (Using parallelism=4; add 0.2 SBU for tests)">
-  <!-- Timing may depend on the capabilities and speed of the graphics card.
-       The timing for 1.22.8 was taken on an Intel-based system, with HD Graphics
-       530 on a Skylake i5-6600k.-->
-]>
-
-<sect1 id="cogl" xreflabel="Cogl-&cogl-version;">
-  <?dbhtml filename="cogl.html"?>
-
-
-  <title>Cogl-&cogl-version;</title>
-
-  <indexterm zone="cogl">
-    <primary sortas="a-Cogl">Cogl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cogl</title>
-
-    <para>
-      <application>Cogl</application> is a modern 3D graphics API with associated
-      utility APIs designed to expose the features of 3D graphics hardware using
-      a direct state access API design, as opposed to the state-machine style
-      of OpenGL.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cogl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cogl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cogl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cogl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cogl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cogl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- No longer required with 1.22.8
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cogl-&cogl-version;-mesa_20_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Cogl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="pango"/>, and
-      <xref linkend="wayland"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk-doc"/>, and
-      <xref linkend="sdl2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cogl</title>
-
-<!--
-    <para>
-      First fix an issue introduced by mesa-20.x and later:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../cogl-&cogl-version;-mesa_20_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>Cogl</application> by running the following
-      commands:
-    </para>
-
-    &parallel_issues;
-
-<screen><userinput>./configure --prefix=/usr  \
-            --enable-gles1 \
-            --enable-gles2 \
-            --enable-{kms,wayland,xlib}-egl-platform \
-            --enable-wayland-egl-server              &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      All of the tests except for the ES2 and ES2-NPT tests are broken due to
-      slight behavior changes in Mesa. To test the results anyway, issue:
-      <command>make check</command>. The tests should be run from an X terminal
-      on a hardware accelerated Xorg Server. A few tests will use all CPUs in
-      parallel, regardless of parallellism settings.
-      <!-- I found this on my system with an NVIDIA GPU, but running the tests
-           on an 11.3 system with an Intel GPU provides the same results. -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-gles1</parameter>: This switch enables support
-      for OpenGL ES 1.1.
-    </para>
-
-    <para>
-      <parameter>--enable-gles2</parameter>: This switch enables support
-      for OpenGL ES 2.0.
-    </para>
-
-    <para>
-      <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>:
-      These switches enable support for KMS, Wayland and Xlib EGL platforms.
-      They are required for <application>GNOME</application> Wayland support.
-    </para>
-
-    <para>
-      <parameter>--enable-wayland-egl-server</parameter>: This switch
-      enables <application>Cogl</application>'s Wayland Server API which is
-      required for <application>GNOME</application> Wayland support.
-    </para>
-
-    <para>
-      <option>--enable-cogl-gst</option>: This switch enables gstreamer support.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libcogl-gles2.so,
-          libcogl-pango.so,
-          libcogl-path.so, and
-          libcogl.so, and optional libraries
-          libcogl-gst.so and /usr/lib/gstreamer-1.0/libgstcogl.so
-       </seg>
-        <seg>
-         /usr/include/cogl and
-         /usr/share/cogl
-       </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcogl-gles2">
-        <term><filename class="libraryfile">libcogl-gles2.so</filename></term>
-        <listitem>
-          <para>
-            is the OpenGL ES 2.0 integration library for
-            <application>Cogl</application>
-          </para>
-          <indexterm zone="cogl libcogl-gles2">
-            <primary sortas="c-libcogl-gles2">libcogl-gles2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcogl-pango">
-        <term><filename class="libraryfile">libcogl-pango.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Pango</application> integration library
-            for <application>Cogl</application>
-          </para>
-          <indexterm zone="cogl libcogl-pango">
-            <primary sortas="c-libcogl-pango">libcogl-pango.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcogl">
-        <term><filename class="libraryfile">libcogl.so</filename></term>
-        <listitem>
-          <para>
-            is an object oriented GL/GLES Abstraction/Utility Layer library
-          </para>
-          <indexterm zone="cogl libcogl">
-            <primary sortas="c-libcogl">libcogl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/colord.xml
===================================================================
--- archive/colord.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,342 +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 colord-download-http
-           "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
-  <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "80b106ba18a43c7eeaf2d9a2b8c5725b">
-  <!ENTITY colord-size          "1.2 MB">
-  <!ENTITY colord-buildsize     "37 MB (without tests)">
-  <!ENTITY colord-time          "0.4 SBU (without tests)">
-]>
-
-<sect1 id="colord" xreflabel="Colord-&colord-version;">
-  <?dbhtml filename="colord.html"?>
-
-
-  <title>Colord-&colord-version;</title>
-
-  <indexterm zone="colord">
-    <primary sortas="a-Colord">Colord</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord</title>
-
-    <para>
-      <application>Colord</application> is a system activated daemon that
-      maps devices to color profiles. It is used by
-      <application>GNOME Color Manager</application> for system integration
-      and use when there are no users logged in.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="lcms2"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (for the tests)</bridgehead>
-    <para role="required">
-      <xref linkend="valgrind"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libgusb"/>,
-      <xref linkend="polkit"/>,<phrase revision="sysv"> and</phrase>
-      <phrase revision="systemd"><xref linkend="systemd"/>, and</phrase>
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gnome-desktop"/> and
-      <xref linkend="colord-gtk"/> (to build the example tools),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="sane"/>,
-      <ulink url="http://www.argyllcms.com/">ArgllCMS</ulink>, and
-      <ulink url="http://bash-completion.alioth.debian.org/">Bash Completion</ulink>,
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/colord"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>colord</command> daemon after it is started.
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 71 colord &amp;&amp;
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
-        -g colord -s /bin/false colord</userinput></screen>
-
-    <para>
-      Install <application>Colord</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --with-daemon-user=colord    \
-            --enable-vala                \
-            --enable-systemd-login=no    \
-            --disable-argyllcms-sensor   \
-            --disable-bash-completion    \
-            --disable-static             \
-            --with-systemdsystemunitdir=no &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --with-daemon-user=colord    \
-            --enable-vala                \
-            --disable-argyllcms-sensor   \
-            --disable-bash-completion    \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. For unknown
-      reasons, some tests may fail. Note that the system-wide
-      <application>D-Bus</application> daemon must be running or the tests
-      will fail.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-daemon-user=colord</parameter>: This
-      switch is used so the <command>colord</command> daemon
-      will run as an unprivileged user instead of
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      <parameter>--enable-vala</parameter>: This switch enables
-      building of the Vala bindings. Remove if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--enable-systemd-login=no</parameter>: This parameter fixes
-      building without <application>systemd</application>, which is not part
-      of LFS/BLFS. If you use <application>systemd</application>,
-      replace "no" by "yes".
-    </para>
-
-    <para>
-      <parameter>--disable-argyllcms-sensor</parameter>: Disables <ulink
-      url="http://www.argyllcms.com/">ArgllCMS</ulink> sensor driver.
-    </para>
-
-    <para>
-      <parameter>--disable-bash-completion</parameter>: This switch
-      disables <application>Bash Completion</application>
-      support for <application>Colord</application> apps.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para revision="sysv">
-      <parameter>--with-systemdsystemunitdir=no</parameter>: Disables
-      attempting to build with systemd libraries.
-    </para>
-
-    <para>
-      <option>--enable-gtk-doc</option>: Use this switch if
-      <application>GTK-Doc</application> is installed and you wish to build
-      and install the API documentation.
-    </para>
-
-    <para>
-      <option>--disable-gusb</option>: Use this switch if you don't have
-      <application>libgusb</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-udev</option>: Use this switch if you don't have GUdev
-      installed.
-    </para>
-
-    <para>
-      <option>--disable-polkit</option>: Use this switch if you don't have
-      <application>Polkit</application> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cd-create-profile, cd-fix-profile, cd-iccdump, cd-it8, and colormgr
-        </seg>
-        <seg>
-          libcolord.so, libcolordprivate.so, and libcolorhug.so
-        </seg>
-        <seg>
-          /usr/include/colord-1,
-          /usr/lib/colord-{plugins,sensors},
-          /usr/share/color{,d},
-          /usr/share/gtk-doc/html/colord, and
-          /var/lib/colord
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cd-create-profile">
-        <term><command>cd-create-profile</command></term>
-        <listitem>
-          <para>
-            is a Color Manager Profile Creation Tool.
-          </para>
-          <indexterm zone="colord cd-create-profile">
-            <primary sortas="b-cd-create-profile">cd-create-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-fix-profile">
-        <term><command>cd-fix-profile</command></term>
-        <listitem>
-          <para>
-            is a tool used to fix metadata in ICC profiles.
-          </para>
-          <indexterm zone="colord cd-fix-profile">
-            <primary sortas="b-cd-fix-profile">cd-fix-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-iccdump">
-        <term><command>cd-iccdump</command></term>
-        <listitem>
-          <para>
-            dumps the contents of an ICC profile as human readable text.
-          </para>
-          <indexterm zone="colord cd-iccdump">
-            <primary sortas="b-cd-iccdump">cd-iccdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-it8">
-        <term><command>cd-it8</command></term>
-        <listitem>
-          <para>
-            is a Color Manager Testing Tool.
-          </para>
-          <indexterm zone="colord cd-it8">
-            <primary sortas="b-cd-it8">cd-it8</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colormgr">
-        <term><command>colormgr</command></term>
-        <listitem>
-          <para>
-            is a text-mode program that allows you to interact with colord
-            on the command line.
-          </para>
-          <indexterm zone="colord colormgr">
-            <primary sortas="b-colormgr">colormgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord">
-        <term><filename class="libraryfile">libcolord.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application> API functions.
-          </para>
-          <indexterm zone="colord libcolord">
-            <primary sortas="c-libcolord">libcolord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/compressdoc.xml
===================================================================
--- archive/compressdoc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,602 +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="compressdoc" xreflabel="Compressing man and info pages">
-  <?dbhtml filename="compressdoc.html"?>
-
-
-  <title>Compressing Man and Info Pages</title>
-
-  <indexterm zone="compressdoc">
-    <primary sortas="b-compressdoc">compressdoc</primary>
-  </indexterm>
-
-  <para>Man and info reader programs can transparently process files compressed
-  with <command>gzip</command> or <command>bzip2</command>, a feature you can
-  use to free some disk space while keeping your documentation
-  available. However, things are not that simple; man directories tend to
-  contain links&mdash;hard and symbolic&mdash;which defeat simple ideas like
-  recursively calling <command>gzip</command> on them. A better way to go is
-  to use the script below. If you would prefer to download the file instead of
-  creating it by typing or copy-and-pasting, you can find it at
-  <ulink url="&files-anduin;/compressdoc"/> (the file should be installed in
-  the <filename class="directory">/usr/sbin</filename> directory).</para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /usr/sbin/compressdoc &lt;&lt; "EOF"
-<literal>#!/bin/bash
-# VERSION: 20080421.1623
-#
-# Compress (with bzip2 or gzip) all man pages in a hierarchy and
-# update symlinks - By Marc Heerdink &lt;marc @ koelkast.net&gt;
-#
-# Modified to be able to gzip or bzip2 files as an option and to deal
-# with all symlinks properly by Mark Hymers &lt;markh @ &lfs-domainname;&gt;
-#
-# Modified 20030930 by Yann E. Morin &lt;yann.morin.1998 @ anciens.enib.fr&gt;
-# to accept compression/decompression, to correctly handle hard-links,
-# to allow for changing hard-links into soft- ones, to specify the
-# compression level, to parse the man.conf for all occurrences of MANPATH,
-# to allow for a backup, to allow to keep the newest version of a page.
-#
-# Modified 20040330 by Tushar Teredesai to replace $0 by the name of the
-# script.
-#   (Note: It is assumed that the script is in the user's PATH)
-#
-# Modified 20050112 by Randy McMurchy to shorten line lengths and
-# correct grammar errors.
-#
-# Modified 20060128 by Alexander E. Patrakov for compatibility with Man-DB.
-#
-# Modified 20060311 by Archaic to use Man-DB manpath utility which is a
-# replacement for man --path from Man.
-#
-# Modified 20080421 by Dan Nicholson to properly execute the correct
-# compressdoc when working recursively. This means the same compressdoc
-# will be used whether a full path was given or it was resolved from PATH.
-#
-# Modified 20080421 by Dan Nicholson to be more robust with directories
-# that don't exist or don't have sufficient permissions.
-#
-# Modified 20080421 by Lars Bamberger to (sort of) automatically choose
-# a compression method based on the size of the manpage. A couple bug
-# fixes were added by Dan Nicholson.
-#
-# Modified 20080421 by Dan Nicholson to suppress warnings from manpath
-# since these are emitted when $MANPATH is set. Removed the TODO for
-# using the $MANPATH variable since manpath(1) handles this already.
-#
-# TODO:
-#     - choose a default compress method to be based on the available
-#       tool : gzip or bzip2;
-#     - offer an option to restore a previous backup;
-#     - add other compression engines (compress, zip, etc?). Needed?
-
-# Funny enough, this function prints some help.
-function help ()
-{
-  if [ -n "$1" ]; then
-    echo "Unknown option : $1"
-  fi
-  ( echo "Usage: $MY_NAME &lt;comp_method&gt; [options] [dirs]" &amp;&amp; \
-  cat &lt;&lt; EOT
-Where comp_method is one of :
-  --gzip, --gz, -g
-  --bzip2, --bz2, -b
-                Compress using gzip or bzip2.
-  --automatic
-                Compress using either gzip or bzip2, depending on the
-                size of the file to be compressed. Files larger than 5
-                kB are bzipped, files larger than 1 kB are gzipped and
-                files smaller than 1 kB are not compressed.
-
-  --decompress, -d
-                Decompress the man pages.
-
-  --backup      Specify a .tar backup shall be done for all directories.
-                In case a backup already exists, it is saved as .tar.old
-                prior to making the new backup. If a .tar.old backup
-                exists, it is removed prior to saving the backup.
-                In backup mode, no other action is performed.
-
-And where options are :
-  -1 to -9, --fast, --best
-                The compression level, as accepted by gzip and bzip2.
-                When not specified, uses the default compression level
-                for the given method (-6 for gzip, and -9 for bzip2).
-                Not used when in backup or decompress modes.
-
-  --force, -F   Force (re-)compression, even if the previous one was
-                the same method. Useful when changing the compression
-                ratio. By default, a page will not be re-compressed if
-                it ends with the same suffix as the method adds
-                (.bz2 for bzip2, .gz for gzip).
-
-  --soft, -S    Change hard-links into soft-links. Use with _caution_
-                as the first encountered file will be used as a
-                reference. Not used when in backup mode.
-
-  --hard, -H    Change soft-links into hard-links. Not used when in
-                backup mode.
-
-  --conf=dir, --conf dir
-                Specify the location of man_db.conf. Defaults to /etc.
-
-  --verbose, -v Verbose mode, print the name of the directory being
-                processed. Double the flag to turn it even more verbose,
-                and to print the name of the file being processed.
-
-  --fake, -f    Fakes it. Print the actual parameters compressdoc will use.
-
-  dirs          A list of space-separated _absolute_ pathnames to the
-                man directories. When empty, and only then, use manpath
-                to parse ${MAN_CONF}/man_db.conf for all valid occurrences
-                of MANDATORY_MANPATH.
-
-Note about compression:
-  There has been a discussion on blfs-support about compression ratios of
-  both gzip and bzip2 on man pages, taking into account the hosting fs,
-  the architecture, etc... On the overall, the conclusion was that gzip
-  was much more efficient on 'small' files, and bzip2 on 'big' files,
-  small and big being very dependent on the content of the files.
-
-  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
-
-  On my system (x86, ext3), man pages were 35564KB before compression.
-  gzip -9 compressed them down to 20372KB (57.28%), bzip2 -9 got down to
-  19812KB (55.71%). That is a 1.57% gain in space. YMMV.
-
-  What was not taken into consideration was the decompression speed. But
-  does it make sense to? You gain fast access with uncompressed man
-  pages, or you gain space at the expense of a slight overhead in time.
-  Well, my P4-2.5GHz does not even let me notice this... :-)
-
-EOT
-) | less
-}
-
-# This function checks that the man page is unique amongst bzip2'd,
-# gzip'd and uncompressed versions.
-#  $1 the directory in which the file resides
-#  $2 the file name for the man page
-# Returns 0 (true) if the file is the latest and must be taken care of,
-# and 1 (false) if the file is not the latest (and has therefore been
-# deleted).
-function check_unique ()
-{
-  # NB. When there are hard-links to this file, these are
-  # _not_ deleted. In fact, if there are hard-links, they
-  # all have the same date/time, thus making them ready
-  # for deletion later on.
-
-  # Build the list of all man pages with the same name
-  DIR=$1
-  BASENAME=`basename "${2}" .bz2`
-  BASENAME=`basename "${BASENAME}" .gz`
-  GZ_FILE="$BASENAME".gz
-  BZ_FILE="$BASENAME".bz2
-
-  # Look for, and keep, the most recent one
-  LATEST=`(cd "$DIR"; ls -1rt "${BASENAME}" "${GZ_FILE}" "${BZ_FILE}" \
-         2&gt;/dev/null | tail -n 1)`
-  for i in "${BASENAME}" "${GZ_FILE}" "${BZ_FILE}"; do
-    [ "$LATEST" != "$i" ] &amp;&amp; rm -f "$DIR"/"$i"
-  done
-
-  # In case the specified file was the latest, return 0
-  [ "$LATEST" = "$2" ] &amp;&amp; return 0
-  # If the file was not the latest, return 1
-  return 1
-}
-
-# Name of the script
-MY_NAME=`basename $0`
-
-# OK, parse the command-line for arguments, and initialize to some
-# sensible state, that is: don't change links state, parse
-# /etc/man_db.conf, be most silent, search man_db.conf in /etc, and don't
-# force (re-)compression.
-COMP_METHOD=
-COMP_SUF=
-COMP_LVL=
-FORCE_OPT=
-LN_OPT=
-MAN_DIR=
-VERBOSE_LVL=0
-BACKUP=no
-FAKE=no
-MAN_CONF=/etc
-while [ -n "$1" ]; do
-  case $1 in
-    --gzip|--gz|-g)
-      COMP_SUF=.gz
-      COMP_METHOD=$1
-      shift
-      ;;
-    --bzip2|--bz2|-b)
-      COMP_SUF=.bz2
-      COMP_METHOD=$1
-      shift
-      ;;
-    --automatic)
-      COMP_SUF=TBD
-      COMP_METHOD=$1
-      shift
-      ;;
-    --decompress|-d)
-      COMP_SUF=
-      COMP_LVL=
-      COMP_METHOD=$1
-      shift
-      ;;
-    -[1-9]|--fast|--best)
-      COMP_LVL=$1
-      shift
-      ;;
-    --force|-F)
-      FORCE_OPT=-F
-      shift
-      ;;
-    --soft|-S)
-      LN_OPT=-S
-      shift
-      ;;
-    --hard|-H)
-      LN_OPT=-H
-      shift
-      ;;
-    --conf=*)
-      MAN_CONF=`echo $1 | cut -d '=' -f2-`
-      shift
-      ;;
-    --conf)
-      MAN_CONF="$2"
-      shift 2
-      ;;
-    --verbose|-v)
-      let VERBOSE_LVL++
-      shift
-      ;;
-    --backup)
-      BACKUP=yes
-      shift
-      ;;
-    --fake|-f)
-      FAKE=yes
-      shift
-      ;;
-    --help|-h)
-      help
-      exit 0
-      ;;
-    /*)
-      MAN_DIR="${MAN_DIR} ${1}"
-      shift
-      ;;
-    -*)
-      help $1
-      exit 1
-      ;;
-    *)
-      echo "\"$1\" is not an absolute path name"
-      exit 1
-      ;;
-  esac
-done
-
-# Redirections
-case $VERBOSE_LVL in
-  0)
-     # O, be silent
-     DEST_FD0=/dev/null
-     DEST_FD1=/dev/null
-     VERBOSE_OPT=
-     ;;
-  1)
-     # 1, be a bit verbose
-     DEST_FD0=/dev/stdout
-     DEST_FD1=/dev/null
-     VERBOSE_OPT=-v
-     ;;
-  *)
-     # 2 and above, be most verbose
-     DEST_FD0=/dev/stdout
-     DEST_FD1=/dev/stdout
-     VERBOSE_OPT="-v -v"
-     ;;
-esac
-
-# Note: on my machine, 'man --path' gives /usr/share/man twice, once
-# with a trailing '/', once without.
-if [ -z "$MAN_DIR" ]; then
-  MAN_DIR=`manpath -q -C "$MAN_CONF"/man_db.conf \
-            | sed 's/:/\\n/g' \
-            | while read foo; do dirname "$foo"/.; done \
-            | sort -u \
-            | while read bar; do echo -n "$bar "; done`
-fi
-
-# If no MANDATORY_MANPATH in ${MAN_CONF}/man_db.conf, abort as well
-if [ -z "$MAN_DIR" ]; then
-  echo "No directory specified, and no directory found with \`manpath'"
-  exit 1
-fi
-
-# Check that the specified directories actually exist and are readable
-for DIR in $MAN_DIR; do
-  if [ ! -d "$DIR" -o ! -r "$DIR" ]; then
-    echo "Directory '$DIR' does not exist or is not readable"
-    exit 1
-  fi
-done
-
-# Fake?
-if [ "$FAKE" != "no" ]; then
-  echo "Actual parameters used:"
-  echo -n "Compression.......: "
-  case $COMP_METHOD in
-    --bzip2|--bz2|-b) echo -n "bzip2";;
-    --gzip|--gz|-g) echo -n "gzip";;
-    --automatic) echo -n "compressing";;
-    --decompress|-d) echo -n "decompressing";;
-    *) echo -n "unknown";;
-  esac
-  echo " ($COMP_METHOD)"
-  echo "Compression level.: $COMP_LVL"
-  echo "Compression suffix: $COMP_SUF"
-  echo -n "Force compression.: "
-  [ "foo$FORCE_OPT" = "foo-F" ] &amp;&amp; echo "yes" || echo "no"
-  echo "man_db.conf is....: ${MAN_CONF}/man_db.conf"
-  echo -n "Hard-links........: "
-  [ "foo$LN_OPT" = "foo-S" ] &amp;&amp;
-  echo "convert to soft-links" || echo "leave as is"
-  echo -n "Soft-links........: "
-  [ "foo$LN_OPT" = "foo-H" ] &amp;&amp;
-  echo "convert to hard-links" || echo "leave as is"
-  echo "Backup............: $BACKUP"
-  echo "Faking (yes!).....: $FAKE"
-  echo "Directories.......: $MAN_DIR"
-  echo "Verbosity level...: $VERBOSE_LVL"
-  exit 0
-fi
-
-# If no method was specified, print help
-if [ -z "${COMP_METHOD}" -a "${BACKUP}" = "no" ]; then
-  help
-  exit 1
-fi
-
-# In backup mode, do the backup solely
-if [ "$BACKUP" = "yes" ]; then
-  for DIR in $MAN_DIR; do
-    cd "${DIR}/.."
-    if [ ! -w "`pwd`" ]; then
-      echo "Directory '`pwd`' is not writable"
-      exit 1
-    fi
-    DIR_NAME=`basename "${DIR}"`
-    echo "Backing up $DIR..." &gt; $DEST_FD0
-    [ -f "${DIR_NAME}.tar.old" ] &amp;&amp; rm -f "${DIR_NAME}.tar.old"
-    [ -f "${DIR_NAME}.tar" ] &amp;&amp;
-    mv "${DIR_NAME}.tar" "${DIR_NAME}.tar.old"
-    tar -cvf "${DIR_NAME}.tar" "${DIR_NAME}" &gt; $DEST_FD1
-  done
-  exit 0
-fi
-
-# I know MAN_DIR has only absolute path names
-# I need to take into account the localized man, so I'm going recursive
-for DIR in $MAN_DIR; do
-  MEM_DIR=`pwd`
-  if [ ! -w "$DIR" ]; then
-    echo "Directory '$DIR' is not writable"
-    exit 1
-  fi
-  cd "$DIR"
-  for FILE in *; do
-    # Fixes the case were the directory is empty
-    if [ "foo$FILE" = "foo*" ]; then continue; fi
-
-    # Fixes the case when hard-links see their compression scheme change
-    # (from not compressed to compressed, or from bz2 to gz, or from gz
-    # to bz2)
-    # Also fixes the case when multiple version of the page are present,
-    # which are either compressed or not.
-    if [ ! -L "$FILE" -a ! -e "$FILE" ]; then continue; fi
-
-    # Do not compress whatis files
-    if [ "$FILE" = "whatis" ]; then continue; fi
-
-    if [ -d "$FILE" ]; then
-      # We are going recursive to that directory
-      echo "-&gt; Entering ${DIR}/${FILE}..." &gt; $DEST_FD0
-      # I need not pass --conf, as I specify the directory to work on
-      # But I need exit in case of error. We must change back to the
-      # original directory so $0 is resolved correctly.
-      (cd "$MEM_DIR" &amp;&amp; eval "$0" ${COMP_METHOD} ${COMP_LVL} ${LN_OPT} \
-        ${VERBOSE_OPT} ${FORCE_OPT} "${DIR}/${FILE}") || exit $?
-      echo "&lt;- Leaving ${DIR}/${FILE}." &gt; $DEST_FD1
-
-    else # !dir
-      if ! check_unique "$DIR" "$FILE"; then continue; fi
-
-      # With automatic compression, get the uncompressed file size of
-      # the file (dereferencing symlinks), and choose an appropriate
-      # compression method.
-      if [ "$COMP_METHOD" = "--automatic" ]; then
-        declare -i SIZE
-        case "$FILE" in
-          *.bz2)
-            SIZE=$(bzcat "$FILE" | wc -c) ;;
-          *.gz)
-            SIZE=$(zcat "$FILE" | wc -c) ;;
-          *)
-            SIZE=$(wc -c &lt; "$FILE") ;;
-        esac
-        if (( $SIZE &gt;= (5 * 2**10) )); then
-          COMP_SUF=.bz2
-        elif (( $SIZE &gt;= (1 * 2**10) )); then
-          COMP_SUF=.gz
-        else
-          COMP_SUF=
-        fi
-      fi
-
-      # Check if the file is already compressed with the specified method
-      BASE_FILE=`basename "$FILE" .gz`
-      BASE_FILE=`basename "$BASE_FILE" .bz2`
-      if [ "${FILE}" = "${BASE_FILE}${COMP_SUF}" \
-         -a "foo${FORCE_OPT}" = "foo" ]; then continue; fi
-
-      # If we have a symlink
-      if [ -h "$FILE" ]; then
-        case "$FILE" in
-          *.bz2)
-            EXT=bz2 ;;
-          *.gz)
-            EXT=gz ;;
-          *)
-            EXT=none ;;
-        esac
-
-        if [ ! "$EXT" = "none" ]; then
-          LINK=`ls -l "$FILE" | cut -d "&gt;" -f2 \
-               | tr -d " " | sed s/\.$EXT$//`
-          NEWNAME=`echo "$FILE" | sed s/\.$EXT$//`
-          mv "$FILE" "$NEWNAME"
-          FILE="$NEWNAME"
-        else
-          LINK=`ls -l "$FILE" | cut -d "&gt;" -f2 | tr -d " "`
-        fi
-
-        if [ "$LN_OPT" = "-H" ]; then
-          # Change this soft-link into a hard- one
-          rm -f "$FILE" &amp;&amp; ln "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
-          chmod --reference "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
-        else
-          # Keep this soft-link a soft- one.
-          rm -f "$FILE" &amp;&amp; ln -s "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
-        fi
-        echo "Relinked $FILE" &gt; $DEST_FD1
-
-      # else if we have a plain file
-      elif [ -f "$FILE" ]; then
-        # Take care of hard-links: build the list of files hard-linked
-        # to the one we are {de,}compressing.
-        # NB. This is not optimum has the file will eventually be
-        # compressed as many times it has hard-links. But for now,
-        # that's the safe way.
-        inode=`ls -li "$FILE" | awk '{print $1}'`
-        HLINKS=`find . \! -name "$FILE" -inum $inode`
-
-        if [ -n "$HLINKS" ]; then
-          # We have hard-links! Remove them now.
-          for i in $HLINKS; do rm -f "$i"; done
-        fi
-
-        # Now take care of the file that has no hard-link
-        # We do decompress first to re-compress with the selected
-        # compression ratio later on...
-        case "$FILE" in
-          *.bz2)
-            bunzip2 $FILE
-            FILE=`basename "$FILE" .bz2`
-          ;;
-          *.gz)
-            gunzip $FILE
-            FILE=`basename "$FILE" .gz`
-          ;;
-        esac
-
-        # Compress the file with the given compression ratio, if needed
-        case $COMP_SUF in
-          *bz2)
-            bzip2 ${COMP_LVL} "$FILE" &amp;&amp; chmod 644 "${FILE}${COMP_SUF}"
-            echo "Compressed $FILE" &gt; $DEST_FD1
-            ;;
-          *gz)
-            gzip ${COMP_LVL} "$FILE" &amp;&amp; chmod 644 "${FILE}${COMP_SUF}"
-            echo "Compressed $FILE" &gt; $DEST_FD1
-            ;;
-          *)
-            echo "Uncompressed $FILE" &gt; $DEST_FD1
-            ;;
-        esac
-
-        # If the file had hard-links, recreate those (either hard or soft)
-        if [ -n "$HLINKS" ]; then
-          for i in $HLINKS; do
-            NEWFILE=`echo "$i" | sed s/\.gz$// | sed s/\.bz2$//`
-            if [ "$LN_OPT" = "-S" ]; then
-              # Make this hard-link a soft- one
-              ln -s "${FILE}$COMP_SUF" "${NEWFILE}$COMP_SUF"
-            else
-              # Keep the hard-link a hard- one
-              ln "${FILE}$COMP_SUF" "${NEWFILE}$COMP_SUF"
-            fi
-            # Really work only for hard-links. Harmless for soft-links
-            chmod 644 "${NEWFILE}$COMP_SUF"
-          done
-        fi
-
-      else
-        # There is a problem when we get neither a symlink nor a plain
-        # file. Obviously, we shall never ever come here... :-(
-        echo -n "Whaooo... \"${DIR}/${FILE}\" is neither a symlink "
-        echo "nor a plain file. Please check:"
-        ls -l "${DIR}/${FILE}"
-        exit 1
-      fi
-    fi
-  done # for FILE
-done # for DIR</literal>
-
-EOF</userinput></screen>
-
-  <note>
-    <para>
-      Doing a very large copy/paste directly to a terminal may result in a
-      corrupted file.  Copying to an editor may overcome this issue.
-    </para>
-  </note>
-
-  <para>As <systemitem class="username">root</systemitem>, make
-  <command>compressdoc</command> executable for all users:</para>
-
-<screen><userinput>chmod -v 755 /usr/sbin/compressdoc</userinput></screen>
-
-  <para>Now, as <systemitem class="username">root</systemitem>, you can issue
-  the command <command>compressdoc --bz2</command> to compress all your system man
-  pages. You can also run <command>compressdoc --help</command> to get
-  comprehensive help about what the script is able to do.</para>
-
-  <para>Don't forget that a few programs, like the <application>X Window
-  System</application> and <application>XEmacs</application> also
-  install their documentation in non-standard places (such as
-  <filename class="directory">/usr/X11R6/man</filename>, etc.). Be sure
-  to add these locations to the file <filename>/etc/man_db.conf</filename>, as
-  <envar>MANDATORY_MANPATH</envar> <replaceable>&lt;/path&gt;</replaceable>
-  lines.</para>
-
-  <para>Example:</para>
-
-<screen><literal>    ...
-    MANDATORY_MANPATH                       /usr/share/man
-    MANDATORY_MANPATH                       /usr/X11R6/man
-    MANDATORY_MANPATH                       /usr/local/man
-    MANDATORY_MANPATH                       /opt/qt/doc/man
-    ...</literal></screen>
-
-  <para>Generally, package installation systems do not compress man/info pages,
-  which means you will need to run the script again if you want to keep the size
-  of your documentation as small as possible. Also, note that running the script
-  after upgrading a package is safe; when you have several versions of a page
-  (for example, one compressed and one uncompressed), the most recent one is kept
-  and the others are deleted.</para>
-
-</sect1>
Index: chive/config.xml
===================================================================
--- archive/config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,46 +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="gnome-config">
-  <?dbhtml filename="config.html"?>
-
-
-  <title>Configuring the Core GNOME Packages</title>
-
-  <para>Create (or append to) a <filename>~/.xinitrc</filename> file to start
-  <application>GNOME</application>:</para>
-
-<screen><userinput>echo "exec gnome-session" &gt;&gt; ~/.xinitrc</userinput></screen>
-
-  <para>If you have <xref linkend="dbus"/> installed, you can start the
-  <application>D-BUS</application> session daemon here as well. Starting the
-  session daemon here has the added bonus that it will exit when you log out
-  of your <application>GNOME</application> session. If you wish to start the
-  daemon here, use the following command instead of the one shown above:</para>
-
-<screen><userinput>echo "exec dbus-launch --exit-with-session gnome-session" &gt;&gt; ~/.xinitrc</userinput></screen>
-
-  <note>
-    <para>Check the <filename>~/.xinitrc</filename> file and ensure you have
-    no other window managers or other <application>X</application> applications
-    mentioned before <application>GNOME</application>.</para>
-  </note>
-
-  <para>Ensure all libraries can be found by updating the linker's cache (as
-  <systemitem class="username">root</systemitem>):</para>
-
-<screen role='root'><userinput>ldconfig</userinput></screen>
-
-  <para>Update the MIME-type application database
-  (as <systemitem class="username">root</systemitem>):</para>
-
-<screen role='root'><userinput>update-desktop-database</userinput></screen>
-
-  <para>At this point you can bring up <application>GNOME</application> with
-  <command>startx</command>.</para>
-
-</sect1>
Index: chive/consolekit.xml
===================================================================
--- archive/consolekit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,399 +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 consolekit-download-http "https://github.com/Consolekit2/ConsoleKit2/releases/download/&consolekit-version;/ConsoleKit2-&consolekit-version;.tar.bz2">
-  <!ENTITY consolekit-download-ftp  " ">
-  <!ENTITY consolekit-md5sum        "17d31475f9b08969e55ea60750f4f219">
-  <!ENTITY consolekit-size          "1.1 MB">
-  <!ENTITY consolekit-buildsize     "18 MB">
-  <!ENTITY consolekit-time          "0.2 SBU">
-]>
-
-<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;">
-  <?dbhtml filename="consolekit.html"?>
-
-
-  <title>ConsoleKit2-&consolekit-version;</title>
-
-  <indexterm zone="consolekit">
-    <primary sortas="a-ConsoleKit">ConsoleKit2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ConsoleKit</title>
-
-    <para>
-      The <application>ConsoleKit</application> package is a framework for
-      keeping track of the various users, sessions, and seats present on a system.
-      It provides a mechanism for software to react to changes of any of these
-      items or of any of the metadata associated with them.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&consolekit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&consolekit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &consolekit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &consolekit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &consolekit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &consolekit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ConsoleKit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="pm-utils"/> (run-time dependency to allow ConsoleKit2 to
-      put the system in <quote>Suspend</quote> or <quote>Hibernation</quote>
-      mode)
-    </para>
-
-    <warning>
-      <para>
-        If you intend <emphasis role="strong">NOT</emphasis> to install
-        <application>polkit</application>, you will need to manually edit the
-        ConsoleKit.conf file to lock down the service. Failure to do so may be a
-        huge SECURITY HOLE.
-      </para>
-    </warning>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/consolekit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ConsoleKit</title>
-
-    <para>
-      Install <application>ConsoleKit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --enable-udev-acl    \
-            --enable-pam-module  \
-            --enable-polkit      \
-            --with-xinitrc-dir=/etc/X11/app-defaults/xinitrc.d \
-            --docdir=/usr/share/doc/ConsoleKit-&consolekit-version;           \
-            --with-systemdsystemunitdir=no                     &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 -v /etc/X11/app-defaults/xinitrc.d/90-consolekit{,.sh}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-udev-acl</parameter>: This switch enables building of
-      the <command>udev-acl</command> tool, which is used to allow normal users
-      to access device nodes normally only accessible to
-      <systemitem class="username">root</systemitem>.
-    </para>
-
-    <para>
-      <parameter>--enable-pam-module</parameter>: This switch enables building
-      of the <application>ConsoleKit</application>
-      <application>PAM</application> module which is needed for
-      <application>ConsoleKit</application> to work correctly with
-      <application>PAM</application>. Remove if
-      <application>Linux PAM</application> is
-      <emphasis role="strong">NOT</emphasis> installed.
-    </para>
-
-    <para>
-      <parameter>--enable-polkit</parameter>: Enable PolicyKit support.
-    </para>
-
-    <para>
-      <parameter>--with-xinitrc-dir=/etc/X11/app-defaults/xinitrc.d</parameter>:
-      Fix the location of the 90-consolekit.sh script. Notice that the script
-      has been renamed after installation, because xinitrc only sources script
-      names ending with extension <emphasis>.sh</emphasis>.
-    </para>
-
-    <para>
-      <parameter>--with-systemdsystemunitdir=no</parameter>: Disable
-      attempting to build with systemd libraries.
-    </para>
-
-    <para>
-      <option>--enable-docbook-docs</option>: Use this switch if
-      <application>xmlto</application> is installed and you wish to
-      build the user and API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ConsoleKit</title>
-
-    <sect3>
-      <title>PAM Module Configuration</title>
-
-      <para>
-        If you use <application>Linux PAM</application>, it needs to be
-        configured to activate <application>ConsoleKit</application> upon user
-        login.  This can be achieved by editing the
-        <filename>/etc/pam.d/system-session</filename> file as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF"
-<literal># Begin ConsoleKit addition
-
-session   optional    pam_loginuid.so
-session   optional    pam_ck_connector.so nox11
-
-# End ConsoleKit addition</literal>
-EOF</userinput></screen>
-
-      <para>
-        You will also need a helper script that creates a file in
-        <filename class="directory">/var/run/console</filename>
-        named as the currently logged in user and that contains the
-        <application>D-Bus</application> address of the session. You
-        can create the script by running the following commands as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck &lt;&lt; "EOF"
-<literal>#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-    mkdir -p "$TAGDIR"
-    echo "$CK_SESSION_ID" &gt;&gt; "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] &amp;&amp; [ -e "$TAGFILE" ]; then
-    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi</literal>
-EOF
-chmod -v 755 /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck</userinput></screen>
-
-      <para>
-        See /usr/share/doc/ConsoleKit/spec/ConsoleKit.html for more
-        configuration.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ck-history, 
-          ck-launch-session, and 
-          ck-list-sessions
-          <!-- Not listing /usr/libexec:
-          ck-collect-session-info    ck-get-x11-server-pid  udev-acl
-          ck-get-x11-display-device  ck-remove-directory -->
-
-        </seg>
-        <seg>
-          libconsolekit.so, 
-          libck-connector.so, and 
-          pam_ck_connector.so
-        </seg>
-        <seg>
-          /etc/ConsoleKit,
-          /usr/{include,lib}/ConsoleKit,
-          /usr/share/doc/ihtml/ConsoleKit-&consolekit-version;, and
-          /var/{log,run}/ConsoleKit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ck-history">
-        <term><command>ck-history</command></term>
-        <listitem>
-          <para>is a utility that provides information from the ConsoleKit
-                database about what users have logged into the system.</para>
-          <indexterm zone="consolekit ck-history">
-            <primary sortas="b-ck-history">ck-history</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-launch-session">
-        <term><command>ck-launch-session</command></term>
-        <listitem>
-          <para>is a utility for starting a command in its own ConsoleKit
-                session.
-          </para>
-          <indexterm zone="consolekit ck-launch-session">
-            <primary sortas="b-ck-launch-session">ck-launch-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-list-sessions">
-        <term><command>ck-list-sessions</command></term>
-        <listitem>
-          <para>list sessions with respective properties. Also good for
-          debugging purposes.</para>
-          <indexterm zone="consolekit ck-list-sessions">
-            <primary sortas="b-ck-list-sessions">ck-list-sessions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-log-system-restart">
-        <term><command>ck-log-system-restart</command></term>
-        <listitem>
-          <para>write system restart to log.</para>
-          <indexterm zone="consolekit ck-log-system-restart">
-            <primary sortas="b-ck-log-system-restart">ck-log-system-restart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-log-system-start">
-        <term><command>ck-log-system-start</command></term>
-        <listitem>
-          <para>write system start to log.</para>
-          <indexterm zone="consolekit ck-log-system-start">
-            <primary sortas="b-ck-log-system-start">ck-log-system-start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-log-system-stop">
-        <term><command>ck-log-system-stop</command></term>
-        <listitem>
-          <para>write system stop to log.</para>
-          <indexterm zone="consolekit ck-log-system-stop">
-            <primary sortas="b-ck-log-system-stop">ck-log-system-stop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="console-kit-daemon">
-        <term><command>console-kit-daemon</command></term>
-        <listitem>
-          <para>is the <application>ConsoleKit</application> daemon.</para>
-          <indexterm zone="consolekit console-kit-daemon">
-            <primary sortas="b-console-kit-daemon">console-kit-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Note (Denis): I don't know if theses programs are installed by the 
-     current version of consolekit.
-     
-     (Bruce) These are in /usr/libexec and we do not document those.
-
-      <varlistentry id="ck-collect-session-info">
-        <term><command>ck-collect-session-info</command></term>
-        <listitem>
-          <para>displays session informations about the current session.</para>
-          <indexterm zone="consolekit ck-collect-session-info">
-            <primary sortas="b-ck-collect-session-info">ck-collect-session-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-get-x11-display-device">
-        <term><command>ck-get-x11-display-device</command></term>
-        <listitem>
-          <para>displays the x11 display device of the current session.</para>
-          <indexterm zone="consolekit ck-get-x11-display-device">
-            <primary sortas="b-ck-get-x11-display-device">ck-get-x11-display-device</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ck-get-x11-server-pid">
-        <term><command>ck-get-x11-server-pid</command></term>
-        <listitem>
-          <para>displays the x11 server pid of the current session.</para>
-          <indexterm zone="consolekit ck-get-x11-server-pid">
-            <primary sortas="b-ck-get-x11-server-pid">ck-get-x11-server-pid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      also ck-remove-directory  udev-acl
-
--->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/akonadi.xml
===================================================================
--- archive/core/akonadi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +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 akonadi-download-http "&kde-download-http;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
-  <!ENTITY akonadi-download-ftp  " ">
-  <!ENTITY akonadi-md5sum        "84eb2e471bd6bdfe54a2a2f1d858c07d">
-  <!ENTITY akonadi-size          "287 KB">
-  <!ENTITY akonadi-buildsize     "82 MB">
-  <!ENTITY akonadi-time          "3.5 SBU, additional 1.5 SBU for tests">
-]>
-
-<sect1 id="akonadi" xreflabel="Akonadi-&akonadi-version;">
-  <?dbhtml filename="akonadi.html"?>
-
-
-  <title>Akonadi-&akonadi-version;</title>
-
-  <indexterm zone="akonadi">
-    <primary sortas="a-Akonadi">Akonadi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Akonadi</title>
-
-    <para><application>Akonadi</application> is an extensible cross-desktop
-    storage service for PIM data and metadata providing concurrent read, write,
-    and query access. It provides unique desktop-wide object identification and
-    retrieval.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&akonadi-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&akonadi-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &akonadi-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &akonadi-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &akonadi-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &akonadi-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Akonadi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="shared-mime-info"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="boost"/>, and one of:
-     <xref linkend="sqlite"/>,
-     <xref linkend="mariadb"/>,
-     <ulink url="http://www.mysql.com/">MySQL</ulink>, or
-     <xref linkend="postgresql"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&sourceforge-repo;/soprano/">soprano</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/akonadi"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Akonadi</title>
-
-    <para>Install <application>Akonadi</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;  \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    a higher level of compiler optimizations.</para>
-
-    <para><option>-DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE</option>: This switch ensures
-    that <application>Akonadi</application> SQLite extension is installed into
-    the <application>Qt</application> plugins directory.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>akonadi_agent_launcher, akonadi_agent_server, akonadi_control,
-        akonadi_rds, akonadictl, akonadiserver and asapcat</seg>
-        <seg>libakonadiprotocolinternals.so and libqsqlite3.so</seg>
-        <seg>&kde-dir;/include/akonadi, &kde-dir;/lib/cmake/Akonadi and
-        &kde-dir;/share/config/akonadi</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/attica.xml
===================================================================
--- archive/core/attica.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +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 attica-download-http "&kde-download-http;attica/attica-&attica-version;.tar.bz2">
-  <!ENTITY attica-download-ftp  " ">
-  <!ENTITY attica-md5sum        "d62c5c9489a68432e8d990dde7680c24">
-  <!ENTITY attica-size          "59 KB">
-  <!ENTITY attica-buildsize     "7.5 MB">
-  <!ENTITY attica-time          "0.5 SBU">
-]>
-
-<sect1 id="attica" xreflabel="Attica-&attica-version;">
-  <?dbhtml filename="attica.html"?>
-
-
-  <title>Attica-&attica-version;</title>
-
-  <indexterm zone="attica">
-    <primary sortas="a-attica">attica</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Attica</title>
-
-    <para><application>Attica</application> is a library to access
-    "Open Collaboration Service" providers.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&attica-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&attica-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &attica-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &attica-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &attica-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &attica-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Attica Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt4"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/attica"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Attica</title>
-
-    <para>Install <application>Attica</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DQT4_BUILD=ON                     \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply a higher level of compiler the optimizations.
-    </para>
-
-    <para>
-      <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
-      to build against <application>Qt4</application> even if
-      <application>Qt5</application> is present on the system.
-    </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>libattica.so</seg>
-        <seg>&kde-dir;/include/attica</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-attica">
-        <term><command>attica</command></term>
-        <listitem>
-          <para>is a testing utility for attica-generated build trees.</para>
-          <indexterm zone="a-attica attica">
-            <primary sortas="b-attica">attica</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: chive/core/automoc4.xml
===================================================================
--- archive/core/automoc4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +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 automoc4-download-http "&kde-download-http;automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
-  <!ENTITY automoc4-download-ftp  " ">
-  <!ENTITY automoc4-md5sum        "91bf517cb940109180ecd07bc90c69ec">
-  <!ENTITY automoc4-size          "0.9 MB">
-  <!ENTITY automoc4-buildsize     "488 KB">
-  <!ENTITY automoc4-time          "0.1 SBU">
-]>
-
-<sect1 id="automoc4" xreflabel="automoc4-&automoc4-version;">
-  <?dbhtml filename="automoc4.html"?>
-
-
-  <title>Automoc4-&automoc4-version;</title>
-
-  <indexterm zone="automoc4">
-    <primary sortas="a-automoc4">automoc4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Automoc4</title>
-
-    <para><application>Automoc4</application> is a tool to add rules for generating
-    <application>Qt</application> moc files automatically to projects that use
-    <application>CMake</application> as the buildsystem.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&automoc4-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&automoc4-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &automoc4-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &automoc4-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &automoc4-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &automoc4-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/automoc4-&automoc4-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Automoc4 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="cmake"/> and
-    <xref linkend="qt4"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/automoc4"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Automoc4</title>
-
-    <para>Install <application>automoc4</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev .. &amp;&amp;
-make</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><option>-Wno-dev</option>: Suppress warnings that are meant for the
-    author of the CMakeLists.txt files.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>automoc4</seg>
-        <seg>none</seg>
-        <seg>none</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-automoc4">
-        <term><command>automoc4</command></term>
-        <listitem>
-          <para>is a utility generating <application>Qt</application> moc
-          files.</para>
-          <indexterm zone="a-automoc4 automoc4">
-            <primary sortas="b-automoc4">automoc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/baloo-widgets.xml
===================================================================
--- archive/core/baloo-widgets.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,113 +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 baloo-widgets-download-http "&kde-download-http;&kde-old-version;/src/baloo-widgets-&kde-old-version;.tar.xz">
-  <!ENTITY baloo-widgets-download-ftp  " ">
-  <!ENTITY baloo-widgets-md5sum        "9ee2a741c502b924a9575a96f10bb5f8">
-  <!ENTITY baloo-widgets-size          "40 KB">
-  <!ENTITY baloo-widgets-buildsize     "3.6 MB">
-  <!ENTITY baloo-widgets-time          "0.1 SBU">
-]>
-
-<sect1 id="baloo-widgets" xreflabel="baloo-widgets-&kde-old-version;">
-  <?dbhtml filename="baloo-widgets.html"?>
-
-
-  <title>Baloo-widgets-&kde-old-version;</title>
-
-  <indexterm zone="baloo-widgets">
-    <primary sortas="a-baloo-widgets">baloo-widgets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Baloo-widgets</title>
-
-    <para>Baloo-widgets contains widgets for the baloo search framework.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&baloo-widgets-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&baloo-widgets-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &baloo-widgets-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &baloo-widgets-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &baloo-widgets-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &baloo-widgets-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Baloo-widgets Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="baloo"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/baloo-widgets"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Baloo-widgets</title>
-
-    <para>Install <application>baloo-widgets</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a working test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          none
-        </seg>
-        <seg>
-          libbaloowidgets.so
-        </seg>
-        <seg>
-          &kde-dir;/include/baloo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/baloo.xml
===================================================================
--- archive/core/baloo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,124 +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 baloo-download-http "&kde-download-http;&kde-old-version;/src/baloo-&kde-old-version;.tar.xz">
-  <!ENTITY baloo-download-ftp  " ">
-  <!ENTITY baloo-md5sum        "09575539cf2c76c951a67da00bd5df5b">
-  <!ENTITY baloo-size          "144 KB">
-  <!ENTITY baloo-buildsize     "33 MB">
-  <!ENTITY baloo-time          "1.8 SBU">
-]>
-
-<sect1 id="baloo" xreflabel="baloo-&kde-old-version;">
-  <?dbhtml filename="baloo.html"?>
-
-
-  <title>Baloo-&kde-old-version;</title>
-
-  <indexterm zone="baloo">
-    <primary sortas="a-baloo">baloo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Baloo</title>
-
-    <para>Baloo is a framework for searching and managing metadata.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&baloo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&baloo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &baloo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &baloo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &baloo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &baloo-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Baloo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdepimlibs"/>,
-      <xref linkend="kfilemetadata"/>, and
-      <xref linkend="xapian"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openssl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/baloo"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Baloo</title>
-
-    <para>Install <application>baloo</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          akonadi_baloo_indexer, baloo_file, baloo_file_cleaner,
-          baloo_file_extractor, baloosearch and balooshow
-        </seg>
-        <seg>
-          libbaloocore.so, libbaloofiles.so, libbaloopim.so, libbalooxapian.so
-          and several in &kde-dir;/lib/kde4
-        </seg>
-        <seg>
-          &kde-dir;/include/baloo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/config.xml
===================================================================
--- archive/core/config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,124 +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="kde-core-config" xreflabel="Starting KDE4">
-  <?dbhtml filename="config.html"?>
-
-
-  <title>Starting KDE4</title>
-
-  <bridgehead renderas="sect3">KDE4 Startup Dependencies</bridgehead>
-
-  <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
-  <para role="recommended">
-    <xref linkend="consolekit"/> and
-    <xref linkend="dbus"/>
-  </para>
-
-  <para>After <application>Kde-workspace</application> has been installed, the
-  first important milestone has been reached. Now you need to configure your
-  system to start KDE4.</para>
-
-  <sect2 role="content">
-  <title>Starting KDE4 from the command prompt</title>
-
-    <para>
-      You can start <application>KDE4</application> from runlevel 3, using
-      <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="sddm"/>.
-    </para>
-
-    <para>
-      To start <application>KDE4</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>ck-launch-session dbus-launch --exit-with-session startkde</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      The X session starts on the first unused virtual terminal, normally vt7.
-      You can switch to another vt<emphasis>n</emphasis> simultaneously
-      pressing the keys Ctrl-Alt-F<emphasis>n</emphasis>
-      (<emphasis>n</emphasis>=1, 2, ...).  To switch back to the X session,
-      normally started at vt7, use Ctrl-Alt-F7. The vt where the command
-      <command>startx</command> was executed will display many messages,
-      including X starting messages, applications automatically started with
-      the session, and eventually, some warning and error messages. You may
-      prefer to redirect those messages to a log file, which not only will keep
-      the initial vt uncluttered, but can also be used for debug purposes. This
-      can be done starting X with:
-    </para>
-
-    <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-    <note>
-      <para>
-        You may wish to drop consolekit and/or dbus-launch, e.g., just using
-        startkde in ~/.xinitrc. However some capabilities such as mounting or
-        umounting file systems from a file manager will not be possible, or the
-        reboot option will be absent or inoperative, among other problems.
-      </para>
-    </note>
-
-    <para>
-      When shutting down or rebooting, the shutdown messages appear on the vt
-      where X was running. If you wish to see those messages, simultaneously
-      press keys Alt-F7 (assuming that X was running on vt7).
-    </para>
-
-  </sect2>
-
-    <sect2 role="content">
-    <title>Starting KDE4 at boot</title>
-
-    <para>KDE4 comes with a graphical login interface called KDM (the KDE4 Display
-    Manager), which provides a customizable graphical login at boot. To use KDM,
-    you need to edit your <filename>/etc/inittab</filename> file (as the
-    <systemitem class="username">root</systemitem> user).
-    First, setup run-level 5 to start KDM (adjust
-    the path to kdm according to your system):</para>
-
-<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; EOF
-<literal>kd:5:respawn:/opt/kde/bin/kdm</literal>
-EOF</userinput></screen>
-
-    <para>Additionally, you need to change the default run-level from 3 to 5:</para>
-
-<screen><userinput>sed -i 's#id:3:initdefault:#id:5:initdefault:#' /etc/inittab</userinput></screen>
-
-    <para>You can now restart your system and see the KDE4 login
-    screen.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Installing further languages (l10n)</title>
-
-    <para>You may want to install support for your locale language. The l10n
-    packages can be found at <ulink
-    url="&kde-download-http;applications/&kde-apps-version;/src/kde-l10n/">
-         &kde-download-http;applications/&kde-apps-version;/src/kde-l10n/</ulink>.
-    See <xref linkend="kde-add-pkgs"/> for build instructions. If you are in a
-    KDE4 session when installing a new language and configure KDE4 to use it, the
-    session needs to be restarted, in order to see the effects.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Installing further KDE4 packages</title>
-
-    <para>Every subsequent package can be built while having
-    <application>KDE4</application> up and running, but remember to keep
-    <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
-
-  </sect2>
-
-</sect1>
Index: chive/core/core.xml
===================================================================
--- archive/core/core.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kde4-core">
-  <?dbhtml filename="core.html"?>
-
-  <title>The KDE4 Core</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-gstreamer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-vlc.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="akonadi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attica.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qimageblitz.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kfilemetadata.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepimlibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baloo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baloo-widgets.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-baseapps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-base-artwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
-
-</chapter>
Index: chive/core/kactivities.xml
===================================================================
--- archive/core/kactivities.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,126 +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 kactivities-download-http "&kde-download-attic2;/4.13.3/src/kactivities-&kactivities-version;.tar.xz">
-  <!ENTITY kactivities-download-ftp  " ">
-  <!ENTITY kactivities-md5sum        "e56a3aead6f418d973c0acd9c889deb8">
-  <!ENTITY kactivities-size          "88 KB">
-  <!ENTITY kactivities-buildsize     "9.2 MB">
-  <!ENTITY kactivities-time          "0.8 SBU">
-]>
-
-<sect1 id="kactivities" xreflabel="kactivities-&kactivities-version;">
-  <?dbhtml filename="kactivities.html"?>
-
-
-  <title>Kactivities-&kactivities-version;</title>
-
-  <indexterm zone="kactivities">
-    <primary sortas="a-kactivities">kactivities</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kactivities</title>
-
-    <para>This package provides the activitymanager for KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kactivities-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kactivities-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kactivities-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kactivities-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kactivities-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kactivities-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kactivities-&kdelibs-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kactivities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&kde-download-http;&kde-version;/src">nepomuk-core</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/kactivities"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kactivities</title>
-
-    <para>Install <application>Kactivities</application> by running the following
-    commands:</para>
-
-<!-- Nothing in sysconfdir here, too -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not ship a default test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kactivitymanagerd</seg>
-        <seg>libkactivities.so, libkactivities-models.so and several in
-        &kde-dir;/lib/kde4</seg>
-        <seg>&kde-dir;/include/kactivities,
-        &kde-dir;/include/kactivities-models, &kde-dir;/include/KDE/KActivities,
-        &kde-dir;/lib/cmake/KActivities, &kde-dir;/lib/cmake/KActivities-models,
-        and several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kde-base-artwork.xml
===================================================================
--- archive/core/kde-base-artwork.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,103 +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 kde-base-artwork-download-http "&kde-download-http;applications/&kde-base-artwork-version;/src/kde-base-artwork-&kde-base-artwork-version;.tar.xz">
-  <!ENTITY kde-base-artwork-download-ftp  " ">
-  <!ENTITY kde-base-artwork-md5sum        "99e95461864527323b7cd4b44053e0d3">
-  <!ENTITY kde-base-artwork-size          "7.1 MB">
-  <!ENTITY kde-base-artwork-buildsize     "7.7 MB">
-  <!ENTITY kde-base-artwork-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-base-artwork-version;">
-  <?dbhtml filename="kde-base-artwork.html"?>
-
-
-  <title>Kde-base-artwork-&kde-base-artwork-version;</title>
-
-  <indexterm zone="kde-base-artwork">
-    <primary sortas="a-kde-base-artwork">kde-base-artwork</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-base-artwork</title>
-
-    <para>This package provides the default splash screen for KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-base-artwork-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-base-artwork-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-base-artwork-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-base-artwork-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-base-artwork-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-base-artwork-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kde-base-artwork Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde-base-artwork"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kde-base-artwork</title>
-
-    <para>Install <application>Kde-base-artwork</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev ..</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>&kde-dir;/share/apps/ksplash/Themes/Default</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kde-baseapps.xml
===================================================================
--- archive/core/kde-baseapps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 kde-baseapps-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-baseapps-&kde-apps-version;.tar.xz">
-  <!ENTITY kde-baseapps-download-ftp  " ">
-  <!ENTITY kde-baseapps-md5sum        "c2e47f4dacaded8118bbc7a3b975e7d4">
-  <!ENTITY kde-baseapps-size          "2.0 MB">
-  <!ENTITY kde-baseapps-buildsize     "85 MB">
-  <!ENTITY kde-baseapps-time          "4.2 SBU">
-]>
-
-<sect1 id="kde-baseapps" xreflabel="kde-baseapps-&kde-apps-version;">
-  <?dbhtml filename="kde-baseapps.html"?>
-
-
-  <title>Kde-baseapps-&kde-apps-version;</title>
-
-  <indexterm zone="kde-baseapps">
-    <primary sortas="a-kde-baseapps">kde-baseapps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-baseapps</title>
-
-    <para>This package provides various applications, such as Dolphin
-    (file manager) and Konqueror (web browser). Infrastructure files and
-    libraries are also provided.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-baseapps-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-baseapps-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-baseapps-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-baseapps-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-baseapps-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-baseapps-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kde-baseapps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kactivities"/>,
-    <xref linkend="kfilemetadata"/>,
-    <xref linkend="baloo"/>, and
-    <xref linkend="baloo-widgets"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-<!--    <xref linkend="tidy-html"/> and
-     NOt compatible with the latest tidy.
--->
-    <xref linkend="glib2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde-baseapps"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kde-baseapps</title>
-
-    <para>Install <application>Kde-baseapps</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -DWITH_LibTidy=OFF                   \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para> Now as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dolphin, fsview, kbookmarkmerger, kdepasswd, kdialog, keditbookmarks, kfind,
-        kfmclient, konqueror, nspluginscan, nspluginviewer, servicemenudeinstallation and
-        servicemenuinstallation</seg>
-        <seg>libdolphinprivate.so, libkbookmarkmodel_private.so,
-        libkdeinit4_dolphin.so, libkdeinit4_keditbookmarks.so,
-        libkdeinit4_kfmclient.so, libkdeinit4_konqueror.so, libkonq.so,
-        libkonqsidebarplugin.so, libkonquerorprivate.so and several in
-        &kde-dir;/lib/kde4</seg>
-        <seg>several in &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kbookmarkmerger">
-        <term><command>kbookmarkmerger</command></term>
-        <listitem>
-          <para>
-            is a program for merging a given set of bookmarks into the
-            user's set of bookmarks.
-          </para>
-          <indexterm zone="kde-baseapps kbookmarkmerger">
-            <primary sortas="b-kbookmarkmerger">kbookmarkmerger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kfind">
-        <term><command>kfind</command></term>
-        <listitem>
-          <para>
-            is the file find utility for KDE.
-          </para>
-          <indexterm zone="kde-baseapps kfind">
-            <primary sortas="b-kfind">kfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kde-runtime.xml
===================================================================
--- archive/core/kde-runtime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 kde-runtime-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-runtime-&kde-apps-version;.tar.xz">
-  <!ENTITY kde-runtime-download-ftp  " ">
-  <!ENTITY kde-runtime-md5sum        "261c5cab13f3d9b1565d40056da6157c">
-  <!ENTITY kde-runtime-size          "7.5 MB">
-  <!ENTITY kde-runtime-buildsize     "110 MB">
-  <!ENTITY kde-runtime-time          "4.3 SBU">
-]>
-
-<sect1 id="kde-runtime" xreflabel="kde-runtime-&kde-apps-version;">
-  <?dbhtml filename="kde-runtime.html"?>
-
-
-  <title>Kde-runtime-&kde-apps-version;</title>
-
-  <indexterm zone="kde-runtime">
-    <primary sortas="a-kde-runtime">kde-runtime</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-runtime</title>
-
-    <para>Kde-runtime contains runtime applications and libraries essential
-    for <application>KDE</application>.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-runtime-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-runtime-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-runtime-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-runtime-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-runtime-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-runtime-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kde-runtime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/> and
-      <xref linkend="libgcrypt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-      <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="exiv2"/>,
-      <xref linkend="kactivities"/>,
-      <xref linkend="kdepimlibs"/>, and
-      <xref linkend="libjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcanberra"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="xine-lib"/>,
-      <ulink url="http://www.libssh.org/">libssh</ulink>,
-<!--  <ulink url="&kde-download-http;&kde-version;/src/">nepomuk-core</ulink>,-->
-      <ulink url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core">nepomuk-core</ulink>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>, and
-      <ulink url="http://launchpad.net/ntrack">QNtrack</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde-runtime"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kde-runtime</title>
-
-    <para>Install <application>kde-runtime</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;         \
-      -DSYSCONF_INSTALL_DIR=/etc                 \
-      -DCMAKE_BUILD_TYPE=Release                 \
-      -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0       \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para> Now as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sfv ../lib/kde4/libexec/kdesu &kde-dir;/bin/kdesu</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0</parameter>:
-      This switch is used so that <application>CMake</application> can
-      properly find <application>Samba</application> headers which got
-      moved in version 4.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kcmshell4, kde-cp, kde-mv, kde-open, kde4, kde4-menu,
-        kdebugdialog, keditfiletype, kfile4, kglobalaccel, khelpcenter,
-        khotnewstuff-upload, khotnewstuff4, kiconfinder, kioclient,
-        kmimetypefinder, knotify4, kquitapp, kreadconfig, kstart, ksvgtopng,
-        ktraderclient, ktrash, kuiserver, kwalletd, kwriteconfig,
-        plasma-remote-helper, plasmapkg and solid-hardware.
-        </seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/lib and &kde-dir;/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kde-workspace.xml
===================================================================
--- archive/core/kde-workspace.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,265 +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 kde-workspace-download-http "&kde-download-attic;/&kde-workspace-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-download-ftp  " ">
-  <!ENTITY kde-workspace-md5sum        "bd7fa9c894dda23e8d06fc6a49a561cf">
-  <!ENTITY kde-workspace-size          "12.9 MB">
-  <!ENTITY kde-workspace-buildsize     "304 MB">
-  <!ENTITY kde-workspace-time          "13.3 SBU">
-]>
-
-<sect1 id="kde-workspace" xreflabel="kde-workspace-&kde-workspace-version;">
-  <?dbhtml filename="kde-workspace.html"?>
-
-
-  <title>Kde-workspace-&kde-workspace-version;</title>
-
-  <indexterm zone="kde-workspace">
-    <primary sortas="a-kde-workspace">kde-workspace</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-workspace</title>
-
-    <para>
-      The Kde-workspace package contains components that are central to
-      providing the <application>KDE</application> desktop environment. Of
-      particular importance are KWin, the <application>KDE</application>
-      window manager, and Plasma, which provides the workspace interface.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-workspace-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-workspace-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-workspace-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-workspace-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-workspace-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-workspace-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde-workspace-&kde4-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kde-workspace Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kactivities"/>,
-      <xref linkend="qimageblitz"/>,
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-renderutil"/>,
-      <xref linkend="xcb-util-keysyms"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="kdepimlibs"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="pciutils"/>, and
-      <xref linkend="consolekit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="lm_sensors"/>,
-      <xref linkend="qjson"/>,
-      <ulink url="&kde-download-http;&kde-version;/src/">PyKDE4</ulink>,
-      <ulink url="http://code.google.com/p/google-gadgets-for-linux/">GoogleGadgets</ulink>,
-      <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>,
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="http://www.catb.org/gpsd/">gpsd</ulink>,
-      <ulink url="http://www.xmms.org/">XMMS</ulink>,
-      <ulink url="http://qalculate.sourceforge.net/">libqalculate</ulink>
-      (wants <ulink url="http://www.ginac.de/CLN/">CLN</ulink>), and
-      <xref linkend="wayland"/>
-    </para>
-
-    <note>
-      <para>
-        Kde-workspace has a run-time dependency called
-        <application>Application menu for Qt</application> that allows the
-        application menubar to be inserted as a single button in the titlebar.
-        It can be found at
-        <ulink url="https://launchpad.net/appmenu-qt">appmenu-qt</ulink>.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/kde-workspace"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kde-workspace</title>
-
-    <para>
-      It is recommended to have a dedicated user and group to take
-      control of the <command>kdm</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 37 kdm &amp;&amp;
-useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm \
-        -u 37 -s /bin/false kdm &amp;&amp;
-install -o kdm -g kdm -dm755 /var/lib/kdm</userinput></screen>
-
-    <para>
-      Install <application>Kde-workspace</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e '/graphics.*TESTNAME/s/-signalplottertest/&amp;2/' \
-    -e '/test TESTNAME/s/-signalplottertest/&amp;3/'      \
-    -i libs/ksysguard/tests/CMakeLists.txt
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;           \
-      -DSYSCONF_INSTALL_DIR=/etc                   \
-      -DCMAKE_BUILD_TYPE=Release                   \
-      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
-      -Wno-dev .. &amp;&amp;
-make -j1</userinput></screen>
-
-    &parallel_issues;
-
-    <note><para>If building KDE in /opt, then an environment
-    variable <envar>LIBRARY_PATH=$KDE_PREFIX/lib:$LIBRARY_PATH</envar>
-    may be needed on the <command>make</command> line.</para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                  &amp;&amp;
-mkdir -p /usr/share/xsessions &amp;&amp;
-ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop \
-       /usr/share/xsessions/kde-plasma.desktop</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE</option>: This option is
-    set to install the KDE Python objects in the correct place.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring KDE Workspace</title>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If you built <application>KDE Workspace</application> with
-        <application>Linux PAM</application> support, create necessary
-        configuration files by running the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/kde &lt;&lt; "EOF" &amp;&amp;
-# Begin /etc/pam.d/kde
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/kde
-EOF
-cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF" &amp;&amp;
-# Begin /etc/pam.d/kde-np
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/kde-np
-EOF
-cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
-# Begin /etc/pam.d/kscreensaver
-
-auth    include system-auth
-account include system-account
-
-# End /etc/pam.d/kscreensaver
-EOF</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>genkdmconf, kaccess, kapplymousetheme, kblankscrn.kss,
-        kcheckrunning, kcminit, kcminit_startup, kdm, kdmctl,
-        kdostartupconfig4, kfontinst, kfontview, kinfocenter, klipper,
-        kmenuedit, krandom.kss, krandrstartup, krandrtray, krdb, krunner,
-        ksmserver, ksplashqml, ksplashsimple, ksplashx, ksplashx_scale,
-        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwin_gles,
-        kwrited, oxygen-demo, oxygen-settings, oxygen-shadow-demo,
-        plasma-desktop, plasma-netbook, plasma-overlay, plasma-windowed,
-        solid-action-desktop-gen, solid-network, startkde and systemsettings
-        </seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kdelibs.xml
===================================================================
--- archive/core/kdelibs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,363 +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 kdelibs-download-http "&kde-download-http;applications/&kde-apps2-version;/src/kdelibs-&kde-libs-version;.tar.xz">
-  <!ENTITY kdelibs-download-ftp  " ">
-  <!ENTITY kdelibs-md5sum        "9a4c194ee49e6e3836515389385d77cc">
-  <!ENTITY kdelibs-size          "11.1 MB">
-  <!ENTITY kdelibs-buildsize     "381 MB">
-  <!ENTITY kdelibs-time          "18 SBU">
-]>
-
-<sect1 id="kdelibs" xreflabel="kdelibs-&kde-libs-version;">
-  <?dbhtml filename="kdelibs.html"?>
-
-
-  <title>Kdelibs-&kde-libs-version;</title>
-
-  <indexterm zone="kdelibs">
-    <primary sortas="a-kdelibs">kdelibs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdelibs</title>
-
-    <para>This package includes programs and libraries that
-    are central to development and execution of KDE programs.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdelibs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdelibs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdelibs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdelibs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdelibs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdelibs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="attica"/>,
-      <xref linkend="automoc4"/>,
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="libdbusmenu-qt"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="phonon"/>,
-      <xref linkend="strigi"/>, and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="polkit-qt"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="qca"/>,
-      <xref linkend="upower"/>, and
-      <xref linkend="udisks"/> or <xref linkend="udisks2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="jasper"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="avahi"/>,
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="grantlee"/>,
-      <xref linkend="mitkrb"/>,
-      <ulink url="&sourceforge-repo;/soprano">soprano</ulink>,
-      <ulink url="&sourceforge-repo;/oscaf/">shared-desktop-ontologies</ulink>,
-      <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
-      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>,
-      <ulink url="http://www.herqq.org/">HUPnP</ulink>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info">media-player-info</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdelibs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdelibs</title>
-
-    <para>Fix file conflicts with <application>GNOME Menus</application> by running
-    the following commands:</para>
-
-<screen><userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@&amp; RENAME kde-applications.menu@" \
-        kded/CMakeLists.txt &amp;&amp;
-
-sed -i "s@applications.menu@kde-&amp;@" \
-        kded/kbuildsycoca.cpp</userinput></screen>
-
-<!--
-    <para>Cmake looks for <application>Xorg</application> libraries in a set of
-    hard coded directories instead of using
-    <application>pkg-config</application>.  If <application>Xorg</application>
-    has not been installed in <filename class="directory">/usr</filename>, add
-    the location to the list:</para>
-
-<screen><userinput>sed -e "/SET(X11_LIB_SEARCH_PATH/ a $XORG_PREFIX/lib"     \
-    -e "/SET(X11_INC_SEARCH_PATH/ a $XORG_PREFIX/include" \
-    -i cmake/modules/FindX11.cmake</userinput></screen>
--->
-
-    <para>Install <application>Kdelibs</application> by running the following
-    commands:</para>
-
-<!-- I wouldn't recommend installing D-Bus configuration files outside of
-     /etc if kde-dir is /usr, maybe kde-etc-dir should be introduced? -->
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc         \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>The unit regression tests are designed to be run after
-    <application>kdelibs</application> is installed.</para>
-
-    <para> Now as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  <para>To run the unit regression tests, you must have a current KDE session
-  running and issue <command>make test</command>.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DSYSCONF_INSTALL_DIR=/etc</option>: This switch is used to install
-    configuration files in /etc.</para>
-
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    higher level of compiler optimizations.</para>
-
-    <para><option>-DDOCBOOKXML_CURRENTDTD_DIR=...</option>: This switch is used to
-    tell <command>cmake</command> where to find the XML DTDs.</para>
-
-    <para><option>-DWITH_SOLID_UDISKS2=TRUE</option>: Use this switch if you
-    have <application>UDisks2</application>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>checkXML, kbuildsycoca4, kconfig_compiler, kcookiejar4,
-        kde4-config, kded4, kdeinit4, kdeinit4_shutdown, kdeinit4_wrapper,
-        kfilemetadatareader, kjs, kjscmd, kmailservice, kross, kshell4,
-        ktelnetservice, kunittestmodrunner, kwrapper4, makekdewidgets,
-        meinproc4, meinproc4_simple, nepomuk-rcgen and preparetips</seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkXML">
-        <term><command>checkXML</command></term>
-        <listitem>
-          <para>
-            is a tool used to check for syntax errors in KDE DocBook
-            XML files.
-          </para>
-          <indexterm zone="kdelibs checkXML">
-            <primary sortas="b-checkXML">checkXML</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbuildsycoca4">
-        <term><command>kbuildsycoca4</command></term>
-        <listitem>
-          <para>
-            is used to rebuild the system configuration cache.
-          </para>
-          <indexterm zone="kdelibs kbuildsycoca4">
-            <primary sortas="b-kbuildsycoca4">kbuildsycoca4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kconfig_compiler">
-        <term><command>kconfig_compiler</command></term>
-        <listitem>
-          <para>
-            is the KDE configuration compiler.
-          </para>
-          <indexterm zone="kdelibs kconfig_compiler">
-            <primary sortas="b-kconfig_compiler">kconfig_compiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcookiejar4">
-        <term><command>kcookiejar4</command></term>
-        <listitem>
-          <para>
-            is the KDE HTTP cookie daemon.
-          </para>
-          <indexterm zone="kdelibs kcookiejar4">
-            <primary sortas="b-kcookiejar4">kcookiejar4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kde4-config">
-        <term><command>kde4-config</command></term>
-        <listitem>
-          <para>
-            is used to print the KDE installation paths.
-          </para>
-          <indexterm zone="kdelibs kde4-config">
-            <primary sortas="b-kde4-config">kde4-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kded4">
-        <term><command>kded4</command></term>
-        <listitem>
-          <para>
-            is the KDE daemon.
-          </para>
-          <indexterm zone="kdelibs kded4">
-            <primary sortas="b-kded4">kded4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdeinit4">
-        <term><command>kdeinit4</command></term>
-        <listitem>
-          <para>
-            is the KDE process launcher.
-          </para>
-          <indexterm zone="kdelibs kdeinit4">
-            <primary sortas="b-kdeinit4">kdeinit4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjs">
-        <term><command>kjs</command></term>
-        <listitem>
-          <para>
-            is the KDE ECMAScript/JavaScript engine.
-          </para>
-          <indexterm zone="kdelibs kjs">
-            <primary sortas="b-kjs">kjs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjscmd">
-        <term><command>kjscmd</command></term>
-        <listitem>
-          <para>
-            is a tool used for launching KJSEmbed scripts from
-            the command line.
-          </para>
-          <indexterm zone="kdelibs kjscmd">
-            <primary sortas="b-kjscmd">kjscmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kross">
-        <term><command>kross</command></term>
-        <listitem>
-          <para>
-            is the KDE application used to run kross scripts.
-          </para>
-          <indexterm zone="kdelibs kross">
-            <primary sortas="b-kross">kross</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makekdewidgets">
-        <term><command>makekdewidgets</command></term>
-        <listitem>
-          <para>
-            is used to build Qt widget plugins from an ini style
-            description file.
-          </para>
-          <indexterm zone="kdelibs makekdewidgets">
-            <primary sortas="b-makekdewidgets">makekdewidgets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="meinproc4">
-        <term><command>meinproc4</command></term>
-        <listitem>
-          <para>
-            is used to convert DocBook files to HTML.
-          </para>
-          <indexterm zone="kdelibs meinproc4">
-            <primary sortas="b-meinproc4">meinproc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preparetips">
-        <term><command>preparetips</command></term>
-        <listitem>
-          <para>
-            is a script used to extract the text from a tips file.
-          </para>
-          <indexterm zone="kdelibs preparetips">
-            <primary sortas="b-preparetips">preparetips</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kdepimlibs.xml
===================================================================
--- archive/core/kdepimlibs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 kdepimlibs-download-http "&kde-download-attic;/15.04.3/src/kdepimlibs-&kdepim-version;.tar.xz">
-  <!ENTITY kdepimlibs-download-ftp  " ">
-  <!ENTITY kdepimlibs-md5sum        "098c975fb970621dc8382ed3c28de0eb">
-  <!ENTITY kdepimlibs-size          "2.7 MB">
-  <!ENTITY kdepimlibs-buildsize     "213 MB">
-  <!ENTITY kdepimlibs-time          "8.3 SBU">
-]>
-
-<sect1 id="kdepimlibs" xreflabel="kdepimlibs-&kdepim-version;">
-  <?dbhtml filename="kdepimlibs.html"?>
-
-
-  <title>Kdepimlibs-&kdepim-version;</title>
-
-  <indexterm zone="kdepimlibs">
-    <primary sortas="a-kdepimlibs">kdepimlibs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdepimlibs</title>
-
-    <para><application>Kdepimlibs</application> is the common library for
-    <application>KDE</application> PIM applications like
-    <command>kmail</command>, <command>kalarm</command>, etc.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdepimlibs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdepimlibs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdepimlibs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdepimlibs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdepimlibs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdepimlibs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdepimlibs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="libical"/>,
-      <xref linkend="akonadi"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="boost"/>, and
-      <xref linkend="qjson"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openldap"/> (if connecting to an LDAP server)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openssl"/> and
-      <ulink url="http://projects.kde.org/prison">prison</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdepimlibs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdepimlibs</title>
-
-    <para>Install <application>kdepimlibs</application> by running the following
-    commands:</para>
-
-<!-- Again, nothing in sysconfdir -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>The full test suite for this package is not enabled by default and not
-    tested by the BLFS team.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>akonadi2xml, akonadi_benchmarker, and akonaditest</seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/kfilemetadata.xml
===================================================================
--- archive/core/kfilemetadata.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,133 +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 kfilemetadata-download-http "&kde-download-http;&kde-old-version;/src/kfilemetadata-&kde-old-version;.tar.xz">
-  <!ENTITY kfilemetadata-download-ftp  " ">
-  <!ENTITY kfilemetadata-md5sum        "2e7143fd470bf84ac05475871119d9eb">
-  <!ENTITY kfilemetadata-size          "36 KB">
-  <!ENTITY kfilemetadata-buildsize     "4.3 MB">
-  <!ENTITY kfilemetadata-time          "0.2 SBU">
-]>
-
-<sect1 id="kfilemetadata" xreflabel="kfilemetadata-&kde-old-version;">
-  <?dbhtml filename="kfilemetadata.html"?>
-
-
-  <title>Kfilemetadata-&kde-old-version;</title>
-
-  <indexterm zone="kfilemetadata">
-    <primary sortas="a-kfilemetadata">kfilemetadata</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kfilemetadata</title>
-
-    <para>Kfilemetadata is a framework for searching and managing metadata.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kfilemetadata-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kfilemetadata-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kfilemetadata-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kfilemetadata-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kfilemetadata-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kfilemetadata-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kfilemetadata Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="taglib"/>,
-    <xref linkend="poppler"/>,
-    <xref linkend="exiv2"/>,
-    <xref linkend="ffmpeg"/>,
-    <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink> and
-    <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kfilemetadata"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kfilemetadata</title>
-
-    <para>Install <application>kfilemetadata</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_BUILD_TYPE=Release           \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the test suite, issue: <command>make test</command>.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0</option>: This switch is
-    needed to avoid a cmake error when using cmake-3.3 and later.</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>
-          libkfilemetadata.so and several in &kde-dir;/lib/kde4
-        </seg>
-        <seg>
-          &kde-dir;/include/kfilemetadata and &kde-dir;/lib/cmake/KFileMetaData
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/core/polkit-kde-agent.xml
===================================================================
--- archive/core/polkit-kde-agent.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +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 polkit-kde-agent-download-http "&kde-download-http;apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
-  <!ENTITY polkit-kde-agent-download-ftp  " ">
-  <!ENTITY polkit-kde-agent-md5sum        "a02d3fddc6270a88bceaf3ba604c92f8">
-  <!ENTITY polkit-kde-agent-size          "34 KB">
-  <!ENTITY polkit-kde-agent-buildsize     "6.8 MB">
-  <!ENTITY polkit-kde-agent-time          "0.1 SBU">
-]>
-
-<sect1 id="polkit-kde-agent" xreflabel="polkit-kde-agent-&polkit-kde-agent-version;">
-  <?dbhtml filename="polkit-kde-agent.html"?>
-
-
-  <title>Polkit-kde-agent-&polkit-kde-agent-version;</title>
-
-  <indexterm zone="polkit-kde-agent">
-    <primary sortas="a-polkit-kde-agent">polkit-kde-agent</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Polkit-kde-agent</title>
-
-    <para><application>Polkit-kde-agent</application> provides a graphical
-    authentication prompt so non-priviledged users can authenticate themselves
-    for performing administrative tasks in KDE.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&polkit-kde-agent-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&polkit-kde-agent-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &polkit-kde-agent-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &polkit-kde-agent-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &polkit-kde-agent-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &polkit-kde-agent-time;</para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Optional patch: <ulink
-        url="&patch-root;/polkit-kde-agent-1-&polkit-kde-agent-version;-remember_password-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Polkit-kde-agent Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="polkit-qt"/> and
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/polkit-kde-agent"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Polkit-kde-agent</title>
-
-    <para>Install <application>polkit-kde-agent</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../polkit-kde-agent-1-&polkit-kde-agent-version;-remember_password-1.patch &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>polkit-kde-authentication-agent-1</seg>
-        <seg>none</seg>
-        <seg>&kde-dir;/share/apps/policykit1-kde</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-polkit-kde-agent">
-        <term><command>polkit-kde-agent</command></term>
-        <listitem>
-          <para>is a testing utility for polkit-kde-agent-generated build trees.</para>
-          <indexterm zone="a-polkit-kde-agent polkit-kde-agent">
-            <primary sortas="b-polkit-kde-agent">polkit-kde-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: chive/core/pre-install-config.xml
===================================================================
--- archive/core/pre-install-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,110 +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="kde-pre-install-config">
-  <?dbhtml filename="pre-install-config.html"?>
-
-
-  <title>KDE4 Pre-installation Configuration</title>
-
-  <note><para>If you did not install <application>Xorg</application> in
-  <filename class="directory">/usr</filename>, some of the
-  <application>CMake</application> modules in <application>KDE</application>
-  look for packages at hard coded locations. To accommodate this issue,
-  create the following symbolic link (as the root user):</para>
-
-<screen role="root"><userinput>ln -sv $XORG_PREFIX /usr/X11R6</userinput></screen>
-  </note>
-
-  <sect2><title>Installing in /usr</title>
-
-    <para>One option is to put <application>KDE</application> into the
-    <filename class='directory'>/usr</filename> hierarchy.  This creates a
-    simpler setup but makes it more difficult to try multiple versions of
-    <application>KDE</application>.</para>
-
-<screen><userinput>export &kde-dir-var;=/usr</userinput></screen>
-  </sect2>
-
-  <sect2><title>Installing in /opt</title>
-
-    <para>A method of building multiple versions installs
-    <application>KDE</application> in the <filename
-    class='directory'>/opt</filename> hierarchy:</para>
-
-<screen><userinput>export &kde-dir-var;=/opt/kde</userinput></screen>
-
-    <para>If you are not installing <application>KDE</application> in
-    <filename class="directory">/usr</filename>, you will need to make some
-    additional configuration changes. Best practice is to add those to your
-    system (as <systemitem  class="username">root</systemitem>) or personal
-    profile:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; 'EOF'
-<literal># Begin /etc/profile.d/kde.sh
-
-&kde-dir-var;=/opt/kde
-KDEDIR=&kde-dir;
-
-pathappend &kde-dir;/bin             PATH
-pathappend &kde-dir;/lib/pkgconfig   PKG_CONFIG_PATH
-pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
-pathappend &kde-dir;/share           XDG_DATA_DIRS
-pathappend &kde-dir;/share/man       MANPATH
-pathappend /etc/kde/xdg                XDG_CONFIG_DIRS
-
-export &kde-dir-var; KDEDIR
-
-# End /etc/profile.d/kde.sh</literal>
-EOF
-</userinput></screen>
-
-    <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin kde addition
-
-/opt/kde/lib
-
-# End kde addition</literal>
-EOF</userinput></screen>
-
-    <indexterm zone="kde-pre-install-config">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>Several KDE packages install files into D-Bus and polkit directories.
-    When installing KDE in a location other than <filename class="directory">/usr</filename>,
-    D-Bus and polkit need 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"><userinput>install -d &kde-dir;/share &amp;&amp;
-ln -svf /usr/share/dbus-1 &kde-dir;/share &amp;&amp;
-ln -svf /usr/share/polkit-1 &kde-dir;/share</userinput></screen>
-
-    <tip>
-      <para>Sometimes, the installation paths are coded into installed files.
-      This is the reason why <filename class="directory">/opt/kde</filename>
-      is used as installation prefix instead of <filename
-      class="directory">/opt/kde-&kde-version;</filename>.  After installing
-      <application>KDE</application>, you may rename the directory and create
-      a symlink:</para>
-
-<screen role="root"><userinput>mv /opt/kde{,-&kde-version;} &amp;&amp;
-ln -svf kde-&kde-version; /opt/kde</userinput></screen>
-
-      <para>Later on, you may want to install other versions of
-      <application>KDE</application>.  To do that, just remove the symlink and
-      use <filename class="directory">/opt/kde</filename> as the prefix again
-      (<application>KDE</application> must not be started). Which version of
-      <application>KDE</application> you use depends only on where the symlink
-      points to. No other reconfiguration will be needed.</para>
-
-    </tip>
-
-  </sect2>
-</sect1>
Index: chive/core/qimageblitz.xml
===================================================================
--- archive/core/qimageblitz.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +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 qimageblitz-download-http "&kde-download-http;qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
-  <!ENTITY qimageblitz-download-ftp  " ">
-  <!ENTITY qimageblitz-md5sum        "0ae2f7d4e0876764a97ca73799f61df4">
-  <!ENTITY qimageblitz-size          "57 KB">
-  <!ENTITY qimageblitz-buildsize     "1.4 MB">
-  <!ENTITY qimageblitz-time          "0.1 SBU">
-]>
-
-<sect1 id="qimageblitz" xreflabel="qimageblitz-&qimageblitz-version;">
-  <?dbhtml filename="qimageblitz.html"?>
-
-
-  <title>QImageblitz-&qimageblitz-version;</title>
-
-  <indexterm zone="qimageblitz">
-    <primary sortas="a-qimageblitz">qimageblitz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QImageblitz</title>
-
-    <para><application>QImageblitz</application> is a graphical effect and
-    filter library for <application>KDE</application>.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qimageblitz-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qimageblitz-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qimageblitz-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qimageblitz-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qimageblitz-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qimageblitz-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/qimageblitz-&qimageblitz-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">QImageblitz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="qt4"/> and
-    <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qimageblitz"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QImageblitz</title>
-
-    <para>Install <application>QImageblitz</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>blitztest</seg>
-        <seg>libqimageblitz.so</seg>
-        <seg>&kde-dir;/include/qimageblitz</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="blitztest">
-        <term><command>blitztest</command></term>
-        <listitem>
-          <para>is a testing utility for qimageblitz.</para>
-          <indexterm zone="qimageblitz blitztest">
-            <primary sortas="b-blitztest">blitztest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/courier.xml
===================================================================
--- archive/courier.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1086 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY courier-download-http "&sourceforge-repo;/courier/courier-&courier-version;.tar.bz2">
-  <!ENTITY courier-download-ftp " ">
-  <!ENTITY courier-md5sum "639bb3b236914e3b86f287ce3f55264e">
-  <!ENTITY courier-size "4.3 MB">
-  <!ENTITY courier-buildsize "102 MB">
-  <!ENTITY courier-time "2.62 SBU">
-]>
-
-<sect1 id="courier" xreflabel="Courier-&courier-version;">
-  <?dbhtml filename="courier.html"?>
-
-
-  <title>Courier-&courier-version;</title>
-
-  <indexterm zone="courier">
-    <primary sortas="a-Courier">Courier MTA</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Courier</title>
-
-    <para>The <application>Courier</application> package contains a Mail
-    Transport Agent (MTA). This is useful for sending email to other users
-    of your host machine. It can also be configured to be a central mail
-    server for your domain or a mail relay agent. The
-    <application>Courier</application> packages also includes a web-based
-    email interface, IMAP, IMAP-SSL, POP3, and POP3-SSL.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&courier-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&courier-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &courier-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &courier-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &courier-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &courier-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Courier Dependencies</bridgehead>
-
-    <!-- <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gdbm"/></para> -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="mysql"/> or <xref linkend="postgresql"/>,
-    <xref linkend="linux-pam"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="gamin"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="apache"/>,
-    <!-- <xref linkend="ispell"/> or <xref linkend="aspell"/>, -->
-    <xref linkend="aspell"/>,
-    <xref linkend="gnupg"/>,
-    <xref linkend="expect"/>,
-    <xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->,
-    <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink> and
-    <ulink url="http://alpha.greenie.net/mgetty/">Mgetty+Sendfax</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/courier"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Courier</title>
-
-    <note>
-      <para><application>Courier</application>'s tarball must be extracted
-      as an unprivileged user or the <command>configure</command> script will
-      fail.</para>
-    </note>
-
-    <para>Before you compile the program, you need to create the
-    <systemitem class="username">courier</systemitem> user and group
-    that is expected to be in place during installation.
-    As the <systemitem class="username">root</systemitem> user, add
-    the <systemitem class="username">courier</systemitem> user and
-    group with the following commands:</para>
-
-<screen role="root"><userinput>groupadd -g 30 courier &amp;&amp;
-useradd -c 'Courier Mail Server' -d /dev/null \
-        -g courier -s /bin/false -u 30 courier</userinput></screen>
-
-    <para>The install script also expects a <systemitem
-    class="username">bin</systemitem> user. If you already have a
-    user named <systemitem class="username">bin</systemitem>, this
-    step can be safely ignored. If necessary, create the user by
-    issuing the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>useradd -c 'bin' -d /dev/null -g bin -u 1 bin</userinput></screen>
-
-    <para><application>Courierfilter</application> requires the directory
-    <filename class="directory">/var/run/courier</filename> to store
-    all the <application>Courier</application> PID and lock files.
-    <filename class="directory">/var/lock/subsys</filename> also must exist
-    for the master lock file for <application>Courier</application>. Issue
-    the following commands as the
-    <systemitem class="username">root</systemitem> user to create these
-    directories:</para>
-
-<screen role="root"><userinput>install -v -d /var/run/courier -o courier -g courier -m755 &amp;&amp;
-install -v -d /var/lock/subsys -o root -g root -m755</userinput></screen>
-
-    <para>Build <application>Courier</application> as an unprivileged user
-    with the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/courier \
-    --datadir=/usr/share/courier --sysconfdir=/etc/courier \
-    --localstatedir=/var/lib/courier --with-piddir=/var/run/courier \
-    --with-paranoid-smtpext --disable-autorenamesent \
-    --enable-workarounds-for-imap-client-bugs --with-db=gdbm &amp;&amp;
-make</userinput></screen>
-
-    <para>Once again, become the <systemitem class="username">root</systemitem>
-    user and install <application>Courier</application> with the following
-    commands:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-configure</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--libexecdir=/usr/lib/courier</parameter>: Specifies
-    the directory which contains programs and libraries that should not be
-    directly executed from the command-line.</para>
-
-    <para><parameter>--datadir=/usr/share/courier</parameter>: Specifies the
-    directory where miscellaneous shell scripts,
-    <application>Perl</application> scripts, and data files will be
-    installed.</para>
-
-    <para><parameter>--localstatedir=/var/spool/courier</parameter>:
-    Specifies the directory that will hold the mail queue, and other
-    temporary data.</para>
-
-    <para><parameter>--with-piddir=/var/run/courier</parameter>: Specifies
-    the directory where <application>Courier</application>'s
-    PID files are stored when
-    <application>Courier</application> is active.</para>
-
-    <para><parameter>--with-paranoid-smtpext</parameter>: Be paranoid when
-    negotiating Courier-specific ESMTP extensions with remote servers.
-    The <application>Courier</application> mail server defines and implements
-    certain experimental ESMTP extensions: XVERP and XEXDATA. Problems may
-    result in the event that someone else uses the same name to implement
-    some other extension. If this option is specified,
-    <application>Courier</application>'s ESMTP server will also advertise a
-    dummy ESMTP capability called XCOURIEREXTENSIONS, and will not recognize
-    any Courier-specific extensions unless the remote mail server also
-    advertises this dummy ESMTP capability.</para>
-
-    <para><parameter>--disable-autorenamesent</parameter>: Do not rename the
-    Sent folder every month. This option can also be controlled by the
-    <envar>SQWEBMAIL_AUTORENAMESENT</envar> environment variable.</para>
-
-    <para><parameter>--enable-workarounds-for-imap-client-bugs</parameter>:
-    There are several confirmed bugs in some IMAP clients that do not properly
-    implement the IMAP4rev1 protocol. This option enables some workarounds for
-    those buggy IMAP clients. NOTE: <command>make check</command> will fail if
-    this option is used. You should first configure without this option, and
-    if all post-configuration tests succeed, rerun <command>configure</command>
-    with this option and recompile.</para>
-
-    <para><parameter>--with-db=gdbm</parameter>:
-    <application>Courier</application> requires either the
-    <application>GDBM</application> or the <application>DB</application>
-    database library. <application>GDBM</application> is used if both are
-    present. This option forces the selection of
-    <application>GDBM</application> as <application>Courier</application>
-    is currently broken when used with <application>DB</application>.</para>
-
-    <!-- # Note - Courier will build fine with <xref linkend="db"/>, but all
-    the database files will not be created correctly -->
-
-    <para><option>--with-ispell=/usr/bin/aspell</option>:
-    <application>Courier</application>'s webmail server can use spell
-    checking, if <command>configure</command> finds
-    <application>ispell</application> or if you explicitly set the location
-    of <application>Aspell</application>.</para>
-
-    <para><option>--enable-mimetypes=<replaceable>&lt;location of mime.types
-    file&gt;</replaceable></option>: Use this switch if you receive an error
-    saying that the <filename>mime.types</filename> file could not be
-    found.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Courier</title>
-
-    <sect3 id="courier-config">
-      <title>Configuration Files</title>
-
-      <para><filename>/etc/courier/*</filename></para>
-
-      <indexterm zone="courier courier-config">
-        <primary sortas="e-etc-courier-star">/etc/courier/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>While still as <systemitem class="username">root</systemitem>,
-      you will need to create the following files with the contents
-      specified.</para>
-
-      <para><filename>/etc/courier/defaultdomain</filename></para>
-
-<screen role="root"><userinput>cat &gt; /etc/courier/defaultdomain &lt;&lt; "EOF"
-<literal><replaceable>&lt;yourdomain&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-      <para><filename>/etc/courier/me</filename></para>
-
-<screen role="root"><userinput>cat &gt; /etc/courier/me &lt;&lt; "EOF"
-<literal><replaceable>&lt;servername.yourdomain&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-      <para><filename>/etc/courier/locals</filename></para>
-
-<screen role="root"><userinput>cat &gt; /etc/courier/locals &lt;&lt; "EOF"
-<literal>localhost
-<replaceable>&lt;yourdomain&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-      <para><filename>/etc/courier/esmtpacceptmailfor.dir/system</filename></para>
-
-<screen role="root"><userinput>cat &gt; /etc/courier/esmtpacceptmailfor.dir/system &lt;&lt; "EOF"
-<literal>localhost
-<replaceable>&lt;yourdomain&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-      <para>You will also need to edit the
-      <filename>/etc/courier/aliases/system</filename> file and change the
-      following entry.</para>
-
-<screen><literal>postmaster: <replaceable>&lt;your administrator email&gt;</replaceable></literal></screen>
-
-      <para>If you want to deny access from some hosts from sending mail,
-      you will need to edit the
-      <filename>/etc/courier/smtpaccess/default</filename> file.</para>
-
-      <para>If you wish to host mail for non-local domains including virtual
-      domains, you must add them to
-      <filename>/etc/courier/hosteddomains</filename>. This file should exist
-      whether you need a hosted domain list or not:</para>
-
-<screen role="root"><userinput>touch /etc/courier/hosteddomains</userinput></screen>
-
-      <para>After the above steps are completed you will need to run the
-      following commands:</para>
-
-<screen role="root"><userinput>makesmtpaccess &amp;&amp;
-makehosteddomains &amp;&amp;
-makealiases</userinput></screen>
-
-      <para>For each user, you will need to create a
-      <filename class="directory">Maildir</filename> directory:</para>
-
-<screen role="root"><userinput>cd /home/<replaceable>&lt;username&gt;</replaceable> &amp;&amp;
-maildirmake Maildir &amp;&amp;
-chown <replaceable>&lt;username&gt;</replaceable>.<replaceable>&lt;username&gt;</replaceable> Maildir -R</userinput></screen>
-
-      <para>If you wish to use SSL with <application>Courier</application>,
-      you should obtain certificates and store them in
-      <filename class='directory'>/usr/share/courier</filename>.  You can
-      optionally create self-signed, test certificates with the following
-      commands:</para>
-
-<screen role="root"><userinput>mkesmtpdcert &amp;&amp;
-mkimapdcert &amp;&amp;
-mkpop3dcert</userinput></screen>
-
-      <para>All of <application>Courier</application>'s configuration files reside
-      in the directory <filename class="directory">/etc/courier/</filename>. For
-      each service SMTP, POP3 and IMAP, you will have a standard config file, and
-      an SSL config file. For each service that you wish to utilize, you will
-      need to edit the configuration file, and change the
-      <replaceable>&lt;DAEMON&gt;</replaceable>START variable from 'NO' to 'YES'. For
-      example, to use SMTP with SSL, you'll need to edit
-      <filename>/etc/courier/esmtpd-ssl</filename> and change the value of
-      'ESMTPDSSLSTART' to 'YES'.  Make the same change for each service
-      configuration that you wish to use with
-      <application>Courier</application>.</para>
-
-      <para>If you wish to use LDAP, an LDAP configuration file should be
-      created:</para>
-
-<screen role="root"><userinput>echo "LDAPALIASDSTART=YES" > /etc/courier/ldapaliasd</userinput></screen>
-
-      <para>Similarly, if you wish to use webmail, you should create the webmail
-      configuration file:</para>
-
-<screen role="root"><userinput>echo "WEBMAILDSTART=YES" > /etc/courier/webmaild</userinput></screen>
-
-      <para>You will also need to copy the <filename>webmail</filename> file
-      from <filename>/usr/lib/courier/courier/webmail</filename> to the
-      <filename class='directory'>cgi-bin</filename> directory of your
-      <application>Apache</application> server.</para>
-
-<screen role="root"><userinput>cp -v -a /usr/lib/courier/courier/webmail/webmail /srv/www/cgi-bin</userinput></screen>
-
-      <para>You will then need to copy the images to a directory under your
-      <filename class='directory'>htdocs</filename> directory of your
-      <application>Apache</application> server. The directory needs to be named
-      <filename class='directory'>webmail</filename> or you need to specify it
-      during the configure phase with
-      <option>--enable-imageurl=<replaceable>&lt;URL&gt;</replaceable></option>.</para>
-
-<screen role="root"><userinput>cp -v -a /usr/share/courier/sqwebmail/images /srv/www/htdocs/webmail</userinput></screen>
-
-      <para>If you wish to utilize the webadmin utility, you will need to copy
-      the <filename>webadmin</filename> file from
-      <filename class="directory">/usr/lib/courier/courier/webmail</filename>
-      to your <filename class="directory">cgi-bin</filename> directory of your
-      <application>Apache</application> server.</para>
-
-<screen role="root"><userinput>cp -v -a /usr/lib/courier/courier/webmail/webadmin /srv/www/cgi-bin</userinput></screen>
-
-      <para>You also need to put the password into the file
-      <filename>/etc/courier/webadmin/password</filename>:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/courier/webadmin/password &lt;&lt; "EOF"
-<literal><replaceable>&lt;password&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-      <para>If you are not using SSL on your <application>Apache</application>
-      server, you will also need to add
-      <filename>/etc/courier/webadmin/unsecureok</filename>, so you will be
-      able to use your web based administration tool.</para>
-
-<screen role="root"><userinput>touch /etc/courier/webadmin/unsecureok</userinput></screen>
-
-      <para>If you use <application>Linux-PAM</application> on your system,
-      you will need to create the PAM configuration files:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/esmtp &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/esmtp
-
-auth            required                pam_unix.so try_first_pass
-account         required                pam_unix.so
-session         required                pam_unix.so
-
-# End /etc/pam.d/esmtp</literal>
-EOF
-<literal>cat &gt; /etc/pam.d/pop3 &lt;&lt; "EOF"
-# Begin /etc/pam.d/pop3
-
-auth            required                pam_unix.so try_first_pass
-account         required                pam_unix.so
-session         required                pam_unix.so
-
-# End /etc/pam.d/pop3</literal>
-EOF
-cat &gt; /etc/pam.d/imap &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/imap
-
-auth            required                pam_unix.so try_first_pass
-account         required                pam_unix.so
-session         required                pam_unix.so
-
-# End /etc/pam.d/imap</literal>
-EOF
-cat &gt; /etc/pam.d/webmail &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/webmail
-
-auth            required                pam_unix.so try_first_pass
-account         required                pam_unix.so
-session         required                pam_unix.so
-
-# End /etc/pam.d/webmail</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="courier-init">
-      <title>Boot Script</title>
-
-      <para>Finally, if you wish to start the
-      <application>Courier</application> server at boot, install the
-      <filename>/etc/rc.d/init.d/courier</filename> bootscript included
-      in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="courier courier-init">
-        <primary sortas="f-courier-init">courier</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-courier</userinput></screen>
-
-    </sect3>
-
-<!-- Begin virtual user setup * To be removed once added to the hint. -->
-
-    <sect3>
-      <title>Configuring for Virtual Users</title>
-
-      <para>These instructions will configure <application>Courier</application>
-      to lookup virtual users in a <application>MySQL</application> database.
-      Begin by making the following changes to
-      <filename>/etc/courier/authmysqlrc</filename>:</para>
-
-<screen><literal>MYSQL_SERVER            localhost
-MYSQL_USERNAME          courier
-MYSQL_PASSWORD          <replaceable>&lt;your choice&gt;</replaceable>
-MYSQL_SOCKET            /var/run/mysql/mysql.sock
-MYSQL_PORT              3306
-MYSQL_DATABASE          courier_mail
-MYSQL_USER_TABLE        users
-MYSQL_CLEAR_PWFIELD     clear
-DEFAULT DOMAIN          <replaceable>&lt;your domain&gt;</replaceable>
-MYSQL_QUOTA_FIELD       quota</literal></screen>
-
-      <para>Connect to <application>MySQL</application>:</para>
-
-<screen role="root"><userinput>mysql -p</userinput></screen>
-
-      <para>Create the <filename>courier_mail</filename> database and setup
-      the users table:</para>
-
-<screen role="root"><userinput>CREATE DATABASE courier_mail;
-USE courier_mail
-CREATE TABLE users (
-id                    char(128) DEFAULT '' NOT NULL,
-crypt                 char(128) DEFAULT '' NOT NULL,
-clear                 char(128) DEFAULT '' NOT NULL,
-name                  char(128) DEFAULT '' NOT NULL,
-uid                   int(10) unsigned DEFAULT '65534' NOT NULL,
-gid                   int(10) unsigned DEFAULT '65534' NOT NULL,
-home                  char(255) DEFAULT '' NOT NULL,
-quota                 char(255) DEFAULT '' NOT NULL,
-KEY id (id(128))
-);</userinput></screen>
-
-      <para>Grant all privileges to the <systemitem
-      class="username">courier</systemitem> user created earlier:</para>
-
-<screen role="root"><userinput>GRANT ALL PRIVILEGES ON *.* TO courier@localhost \
-    IDENTIFIED BY '<replaceable>&lt;password&gt;</replaceable>' WITH GRANT OPTION;
-QUIT</userinput></screen>
-
-      <para>Create a virtual mailman user and group:</para>
-
-<screen role="root"><userinput>groupadd -g 35 vmailman &amp;&amp;
-useradd -c 'Virtual Mailman' -g vmailman -m -k /dev/null -u 35 vmailman</userinput></screen>
-
-      <para>Create a mail directory for a new virtual user:</para>
-
-<screen role="root"><userinput>cd /home/vmailman &amp;&amp;
-mkdir -v <replaceable>&lt;virtual_user&gt;</replaceable> &amp;&amp;
-cd <replaceable>&lt;virtual_user&gt;</replaceable> &amp;&amp;
-maildirmake Maildir &amp;&amp;
-chown -v vmailman.vmailman Maildir -R</userinput></screen>
-
-      <para>Now, connect to the <application>MySQL</application> database as
-      the <systemitem class="username">courier</systemitem> user:</para>
-
-<screen role="root"><userinput>mysql -u courier -p</userinput></screen>
-
-      <para>To add the virtual user you need to enter at least one version of the
-      password; either clear text or encrypted.</para>
-
-      <para>Add the first virtual user with the following commands:</para>
-
-<screen><userinput>USE courier_mail
-INSERT INTO users VALUES (
-'<replaceable>&lt;virtual_users&gt;</replaceable>@<replaceable>&lt;domain.com&gt;</replaceable>,
-'<replaceable>&lt;encrypted password or blank&gt;</replaceable>',
-'<replaceable>&lt;clear text password or blank&gt;</replaceable>',
-'<replaceable>&lt;User's Name&gt;</replaceable>',
-9000,
-9000,
-'<replaceable>&lt;location of Maildir&gt;</replaceable>',
-'<replaceable>&lt;Quota in Bytes'&gt;</replaceable>
-);
-QUIT</userinput></screen>
-
-      <para>For example:</para>
-
-<screen><userinput>INSERT INTO users VALUES (
-'blfsuser@&lfs-domainname;',
-'',
-'password',
-'BLFS User',
-9000,
-9000,
-'/home/vmailman/blfsuser',
-''
-);</userinput></screen>
-
-    </sect3>
-
-<!-- End of Virtual user setup  -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>addcr, authenumerate, cancelmsg, courier, courier-config,
-        courieresmtpd, courierfilter, courierlogger, couriermlm, couriertcpd,
-        couriertls, deliverquota, dotforward, esmtpd, esmtpd-msa, esmtpd-ssl,
-        filterctl, imapd, imapd-ssl, lockmail, mailbot, maildiracl, maildirkw,
-        maildirmake, maildrop, mailq, makeacceptmailfor, makealiases, makedat,
-        makehosteddomains, makemime, makepercentrelay, makesmtpaccess,
-        makesmtpaccess-msa, makeuserdb, makeuucpneighbors, mimegpg,
-        mkesmtpdcert, mkimapdcert, mkpop3dcert, pop3d, pop3d-ssl, preline,
-        pw2userdb, reformail, reformime, rmail, sendmail, sharedindexinstall,
-        sharedindexsplit, showconfig, showmodules, testmxlookup, userdb,
-        userdbpw, vchkpw2userdb, webgpg, and webmaild</seg>
-        <seg>None</seg>
-        <seg>/etc/courier, /usr/lib/courier, /usr/share/courier, /var/lib/courier,
-        /var/lock/subsys, /var/run/courier, and /var/spool/courier</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cancelmsg">
-        <term><command>cancelmsg</command></term>
-        <listitem>
-          <para>removes a message from the mail queue.</para>
-          <indexterm zone="courier cancelmsg">
-            <primary sortas="b-cancelmsg">cancelmsg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courier-prog">
-        <term><command>courier</command></term>
-        <listitem>
-          <para>is an administrative command used to control the
-          <application>Courier</application> scheduling engine.</para>
-          <indexterm zone="courier courier-prog">
-            <primary sortas="b-courier">courier</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierfax">
-        <term><command>courierfax</command></term>
-        <listitem>
-          <para>sends email messages by fax.</para>
-          <indexterm zone="courier courierfax">
-            <primary sortas="b-courierfax">courierfax</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierfilter">
-        <term><command>courierfilter</command></term>
-        <listitem>
-          <para>starts and stops all mail filters installed by
-          <command>filterctl</command>.</para>
-          <indexterm zone="courier courierfilter">
-            <primary sortas="b-courierfilter">courierfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierldapaliasd">
-        <term><command>courierldapaliasd</command></term>
-        <listitem>
-          <para>supports mail address aliasing using an LDAP directory.</para>
-          <indexterm zone="courier courierldapaliasd">
-            <primary sortas="b-courierldapaliasd">courierldapaliasd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierlogger">
-        <term><command>courierlogger</command></term>
-        <listitem>
-          <para>captures error messages from other
-          <application>Courier</application> applications and forwards them
-          to the system logger.</para>
-          <indexterm zone="courier courierlogger">
-            <primary sortas="b-courierlogger">courierlogger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="couriermlm">
-        <term><command>couriermlm</command></term>
-        <listitem>
-          <para>sets up, maintains, and manages mailing lists.</para>
-          <indexterm zone="courier couriermlm">
-            <primary sortas="b-couriermlm">couriermlm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierperlfilter">
-        <term><command>courierperlfilter</command></term>
-        <listitem>
-          <para>is a sample filter written in
-          <application>Perl</application>.</para>
-          <indexterm zone="courier courierperlfilter">
-            <primary sortas="b-courierperlfilter">courierperlfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierpop3d">
-        <term><command>courierpop3d</command></term>
-        <listitem>
-          <para>is a <application>Courier</application>
-          POP3 server.</para>
-          <indexterm zone="courier courierpop3d">
-            <primary sortas="b-courierpop3d">courierpop3d</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="courierpop3login">
-        <term><command>courierpop3login</command></term>
-        <listitem>
-          <para>reads the POP3 userid and password and
-          passes them to the authentication modules.</para>
-          <indexterm zone="courier courierpop3login">
-            <primary sortas="b-courierpop3login">courierpop3login</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="couriertcpd">
-        <term><command>couriertcpd</command></term>
-        <listitem>
-          <para>accepts incoming network connections, and runs other
-          <application>Courier</application> programs after establishing each
-          network connection.</para>
-          <indexterm zone="courier couriertcpd">
-            <primary sortas="b-couriertcpd">couriertcpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="couriertls">
-        <term><command>couriertls</command></term>
-        <listitem>
-          <para>is used by applications to encrypt a network connection
-          using SSL/TLS.</para>
-          <indexterm zone="courier couriertls">
-            <primary sortas="b-couriertls">couriertls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dotforward">
-        <term><command>dotforward</command></term>
-        <listitem>
-          <para>is a compatibility module that reads forwarding
-          instructions in <filename>$HOME/.forward</filename>.</para>
-          <indexterm zone="courier dotforward">
-            <primary sortas="b-dotforward">dotforward</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dupfilter">
-        <term><command>dupfilter</command></term>
-        <listitem>
-          <para>is a threaded filter that tries to block junk E-mail by
-          attempting to detect multiple copies of the same message, which
-          are rejected.</para>
-          <indexterm zone="courier dupfilter">
-            <primary sortas="b-dupfilter">dupfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esmtpd">
-        <term><command>esmtpd</command></term>
-        <listitem>
-          <para>is a control script for courieresmtpd.</para>
-          <indexterm zone="courier esmtpd">
-            <primary sortas="b-esmtpd">esmtpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esmtpd-msa">
-        <term><command>esmtpd-msa</command></term>
-        <listitem>
-          <para>is a control script for courieresmtpd, but adds message
-          submission port 587 for the MSA protocol.</para>
-          <indexterm zone="courier esmtpd-msa">
-            <primary sortas="b-esmtpd-msa">esmtpd-msa</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="filterctl">
-        <term><command>filterctl</command></term>
-        <listitem>
-          <para>installs or uninstalls global mail filters.</para>
-          <indexterm zone="courier filterctl">
-            <primary sortas="b-filterctl">filterctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imapd">
-        <term><command>imapd</command></term>
-        <listitem>
-          <para>is the <application>Courier</application>-IMAP server.</para>
-          <indexterm zone="courier imapd">
-            <primary sortas="b-imapd">imapd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lockmail">
-        <term><command>lockmail</command></term>
-        <listitem>
-          <para>is a helper utility for locking  mailbox files.</para>
-          <indexterm zone="courier lockmail">
-            <primary sortas="b-lockmail">lockmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailbot">
-        <term><command>mailbot</command></term>
-        <listitem>
-          <para>is a MIME-aware autoresponder utility.</para>
-          <indexterm zone="courier mailbot">
-            <primary sortas="b-mailbot">mailbot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="maildiracl">
-        <term><command>maildiracl</command></term>
-        <listitem>
-          <para>manages access control lists.</para>
-          <indexterm zone="courier maildiracl">
-            <primary sortas="b-maildiracl">maildiracl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="maildirkw">
-        <term><command>maildirkw</command></term>
-        <listitem>
-          <para>modifies <application>Courier</application>-IMAP compatible
-          maildir message keywords.</para>
-          <indexterm zone="courier maildirkw">
-            <primary sortas="b-maildirkw">maildirkw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="maildirmake">
-        <term><command>maildirmake</command></term>
-        <listitem>
-          <para>creates maildirs, and maildir folders.</para>
-          <indexterm zone="courier maildirmake">
-            <primary sortas="b-maildirmake">maildirmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="maildrop">
-        <term><command>maildrop</command></term>
-        <listitem>
-          <para>is a replacement local mail delivery agent that includes a
-          mail filtering language.</para>
-          <indexterm zone="courier maildrop">
-            <primary sortas="b-maildrop">maildrop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailq-courier">
-        <term><command>mailq</command></term>
-        <listitem>
-          <para>displays a list of all messages that have not been
-          delivered yet.</para>
-          <indexterm zone="courier mailq-courier">
-            <primary sortas="b-mailq">mailq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeacceptmailfor">
-        <term><command>makeacceptmailfor</command></term>
-        <listitem>
-          <para>builds a list of domains to accept mail for, from the
-          <filename class="directory">/etc/courier/esmtpacceptmailfor.dir</filename>
-          directory.</para>
-          <indexterm zone="courier makeacceptmailfor">
-            <primary sortas="b-makeacceptmailfor">makeacceptmailfor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makealiases">
-        <term><command>makealiases</command></term>
-        <listitem>
-          <para>builds an alias database from one or more plain text
-          source files.</para>
-          <indexterm zone="courier makealiases">
-            <primary sortas="b-makealiases">makealiases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makedat">
-        <term><command>makedat</command></term>
-        <listitem>
-          <para>is a utility to create <application>GDBM</application> or
-          <application>DB</application> files from plain text files.</para>
-          <indexterm zone="courier makedat">
-            <primary sortas="b-makedat">makedat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makehosteddomains">
-        <term><command>makehosteddomains</command></term>
-        <listitem>
-          <para>rebuilds the contents of the hosteddomains database from the
-          contents of <filename>/etc/courier/hosteddomains</filename>.</para>
-          <indexterm zone="courier makehosteddomains">
-            <primary sortas="b-makehosteddomains">makehosteddomains</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makemime">
-        <term><command>makemime</command></term>
-        <listitem>
-          <para>creates MIME-formatted messages from one
-          or more files.</para>
-          <indexterm zone="courier makemime">
-            <primary sortas="b-makemime">makemime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makepercentrelay">
-        <term><command>makepercentrelay</command></term>
-        <listitem>
-          <para>builds a list of %-relayed domains from the
-          <filename class="directory">percentrelay.dir</filename> directory.</para>
-          <indexterm zone="courier makepercentrelay">
-            <primary sortas="b-makepercentrelay">makepercentrelay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makesmtpaccess">
-        <term><command>makesmtpaccess</command></term>
-        <listitem>
-          <para>builds ESMTP server access files from the
-          <filename class="directory">/etc/courier/smtpaccess</filename>
-          directory.</para>
-          <indexterm zone="courier makesmtpaccess">
-            <primary sortas="b-makesmtpaccess">makesmtpaccess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makesmtpaccess-msa">
-        <term><command>makesmtpaccess-msa</command></term>
-        <listitem>
-          <para>builds ESMTP server access files from the
-          <filename class="directory">/etc/courier/smtpaccess</filename>
-          directory. This esmtp list is for the MSA protocol.</para>
-          <indexterm zone="courier makesmtpaccess-msa">
-            <primary sortas="b-makesmtpaccess-msa">makesmtpaccess-msa</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeuserdb">
-        <term><command>makeuserdb</command></term>
-        <listitem>
-          <para>builds a user/password db from the contents of <filename
-          class="directory">/etc/courier/userdb</filename>.</para>
-          <indexterm zone="courier makeuserdb">
-            <primary sortas="b-makeuserdb">makeuserdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mimegpg">
-        <term><command>mimegpg</command></term>
-        <listitem>
-          <para>signs, encrypts, or decrypts MIME-formatted
-          email messages using <application>GnuPG</application>.</para>
-          <indexterm zone="courier mimegpg">
-            <primary sortas="b-mimegpg">mimegpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkesmtpdcert">
-        <term><command>mkesmtpdcert</command></term>
-        <listitem>
-          <para>creates a secure SMTP test certificate.</para>
-          <indexterm zone="courier mkesmtpdcert">
-            <primary sortas="b-mkesmtpdcert">mkesmtpdcert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkimapdcert">
-        <term><command>mkimapdcert</command></term>
-        <listitem>
-          <para>creates a secure IMAP test certificate.</para>
-          <indexterm zone="courier mkimapdcert">
-            <primary sortas="b-mkimapdcert">mkimapdcert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkpop3dcert">
-        <term><command>mkpop3dcert</command></term>
-        <listitem>
-          <para>creates a secure POP3 test certificate.</para>
-          <indexterm zone="courier mkpop3dcert">
-            <primary sortas="b-mkpop3dcert">mkpop3dcert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pop3d">
-        <term><command>pop3d</command></term>
-        <listitem>
-          <para>is a wrapper script for <command>couriertcpd</command> to
-          start and stop the POP3 service.</para>
-          <indexterm zone="courier pop3d">
-            <primary sortas="b-pop3d">pop3d</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pop3d-ssl">
-        <term><command>pop3d-ssl</command></term>
-        <listitem>
-          <para>is a wrapper script for <command>couriertcpd</command> to
-          start and stop the POP3 over SSL service.</para>
-          <indexterm zone="courier pop3d-ssl">
-            <primary sortas="b-pop3d-ssl">pop3d-ssl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preline">
-        <term><command>preline</command></term>
-        <listitem>
-          <para>prepends legacy <filename>mbox</filename> headers to mail
-          messages.</para>
-          <indexterm zone="courier preline">
-            <primary sortas="b-preline">preline</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reformail">
-        <term><command>reformail</command></term>
-        <listitem>
-          <para>reads a message on standard input, reformats it in some
-          way, and writes the message to standard output.</para>
-          <indexterm zone="courier reformail">
-            <primary sortas="b-reformail">reformail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reformime">
-        <term><command>reformime</command></term>
-        <listitem>
-          <para>is a utility for reformatting MIME messages.</para>
-          <indexterm zone="courier reformime">
-            <primary sortas="b-reformime">reformime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendmail-courier">
-        <term><command>sendmail</command></term>
-        <listitem>
-          <para>reads an email message and delivers the message to its
-          recipients.</para>
-          <indexterm zone="courier sendmail-courier">
-            <primary sortas="b-sendmail">sendmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="submit">
-        <term><command>submit</command></term>
-        <listitem>
-          <para>submits messages to <application>Courier</application> for
-          processing.</para>
-          <indexterm zone="courier submit">
-            <primary sortas="b-submit">submit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="testmxlookup">
-        <term><command>testmxlookup</command></term>
-        <listitem>
-          <para>lists the names and IP addresses of mail
-          relays that receive mail for the domain.</para>
-          <indexterm zone="courier testmxlookup">
-            <primary sortas="b-testmxlookup">testmxlookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="userdb">
-        <term><command>userdb</command></term>
-        <listitem>
-          <para>is a script to individually manipulate entries in
-          <filename>/etc/courier/userdb.</filename></para>
-          <indexterm zone="courier userdb">
-            <primary sortas="b-userdb">userdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="userdbpw">
-        <term><command>userdbpw</command></term>
-        <listitem>
-          <para>reads a single line of text on standard input, encrypts
-          it, and prints the encrypted result to standard output.</para>
-          <indexterm zone="courier userdbpw">
-            <primary sortas="b-userdbpw">userdbpw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/curlftpfs.xml
===================================================================
--- archive/curlftpfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +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 curlftpfs-download-http
-    "&sourceforge-repo;/curlftpfs/curlftpfs-&curlftpfs-version;.tar.gz">
-  <!ENTITY curlftpfs-download-ftp  " ">
-  <!ENTITY curlftpfs-md5sum        "969998e9cf1663824f44739e94c703a1">
-  <!ENTITY curlftpfs-size          "356 KB">
-  <!ENTITY curlftpfs-buildsize     "3.2 MB">
-  <!ENTITY curlftpfs-time          "0.6 SBU">
-]>
-
-<sect1 id="curlftpfs" xreflabel="curlftpfs-&curlftpfs-version;">
-  <?dbhtml filename="curlftpfs.html"?>
-
-
-  <title>curlftpfs-&curlftpfs-version;</title>
-
-  <indexterm zone="curlftpfs">
-    <primary sortas="a-curlftpfs">Curlftpfs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Curlftpfs</title>
-
-    <para>
-      <application>Curlftpfs</application> is a small program that uses Curl and
-      Fuse to mount a remote ftp server in a folder on your computer as though
-      it were a local filesystem. This allows you to open and manipulate the
-      remote files with other applications as though they were on your computer.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&curlftpfs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&curlftpfs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &curlftpfs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &curlftpfs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &curlftpfs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &curlftpfs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Curlftpfs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="fuse"/> and
-      <xref linkend="glib2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/curlftpfs"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Curlftpfs</title>
-
-    <para>
-      Install <application>Curlftpfs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-
-  <sect2 id="curlftpfs-install">
-    <title>Using Curlftpfs</title>
-
-    <para>
-      To mount ftp://ftp.gnome.org/pub/gnome/sources on ~/gnome:
-    </para>
-
-<screen><userinput>cd &amp;&amp;
-mkdir gnome &amp;&amp;
-curlftpfs ftp://ftp.gnome.org/pub/gnome/sources gnome</userinput></screen>
-
-    <para>
-      To unmount it again:
-    </para>
-
-<screen><userinput>fusermount -u gnome</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-
-      <seglistitem>
-        <seg>curlftpfs.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="curlftpfs-prog">
-        <term><command>curlftpfs</command></term>
-        <listitem>
-          <para>
-            mounts an ftp host as a local directory.
-          </para>
-          <indexterm zone="curlftpfs curlftpfs-prog">
-            <primary sortas="b-curlftpfs">curlftpfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/cvs.xml
===================================================================
--- archive/cvs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,289 +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 cvs-download-http "http://ftp.gnu.org/non-gnu/cvs/source/stable/&cvs-version;/cvs-&cvs-version;.tar.bz2">
-  <!ENTITY cvs-download-ftp  "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/&cvs-version;/cvs-&cvs-version;.tar.bz2">
-  <!ENTITY cvs-md5sum        "0213ea514e231559d6ff8f80a34117f0">
-  <!ENTITY cvs-size          "2.9 MB">
-  <!ENTITY cvs-buildsize     "32.3 MB">
-  <!ENTITY cvs-time          "0.3 SBU (additional ~20 SBU to run the test suite)">
-]>
-
-<sect1 id="cvs" xreflabel="CVS-&cvs-version;">
-  <?dbhtml filename="cvs.html"?>
-
-
-  <title>CVS-&cvs-version;</title>
-
-  <indexterm zone="cvs">
-    <primary sortas="a-CVS">CVS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CVS</title>
-
-    <para><application>CVS</application> is the Concurrent Versions System.
-    This is a version control system useful for projects using a central
-    repository to hold files and then track all changes made to those files.
-    These instructions install the client used to manipulate the repository,
-    creation of a repository is covered at <xref linkend="cvsserver"/>.</para>
-
-    &lfs77_checked; &gcc5_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&cvs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cvs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cvs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cvs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cvs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cvs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended patch: <ulink
-        url="&patch-root;/cvs-&cvs-version;-zlib-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CVS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="gdbm"/>, -->
-    <xref linkend="tcsh"/>,
-    <xref linkend="openssh"/>,
-    <ulink url="ftp://ftp.pdc.kth.se/pub/krb/src/">krb4</ulink>,
-    <xref linkend="mitkrb"/>
-    (for the GSSAPI libraries),
-    <xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->, and
-    an <xref linkend="server-mail"/> (that provides a
-    <command>sendmail</command> command)</para>
-
-    <para><application>CVS</application> will invoke a default text editor to
-    create a commit message if the <parameter>-m "Commit message"</parameter>
-    parameter was not used when changes are committed to a repository.
-    <application>CVS</application> looks for the following text editors, in the
-    order shown below, during configuration to determine the default. This
-    default can always be overridden by the <envar>CVSEDITOR</envar> or
-    <envar>EDITOR</envar> environment variables and can be specified directly
-    by passing the <option>--with-editor=<replaceable>&lt;desired text
-    editor&gt;</replaceable></option> parameter to the
-    <command>configure</command> script.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><xref linkend="vim"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="emacs"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="nano"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="re-alpine"/> (for Pico)</para>
-      </listitem>
-    </itemizedlist>
-
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cvs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CVS</title>
-
-    <para>By default <application>CVS</application> is statically linked
-    against the <application>Zlib</application> library included in its source
-    tree. This makes it exposed to possible security vulnerabilities in that
-    library. If you want to modify <application>CVS</application> to use the
-    system shared <application>Zlib</application> library, apply the following
-    patch:</para>
-
-<screen><userinput>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</userinput></screen>
-
-    <para>Now fix some conflicts with newer libraries and programs:</para>
-
-<screen><userinput>sed -i -e 's/getline /get_line /' lib/getline.{c,h} &amp;&amp;
-sed -i -e 's/^@sp$/&amp; 1/'          doc/cvs.texinfo &amp;&amp;
-touch doc/*.pdf</userinput></screen>
-
-    <para>Install <application>CVS</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/cvs-&cvs-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>If you wish to create HTML or text docs from the
-    documentation source files, issue the following command:</para>
-
-<screen><userinput>make -C doc html txt</userinput></screen>
-
-<!-- developer: test suite still fails, even if the modifications are made
-     and a further patch:
-     https://projects.archlinux.org/svntogit/packages.git/plain/trunk/cvs-1.11.23-sanity.patch?h=packages/cvs
-     is applied.-->
-<!--    <para>To test the results, issue: <command>make check</command>. This will
-    take quite a while. If you don't have <command>rsh</command> configured for
-    access to the host you are building on (or you didn't pass the
-    <option>-\-with-rsh=</option> parameter to the <command>configure</command>
-    script, some tests may fail. If you passed the
-    <option>-\-with-rsh=ssh</option> parameter to enable <command>ssh</command>
-    as the default remote shell program, you'll need to issue the following
-    command so that the tests will complete without any failures:</para>
-
-<screen><userinput>sed -e 's/rsh};/ssh};/' \
-    the string in following expression is not found anywhere in src/sanity.sh
-    -e 's/g=rw,o=r$/g=r,o=r/' \
-    -i src/sanity.sh</userinput></screen>-->
-
-    <para>This package does not come with a working test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install &amp;&amp;
-make -C doc install-pdf &amp;&amp;
-install -v -m644 FAQ README /usr/share/doc/cvs-&cvs-version;</userinput></screen>
-
-    <para>If you created any additional documentation, install it by issuing
-    the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>install -v -m644 doc/*.txt /usr/share/doc/cvs-&cvs-version;                   &amp;&amp;
-install -v -m755 -d        /usr/share/doc/cvs-&cvs-version;/html/cvs{,client} &amp;&amp;
-install -v -m644 doc/cvs.html/* \
-                           /usr/share/doc/cvs-&cvs-version;/html/cvs          &amp;&amp;
-install -v -m644 doc/cvsclient.html/* \
-                           /usr/share/doc/cvs-&cvs-version;/html/cvsclient</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-rsh=ssh</option>: Use this switch to enable
-      <command>ssh</command> as the default remote shell program.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring CVS</title>
-
-    <sect3 id="cvs-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.cvsrc</filename>, <filename>~/.cvswrappers</filename>,
-      and <filename>~/.cvspass</filename>.</para>
-
-      <indexterm zone="cvs cvs-config">
-        <primary sortas="e-AA.cvsrc">~/.cvsrc</primary>
-      </indexterm>
-
-      <indexterm zone="cvs cvs-config">
-        <primary sortas="e-AA.cvswrappers">~/.cvswrappers</primary>
-      </indexterm>
-
-      <indexterm zone="cvs cvs-config">
-        <primary sortas="e-AA.cvspass">~/.cvspass</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para><filename>~/.cvsrc</filename> is the main
-      <application>CVS</application> configuration file.
-      This file is used by users to specify defaults for different
-      <command>cvs</command> commands. For example, to make all
-      <command>cvs diff</command> commands run with <option>-u</option>, a user
-      would add <option>diff -u</option> to their <filename>.cvsrc</filename>
-      file.</para>
-
-      <para><filename>~/.cvswrappers</filename> specifies wrappers to be used in
-      addition to those specified in the <filename>CVSROOT/cvswrappers</filename>
-      file in the repository.</para>
-
-      <para><filename>~/.cvspass</filename> contains passwords used to complete
-      logins to servers.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cvs, cvsbug, and rcs2log</seg>
-        <seg>None</seg>
-        <seg>/usr/share/cvs and /usr/share/doc/cvs-&cvs-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvs-prog">
-        <term><command>cvs</command></term>
-        <listitem>
-          <para>is the main program file for the concurrent versions system.</para>
-          <indexterm zone="cvs cvs-prog">
-            <primary sortas="b-cvs">cvs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cvsbug">
-        <term><command>cvsbug</command></term>
-        <listitem>
-          <para>is used to send problem reports about <application>CVS</application>
-          to a central support site.</para>
-          <indexterm zone="cvs cvsbug">
-            <primary sortas="b-cvsbug">cvsbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcs2log">
-        <term><command>rcs2log</command></term>
-        <listitem>
-          <para>is a symlink to the contributed RCS to Change Log
-          generator.</para>
-          <indexterm zone="cvs rcs2log">
-            <primary sortas="b-rcs2log">rcs2log</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/cvsserver.xml
===================================================================
--- archive/cvsserver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,227 +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="cvsserver" xreflabel="Running a CVS Server">
-  <?dbhtml filename="cvsserver.html"?>
-
-
-  <title>Running a CVS Server</title>
-
-  <sect2 role="package">
-    <title>Running a CVS Server</title>
-
-    <para>This section will describe how to set up, administer and secure
-    a CVS server.</para>
-
-    <bridgehead renderas="sect3">CVS Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="cvs"/> and
-    <xref linkend="openssh"/></para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Setting up a CVS Server.</title>
-
-    <para>A CVS server will be set up using OpenSSH as the remote access
-    method. Other access methods, including :pserver: and :server: will
-    not be used for write access to the CVS repository. The :pserver:
-    method sends clear text passwords over the network and the :server:
-    method is not supported in all CVS ports. Instructions for anonymous,
-    read only CVS access using :pserver: can be found at the end of this
-    section.</para>
-
-    <para>Configuration of the CVS server consists of four
-    steps:</para>
-
-    <sect3>
-      <title>1. Create a Repository.</title>
-
-      <para>Create a new CVS repository with the following
-      commands:</para>
-
-<screen role="root"><userinput>mkdir          /srv/cvsroot &amp;&amp;
-chmod 1777     /srv/cvsroot &amp;&amp;
-export CVSROOT=/srv/cvsroot &amp;&amp;
-cvs init</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>2. Import Source Code Into the Repository.</title>
-
-      <para>Import a source module into the repository with the following
-      commands, issued from a user account on the same machine as the
-      CVS repository:</para>
-
-<screen><userinput>cd <replaceable>&lt;sourcedir&gt;</replaceable> &amp;&amp;
-cvs import -m "<replaceable>&lt;repository test&gt;</replaceable>" <replaceable>&lt;cvstest&gt;</replaceable> <replaceable>&lt;vendortag&gt;</replaceable> <replaceable>&lt;releasetag&gt;</replaceable></userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>3. Verify Local Repository Access.</title>
-
-      <para>Test access to the CVS repository from the same user
-      account with the following command:</para>
-
-<screen><userinput>cvs co cvstest</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>4. Verify Remote Repository Access.</title>
-
-      <para>Test access to the CVS repository from a remote machine using
-      a user account that has <command>ssh</command> access to the CVS
-      server with the following commands:</para>
-
-      <note>
-        <para>Replace <replaceable>&lt;servername&gt;</replaceable> with the
-        IP address or host name of the CVS repository machine. You will
-        be prompted for the user's shell account password before CVS
-        checkout can continue.</para>
-      </note>
-
-<screen><userinput>export CVS_RSH=/usr/bin/ssh &amp;&amp;
-cvs -d:ext:<replaceable>&lt;servername&gt;</replaceable>:/srv/cvsroot co cvstest</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id='cvsserver-config' role="configuration">
-    <title>Configuring CVS for Anonymous Read Only Access.</title>
-
-    <para>CVS can be set up to allow anonymous read only access using the
-    :pserver: method by logging on as <systemitem class="username">root</systemitem>
-    and executing the following commands:</para>
-
-<screen role="root"><userinput>(grep anonymous /etc/passwd || useradd anonymous -s /bin/false -u 98) &amp;&amp;
-echo anonymous: &gt; /srv/cvsroot/CVSROOT/passwd &amp;&amp;
-echo anonymous &gt; /srv/cvsroot/CVSROOT/readers</userinput></screen>
-
-<!--    <para>If you use <command>inetd</command>, the following command
-    will add the <application>CVS</application> entry to
-    <filename>/etc/inetd.conf</filename>:</para>
-
-<screen role="root"><userinput>echo "2401  stream  tcp  nowait  root  /usr/bin/cvs cvs -f \
-    - -allow-root=/srv/cvsroot pserver" &gt;&gt; /etc/inetd.conf</userinput></screen>
-
-    <indexterm zone="cvsserver cvsserver-config">
-      <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-    </indexterm>
-
-    <para>Issue a <command>killall -HUP inetd</command> to reread the changed
-    <filename>inetd.conf</filename> file.</para>
--->
-<!--
-    <para>If you use <command>xinetd</command>, the following command will create
-    the CVS file as <filename>/etc/xinetd.d/cvspserver</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/xinetd.d/cvspserver &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd.d/cvspserver
-
-     service cvspserver
-     {
-          port        = 2401
-          socket_type = stream
-          protocol    = tcp
-          wait        = no
-          user        = root
-          passenv     = PATH
-          server      = /usr/bin/cvs
-          server_args = -f - -allow-root=/srv/cvsroot pserver
-     }
-
-# End /etc/xinetd.d/cvspserver</literal>
-EOF</userinput></screen>
-
-    <indexterm zone="cvsserver cvsserver-config">
-      <primary sortas="e-etc-xinetd.d-cvspserver">/etc/xinetd.d/cvspserver</primary>
-    </indexterm>
-
-    <para>Issue a <command>/etc/rc.d/init.d/xinetd reload</command> to reread
-    the changed <filename>xinetd.conf</filename> file.</para>
--->
-    <para>Testing anonymous access to the new repository requires an account
-    on another machine that can reach the CVS server via network. No account
-    on the CVS repository is needed. To test anonymous access to the CVS
-    repository, log in to another machine as an unprivileged user and execute
-    the following command:</para>
-
-<screen><userinput>cvs -d:pserver:anonymous@<replaceable>&lt;servername&gt;</replaceable>:/srv/cvsroot co cvstest</userinput></screen>
-
-    <note>
-      <para>Replace <replaceable>&lt;servername&gt;</replaceable> with the
-      IP address or hostname of the CVS server.</para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>mkdir /srv/cvsroot</command>: Create the CVS
-    repository directory.</para>
-
-    <para><command>chmod 1777 /srv/cvsroot</command>: Set sticky bit
-    permissions for <envar>CVSROOT</envar>.</para>
-
-    <para><command>export CVSROOT=/srv/cvsroot</command>: Specify new
-    <envar>CVSROOT</envar> for all <command>cvs</command> commands.</para>
-
-    <para><command>cvs init</command>: Initialize the new CVS
-    repository.</para>
-
-    <para><command>cvs import -m "repository test" cvstest vendortag
-    releasetag</command>: All source code modules must be imported into the
-    CVS repository before use, with the <command>cvs import</command> command.
-    The <option>-m</option> flags specifies an initial descriptive entry for
-    the new module. The <option>cvstest</option> parameter is the name used
-    for the module in all subsequent <command>cvs</command> commands. The
-    <option>vendortag</option> and <option>releasetag</option> parameters are
-    used to further identify each CVS module and are mandatory whether used
-    or not.</para>
-
-    <para><command>(grep anonymous /etc/passwd || useradd anonymous -s
-    /bin/false -u 98)</command>: Check for an existing <systemitem
-    class="username">anonymous</systemitem> user and create one if not
-    found.</para>
-
-    <para><command>echo anonymous: &gt; /srv/cvsroot/CVSROOT/passwd</command>:
-    Add the <systemitem class="username">anonymous</systemitem> user to the
-    CVS passwd file, which is unused for anything else in this
-    configuration.</para>
-
-    <para><command>echo anonymous &gt; /srv/cvsroot/CVSROOT/readers</command>:
-    Add the <systemitem class="username">anonymous</systemitem> user to the
-    CVS readers file, a list of users who have read only access to the
-    repository.</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>None</seg>
-        <seg>/srv/cvsroot</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/db.xml
===================================================================
--- archive/db.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,459 +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 db-download-http "&sources-anduin-http;/bdb/db-&db-version;.tar.gz">
-  <!ENTITY db-download-ftp  " ">
-  <!ENTITY db-md5sum        "b99454564d5b4479750567031d66fe24">
-  <!ENTITY db-size          "34 MB">
-  <!ENTITY db-buildsize     "265 MB">
-  <!ENTITY db-time          "0.6 SBU">
-]>
-
-<sect1 id="db" xreflabel="Berkeley DB-&db-version;">
-  <?dbhtml filename="db.html"?>
-
-
-  <title>Berkeley DB-&db-version;</title>
-
-  <indexterm zone="db">
-    <primary sortas="a-Berkeley-DB">Berkeley DB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Berkeley DB</title>
-
-    <para>
-      The <application>Berkeley DB</application> package contains programs and
-      utilities used by many other applications for database related functions.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&db-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&db-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &db-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &db-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &db-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &db-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Berkeley DB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="tcl"/> and -->
-      <xref linkend="libnsl"/> and
-      <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
-
-      <!--,
-      <xref linkend="openjdk"/> or <xref linkend="java"/>, and
-- -          This is currently broken, removed for now.                - -
-      <xref linkend="sharutils"/> (for the <command>uudecode</command> command
-      - Java bindings are required) -->
-    </para>
-
-  </sect2>
-
-  <!-- <sect2 role="testing">
-    <title>Testing Berkeley DB before the real install</title>
-
-    <para>
-      If you can't wait 12 hours or so you may want to skip ahead to
-      <xref linkend="bdb-installation"/>. The test suite can take a long time
-      and has a few bugs causing a report of <quote>Regression tests
-      failed</quote>. However, running the test suite is a very exhaustive test
-      of your hardware, perhaps pushing your machine harder (especially disk
-      I/O) than it will ever see during production use. Note that you must have
-      <application>Tcl</application> installed to run the test suite.
-    </para>
-
-    <para>
-      Build for the <application>Berkeley DB</application> test by running the
-      following commands:
-    </para>
-
-<screen><userinput>cd build_unix                         &amp;&amp;
-../dist/configure -&#45;prefix=/usr       \
-                  -&#45;enable-test       \
-                  -&#45;enable-tcl        \
-                  -&#45;enable-dbm        \
-                  -&#45;with-tcl=/usr/lib &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, start <command>tclsh</command>:
-    </para>
-
-<screen><userinput>tclsh</userinput></screen>
-
-    <para>
-      From the <command>tclsh</command> prompt (<prompt>%&nbsp;</prompt>), run:
-    </para>
-
-<screen><userinput>source ../test/tcl/test.tcl
-run_parallel 5 run_std
-exit</userinput></screen>
-
-    <para>
-      Clean up the source tree with the following command:
-    </para>
-
-<screen><userinput>make realclean &amp;&amp;
-cd ..</userinput></screen>
-
-    <note><para>
-      Test127.f and Repmgr026.c are known to fail.
-    </para></note>
-
-    <para>
-      There are additional testing suites in the
-      <filename class="directory">test/c</filename> and
-      <filename class="directory">test/cxx</filename> directories.  See the
-      <filename>README</filename> in each directory for instructions on how to
-      run the tests.
-    </para>
-  </sect2> -->
-
-  <sect2 role="installation" id="bdb-installation">
-    <title>Installation of Berkeley DB</title>
-
-    <para>
-      First apply a fix so that this will compile with current versions of
-      <command>g++</command>:
-    </para>
-
-<screen><userinput>sed -i 's/\(__atomic_compare_exchange\)/\1_db/' src/dbinc/atomic.h</userinput></screen>
-
-  <!-- move parts of hte testing to here, possibly as sect3 -->
-
-    <para>
-      Install <application>Berkeley DB</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd build_unix                        &amp;&amp;
-../dist/configure --prefix=/usr      \
-                  --enable-compat185 \
-                  --enable-dbm       \
-                  --disable-static   \
-                  --enable-cxx       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
-
-chown -v -R root:root                        \
-      /usr/bin/db_*                          \
-      /usr/include/db{,_185,_cxx}.h          \
-      /usr/lib/libdb*.{so,la}                \
-      /usr/share/doc/db-&db-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>cd build_unix &amp;&amp; ../dist/configure
-      --prefix=/usr...</command>: This replaces the normal
-      <command>./configure</command> command, as
-      <application>Berkeley DB</application> comes with various build
-      directories for different platforms.
-    </para>
-
-    <para>
-      <parameter>--enable-compat185</parameter>: This switch enables building
-      the DB-1.85 compatibility API.
-    </para>
-
-    <para>
-      <parameter>--enable-cxx</parameter>: This switch enables building C++ API
-      libraries.
-    </para>
-
-    <para>
-      <parameter>--enable-dbm</parameter>: Enables legacy interface support
-      needed by some older packages.
-    </para>
-
-    <para>
-      <command>make docdir=/usr/share/doc/db-&db-version; install</command>:
-      This installs the documentation in the standard location instead of
-      <filename class="directory">/usr/docs</filename>.
-    </para>
-
-    <para>
-      <command>chown -v -R root:root ...</command>:This command changes the
-      ownership of various installed files from the uid:gid of the builder to
-      root:root.
-    </para>
-
-    <para>
-      <option>--enable-tcl --with-tcl=/usr/lib</option>: Enables
-      <application>Tcl</application> support in DB and creates the
-      <filename class="libraryfile">libdb_tcl</filename> libraries.
-    </para>
-
-    <para>
-      <option>--enable-java</option>: Enables <application>Java</application>
-      support in DB and creates the
-      <filename class="libraryfile">libdb_java</filename> libraries.
-<!--
-checking if java works... yes
-checking for javac... /opt/jdk/bin/javac
-checking absolute path of javac... /opt/jdk/bin/javac
-checking java version... 10.0.1
-configure: error: Java version 1.3 or higher required, got 10.0.1
--->
-      Java support is currently broken with Java-&openjdk-build;.x and higher.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          db_archive,
-          db_checkpoint,
-          db_deadlock,
-          db_dump,
-          db_hotbackup,
-          db_load,
-          db_log_verify,
-          db_printlog,
-          db_recover,
-          db_replicate,
-          db_stat,
-          db_tuner,
-          db_upgrade, and
-          db_verify
-        </seg>
-        <seg>
-          libdb.so,
-          libdb_cxx.so, and
-<!--      libdb_java.so, and -->
-          libdb_tcl.so
-        </seg>
-        <seg>/usr/share/doc/db-&db-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="db_archive">
-        <term><command>db_archive</command></term>
-        <listitem>
-          <para>
-            prints the pathnames of log files that are no longer in use
-          </para>
-          <indexterm zone="db db_archive">
-            <primary sortas="b-db_archive">db_archive</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_checkpoint">
-        <term><command>db_checkpoint</command></term>
-        <listitem>
-          <para>
-            is a daemon process used to monitor and checkpoint database logs
-          </para>
-          <indexterm zone="db db_checkpoint">
-            <primary sortas="b-db_checkpoint">db_checkpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_deadlock">
-        <term><command>db_deadlock</command></term>
-        <listitem>
-          <para>
-            is used to abort lock requests when deadlocks are detected
-          </para>
-          <indexterm zone="db db_deadlock">
-            <primary sortas="b-db_deadlock">db_deadlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_dump">
-        <term><command>db_dump</command></term>
-        <listitem>
-          <para>
-            converts database files to a flat file format readable by
-            <command>db_load</command>
-          </para>
-          <indexterm zone="db db_dump">
-            <primary sortas="b-db_dump">db_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_hotbackup">
-        <term><command>db_hotbackup</command></term>
-        <listitem>
-          <para>
-            creates "hot backup" or "hot failover" snapshots of Berkeley DB
-            databases
-          </para>
-          <indexterm zone="db db_hotbackup">
-            <primary sortas="b-db_hotbackup">db_hotbackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_load">
-        <term><command>db_load</command></term>
-        <listitem>
-          <para>
-            is used to create database files from flat files created with
-            <command>db_dump</command>
-          </para>
-          <indexterm zone="db db_load">
-            <primary sortas="b-db_load">db_load</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_log_verify">
-        <term><command>db_log_verify</command></term>
-        <listitem>
-          <para>
-            verifies the log files of a database
-          </para>
-          <indexterm zone="db db_log_verify">
-            <primary sortas="b-db_log_verify">db_log_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_printlog">
-        <term><command>db_printlog</command></term>
-        <listitem>
-          <para>
-            converts database log files to human readable text
-          </para>
-          <indexterm zone="db db_printlog">
-            <primary sortas="b-db_printlog">db_printlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_recover">
-        <term><command>db_recover</command></term>
-        <listitem>
-          <para>
-            is used to restore a database to a consistent state after a failure
-          </para>
-          <indexterm zone="db db_recover">
-            <primary sortas="b-db_recover">db_recover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_replicate">
-        <term><command>db_replicate</command></term>
-        <listitem>
-          <para>
-            is a daemon process that provides replication/HA services on a
-            transactional environment
-          </para>
-          <indexterm zone="db db_replicate">
-            <primary sortas="b-db_replicate">db_replicate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_stat">
-        <term><command>db_stat</command></term>
-        <listitem>
-          <para>
-            displays database environment statistics
-          </para>
-          <indexterm zone="db db_stat">
-            <primary sortas="b-db_stat">db_stat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_tuner">
-        <term><command>db_tuner</command></term>
-        <listitem>
-          <para>
-            analyzes the data in a btree database, and suggests a page size that
-            is likely to deliver optimal operation
-          </para>
-          <indexterm zone="db db_tuner">
-            <primary sortas="b-db_tuner">db_tuner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_upgrade">
-        <term><command>db_upgrade</command></term>
-        <listitem>
-          <para>
-            is used to upgrade database files to a newer version of
-            <application>Berkeley DB</application>
-          </para>
-          <indexterm zone="db db_upgrade">
-            <primary sortas="b-db_upgrade">db_upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_verify">
-        <term><command>db_verify</command></term>
-        <listitem>
-          <para>
-            is used to run consistency checks on database files
-          </para>
-          <indexterm zone="db db_verify">
-            <primary sortas="b-db_verify">db_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/dbus-bindings.xml
===================================================================
--- archive/dbus-bindings.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,332 +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 dbus-glib-download-http "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
-  <!ENTITY dbus-glib-download-ftp  " ">
-  <!ENTITY dbus-glib-md5sum        "ad0920c7e3aad669163bb59171cf138e">
-  <!ENTITY dbus-glib-size          "732 KB">
-  <!ENTITY dbus-glib-buildsize     "12 MB">
-  <!ENTITY dbus-glib-time          "0.1 SBU">
-
-  <!ENTITY dbus-python-download-http "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
-  <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "742c7432ad0f7c3f98291d58fa2e35dc">
-  <!ENTITY dbus-python-size          "583 KB">
-  <!ENTITY dbus-python-buildsize     "5.7 MB">
-  <!ENTITY dbus-python-time          "0.2 SBU">
-
-  <!-- All the other bindings info should be here as well -->
-]>
-
-<sect1 id="dbus-bindings" xreflabel="D-Bus Bindings">
-  <?dbhtml filename="dbus-bindings.html"?>
-
-
-  <title>D-Bus Bindings</title>
-
-  <indexterm zone="dbus-bindings">
-    <primary sortas="a-dbus-bindings">D-Bus Bindings</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to D-Bus Bindings</title>
-
-    <para>The <application>D-Bus Bindings</application> are a group of packages
-    that contain programming language and platform interfaces to the D-Bus API.
-    This is useful for programmers to easily interface D-Bus with their
-    supported platform or language of choice. Some non-D-Bus packages will
-    require one or more of the Bindings packages in order to build
-    successfully.</para>
-
-    <para>The <application>GLib</application> and
-    <application>Python</application> bindings are included on this page. Other
-    language bindings are available at the <ulink
-    url="http://www.freedesktop.org/wiki/Software/DBusBindings">D-Bus
-    Bindings</ulink> page for information.</para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para><xref linkend="dbus-glib"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="dbus-python"/></para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <!-- Begin D-Bus GLib Bindings -->
-  <sect2 id="dbus-glib" xreflabel="D-Bus GLib Bindings-&dbus-glib-version;">
-    <title>D-Bus GLib Bindings</title>
-
-    <indexterm zone="dbus-glib">
-      <primary sortas="a-dbus-glib">D-Bus GLib Bindings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to D-Bus GLib Bindings</title>
-
-      &lfs73_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbus-glib-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbus-glib-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-         <para>
-            Download MD5 sum: &dbus-glib-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbus-glib-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbus-glib-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbus-glib-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">D-Bus GLib Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="expat"/> and
-        <xref linkend="glib2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional to Build the API Documentation</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>
-      </para>
-
-      <para condition="html" role="usernotes">User Notes:
-        <ulink url="&blfs-wiki;/dbus-glib"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of D-Bus GLib Bindings</title>
-
-      <para>
-        Install <application>D-Bus GLib Bindings</application> by
-        running the following commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/dbus-1.0 \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>make check</command>. Note that
-        more comprehensive tests can be run by following the same method used in
-        <application>D-Bus</application> instructions, which requires building the
-        package twice.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/static-libraries.xml"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            dbus-binding-tool
-          </seg>
-          <seg>
-            libdbus-glib-1.so
-          </seg>
-          <seg>
-            /usr/share/gtk-doc/html/dbus-glib and
-            /usr/share/doc/dbus-glib-&dbus-glib-version;
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="glib-dbus-binding-tool">
-          <term><command>dbus-binding-tool</command></term>
-          <listitem>
-            <para>
-              is a tool used to interface with the D-Bus API.
-            </para>
-            <indexterm zone="dbus-glib glib-dbus-binding-tool">
-              <primary sortas="b-dbus-binding-tool">dbus-binding-tool</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libdbus-glib-1">
-          <term><filename class="libraryfile">libdbus-glib-1.so</filename></term>
-          <listitem>
-            <para>
-              contains <application>GLib</application> interface functions
-              to the <application>D-Bus</application> API.
-            </para>
-            <indexterm zone="dbus-glib libdbus-glib-1">
-              <primary sortas="c-libdbus-glib-1">libdbus-glib-1.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-
-  <!-- Begin D-Bus Python Bindings -->
-  <sect2 id="dbus-python" xreflabel="D-Bus Python Bindings-&dbus-python-version;">
-    <title>D-Bus Python Bindings</title>
-
-    <indexterm zone="dbus-python">
-      <primary sortas="a-dbus-python">D-Bus Python Bindings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to D-Bus Python Bindings</title>
-
-      &lfs73_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Download (HTTP): <ulink url="&dbus-python-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&dbus-python-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &dbus-python-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &dbus-python-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &dbus-python-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &dbus-python-time;</para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">D-Bus Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> and
-        <xref linkend="dbus-glib"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="pygobject2"/> (required to run the test suite)
-      </para>
-
-      <bridgehead renderas="sect5">Optional
-      (Required to build the API and HTML Documentation)</bridgehead>
-      <para role="optional">
-        <ulink url="http://epydoc.sourceforge.net/">Epydoc</ulink> and
-        <ulink url="http://docutils.sourceforge.net/">Docutils</ulink>
-      </para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/dbus-python"/></para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of D-Bus Python Bindings</title>
-
-      <para>Install <application>D-Bus Python Bindings</application> by
-      running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/dbus-python-&dbus-python-version; &amp;&amp;
-make</userinput></screen>
-
-      <para>To test the results, issue: <command>make check</command>. Note you
-      must have <application>PyGObject</application> installed.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      <para>If you built the API documentation, install it by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/dbus-python-&dbus-python-version;/api &amp;&amp;
-install -v -m644    api/* \
-                    /usr/share/doc/dbus-python-&dbus-python-version;/api</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>none</seg>
-          <seg><application>Python</application>
-          <application>D-Bus</application> modules</seg>
-          <seg>/usr/lib/python&python2-majorver;/site-packages/dbus and
-          /usr/share/doc/dbus-python-&dbus-python-version;</seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: chive/decorator.xml
===================================================================
--- archive/decorator.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,119 +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 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-size          "36 KB">
-  <!ENTITY decorator-buildsize     "232 KB">
-  <!ENTITY decorator-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin decorator -->
-  <sect2 id="decorator" xreflabel="decorator-&decorator-version;">
-    <title>decorator-&decorator-version;</title>
-
-    <indexterm zone="decorator">
-      <primary sortas="a-decorator">decorator</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to decorator Module</title>
-
-      <para>
-        The goal of the <application>decorator</application> module is to make
-        it easy to define signature-preserving function decorators and
-        decorator factories.
-      </para>
-
-      &lfs110a_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&decorator-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&decorator-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &decorator-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &decorator-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &decorator-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &decorator-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para condition="html" role="usernotes">User Notes:
-        <ulink url="&blfs-wiki;/decorator"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of decorator</title>
-
-      <para>
-        Install <application>decorator</application> with the following
-        commands:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        To install the decorator package with the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/decorator-&decorator-version;-py&python3-majorver;.egg-info
-          </seg>
-          <seg>
-            None
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: chive/dejagnu.xml
===================================================================
--- archive/dejagnu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +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 dejagnu-download-http "&gnu-http;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-  <!ENTITY dejagnu-download-ftp  "&gnu-ftp;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-  <!ENTITY dejagnu-md5sum        "e1b07516533f351b3aba3423fafeffd6">
-  <!ENTITY dejagnu-size          "516 KB">
-  <!ENTITY dejagnu-buildsize     "3.4 MB (with tests)">
-  <!ENTITY dejagnu-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="dejagnu" xreflabel="DejaGnu-&dejagnu-version;">
-  <?dbhtml filename="dejagnu.html"?>
-
-
-  <title>DejaGnu-&dejagnu-version;</title>
-
-  <indexterm zone="dejagnu">
-    <primary sortas="a-DejaGnu">DejaGnu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DejaGnu</title>
-
-    <para>
-      <application>DejaGnu</application> is a framework for running test
-      suites on GNU tools. It is written in <command>expect</command>, which
-      uses <application>Tcl</application> (Tool command language). It was installed
-      by LFS in the temporary <filename class="directory">/tools</filename>
-      directory. These instructions install it permanently.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dejagnu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dejagnu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dejagnu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dejagnu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dejagnu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dejagnu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DejaGnu Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="expect"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/> and
-      <ulink url="http://sourceforge.net/projects/docbook2x/">docbook2X</ulink>
-      (both looked for by the <command>configure</command> script but not used
-      in the build)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/dejagnu"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DejaGnu</title>
-
-    <para>
-      Install <application>DejaGnu</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi &amp;&amp;
-makeinfo --plaintext       -o doc/dejagnu.txt  doc/dejagnu.texi</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755   /usr/share/doc/dejagnu-&dejagnu-version; &amp;&amp;
-install -v -m644    doc/dejagnu.{html,txt} \
-                    /usr/share/doc/dejagnu-&dejagnu-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          runtest
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/dejagnu
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="runtest">
-        <term><command>runtest</command></term>
-        <listitem>
-          <para>
-            is the <application>DejaGnu</application> test driver program. It is
-            used to control what tests to run, and variations on how to run them.
-          </para>
-          <indexterm zone="dejagnu runtest">
-            <primary sortas="b-runtest">runtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/deprecated.xml
===================================================================
--- archive/deprecated/deprecated.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="gnome-legacy">
-  <?dbhtml filename="deprecated.html"?>
-
-  <title>Deprecated GNOME Packages</title>
-
-  <para>This section contains legacy <application>GNOME-2</application>
-  packages which are currently used as dependencies by the stable versions
-  of some other applications.  When those applications have been updated to
-  newer stable releases, these packages will be removed from the book.</para>
-
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/> -->
-
-  <!-- This is used as a TOC separator -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-deprecated.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="orbit2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonobo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mime-data.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomecanvas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonoboui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeui.xml"/>
-
-</chapter>
Index: chive/deprecated/dummy-deprecated.xml
===================================================================
--- archive/deprecated/dummy-deprecated.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +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">
-
-
-  <title>Legacy Gnome-2 libraries</title>
-  <para/>
-</sect1>
Index: chive/deprecated/gnome-mime-data.xml
===================================================================
--- archive/deprecated/gnome-mime-data.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +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 gnome-mime-data-download-http "&gnome-download-http;/gnome-mime-data/2.18/gnome-mime-data-&gnome-mime-data-version;.tar.bz2">
-  <!ENTITY gnome-mime-data-download-ftp  "&gnome-download-ftp;/gnome-mime-data/2.18/gnome-mime-data-&gnome-mime-data-version;.tar.bz2">
-  <!ENTITY gnome-mime-data-md5sum        "541858188f80090d12a33b5a7c34d42c">
-  <!ENTITY gnome-mime-data-size          "593 KB">
-  <!ENTITY gnome-mime-data-buildsize     "12 MB">
-  <!ENTITY gnome-mime-data-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-mime-data" xreflabel="gnome-mime-data-&gnome-mime-data-version;">
-  <?dbhtml filename="gnome-mime-data.html"?>
-
-
-  <title>gnome-mime-data-&gnome-mime-data-version;</title>
-
-  <indexterm zone="gnome-mime-data">
-    <primary sortas="a-GNOME-MIME-Data">GNOME MIME Data</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME MIME Data</title>
-
-    <para>The <application>GNOME MIME Data</application> package contains
-    the base set of file types and applications for
-    <application>GNOME-2</application>.</para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-mime-data-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-mime-data-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-mime-data-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-mime-data-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-mime-data-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-mime-data-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME MIME Data Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="perl-xml-parser"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-mime-data"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME MIME Data</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>GNOME MIME Data</application> by running
-    the following commands:</para>
-
-<screen><userinput>ORBit_prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-
-./configure --prefix=$ORBit_prefix            \
-            --sysconfdir=&gnome-old-etc-dir;    \
-            --mandir=$$ORBit_prefix/share/man &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;
-install -v -m644 -D man/gnome-vfs-mime.5 \
-                    $ORBit_prefix/share/man/man5/gnome-vfs-mime.5</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.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>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{application-registry,
-        share/mime-info}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term><filename class='directory'>application-registry</filename></term>
-        <listitem>
-          <para>contains the application mime database.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename class='directory'>mime-info</filename></term>
-        <listitem>
-          <para>contains the mime description database.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/gnome-vfs.xml
===================================================================
--- archive/deprecated/gnome-vfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +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 gnome-vfs-download-http "&gnome-download-http;/gnome-vfs/2.24/gnome-vfs-&gnome-vfs-version;.tar.bz2">
-  <!ENTITY gnome-vfs-download-ftp  "&gnome-download-ftp;/gnome-vfs/2.24/gnome-vfs-&gnome-vfs-version;.tar.bz2">
-  <!ENTITY gnome-vfs-md5sum        "a05fab03eeef10a47dd156b758982f2e">
-  <!ENTITY gnome-vfs-size          "1.8 MB">
-  <!ENTITY gnome-vfs-buildsize     "56 MB">
-  <!ENTITY gnome-vfs-time          "1.0 SBU">
-]>
-
-<sect1 id="gnome-vfs" xreflabel="gnome-vfs-&gnome-vfs-version;">
-  <?dbhtml filename="gnome-vfs.html"?>
-
-
-  <title>gnome-vfs-&gnome-vfs-version;</title>
-
-  <indexterm zone="gnome-vfs">
-    <primary sortas="a-GNOME-Virtual-File-System">GNOME Virtual File System</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Virtual File System</title>
-
-    <para>The <application>GNOME Virtual File System</application> package
-    contains virtual file system libraries. This is used as one of the
-    foundations of the <application>Nautilus</application> file manager.</para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-vfs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-vfs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-vfs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-vfs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-vfs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-vfs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Virtual File System Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/>,
-    <xref linkend="GConf"/>, and
-    <xref linkend="gnome-mime-data"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="samba"/>,
-    <xref linkend="gamin"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="openssh"/>,
-    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="avahi"/>,
-    <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
-    <xref linkend="cdparanoia"/> (not recommended)</para>
-
-    <para>If you run <command>./configure --help</command> for the complete list
-    of dependency requirements and available parameters, you may notice a
-    message about the <ulink
-    url="http://hal.freedesktop.org/releases/">gnome-mount</ulink> package. This
-    package is not required at build-time, and is only a run-time dependency. If
-    <application>gnome-mount</application> is available at run-time,
-    <application>GNOME-VFS</application> will use it. If it is not available,
-    <application>GNOME-VFS</application> will fall back to using other mounting
-    mechanisms.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-vfs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Virtual File System</title>
-
-    <para>Install <application>GNOME Virtual File System</application>
-    by running the following commands:</para>
-
-<screen><userinput>ORBit_prefix=$(pkg-config --variable=prefix ORBit-2.0)   &amp;&amp;
-
-./configure --prefix=$ORBit_prefix                       \
-            --sysconfdir=&gnome-old-etc-dir;               \
-            --libexecdir=$ORBit_prefix/lib/gnome-vfs-2.0 &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-vfs-2.0</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--with-dbus-service-dir=/usr/share/dbus-1/services</option>:
-    Use this parameter if you linked <application>HAL</application> into the
-    build and you want the <filename>gnome-vfs-daemon.service</filename> file
-    installed in the default <application>D-Bus</application> location instead
-    of in <filename
-    class='directory'><envar>GNOME_PREFIX</envar>/share/dbus-1/services</filename>.
-    See the information in the configuration section below if you don't use this
-    parameter.</para>
-
-    <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
-    need to be passed if you have <xref linkend="eject"/> or <ulink
-    url="http://hal.freedesktop.org/releases/">gnome-mount</ulink> installed, as
-    the <command>eject</command> program is used if
-    <application>gnome-mount</application> is not installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gnome Virtual File System</title>
-
-    <sect3 id="gnome-vfs-config">
-      <title>Configuration Information</title>
-
-      <para>If <application>HAL</application> was linked into the build and
-      GNOME is being installed in any location other than
-      <filename class='directory'>/usr</filename>, you should create a local
-      <application>D-Bus</application> session configuration file so that the
-      installed <filename>gnome-vfs-daemon.service</filename> file can be
-      discovered by <application>D-Bus</application>. You should reference
-      the information on the <application>D-Bus</application> page for
-      instructions on how to create a
-      <xref linkend="dbus-session-config"/>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnomevfs-cat, gnomevfs-copy, gnomevfs-df, gnomevfs-info,
-        gnomevfs-ls, gnomevfs-mkdir, gnomevfs-monitor, gnomevfs-mv, gnomevfs-rm,
-        and gnome-vfs-daemon</seg>
-        <seg>libbzip2.{so,a}, libcomputer.{so,a}, libdns-sd.{so,a},
-        libfile.{so,a}, libftp.{so,a}, libgzip.{so,a}, libhttp.{so,a},
-        libnetwork.{so,a}, libnntp.{so,a}, libsftp.{so,a}, libtar.{so,a},
-        libvfs-test.{so,a}, and libgnomevfs-2.{so,a}</seg>
-        <seg>&gnome-old-etc-dir;/gnome-vfs-2.0/modules,
-        <envar>$GNOME_PREFIX</envar>/{include/{gnome-vfs-2.0/libgnomevfs,
-        gnome-vfs-module-2.0/libgnomevfs},lib/gnome-vfs-2.0/{include,modules},
-        share/gtk-doc/html/gnome-vfs-2.0}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/libbonobo.xml
===================================================================
--- archive/deprecated/libbonobo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +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 libbonobo-download-http "&gnome-download-http;/libbonobo/2.32/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-download-ftp  "&gnome-download-ftp;/libbonobo/2.32/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-md5sum        "27fa902d4fdf6762ee010e7053aaf77b">
-  <!ENTITY libbonobo-size          "1.4 MB">
-  <!ENTITY libbonobo-buildsize     "45 MB">
-  <!ENTITY libbonobo-time          "0.6 SBU">
-]>
-
-<sect1 id="libbonobo" xreflabel="libbonobo-&libbonobo-version;">
-  <?dbhtml filename="libbonobo.html"?>
-
-
-  <title>libbonobo-&libbonobo-version;</title>
-
-  <indexterm zone="libbonobo">
-    <primary sortas="a-Libbonobo">Libbonobo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libbonobo</title>
-
-    <para>The <application>libbonobo</application> package contains
-    <filename class="libraryfile">libbonobo</filename> libraries.
-    This is a component and compound document system for
-    <application>GNOME-2</application>.</para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libbonobo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libbonobo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libbonobo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libbonobo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libbonobo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libbonobo-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libbonobo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="glib2"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="ORBit2"/>, and
-    <xref linkend="popt"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="x-window-system"/> and
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libbonobo"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libbonobo</title>
-
-    <para>Install <application>libbonobo</application> by running the following
-    commands:</para>
-
-<screen><userinput>ORBit_prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-
-./configure --prefix=$ORBit_prefix                     \
-            --sysconfdir=&gnome-old-etc-dir;           \
-            --libexecdir=$ORBit_prefix/lib/bonobo-2.0  \
-            --mandir=$ORBit_prefix/share/man           &amp;&amp;
-
-unset ORBit_prefix                                     &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/bonobo-2.0</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of <filename
-    class="directory">$GNOME_PREFIX/lib/bonobo-2.0</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>activation-client, bonobo-activation-run-query, bonobo-slay,
-        echo-client-2, bonobo-activation-server, bonobo-echo-2, and
-        bonobo-activation-sysconf</seg>
-        <seg>libmoniker_std_2.{so,a}, libbonobo-2.{so,a}, and
-        libbonobo-activation.{so,a}</seg>
-        <seg>&gnome-old-etc-dir;/bonobo-activation,
-        <envar>$GNOME_PREFIX</envar>/{include/{bonobo-activation-2.0/bonobo-activation,
-        libbonobo-2.0/bonobo},lib/{bonobo-2.0/samples,bonobo/{monikers,
-        servers}},share/{gtk-doc/html/{bonobo-activation,libbonobo},
-        idl/{bonobo-2.0,bonobo-activation-2.0}}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libbonobo-2">
-        <term><filename class='libraryfile'>libbonobo-2.{so,a}</filename></term>
-        <listitem>
-          <para>are a set of language and system independent CORBA interfaces
-          for creating reusable components and compound documents.</para>
-          <indexterm zone="libbonobo libbonobo-2">
-            <primary sortas="c-libbonobo-2">libbonobo-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/libbonoboui.xml
===================================================================
--- archive/deprecated/libbonoboui.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +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 libbonoboui-download-http
-    "&gnome-download-http;/libbonoboui/2.24/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-download-ftp
-    "&gnome-download-ftp;/libbonoboui/2.24/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-md5sum        "853be8e28aaa4ce48ba60be7d9046bf4">
-  <!ENTITY libbonoboui-size          "954 KB">
-  <!ENTITY libbonoboui-buildsize     "41 MB">
-  <!ENTITY libbonoboui-time          "0.9 SBU">
-]>
-
-<sect1 id="libbonoboui" xreflabel="LibBonoboUI-&libbonoboui-version;">
-  <?dbhtml filename="libbonoboui.html"?>
-
-
-  <title>LibBonoboUI-&libbonoboui-version;</title>
-
-  <indexterm zone="libbonoboui">
-    <primary sortas="a-Libbonoboui">LibBonoboUI</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LibBonoboUI</title>
-
-    <para>
-      The <application>Bonobo</application> User Interface library provides user
-      interface code for <application>Bonobo</application>, the Object
-      Activation Framework for <application>GNOME 2</application>.
-    </para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libbonoboui-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libbonoboui-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libbonoboui-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libbonoboui-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libbonoboui-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libbonoboui-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LibBonoboUI Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libglade"/>,
-      <xref linkend="libgnome"/> and
-      <xref linkend="libgnomecanvas"/>
-    </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;/libbonoboui"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LibBonoboUI</title>
-
-    <para>
-      Install <application>LibBonoboUI</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-  --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d $(pkg-config \
-        --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version; &amp;&amp;
-
-install -v -m644 doc/*.{dtd,txt,xml,html} $(pkg-config \
-        --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LibBonoboUI</title>
-
-      <para>
-        If you have installed gnome with a different prefix to
-        <application>LibGlade</application> (eg,
-        <application>LibGlade</application> is installed into
-        <filename class="directory">/usr</filename> and
-        <application>LibBonoboUI</application> is installed into
-        <filename class="directory">/opt/gnome</filename>) you will need to add
-        the directory containing the Glade files to the environment variable
-        <envar>${LIBGLADE_MODULE_PATH}</envar>. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo export \
-   LIBGLADE_MODULE_PATH=$(pkg-config --variable=prefix ORBit-2.0)/lib/libglade/2.0 \
-   &gt;&gt; /etc/profile</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bonobo-browser and test-moniker</seg>
-        <seg>libbonoboui-2.so and libbonobo.so Glade library</seg>
-        <seg>
-          /usr/include/libbonoboui-2.0/bonobo,
-          /usr/share/doc/libbonoboui-2.24.3,
-          /usr/share/gnome-2.0/ui and
-          /usr/share/gtk-doc/html/libbonoboui
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libbonoboui-2">
-        <term><filename class='libraryfile'>libbonoboui-2.so</filename></term>
-        <listitem>
-          <para>
-            are the GUI portion of the <application>Bonobo</application>
-            libraries.
-          </para>
-          <indexterm zone="libbonoboui libbonoboui-2">
-            <primary sortas="c-libbonoboui">libbonoboui-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/deprecated/libgnome.xml
===================================================================
--- archive/deprecated/libgnome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 libgnome-download-http "&gnome-download-http;/libgnome/2.32/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/2.32/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-md5sum        "a4345e6087ae6195d65a4674ffdca559">
-  <!ENTITY libgnome-size          "1.7 MB">
-  <!ENTITY libgnome-buildsize     "28 MB">
-  <!ENTITY libgnome-time          "0.2 SBU">
-]>
-
-<sect1 id="libgnome" xreflabel="libgnome-&libgnome-version;">
-  <?dbhtml filename="libgnome.html"?>
-
-
-  <title>libgnome-&libgnome-version;</title>
-
-  <indexterm zone="libgnome">
-    <primary sortas="a-Libgnome">Libgnome</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnome</title>
-
-    <para>The <application>libgnome</application> package contains the
-    <filename class="libraryfile">libgnome</filename> library.</para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnome-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnome-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnome-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnome-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnome-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnome-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnome Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonobo"/> and
-    <xref linkend="gnome-vfs"/></para>
-
-    <bridgehead renderas="sect4">Recommended (if you plan on installing the
-    GNOME-2 deprecated packages)</bridgehead>
-    <para role="recommended"><xref linkend="libcanberra"/></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;/libgnome"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnome</title>
-
-    <para>Install <application>libgnome</application> by running the following
-    commands:</para>
-
-<screen><userinput>ORBit=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-
-./configure --prefix=$ORBit                \
-            --sysconfdir=&gnome-old-etc-dir; \
-            --localstatedir=/var/lib       \
-            --mandir=$ORBit/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-sysconfdir.xml"/>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This
-    parameter sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
-    <filename class='directory'>/var/lib</filename> instead
-    of <filename class='directory'>/usr/var</filename>
-    to synchronize with the <application>GNOME Games</application>
-    installation and properly record high scores in
-    <filename class='directory'>/var/lib/games</filename>.</para>
-
-    <!-- change dashes to pluses, otherwise not treated as a comment!
-    esound seems to have fallen out as a dep, probably because of pulse.
-    <para><option>++disable-esd</option>: This parameter is required if
-    <xref linkend="esound"/> is not installed.</para> -->
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-open</seg>
-        <seg>libgnome-2.{so,a} and the libmoniker_extra_2.{so,a} (bonobo
-        library)</seg>
-        <seg>&gnome-old-etc-dir;/sound/events,
-        <envar>$GNOME_PREFIX</envar>/{include/libgnome-2.0/libgnome,
-        share/gtk-doc/html/libgnome}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnome-2">
-        <term><filename class='libraryfile'>libgnome-2.{so,a}</filename></term>
-        <listitem>
-          <para>are the non-GUI portion of the <application>GNOME</application>
-          libraries.</para>
-          <indexterm zone="libgnome libgnome-2">
-            <primary sortas="c-libgnome-2">libgnome-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/libgnomecanvas.xml
===================================================================
--- archive/deprecated/libgnomecanvas.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +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 libgnomecanvas-download-http "&gnome-download-http;/libgnomecanvas/2.30/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-download-ftp  "&gnome-download-ftp;/libgnomecanvas/2.30/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-md5sum        "ffcbb719c671ff5cd86e59aeba8d0b92">
-  <!ENTITY libgnomecanvas-size          "561 KB">
-  <!ENTITY libgnomecanvas-buildsize     "20 MB">
-  <!ENTITY libgnomecanvas-time          "0.3 SBU">
-]>
-
-<sect1 id="libgnomecanvas" xreflabel="libgnomecanvas-&libgnomecanvas-version;">
-  <?dbhtml filename="libgnomecanvas.html"?>
-
-
-  <title>libgnomecanvas-&libgnomecanvas-version;</title>
-
-  <indexterm zone="libgnomecanvas">
-    <primary sortas="a-Libgnomecanvas">Libgnomecanvas</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomecanvas</title>
-
-    <para>The <application>libgnomecanvas</application> package contains
-    the <application>GNOME</application> canvas library.
-    It is an engine for structured graphics and one of the essential
-    <application>GNOME</application> libraries.</para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomecanvas-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomecanvas-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomecanvas-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomecanvas-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomecanvas-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomecanvas-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomecanvas Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="libart_lgpl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="libglade"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnomecanvas"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomecanvas</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>libgnomecanvas</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <!-- make check is recognised, but nothing useful is done -->
-    <para>This package does not have a testsuite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgnomecanvas-2.{so,a}</seg>
-        <seg>/usr/{include/libgnomecanvas-2.0/libgnomecanvas,
-        share/gtk-doc/html/libgnomecanvas}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/libgnomeui.xml
===================================================================
--- archive/deprecated/libgnomeui.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 libgnomeui-download-http "&gnome-download-http;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-download-ftp  "&gnome-download-ftp;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-md5sum        "d4bb506b1916015323928faab5aa708b">
-  <!ENTITY libgnomeui-size          "1.4 MB">
-  <!ENTITY libgnomeui-buildsize     "53 MB">
-  <!ENTITY libgnomeui-time          "0.7 SBU">
-]>
-
-<sect1 id="libgnomeui" xreflabel="libgnomeui-&libgnomeui-version;">
-  <?dbhtml filename="libgnomeui.html"?>
-
-
-  <title>libgnomeui-&libgnomeui-version;</title>
-
-  <indexterm zone="libgnomeui">
-    <primary sortas="a-Libgnomeui">Libgnomeui</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomeui</title>
-
-    <para>The <application>libgnomeui</application> package contains
-    <filename class="libraryfile">libgnomeui</filename> libraries.</para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomeui-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomeui-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomeui-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomeui-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomeui-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomeui-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomeui Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonoboui"/>,
-    <xref linkend="libgnome-keyring"/>, and
-    <xref linkend="xorg7-lib"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="libjpeg"/>,
-    <xref linkend="esound"/>, and -->
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnomeui"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomeui</title>
-
-    <para>Install <application>libgnomeui</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --libexecdir=$(pkg-config \
-            --variable=prefix ORBit-2.0)/lib/libgnomeui &amp;&amp;
-make</userinput></screen>
-
-    <para>This package's testsuite is only intended to be used by the
-    maintainer to check i18n files.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/libgnomeui</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead
-    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <!-- seems bogus, no kde dependencies. dashes changed to plus to keep it
-    as a valid comment
-   <para><option>++with-kde-datadir=&kde-dir;/share</option>: Use this
-    parameter if you have <application>KDE</application> installed in any prefix
-    other than <filename class='directory'>/usr</filename>.</para>-->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <!-- not relevant to anything using the deprecated packages
-  <sect2 role="configuration">
-    <title>Configuring libgnomeui</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Some applications cannot properly discover the
-      <application>libglade</application> interface library installed by
-      <application>libgnomeui</application>. Get around this problem by
-      initializing an environment variable which identifies the location
-      of the library. Add the following line to the system-wide
-      <filename>/etc/profile</filename> file, or to individual user's
-      <filename>~/.profile</filename> or <filename>~/.bashrc</filename>
-      files:</para>
-
-<screen><literal>export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0</literal></screen>
-
-    </sect3>
-
-  </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>libgnomeui-2.{so,a} and libgnome.{so,a} Glade library</seg>
-        <seg>/usr/include/libgnomeui-2.0/libgnomeui,
-             /usr/share/gtk-doc/html/libgnomeui</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnomeui-2">
-        <term><filename class='libraryfile'>libgnomeui-2.{so,a}</filename></term>
-        <listitem>
-          <para>are the GUI portion of the <application>GNOME</application>
-          libraries.</para>
-          <indexterm zone="libgnomeui libgnomeui-2">
-            <primary sortas="c-libgnomeui-2">libgnomeui-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/deprecated/orbit2.xml
===================================================================
--- archive/deprecated/orbit2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +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 ORBit2-download-http "&gnome-download-http;/ORBit2/2.14/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-download-ftp  "&gnome-download-ftp;/ORBit2/2.14/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-md5sum        "7082d317a9573ab338302243082d10d1">
-  <!ENTITY ORBit2-size          "764 KB">
-  <!ENTITY ORBit2-buildsize     "35 MB">
-  <!ENTITY ORBit2-time          "0.6 SBU">
-]>
-
-<sect1 id="ORBit2" xreflabel="ORBit2-&ORBit2-version;">
-  <?dbhtml filename="ORBit2.html"?>
-
-
-  <title>ORBit2-&ORBit2-version;</title>
-
-  <indexterm zone="ORBit2">
-    <primary sortas="a-ORBit2">ORBit2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ORBit2</title>
-
-    <para>The <application>ORBit2</application> package contains a
-    high-performance CORBA Object Request Broker. This allows programs
-    to send requests and receive replies from other programs.</para>
-
-    &lfs72_checked;
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome2.xml"/>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ORBit2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ORBit2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ORBit2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ORBit2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ORBit2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ORBit2-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ORBit2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libidl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="openssl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/orbit2"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ORBit2</title>
-
-    <para>Install <application>ORBit2</application> by running
-    the following commands:</para>
-
-    <para>Run the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=&gnome-old-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ior-decode-2, linc-cleanup-sockets, orbit-idl-2,
-        orbit2-config and typelib-dump</seg>
-        <seg>libname-server-2.a, libORBit-2.{so,a}, libORBit-imodule-2.{so,a},
-        libORBitCosNaming-2.{so,a}, and Everything_module.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/orbit-2.0/*,lib/orbit-2.0,
-        share/{gtk-doc/html/ORBit2,idl/orbit-2.0}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libORBit-2">
-        <term><filename class='libraryfile'>libORBit-2.{so,a}</filename></term>
-        <listitem>
-          <para>is the CORBA API.</para>
-          <indexterm zone="ORBit2 libORBit-2">
-            <primary sortas="c-libORBit-2">libORBit-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/dhcp-client.xml
===================================================================
--- archive/dhcp-client.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,103 +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="dhcp-client" xreflabel="DHCP-&dhcp-version; Client Configuration">
-  <?dbhtml filename="dhcpclient.html"?>
-
-
-  <title>DHCP-&dhcp-version; Client Configuration</title>
-
-  <indexterm zone="dhcp-client">
-    <primary sortas="b-dhclient">dhclient</primary>
-  </indexterm>
-
-  <para>The <application>DHCP</application> package comes with
-  both a client (<command>dhclient</command>) and a server program for
-  using DHCP.  If you want to install this package,
-  the instructions can be found at <xref linkend="dhcp"/>.
-  Note that if you only want to use the client, you
-  do <emphasis>not</emphasis> need to run the server and so do not need
-  the startup script and links provided for the server daemon.
-  You only need to run the DHCP server if you're providing
-  this service to a network, and it's likely that you'll know if that's the
-  case; if it isn't, don't run the server!  Once you have installed the
-  package, return here for information on how to configure the client
-  (<command>dhclient</command>).</para>
-
-  <sect2 role="configuration">
-    <title>Configuring DHCP Client</title>
-
-      <para id="dhclient-service1010">To configure <command>dhclient</command>,
-      you need to first install the network service script,
-      <filename>/lib/services/dhclient</filename>
-      included in the <xref linkend="bootscripts"/> package
-      (as <systemitem class="username">root</systemitem>):</para>
-
-      <indexterm zone="dhcp-client dhclient-service1010">
-        <primary sortas="f-dhclient">dhclient (service script)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>make install-service-dhclient</userinput></screen>
-
-    <para id="dhclient-config1">Next, create the
-    <filename>/etc/sysconfig/ifconfig.eth0</filename>
-    configuration file with the following commands as the <systemitem
-    class="username">root</systemitem> user.  Adjust as
-    necessary for additional interfaces:</para>
-
-    <indexterm zone="dhcp-client dhclient-config1">
-      <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/ifconfig.eth0</primary>
-    </indexterm>
-
-<screen role='root'><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhclient"
-DHCP_START="<replaceable>&lt;add additional start parameters here&gt;</replaceable> eth0"
-DHCP_STOP="-r <replaceable>&lt;add additional stop parameters here&gt;</replaceable>"
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-    <para>For more information on the appropriate
-    <envar>DHCP_START</envar> and <envar>DHCP_STOP</envar>
-    values, examine the man page for <command>dhclient</command>.</para>
-
-    <para id="dhclient-config2">Finally, you should create the
-    <filename>/etc/dhclient.conf</filename> file using the following commands
-    as the <systemitem class="username">root</systemitem> user:</para>
-
-    <indexterm zone="dhcp-client dhclient-config2">
-      <primary sortas="e-etc-dhclient.conf">/etc/dhclient.conf</primary>
-    </indexterm>
-
-    <note>
-      <para>You'll need to add a second interface definition to the file if you
-      have more than one interface.</para>
-    </note>
-
-<screen role='root'><userinput>cat &gt; /etc/dhclient.conf &lt;&lt; "EOF"
-<literal># dhclient.conf
-
-interface "eth0"{
-prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-        domain-name, domain-name-servers, host-name;
-require subnet-mask, domain-name-servers;
-}
-# end dhclient.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: chive/dhcp.xml
===================================================================
--- archive/dhcp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,575 +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 dhcp-download-http "https://ftp.isc.org/isc/dhcp/&dhcp-version;/dhcp-&dhcp-version;.tar.gz">
-  <!ENTITY dhcp-download-ftp  "ftp://ftp.isc.org/isc/dhcp/&dhcp-version;/dhcp-&dhcp-version;.tar.gz">
-  <!ENTITY dhcp-md5sum        "36c6ca77212373b0cff478ae9e5d32af">
-  <!ENTITY dhcp-size          "9.6 MB">
-  <!ENTITY dhcp-buildsize     "199 MB">
-  <!ENTITY dhcp-time          "0.7 SBU">
-]>
-
-<sect1 id="dhcp" xreflabel="DHCP-&dhcp-version;">
-  <?dbhtml filename="dhcp.html"?>
-
-
-  <title>DHCP-&dhcp-version;</title>
-
-  <indexterm zone="dhcp">
-    <primary sortas="a-DHCP">DHCP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ISC DHCP</title>
-
-    <para>
-      The <application>ISC DHCP</application> package contains both the client
-      and server programs for DHCP. <command>dhclient</command> (the client) is
-      used for connecting to a network which uses DHCP to assign network
-      addresses. <command>dhcpd</command> (the server) is used for assigning
-      network addresses on private networks.
-    </para>
-
-    &lfs113_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dhcp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dhcp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dhcp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dhcp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dhcp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dhcp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dhcp-&dhcp-version;-client_script-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/dhcp-&dhcp-version;-missing_ipv6-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-  </sect2>
-
-  <sect2 role="kernel" id="dhcp-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      You must have Packet Socket support.  IPv6 support is optional.
-    </para>
-
-<screen><literal>[*] Networking support ---&gt;        [CONFIG_NET]
-      Networking options ---&gt;
-        &lt;*&gt; Packet socket          [CONFIG_PACKET]
-        &lt;*&gt; The IPv6 Protocol ---&gt; [CONFIG_IPV6]</literal></screen>
-<!--
-    <para>
-      If you do not have IPv6 support:
-    </para>
-
-<screen><literal>[*] Networking support - - -&gt;          [CONFIG_NET]
-      Networking Options - - -&gt;
-        &lt;*&gt; The IPv6 Protocol - - -&gt;   [CONFIG_IPV6]</literal></screen>
-
-    <para>
-       compiled in, then you must use the <quote>missing_ipv6</quote> patch.
-    </para>
--->
-    <indexterm zone="dhcp dhcp-kernel">
-      <primary sortas="d-DHCP">DHCP</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ISC DHCP</title>
-
-<!-- Not needed when building DHCP-4.4.3.
-    <para>
-      First, fix a build issue with GCC 10 and later:
-    </para>
-
-<screen><userinput>sed -i '/o.*dhcp_type/d' server/mdb.c &amp;&amp;
-sed -r '/u.*(local|remote)_port/d'    \
-    -i client/dhclient.c              \
-       relay/dhcrelay.c</userinput></screen>
--->
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-<!--  This should not be needed any more.  Visual check appears to handle it.
-    <para>
-      If you have not compiled IPv6 support into the kernel, apply the
-      missing_ipv6 patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-missing_ipv6-1.patch</userinput></screen>
--->
-    <note>
-      <para>
-        Be careful with the instructions below. The single and
-        double quotes are important because the defined
-        variables are used verbatim in the code.
-      </para>
-    </note>
-
-    <para>
-      Install <application>ISC DHCP</application> by running
-      the following commands:
-    </para>
-
-<!--
-   Running ( export CFLAGS=... ./configure ... ) in a subshell
-   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\"'     \
-        -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
-        -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"        &amp;&amp;
-
-./configure --prefix=/usr                                           \
-            --sysconfdir=/etc/dhcp                                  \
-            --localstatedir=/var                                    \
-            --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases       \
-            --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases     \
-            --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
-            --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
-) &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      <!-- Note: make check builds a library, but otherwise does nothing. -->
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      If you only want to install the <application>ISC DHCP</application> client,
-      issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C client install             &amp;&amp;
-install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
-
-    <para>
-      Skip to <xref linkend="dhclient-config"/> in order to configure the
-      client
-    </para>
-
-    <para>
-      If you only want to install the <application>ISC DHCP</application> server,
-      issue the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C server install</userinput></screen>
-
-    <para>
-      Skip to <xref linkend="dhcpd-config"/> in order to configure the server.
-    </para>
-
-    <para>
-      Alternatively, you can install whole package which includes the client,
-      server, relay, static libraries and development headers by running the
-      following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ISC DHCP</title>
-
-    <sect3 id="dhcp-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/dhcp/dhclient.conf</filename> and
-        <filename>/etc/dhcp/dhcpd.conf</filename>
-      </para>
-
-      <indexterm zone="dhcp dhcp-config">
-        <primary sortas="e-etc-dhcp-dhclient.conf">/etc/dhcp/dhclient.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dhcp dhcp-config">
-        <primary sortas="e-etc-dhcp-dhcpd.conf">/etc/dhcp/dhcpd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="dhclient-config">
-      <title>Client Configuration</title>
-
-      <para>
-        Create a basic <filename>/etc/dhcp/dhclient.conf</filename>
-        by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -vdm755 /etc/dhcp &amp;&amp;
-cat &gt; /etc/dhcp/dhclient.conf &lt;&lt; "EOF"
-<literal># Begin /etc/dhcp/dhclient.conf
-#
-# Basic dhclient.conf(5)
-
-#prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-        domain-name, domain-name-servers, domain-search, host-name,
-        netbios-name-servers, netbios-scope, interface-mtu,
-        ntp-servers;
-require subnet-mask, domain-name-servers;
-#timeout 60;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-
-# End /etc/dhcp/dhclient.conf</literal>
-EOF</userinput></screen>
-
-      <para>
-        See <command>man 5 dhclient.conf</command> for additional options.
-      </para>
-
-      <para>
-        Now create the <filename class="directory">/var/lib/dhclient</filename>
-        directory which will contain DHCP Client leases by running the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -dm 755 /var/lib/dhclient</userinput></screen>
-
-      <para id="dhclient-service-sysd" revision="systemd">
-        If you want to configure network interfaces at boot using
-        <command>dhclient</command>, you need to install the
-        <filename>dhclient@.service</filename> unit included in the
-        <xref linkend="systemd-units"/> package by running the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="dhcp dhclient-service-sysd" revision="systemd">
-        <primary sortas="f-dhclient">dhclient@.service</primary>
-      </indexterm>
-
-<screen role="root" revision="systemd"><userinput>make install-dhclient</userinput></screen>
-
-      <note revision="systemd">
-        <para>
-          Make sure that you disable the <command>systemd-networkd</command>
-          service or configure it not to manage the interfaces you want to
-          manage with <command>dhclient</command>.
-        </para>
-      </note>
-
-      <para>
-        At this point you can test if <command>dhclient</command> is
-        behaving as expected by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"
-        remap="test"
-        revision="sysv"><userinput>dhclient <replaceable>&lt;eth0&gt;</replaceable></userinput></screen>
-
-<screen role="root"
-        remap="test"
-        revision="systemd"><userinput>systemctl start dhclient@<replaceable>eth0</replaceable></userinput></screen>
-
-      <para revision="sysv">
-        Replace <replaceable>&lt;eth0&gt;</replaceable> with your
-        desired interface. If you want more verbose output, add the
-        <command>-v</command> parameter to the command above.
-      </para>
-
-      <para id="dhclient-service" revision="sysv">
-        If you want to configure network interfaces at boot using
-        <command>dhclient</command>, you need to install the
-        <filename>/lib/services/dhclient</filename> script
-        included in <xref linkend="bootscripts"/> package:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-service-dhclient</userinput></screen>
-
-      <indexterm zone="dhcp dhclient-service" revision="sysv">
-        <primary sortas="f-dhclient">dhclient (service script)</primary>
-      </indexterm>
-
-      <para id="dhclient-ifconfig" revision="sysv">
-        Next, create the <filename>/etc/sysconfig/ifconfig.eth0</filename>
-        configuration file with the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhclient"
-DHCP_START=""
-DHCP_STOP=""
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="dhcp dhclient-ifconfig" revision="sysv">
-        <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/ifconfig.eth0</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        Adjust the file to suit your needs.
-      </para>
-
-      <para revision="sysv">
-        For more information on the appropriate <envar>DHCP_START</envar>
-        and <envar>DHCP_STOP</envar> values see
-        <command>man 8 dhclient</command>.
-      </para>
-
-      <para revision="systemd">
-        To start <command>dhclient</command> on a specific interface
-        at boot, enable the previously installed systemd unit by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable dhclient@<replaceable>eth0</replaceable></userinput></screen>
-
-      <para revision="systemd">
-        Replace <replaceable>eth0</replaceable> with the actual interface name.
-      </para>
-
-    </sect3>
-
-    <sect3 id="dhcpd-config">
-      <title>Server Configuration</title>
-
-      <para>
-        Note that you only need the DHCP server if you want to issue
-        LAN addresses over your network. The DHCP client doesn't need
-        the server in order to function properly.
-      </para>
-
-      <para>
-        Start with creating <filename>/etc/dhcp/dhcpd.conf</filename>
-        by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/dhcp/dhcpd.conf &lt;&lt; "EOF"
-<literal># Begin /etc/dhcp/dhcpd.conf
-#
-# Example dhcpd.conf(5)
-
-# Use this to enable / disable dynamic dns updates globally.
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# This is a very basic subnet declaration.
-subnet 10.254.239.0 netmask 255.255.255.224 {
-  range 10.254.239.10 10.254.239.20;
-  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-}
-
-# End /etc/dhcp/dhcpd.conf</literal>
-EOF</userinput></screen>
-
-      <para>
-        Adjust the file to suit your needs. See
-        <command>man 5 dhcpd.conf</command> for additional options.
-      </para>
-
-<!-- the "touch..." is needed according to dhcpd.leases(5) -->
-      <para>
-        Now create the <filename>/var/lib/dhcpd/dhcpd.leases</filename>
-        directory which will contain DHCP Server leases by running the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -dm 755 /var/lib/dhcpd &amp;&amp;
-touch /var/lib/dhcpd/dhcpd.leases</userinput></screen>
-
-       <para>
-        If you want to start the DHCP Server at boot, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/dhcpd</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>dhcpd.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/>
-        package:
-      </para>
-
-<screen role="root"><userinput>make install-dhcpd</userinput></screen>
-
-      <indexterm zone="dhcp dhcpd-config">
-        <primary sortas="f-dhcpd">dhcpd</primary>
-      </indexterm>
-
-      <para>
-        You will need to edit the
-        <phrase revision="sysv"><filename>/etc/sysconfig/dhcpd</filename></phrase>
-        <phrase revision="systemd"><filename>/etc/default/dhcpd</filename></phrase>
-        in order to set the interface on which <command>dhcpd</command>
-        will serve the DHCP requests.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dhclient, dhclient-script, dhcpd, dhcrelay and omshell
-        </seg>
-        <seg>
-          libdhcpctl.a and libomapi.a
-        </seg>
-        <seg>
-          /etc/dhcp,
-          /usr/include/dhcpctl,
-          /usr/include/isc-dhcp,
-          /usr/include/omapip,
-          /var/lib/dhclient and
-          /var/lib/dhcpd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dhclient">
-        <term><command>dhclient</command></term>
-        <listitem>
-          <para>
-            is the implementation of the DHCP client
-          </para>
-          <indexterm zone="dhcp dhclient">
-            <primary sortas="b-dhclient">dhclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dhclient-script">
-        <term><command>dhclient-script</command></term>
-        <listitem>
-          <para>
-            is used by dhclient to (re)configure interfaces. It can make
-            extra changes by invoking custom dhclient-{entry,exit}-hooks
-          </para>
-          <indexterm zone="dhcp dhclient-script">
-            <primary sortas="b-dhclient-script">dhclient-script</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dhcpd">
-        <term><command>dhcpd</command></term>
-        <listitem>
-          <para>
-            implements Dynamic Host Configuration Protocol (DHCP) and
-            Internet Bootstrap Protocol (BOOTP) requests for network
-            addresses
-          </para>
-          <indexterm zone="dhcp dhcpd">
-            <primary sortas="b-dhcpd">dhcpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dhcrelay">
-        <term><command>dhcrelay</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="dhcp dhcrelay">
-            <primary sortas="b-dhcrelay">dhcrelay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="omshell">
-        <term><command>omshell</command></term>
-        <listitem>
-          <para>
-            provides an interactive way to connect to, query and
-            possibly change the ISC DHCP Server's state via OMAPI, the
-            Object Management API
-          </para>
-          <indexterm zone="dhcp omshell">
-            <primary sortas="b-omshell">omshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/dillo.xml
===================================================================
--- archive/dillo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +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 dillo-download-http "http://www.dillo.org/download/dillo-&dillo-version;.tar.bz2">
-  <!ENTITY dillo-download-ftp  "&gentoo-ftp-repo;/dillo-&dillo-version;.tar.bz2">
-  <!ENTITY dillo-md5sum        "d0ab7fa1d40b310deb891388604188f8">
-  <!ENTITY dillo-size          "415 KB">
-  <!ENTITY dillo-buildsize     "9.5 MB">
-  <!ENTITY dillo-time          "0.2 SBU">
-]>
-
-<sect1 id="dillo" xreflabel="Dillo-&dillo-version;">
-  <?dbhtml filename="dillo.html" ?>
-
-
-  <title>Dillo-&dillo-version;</title>
-
-  <indexterm zone="dillo">
-    <primary sortas="a-Dillo">Dillo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Dillo</title>
-
-    <para><application>Dillo</application> is a fast, small footprint
-    graphical browser. Version &dillo-version; is now considered a very
-    stable beta. <application>Dillo</application> does not support
-    <application>Java</application>, JavaScript or CSS, and the current
-    version does not support FTP, HTTPS or frames. It is, however, very
-    fast and so is useful on older, slower machines. It supports downloads
-    and can support cookies.</para>
-
-    <caution>
-      <para><application>Dillo</application> always interprets web pages
-      as if they had the ISO-8859-1 encoding. Thus, it is useless
-      for reading non-English web pages.</para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&dillo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&dillo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &dillo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &dillo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &dillo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &dillo-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Dillo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GTK"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> and
-    <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
-
-    <bridgehead renderas="sect4">Optional (Run-Time Requirement for FTP
-    Downloading)</bridgehead>
-    <para role="optional"><xref linkend="wget"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/dillo"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dillo</title>
-
-
-    <para>Support for secure connections is considered experimental by
-    <application>Dillo</application>'s author. If you want the optional HTTPS
-    support for <application>Dillo</application> and have
-    <xref linkend="openssl"/> installed, run the following command:</para>
-
-<screen><userinput>sed -i -e "/#undef ENABLE_SSL/d" dpi/https.c</userinput></screen>
-
-    <para>Install <application>Dillo</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc/dillo &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;
-install -d -v -m755 /usr/share/doc/dillo-&dillo-version; &amp;&amp;
-install -v -m644 doc/{README,*.txt} /usr/share/doc/dillo-&dillo-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Dillo</title>
-
-    <sect3 id="dillo-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/dillo/dillorc</filename>,
-      <filename>/etc/dillo/dpidrc</filename>, and
-      <filename>~/.dillo/*</filename></para>
-
-      <indexterm zone="dillo dillo-config">
-        <primary sortas="e-AA.dillo-star">~/.dillo/*</primary>
-      </indexterm>
-
-      <indexterm zone="dillo dillo-config">
-        <primary sortas="e-etc-dillo-dillorc">/etc/dillo/dillorc</primary>
-      </indexterm>
-
-      <indexterm zone="dillo dillo-config">
-        <primary sortas="e-etc-dillo-dpidrc">/etc/dillo/dpidrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para><application>Dillo</application> stores its configuration in
-      the system wide <filename>/etc/dillo/dillorc</filename> file and the
-      <filename class="directory">~/.dillo</filename> directory which is
-      created automatically when <command>dillo</command> is run for the
-      first time. Note that cookies are turned off by default. To enable
-      cookies, edit the <filename>~/.dillo/cookiesrc</filename> file.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dillo, dpid, and dpidc</seg>
-        <seg>None</seg>
-        <seg>~/.dillo, /etc/dillo, /usr/share/doc/dillo-&dillo-version;,
-        and /usr/lib/dillo</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dillo-prog">
-        <term><command>dillo</command></term>
-        <listitem>
-          <para>is a GTK+ graphical WWW browser with limited facilities,
-          but a small footprint and runs fast on slower machines.</para>
-          <indexterm zone="dillo dillo-prog">
-            <primary sortas="b-dillo">dillo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dpid">
-        <term><command>dpid</command></term>
-        <listitem>
-          <para>is a <application>Dillo</application> plugin daemon.</para>
-          <indexterm zone="dillo dpid">
-            <primary sortas="b-dpid">dpid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dpidc">
-        <term><command>dpidc</command></term>
-        <listitem>
-          <para>is a control program for <command>dpid</command>.</para>
-          <indexterm zone="dillo dpidc">
-            <primary sortas="b-dpidc">dpidc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/dvb-apps.xml
===================================================================
--- archive/dvb-apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,580 +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 dvb-apps-download-http
-    "http://anduin.linuxfromscratch.org/sources/BLFS/svn/d/dvb-apps-2012-06-10.tar.xz">
-  <!ENTITY dvb-apps-download-ftp  " ">
-  <!ENTITY dvb-apps-md5sum        "6102338db203f9808b433d513e648f8e">
-  <!ENTITY dvb-apps-size          "368 MB">
-  <!ENTITY dvb-apps-buildsize     "17 MB">
-  <!ENTITY dvb-apps-time          "0.1 SBU">
-]>
-
-<sect1 id="dvb-apps" xreflabel="dvb-apps-&dvb-apps-version;">
-  <?dbhtml filename="dvb-apps.html"?>
-
-
-  <title>DVB-Apps-&dvb-apps-version;</title>
-
-  <indexterm zone="dvb-apps">
-    <primary sortas="a-dvb-apps">dvb-apps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DVB-Apps</title>
-
-    <para>
-      The <application>DVB-Apps</application> package contains a collection of
-      command line utilities for controlling and using a digital television
-      card/chip installed (possibly through a USB port) on your computer. These
-      are useful for scanning to make an index of the available channels, tuning
-      the chip to a chosen station or recording the channel to a file on your
-      computer so you can watch it at a later date.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dvb-apps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dvb-apps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dvb-apps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dvb-apps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dvb-apps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dvb-apps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/dvb-apps"/>
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="dvb-apps-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      There are many TV chips available so it is not possible to give guidance
-      on the kernel config for all of them. <command>lspci</command> from
-      <xref linkend="pciutils"/> and Goggle are your friends. One possible
-      gotcha is that some pci cards (such as the <ulink
-      url="http://www.amazon.co.uk/Hauppauge-WinTV-Nova-digital-tuner/dp/B000I1RHWA">
-      Hauppauge Nova T 500</ulink>) present themselves to the motherboard as a
-      USB controller and the TV chip on the card communicates with the
-      motherboard via this USB interface.
-    </para>
-
-<screen>General setup  ---&gt;
-  [*] Prompt for development and/or incomplete code/drivers
-Device Drivers  ---&gt;
-  Generic Driver Options  ---&gt;
-    [*] Userspace firmware loading support
-    [*]   Include in-kernel firmware blobs in kernel binary
-    (list of)    External firmware blobs to build into the kernel binary
-    (/lib/firmware) Firmware blobs root directory
-  [*] I2C support  ---&gt;
-    [*]   I2C device interface
-    I2C Algorithms  ---&gt;
-      [*] I2C bit-banging interfaces
-  [*] Multimedia support  ---&gt;
-    [*]   Video For Linux
-    [*]   DVB for Linux
-    [*]     DVB Network Support
-    [*]   Video capture adapters  ---&gt;
-      [*]   V4L USB devices  ---&gt;
-      (as required depending on your hardware)
-      [*]   V4L PCI(e) devices  ---&gt;
-      (as required depending on your hardware)
-    [*]   DVB/ATSC adapters  ---&gt;
-    (as required depending on your hardware)</screen>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options are
-      selected and recompile your kernel.
-    </para>
-
-    <indexterm zone="dvb-apps dvb-apps-kernel">
-      <primary sortas="d-dvb-apps">dvb-apps</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DVB-Apps</title>
-
-    <para>
-      Install <application>DVB-Apps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/ $(lib_name).a//' Make.rules &amp;&amp;
-sed -i 's/\.a/.so/g' test/*/Makefile &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/ $(lib_name).a//' Make.rules</command> and
-      <command>sed -i 's/\.a/.so/g' test/*/Makefile</command>: These seds
-      disable compiling the static libraries.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DVB-Apps</title>
-
-    <sect3 id="dvb-apps-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.tzap/channels.conf</filename> and
-        <filename>/etc/channels.conf</filename>.
-      </para>
-
-      <indexterm zone="dvb-apps dvb-apps-config">
-        <primary sortas="e-AA.tzap-channels.conf">~/.tzap/channels.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dvb-apps dvb-apps-config">
-        <primary
-        sortas="e-etc-channels.conf">/etc/channels.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        For a user to be able to use the device files in /dev the simplest
-        solution is to make the user part of the video group. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>usermod -a -G video &lt;USERNAME&gt; </userinput></screen>
-
-      <para>
-        Create a channels.conf file listing the channels available from your
-        local transmitter. If it's a terrestrial transmitter there should be a
-        file with its details in /usr/share/dvb/dvb-t. If it's a satellite the
-        file should be in /usr/share/dvb/dvb-s.
-      </para>
-
-<screen><userinput>scan /usr/share/dvb/dvb-t/uk-WinterHill > channels.conf &amp;&amp;
-mkdir -p ~/.tzap &amp;&amp;
-cp channels.conf ~/.tzap</userinput></screen>
-
-      <para>
-        If that went Ok and you saw some familiar TV channels listed in your
-        terminal, as the <systemitem class="username">root</systemitem> user
-        copy it to a system wide location:
-      </para>
-
-<screen role="root"><userinput>cp channels.conf /etc/channels.conf</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using DVB-Apps</title>
-
-    <para>
-      To record a channel to a file:
-    </para>
-
-<screen><userinput>gnutv -out file bbc1.mpeg "BBC ONE"</userinput></screen>
-
-    <para>
-      If you give it ten seconds or so to buffer you can then start to watch the
-      file with a video player such as <command>xine</command> or
-      <command>mplayer</command>. The advantage of watching TV via a file in
-      this way is that it allows you to pause playback and rewind if you want,
-      plus you can watch the file again later.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          atsc_epg,
-          av7110_loadkeys,
-          azap,
-          czap,
-          dib3000-watch,
-          dst_test,
-          dvbdate,
-          dvbnet,
-          dvbscan,
-          dvbtraffic,
-          femon,
-          gnutv,
-          gotox,
-          lsdvb,
-          scan,
-          szap,
-          tzap and
-          zap,
-        </seg>
-        <seg>
-          libdvbapi.so,
-          libdvbcfg.so,
-          libdvben50221.so,
-          libdvbsec.so and
-          libesg.so,
-          libucsi.so
-        </seg>
-        <seg>
-          /usr/include/libdvbapi,
-          /usr/include/libdvbcfg,
-          /usr/include/libdvben50221,
-          /usr/include/libdvbsec,
-          /usr/include/libesg,
-          /usr/include/libucsi and
-          /usr/share/dvb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="atsc_epg">
-        <term><command>atsc_epg</command></term>
-        <listitem>
-          <para>
-            prints out the next three hours worth of programs on a given
-            frequency (for ATSC only)
-          </para>
-          <indexterm zone="dvb-apps atsc_epg">
-            <primary sortas="b-atsc_epg">atsc_epg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="av7110_loadkeys">
-        <term><command>av7110_loadkeys</command></term>
-        <listitem>
-          <para>
-            is a utiltity to load IR remote keymaps into an av7110 based card
-          </para>
-          <indexterm zone="dvb-apps av7110_loadkeys">
-            <primary sortas="b-av7110_loadkeys">av7110_loadkeys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="azap">
-        <term><command>azap</command></term>
-        <listitem>
-          <para>
-            is a tuning utility for ATSC
-          </para>
-          <indexterm zone="dvb-apps azap">
-            <primary sortas="b-azap">azap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="czap">
-        <term><command>czap</command></term>
-        <listitem>
-          <para>
-            is a tuning utilities for DVB-C (cable)
-          </para>
-          <indexterm zone="dvb-apps czap">
-            <primary sortas="b-czap">czap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dib3000-watch">
-        <term><command>dib3000-watch</command></term>
-        <listitem>
-          <para>
-            is a tool to monitor DIB3000 demodulators
-          </para>
-          <indexterm zone="dvb-apps dib3000-watch">
-            <primary sortas="b-dib3000-watch">dib3000-watch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dst_test">
-        <term><command>dst_test</command></term>
-        <listitem>
-          <para>
-            is a utility for DST based cards
-          </para>
-          <indexterm zone="dvb-apps dst_test">
-            <primary sortas="b-dst_test">dst_test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvbdate">
-        <term><command>dvbdate</command></term>
-        <listitem>
-          <para>
-            is a utility that can read date time information from the currently
-            tuned multiplex
-          </para>
-          <indexterm zone="dvb-apps dvbdate">
-            <primary sortas="b-dvbdate">dvbdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvbnet">
-        <term><command>dvbnet</command></term>
-        <listitem>
-          <para>
-            is a utility to control digital data network interfaces, a DVB
-            network interface manager (IP over DVB) for streaming programs from
-            one computer to another over a network.
-          </para>
-          <indexterm zone="dvb-apps dvbnet">
-            <primary sortas="b-dvbnet">dvbnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvbscan">
-        <term><command>dvbscan</command></term>
-        <listitem>
-          <para>
-            is another frequency scanning tool used to generate channel lists
-          </para>
-          <indexterm zone="dvb-apps dvbscan">
-            <primary sortas="b-dvbscan">dvbscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvbtraffic">
-        <term><command>dvbtraffic</command></term>
-        <listitem>
-          <para>
-            is a utility to monitor traffic on a digital device and perform PID
-            analysis of currently tuned multiplex
-          </para>
-          <indexterm zone="dvb-apps dvbtraffic">
-            <primary sortas="b-dvbtraffic">dvbtraffic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="femon">
-        <term><command>femon</command></term>
-        <listitem>
-          <para>
-            is a frontend monitor, it monitors the tuning status on a digital TV
-            device
-          </para>
-          <indexterm zone="dvb-apps femon">
-            <primary sortas="b-femon">femon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnutv">
-        <term><command>gnutv</command></term>
-        <listitem>
-          <para>
-            is a utility to tune and stream your TV
-          </para>
-          <indexterm zone="dvb-apps gnutv">
-            <primary sortas="b-gnutv">gnutv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gotox">
-        <term><command>gotox</command></term>
-        <listitem>
-          <para>
-            is a utility for calculating the position of satellites
-          </para>
-          <indexterm zone="dvb-apps gotox">
-            <primary sortas="b-gotox">gotox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsdvb">
-        <term><command>lsdvb</command></term>
-        <listitem>
-          <para>
-            is a simple utility to list PCI/PCIe DVB devices
-          </para>
-          <indexterm zone="dvb-apps lsdvb">
-            <primary sortas="b-lsdvb">lsdvb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan">
-        <term><command>scan</command></term>
-        <listitem>
-          <para>
-            is a utility to generate channel lists
-          </para>
-          <indexterm zone="dvb-apps scan">
-            <primary sortas="b-scan">scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="szap">
-        <term><command>szap</command></term>
-        <listitem>
-          <para>
-            is a tool to tune a satellite DVB receiver
-          </para>
-          <indexterm zone="dvb-apps szap">
-            <primary sortas="b-szap">szap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tzap">
-        <term><command>tzap</command></term>
-        <listitem>
-          <para>
-            is a tool to tune a terrestrial DVB receiver
-          </para>
-          <indexterm zone="dvb-apps tzap">
-            <primary sortas="b-tzap">tzap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zap">
-        <term><command>zap</command></term>
-        <listitem>
-          <para>
-            just tunes a digital device (and is really intended for developers)
-          </para>
-          <indexterm zone="dvb-apps zap">
-            <primary sortas="b-zap">zap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdvbapi">
-        <term><filename class="libraryfile">libdvbapi.so</filename></term>
-        <listitem>
-          <para>
-            is an interface library for digital TV devices
-          </para>
-          <indexterm zone="dvb-apps libdvbapi">
-            <primary sortas="c-libdvbapi">libdvbapi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdvbcfg">
-        <term><filename class="libraryfile">libdvbcfg.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that parse/create digital TV channel
-            configuration files
-          </para>
-          <indexterm zone="dvb-apps libdvbcfg">
-            <primary sortas="c-libdvbcfg">libdvbcfg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdvben50221">
-        <term><filename class="libraryfile">libdvben50221.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the CENELEC (European Committee
-            for Electrotechnical Standardization) EN 50221 CAM stack
-          </para>
-          <indexterm zone="dvb-apps libdvben50221">
-            <primary sortas="c-libdvben50221">libdvben50221.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdvbsec">
-        <term><filename class="libraryfile">libdvbsec.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Satellite Equipment Control operations
-          </para>
-          <indexterm zone="dvb-apps libdvbsec">
-            <primary sortas="c-libdvbsec">libdvbsec.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesg">
-        <term><filename class="libraryfile">libesg.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for an Electronic Service Guide parser
-          </para>
-          <indexterm zone="dvb-apps libesg">
-            <primary sortas="c-libesg">libesg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libucsi">
-        <term><filename class="libraryfile">libucsi.so</filename></term>
-        <listitem>
-          <para>
-            is a Fast MPEG2 Transport Stream SI table parsing library
-          </para>
-          <indexterm zone="dvb-apps libucsi">
-            <primary sortas="c-libucsi">libucsi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/eject.xml
===================================================================
--- archive/eject.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,125 +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 eject-download-http "http://www.paldo.org/paldo/sources/eject/eject-&eject-version;.tar.bz2">
-  <!ENTITY eject-download-ftp  "ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/eject/eject-&eject-version;.tar.bz2">
-  <!ENTITY eject-md5sum        "5a6cab2184ae4ed21128054d931d558f">
-  <!ENTITY eject-size          "105 KB">
-  <!ENTITY eject-buildsize     "1 MB">
-  <!ENTITY eject-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="eject" xreflabel="eject-&eject-version;">
-  <?dbhtml filename="eject.html"?>
-
-
-  <title>eject-&eject-version;</title>
-
-  <indexterm zone="eject">
-    <primary sortas="a-eject">eject</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Eject</title>
-
-    <para>The <application>Eject</application> package is a program for ejecting
-    removable media under software control.</para>
-
-    <note><para>Starting with util-linux-2.22, the <command>eject</command>
-    program has been incorporated into that package.  If you have installed
-    util-linux-2.22 or later, this package is not needed.</para></note>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&eject-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&eject-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &eject-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &eject-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &eject-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &eject-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/eject"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Eject</title>
-
-    <para>Install <application>Eject</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>eject and volname</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="eject-prog">
-        <term><command>eject</command></term>
-        <listitem>
-          <para>ejects removable media.</para>
-          <indexterm zone="eject eject-prog">
-            <primary sortas="b-eject">eject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="volname">
-        <term><command>volname</command></term>
-        <listitem>
-          <para>returns the volume name.</para>
-          <indexterm zone="eject volname">
-            <primary sortas="b-volname">volname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/ekiga.xml
===================================================================
--- archive/ekiga.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +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 ekiga-download-http "&gnome-download-http;/ekiga/4.0/ekiga-&ekiga-version;.tar.xz">
-  <!ENTITY ekiga-download-ftp  "&gnome-download-ftp;/ekiga/4.0/ekiga-&ekiga-version;.tar.xz">
-  <!ENTITY ekiga-md5sum        "704ba532a8e3e0b5e3e2971dd2db39e4">
-  <!ENTITY ekiga-size          "8.0 MB">
-  <!ENTITY ekiga-buildsize     "315 MB">
-  <!ENTITY ekiga-time          "3.5 SBU">
-]>
-
-<sect1 id="ekiga" xreflabel="Ekiga-&ekiga-version;">
-  <?dbhtml filename="ekiga.html"?>
-
-
-  <title>Ekiga-&ekiga-version;</title>
-
-  <indexterm zone="ekiga">
-    <primary sortas="a-Ekiga">Ekiga</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ekiga</title>
-
-    <para>
-      <application>Ekiga</application> is a VoIP, IP Telephony, and Video
-      Conferencing application that allows you to make audio and video calls to
-      remote users with SIP or H.323 compatible hardware and software.  It
-      supports many audio and video codecs and all modern VoIP features for
-      both SIP and H.323.  <application>Ekiga</application> is the first Open
-      Source application to support both H.323 and SIP, as well as audio and
-      video.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ekiga-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ekiga-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ekiga-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ekiga-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ekiga-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ekiga-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ekiga Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="opal"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="GConf"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <phrase revision="sysv"><ulink url="&gnome-download-http;/evolution-data-server/">
-      Evolution Data Server</ulink></phrase>
-      <phrase revision="systemd"><xref linkend="evolution-data-server"/></phrase>,
-      <ulink url="&gnome-download-http;/gnome-doc-utils/">
-      GNOME Doc Utils</ulink>, and
-      <xref linkend="openldap"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ekiga"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ekiga</title>
-
-    <para>
-      Install <application>Ekiga</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-eds     \
-            --disable-gdu     \
-            --disable-ldap    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-eds</parameter>: This switch disables support for the
-      <application>Evolution Data Server</application>. Remove if you have
-      installed <application>Evolution Data Server</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-gdu</parameter>: This switch disables documentation
-      generation using <application>GNOME Doc Utils</application>. Remove if
-      you have installed <application>GNOME Doc Utils</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-ldap</parameter>: This switch disables LDAP support
-      in <application>Ekiga</application>. Remove if you have installed
-      <application>OpenLDAP</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-    <para>
-      <option>--disable-dbus</option>: This switch disables
-      <application>D-Bus</application> support. Use if you have not installed
-      <application>D-Bus</application>.
-    </para>
-
-    <para>
-      <option>--enable-avahi</option>: This switch enables use of the
-      <application>Avahi</application> with <application>Ekiga</application>.
-      Use if you have installed <application>Avahi</application>.
-    </para>
-
-    <note>
-      <para>
-        If you have not installed recommended dependencies you will need
-        additional switches passed to <command>configure</command>. Examine
-        <command>./configure --help</command> output to see all available
-        switches.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ekiga, ekiga-config-tool and ekiga-helper
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/ekiga,
-          /usr/share/gnome/help/ekiga,
-          /usr/share/omf/ekiga,
-          /usr/share/pixmaps/ekiga and
-          /usr/share/sounds/ekiga
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ekiga-prog">
-        <term><command>ekiga</command></term>
-        <listitem>
-          <para>
-            is a SIP and H.323 VoIP, IP Telephony and Video Conferencing
-            application which complies to the SIP and H.323 protocols.
-          </para>
-          <indexterm zone="ekiga ekiga-prog">
-            <primary sortas="b-ekiga">ekiga</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="ekiga-config-tool">
-        <term><command>ekiga-config-tool</command></term>
-        <listitem>
-          <para>
-            fixes problems with the Ekiga settings.
-          </para>
-          <indexterm zone="ekiga ekiga-config-tool">
-            <primary sortas="b-ekiga-config-tool">ekiga-config-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/elfutils.xml
===================================================================
--- archive/elfutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,361 +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 elfutils-download-http
-    "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-  <!ENTITY elfutils-download-ftp  
-     "ftp://sourceware.org/pub/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-  <!ENTITY elfutils-md5sum        "03599aee98c9b726c7a732a2dd0245d5">
-  <!ENTITY elfutils-size          "8.0 MB">
-  <!ENTITY elfutils-buildsize     "78 MB (with tests)">
-  <!ENTITY elfutils-time          "0.9 SBU (with tests)">
-]>
-
-<sect1 id="elfutils" xreflabel="elfutils-&elfutils-version;">
-  <?dbhtml filename="elfutils.html"?>
-
-
-  <title>elfutils-&elfutils-version;</title>
-
-  <indexterm zone="elfutils">
-    <primary sortas="a-elfutils">elfutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to elfutils</title>
-
-    <para>
-      The <application>elfutils</application> package contains a set of
-      utilities and libraries for handling ELF (Executable and Linkable Format)
-      files.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&elfutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&elfutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &elfutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &elfutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &elfutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &elfutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">elfutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/elfutils"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of elfutils</title>
-
-    <para>
-      Install <application>elfutils</application> by running the following
-      commands:
-    </para>
-
-<!-- don't disable static libs, disable-static switch doesn't work anyways -->
-<screen><userinput>./configure --prefix=/usr --program-prefix="eu-" &amp;&amp;
-make</userinput></screen>
-<!--
-    <para>
-      If you wish to run the test suite, first fix it to skip two failing tests:
-    </para>
-
-<screen><userinput>sed -i '/srcdir/ iexit 77\n'         \
-       tests/run-backtrace-native.sh \
-       tests/run-backtrace-native-core.sh</userinput></screen>-->
-
-    <para>
-       To test the results, issue: <command>make check</command>. 
-       One test, run-strip-nothing.sh, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--program-prefix="eu-"</parameter>: This switch renames
-      installed programs to avoid conflict with
-      <application>Binutils</application> programs installed in LFS.
-    </para>
-
-    <para>
-      <option>--enable-valgrind</option>: Run all tests under valgrind.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          eu-addr2line, eu-ar, eu-elfcmp, eu-elfcompress, eu-elflint,
-          eu-findtextrel, eu-make-debug-archive, eu-nm, eu-objdump,
-          eu-ranlib, eu-readelf, eu-size, eu-stack, eu-strings, eu-strip, and
-          eu-unstrip
-        </seg>
-        <seg>
-          libasm.{a,so}, libdw.{a,so}, libebl.a, libelf.{a,so}, and
-          some for different architectures under /usr/lib/elfutils
-        </seg>
-        <seg>
-          /usr/include/elfutils and
-          /usr/lib/elfutils
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="eu-addr2line">
-        <term><command>eu-addr2line</command></term>
-        <listitem>
-          <para>
-            converts addresses into file names and line numbers.
-          </para>
-          <indexterm zone="elfutils eu-addr2line">
-            <primary sortas="b-eu-addr2line">eu-addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-ar">
-        <term><command>eu-ar</command></term>
-        <listitem>
-          <para>
-            creates, modifies, and extracts from archives.
-          </para>
-          <indexterm zone="elfutils eu-ar">
-            <primary sortas="b-eu-ar">eu-ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-elfcmp">
-        <term><command>eu-elfcmp</command></term>
-        <listitem>
-          <para>
-            compares relevant parts of two ELF files for equality.
-          </para>
-          <indexterm zone="elfutils eu-elfcmp">
-            <primary sortas="b-eu-elfcmp">eu-elfcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-elfcompress">
-        <term><command>eu-elfcompress</command></term>
-        <listitem>
-          <para>
-            compresses or decompresses sections in an ELF file.
-          </para>
-          <indexterm zone="elfutils eu-elfcompress">
-            <primary sortas="b-eu-elfcompress">eu-elfcompress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-elflint">
-        <term><command>eu-elflint</command></term>
-        <listitem>
-          <para>
-            does pedantic checking of ELF files compliance with gABI/psABI spec.
-          </para>
-          <indexterm zone="elfutils eu-elflint">
-            <primary sortas="b-eu-elflint">eu-elflint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-findtextrel">
-        <term><command>eu-findtextrel</command></term>
-        <listitem>
-          <para>
-            locates the source of text relocations in FILEs (a.out by default).
-          </para>
-          <indexterm zone="elfutils eu-findtextrel">
-            <primary sortas="b-eu-findtextrel">eu-findtextrel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="eu-ld">
-        <term><command>eu-ld</command></term>
-        <listitem>
-          <para>
-            combines object and archive files.
-          </para>
-          <indexterm zone="elfutils eu-ld">
-            <primary sortas="b-eu-ld">eu-ld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="eu-nm">
-        <term><command>eu-nm</command></term>
-        <listitem>
-          <para>
-            lists symbols from FILEs (a.out by default).
-          </para>
-          <indexterm zone="elfutils eu-nm">
-            <primary sortas="b-eu-nm">eu-nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-objdump">
-        <term><command>eu-objdump</command></term>
-        <listitem>
-          <para>
-            shows information from FILEs (a.out by default).
-          </para>
-          <indexterm zone="elfutils eu-objdump">
-            <primary sortas="b-eu-objdump">eu-objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-ranlib">
-        <term><command>eu-ranlib</command></term>
-        <listitem>
-          <para>
-            generates an index to speed up access to archives.
-          </para>
-          <indexterm zone="elfutils eu-ranlib">
-            <primary sortas="b-eu-ranlib">eu-ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-readelf">
-        <term><command>eu-readelf</command></term>
-        <listitem>
-          <para>
-            prints information from ELF files in human-readable form.
-          </para>
-          <indexterm zone="elfutils eu-readelf">
-            <primary sortas="b-eu-readelf">eu-readelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-size">
-        <term><command>eu-size</command></term>
-        <listitem>
-          <para>
-            lists section sizes of FILEs (a.out by default).
-          </para>
-          <indexterm zone="elfutils eu-size">
-            <primary sortas="b-eu-size">eu-size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-stack">
-        <term><command>eu-stack</command></term>
-        <listitem>
-          <para>
-            prints a stack for each thread in a process or core file.
-          </para>
-          <indexterm zone="elfutils eu-stack">
-            <primary sortas="b-eu-stack">eu-stack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-strings">
-        <term><command>eu-strings</command></term>
-        <listitem>
-          <para>
-            prints the strings of printable characters in files.
-          </para>
-          <indexterm zone="elfutils eu-strings">
-            <primary sortas="b-eu-strings">eu-strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-strip">
-        <term><command>eu-strip</command></term>
-        <listitem>
-          <para>
-            discards symbols from object files.
-          </para>
-          <indexterm zone="elfutils eu-strip">
-            <primary sortas="b-eu-strip">eu-strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eu-unstrip">
-        <term><command>eu-unstrip</command></term>
-        <listitem>
-          <para>
-            combines stripped files with separate symbols and debug information.
-          </para>
-          <indexterm zone="elfutils eu-unstrip">
-            <primary sortas="b-eu-unstrip">eu-unstrip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/esound.xml
===================================================================
--- archive/esound.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,292 +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 esound-download-http "&gnome-download-http;/esound/0.2/esound-&esound-version;.tar.bz2">
-  <!ENTITY esound-download-ftp  "&gnome-download-ftp;/esound/0.2/esound-&esound-version;.tar.bz2">
-  <!ENTITY esound-md5sum        "8d9aad3d94d15e0d59ba9dc0ea990c6c">
-  <!ENTITY esound-size          "392 KB">
-  <!ENTITY esound-buildsize     "5.3 MB">
-  <!ENTITY esound-time          "0.3 SBU">
-]>
-
-<sect1 id="esound" xreflabel="EsounD-&esound-version;">
-  <?dbhtml filename="esound.html"?>
-
-
-  <title>EsounD-&esound-version;</title>
-
-  <indexterm zone="esound">
-    <primary sortas="a-EsounD">EsounD</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to EsounD</title>
-
-    <para>The <application>EsounD</application> package contains
-    the Enlightened Sound Daemon. This is useful for mixing together
-    several digitized audio streams for playback by a single device.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&esound-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&esound-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &esound-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &esound-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &esound-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &esound-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">EsounD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="audiofile"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="alsa-lib"/> and
-    <xref linkend="docbook-utils"/> (Required for building the html documentation)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/esound"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of EsounD</title>
-
-    <para>Install <application>EsounD</application> by running the following
-    commands:</para>
-
-<screen><userinput>LIBS=-lm ./configure --prefix=/usr --sysconfdir=/etc &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 docdir=/usr/share/doc/esound-&esound-version;</userinput></screen>
-
-    <para>If you have <application>DocBook-utils</application> installed, still
-    as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>chown -v root:root /usr/share/doc/esound-&esound-version;/*</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>LIBS=-lm</parameter>: Make sure the linker uses the math
-    library.</para>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This switch puts
-    configuration files in <filename class="directory">/etc</filename> instead
-    of <filename class="directory">/usr/etc</filename>.</para>
-
-    <para><parameter>--disable-static</parameter>: Prevent the static libraries
-    being built.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring EsounD</title>
-
-    <sect3 id="esound-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/esd.conf</filename></para>
-
-      <indexterm zone="esound esound-config">
-        <primary sortas="e-etc-esd.conf">/etc/esd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Instructions and information about the configuration file is
-      located in the <filename>TIPS</filename> file in the
-      <application>EsounD</application> source directory.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>esd, esdcat, esd-config, esdctl, esddsp, esdfilt, esdloop, esdmon,
-        esdplay, esdrec, and esdsample</seg>
-        <seg>libesd.{so,a} and libesddsp.{so,a}</seg>
-        <seg>/usr/share/doc/esound</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="esd">
-        <term><command>esd</command></term>
-        <listitem>
-          <para>is the Enlightened Sound Daemon.</para>
-          <indexterm zone="esound esd">
-            <primary sortas="b-esd">esd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdcat">
-        <term><command>esdcat</command></term>
-        <listitem>
-          <para>plays a RAW audio stream through the daemon.</para>
-          <indexterm zone="esound esdcat">
-            <primary sortas="b-esdcat">esdcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esd-config">
-        <term><command>esd-config</command></term>
-        <listitem>
-          <para>is used by <command>configure</command> to determine the
-          compiler and linker flags that should be used to compile and link programs
-          that use <application>EsounD</application>.</para>
-          <indexterm zone="esound esd-config">
-            <primary sortas="b-esd-config">esd-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdctl">
-        <term><command>esdctl</command></term>
-        <listitem>
-          <para> controls certain aspects of the sound daemon.</para>
-          <indexterm zone="esound esdctl">
-            <primary sortas="b-esdctl">esdctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esddsp">
-        <term><command>esddsp</command></term>
-        <listitem>
-          <para>can allow non-esd applications to be routed through esd.</para>
-          <indexterm zone="esound esddsp">
-            <primary sortas="b-esddsp">esddsp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdfilt">
-        <term><command>esdfilt</command></term>
-        <listitem>
-          <para>is an <application>EsoundD</application> filter.</para>
-          <indexterm zone="esound esdfilt">
-            <primary sortas="b-esdfilt">esdfilt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdloop">
-        <term><command>esdloop</command></term>
-        <listitem>
-          <para>is test scaffolding for sample cache, loop and free.</para>
-          <indexterm zone="esound esdloop">
-            <primary sortas="b-esdloop">esdloop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdmon">
-        <term><command>esdmon</command></term>
-        <listitem>
-          <para>outputs the mixed stream from the daemon.</para>
-          <indexterm zone="esound esdmon">
-            <primary sortas="b-esdmon">esdmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdplay">
-        <term><command>esdplay</command></term>
-        <listitem>
-          <para>plays the named file on
-          <application>EsoundD</application>.</para>
-          <indexterm zone="esound esdplay">
-            <primary sortas="b-esdplay">esdplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdrec">
-        <term><command>esdrec</command></term>
-        <listitem>
-          <para>outputs from the sound device's current input.</para>
-          <indexterm zone="esound esdrec">
-            <primary sortas="b-esdrec">esdrec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdsample">
-        <term><command>esdsample</command></term>
-        <listitem>
-          <para>is test scaffolding for sample cache, playback, and free.</para>
-          <indexterm zone="esound esdsample">
-            <primary sortas="b-esdsample">esdsample</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesd">
-        <term><filename class='libraryfile'>libesd.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions used by the <application>EsounD</application>
-          programs to read, write and play various sound format files.</para>
-          <indexterm zone="esound libesd">
-            <primary sortas="c-libesd">libesd.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesddsp">
-        <term><filename class='libraryfile'>libesddsp.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions used by other programs to read, write and
-          play various sound format files.</para>
-          <indexterm zone="esound libesddsp">
-            <primary sortas="c-libesddsp">libesddsp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/espgs.xml
===================================================================
--- archive/espgs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,264 +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 espgs-download-http "http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/&espgs-version;/espgs-&espgs-version;-source.tar.bz2">
-  <!ENTITY espgs-download-ftp  "ftp://ftp.easysw.com/pub/ghostscript/&espgs-version;/espgs-&espgs-version;-source.tar.bz2">
-  <!ENTITY espgs-md5sum        "e74e0463e0bfb1cea3db245d8e71828c">
-  <!ENTITY espgs-size          "8.7 MB">
-  <!ENTITY espgs-buildsize     "108 MB (includes installing libgs.so and both font tarballs)">
-  <!ENTITY espgs-time          "2.3 SBU (includes building and installing libgs.so)">
-
-  <!ENTITY espgs-standard-fonts-download "ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ghostscript-fonts-std-8.11.tar.gz">
-  <!ENTITY espgs-standard-fonts-md5sum   "6865682b095f8c4500c54b285ff05ef6">
-  <!ENTITY espgs-standard-fonts-size     "3.7 MB">
-
-  <!ENTITY espgs-other-fonts-download    "http://ftp.gnu.org/pub/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz">
-  <!ENTITY espgs-other-fonts-md5sum      "33457d3f37de7ef03d2eea05a9e6aa4f">
-  <!ENTITY espgs-other-fonts-size        "796 KB">
-]>
-
-<sect1 id="espgs" xreflabel="ESP Ghostscript-&espgs-version;">
-  <?dbhtml filename="espgs.html"?>
-
-
-  <title>ESP Ghostscript-&espgs-version;</title>
-
-  <indexterm zone="espgs">
-    <primary sortas="a-ESP-Ghostscript">ESP Ghostscript</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ESP Ghostscript</title>
-
-    <para><application>ESP Ghostscript</application> is a versatile processor
-    for PostScript data with the ability to render PostScript to different
-    targets. <application>ESP Ghostscript</application> is a customized
-    version of GNU Ghostscript that includes an enhanced configuration script,
-    the <application>CUPS</application> raster driver to support
-    <application>CUPS</application> raster printer drivers, and additional
-    patches and drivers from various Linux distributors.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&espgs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&espgs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &espgs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &espgs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &espgs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &espgs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing='compact'>
-      <title>Required Patch</title>
-      <listitem>
-        <para><ulink url="&patch-root;/espgs-&espgs-version;-bov_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Standard Fonts</title>
-      <listitem>
-        <para>Download (FTP): <ulink url="&espgs-standard-fonts-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &espgs-standard-fonts-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &espgs-standard-fonts-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Other Fonts</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&espgs-other-fonts-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &espgs-other-fonts-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &espgs-other-fonts-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ESP Ghostscript Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="cups"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libpng"/>,
-    <xref linkend="x-window-system"/>, and
-    <xref linkend="gtk2"/> or <xref linkend="GTK"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/espgs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ESP Ghostscript</title>
-
-    <para>Install <application>ESP Ghostscript</application>
-    by running the following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../espgs-&espgs-version;-bov_fix-1.patch &amp;&amp;
-sed -i "s/bbox.dev$/x11.dev/" Makefile.in &amp;&amp;
-./configure --prefix=/usr \
-            --enable-threads \
-            --without-omni &amp;&amp;
-make</userinput></screen>
-
-    <para>To build the shared
-    <filename class='libraryfile'>libgs.so</filename> library you must have
-    <application>GTK+</application> installed and issue the following
-    command:</para>
-
-<screen><userinput>make so</userinput></screen>
-
-    <para>This package does not come with a test suite. However, you may test
-    the operation of the newly built <command>gs</command> program by issuing
-    the following command (issue from an X Windows terminal):</para>
-
-<screen><userinput>bin/gs -Ilib -dBATCH examples/tiger.eps</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -d /usr/share/doc/espgs-&espgs-version;
-ln -v -s ../../ghostscript/8.15/doc /usr/share/doc/espgs-&espgs-version; &amp;&amp;
-for INSTFILE in `ls doc`
-do
-  if [ ! -f /usr/share/doc/espgs-&espgs-version;/$INSTFILE ]; then
-    install -v -m644 doc/$INSTFILE /usr/share/doc/espgs-&espgs-version;/
-  fi
-done</userinput></screen>
-
-    <para>If you built the shared library, install it and the associated
-    programs by issuing the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make soinstall &amp;&amp;
-install -v -d -m755 /usr/include/ps &amp;&amp;
-install -v -m644 src/*.h /usr/include/ps &amp;&amp;
-ln -v -s ps /usr/include/ghostscript</userinput></screen>
-
-    <para>To finish the installation, unpack all fonts you've downloaded to
-    <filename class="directory">/usr/share/ghostscript</filename> and ensure
-    the ownerships of the files are
-    <systemitem class="username">root</systemitem>:<systemitem class="groupname">root</systemitem>.
-    Substitute <replaceable>&lt;font-tarball&gt;</replaceable> appropriately in
-    the command below for the fonts you wish to install:</para>
-
-<screen role="root"><userinput>tar -xvf ../<replaceable>&lt;font-tarball&gt;</replaceable> -C /usr/share/ghostscript &amp;&amp;
-chown -v root:root /usr/share/ghostscript/fonts/*</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i "s/bbox.dev$/x11.dev/" Makefile.in</command>:
-    This command changes the default <command>gs</command> output device from
-    the bbox driver to the x11 (screen) driver.</para>
-
-    <para><parameter>--enable-threads</parameter>: This parameter enables
-    threaded output.</para>
-
-    <para><parameter>--without-omni</parameter>: This switch disables the
-    omni driver support.</para>
-
-    <para><option>--without-ijs</option>: This switch disables the
-    IJS driver support.</para>
-
-    <para><command>install -v -m644 src/*.h /usr/include/ps</command>: Some
-    packages (<application>ImageMagick</application> is one) need the
-    <application>Ghostscript</application> interface headers in place to link
-    to the shared library. These commands install the headers.</para>
-
-    <para><command>ln -v -s ps /usr/include/ghostscript</command>: Some
-    packages expect to find the interface headers in an alternate
-    location.</para>
-
-    <para><command>for INSTFILE in `ls doc` ...</command>: This
-    <quote>for</quote> loop installs some documentation files that were not
-    installed during the installation process.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bdftops, dvipdf, eps2eps, fixmswrd.pl, font2c, gs, gsbj, gsc, gsdj,
-        gsdj500, gslj, gslp, gsnd, gsx, lprsetup.sh, pdf2dsc, pdf2ps, pdfopt,
-        pf2afm, pfbtopfa, printafm, ps2ascii, ps2epsi, ps2pdf,ps2pdf12,
-        ps2pdf13, ps2pdf14, ps2pdfwr, ps2ps, pv.sh, unix-lpr.sh, and
-        wftopfa</seg>
-        <seg>libgs.so </seg>
-        <seg>/usr/include/ps and /usr/share/ghostscript</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gs-prog-gs">
-        <term><command>gs</command></term>
-        <listitem>
-          <para>invokes <application>Ghostscript</application>, an interpreter
-          of Adobe Systems' PostScript(tm) and Portable Document Format
-          (PDF) languages.</para>
-          <indexterm zone="espgs gs-prog-gs">
-            <primary sortas="b-gs">gs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstoraster">
-        <term><filename>pstoraster</filename></term>
-        <listitem>
-          <para>is a filter used by <application>CUPS</application> to convert
-          PostScript to a generic raster image format that is acceptable as an
-          input to drivers for non-PostScript printers (e.g., from
-          <xref linkend="gutenprint"/>). It is built and installed only if
-          <xref linkend="cups"/> is found.</para>
-          <indexterm zone="espgs pstoraster">
-            <primary sortas="g-pstoraster">pstoraster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para><application>ESP Ghostscript</application> provides many different
-    scripts used to render PostScript/PDF files back and forth. Please refer
-    to the HTML documentation or try <command>man gs</command> for information
-    about the capabilities provided by the package.</para>
-
-  </sect2>
-
-</sect1>
Index: chive/etcshells.xml
===================================================================
--- archive/etcshells.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part 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="postlfs-config-shells" xreflabel="The /etc/shells File">
-  <?dbhtml filename="etcshells.html"?>
-
-
-  <title>The /etc/shells File</title>
-
-  <indexterm zone="postlfs-config-shells">
-    <primary sortas="e-etc-shells">/etc/shells</primary>
-  </indexterm>
-
-  <para>The <filename>shells</filename> file contains a list of
-  login shells on the system. Applications use this file to determine
-  whether a shell is valid. For each shell a single line should be
-  present, consisting of the shell's path, relative to the root of the
-  directory structure (/).</para>
-
-  <para>For example, this file is consulted by <command>chsh</command>
-  to determine whether an unprivileged user may change the login shell for her
-  own account. If the command name is not listed, the user will be denied of
-  change.</para>
-
-  <para>It is a requirement for applications such as
-  <application>GDM</application> which does not populate the
-  face browser if it can't find <filename>/etc/shells</filename>, or
-  FTP daemons which traditionally disallow access to users
-  with shells not included in this file.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/shells &lt;&lt; "EOF"
-<literal># Begin /etc/shells
-
-/bin/sh
-/bin/bash
-
-# End /etc/shells</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: chive/expat.xml
===================================================================
--- archive/expat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +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 expat-download-http "&sourceforge-repo;/expat/expat-&expat-version;.tar.gz">
-  <!ENTITY expat-download-ftp  " ">
-  <!ENTITY expat-md5sum        "dd7dab7a5fea97d2a6a43f511449b7cd">
-  <!ENTITY expat-size          "552 KB">
-  <!ENTITY expat-buildsize     "6.0 MB">
-  <!ENTITY expat-time          "0.1 SBU">
-]>
-
-<sect1 id="expat" xreflabel="expat-&expat-version;">
-  <?dbhtml filename="expat.html"?>
-
-
-  <title>Expat-&expat-version;</title>
-
-  <indexterm zone="expat">
-    <primary sortas="a-Expat">Expat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Expat</title>
-
-    <para>The <application>Expat</application> package contains a stream oriented
-    C library for parsing XML.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&expat-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&expat-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &expat-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &expat-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &expat-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &expat-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/expat-&expat-version;-fixes-3.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/expat"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expat</title>
-
-    <para>Install <application>Expat</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/expat-&expat-version; &amp;&amp;
-install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command> as an
-    unprivileged user. Note this must be done after the package is
-    installed.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>xmlwf</seg>
-        <seg>libexpat.so</seg>
-        <seg>/usr/share/doc/expat-&expat-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xmlwf">
-        <term><command>xmlwf</command></term>
-        <listitem>
-          <para>is a non-validating utility to check whether or not
-          XML documents are well formed.</para>
-          <indexterm zone="expat xmlwf">
-            <primary sortas="b-xmlwf">xmlwf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpat">
-        <term><filename class='libraryfile'>libexpat.so</filename></term>
-        <listitem>
-          <para>contains API functions for parsing XML.</para>
-          <indexterm zone="expat libexpat">
-            <primary sortas="c-libexpat">libexpat.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/expect.xml
===================================================================
--- archive/expect.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,507 +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 expect-download-http "&sourceforge-dl;/expect/expect&expect-version;.tar.gz">
-  <!ENTITY expect-download-ftp  " ">
-  <!ENTITY expect-md5sum        "00fce8de158422f5ccd2666512329bd2">
-  <!ENTITY expect-size          "624 KB">
-  <!ENTITY expect-buildsize     "3.2 MB (with tests)">
-  <!ENTITY expect-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="expect" xreflabel="Expect-&expect-version;">
-  <?dbhtml filename="expect.html"?>
-
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Expect</title>
-
-    <para>
-      The <application>Expect</application> package was installed in the
-      LFS temporary tools directory for testing other packages.  These
-      procedures install it in a permanent location.  It contains tools for
-      automating interactive applications such as <command>telnet</command>,
-      <command>ftp</command>, <command>passwd</command>,
-      <command>fsck</command>, <command>rlogin</command>,
-      <command>tip</command>, etc. <application>Expect</application> is also
-      useful for testing these same applications as well as easing all sorts of
-      tasks that are prohibitively difficult with anything else.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&expect-download-http;"/>
-        </para>
-      </listitem>
-      <!-- <listitem>
-        <para>
-          Download (FTP): <ulink url="&expect-download-ftp;"/>
-        </para>
-      </listitem> -->
-      <listitem>
-        <para>
-          Download MD5 sum: &expect-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &expect-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &expect-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &expect-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Expect Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="tcl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="tk"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/expect"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <para>
-      Install <application>Expect</application> by running the following
-      commands:
-    </para>
-
-    <!-- Not sure if we need a static library as it does not build by default
-         any longer. Only a .so library is installed when passing
-         'enable-shared'. -->
-<screen><userinput>./configure --prefix=/usr           \
-            --with-tcl=/usr/lib     \
-            --enable-shared         \
-            --mandir=/usr/share/man \
-            --with-tclinclude=/usr/include &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svf expect&expect-version;/libexpect&expect-version;.so /usr/lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-with-tcl=/usr/lib</parameter>: This parameter is used to
-      tell the <command>configure</command> script where the
-      <command>tclConfig.sh</command> is located.
-    </para>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This option enables
-      building the shared library.
-    </para>
-
-    <!-- Not really sure if this is required any longer as the library is now
-         installed directly in /usr/lib/expect5.45/. -->
-    <para>
-      <command>ln -sf ...</command>: This command creates a required link
-      to the shared library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Expect</title>
-
-    <sect3 id="expect-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>$exp_library/expect.rc</filename> and
-        <filename>~/.expect.rc</filename>
-      </para>
-
-      <indexterm zone="expect expect-config">
-        <primary sortas="e-AA.expect.rc">~/.expect.rc</primary>
-      </indexterm>
-
-      <indexterm zone="expect expect-config">
-        <primary sortas="e-A.exp_library-expect.rc">$exp_library/expect.rc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Reference the <command>expect</command> man page for information about
-        utilizing the <filename>expect.rc</filename> configuration files.
-        Additionally, many of the tools contained in the
-        <application>Expect</application> package will use their own
-        configuration files. Reference the respective man page, or
-        examine the script directly for configuration file information.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>autoexpect, autopasswd, cryptdir, decryptdir, dislocate, expect, ftp-rfc,
-        kibitz, lpunlock, mkpasswd, passmass, rftp, rlogin-cwd, timed-read, timed-run,
-        unbuffer, weather, and optionally (if <application>Expect</application> was
-        linked against <application>Tk</application>), multixterm,
-        tknewsbiff, tkpasswd, xkibitz, and xpstat</seg>
-        <seg>libexpect&expect-version;.so</seg>
-        <seg>/usr/lib/expect&expect-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autoexpect">
-        <term><command>autoexpect</command></term>
-        <listitem>
-          <para>
-            generates an <application>Expect</application> script from
-            watching a session.
-          </para>
-          <indexterm zone="expect autoexpect">
-            <primary sortas="b-autoexpect">autoexpect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autopasswd">
-        <term><command>autopasswd</command></term>
-        <listitem>
-          <para>
-            is a wrapper to make <command>passwd</command>(1) be
-            non-interactive.
-          </para>
-          <indexterm zone="expect autopasswd">
-            <primary sortas="b-autopasswd">autopasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cryptdir">
-        <term><command>cryptdir</command></term>
-        <listitem>
-          <para>
-            encrypts all files in a directory.
-          </para>
-          <indexterm zone="expect cryptdir">
-            <primary sortas="b-cryptdir">cryptdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="decryptdir">
-        <term><command>decryptdir</command></term>
-        <listitem>
-          <para>
-            decrypts all files in a directory.
-          </para>
-          <indexterm zone="expect decryptdir">
-            <primary sortas="b-decryptdir">decryptdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dislocate">
-        <term><command>dislocate</command></term>
-        <listitem>
-          <para>
-            allows processes to be disconnected and reconnected to a
-            terminal.
-          </para>
-          <indexterm zone="expect dislocate">
-            <primary sortas="b-dislocate">dislocate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expect-prog">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>
-            is a program that <quote>talks</quote> to other interactive
-            programs according to a script.
-          </para>
-          <indexterm zone="expect expect-prog">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftp-rfc">
-        <term><command>ftp-rfc</command></term>
-        <listitem>
-          <para>
-            retrieves an RFC (or the index) from UUNET.
-          </para>
-          <indexterm zone="expect ftp-rfc">
-            <primary sortas="b-ftp-rfc">ftp-rfc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kibitz">
-        <term><command>kibitz</command></term>
-        <listitem>
-          <para>
-            allows two (or more) people to interact with one shell
-            (or any arbitrary program).
-          </para>
-          <indexterm zone="expect kibitz">
-            <primary sortas="b-kibitz">kibitz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpunlock">
-        <term><command>lpunlock</command></term>
-        <listitem>
-          <para>
-            unhangs a printer which claims it is <quote>waiting for
-            lock</quote>.
-          </para>
-          <indexterm zone="expect lpunlock">
-            <primary sortas="b-lpunlock">lpunlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkpasswd">
-        <term><command>mkpasswd</command></term>
-        <listitem>
-          <para>
-            generates passwords and can apply them automatically to users.
-          </para>
-          <indexterm zone="expect mkpasswd">
-            <primary sortas="b-mkpasswd">mkpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="passmass">
-        <term><command>passmass</command></term>
-        <listitem>
-          <para>
-            changes a password on multiple machines.
-          </para>
-          <indexterm zone="expect passmass">
-            <primary sortas="b-passmass">passmass</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rftp">
-        <term><command>rftp</command></term>
-        <listitem>
-          <para>
-            is much like <command>ftp</command> except it uses
-            <option>~g</option> and <option>~p</option> instead of
-            <option>mget</option> and <option>mput</option>.
-          </para>
-          <indexterm zone="expect rftp">
-            <primary sortas="b-rftp">rftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rlogin-cwd">
-        <term><command>rlogin-cwd</command></term>
-        <listitem>
-          <para>
-            is <command>rlogin</command> except it uses the local current
-            directory as the current working directory on the remote machine.
-          </para>
-          <indexterm zone="expect rlogin-cwd">
-            <primary sortas="b-rlogin-cwd">rlogin-cwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="timed-read">
-        <term><command>timed-read</command></term>
-        <listitem>
-          <para>
-            reads a complete line from stdin and aborts after a given
-            number of seconds.
-          </para>
-          <indexterm zone="expect timed-read">
-            <primary sortas="b-timed-read">timed-read</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="timed-run">
-        <term><command>timed-run</command></term>
-        <listitem>
-          <para>
-            runs a program for a given amount of time.
-          </para>
-          <indexterm zone="expect timed-run">
-            <primary sortas="b-timed-run">timed-run</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbuffer">
-        <term><command>unbuffer</command></term>
-        <listitem>
-          <para>
-            disables the output buffering that occurs when program output
-            is redirected.
-          </para>
-          <indexterm zone="expect unbuffer">
-            <primary sortas="b-unbuffer">unbuffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="weather">
-        <term><command>weather</command></term>
-        <listitem>
-          <para>
-            retrieves a weather report (courtesy University of Michigan)
-            for a given city or geographical area.
-          </para>
-          <indexterm zone="expect weather">
-            <primary sortas="b-weather">weather</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="multixterm">
-        <term><command>multixterm</command></term>
-        <listitem>
-          <para>
-            creates multiple <command>xterm</command>s that can be driven
-            together or separately.
-          </para>
-          <indexterm zone="expect multixterm">
-            <primary sortas="b-multixterm">multixterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tknewsbiff">
-        <term><command>tknewsbiff</command></term>
-        <listitem>
-          <para>
-            pops up a window when there is unread news in your favorite
-            newsgroups and removes the window after you've read the news.
-          </para>
-          <indexterm zone="expect tknewsbiff">
-            <primary sortas="b-tknewsbiff">tknewsbiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tkpasswd">
-        <term><command>tkpasswd</command></term>
-        <listitem>
-          <para>
-            is a script to change passwords using
-            <command>expect</command> and <application>Tk</application>.
-          </para>
-          <indexterm zone="expect tkpasswd">
-            <primary sortas="b-tkpasswd">tkpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkibitz">
-        <term><command>xkibitz</command></term>
-        <listitem>
-          <para>
-            allows users in separate <command>xterm</command>s to share one
-            shell (or any program that runs in an <command>xterm</command>).
-          </para>
-          <indexterm zone="expect xkibitz">
-            <primary sortas="b-xkibitz">xkibitz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstat">
-        <term><command>xpstat</command></term>
-        <listitem>
-          <para>
-            is a script that acts as a front-end for <command>xpilot</command>.
-          </para>
-          <indexterm zone="expect xpstat">
-            <primary sortas="b-xpstat">xpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class='libraryfile'>libexpect&expect-version;.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow <application>Expect</application> to
-            be used as a <application>Tcl</application> extension or to be
-            used directly from C or C++ (without
-            <application>Tcl</application>).
-          </para>
-          <indexterm zone="expect libexpect">
-            <primary sortas="c-libexpect&expect-version;">libexpect&expect-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/farsight2.xml
===================================================================
--- archive/farsight2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +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 farsight2-download-http "http://farsight.freedesktop.org/releases/farsight2/farsight2-&farsight2-version;.tar.gz">
-  <!ENTITY farsight2-download-ftp  " ">
-  <!ENTITY farsight2-md5sum        "7756d910687dd2abd455fd68e83f125c">
-  <!ENTITY farsight2-size          "1.1 MB">
-  <!ENTITY farsight2-buildsize     "40 MB">
-  <!ENTITY farsight2-time          "0.4 SBU">
-]>
-
-<sect1 id="farsight2" xreflabel="Farsight2-&farsight2-version;">
-  <?dbhtml filename="farsight2.html"?>
-
-
-  <title>Farsight2-&farsight2-version;</title>
-
-  <indexterm zone="farsight2">
-    <primary sortas="a-Farsight2">Farsight2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Farsight2</title>
-
-    <para>The <application>Farsight2</application> package is a collection of
-    GStreamer modules and libraries for videoconferencing.</para>
-
-    &lfs70_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&farsight2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&farsight2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &farsight2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &farsight2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &farsight2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &farsight2-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Farsight2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gst-plugins-base"/>,
-    <xref linkend="libnice"/>, and
-    <xref linkend="python2"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink
-    url="http://gstreamer.freedesktop.org/modules/gst-python.html">GStreamer
-    Python Bindings</ulink>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="gupnp"/>,
-    <xref linkend="pygobject2"/>, and
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/farsight2"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Farsight2</title>
-
-    <para>Install <application>Farsight2</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-python &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--disable-python</parameter>: This parameter disables the
-    <application>Python</application> bindings from being built. Omit it if
-    you have installed the optional python module dependencies.</para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libfsfunnel.{so,a},libfsmsnconference.{so,a},
-        libfsrawconference.{so,a},libfsrtcpfilter.{so,a},libfsrtpconference.{so,a},
-        libfsvideoanyrate.{so,a},libgstfarsight-0.10.{so,a},
-        libmulticast-transmitter.{so,a},libnice-transmitter.{so,a},
-        librawudp-transmitter.{so,a}, and libshm-transmitter.{so,a}</seg>
-        <seg>/usr/{include/gstreamer-0.10/gst/farsight,lib/farsight2-0.0,
-        share/{farsight2/0.0/fsrtpconference,gtk-doc/html/{farsight2-libs-0.10,
-        farsight2-plugins-0.10}}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgstfarsight-0.10">
-        <term><filename class='libraryfile'>libgstfarsight-0.10.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>farsight2</application> API
-          functions.</para>
-          <indexterm zone="farsight2 libgstfarsight-0.10">
-            <primary sortas="c-libgstfarsight-0.10">libgstfarsight-0.10.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/farstream.xml
===================================================================
--- archive/farstream.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +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 farstream-download-http
-           "http://freedesktop.org/software/farstream/releases/farstream/farstream-&farstream-version;.tar.gz">
-  <!ENTITY farstream-download-ftp  " ">
-  <!ENTITY farstream-md5sum        "a8971167068b69a6933d3eaaeb9ab448">
-  <!ENTITY farstream-size          "1.2 MB">
-  <!ENTITY farstream-buildsize     "30 MB">
-  <!ENTITY farstream-time          "0.2 SBU">
-]>
-
-<sect1 id="farstream" xreflabel="Farstream-&farstream-version;">
-  <?dbhtml filename="farstream.html"?>
-
-
-  <title>Farstream-&farstream-version;</title>
-
-  <indexterm zone="farstream">
-    <primary sortas="a-Farstream">Farstream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Farstream</title>
-
-    <para>
-      The <application>Farstream</application> package contains libraries
-      and a collection of <application>GStreamer</application> modules
-      used for video conferencing.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&farstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&farstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &farstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &farstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &farstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &farstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Farstream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/> and
-      <xref linkend="libnice"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-bad"/> and
-      <xref linkend="gst10-plugins-good"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://wiki.gnome.org/action/show/Projects/GUPnP">gupnp-igd</ulink> and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/farstream"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Farstream</title>
-
-    <para>
-      Install <application>Farstream</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libfarstream-0.2.so
-        </seg>
-        <seg>
-          /usr/include/farstream-0.2,
-          /usr/lib/farstream-0.2,
-          /usr/share/farstream,
-          /usr/share/gtk-doc/html/farstream-libs-1.0, and
-          /usr/share/gtk-doc/html/farstream-plugins-0.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfarstream">
-        <term><filename class="libraryfile">libfarstream-0.2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Farstream</application> API functions.
-          </para>
-          <indexterm zone="farstream libfarstream">
-            <primary sortas="c-libfarstream">libfarstream-0.2so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/firefox-legacy.xml
===================================================================
--- archive/firefox-legacy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,661 +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        "453c90444bad8702fd08b71213ab2cbc">
-  <!ENTITY firefox-size          "316 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" ?>
-
-
-  <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: chive/firewalld.xml
===================================================================
--- archive/firewalld.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,332 +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"?>
-
-
-  <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: chive/flashplayer.xml
===================================================================
--- archive/flashplayer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,248 +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 flashplayer-npapi-download-http   "https://fpdownload.adobe.com/pub/flashplayer/pdc/&flashplayer-version;/flash_player_npapi_linux.x86_64.tar.gz">
-  <!ENTITY flashplayer-npapi-md5sum          "8727e83fe43314a452517988a29d9599">
-  <!ENTITY flashplayer-npapi-size            "8.6 MB">
-
-  <!ENTITY flashplayer-npapi32-download-http "https://fpdownload.adobe.com/pub/flashplayer/pdc/&flashplayer-version;/flash_player_npapi_linux.i386.tar.gz">
-  <!ENTITY flashplayer-npapi32-md5sum        "5a2aa19ef95da1f705d593ba53c7e004">
-  <!ENTITY flashplayer-npapi32-size          "8.2 MB">
-
-  <!ENTITY flashplayer-ppapi-download-http   "https://fpdownload.adobe.com/pub/flashplayer/pdc/&flashplayer-version;/flash_player_ppapi_linux.x86_64.tar.gz">
-  <!ENTITY flashplayer-ppapi-md5sum          "1f0d9d09c741e83ba0488670f44f61dd">
-  <!ENTITY flashplayer-ppapi-size            "9.1 MB">
-
-  <!ENTITY flashplayer-ppapi32-download-http "https://fpdownload.adobe.com/pub/flashplayer/pdc/&flashplayer-version;/flash_player_ppapi_linux.i386.tar.gz">
-  <!ENTITY flashplayer-ppapi32-md5sum        "46685a66f29c9d07ad1abc0eca0a7780">
-  <!ENTITY flashplayer-ppapi32-size          "8.2 MB">
-
-  <!ENTITY chromium-launcher-download-http   "https://github.com/foutrelis/chromium-launcher/archive/v5.tar.gz">
-  <!ENTITY chromium-launcher-md5sum          "57086ccab3a6a1a0d2c8a809edd3add2">
-  <!ENTITY chromium-launcher-size            "8 KB">
-]>
-
-<sect1 id="flashplayer" xreflabel="Flash Player-&flashplayer-version;">
-  <?dbhtml filename="flashplayer.html"?>
-
-
-  <title>Flash Player-&flashplayer-version;</title>
-
-  <indexterm zone="flashplayer">
-    <primary sortas="a-Flash Player">Flash Player</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Flash Player</title>
-
-    <para><application>Flash Player</application> is a multi-platform client
-    runtime to view and interact with SWF content, distributed as a browser
-    plugin for both NPAPI (Gecko and WebKit) and PPAPI (Blink) based
-    browsers.</para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Downloads</bridgehead>
-
-    <bridgehead renderas="sect4">NPAPI plugin for Gecko (Mozilla) and WebKit 64-bit</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&flashplayer-npapi-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &flashplayer-npapi-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &flashplayer-npapi-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">NPAPI plugin for Gecko (Mozilla) and WebKit 32-bit</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&flashplayer-npapi32-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &flashplayer-npapi32-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &flashplayer-npapi32-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PPAPI plugin for Blink (QTWebEngine and Chromium) 64-bit</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&flashplayer-ppapi-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &flashplayer-ppapi-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &flashplayer-ppapi-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PPAPI plugin for Blink (QTWebEngine and Chromium) 32-bit</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&flashplayer-ppapi32-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &flashplayer-ppapi32-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &flashplayer-ppapi32-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Chromium Launcher (required for Chromium)</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&chromium-launcher-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &chromium-launcher-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &chromium-launcher-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <note><para>Download this file via wget as:</para>
-<screen><userinput>wget &chromium-launcher-download-http; \
-     -O chromium-launcher-v5.tar.gz</userinput></screen>
-    </note>
-
-    <bridgehead renderas="sect3">Flash Player Dependencies (NPAPI)</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="graphite2"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="mesa"/>, and
-      <xref linkend="nss"/>, 
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="epiphany"/>,
-      <xref role="runtime" linkend="firefox"/>,
-      <xref role="runtime" linkend="libreoffice"/>,
-      <xref role="runtime" linkend="midori"/>,
-      <xref role="runtime" linkend="seamonkey"/>, and
-      <xref role="runtime" linkend="thunderbird"/>
-    </para>
-
-    <bridgehead renderas="sect3">Flash Player Dependencies (PPAPI)</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="chromium"/> (required if installing
-      <application>Chromium Launcher</application>) or
-      <xref role="runtime" linkend="qupzilla"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/flashplayer"/></para>
-
-  </sect2>
-
-
-  <sect2 role="installation">
-    <title>Installation of Flash Player</title>
-
-    <bridgehead renderas="sect3">NPAPI Plug-in Installation (Mozilla and WebKit)</bridgehead>
-    <para>Install the <application>Flash Player</application> NPAPI plugin by
-    running the following commands:</para>
-
-<screen><userinput>mkdir flashplayer &amp;&amp;
-cd flashplayer    &amp;&amp;
-case $(uname -m) in
-    x86_64) tar -xf ../flash_player_npapi_linux.x86_64.tar.gz
-    ;;
-    i?86)   tar -xf ../flash_player_npapi_linux.i386.tar.gz
-    ;;
-esac</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>install -vdm755 /usr/lib/mozilla/plugins &amp;&amp;
-install -vm755 libflashplayer.so /usr/lib/mozilla/plugins/libflashplayer.so &amp;&amp;
-install -vm755 usr/bin/flash-player-properties /usr/bin &amp;&amp;
-install -vm644 usr/share/applications/flash-player-properties.desktop \
-               /usr/share/applications &amp;&amp;
-for size in 16 22 24 32 48
-do
-    install -vdm755 usr/share/icons/hicolor/${size}x${size}/apps/ &amp;&amp;
-    install -vm644 usr/share/icons/hicolor/${size}x${size}/apps/flash-player-properties.png \
-                   /usr/share/icons/hicolor/${size}x${size}/apps
-done &amp;&amp;
-update-desktop-database</userinput></screen>
-
-<bridgehead renderas="sect3">PPAPI Plug-in Installation (QTWebEngine and Chromium)</bridgehead>
-    <para>Install the <application>Flash Player</application> PPAPI plugin by
-    running the following commands:</para>
-
-<screen><userinput>mkdir flashplayer &amp;&amp;
-cd flashplayer    &amp;&amp;
-case $(uname -m) in
-    x86_64) tar -xf ../flash_player_ppapi_linux.x86_64.tar.gz
-    ;;
-    i?86)   tar -xf ../flash_player_ppapi_linux.i386.tar.gz
-    ;;
-esac</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>install -vdm755 /usr/lib/PepperFlash &amp;&amp;
-install -vDm755 libpepflashplayer.so /usr/lib/PepperFlash/ &amp;&amp;
-install -vm644 manifest.json /usr/lib/PepperFlash/</userinput></screen>
-
-<bridgehead renderas="sect3">Chromium Lanucher Installation</bridgehead>
-
-    <para><application>Chromium Lanucher</application> is a wrapper for
-    <application>Chromium</application> that adds the PeppperFlash installation
-    path and plug-in flags to the <application>Chromium</application> command
-    line if the PPAPI plugin is found at runtime. Install <application>Chromium
-    Launcher</application> with the following commands:</para>
-
-<screen><userinput>tar -xf chromium-launcher-5.tar.gz &amp;&amp;
-cd chromium-launcher-5             &amp;&amp;
-make PREFIX=/usr</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>mv -v /usr/bin/chromium /usr/bin/chromium-orig &amp;&amp;
-make PREFIX=/usr install-strip</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>/usr/bin/chromium</seg>
-        <seg>/usr/lib/mozilla/plugins/libflashplayer.so and/or
-        /usr/lib/PepperFlash/libpepflashplayer.so</seg>
-        <seg>/usr/lib/PepperFlash</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/flit_core.xml
===================================================================
--- archive/flit_core.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect2 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 flit_core-download-http "https://files.pythonhosted.org/packages/source/f/flit_core/flit_core-&flit_core-version;.tar.gz">
-  <!ENTITY flit_core-download-ftp  " ">
-  <!ENTITY flit_core-md5sum        "&flit_core-md5sum;">
-  <!ENTITY flit_core-size          "40 KB">
-  <!ENTITY flit_core-buildsize     "1.7 MB (add 25 MB for tests)">
-  <!ENTITY flit_core-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="flit_core" xreflabel="flit_core-&flit_core-version;">
-
-    <title>Flit_core-&flit_core-version;</title>
-
-    <indexterm zone="flit_core">
-      <primary sortas="a-flit_core">flit_core</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Flit_core Module</title>
-
-      <para>
-        The <application>Flit_core</application> module is the key component
-        of the <application>Flit</application> system, which provides a
-        simple way to put Python packages and modules on PyPi.
-      </para>
-
-      &lfs113_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&flit_core-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&flit_core-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &flit_core-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &flit_core-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &flit_core-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &flit_core-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Flit_core Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/testpath/">testpath</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Flit_core</title>
-
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user flit_core</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependency is not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install testpath                          &amp;&amp;
-python3 /usr/bin/pytest<!-- no && in case there is an error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/flit_core and
-            /usr/lib/python&python3-majorver;/site-packages/flit_core-&flit_core-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: chive/freetts.xml
===================================================================
--- archive/freetts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,310 +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 freetts-download-http "&sourceforge-dl;/freetts/freetts-&freetts-version;-src.zip">
-  <!ENTITY freetts-download-ftp  " ">
-  <!ENTITY freetts-md5sum        "692b5ece251fed88539736e55af5f391">
-  <!ENTITY freetts-size          "13.5 MB">
-  <!ENTITY freetts-buildsize     "92 MB">
-  <!ENTITY freetts-time          "0.3 SBU">
-
-  <!ENTITY freetts-testsuite-download  "&sourceforge-dl;/freetts/freetts-&freetts-version;-tst.zip">
-  <!ENTITY freetts-testsuite-md5sum    "4348c7db928612d4b6f6eb2fd621a949">
-  <!ENTITY freetts-testsuite-size      "3.8 MB">
-
-]>
-
-<sect1 id="freetts" xreflabel="FreeTTS-&freetts-version;">
-  <?dbhtml filename="freetts.html"?>
-
-
-  <title>FreeTTS-&freetts-version;</title>
-
-  <indexterm zone="freetts">
-    <primary sortas="a-FreeTTS">FreeTTS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FreeTTS</title>
-
-    <para>
-      The <application>FreeTTS</application> package contains a speech
-      synthesis system written entirely in the <application>Java</application>
-      programming language. It is based upon
-      <ulink url="http://www.cmuflite.org/">Flite</ulink>: a small run-time
-      speech synthesis engine developed at Carnegie Mellon University.
-      <application>Flite</application> is derived from the
-      <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>
-      Speech Synthesis System from the University of Edinburgh and the
-      <ulink url ="http://festvox.org/">FestVox</ulink> project from Carnegie
-      Mellon University. The <application>FreeTTS</application> package is used
-      to convert text to audible speech through the system audio hardware.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freetts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&freetts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freetts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freetts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &freetts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &freetts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Test suite: <ulink url="&freetts-testsuite-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freetts-testsuite-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freetts-testsuite-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FreeTTS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apache-ant"/> and
-      <xref linkend="sharutils"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/freetts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FreeTTS</title>
-
-    <para>
-      The <application>FreeTTS</application> package is distributed in
-      ZIP format and the <command>unzip</command> command will default to
-      creating an unused source directory. Additionally,
-      unzipping the test suite file will prompt for questions
-      about overwriting existing files. Use the following commands to
-      <command>unzip</command> the source files:
-    </para>
-
-<screen><userinput>unzip -q freetts-&freetts-version;-src.zip -x META-INF/* &amp;&amp;
-unzip -q freetts-&freetts-version;-tst.zip -x META-INF/*</userinput></screen>
-
-    <tip>
-      <para>
-        The <command>sh jsapi.sh</command> command below installs the Java
-        Speech API components into the <application>FreeTTS</application> source
-        tree. You will be required to view, and then accept (by entering a
-        <keycap>y</keycap> keypress), a license agreement before the installation
-        will continue. If you are scripting (automating) the build, you'll need
-        to account for this. There is information about automating build commands
-        in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
-        the end of this section, specific information for automating this type of
-        installation is discussed.
-      </para>
-    </tip>
-
-    <para>
-      Install <application>FreeTTS</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/value="src/value="./' build.xml &amp;&amp;
-cd lib      &amp;&amp;
-sh jsapi.sh &amp;&amp;
-cd ..       &amp;&amp;
-ant</userinput></screen>
-
-    <para>
-      To test the results, issue:
-    </para>
-
-<screen><userinput>ant junit &amp;&amp;
-cd tests &amp;&amp;
-sh regression.sh &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /opt/freetts-&freetts-version;/{lib,docs/{audio,images}} &amp;&amp;
-install -v -m644 lib/*.jar /opt/freetts-&freetts-version;/lib                &amp;&amp;
-install -v -m644 *.txt RELEASE_NOTES docs/*.{pdf,html,txt,sx{w,d}} \
-                               /opt/freetts-&freetts-version;/docs           &amp;&amp;
-install -v -m644 docs/audio/*  /opt/freetts-&freetts-version;/docs/audio     &amp;&amp;
-install -v -m644 docs/images/* /opt/freetts-&freetts-version;/docs/images    &amp;&amp;
-cp -v -R javadoc               /opt/freetts-&freetts-version;                &amp;&amp;
-ln -v -s freetts-&freetts-version; /opt/freetts</userinput></screen>
-
-    <para>
-      Optionally, install any or all of the additional
-      <application>FreeTTS</application> components using the following
-      commands as the <systemitem class="username">root</systemitem> user
-      (see the Command Explanations section for details):
-    </para>
-
-<screen role="root"><userinput>cp -v -R bin    /opt/freetts-&freetts-version;        &amp;&amp;
-install -v -m644 speech.properties $JAVA_HOME/jre/lib &amp;&amp;
-cp -v -R tools  /opt/freetts-&freetts-version;        &amp;&amp;
-cp -v -R mbrola /opt/freetts-&freetts-version;        &amp;&amp;
-cp -v -R demo   /opt/freetts-&freetts-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/value="src/value="./' build.xml</command>: Fix an
-      error in the build file to allow the program to find the source.
-    </para>
-
-    <para>
-      <command>sh jsapi.sh</command>: This command installs the
-      <application>Java Speech API</application> components into the
-      <application>FreeTTS</application> source tree.
-    </para>
-
-    <para>
-      <command>ant</command>: <application>FreeTTS</application> uses the
-      <application>Apache Ant</application> build system instead of the GNU
-      <application>autotools</application>. This commands builds everything,
-      including the class libraries, tools and demos.
-    </para>
-
-    <para>
-      <command>cp -v -R bin ...</command>;
-      <command>install -v -m644 speech.properties</command>: These two commands
-      install the demonstration programs. Optionally copy the
-      <filename>speech.properties</filename> file to
-      <filename>~/speech.properties</filename> if you don't want to make it
-      available system-wide.
-    </para>
-
-    <para>
-      <command>cp -v -R tools ...</command>: This installs the voice data
-      import utilities. See the <filename>README.html</filename> files in the
-      <filename class="directory">tools/</filename> subdirectories for
-      information and instructions about using the tools.
-    </para>
-
-    <para>
-      <command>cp -v -R mbrola ...</command>: This installs the
-      <filename class="libraryfile">mbrola.jar</filename> file, required if you
-      use the <ulink
-      url="http://freetts.sourceforge.net/mbrola/README.html">MBROLA</ulink>
-      voices.
-    </para>
-
-    <para>
-      <command>cp -v -R demo ...</command>: This installs the sources
-      and documentation for the demonstration programs.
-    </para>
-
-    <para>
-      For additional information and documentation about the
-      <application>FreeTTS</application> project, visit the main web
-      page at <ulink url="http://freetts.sourceforge.net"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing the Installation</title>
-
-    <para>
-      Test the installation using the following command:
-    </para>
-
-<screen><userinput>java -jar /opt/freetts/lib/freetts.jar \
-     -text "This is a test of the FreeTTS speech synthesis system"</userinput></screen>
-
-    <para>
-      Depending on the setup of your audio drivers and software, you
-      may have to add the <option>-streaming</option> switch to the command
-      as shown below:
-    </para>
-
-<screen><userinput>java -jar /opt/freetts/lib/freetts.jar -streaming \
-     -text "This is a test of the FreeTTS speech synthesis system"</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /opt/freetts-&freetts-version;/lib/*.jar
-        </seg>
-        <seg>
-          /opt/freetts-&freetts-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term><filename class="libraryfile">*.jar </filename></term>
-        <listitem>
-          <para>
-            contains the class libraries which make up the
-            <application>FreeTTS</application> speech synthesis system.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/funcsigs.xml
===================================================================
--- archive/funcsigs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 funcsigs-download-http "&pymodules-dl;/f/funcsigs/funcsigs-&funcsigs-version;.tar.gz">
-  <!ENTITY funcsigs-download-ftp  " ">
-  <!ENTITY funcsigs-md5sum        "7e583285b1fb8a76305d6d68f4ccc14e">
-  <!ENTITY funcsigs-size          "32 KB">
-  <!ENTITY funcsigs-buildsize     "440 KB">
-  <!ENTITY funcsigs-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin funcsigs -->
-  <sect2 id="funcsigs" xreflabel="funcsigs-&funcsigs-version;">
-
-    <title>funcsigs-&funcsigs-version;</title>
-
-    <indexterm zone="funcsigs">
-      <primary sortas="a-funcsigs">funcsigs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the funcsigs Module</title>
-
-      <para>
-        <application>funcsigs</application> is a is a backport of the
-        PEP 362 function signature features from
-        <application>Python</application> 3.3's inspect module for
-        <application>Python</application> 2.x.
-      </para>
-
-      &lfs83_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&funcsigs-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&funcsigs-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &funcsigs-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &funcsigs-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &funcsigs-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &funcsigs-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-<!-- OBSOLETE
-      <bridgehead renderas="sect4">funcsigs Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools"/>
-      </para>
--->
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/funcsigs"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of funcsigs</title>
-
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
-      <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>python setup.py install --optimize=1</userinput></screen>
-
-      <note>
-        <para>
-          This module is included with <application>Python</application>
-          distributions after 3.3.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/funcsigs-&funcsigs-version;-py&python2-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End funcsigs -->
Index: chive/fuse2.xml
===================================================================
--- archive/fuse2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,285 +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 fuse2-download-http "https://github.com/libfuse/libfuse/releases/download/fuse-&fuse2-version;/fuse-&fuse2-version;.tar.gz">
-  <!ENTITY fuse2-download-ftp  " ">
-  <!ENTITY fuse2-md5sum        "9bd4ce8184745fd3d000ca2692adacdb">
-  <!ENTITY fuse2-size          "646 KB">
-  <!ENTITY fuse2-buildsize     "8.2 MB (9.8 MB with API documentation)">
-  <!ENTITY fuse2-time          "0.1 SBU">
-]>
-
-<sect1 id="fuse2" xreflabel="Fuse-&fuse2-version;">
-  <?dbhtml filename="fuse2.html"?>
-
-
-  <title>Fuse-&fuse2-version;</title>
-
-  <indexterm zone="fuse2">
-    <primary sortas="a-Fuse-2">Fuse 2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fuse</title>
-
-    <para>
-      <application>FUSE</application> (Filesystem in Userspace) is a simple
-      interface for userspace programs to export a virtual filesystem to the
-      Linux kernel. <application>Fuse</application> also aims to provide a
-      secure method for non privileged users to create and mount their own
-      filesystem implementations.
-    </para>
-
-    <para>
-      This package is only installed for compatibility with 
-      <xref linkend="gvfs"/>.  It is not needed with other packages.
-      For full fuse functionality, install <xref linkend="fuse3"/> which
-      does not interfere with these instructions.
-    </para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fuse2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fuse2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fuse2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fuse2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fuse2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fuse2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Fuse Dependencies</bridgehead>
-
-<!-- What is this?
-    <bridgehead renderas="sect3">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fuse3"/> (runtime only)
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to rebuild the API documentation)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/fuse2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="fuse2-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>File systems  ---&gt;
-  &lt;*/M&gt; FUSE (Filesystem in Userspace) support [CONFIG_FUSE_FS]</literal></screen>
-
-    <indexterm zone="fuse2 fuse2-kernel">
-      <primary sortas="d-fuse2">Fuse 2</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fuse</title>
-
-    <para>
-      Install <application>Fuse</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --exec-prefix=/  &amp;&amp;
-
-make &amp;&amp;
-make DESTDIR=$PWD/Dest install</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>install -vm755 Dest/lib/libfuse.so.&fuse2-version; /lib                  &amp;&amp;
-install -vm755 Dest/lib/libulockmgr.so.1.0.1 /lib                 &amp;&amp;
-ln -sfv ../../lib/libfuse.so.&fuse2-version; /usr/lib/libfuse.so         &amp;&amp;
-ln -sfv ../../lib/libulockmgr.so.1.0.1 /usr/lib/libulockmgr.so &amp;&amp;
-
-install -vm644  Dest/lib/pkgconfig/fuse.pc /usr/lib/pkgconfig  &amp;&amp; 
-                                                         
-install -vm4755 Dest/bin/fusermount       /bin                 &amp;&amp;
-install -vm755  Dest/bin/ulockmgr_server  /bin                 &amp;&amp;
-
-install -vm755  Dest/sbin/mount.fuse      /sbin                &amp;&amp;
-
-install -vdm755 /usr/include/fuse                              &amp;&amp;
-
-install -vm644  Dest/usr/include/*.h      /usr/include         &amp;&amp;
-install -vm644  Dest/usr/include/fuse/*.h /usr/include/fuse/   &amp;&amp;
-
-install -vm644  Dest/usr/share/man/man1/* /usr/share/man/man1  &amp;&amp;
-/sbin/ldconfig -v</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>
-      <parameter>--exec-prefix=/</parameter>: This parameter moves programs and
-      libraries that could be needed before the
-      <filename class="directory">/usr</filename> directory is mounted, to the
-      root filesystem.
-    </para>
-
-    <para>
-      <command>make DESTDIR=$PWD/Dest install</command>: This command installs
-      the files to a temporary directory, so that the needed files can be
-      installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring fuse</title>
-
-    <sect3 id="fuse2-config">
-      <title>Config Files</title>
-
-      <para>
-        Information on configuring fuse can be found at
-        <xref linkend="fuse-configuration"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          fusermount, mount.fuse, and ulockmgr_server
-        </seg>
-        <seg>
-          libfuse.so and libulockmgr.so
-        </seg>
-        <seg>
-          /usr/include/fuse
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fusermount2">
-        <term><command>fusermount</command></term>
-        <listitem>
-          <para>
-            is a suid root program to mount and unmount Fuse
-            filesystems.
-          </para>
-          <indexterm zone="fuse2 fusermount2">
-            <primary sortas="b-fusermount2">fusermount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.fuse2">
-        <term><command>mount.fuse</command></term>
-        <listitem>
-          <para>
-            is the command <command>mount</command> would call to mount a Fuse
-            filesystem.
-          </para>
-          <indexterm zone="fuse2 mount.fuse2">
-            <primary sortas="b-mount.fuse2">mount.fuse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ulockmgr_server2">
-        <term><command>ulockmgr_server</command></term>
-        <listitem>
-          <para>
-            is the Userspace Lock Manager Server for Fuse filesystems.
-          </para>
-          <indexterm zone="fuse2 ulockmgr_server2">
-            <primary sortas="b-ulockmgr_server2">ulockmgr_server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfuse2">
-        <term><filename class="libraryfile">libfuse.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>FUSE</application> API functions.
-          </para>
-          <indexterm zone="fuse2 libfuse2">
-            <primary sortas="c-libfuse2">libfuse.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libulockmgr2">
-        <term><filename class="libraryfile">libulockmgr.so</filename></term>
-        <listitem>
-          <para>
-            contains the Userspace Lock Manager API functions.
-          </para>
-          <indexterm zone="fuse2 libulockmgr2">
-            <primary sortas="c-libulockmgr2">libulockmgr.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/galeon.xml
===================================================================
--- archive/galeon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +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 galeon-download-http "&sourceforge-repo;/galeon/galeon-&galeon-version;.tar.bz2">
-  <!ENTITY galeon-download-ftp  "&gentoo-ftp-repo;/galeon-&galeon-version;.tar.bz2">
-  <!ENTITY galeon-md5sum        "34d6e3a6ee78f9e4d12736e5d81b462b">
-  <!ENTITY galeon-size          "2.9 MB">
-  <!ENTITY galeon-buildsize     "75.4 MB">
-  <!ENTITY galeon-time          "1.3 SBU">
-]>
-
-<sect1 id="galeon" xreflabel="Galeon-&galeon-version;">
-  <?dbhtml filename="galeon.html" ?>
-
-
-  <title>Galeon-&galeon-version;</title>
-
-  <indexterm zone="galeon">
-    <primary sortas="a-Galeon">Galeon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Galeon</title>
-
-    <para>The <application>Galeon</application> package contains a
-    <application>GNOME</application>-2 browser that utilizes
-    the mozilla.org Gecko layout engine and presents the simplest
-    interface possible for a browser.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&galeon-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&galeon-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &galeon-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &galeon-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &galeon-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &galeon-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Galeon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/> and
-     a mozilla.org Gecko layout engine
-    (<xref linkend="seamonkey"/> or
-    <xref linkend="firefox"/> or
-    <xref linkend="thunderbird"/> or
-    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink>)</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgtkhtml"/> and
-    <xref linkend="iso-codes"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/galeon"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Galeon</title>
-
-    <para>Compiling must be done with the same compiler version and
-    optimization settings that were used to compile the Gecko layout
-    engine package.</para>
-
-    <para>Install <application>Galeon</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man &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;
-install -v -m755 -d $(pkg-config \
-        --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version; &amp;&amp;
-install -v -m644 FAQ README* doc/*.txt $(pkg-config \
-        --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version; &amp;&amp;
-ln -v -s ../../$PACKAGE_NAME/FAQ.html $(pkg-config \
-        --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>galeon and galeon-config-tool</seg>
-        <seg>None</seg>
-        <seg>The following subdirectories of
-        <envar>$GNOME_PREFIX</envar>/share/:
-        galeon, {gnome/help, omf, sounds}/galeon</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="galeon-prog">
-        <term><command>galeon</command></term>
-        <listitem>
-          <para>is a <application>GNOME</application>-2 web browser
-          using a Gecko-based rendering/security/networking engine.</para>
-          <indexterm zone="galeon galeon-prog">
-            <primary sortas="b-galeon">galeon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="galeon-config-tool">
-        <term><command>galeon-config-tool</command></term>
-        <listitem>
-          <para>clears settings, installs schemas, removes schemas and
-          fixes permissions in the <application>GConf</application>
-          database.</para>
-          <indexterm zone="galeon galeon-config-tool">
-            <primary sortas="b-galeon-config-tool">galeon-config-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gamin.xml
===================================================================
--- archive/gamin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,204 +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 gamin-download-http
-    "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
-  <!ENTITY gamin-download-ftp  "&gentoo-ftp-repo;/gamin-&gamin-version;.tar.gz">
-  <!ENTITY gamin-md5sum        "b4ec549e57da470c04edd5ec2876a028">
-  <!ENTITY gamin-size          "639 KB">
-  <!ENTITY gamin-buildsize     "6.7 MB">
-  <!ENTITY gamin-time          "0.1 SBU">
-]>
-
-<sect1 id="gamin" xreflabel="Gamin-&gamin-version;">
-  <?dbhtml filename="gamin.html"?>
-
-
-  <title>Gamin-&gamin-version;</title>
-
-  <indexterm zone="gamin">
-    <primary sortas="a-Gamin">Gamin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gamin</title>
-
-    <para>
-      The <application>Gamin</application> package contains a File Alteration
-      Monitor which is useful for notifying applications of changes to the file
-      system. Gamin is compatible with
-      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>.
-    </para>
-
-    &lfs74_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gamin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gamin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gamin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gamin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gamin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gamin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gamin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gamin"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gamin</title>
-
-    <para>
-      Install <application>Gamin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/G_CONST_RETURN/const/' server/gam_{node,subscription}.{c,h} &amp;&amp;
-./configure --prefix=/usr --libexecdir=/usr/sbin --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that some
-      tests may display errors.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/gamin-&gamin-version; &amp;&amp;
-install -v -m644 doc/*.{html,fig,gif,txt} /usr/share/doc/gamin-&gamin-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/G_CONST_RETURN/const/'
-      server/gam_{node,subscription}.{c,h}</command>: This sed fixes compiling
-      with <application>Glib 2.32</application> or greater installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gamin</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        No configuration is generally required and the default options should
-        work for most users. See
-        <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> for
-        details.
-      </para>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gam_server</seg>
-        <seg>
-          libfam.so, libgamin-1.so, libgamin_shared.a and (if you've installed
-          <application>Python 2</application>) _gamin.so.
-        </seg>
-        <seg>/usr/share/doc/gamin-&gamin-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="gam_server">
-      <term><command>gam_server</command></term>
-      <listitem>
-        <para>
-          is the file alteration monitor daemon that is started on demand for
-          each user.
-        </para>
-        <indexterm zone="gamin gam_server">
-          <primary sortas="b-gam_server">gam_server</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libgamin">
-      <term><filename class='libraryfile'>libgamin.so</filename></term>
-      <listitem>
-        <para>
-          contains functions that support the file allocation monitor.
-        </para>
-        <indexterm zone="gamin libgamin">
-          <primary sortas="c-libgamin">libgamin.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libfam">
-      <term><filename class='libraryfile'>libfam.so</filename></term>
-      <listitem>
-        <para>
-          contains functions that provide compatibility with FAM.
-        </para>
-        <indexterm zone="gamin libfam">
-          <primary sortas="c-libfam">libfam.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/gcab.xml
===================================================================
--- archive/gcab.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +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 gcab-download-http
-           "&gnome-download-http;/gcab/0.7/gcab-&gcab-version;.tar.xz">
-  <!ENTITY gcab-download-ftp
-           "&gnome-download-ftp;/gcab/0.7/gcab-&gcab-version;.tar.xz">
-  <!ENTITY gcab-md5sum        "d8c54c340e56d0b6a8fe082fd04d8090">
-  <!ENTITY gcab-size          "328 KB">
-  <!ENTITY gcab-buildsize     "5.2 MB (with tests)">
-  <!ENTITY gcab-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="gcab" xreflabel="gcab-&gcab-version;" revision="systemd">
-  <?dbhtml filename="gcab.html"?>
-
-
-  <title>gcab-&gcab-version;</title>
-
-  <indexterm zone="gcab">
-    <primary sortas="a-gcab">gcab</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gcab</title>
-
-    <para>
-      The <application>Gcab</application> package contains a
-      program and a library used to create Microsoft cabinet
-      (.cab) archives.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcab-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcab-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcab-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcab-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcab-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcab-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </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;/gcab"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gcab</title>
-
-    <para>
-      Install <application>Gcab</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcab
-        </seg>
-        <seg>
-          libgcab-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libgcab-1.0 and
-          /usr/share/gtk-doc/html/gcab
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcab-prog">
-        <term><command>gcab</command></term>
-        <listitem>
-          <para>
-            is a program used to create Microsoft cabinet
-            (.cab) archives.
-          </para>
-          <indexterm zone="gcab gcab-prog">
-            <primary sortas="b-gcab">gcab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcab-1.0">
-        <term><filename class="libraryfile">libgcab-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for creating Microsoft
-            cabinet (.cab) archives.
-          </para>
-          <indexterm zone="gcab libgcab-1.0">
-            <primary sortas="c-libgcab-1.0">libgcab-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gcc-ada.xml
===================================================================
--- archive/gcc-ada.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,576 +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 gcc-download-http     "&gnu-http;/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.xz">
-  <!ENTITY gcc-download-ftp      "&gnu-ftp;/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.xz">
-  <!ENTITY gcc-md5sum            "4ab282f414676496483b3e1793d07862">
-  <!ENTITY gcc-size              "61 MB">
-  <!ENTITY gcc-ada-buildsize     "7.0 GB (add 369 MB for tests, add 1.6 GB if GNAT install dir is not removed)">
-  <!ENTITY gcc-ada-time          "25 SBU (with parallelism=4, add 92 SBU for tests)">
-
-  <!-- Keeping these the same because the new GNAT binary for x86_64
-       Requires Qt4 and a GUI to install. The i686 one is being tested
-       seperately from this update.-->
-  <!ENTITY gnat-download-http    "https://libre.adacore.com/download/">
-  <!ENTITY gnat-64-download-http "http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7">
-  <!ENTITY gnat-64-md5sum        "226dac83d9e6490fc8542ac0934a1db0">
-  <!ENTITY gnat-64-size          "473 MB">
-  <!ENTITY gnat-32-download-http "http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248">
-  <!ENTITY gnat-32-md5sum        "69423c7ad8d9759377d4fff71a78992d">
-  <!ENTITY gnat-32-size          "222 MB">
-]>
-
-<sect1 id="gcc-ada" xreflabel="GCC-Ada-&gcc-ada-version;">
-  <?dbhtml filename="gcc-ada.html" ?>
-
-
-  <title>GCC-Ada-&gcc-ada-version;</title>
-
-  <indexterm zone="gcc-ada">
-    <primary sortas="a-gcc-ada">GCC-Ada-&gcc-ada-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the GCC Ada compiler</title>
-
-    <para>
-      Ada is a modern programming language designed for large, long-lived
-      applications &mdash; and embedded systems in particular &mdash; where
-      reliability and efficiency are essential. It has a set of unique technical
-      features that make it highly effective for use in large, complex and
-      safety-critical projects.
-    </para>
-
-    <para>
-      The compiler and associated tools on this page are known as the
-      <application>GNAT</application> technology, developed by the Adacore
-      company, using the <application>GCC</application> backend. Since
-      parts of the Ada compiler are written in Ada, there is a circular
-      dependency on an Ada compiler. The instructions below first install
-      a binary compiler. You do not need to do that if you already have built
-      <application>GNAT</application> tools.
-    </para>
-
-    &lfs84_checked;
-
-    <caution>
-      <para>
-        Using the instructions on this page will have the effect that
-        the C and C++ compiler and libraries will be reinstalled, overwriting
-        the ones on your system. This may lead to some issues. Please read the
-        notes and caution on the <xref linkend="gcc"/> page.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        If you want to install other compilers in the <application>GCC
-        </application> collection, simply add them to the
-        <parameter>--enable-languages</parameter> parameter for <command>
-        configure</command>. If you rebuild <application>GCC</application>
-        without enabling ada after running the instructions on this page,
-        the new compiler will not be able to compile ADA anymore. If you already
-        have ADA instaled, you do not need to use the instructions on this page,
-        simply add <parameter>ada</parameter> to the
-        <parameter>--enable-languages</parameter> parameter using the
-        instructions from <xref linkend="gcc"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcc-ada-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcc-ada-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <note>
-            <!-- gnat-2018 uses graphical installer, stick to 2017 -->
-      <para>
-        You will need to install <application>GNAT</application>
-        temporarily to satisfy the circular dependency. You may point your
-        browser to the <ulink url="&gnat-download-http;">AdaCore download
-        page</ulink>, choose your platform and 2017 (64 bit machines) or
-        2014 (32 bit machines), then select the file
-        to download. Alternatively, direct links to the 64 bit and 32 bit
-        linux versions are given below.
-      </para>
-    </note>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          GNAT 64 bit binary: <ulink url="&gnat-64-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          GNAT 64 bit MD5 sum: &gnat-64-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          GNAT 64 bit size: &gnat-64-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          GNAT 32 bit binary: <ulink url="&gnat-32-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          GNAT 32 bit MD5 sum: &gnat-32-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          GNAT 32 bit size: &gnat-32-size;
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gcc-&gcc-ada-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GCC Ada Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dejagnu"/>, for tests
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/> and
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gcc-ada"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the GNAT binary</title>
-
-    <para>
-      Before unpacking and changing into the GCC source directory, first
-      unpack the <application>GNAT</application> tarball, and change to the
-      GNAT directory. Then, install the <application>GNAT</application> binary
-      by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make ins-all prefix=/opt/gnat</userinput></screen>
-
-    <para>
-      The <application>GNAT</application> compiler can be invoked by
-      executing the <command>gcc</command> binary installed in <filename
-      class="directory">/opt/gnat/bin</filename>.
-    </para>
-
-    <para>
-      You may now remove the <application>GNAT</application>
-      source directory if desired.
-    </para>
-
-    <para>
-      Prepare to compile <application>GCC</application> by placing the
-      <application>GNAT</application> version of <command>gcc</command> at the
-      beginning of the <envar>PATH</envar> variable by using the following
-      commands:
-    </para>
-
-<screen><userinput>PATH_HOLD=$PATH &amp;&amp;
-export PATH=/opt/gnat/bin:$PATH_HOLD</userinput></screen>
-
-    <para>
-      Doing so has the drawback that the <application>GCC</application>
-      and <application>Binutils</application> executables are taken
-      from the just installed <application>GNAT</application> package, but the
-      versions of those executables are outdated compared to those installed in
-      LFS. This is not important for the <application>GCC</application> compilers,
-      since they recompile themselves during the bootstrap process. On the other
-      hand, the outdated <command>ld</command> and <command>as</command> tools
-      are used all along. In order to use the LFS tools, issue as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find /opt/gnat -name ld -exec mv -v {} {}.old \;
-find /opt/gnat -name as -exec mv -v {} {}.old \;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Ada</title>
-
-    <para>
-      Install <application>GCC Ada</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
-  ;;
-esac
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure               \
-    --prefix=/usr          \
-    --disable-multilib     \
-    --disable-libmpx       \
-    --with-system-zlib     \
-    --enable-languages=ada &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed additional packages such as
-      <application>Valgrind</application> and <application>GDB</application>,
-      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). To run the tests, issue:
-    </para>
-
-<screen><userinput>ulimit -s 32768 &amp;&amp;
-make -k check</userinput></screen>
-<!-- The command above may error out, so using && may prevent the summary
-to be run. -->
-
-    <para>
-      The tests are very long, and the results may be hard to find in the
-      logs, specially if you use parallel jobs with make. You can get a summary
-      of the tests with:
-    </para>
-
-<screen><userinput>../contrib/test_summary</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                               &amp;&amp;
-mkdir -pv /usr/share/gdb/auto-load/usr/lib                 &amp;&amp;
-mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib    &amp;&amp;
-
-chown -v -R root:root \
-    /usr/lib/gcc/*linux-gnu/&gcc-ada-version;/include{,-fixed} \
-    /usr/lib/gcc/*linux-gnu/&gcc-ada-version;/ada{lib,include}</userinput></screen>
-
-    <para>
-      You should now remove the <application>GNAT</application>
-      installation and perform other cleanups. First, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf /opt/gnat</userinput></screen>
-
-    <para>
-      Then, as a normal user:
-    </para>
-
-<screen><userinput>export PATH=$PATH_HOLD &amp;&amp;
-unset PATH_HOLD</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mkdir build; cd build</command>: The
-      <application>GCC</application> documentation recommends
-      building the package in a dedicated build directory.
-    </para>
-
-    <para>
-      <parameter>--disable-multilib</parameter>: This parameter ensures
-      that files are created for the specific architecture of your computer.
-    </para>
-
-    <para>
-      <parameter>--with-system-zlib</parameter>: Uses the system
-      <application>zlib</application> instead of the bundled one.
-      <application>zlib</application> is used for compressing
-      and uncompressing <application>GCC</application>'s intermediate
-      language in LTO (Link Time Optimization) object files.
-    </para>
-
-    <para>
-      <parameter>--enable-languages=ada</parameter>: Instructs the build system
-      to build the Ada tools and compiler. It is unavoidable that the
-      <application>C</application> and <application>C++</application>
-      compilers be built too.
-    </para>
-
-    <!-- Unlike standard GCC, removing this could break compatibility
-    with the GNAT binary for i686 because it uses gcc-4.7.3 in the
-    binary. Leave it alone until tested. -->
-    <para>
-      <option>--with-default-libstdcxx-abi=gcc4-compatible</option>: Use this
-      switch if you are building <application>GNAT</application> tools using a
-      <application>GCC</application> version prior to 5.1.0,
-      and you do not want to recompile all the libraries written in C++.
-    </para>
-
-    <para>
-      <command>ulimit -s 32768</command>: This command prevents several
-      tests from running out of stack space.
-    </para>
-
-    <para>
-      <command>make -k check</command>: This command runs the test suite
-      without stopping if any errors are encountered.
-    </para>
-
-    <para>
-      <command>../contrib/test_summary</command>: This
-      command will produce a summary of the test suite results. You can append
-      <command>| grep -A7 Summ</command> to the command to produce an even more
-      condensed version of the summary. You may also wish to redirect the output
-      to a file for review and comparison later on.
-    </para>
-
-    <para>
-      <command>chown -v -R root:root /usr/lib/gcc/*linux-gnu/...</command>:
-      If the package is built by a user other than root, the ownership of the
-      installed <filename class="directory">include</filename> and
-      <filename class="directory">adalib</filename> directories (and their
-      contents) will be incorrect. These commands change the ownership to the
-      <systemitem class="username">root</systemitem> user and group.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnat, gnatbind, gnatchop, gnatclean, gnatfind, gnatkr,
-          gnatlink, gnatls, gnatmake, gnatname, gnatprep, gnatxref
-        </seg>
-        <seg>
-          libgnarl.{so,a}, libgnat.{so,a} in <filename class="directory">
-          /usr/lib/gcc/&lt;arch-triplet&gt;/&gcc-ada-version;/adalib</filename>
-        </seg>
-        <seg>
-          /usr/lib/gcc/&lt;arch-triplet&gt;/&gcc-ada-version;/ada{include,lib}
-          and /usr/lib/gcc/&lt;arch-triplet&gt;/&gcc-ada-version;/plugin/include/ada
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <para>
-      Only the Ada specific files are listed here. Others can be found at
-      <ulink url="&lfs-root;/chapter06/gcc.html#contents-gcc"/> as they were
-      initially installed during the building of LFS.
-    </para>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnat">
-        <term><command>gnat</command></term>
-        <listitem>
-          <para>
-            is a wrapper that accepts a number of commands and calls
-            the corresponding tool from the list below.
-          </para>
-          <indexterm zone="gcc-ada gnat">
-            <primary sortas="b-gnat">gnat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatbind">
-        <term><command>gnatbind</command></term>
-        <listitem>
-          <para>
-            is used to bind compiled objects.
-          </para>
-          <indexterm zone="gcc-ada gnatbind">
-            <primary sortas="b-gnatbind">gnatbind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatchop">
-        <term><command>gnatchop</command></term>
-        <listitem>
-          <para>
-            is useful for renaming files to meet the standard
-            <application>Ada</application> default file naming conventions.
-          </para>
-          <indexterm zone="gcc-ada gnatchop">
-            <primary sortas="b-gnatchop">gnatchop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatclean">
-        <term><command>gnatclean</command></term>
-        <listitem>
-          <para>
-            is used to remove files associated with a
-            <application>GNAT</application> project.
-          </para>
-          <indexterm zone="gcc-ada gnatclean">
-            <primary sortas="b-gnatclean">gnatclean</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatfind">
-        <term><command>gnatfind</command></term>
-        <listitem>
-          <para>
-            is intended for locating definition and/or references to
-            specified entities in a <application>GNAT</application> project.
-          </para>
-          <indexterm zone="gcc-ada gnatfind">
-            <primary sortas="b-gnatfind">gnatfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatkr">
-        <term><command>gnatkr</command></term>
-        <listitem>
-          <para>
-            is used to determine the crunched name for a given file, when
-            crunched to a specified maximum length.
-          </para>
-          <indexterm zone="gcc-ada gnatkr">
-            <primary sortas="b-gnatkr">gnatkr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatlink">
-        <term><command>gnatlink</command></term>
-        <listitem>
-          <para>
-            is used to link programs and build an executable file.
-          </para>
-          <indexterm zone="gcc-ada gnatlink">
-            <primary sortas="b-gnatlink">gnatlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatls">
-        <term><command>gnatls</command></term>
-        <listitem>
-          <para>
-            is the compiled unit browser.
-          </para>
-          <indexterm zone="gcc-ada gnatls">
-            <primary sortas="b-gnatls">gnatls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatmake">
-        <term><command>gnatmake</command></term>
-        <listitem>
-          <para>
-            is the <application>Ada</application> compiler, which performs
-            compilation, binding and linking.
-          </para>
-          <indexterm zone="gcc-ada gnatmake">
-            <primary sortas="b-gnatmake">gnatmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatname">
-        <term><command>gnatname</command></term>
-        <listitem>
-          <para>
-            will list the files associated with a
-            <application>GNAT</application> project.
-          </para>
-          <indexterm zone="gcc-ada gnatname">
-            <primary sortas="b-gnatname">gnatname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatprep">
-        <term><command>gnatprep</command></term>
-        <listitem>
-          <para>
-            is the <application>GNAT</application> external preprocessor.
-          </para>
-          <indexterm zone="gcc-ada gnatprep">
-            <primary sortas="b-gnatprep">gnatprep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnatxref">
-        <term><command>gnatxref</command></term>
-        <listitem>
-          <para>
-            is similar to <command>gnatfind</command>, but generates
-            a full report of all cross-references.
-          </para>
-          <indexterm zone="gcc-ada gnatxref">
-            <primary sortas="b-gnatxref">gnatxref</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gcc-java.xml
===================================================================
--- archive/gcc-java.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,667 +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 gcc-java-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-java-version;/gcc-&gcc-java-version;.tar.bz2">
-  <!ENTITY gcc-java-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-java-version;/gcc-&gcc-java-version;.tar.bz2">
-  <!ENTITY gcc-java-md5sum         "6bf56a2bca9dac9dbbf8e8d1036964a8">
-  <!ENTITY gcc-java-size           "80 MB">
-  <!ENTITY gcc-java-buildsize      "4.5 GB">
-  <!ENTITY gcc-java-time           "34 SBU (with tests and parallelism=4)">
-
-<!-- ecj-latest points to 4.5 while ecj-4.9 is available -->
-  <!ENTITY ecj-download-ftp    "ftp://sourceware.org/pub/java/ecj-4.9.jar">
-
-  <!ENTITY antlr-version       "4.6">
-  <!ENTITY antlr-download-http "http://www.antlr.org/download/antlr-&antlr-version;-complete.jar">
-]>
-
-<sect1 id="gcc-java" xreflabel="GCC-Java-&gcc-java-version;">
-  <?dbhtml filename="gcc-java.html" ?>
-
-
-  <title>GCC-Java-&gcc-java-version;</title>
-
-  <indexterm zone="gcc-java">
-    <primary sortas="a-gcc-java">GCC-Java-&gcc-java-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GCC-Java</title>
-
-    <para>
-      See the introduction to the Java language and system at
-      <xref linkend="java"/>. The GNU Compiler Collection (GCC) contains
-      a Java compiler to native code. Together with the
-      <application>ecj</application> Java compiler from Eclipse (to bytecode),
-      it provides a way to build an acceptable JVM from source. However, since
-      the release of <application>OpenJDK</application>, the development
-      of GCC-Java has almost stopped, and the built JVM is an old version,
-      which cannot be used for building <xref linkend="openjdk"/>.
-    </para>
-
-    &lfs80_checked;
-
-    <caution>
-      <para>
-        Using the instructions on this page will have the effect that
-        the C and C++ compiler and libraries will be reinstalled, overwriting
-        the ones on your system. This may lead to some issues. Please read the
-        note and caution on the <xref linkend="gcc"/> page.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcc-java-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcc-java-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcc-java-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcc-java-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcc-java-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcc-java-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Eclipse Java compiler: <ulink url="&ecj-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          ANTLR binary, for building <command>gjdoc</command> (optional):
-          <ulink url="&antlr-download-http;"/>
-        </para>
-      </listitem>
-<!--      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gcc-&gcc-java-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>-->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GCC Java Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="unzip"/>,
-      <xref linkend="which"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dejagnu"/>, for tests
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/> and
-      <ulink url="https://download.gnome.org/sources/libart_lgpl/">
-        Libart
-      </ulink> for building the AWT peer
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gcc-java"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Java</title>
-
-    <para>
-      The instructions below assume that the C and C++ compilers have
-      the same version as the one you are installing, so that a
-      <quote>bootstrap</quote> is not necessary. If you are upgrading
-      the GCC version, then remove the <option>--disable-bootstrap</option> from
-      the <command>./configure</command> options below.
-    </para>
-
-    <para>
-      Install <application>GCC Java</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
-  ;;
-esac
-
-sed -i 's/\(install.*:\) install-.*recursive/\1/' libffi/Makefile.in         &amp;&amp;
-sed -i 's/\(install-data-am:\).*/\1/'             libffi/include/Makefile.in &amp;&amp;
-sed -i 's/absolute/file normalize/' libjava/testsuite/lib/libjava.exp &amp;&amp;
-sed -i 's/major.*1000.*minor/major/' gcc/java/decl.c &amp;&amp;
-
-cp ../ecj-4.9.jar ./ecj.jar &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure                     \
-    --prefix=/usr                \
-    --disable-multilib           \
-    --with-system-zlib           \
-    --disable-bootstrap          \
-    --enable-java-home           \
-    --with-jvm-root-dir=/opt/gcj \
-    --with-antlr-jar=$(pwd)/../../antlr-&antlr-version;-complete.jar \
-    --enable-languages=java &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed additional packages such as
-      <application>Valgrind</application> and <application>GDB</application>,
-      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). To run the tests, issue:
-    </para>
-
-<screen><userinput>ulimit -s 32768 &amp;&amp;
-make -k check</userinput></screen>
-<!-- The command above may error out, so using && may prevent the summary
-to be run. -->
-
-    <para>
-      The tests are very long, and the results may be hard to find in the
-      logs, specially if you use job control with make. You can get a summary
-      of the tests with:
-    </para>
-
-<screen><userinput>../contrib/test_summary</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-mkdir -pv /usr/share/gdb/auto-load/usr/lib              &amp;&amp;
-mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-
-chown -v -R root:root \
-    /usr/lib/gcc/*linux-gnu/&gcc-java-version;/include{,-fixed} &amp;&amp;
-
-gcj -o ecj ../../ecj-4.9.jar \
-    --main=org.eclipse.jdt.internal.compiler.batch.Main &amp;&amp;
-mv ecj /usr/bin &amp;&amp;
-ln -sfv ../../../usr/bin/ecj /opt/gcj/bin/javac</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      The first two <command>sed</command> commands prevent the
-      installation of the <application>libffi</application> library bundled
-      with <application>GCC</application>, since it is outdated compared to
-      <xref linkend="libffi"/>.
-    </para>
-
-    <para>
-      The next two <command>sed</command> commands implement upstream fixes
-      to the <application>GCC Java</application> compiler and tests.
-    </para>
-
-    <para>
-      <command>mkdir build; cd build</command>: The
-      <application>GCC</application> documentation recommends
-      building the package in a dedicated build directory.
-    </para>
-
-    <para>
-      <parameter>--disable-multilib</parameter>: This parameter ensures
-      that files are created for the specific architecture of your computer.
-    </para>
-
-    <para>
-      <parameter>--with-system-zlib</parameter>: Uses the system
-      <application>zlib</application> instead of the bundled one.
-    </para>
-
-    <para>
-      <parameter>--disable-bootstrap</parameter>: Prevents the C and C++
-      compilers to recompile themselves. You should use this switch only
-      if the installed C and C++ compilers are the same version as the
-      ones you install.
-    </para>
-
-    <para>
-      <parameter>--enable-java-home</parameter>: Creates a directory
-      layout similar to that of a JVM.
-    </para>
-
-    <para>
-      <parameter>--with-jvm-root-dir=/opt/gcj</parameter>: Installs
-      the JVM in the specified location.
-    </para>
-
-    <para>
-      <parameter>--with-antlr-jar=...</parameter>: Specifies the location of
-      <application>ANTLR</application>, which is needed to build
-      <command>gjdoc</command>. Remove if you have not downloaded antlr.
-    </para>
-
-    <para>
-      <parameter>--enable-languages=java</parameter>:
-      This command identifies which language to build. Note it is unavoidable
-      that the <application>C</application> and <application>C++</application>
-      compilers be built too.
-    </para>
-
-    <para>
-      <option>--enable-java-awt=gtk</option>: Allows to build the Java AWT
-      <application>GTK+2</application> peer. Needed to have a fully functional
-      JVM.
-    </para>
-
-    <para>
-      <command>ulimit -s 32768</command>: This command prevents several
-      tests from running out of stack space.
-    </para>
-
-    <para>
-      <command>make -k check</command>: This command runs the test suite
-      without stopping if any errors are encountered.
-    </para>
-
-    <para>
-      <command>../contrib/test_summary</command>: This
-      command will produce a summary of the test suite results. You can append
-      <command>| grep -A7 Summ</command> to the command to produce an even more
-      condensed version of the summary. You may also wish to redirect the output
-      to a file for review and comparison later on.
-    </para>
-
-    <para>
-      <command>chown -v -R root:root
-      /usr/lib/gcc/*linux-gnu/...</command>:
-      If the package is built by a user other than root, the ownership of the
-      installed <filename class="directory">include</filename> directory (and
-      its content) will be incorrect. This command changes the ownership to
-      the <systemitem class="username">root</systemitem> user and group.
-    </para>
-
-    <para>
-      <command>gcj -o ecj ...</command>: compiles the eclipse compiler to
-      native code, which is much faster than bytecode. This compiler is
-      then used as a <command>javac</command> replacement in the JVM.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GCC-Java</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The configuration is the same as <xref linkend="ojdk-conf"/>,
-        replacing <filename class="directory">/opt/jdk</filename> with
-        <filename class="directory">/opt/gcj</filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aot-compile, ecj, gappletviewer, gc-analyze, gcj, gcj-dbtool,
-          gcjh, gij, gjar, gjarsigner, gjavah, gjdoc, gkeytool, gnative2ascii,
-          gorbd, grmic, grmid, grmiregistry, gserialver, gtnameserv, jcf-dump,
-          jv-convert, rebuild-gcj-db. Symbolic links to these files are located
-          in <filename class="directory">/opt/gcj/bin</filename>
-        </seg>
-        <seg>
-          libgcj_bc.so, libgcj.so, libgcj-tools.so, and libgij.so
-        </seg>
-        <seg>
-          /usr/include/c++/&gcc-java-version;/{gcj,gnu,java,javax,org,sun},
-          /usr/lib/gcj-&gcc-java-version;-17, /usr/lib/jvm-exports,
-          /usr/lib/security, /opt/gcj, and /usr/share/java
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <para>
-      Some programs, libraries, and descriptions are not listed here,
-      but can be found at
-      <ulink url="&lfs-root;/chapter06/gcc.html#contents-gcc"/> as they were
-      initially installed during the building of LFS.
-    </para>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aot-compile">
-        <term><command>aot-compile</command></term>
-        <listitem>
-          <para>
-            searches a directory for Java bytecode and uses
-            <command>gcj</command> to compile it to native code.
-          </para>
-          <indexterm zone="gcc-java aot-compile">
-            <primary sortas="b-aot-compile">aot-compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ecj">
-        <term><command>ecj</command></term>
-        <listitem>
-          <para>
-            is the Eclipse Java compiler.
-          </para>
-          <indexterm zone="gcc-java ecj">
-            <primary sortas="b-ecj">ecj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gappletviewer">
-        <term><command>gappletviewer</command></term>
-        <listitem>
-          <para>
-            loads and run a <application>Java</application> applet.
-          </para>
-          <indexterm zone="gcc-java gappletviewer">
-            <primary sortas="b-gappletviewer">gappletviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gc-analyze">
-        <term><command>gc-analyze</command></term>
-        <listitem>
-          <para>
-            analyzes garbage collector (GC) memory dumps from
-            <application>Java</application> code.
-          </para>
-          <indexterm zone="gcc-java gc-analyze">
-            <primary sortas="b-gc-analyze">gc-analyze</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcj">
-        <term><command>gcj</command></term>
-        <listitem>
-          <para>
-            is an ahead-of-time compiler for the <application>Java</application>
-            language.
-          </para>
-          <indexterm zone="gcc-java gcj">
-            <primary sortas="b-gcj">gcj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcj-dbtool">
-        <term><command>gcj-dbtool</command></term>
-        <listitem>
-          <para>
-            is a tool for creating and manipulating class file mapping databases.
-          </para>
-          <indexterm zone="gcc-java gcj-dbtool">
-            <primary sortas="b-gcj-dbtool">gcj-dbtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcjh">
-        <term><command>gcjh</command></term>
-        <listitem>
-          <para>
-            generates header files from <application>Java</application> class files.
-          </para>
-          <indexterm zone="gcc-java gcjh">
-            <primary sortas="b-gcjh">gcjh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gij">
-        <term><command>gij</command></term>
-        <listitem>
-          <para>
-            is the GNU interpreter for <application>Java</application> bytecode.
-          </para>
-          <indexterm zone="gcc-java gij">
-            <primary sortas="b-gij">gij</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gjar">
-        <term><command>gjar</command></term>
-        <listitem>
-          <para>
-            is an (partial) implementation of the <command>jar</command>
-            utility that comes with Sun's JDK.
-          </para>
-          <indexterm zone="gcc-java gjar">
-            <primary sortas="b-gjar">gjar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gjarsigner">
-        <term><command>gjarsigner</command></term>
-        <listitem>
-          <para>
-            is a Java ARchive (JAR) file signing and verification tool.
-          </para>
-          <indexterm zone="gcc-java gjarsigner">
-            <primary sortas="b-gjarsigner">gjarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gjavah">
-        <term><command>gjavah</command></term>
-        <listitem>
-          <para>
-            generates header files from Java class files.
-          </para>
-          <indexterm zone="gcc-java gjavah">
-            <primary sortas="b-gjavah">gjavah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gjdoc">
-        <term><command>gjdoc</command></term>
-        <listitem>
-          <para>
-            is a documentation tool similar to <command>javadoc</command>.
-          </para>
-          <indexterm zone="gcc-java gjdoc">
-            <primary sortas="b-gjdoc">gjdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gkeytool">
-        <term><command>gkeytool</command></term>
-        <listitem>
-          <para>
-            manages private keys and public certificates in a
-            <application>Java</application> environment.
-          </para>
-          <indexterm zone="gcc-java gkeytool">
-            <primary sortas="b-gkeytool">gkeytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnative2ascii">
-        <term><command>gnative2ascii</command></term>
-        <listitem>
-          <para>
-            is an encoding converter for <application>Java</application>.
-          </para>
-          <indexterm zone="gcc-java gnative2ascii">
-            <primary sortas="b-gnative2ascii">gnative2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gorbd">
-        <term><command>gorbd</command></term>
-        <listitem>
-          <para>
-            is an object request broker daemon.
-          </para>
-          <indexterm zone="gcc-java gorbd">
-            <primary sortas="b-gorbd">gorbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grmic-gcc">
-        <term><command>grmic</command></term>
-        <listitem>
-          <para>
-            generates stubs for Remote Method Invocation.
-          </para>
-          <indexterm zone="gcc-java grmic-gcc">
-            <primary sortas="b-grmic">grmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grmid-gcc">
-        <term><command>grmid</command></term>
-        <listitem>
-          <para>
-            RMI activation system daemon.
-          </para>
-          <indexterm zone="gcc-java grmid-gcc">
-            <primary sortas="b-grmid">grmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grmiregistry-gcc">
-        <term><command>grmiregistry</command></term>
-        <listitem>
-          <para>
-            starts a remote object registry on the current host.
-          </para>
-          <indexterm zone="gcc-java grmiregistry-gcc">
-            <primary sortas="b-grmiregistry">grmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gserialver">
-        <term><command>gserialver</command></term>
-        <listitem>
-          <para>
-            prints the serialVersionUID of the specified class.
-          </para>
-          <indexterm zone="gcc-java gserialver">
-            <primary sortas="b-gserialver">gserialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtnameserv">
-        <term><command>gtnameserv</command></term>
-        <listitem>
-          <para>
-            starts a naming service.
-          </para>
-          <indexterm zone="gcc-java gtnameserv">
-            <primary sortas="b-gtnameserv">gtnameserv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jcf-dump">
-        <term><command>jcf-dump</command></term>
-        <listitem>
-          <para>
-            prints information about <application>Java</application>
-            class files.
-          </para>
-          <indexterm zone="gcc-java jcf-dump">
-            <primary sortas="b-jcf-dump">jcf-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jv-convert">
-        <term><command>jv-convert</command></term>
-        <listitem>
-          <para>
-            converts files from one encoding to another.
-          </para>
-          <indexterm zone="gcc-java jv-convert">
-            <primary sortas="b-jv-convert">jv-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rebuild-gcj-db">
-        <term><command>rebuild-gcj-db</command></term>
-        <listitem>
-          <para>
-            Merge the per-solib databases made by
-            <application>aot-compile</application> into one system-wide
-            database.
-          </para>
-          <indexterm zone="gcc-java rebuild-gcj-db">
-            <primary sortas="b-rebuild-gcj-db">rebuild-gcj-db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gconf.xml
===================================================================
--- archive/gconf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +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 GConf-download-http "&gnome-download-http;/GConf/3.2/GConf-&GConf-version;.tar.xz">
-  <!ENTITY GConf-download-ftp  " ">
-  <!ENTITY GConf-md5sum        "2b16996d0e4b112856ee5c59130e822c">
-  <!ENTITY GConf-size          "1.5 MB">
-  <!ENTITY GConf-buildsize     "45 MB">
-  <!ENTITY GConf-time          "0.3 SBU">
-]>
-
-<sect1 id="GConf" xreflabel="GConf-&GConf-version;">
-  <?dbhtml filename="GConf.html"?>
-
-
-  <title>GConf-&GConf-version;</title>
-
-  <indexterm zone="GConf">
-    <primary sortas="a-GConf">GConf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GConf</title>
-
-    <para>
-      The <application>GConf</application> package contains a
-      configuration database system used by many
-      <application>GNOME</application> applications.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&GConf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&GConf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &GConf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &GConf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &GConf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &GConf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GConf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-       <!--<xref linkend="gtk-doc"/> and -->
-      <xref linkend="openldap"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GConf</title>
-
-    <para>
-      Install <application>GConf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-orbit   \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -s gconf.xml.defaults /etc/gconf/gconf.xml.system</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-orbit</parameter>: This switch is required if
-      <application>ORBit2</application> is not installed.
-      <application>ORBit2</application> is a deprecated package.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-    <!-- gtk-doc support is broken due to obsolete command "gtkdoc-mktmpl"
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gconf-merge-tree, gconftool-2, gsettings-data-convert and
-          gsettings-schema-convert
-        </seg>
-        <seg>
-          libgconf-2.so and libgsettingsgconfbackend.so (GIO Module installed
-          in <filename class="directory">/usr/lib/gio/modules</filename>)
-        </seg>
-        <seg>
-          /etc/gconf,
-          /usr/include/gconf,
-          /usr/lib/GConf,
-          /usr/share/gtk-doc/html/gconf and
-          /usr/share/sgml/gconf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gconf-merge-tree">
-        <term><command>gconf-merge-tree</command></term>
-        <listitem>
-          <para>
-            merges an XML filesystem hierarchy
-          </para>
-          <indexterm zone="GConf gconf-merge-tree">
-            <primary sortas="b-gconf-merge-tree">gconf-merge-tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gconftool-2">
-        <term><command>gconftool-2</command></term>
-        <listitem>
-          <para>
-            is a command line tool used for manipulating the
-            <application>GConf</application> database
-          </para>
-          <indexterm zone="GConf gconftool-2">
-            <primary sortas="b-gconftool-2">gconftool-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsettings-data-convert">
-        <term><command>gsettings-data-convert</command></term>
-        <listitem>
-          <para>
-            reads values out of the users <application>GConf</application>
-            database and stores them in GSettings
-          </para>
-          <indexterm zone="GConf gsettings-data-convert">
-            <primary sortas="b-gsettings-data-convert">gsettings-data-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsettings-schemas-convert">
-        <term><command>gsettings-schemas-convert</command></term>
-        <listitem>
-          <para>
-            converts between <application>GConf</application> and GSettings
-            schema file formats
-          </para>
-          <indexterm zone="GConf gsettings-schemas-convert">
-            <primary sortas="b-gsettings-schemas-convert">gsettings-schemas-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgconf-2">
-        <term><filename class="libraryfile">libgconf-2.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions necessary to maintain the
-            configuration database
-          </para>
-          <indexterm zone="GConf libgconf-2">
-            <primary sortas="c-libgconf-2">libgconf-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gdk-pixbuf-xlib.xml
===================================================================
--- archive/gdk-pixbuf-xlib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +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 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-buildsize     "1.5 MB">
-  <!ENTITY gdk-pixbuf-xlib-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gdk-pixbuf-xlib" xreflabel="gdk-pixbuf-xlib-&gdk-pixbuf-xlib-version;">
-  <?dbhtml filename="gdk-pixbuf-xlib.html"?>
-
-
-  <title>gdk-pixbuf-xlib-&gdk-pixbuf-xlib-version;</title>
-
-  <indexterm zone="gdk-pixbuf-xlib">
-    <primary sortas="a-gdk-pixbuf-xlib">gdk-pixbuf-xlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gdk-pixbuf-xlib</title>
-
-    <para>
-      The <application>gdk-pixbuf-xlib</application> package provides
-      a deprecated Xlib interface to gdk-pixbuf, which is needed for some
-      applications which have not been ported to use the new interfaces yet.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdk-pixbuf-xlib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdk-pixbuf-xlib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdk-pixbuf-xlib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdk-pixbuf-xlib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdk-pixbuf-xlib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdk-pixbuf-xlib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gdk-pixbuf-xlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gdk-pixbuf-xlib</title>
-
-    <para>
-      Install <application>gdk-pixbuf-xlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr .. &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>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this option if
-      <xref linkend="gtk-doc" role="nodep"/> is installed and you wish to
-      rebuild and install the API documentation.
-    </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>
-          libgdk_pixbuf_xlib-2.0.so
-        </seg>
-        <seg>
-          /usr/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdk_pixbuf_xlib-2.0">
-        <term><filename class="libraryfile">libgdk_pixbuf_xlib-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a Xlib interface to gdk-pixbuf
-          </para>
-          <indexterm zone="gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0">
-            <primary sortas="c-libgdk_pixbuf_xlib-2.0">libgdk_pixbuf_xlib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/gdl.xml
===================================================================
--- archive/gdl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 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-time          "0.1 SBU">
-]>
-
-<sect1 id="gdl" xreflabel="GDL-&gdl-version;">
-  <?dbhtml filename="gdl.html"?>
-
-
-  <title>GDL-&gdl-version;</title>
-
-  <indexterm zone="gdl">
-    <primary sortas="a-GDL">GDL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GDL</title>
-
-    <para>
-      The GDL package provides a library that is useful for docking objects in
-      GTK+ applications.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GDL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gdl"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GDL</title>
-
-    <para>
-      Install <application>GDL</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgdl-3.so
-        </seg>
-        <seg>
-          /usr/include/libgdl-3.0 and
-          /usr/share/gtk-doc/html/gdl-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdl-3">
-        <term><filename class="libraryfile">libgdl-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow for docking objects in GTK+ applications
-          </para>
-          <indexterm zone="gdl libgdl-3">
-            <primary sortas="c-libgdl-3">libgdl-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/geoclue.xml
===================================================================
--- archive/geoclue.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +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 geoclue-download-http
-  "https://launchpad.net/geoclue/trunk/0.12/+download/geoclue-0.12.0.tar.gz">
-  <!ENTITY geoclue-download-ftp  " ">
-  <!ENTITY geoclue-md5sum        "33af8307f332e0065af056ecba65fec2">
-  <!ENTITY geoclue-size          "556 KB">
-  <!ENTITY geoclue-buildsize     "11 MB">
-  <!ENTITY geoclue-time          "0.1 SBU">
-]>
-
-<sect1 id="geoclue" xreflabel="GeoClue-&geoclue-version;">
-  <?dbhtml filename="geoclue.html"?>
-
-
-  <title>GeoClue-&geoclue-version;</title>
-
-  <indexterm zone="geoclue">
-    <primary sortas="a-geoclue">GeoClue</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GeoClue</title>
-
-    <para>
-      <application>GeoClue</application> is a modular geoinformation service
-      built on top of the <application>D-Bus</application> messaging system. The
-      goal of the <application>GeoClue</application> project is to make creating
-      location-aware applications as simple as possible.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&geoclue-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&geoclue-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &geoclue-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &geoclue-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &geoclue-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &geoclue-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch (if GPSD is installed):
-          <ulink url="&patch-root;/geoclue-&geoclue-version;-gpsd_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GeoClue Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="GConf"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended if you are building GNOME</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/> and
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://savannah.nongnu.org/projects/gpsd">GPSD</ulink>,
-      <xref linkend="gtk2"/> and
-      <ulink url="https://01.org/ofono">oFono</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/geoclue"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GeoClue</title>
-
-    <para>
-      Install <application>GeoClue</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../geoclue-&geoclue-version;-gpsd_fix-1.patch &amp;&amp;
-
-sed -i "s@ -Werror@@" configure &amp;&amp;
-sed -i "s@libnm_glib@libnm-glib@g" configure &amp;&amp;
-
-sed -i "s@geoclue/libgeoclue.la@&amp; -lgthread-2.0@g" \
-       providers/skyhook/Makefile.in &amp;&amp;
-
-./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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "s@ -Werror@@" configure</command>: This
-      <command>sed</command> removes <parameter>-Werror</parameter> from the
-      <envar>CFLAGS</envar> variable, otherwise the build will fail with
-      <application>gcc-4.7</application>.
-    </para>
-
-    <para>
-      <command>sed -i "s@libnm_glib@libnm-glib@g" configure</command>:
-      This <command>sed</command> fixes detection of
-      <application>NetworkManager</application> libraries.
-    </para>
-
-    <para>
-      <command>sed -i "s@geoclue/libgeoclue.la@&amp; -lgthread-2.0@g" ..
-      </command>: This <command>sed</command> fixes building
-      <application>GeoClue</application> with recent
-      <application>binutils</application>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgeoclue.so
-        </seg>
-        <seg>
-          /usr/include/geoclue, /usr/share/geoclue-providers,
-          and /usr/share/gtk-doc/html/geoclue
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgeoclue">
-        <term><filename class="libraryfile">libgeoclue.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide the
-            <application>GeoClue</application> geoinformation application
-            programming interface.
-          </para>
-          <indexterm zone="geoclue libgeoclue">
-            <primary sortas="c-libgeoclue">libgeoclue.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/ggz-client-libs.xml
===================================================================
--- archive/ggz-client-libs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY ggz-client-libs-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
-  <!ENTITY ggz-client-libs-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
-  <!ENTITY ggz-client-libs-md5sum        "299eaa93721b1d867b5bf7dc6ac764b0">
-  <!ENTITY ggz-client-libs-size          "600 KB">
-  <!ENTITY ggz-client-libs-buildsize     "8 MB">
-  <!ENTITY ggz-client-libs-time          "0.2 SBU">
-]>
-
-<sect1 id="ggz-client-libs" xreflabel="ggz-client-libs-&ggz-client-libs-version;">
-  <?dbhtml filename="ggz-client-libs.html"?>
-
-
-  <title>ggz-client-libs-&ggz-client-libs-version;</title>
-
-  <indexterm zone="ggz-client-libs">
-    <primary sortas="a-ggz-client-libs">ggz-client-libs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ggz-client-libs</title>
-
-    <para>The <application>ggz-client-libs</application> package provides the
-    common procedures and utilities required to run the GGZ client and games.
-    The routines are shared by other modules in order to ease coding and promote
-    compatibility and stability.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ggz-client-libs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ggz-client-libs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ggz-client-libs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ggz-client-libs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ggz-client-libs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ggz-client-libs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ggz-client-libs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="expat"/> and
-    <xref linkend="libggz"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ggz-client-libs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ggz-client-libs</title>
-
-    <para>Install <application>ggz-client-libs</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ggz, ggz-config, ggz-wrapper, and ggzwrap</seg>
-        <seg>libggzcore.{so,a} and libggzmod.{so,a}</seg>
-        <seg>/usr/lib/ggz</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ggz">
-        <term><command>ggz</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone core client selector.</para>
-          <indexterm zone="ggz-client-libs ggz">
-            <primary sortas="b-ggz">ggz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggz-config">
-        <term><command>ggz-config</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone configuration manager.</para>
-          <indexterm zone="ggz-client-libs ggz-config">
-            <primary sortas="b-ggz-config">ggz-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggz-wrapper">
-        <term><command>ggz-wrapper</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone command line core client.</para>
-          <indexterm zone="ggz-client-libs ggz-wrapper">
-            <primary sortas="b-ggz-wrapper">ggz-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggzwrap">
-        <term><command>ggzwrap</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone game client wrapper.</para>
-          <indexterm zone="ggz-client-libs ggzwrap">
-            <primary sortas="b-ggzwrap">ggzwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libggzcore">
-        <term><filename class='libraryfile'>libggzcore.{so,a}</filename></term>
-        <listitem>
-          <para>handles the connection of a client application to the GGZ
-          server.</para>
-          <indexterm zone="ggz-client-libs libggzcore">
-            <primary sortas="c-libggzcore">libggzcore.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libggzmod">
-        <term><filename class='libraryfile'>libggzmod.{so,a}</filename></term>
-        <listitem>
-          <para>facilitates the messaging from and to a GGZ core client in a
-          game client.</para>
-          <indexterm zone="ggz-client-libs libggzmod">
-            <primary sortas="c-libggzmod">libggzmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gimp-print.xml
===================================================================
--- archive/gimp-print.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +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 gimp-print-download-http "&sourceforge-repo;/gimp-print/gimp-print-&gimp-print-version;.tar.gz">
-  <!ENTITY gimp-print-download-ftp  " ">
-  <!ENTITY gimp-print-md5sum        "766be49f44a6a682d857e5aefec414d4">
-  <!ENTITY gimp-print-size          "5.1 MB">
-  <!ENTITY gimp-print-buildsize     "36 MB">
-  <!ENTITY gimp-print-time          "0.32 SBU (additional 4.37 SBUs to run the test suite)">
-]>
-
-<sect1 id="gimp-print" xreflabel="Gimp-Print-&gimp-print-version;">
-  <?dbhtml filename="gimp-print.html"?>
-
-
-  <title>Gimp-Print-&gimp-print-version;</title>
-
-  <indexterm zone="gimp-print">
-    <primary sortas="a-Gimp-Print">Gimp-Print</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gimp-Print</title>
-
-    <para>The <application>Gimp-Print</application> package contains
-    high quality drivers for Canon, Epson, Lexmark and PCL
-    printers for use with <xref linkend="gs"/>, <xref linkend="cups"/>,
-    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-    <xref linkend="LPRng"/>, <command>lpr</command> and the
-    <application>GIMP-1.2</application>. See a list of supported printers at
-    <ulink url="http://gimp-print.sourceforge.net/p_Supported_Printers.php3"/>.
-    </para>
-
-<!-- FIXME: APFL Ghostscript is not tested. Don't forget to check the license. -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gimp-print-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gimp-print-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gimp-print-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gimp-print-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gimp-print-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gimp-print-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gimp-Print Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="cups"/>,
-    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-    <ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink>,
-    <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
-    <xref linkend="docbook-utils"/> and
-    <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gimp-print"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gimp-Print</title>
-
-    <para>Install <application>Gimp-Print</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-testpattern --enable-test &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-testpattern</parameter>: This parameter causes the
-    test pattern generator program to be built.</para>
-
-    <para><parameter>--enable-test</parameter>: This parameter causes the
-    programs required by the test suite to be built.</para>
-
-    <para><option>--with-translated-ppds=no</option>: When this switch is
-    given, only US English PPD files for <application>CUPS</application>
-    will be built. Useful if the PPD files are not yet translated into your
-    native language and you want to save some space by not installing unneeded
-    translations.</para>
-
-    <para><option>--enable-cups-level3-ps</option>: This option causes
-    the build process to generate PostScript level 3 PPD files
-    instead of level 2 ones.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gimp-Print</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>For <application>CUPS</application> to see newly installed PPD
-      files, it has to be restarted (as the <systemitem
-      class="username">root</systemitem> user):</para>
-
-<screen role="root"><userinput>/etc/rc.d/init.d/cups restart</userinput></screen>
-
-      <note>
-        <para>This command may take a very long time (up to 10 minutes)
-        to complete. Don't panic while <application>CUPS</application>
-        is rescanning the list of PPD files. The long delay will happen
-        only once.</para>
-      </note>
-
-      <para>Then point your web browser to <ulink url="http://localhost:631/"/>
-      to add a new printer to <application>CUPS</application>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cups-calibrate, escputil, gimpprint-config, ijsgimpprint, and
-        testpattern</seg>
-        <seg>libgimpprint.{so,a} and optionally, various
-        <application>CUPS</application> filters and backend
-        drivers</seg>
-        <seg>/usr/include/gimp-print, /usr/lib/gimp, /usr/share/cups/model/C,
-        and /usr/share/gimp-print</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cups-calibrate">
-        <term><command>cups-calibrate</command></term>
-        <listitem>
-          <para>calibrates the color output of printers using the
-          <application>Gimp-Print</application>,
-          <application>CUPS</application> or
-          <application>ESP Print Pro</application> drivers.</para>
-          <indexterm zone="gimp-print cups-calibrate">
-            <primary sortas="b-cups-calibrate">cups-calibrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escputil">
-        <term><command>escputil</command></term>
-        <listitem>
-          <para>is a command line utility to perform various maintenance
-          tasks on Epson Stylus inkjet printers.</para>
-          <indexterm zone="gimp-print escputil">
-            <primary sortas="b-escputil">escputil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimpprint-config">
-        <term><command>gimpprint-config</command></term>
-        <listitem>
-          <para>is a script to get information about the installed version
-          of <application>Gimp-Print</application>.</para>
-          <indexterm zone="gimp-print gimpprint-config">
-            <primary sortas="b-gimpprint-config">gimpprint-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ijsgimpprint">
-        <term><command>ijsgimpprint</command></term>
-        <listitem>
-          <para>is a Ghostscript driver for
-          <application>Gimp-Print</application>.</para>
-          <indexterm zone="gimp-print ijsgimpprint">
-            <primary sortas="b-ijsgimpprint">ijsgimpprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gmime.xml
===================================================================
--- archive/gmime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 gmime-download-http "&gnome-download-http;/gmime/2.6/gmime-&gmime-version;.tar.xz">
-  <!ENTITY gmime-download-ftp  "&gnome-download-ftp;/gmime/2.6/gmime-&gmime-version;.tar.xz">
-  <!ENTITY gmime-md5sum        "247072236d84bd0fbbff299d69bdf333">
-  <!ENTITY gmime-size          "5.0 MB">
-  <!ENTITY gmime-buildsize     "28 MB (with tests)">
-  <!ENTITY gmime-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="gmime" xreflabel="GMime-&gmime-version;">
-  <?dbhtml filename="gmime.html"?>
-
-
-  <title>GMime-&gmime-version;</title>
-
-  <indexterm zone="gmime">
-    <primary sortas="a-GMime-2">GMime 2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GMime</title>
-
-    <para>
-      The <application>GMime</application> package contains a set of
-      utilities for parsing and creating messages using the Multipurpose
-      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
-      <ulink url="http://spruce.sourceforge.net/gmime/">GMime web site</ulink>
-      for the RFCs resourced. This is useful as it provides an API which adheres
-      to the MIME specification as closely as possible while also providing
-      programmers with an extremely easy to use interface to the API functions.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gmime-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gmime-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gmime-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gmime-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gmime-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gmime-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
-      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gmime"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMime</title>
-
-    <para>
-      Install <application>GMime</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-smime</option>: Use this switch if you have
-      installed <xref linkend="gpgme"/> and wish to enable
-      S/MIME support in <application>GMime</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgmime-2.6.so
-        </seg>
-        <seg>
-          /usr/include/gmime-2.6 and
-          /usr/share/gtk-doc/html/gmime-2.6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmime-2">
-        <term><filename class="libraryfile">libgmime-2.6.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used by programs that need to comply to
-            the MIME standards.
-          </para>
-          <indexterm zone="gmime libgmime-2">
-            <primary sortas="c-libgmime-2">libgmime-2.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnash.xml
===================================================================
--- archive/gnash.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,252 +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 gnash-download-http
-    "http://ftp.gnu.org/pub/gnu/gnash/&gnash-version;/gnash-&gnash-version;.tar.bz2">
-  <!ENTITY gnash-download-ftp
-    "ftp://ftp.gnu.org/pub/gnu/gnash/&gnash-version;/gnash-&gnash-version;.tar.bz2">
-  <!ENTITY gnash-md5sum        "63e9f79c41d93d48c5a2fa94856548c4">
-  <!ENTITY gnash-size          "4.1 MB">
-  <!ENTITY gnash-buildsize     "758 MB">
-  <!ENTITY gnash-time          "11.1 SBU">
-]>
-
-<sect1 id="gnash" xreflabel="gnash-&gnash-version;">
-  <?dbhtml filename="gnash.html"?>
-
-
-  <title>gnash-&gnash-version;</title>
-
-  <indexterm zone="gnash">
-    <primary sortas="a-gnash">gnash</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnash</title>
-
-    <para>
-      <application>Gnash</application> is the GNU Flash movie player and browser
-      plugin. This is useful for watching YouTube videos or simple flash
-      animations.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnash-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnash-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnash-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnash-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnash-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnash-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnash-&gnash-version;-CVE-2012-1175-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnash Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="agg"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="curl"/>,
-      <!-- <xref linkend="ffmpeg"/> or -->
-      <xref linkend="gst-ffmpeg"/>,
-      <xref linkend="npapi-sdk"/>, and
-      <xref linkend="giflib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dejagnu"/>,
-      <xref linkend="GConf"/>,
-      <xref linkend="git"/>,
-      <xref linkend="kdelibs"/>,
-      <xref linkend="libogg"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="qt4"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="wget"/>,
-      <ulink url="http://www.swftools.org/">SWFTools</ulink>,
-      <ulink url="http://swfmill.org/">Swfmill </ulink>,
-      <ulink url="http://www.mtasc.org/">Mtasc</ulink>,
-      <ulink url="http://netcat.sourceforge.net/">Netcat</ulink>,
-      <ulink url="http://csound.sourceforge.net/">Csound</ulink>,
-      <ulink url="https://launchpad.net/libgsm">LibGSM</ulink> and
-      <ulink url="http://sourceforge.net/projects/libdc1394/">Libdc1394</ulink>.
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnash"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnash</title>
-
-    <para>
-      Install <application>gnash</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gnash-&gnash-version;-CVE-2012-1175-1.patch &amp;&amp;
-sed -i '/^LIBS/s/\(.*\)/\1 -lboost_system/' \
-    gui/Makefile.in utilities/Makefile.in   &amp;&amp;
-sed -e '/DGifOpen/s:Data:&amp;, NULL:'          \
-    -e '/DGifCloseFile/s:_gif:&amp;, NULL:'     \
-    -i libbase/GnashImageGif.cpp            &amp;&amp;
-sed -i '/#include &lt;csignal&gt;/a\#include &lt;unistd.h&gt;' plugin/klash4/klash_part.cpp &amp;&amp;
-
-./configure --prefix=/usr --sysconfdir=/etc               \
-  --with-npapi-incl=/usr/include/npapi-sdk --enable-media=gst \
-  --with-npapi-plugindir=/usr/lib/mozilla/plugins         \
-  --without-gconf &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-plugin</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/^LIBS/s/\(.*\)/\1 -lboost_system/' ...</command>:
-      This fixes linking to the current <application>boost</application> libraries.
-    </para>
-
-    <para>
-      <command>sed -e '/DGifOpen/s:Data:&amp;, NULL:' ...</command>:
-      This sed fixes building with recent versions of
-      <application>Giflib</application>.
-    </para>
-
-    <para>
-      <command>sed -i '/#include &lt;csignal&gt;/a\#include &lt;unistd.h&gt;' ...</command>:
-      This fixes building when <application>kdelibs</application> has been installed.
-    </para>
-
-    <para>
-      <option>--enable-media=gst</option>: This tells it to use Gstreamer for
-      to play video and audio (--enable-media=ffmpeg is broken with
-      FFmpeg-0.11.1).
-    </para>
-
-    <para>
-      <option>--with-npapi-incl=/usr/include/npapi-sdk</option>: This option tells
-      it where to find some Mozilla headers that it needs.
-    </para>
-
-    <para>
-      <option>--with-npapi-plugindir=/usr/lib/mozilla/plugins</option>: This
-      option tells it to install the Mozilla browser plugin into
-      /usr/lib/mozilla/plugins.
-    </para>
-
-    <para>
-      <option>--without-gconf</option>: Omit this switch if you have GConf
-      installed and wish gnash to use it.
-    </para>
-
-    <para>
-      <command>make install-plugin</command>: This command installs the Mozilla
-      browser plugin.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnash-gtk-launcher</seg>
-        <seg>
-          2 private libraries in /usr/lib/gnash and
-          libgnashplugin.so.
-        </seg>
-        <seg>
-          /usr/lib/gnash and
-          /usr/share/gnash.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnash-gtk-launcher">
-        <term><command>gnash-gtk-launcher</command></term>
-        <listitem>
-          <para>
-            launches Gnash.
-          </para>
-          <indexterm zone="gnash gnash-gtk-launcher">
-            <primary sortas="b-gnash-gtk-launcher">gnash-gtk-launcher</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnashplugin">
-        <term><filename class="libraryfile">libgnashplugin.so</filename></term>
-        <listitem>
-          <para>
-            is the Mozilla browser plugin.
-          </para>
-          <indexterm zone="gnash libgnashplugin">
-            <primary sortas="c-libgnashplugin">libgnashplugin.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/gnet.xml
===================================================================
--- archive/gnet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +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 gnet-download-http "http://gnetlibrary.org/src/gnet-&gnet-version;.tar.gz">
-  <!ENTITY gnet-download-ftp  " ">
-  <!ENTITY gnet-md5sum        "3a7a40411775688fe4c42141ab007048">
-  <!ENTITY gnet-size          "595 KB">
-  <!ENTITY gnet-buildsize     "7.6 MB">
-  <!ENTITY gnet-time          "0.2 SBU">
-]>
-
-<sect1 id="gnet" xreflabel="GNet-&gnet-version;">
-  <?dbhtml filename="gnet.html"?>
-
-
-  <title>GNet-&gnet-version;</title>
-
-  <indexterm zone="gnet">
-    <primary sortas="a-GNet">GNet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNet</title>
-
-    <para>The <application>GNet</application> package contains a simple network
-    library. This is useful for supporting TCP sockets, UDP and IP multicast,
-    asynchronous DNS lookup, and more.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnet-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnet-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnet-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnet-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnet-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnet-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><!--<xref linkend="GLib"/> or--><xref linkend="glib2"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnet"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNet</title>
-
-    <para>Install <application>GNet</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgnet-2.0.{so,a}</seg>
-        <seg>/usr/include/gnet-2.0, /usr/lib/gnet-2.0 and
-        /usr/share/doc/libgnet2.0-dev or /usr/share/gtk-doc/html/gnet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnet">
-        <term><filename class='libraryfile'>libgnet-2.0.{so,a}</filename></term>
-        <listitem>
-          <para>is a simple network library written in C. It is
-          object-oriented and built upon <application>GLib</application>. It is
-          intended to be easy to use and port.</para>
-          <indexterm zone="gnet libgnet">
-            <primary sortas="c-libgnet-2.0">libgnet-2.0.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/at-spi.xml
===================================================================
--- archive/gnome-obsolete/at-spi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,219 +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 at-spi-download-http "&gnome-download-http;/at-spi/1.30/at-spi-&at-spi-version;.tar.bz2">
-  <!ENTITY at-spi-download-ftp  "&gnome-download-ftp;/at-spi/1.30/at-spi-&at-spi-version;.tar.bz2">
-  <!ENTITY at-spi-md5sum        "29fdf7934e98efda5fe0ab74ab4d3f29">
-  <!ENTITY at-spi-size          "817 KB">
-  <!ENTITY at-spi-buildsize     "23 MB">
-  <!ENTITY at-spi-time          "0.4 SBU">
-]>
-
-<sect1 id="at-spi" xreflabel="AT SPI-&at-spi-version;">
-  <?dbhtml filename="at-spi.html"?>
-
-
-  <title>AT SPI-&at-spi-version;</title>
-
-  <indexterm zone="at-spi">
-    <primary sortas="a-AT-SPI">AT SPI</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AT SPI</title>
-
-    <para>The <application>AT SPI</application> package contains the Assistive
-    Technology Service Provider Interface. This is useful for redirecting
-    UI events to accessible applications and adaptive/assistive
-    technologies.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&at-spi-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&at-spi-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &at-spi-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &at-spi-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &at-spi-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &at-spi-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AT SPI Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="libbonobo"/>,
-    <xref linkend="python2"/>, and
-    <xref linkend="xorg7-lib"/></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;/at-spi"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AT SPI</title>
-
-    <para>Install <application>AT SPI</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/at-spi &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a functional test suite. Review the
-    <filename>README</filename> file for additional information about testing
-    the package.</para>
-
-    <!-- The test suite cannot be run until after the package is installed.
-    To run the test suite after installation, issue:
-    <command>make check</command>.</para> -->
-
-    <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/at-spi</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/at-spi</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>at-spi-registryd</seg>
-        <seg>libatk-bridge.so, libcspi.so, libloginhelper.so, libspi.so,
-        Accessibility_LoginHelper_module.so, and Accessibility_module.so</seg>
-        <seg>/usr/lib/python&python2-majorver;/site-packages/pyatspi,
-        <envar>$GNOME_PREFIX</envar>/{include/at-spi-1.0/{cspi,libspi,
-        login-helper},lib/at-spi,share/{doc/at-spi-1.30.1/reference/html,
-        gtk-doc/html/at-spi-cspi,idl/at-spi-1.0}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="at-spi-registryd">
-        <term><command>at-spi-registryd</command></term>
-        <listitem>
-          <para>is the registry daemon that allows communication between
-          the UI and assistance devices.</para>
-          <indexterm zone="at-spi at-spi-registryd">
-            <primary sortas="b-at-spi-registryd">at-spi-registryd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatk-bridge">
-        <term><filename class='libraryfile'>libatk-bridge.so</filename></term>
-        <listitem>
-          <para>is a <application>GTK+</application> module.</para>
-          <indexterm zone="at-spi libatk-bridge">
-            <primary sortas="c-libatk-bridge">libatk-bridge.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--<varlistentry id="libcspi">
-        <term><filename class='libraryfile'>libcspi.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="at-spi libcspi">
-            <primary sortas="c-libcspi">libcspi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libloginhelper">
-        <term><filename class='libraryfile'>libloginhelper.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="at-spi libloginhelper">
-            <primary sortas="c-libloginhelper">libloginhelper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libspi">
-        <term><filename class='libraryfile'>libspi.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="at-spi libspi">
-            <primary sortas="c-libspi">libspi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="Accessibility_LoginHelper_module">
-        <term><filename class='libraryfile'>Accessibility_LoginHelper_module.so</filename></term>
-        <listitem>
-          <para>is an <application>ORBit2</application> module.</para>
-          <indexterm zone="at-spi Accessibility_LoginHelper_module">
-            <primary sortas="c-Accessibility_LoginHelper_module">Accessibility_LoginHelper_module.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Accessibility_module">
-        <term><filename class='libraryfile'>Accessibility_module.so</filename></term>
-        <listitem>
-          <para>is an <application>ORBit2</application> module.</para>
-          <indexterm zone="at-spi Accessibility_module">
-            <primary sortas="c-Accessibility_module">Accessibility_module.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/bug-buddy.xml
===================================================================
--- archive/gnome-obsolete/bug-buddy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY bug-buddy-download-http "&gnome-download-http;/bug-buddy/&gnome-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
-  <!ENTITY bug-buddy-download-ftp  "&gnome-download-ftp;/bug-buddy/&gnome-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
-  <!ENTITY bug-buddy-md5sum        "da34ace8a806cd1c901ae960184e2997">
-  <!ENTITY bug-buddy-size          "1.1 MB">
-  <!ENTITY bug-buddy-buildsize     "37 MB">
-  <!ENTITY bug-buddy-time          "0.4 SBU">
-]>
-
-<sect1 id="bug-buddy" xreflabel="bug-buddy-&bug-buddy-version;">
-  <?dbhtml filename="bug-buddy.html"?>
-
-
-  <title>bug-buddy-&bug-buddy-version;</title>
-
-  <indexterm zone="bug-buddy">
-    <primary sortas="a-Bug-buddy">Bug-buddy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to bug-buddy</title>
-
-    <para>The <application>bug-buddy</application> package contains a graphical
-    bug reporting tool. This can extract debugging information from a core file
-    or crashed application.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&bug-buddy-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&bug-buddy-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &bug-buddy-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &bug-buddy-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &bug-buddy-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &bug-buddy-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">bug-buddy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="evolution-data-server"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="libelf"/>, and
-    <xref linkend="libgtop"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/bug-buddy"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of bug-buddy</title>
-
-    <para>Install <application>bug-buddy</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <para><option>--disable-scrollkeeper</option>: This parameter disables
-    updates to the scrollkeeper database.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bug-buddy, minidump_dump, and minidump_stackwalk</seg>
-        <seg>libbreakpad.{so,a} and libgnomebreakpad.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/bug-buddy,share/bug-buddy}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bug-buddy-prog">
-        <term><command>bug-buddy</command></term>
-        <listitem>
-          <para>is a graphical bug reporting system.</para>
-          <indexterm zone="bug-buddy bug-buddy-prog">
-            <primary sortas="b-bug-buddy">bug-buddy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbreakpad">
-        <term><filename class='libraryfile'>libbreakpad.{so,a}</filename></term>
-        <listitem>
-          <para>contains the Google breakpad API functions.</para>
-          <indexterm zone="bug-buddy libbreakpad">
-            <primary sortas="c-libbreakpad">libbreakpad.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnomebreakpad">
-        <term><filename class='libraryfile'>libgnomebreakpad.so</filename></term>
-        <listitem>
-          <para>is a <application>GTK+</application> breakpad module.</para>
-          <indexterm zone="bug-buddy libgnomebreakpad">
-            <primary sortas="c-libgnomebreakpad">libgnomebreakpad.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/dasher.xml
===================================================================
--- archive/gnome-obsolete/dasher.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +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 dasher-download-http "&gnome-download-http;/dasher/4.11/dasher-&dasher-version;.tar.bz2">
-  <!ENTITY dasher-download-ftp  "&gnome-download-ftp;/dasher/4.11/dasher-&dasher-version;.tar.bz2">
-  <!ENTITY dasher-md5sum        "55695cacecb9fa9e3259e0f2ef82ae9e">
-  <!ENTITY dasher-size          "8.0 MB">
-  <!ENTITY dasher-buildsize     "120 MB">
-  <!ENTITY dasher-time          "1.0 SBU">
-]>
-
-<sect1 id="dasher" xreflabel="dasher-&dasher-version;">
-  <?dbhtml filename="dasher.html"?>
-
-
-  <title>dasher-&dasher-version;</title>
-
-  <indexterm zone="dasher">
-    <primary sortas="a-dasher">dasher</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dasher</title>
-
-    <para>The <application>dasher</application> package is a zooming predictive
-    text entry system, designed for situations where keyboard input is
-    impractical (for instance, accessibility or PDAs). It is usable with highly
-    limited amounts of physical input while still allowing high rates of text
-    entry.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&dasher-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&dasher-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &dasher-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &dasher-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &dasher-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &dasher-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">dasher Dependencies</bridgehead>
-
-   <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="glib2"/>,
-    <xref linkend="gtk2"/>, and
-    <xref linkend="intltool"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="at-spi"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="libbonobo"/>, and
-    <xref linkend="libgnomeui"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/dasher"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dasher</title>
-
-    <para>Install <application>dasher</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --enable-a11y=no \
-            --with-gnome=no &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--enable-a11y=no</parameter>: Do not build with support for
-    the GNOME accessibility framework. Remove it if
-    <application>libgnomeui</application> and <application>at-spi</application>
-    are installed.</para>
-
-    <para><parameter>--with-gnome=no</parameter>: Do not build with GNOME
-    support. Remove it if <application>libgnomeui</application> and
-    <application>gnome-doc-utils</application> are installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dasher</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{dasher,gnome/help/dasher/*,
-        omf/dasher}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dasher-prog">
-        <term><command>dasher</command></term>
-        <listitem>
-          <para>is a graphical predictive text entry system.</para>
-          <indexterm zone="dasher dasher-prog">
-            <primary sortas="b-dasher">dasher</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/deskbar-applet.xml
===================================================================
--- archive/gnome-obsolete/deskbar-applet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 deskbar-applet-download-http "&gnome-download-http;/deskbar-applet/&gnome-version;/deskbar-applet-&deskbar-applet-version;.tar.bz2">
-  <!ENTITY deskbar-applet-download-ftp  "&gnome-download-ftp;/deskbar-applet/&gnome-version;/deskbar-applet-&deskbar-applet-version;.tar.bz2">
-  <!ENTITY deskbar-applet-md5sum        "80ba002fb063a9f034cc82d7099932e5">
-  <!ENTITY deskbar-applet-size          "1.0 MB">
-  <!ENTITY deskbar-applet-buildsize     "23 MB">
-  <!ENTITY deskbar-applet-time          "0.3 SBU">
-]>
-
-<sect1 id="deskbar-applet" xreflabel="deskbar-applet-&deskbar-applet-version;">
-  <?dbhtml filename="deskbar-applet.html"?>
-
-
-  <title>deskbar-applet-&deskbar-applet-version;</title>
-
-  <indexterm zone="deskbar-applet">
-    <primary sortas="a-deskbar-applet">deskbar-applet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to deskbar-applet</title>
-
-    <para>The <application>deskbar-applet</application> package is a universal
-    search and navigation bar for <application>GNOME</application>.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&deskbar-applet-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&deskbar-applet-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &deskbar-applet-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &deskbar-applet-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &deskbar-applet-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &deskbar-applet-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">deskbar-applet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-python"/>,
-    <xref linkend="gnome-desktop"/>, and
-    <!-- FIXME:ken -->
-    Gnome-Python-Desktop-2.30.2</para>
-    <!--
-    <xref linkend="gnome-python-desktop"/></para>
-    -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="evolution-data-server"/> and
-    <xref linkend="rarian"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/deskbar-applet"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of deskbar-applet</title>
-
-    <para>Install <application>deskbar-applet</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib \
-            --disable-scrollkeeper &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/deskbar-applet</parameter>: This parameter is used so that
-    the <application>deskbar-applet</application> internal support programs are
-    installed in the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/deskbar-applet</filename> instead of
-    <filename
-    class='directory'>$GNOME_PREFIX/libexec/deskbar-applet</filename>.</para>
-
-    <para><parameter>--disable-scrollkeeper</parameter>: Do not make updates to
-    the <application>scrollkeeper</application> database. Remove it if you have
-    <application>rarian</application> installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>deskbar-applet</seg>
-        <seg>Python modules</seg>
-        <seg>/usr/lib/python&python2-majorver;/site-packages/deskbar/{core/{_userdirs,
-        keybinder,updater},handlers/{actions,evolution},interfaces,osutils,
-        ui/{cuemiac,iconentry,preferences}},
-        <envar>$GNOME_PREFIX</envar>/{lib/deskbar-applet/modules-2.20-compatible,
-        share/{deskbar-applet/art,gnome/help/deskbar/*,omf/deskbar}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="deskbar-applet-prog">
-        <term><command>deskbar-applet</command></term>
-        <listitem>
-          <para>is the universal search and navigation bar applet.</para>
-          <indexterm zone="deskbar-applet deskbar-applet-prog">
-            <primary sortas="b-deskbar-applet">deskbar-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/dummy-accessibility.xml
===================================================================
--- archive/gnome-obsolete/dummy-accessibility.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +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">
-
-
-  <title>Accessibility</title>
-  <para/>
-</sect1>
Index: chive/gnome-obsolete/eel.xml
===================================================================
--- archive/gnome-obsolete/eel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +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 eel-download-http "&gnome-download-http;/eel/2.18/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-download-ftp  "&gnome-download-ftp;/eel/2.18/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-md5sum        "c51fea61eb99eaa7995754b8acf787ff">
-  <!ENTITY eel-size          "643 KB">
-  <!ENTITY eel-buildsize     "14 MB">
-  <!ENTITY eel-time          "0.5 SBU">
-]>
-
-<sect1 id="eel" xreflabel="EEL-&eel-version;">
-  <?dbhtml filename="eel.html"?>
-
-
-  <title>EEL-&eel-version;</title>
-
-  <indexterm zone="eel">
-    <primary sortas="a-EEL">EEL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to EEL</title>
-
-    <para>The <application>EEL</application> package contains the Eazel
-    Extensions Library.  This is a collection of widgets and extensions
-    to the <application>GNOME</application> platform.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&eel-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&eel-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &eel-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &eel-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &eel-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &eel-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">EEL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/>,
-    <xref linkend="gnome-menus"/>, and
-    <xref linkend="gail"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/eel"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of EEL</title>
-
-    <para>Install <application>EEL</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libeel-2.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/include/eel-2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libeel-2">
-        <term><filename class='libraryfile'>libeel-2.{so,a}</filename></term>
-        <listitem>
-          <para>is a collection of widgets developed by the
-          <application>Nautilus</application> project.</para>
-          <indexterm zone="eel libeel-2">
-            <primary sortas="c-libeel-2">libeel-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gail.xml
===================================================================
--- archive/gnome-obsolete/gail.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,160 +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 gail-download-http "&gnome-download-http;/gail/1.22/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-download-ftp  "&gnome-download-ftp;/gail/1.22/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-md5sum        "d58ad8cc79d3cb6778bc015ef69fb499">
-  <!ENTITY gail-size          "659 KB">
-  <!ENTITY gail-buildsize     "26 MB">
-  <!ENTITY gail-time          "0.5 SBU">
-]>
-
-<sect1 id="gail" xreflabel="GAIL-&gail-version;">
-  <?dbhtml filename="gail.html"?>
-
-
-  <title>GAIL-&gail-version;</title>
-
-  <indexterm zone="gail">
-    <primary sortas="a-GAIL">GAIL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GAIL</title>
-
-    <para>The <application>GAIL</application> package provides accessibility
-    support for <application>GTK+</application> and
-    <application>libgnomecanvas</application> by implementing AtkObjects for
-    widgets in <application>GTK+</application> and
-    <application>libgnomecanvas</application>. The
-    <application>GAIL</application> library is a
-    <application>GTK+</application> module. This module is normally used with
-    the atk-bridge <application>GTK+</application> module from
-    <application>AT-SPI</application> to allow an assistive technology, e.g., a
-    screenreader, to query or drive the program.</para>
-
-    <para>&lfssvn_built;20100803&lfssvn_built2;</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gail-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gail-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gail-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gail-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gail-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gail-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GAIL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/></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;/gail"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GAIL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>GAIL</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &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;
-
-if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
-    ln -v -s $(pkg-config --variable=prefix \
-             ORBit-2.0)/lib/gtk-2.0/modules \
-         /usr/lib/gtk-2.0
-fi</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para><command>if [ ... != "/usr" ]; then ...; fi</command>:
-    <application>GTK+</application> will look for the
-    <application>GAIL</application> modules in
-    <filename class='directory'>/usr/lib</filename> even if
-    <envar>$GNOME_PREFIX</envar> is NOT
-    <filename class='directory'>/usr</filename>. This command creates a
-    symbolic link to satisfy this requirement.</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>libgailutil.so and <application>GAIL</application>
-        <application>GTK+</application> modules</seg>
-        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
-        include/gail-1.0,
-        lib/gtk-2.0/modules and
-        share/gtk-doc/html/gail-libgail-util</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgailutil">
-        <term><filename class='libraryfile'>libgailutil.so</filename></term>
-        <listitem>
-          <para>provides the functions that solve accessibility problems
-          in a consistent manner across <application>GNOME</application>.</para>
-          <indexterm zone="gail libgailutil">
-            <primary sortas="c-libgailutil">libgailutil.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gal.xml
===================================================================
--- archive/gnome-obsolete/gal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,114 +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 gal-download-http "http://ftp.gnome.org/pub/gnome/sources/gal/2.4/gal-&gal-version;.tar.bz2">
-  <!ENTITY gal-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gal/2.4/gal-&gal-version;.tar.bz2">
-  <!ENTITY gal-md5sum "70e07fde659f0553ba56caeae4f51908">
-  <!ENTITY gal-size "1.2 MB">
-  <!ENTITY gal-buildsize "63 MB">
-  <!ENTITY gal-time "1.5 SBU">
-]>
-
-<sect1 id="gal" xreflabel="GAL-&gal-version;">
-  <?dbhtml filename="gal.html"?>
-
-
-  <title>GAL-&gal-version;</title>
-
-  <indexterm zone="gal">
-    <primary sortas="a-GAL">GAL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GAL</title>
-
-    <para>The <application>GAL</application> package contains library functions
-    that came from <application>Evolution</application> and
-    <application>Gnumeric</application>. <application>GAL</application> is short
-    for <application>GNOME</application> Application Libs.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gal-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gal-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gal-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gal-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gal-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gal-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GAL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/> and
-    <xref linkend="libgnomeprintui"/></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;/gal"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GAL</title>
-
-    <para>In order to build the documentation using
-    <application>GTK-Doc</application>, issue the following commands to fix a
-    build problem:</para>
-
-<screen><userinput>mv docs/gal-decl.txt docs/gal-2.4-decl.txt &amp;&amp;
-mv docs/gal-sections.txt docs/gal-2.4-sections.txt &amp;&amp;
-sed -i -e "s/gal-decl/gal-2.4-decl/" \
-       -e "s/gal-sections/gal-2.4-sections/" docs/Makefile.in</userinput></screen>
-
-    <para>Install <application>GAL</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgal-a11y-2.4.{so,a} and libgal-2.4.{so,a}</seg>
-        <seg>$GNOME_PREFIX/include/gal-2.4,
-        $GNOME_PREFIX/share/gtk-doc/html/gal-2.4, and
-        $GNOME_PREFIX/share/gal-2.4</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gconf-editor.xml
===================================================================
--- archive/gnome-obsolete/gconf-editor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +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 gconf-editor-download-http "&gnome-download-http;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
-  <!ENTITY gconf-editor-download-ftp  "&gnome-download-ftp;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
-  <!ENTITY gconf-editor-md5sum        "2a941e3c64843be69190f38891470580">
-  <!ENTITY gconf-editor-size          "1.3 MB">
-  <!ENTITY gconf-editor-buildsize     "13 MB">
-  <!ENTITY gconf-editor-time          "0.2 SBU">
-]>
-
-<sect1 id="gconf-editor" xreflabel="GConf Editor-&gconf-editor-version;">
-  <?dbhtml filename="gconf-editor.html"?>
-
-
-  <title>GConf Editor-&gconf-editor-version;</title>
-
-  <indexterm zone="gconf-editor">
-    <primary sortas="a-GConf-Editor">GConf Editor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GConf Editor</title>
-
-    <para>The <application>GConf Editor</application> package contains a
-    GUI editor for the <application>GConf</application> configuration
-    database.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gconf-editor-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gconf-editor-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gconf-editor-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gconf-editor-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gconf-editor-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gconf-editor-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GConf Editor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk2"/>, and
-    <xref linkend="which"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gconf-editor"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GConf Editor</title>
-
-    <para>Install <application>GConf Editor</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gconf-editor</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gconf-editor/icons/hicolor/16x16/status,
-        gnome/help/gconf-editor/*,omf/gconf-editor}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gconf-editor-prog">
-        <term><command>gconf-editor</command></term>
-        <listitem>
-          <para>allows direct modification of the
-          <application>GConf</application> configuration database.</para>
-          <indexterm zone="gconf-editor gconf-editor-prog">
-            <primary sortas="b-gconf-editor">gconf-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/ggv.xml
===================================================================
--- archive/gnome-obsolete/ggv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +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 ggv-download-http "http://ftp.gnome.org/pub/GNOME/sources/ggv/&gnome-version;/ggv-&ggv-version;.tar.bz2">
-  <!ENTITY ggv-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/ggv/&gnome-version;/ggv-&ggv-version;.tar.bz2">
-  <!ENTITY ggv-md5sum        "418f0ef3f8b82bb0c423a2a1cf6769f7">
-  <!ENTITY ggv-size          "1.0 MB">
-  <!ENTITY ggv-buildsize     "17.8 MB">
-  <!ENTITY ggv-time          "0.3 SBU">
-]>
-
-<sect1 id="ggv" xreflabel="GGV-&ggv-version;">
-  <?dbhtml filename="ggv.html"?>
-
-
-  <title>GGV-&ggv-version;</title>
-
-  <indexterm zone="ggv">
-    <primary sortas="a-GGV">GGV</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GGV</title>
-
-    <para>The <application>GGV</application> package contains a PostScript
-    file viewer.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ggv-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ggv-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ggv-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ggv-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ggv-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ggv-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GGV Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/>, and
-    <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="cups"/> or <xref linkend="LPRng"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ggv"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GGV</title>
-
-    <para>Install <application>GGV</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ggv and ggv-postscript-viewer</seg>
-        <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/ggv,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/ggv,
-        $GNOME_PREFIX/share/gnome/help/ggv,
-        $GNOME_PREFIX/share/omf/ggv, and
-        $GNOME_PREFIX/share/pixmaps/ggv</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ggv-prog">
-        <term><command>ggv</command></term>
-        <listitem>
-          <para>is a <application>GNOME</application> 2 based PostScript
-          viewer.</para>
-          <indexterm zone="ggv ggv-prog">
-            <primary sortas="b-ggv">ggv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-audio.xml
===================================================================
--- archive/gnome-obsolete/gnome-audio.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,103 +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 gnome-audio-download-http "&gnome-download-http;/gnome-audio/2.0/gnome-audio-&gnome-audio-version;.tar.bz2">
-  <!ENTITY gnome-audio-download-ftp  "&gnome-download-ftp;/gnome-audio/2.0/gnome-audio-&gnome-audio-version;.tar.bz2">
-  <!ENTITY gnome-audio-md5sum        "cd14b84af59fb2ec673527d32f4e379f">
-  <!ENTITY gnome-audio-size          "1.4 MB">
-  <!ENTITY gnome-audio-buildsize     "4.2 MB">
-  <!ENTITY gnome-audio-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-audio" xreflabel="gnome-audio-&gnome-audio-version;">
-  <?dbhtml filename="gnome-audio.html"?>
-
-
-  <title>gnome-audio-&gnome-audio-version;</title>
-
-  <indexterm zone="gnome-audio">
-    <primary sortas="a-Gnome-audio">Gnome-audio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-audio</title>
-
-    <para>The <application>gnome-audio</application> package contains a set
-    of default sounds for the <application>GNOME</application> GUI desktop.
-    Sound files for startup, shutdown and many GTK+ events are included.
-    These sounds complement the <application>GNOME Media</application>
-    package.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-audio-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-audio-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-audio-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-audio-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-audio-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-audio-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-audio"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-audio</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>gnome-audio</application> by running the
-    following command as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make prefix=$(pkg-config --variable=prefix ORBit-2.0) install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>prefix=$(pkg-config --variable=prefix
-    ORBit-2.0)</parameter>: Setting the prefix using this parameter instead of
-    with <envar>$GNOME_PREFIX</envar> will ensure that the prefix is consistent
-    with the installation environment and the package will be installed in the
-    correct location.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/sounds</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-hicolor-icon-theme.xml
===================================================================
--- archive/gnome-obsolete/gnome-hicolor-icon-theme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +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="GNOME-hicolor-icon-theme">
-  <?dbhtml filename="gnome-hicolor-icon-theme.html"?>
-
-
-  <title>hicolor-icon-theme-&hicolor-icon-theme-version;</title>
-
-  <para>The <xref linkend="hicolor-icon-theme"/> package is located in
-  Chapter 26 &mdash; X Libraries and is recommended in a GNOME-2 installation.
-  This package is not a direct dependency of any GNOME-2 package, therefore
-  it is mentioned within the GNOME-2 Core Packages chapter to ensure it is
-  installed.</para>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-keyring-manager.xml
===================================================================
--- archive/gnome-obsolete/gnome-keyring-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +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 gnome-keyring-manager-download-http "&gnome-download-http;/gnome-keyring-manager/2.18/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
-  <!ENTITY gnome-keyring-manager-download-ftp  "&gnome-download-ftp;/gnome-keyring-manager/2.18/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
-  <!ENTITY gnome-keyring-manager-md5sum        "05183cdea9d933cb1e9a8f4202c6ffc0">
-  <!ENTITY gnome-keyring-manager-size          "455 KB">
-  <!ENTITY gnome-keyring-manager-buildsize     "8 MB">
-  <!ENTITY gnome-keyring-manager-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-keyring-manager"
-       xreflabel="GNOME Keyring Manager-&gnome-keyring-manager-version;">
-  <?dbhtml filename="gnome-keyring-manager.html"?>
-
-
-  <title>GNOME Keyring Manager-&gnome-keyring-manager-version;</title>
-
-  <indexterm zone="gnome-keyring-manager">
-    <primary sortas="a-GNOME-Keyring-Manager">GNOME Keyring Manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Keyring Manager</title>
-
-    <para>The <application>GNOME Keyring Manager</application> package contains
-    a keyring management program for the GNOME Desktop. This is useful for
-    maintenance of a keyring database using a graphical user interface.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-keyring-manager-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-keyring-manager-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-keyring-manager-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-keyring-manager-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-keyring-manager-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-keyring-manager-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Keyring Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/> and
-    <xref linkend="gnome-doc-utils"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-keyring-manager"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Keyring Manager</title>
-
-    <para>Install <application>GNOME Keyring Manager</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-keyring-manager</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/
-        ,omf/}gnome-keyring-manager</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-keyring-manager-prog">
-        <term><command>gnome-keyring-manager</command></term>
-        <listitem>
-          <para>is a graphical key management tool for GNOME. It allows the
-          user to create, delete, and otherwise manipulate keys and keyrings
-          which can be used to store passwords.</para>
-          <indexterm zone="gnome-keyring-manager gnome-keyring-manager-prog">
-            <primary sortas="b-gnome-keyring-manager-prog">gnome-keyring-manager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-mag.xml
===================================================================
--- archive/gnome-obsolete/gnome-mag.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY gnome-mag-download-http "&gnome-download-http;/gnome-mag/0.16/gnome-mag-&gnome-mag-version;.tar.bz2">
-  <!ENTITY gnome-mag-download-ftp  "&gnome-download-ftp;/gnome-mag/0.16/gnome-mag-&gnome-mag-version;.tar.bz2">
-  <!ENTITY gnome-mag-md5sum        "bbe177dadfd64c071b5670956ed703ae">
-  <!ENTITY gnome-mag-size          "534 KB">
-  <!ENTITY gnome-mag-buildsize     "10 MB">
-  <!ENTITY gnome-mag-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-mag" xreflabel="GNOME Magnifier-&gnome-mag-version;">
-  <?dbhtml filename="gnome-mag.html"?>
-
-
-  <title>GNOME Magnifier-&gnome-mag-version;</title>
-
-  <indexterm zone="gnome-mag">
-    <primary sortas="a-GNOME Magnifier">GNOME Magnifier</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Magnifier</title>
-
-    <para>The <application>GNOME Magnifier</application> includes a screen
-    magnifier, which allows you to zoom in on portions of the desktop. It is
-    expressly designed for users with low vision who wish to use the
-    <application>GNOME</application> desktop.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-mag-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-mag-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-mag-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-mag-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-mag-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-mag-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Magnifier Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="at-spi"/></para>
-
-    <bridgehead renderas="sect4">Optional (to Build the Colorblind Applet)</bridgehead>
-    <para role="optional"><xref linkend="gnome-desktop"/>,
-    <ulink url="http://people.debian.org/~ruoso/">colorblind</ulink>,
-    <xref linkend="pygtk"/> (including the gtk and gtk.libglade modules),
-    <!-- FIXME:ken --> PYORBit-2.24.0, Gnome-Python-2.28.1, Gnome-Python-Desktop-2.30.2.</para>
-   <!--
-    <xref linkend="pyorbit"/>,
-    <xref linkend="gnome-python"/> (including the gnome.ui module), and
-    <xref linkend="gnome-python-desktop"/> (including the gnomeapplet
-    module)</para>
-    -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-mag"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Magnifier</title>
-
-    <para>If <xref linkend="doxygen"/> is installed, the reference
-    documentation is automatically generated. Install
-    <application>GNOME Magnifier</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>magnifier</seg>
-        <seg>libgnome-mag.so and GNOME_Magnifier_module.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-mag-1.0/magnifier,
-        share/{doc/gnome-mag-0.16.1/reference/html,gnome-mag/{1_32,dbus},
-        idl/gnome-mag-1.0}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="magnifier">
-        <term><command>magnifier</command></term>
-        <listitem>
-          <para>is a screen zooming utility.</para>
-          <indexterm zone="gnome-mag magnifier">
-            <primary sortas="b-magnifier">magnifier</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnome-mag">
-        <term><filename class='libraryfile'>libgnome-mag.so</filename></term>
-        <listitem>
-          <para>contains the <application>GNOME Magnifier</application> API
-          functions.</para>
-          <indexterm zone="gnome-mag libgnome-mag">
-            <primary sortas="c-libgnome-mag">libgnome-mag.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="GNOME_Magnifier_module">
-        <term><filename class='libraryfile'>GNOME_Magnifier_module.so</filename></term>
-        <listitem>
-          <para>is an <application>ORBit2</application> module.</para>
-          <indexterm zone="gnome-mag GNOME_Magnifier_module">
-            <primary sortas="c-GNOME_Magnifier_module">GNOME_Magnifier_module.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-mount.xml
===================================================================
--- archive/gnome-obsolete/gnome-mount.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +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 gnome-mount-download-http "http://hal.freedesktop.org/releases/gnome-mount-&gnome-mount-version;.tar.gz">
-  <!ENTITY gnome-mount-download-ftp  " ">
-  <!ENTITY gnome-mount-md5sum        "562ec9d0196e5e000bdd249a04a3aa6a">
-  <!ENTITY gnome-mount-size          "494 KB">
-  <!ENTITY gnome-mount-buildsize     "5 MB">
-  <!ENTITY gnome-mount-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-mount" xreflabel="gnome-mount-&gnome-mount-version;">
-  <?dbhtml filename="gnome-mount.html"?>
-
-
-  <title>gnome-mount-&gnome-mount-version;</title>
-
-  <indexterm zone="gnome-mount">
-    <primary sortas="a-gnome-mount">gnome-mount</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-mount</title>
-
-    <para>The <application>gnome-mount</application> package contains programs
-    for mounting, unmounting and ejecting storage devices. The goal for
-    <application>gnome-mount</application> is to get the appropriate GNOME
-    software (such as <application>gnome-volume-manager</application> and
-    <application>GNOME-VFS</application>) to use this instead of invoking
-    <command>mount</command>/<command>umount</command>/<command>eject</command>
-    or direct <application>HAL</application> invoking methods.</para>
-
-    <para>All the <application>gnome-mount</application> programs utilize the
-    methods on <application>HAL</application> and as such run unprivileged. The
-    rationale for <application>gnome-mount</application> is to have a
-    centralized place (in <application>GConf</application>) where settings
-    (e.g., mount options and mount locations) are maintained.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-mount-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-mount-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-mount-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-mount-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-mount-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-mount-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnome-mount Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-keyring"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>,
-    <xref linkend="libglade"/>,
-    <xref linkend="libnotify"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="nautilus"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-mount"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-mount</title>
-
-    <para>Install <application>gnome-mount</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><option>--disable-nautilus-extension</option>: Use this option if you
-    do not have <application>Nautilus</application> installed. This will prevent
-    the <application>Nautilus</application> extension from being built.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-eject, gnome-mount and gnome-umount</seg>
-        <seg>libgnome-mount.{so,a} Nautilus extension</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/gnome-mount</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-mount-prog">
-        <term><command>gnome-mount</command></term>
-        <listitem>
-          <para>is used to automatically mount storage media and other
-          removable media.</para>
-          <indexterm zone="gnome-mount gnome-mount-prog">
-            <primary sortas="b-gnome-mount">gnome-mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-umount">
-        <term><command>gnome-umount</command></term>
-        <listitem>
-          <para>is a symbolic link to <command>gnome-mount</command> used to
-          automatically unmount storage media and other removable media.</para>
-          <indexterm zone="gnome-mount gnome-umount">
-            <primary sortas="g-gnome-umount">gnome-umount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-eject">
-        <term><command>gnome-eject</command></term>
-        <listitem>
-          <para>is a symbolic link to <command>gnome-mount</command> used to
-          automatically open and close (if supported by the drive) the drive
-          door and tray in CD/DVD drives.</para>
-          <indexterm zone="gnome-mount gnome-eject">
-            <primary sortas="b-gnome-eject">gnome-eject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-netstatus.xml
===================================================================
--- archive/gnome-obsolete/gnome-netstatus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +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 gnome-netstatus-download-http "&gnome-download-http;/gnome-netstatus/2.28/gnome-netstatus-&gnome-netstatus-version;.tar.bz2">
-  <!ENTITY gnome-netstatus-download-ftp  "&gnome-download-ftp;/gnome-netstatus/2.28/gnome-netstatus-&gnome-netstatus-version;.tar.bz2">
-  <!ENTITY gnome-netstatus-md5sum        "8ecc95396c9d1c7d963a7f232ca370f8">
-  <!ENTITY gnome-netstatus-size          "559 KB">
-  <!ENTITY gnome-netstatus-buildsize     "10 MB">
-  <!ENTITY gnome-netstatus-time          "0.5 SBU">
-]>
-
-<sect1 id="gnome-netstatus"
-xreflabel="GNOME Netstatus-&gnome-netstatus-version;">
-  <?dbhtml filename="gnome-netstatus.html"?>
-
-
-  <title>GNOME Netstatus-&gnome-netstatus-version;</title>
-
-  <indexterm zone="gnome-netstatus">
-    <primary sortas="a-GNOME Netstatus">GNOME Netstatus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Netstatus</title>
-
-    <para>The <application>GNOME Netstatus</application> package contains a
-    panel applet that monitors network interfaces. It provides indicators
-    for incoming and outgoing data, packets received and transmitted, and
-    information about the network interface such as IP information and
-    Ethernet address.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-netstatus-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-netstatus-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-netstatus-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-netstatus-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-netstatus-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-netstatus-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Netstatus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-panel"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-netstatus"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Netstatus</title>
-
-    <para>Install <application>GNOME Netstatus</application>
-    by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-netstatus &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-netstatus</parameter>: This parameter causes the
-    libexec files to be installed in the preferred location of
-    in <filename class="directory">$GNOME_PREFIX/lib/gnome-netstatus</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Applet</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>gnome-netstatus-applet</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/gnome-netstatus,
-        share/{gnome-netstatus,gnome/help/gnome-netstatus/*,
-        omf/gnome-netstatus}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-netstatus-applet">
-        <term><command>gnome-netstatus-applet</command></term>
-        <listitem>
-          <para>displays information about a network interface on
-          your panel.</para>
-          <indexterm zone="gnome-netstatus gnome-netstatus-applet">
-            <primary
-            sortas="b-gnome-netstatus-applet">gnome-netstatus-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-speech.xml
===================================================================
--- archive/gnome-obsolete/gnome-speech.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +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 gnome-speech-download-http "&gnome-download-http;/gnome-speech/0.4/gnome-speech-&gnome-speech-version;.tar.bz2">
-  <!ENTITY gnome-speech-download-ftp  "&gnome-download-ftp;/gnome-speech/0.4/gnome-speech-&gnome-speech-version;.tar.bz2">
-  <!ENTITY gnome-speech-md5sum        "89cbc23fc131c33396c0346085759f63">
-  <!ENTITY gnome-speech-size          "329 KB">
-  <!ENTITY gnome-speech-buildsize     "5 MB">
-  <!ENTITY gnome-speech-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-speech" xreflabel="GNOME Speech-&gnome-speech-version;">
-  <?dbhtml filename="gnome-speech.html"?>
-
-
-  <title>GNOME Speech-&gnome-speech-version;</title>
-
-  <indexterm zone="gnome-speech">
-    <primary sortas="a-GNOME Speech">GNOME Speech</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Speech</title>
-
-    <para>The <application>GNOME Speech</application> package provides a
-    simple general API for producing text-to-speech output. Multiple backends
-    are supported by the <application>GNOME Speech</application> library, but
-    currently only the <application>Festival</application> backend is built
-    by default; the other backends require either Java or proprietary
-    software.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-speech-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-speech-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-speech-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-speech-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-speech-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-speech-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/gnome-speech-&gnome-speech-version;-freetts_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">GNOME Speech Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonobo"/></para>
-
-    <bridgehead renderas="sect4">Optional Backend Drivers</bridgehead>
-    <para role="optional"><xref linkend="java-access-bridge"/>,
-    <xref linkend="freetts"/>,
-    <ulink url="http://www.fonixspeech.com/pages/index.php">DECtalk</ulink>,
-    <ulink url="http://espeak.sourceforge.net/">eSpeak</ulink>,
-    <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>,
-    <ulink url="http://voice-software.loquendo.com/interactive-tts.htm">Loquendo</ulink>,
-    <ulink url="http://www.freebsoft.org/speechd">Speech Dispatcher</ulink>,
-    <ulink url="http://www.nuance.com/">Speechworks ETI Eloquence</ulink>,
-    <ulink url="http://www.cepstral.com/">Swift</ulink>,
-    <ulink url="http://www.cepstral.com/">Theta</ulink>, and
-    <ulink url="http://www.ibm.com/software/voice/viavoice/">ViaVoice</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-speech"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Speech</title>
-
-    <note>
-      <para>You must install at least one of the backend drivers for
-      <application>GNOME Speech</application> to render speech through the
-      audio hardware. You should test the installation of the backend driver and
-      ensure it produces desired results before installing
-      <application>GNOME Speech</application>.</para>
-    </note>
-
-    <para>Install <application>GNOME Speech</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &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;
-install -v -m644 -D doc/gnome-speech.html \
-    $(pkg-config --variable=prefix \
-    ORBit-2.0)/share/doc/gnome-speech-&gnome-speech-version;/gnome-speech.html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><option>--with-jab-dir=$(pkg-config
-    --variable=prefix ORBit-2.0)/share/jar</option>: Use this option if you
-    have installed the <application>Java Access Bridge</application> package
-    and wish to have <application>GNOME Speech</application> build
-    in <application>Java</application> support.</para>
-
-    <para>Note: see the <filename>README</filename> and
-    <filename>INSTALL</filename> files in the package source tree for the
-    correct parameters to pass to <command>configure</command> to enable the
-    desired backends.</para>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing the Installation</title>
-
-    <para>You can test all the available backend drivers, voices and audio
-    hardware using the <command>test-speech</command> command. Invoking
-    <command>test-speech</command> produces a menu allowing you to select
-    a backend driver and the desired voice, then prompts you (with on-screen
-    prompts and text-to-speech audio) for additional information.</para>
-
-    <para>If you are using the <application>FreeTTS</application> backend and
-    you do not hear any audio, you may need to use the streaming audio method
-    instead of the clip audio method. As the
-    <systemitem class="username">root</systemitem> user, modify the
-    <command>freetts-synthesis-driver</command> script:</para>
-
-<screen role='root'><userinput>sed -i "s/clip/streaming/" <envar>$GNOME_PREFIX</envar>/bin/freetts-synthesis-driver</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>festival-synthesis-driver and test-speech</seg>
-        <seg>libgnomespeech.so and GNOME_Speech_module.so. Other drivers and
-        libraries are also installed if you have enabled additional
-        backends.</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-speech-1.0/gnome-speech,
-        share/{doc/gnome-speech-&gnome-speech-version;,
-        idl/gnome-speech-1.0}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="test-speech">
-        <term><command>test-speech</command></term>
-        <listitem>
-          <para>is used to test the various backend drivers and voices
-          installed on the system.</para>
-          <indexterm zone="gnome-speech test-speech">
-            <primary sortas="b-test-speech">test-speech</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnomespeech">
-        <term><filename class='libraryfile'>libgnomespeech.so</filename></term>
-        <listitem>
-          <para>provides the API for programs to convert text into speech.</para>
-          <indexterm zone="gnome-speech libgnomespeech">
-            <primary sortas="c-libgnomespeech">libgnomespeech.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="GNOME_Speech_module">
-        <term><filename class='libraryfile'>GNOME_Speech_module.so</filename></term>
-        <listitem>
-          <para>is an <application>ORBit2</application> module.</para>
-          <indexterm zone="gnome-speech GNOME_Speech_module">
-            <primary sortas="c-GNOME_Speech_module">GNOME_Speech_module.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-system-tools.xml
===================================================================
--- archive/gnome-obsolete/gnome-system-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +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 gnome-system-tools-download-http "&gnome-download-http;/gnome-system-tools/&gnome-version;/gnome-system-tools-&gnome-system-tools-version;.tar.bz2">
-  <!ENTITY gnome-system-tools-download-ftp  "&gnome-download-ftp;/gnome-system-tools/&gnome-version;/gnome-system-tools-&gnome-system-tools-version;.tar.bz2">
-  <!ENTITY gnome-system-tools-md5sum        "9211516168aa171b34823d8c58c807d4">
-  <!ENTITY gnome-system-tools-size          "5.2 MB">
-  <!ENTITY gnome-system-tools-buildsize     "43 MB">
-  <!ENTITY gnome-system-tools-time          "0.4 SBU">
-]>
-
-<sect1 id="gnome-system-tools" xreflabel="gnome-system-tools-&gnome-system-tools-version;">
-  <?dbhtml filename="gnome-system-tools.html"?>
-
-
-  <title>gnome-system-tools-&gnome-system-tools-version;</title>
-
-  <indexterm zone="gnome-system-tools">
-    <primary sortas="a-gnome-system-tools">gnome-system-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-system-tools</title>
-
-    <para>The <application>gnome-system-tools</application> package are a fully
-    integrated set of tools aimed to make computer administration easy on a
-    Linux workstation.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-system-tools-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-system-tools-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-system-tools-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-system-tools-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-system-tools-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-system-tools-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnome-system-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="liboobs"/> and
-    <xref linkend="nautilus"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="polkit-gnome"/>,
-    <xref linkend="rarian"/>, and
-    <xref linkend="wireless_tools"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-system-tools"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-system-tools</title>
-
-    <para>Install <application>gnome-system-tools</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --enable-polkit-gtk=no &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--enable-polkit-gtk=no</parameter>: This parameter is
-    required if <application>polkit-gnome</application> is not installed. Remove
-    it if <application>polkit-gnome</application> is installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>network-admin, services-admin, shares-admin, time-admin, and
-        users-admin</seg>
-        <seg>libnautilus-gst-shares.{so,a}</seg>
-        <seg>&gnome-etc-dir;/gnome-system-tools,
-        <envar>$GNOME_PREFIX</envar>/share/{gnome-system-tools/{pixmaps,ui},
-        gnome/help/{network-admin/*,services-admin/*,shares-admin/*,
-        time-admin/*,users-admin/*},omf/{gnome-system-tools,network-admin,
-        services-admin,shares-admin,time-admin,users-admin}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="network-admin">
-        <term><command>network-admin</command></term>
-        <listitem>
-          <para>is a network configuration tool.</para>
-          <indexterm zone="gnome-system-tools network-admin">
-            <primary sortas="b-network-admin">network-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="services-admin">
-        <term><command>services-admin</command></term>
-        <listitem>
-          <para>is a Services configuration tool.</para>
-          <indexterm zone="gnome-system-tools services-admin">
-            <primary sortas="b-services-admin">services-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shares-admin">
-        <term><command>shares-admin</command></term>
-        <listitem>
-          <para>is a shares administration tool.</para>
-          <indexterm zone="gnome-system-tools shares-admin">
-            <primary sortas="b-shares-admin">shares-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="time-admin">
-        <term><command>time-admin</command></term>
-        <listitem>
-          <para>is a date and time configureation tool.</para>
-          <indexterm zone="gnome-system-tools time-admin">
-            <primary sortas="b-time-admin">time-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="users-admin">
-        <term><command>users-admin</command></term>
-        <listitem>
-          <para>is a users and groups administration tool.</para>
-          <indexterm zone="gnome-system-tools users-admin">
-            <primary sortas="b-users-admin">users-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnautilus-gst-shares">
-        <term><filename class='libraryfile'>libnautilus-gst-shares.{so,a}</filename></term>
-        <listitem>
-          <para>is a <application>Nautilus</application> extension module.</para>
-          <indexterm zone="gnome-system-tools libnautilus-gst-shares">
-            <primary sortas="c-libnautilus-gst-shares">libnautilus-gst-shares.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-themes.xml
===================================================================
--- archive/gnome-obsolete/gnome-themes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,112 +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 gnome-themes-download-http "&gnome-download-http;/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
-  <!ENTITY gnome-themes-download-ftp  "&gnome-download-ftp;/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
-  <!ENTITY gnome-themes-md5sum        "a14d46ac59f651e04a333ae1dff23848">
-  <!ENTITY gnome-themes-size          "1.6 MB">
-  <!ENTITY gnome-themes-buildsize     "22 MB">
-  <!ENTITY gnome-themes-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-themes" xreflabel="GNOME Themes-&gnome-themes-version;">
-  <?dbhtml filename="gnome-themes.html"?>
-
-
-  <title>GNOME Themes-&gnome-themes-version;</title>
-
-  <indexterm zone="gnome-themes">
-    <primary sortas="a-GNOME Themes">GNOME Themes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Themes</title>
-
-    <para>The <application>GNOME Themes</application> package
-    contains several more theme sets.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-themes-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-themes-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-themes-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-themes-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-themes-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-themes-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Themes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="icon-naming-utils"/> and
-    <xref linkend="gtk-engines"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-themes"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Themes</title>
-
-    <para>Install <application>GNOME Themes</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --enable-all-themes &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--enable-all-themes</option>: Using this parameter enables
-    the installation of additional accessibility themes. Omit this parameter if
-    you have no desire for additional accessibility themes.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <segtitle>Installed Themes</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>Several directories under /usr/share/{icons,themes}</seg>
-        <seg>Several themes in the /usr/share/themes hierarchy and icons
-        in the /usr/share/icons hierarchy</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-vfs-monikers.xml
===================================================================
--- archive/gnome-obsolete/gnome-vfs-monikers.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,110 +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 gnome-vfs-monikers-download-http "&gnome-download-http;/gnome-vfs-monikers/2.15/gnome-vfs-monikers-&gnome-vfs-monikers-version;.tar.bz2">
-  <!ENTITY gnome-vfs-monikers-download-ftp  "&gnome-download-ftp;/gnome-vfs-monikers/2.15/gnome-vfs-monikers-&gnome-vfs-monikers-version;.tar.bz2">
-  <!ENTITY gnome-vfs-monikers-md5sum        "b16f0db0482263be3318e269f52bb5b6">
-  <!ENTITY gnome-vfs-monikers-size          "254 KB">
-  <!ENTITY gnome-vfs-monikers-buildsize     "4 MB">
-  <!ENTITY gnome-vfs-monikers-time          ".1 SBU">
-]>
-
-<sect1 id="gnome-vfs-monikers" xreflabel="GNOME VFS Monikers-&gnome-vfs-monikers-version;">
-  <?dbhtml filename="gnome-vfs-monikers.html"?>
-
-
-  <title>GNOME VFS Monikers-&gnome-vfs-monikers-version;</title>
-
-  <indexterm zone="gnome-vfs-monikers">
-    <primary sortas="a-GNOME-VFS-Monikers">GNOME VFS Monikers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME VFS Monikers</title>
-
-    <para>The <application>GNOME VFS Monikers</application> package
-    contains <application>Bonobo</application> monikers that were pulled out
-    of the GNOME VFS package during the <application>Bonobo</application> to
-    <application>D-Bus</application> conversion. This package is required so
-    that the <application>GNOME VFS</application> API/ABI remains
-    stable.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-vfs-monikers-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-vfs-monikers-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-vfs-monikers-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-vfs-monikers-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-vfs-monikers-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-vfs-monikers-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME VFS Monikers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonobo"/> and
-    <xref linkend="gnome-vfs"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-vfs-monikers"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME VFS Monikers</title>
-
-    <para>Install <application>GNOME VFS Monikers</application>
-    by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </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>libmoniker_gnome_vfs_std.{so,a} (bonobo library)</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnome-volume-manager.xml
===================================================================
--- archive/gnome-obsolete/gnome-volume-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +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 gnome-volume-manager-download-http "&gnome-download-http;/gnome-volume-manager/2.17/gnome-volume-manager-&gnome-volume-manager-version;.tar.bz2">
-  <!ENTITY gnome-volume-manager-download-ftp  "&gnome-download-ftp;/gnome-volume-manager/2.17/gnome-volume-manager-&gnome-volume-manager-version;.tar.bz2">
-  <!ENTITY gnome-volume-manager-md5sum        "104cec26e721e0bba69debd392367195">
-  <!ENTITY gnome-volume-manager-size          "341 KB">
-  <!ENTITY gnome-volume-manager-buildsize     "11 MB">
-  <!ENTITY gnome-volume-manager-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-volume-manager"
-       xreflabel="gnome-volume-manager-&gnome-volume-manager-version;">
-  <?dbhtml filename="gnome-volume-manager.html"?>
-
-
-  <title>gnome-volume-manager-&gnome-volume-manager-version;</title>
-
-  <indexterm zone="gnome-volume-manager">
-    <primary sortas="a-gnome-volume-manager">gnome-volume-manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-volume-manager</title>
-
-    <para>The <application>gnome-volume-manager</application> package contains
-    a volume manager for GNOME. It is a desktop-level daemon that enforces
-    volume-related policy in response to events received from
-    <application>HAL</application>. This is useful for automatic mounting of
-    floppy diskettes, CDROMs and removable storage devices. It can also be
-    used to automatically run a program in response to other hotplug events
-    such as plugging in USB printers or cameras, or inserting DVDs and
-    music CDs. The goal of <application>gnome-volume-manager</application> is
-    to implement all functionality as a state-machine in response to
-    asynchronous events from <application>HAL</application>. It is one
-    component in a larger plan to fully integrate all levels of the Linux
-    system, from the kernel on up through the desktop and its
-    applications.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-volume-manager-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-volume-manager-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-volume-manager-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-volume-manager-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-volume-manager-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-volume-manager-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnome-volume-manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/> and
-    <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/>,
-    <xref linkend="nautilus"/>, and
-    <xref linkend="libnotify"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-volume-manager"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-volume-manager</title>
-
-    <para>Install <application>gnome-volume-manager</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --disable-multiuser &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--disable-multiuser</parameter>: Without this parameter,
-    <application>gnome-volume-manager</application> will only allow the user
-    who is at the active console to manage volumes. This is determined
-    through the <xref linkend="linux-pam"/> module <ulink
-    url="&blfs-wiki;/linux-pam">pam_console</ulink>. If your system is
-    configured to use <ulink url="&blfs-wiki;/linux-pam">pam_console</ulink>,
-    you can drop this parameter.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring gnome-volume-manager</title>
-
-    <sect3 id="gnome-volume-manager-config">
-      <title>Configuration Information</title>
-
-      <para>Proper operation of this package is dependent upon the
-      <command>hald</command> daemon running on the system. Ensure the
-      <command>hald</command> daemon is running before attempting to start or
-      configure <command>gnome-volume-manager</command>. Configuration
-      is accomplished using the <quote>Removable Drives and Media</quote>
-      graphical interface found on the
-      <quote>Desktop</quote>&mdash;<quote>Preferences</quote> drop-down
-      menu. You can also run the <command>gnome-volume-properties</command>
-      command from the command line to bring up the configuration
-      interface.</para>
-
-      <para>Note that the <command>gnome-volume-manager</command> daemon
-      program should be started when your GNOME desktop environment is started.
-      This should be automatically configured during the installation of
-      <application>gnome-volume-manager</application>.</para>
-
-      <!--
-      This can easily be accomplished by adding
-      <command>gnome-volume-manager</command> to the
-      <quote>Startup Programs</quote>, found by selecting the
-      <quote>Desktop</quote>&mdash;<quote>Preferences</quote>&mdash;<quote>Sessions</quote>
-      drop-down menu.</para>
-      -->
-
-      <para>The <quote>Disk Mounter</quote> applet can be installed in the
-      control panel for visual display status of removable media. Installing
-      this applet in the panel is accomplished using conventional
-      methods.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-volume-manager and gnome-volume-properties</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/gnome-volume-manager</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-volume-manager-prog">
-        <term><command>gnome-volume-manager</command></term>
-        <listitem>
-          <para>is the manager daemon, designed to be run at the desktop level.
-          It is a simple policy engine that implements a state machine in
-          response to events from <application>HAL</application>. Responding
-          to these events, it implements automount, autorun, autoplay,
-          automatic photo management, and so on.</para>
-          <indexterm zone="gnome-volume-manager gnome-volume-manager-prog">
-            <primary sortas="b-gnome-volume-manager">gnome-volume-manager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-volume-properties">
-        <term><command>gnome-volume-properties</command></term>
-        <listitem>
-          <para>is a control panel applet for
-          <application>gnome-volume-manager</application>. It is also provides
-          a graphical configuration interface.</para>
-          <indexterm zone="gnome-volume-manager gnome-volume-properties">
-            <primary sortas="b-gnome-volume-properties">gnome-volume-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gnopernicus.xml
===================================================================
--- archive/gnome-obsolete/gnopernicus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 gnopernicus-download-http "&gnome-download-http;/gnopernicus/1.1/gnopernicus-&gnopernicus-version;.tar.bz2">
-  <!ENTITY gnopernicus-download-ftp  "&gnome-download-ftp;/gnopernicus/1.1/gnopernicus-&gnopernicus-version;.tar.bz2">
-  <!ENTITY gnopernicus-md5sum        "e691c408de4ca885a3589a0b6fa297be">
-  <!ENTITY gnopernicus-size          "1.5 MB">
-  <!ENTITY gnopernicus-buildsize     "41.8 MB">
-  <!ENTITY gnopernicus-time          "0.7 SBU">
-]>
-
-<sect1 id="gnopernicus" xreflabel="Gnopernicus-&gnopernicus-version;">
-  <?dbhtml filename="gnopernicus.html"?>
-
-
-  <title>Gnopernicus-&gnopernicus-version;</title>
-
-  <indexterm zone="gnopernicus">
-    <primary sortas="a-Gnopernicus">Gnopernicus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gnopernicus</title>
-
-    <para><application>Gnopernicus</application> enables users with limited
-    vision, or no vision, to use the GNOME desktop and applications
-    effectively. It provides a number of features, including magnification,
-    focus tracking, braille output, automatic screen reading and more.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnopernicus-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnopernicus-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnopernicus-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnopernicus-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnopernicus-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnopernicus-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gnopernicus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgail-gnome"/>,
-    <xref linkend="gnome-speech"/>, and
-    <xref linkend="gnome-mag"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/>,
-    <xref linkend="gtk-doc"/>, and
-    <ulink url="http://www.mielke.cc/brltty/">BRLTTY</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnopernicus"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gnopernicus</title>
-
-    <para>Install <application>Gnopernicus</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnopernicus-1.0 &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnopernicus-1.0</parameter>: This parameter causes the
-    libexec files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnopernicus-1.0</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <!-- Commented out as the default X font dir is now /usr/share/fonts
-    <para><parameter>-with-default-fonts-path=/usr/X11R6/lib/X11/fonts/Type1</parameter>:
-    This switch installs Braille fonts into
-    <filename class='directory'>/usr/X11R6/lib/X11/fonts/Type1</filename> instead
-    of <filename class='directory'>/usr/share/fonts/default/Type1</filename>.</para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnopernicus, gnopernicus-mag-config and srcore</seg>
-        <seg><application>Gnopernicus</application> support libraries</seg>
-        <seg>&gnome-etc-dir;/gnopernicus-1.0},
-        and the following subdirectories of <envar>$GNOME_PREFIX</envar>/:
-        include/gnopernicus-1.0,
-        lib/gnopernicus-1.0,
-        share/{gnome/help/{brlmonitor,gnopernicus}, gnopernicus,
-        omf/gnopernicus}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnopernicus-prog">
-        <term><command>gnopernicus</command></term>
-        <listitem>
-          <para>is a GUI menu interface used to access and configure the
-          various functionality parameters provided for users with limited
-          vision.</para>
-          <indexterm zone="gnopernicus gnopernicus-prog">
-            <primary sortas="b-gnopernicus">gnopernicus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gok.xml
===================================================================
--- archive/gnome-obsolete/gok.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 gok-download-http "&gnome-download-http;/gok/&gnome-version;/gok-&gok-version;.tar.bz2">
-  <!ENTITY gok-download-ftp  "&gnome-download-ftp;/gok/&gnome-version;/gok-&gok-version;.tar.bz2">
-  <!ENTITY gok-md5sum        "853c7825eb62d7c425f5a0efdc07412a">
-  <!ENTITY gok-size          "1.5 MB">
-  <!ENTITY gok-buildsize     "50 MB">
-  <!ENTITY gok-time          "0.5 SBU">
-]>
-
-<sect1 id="gok" xreflabel="GOK-&gok-version;">
-  <?dbhtml filename="gok.html"?>
-
-
-  <title>GOK-&gok-version;</title>
-
-  <indexterm zone="gok">
-    <primary sortas="a-GOK">GOK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GOK</title>
-
-    <para><application>GOK</application> is a dynamic onscreen keyboard. It
-    features Direct Selection, Dwell Selection, Automatic Scanning and Inverse
-    Scanning access methods and includes word completion.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gok-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gok-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gok-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gok-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gok-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gok-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GOK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="at-spi"/>,
-    <xref linkend="GConf"/>,
-    <xref linkend="gnome-speech"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="libwnck"/>, and
-    <xref linkend="rarian"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libusb-compat"/> and
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gok"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GOK</title>
-
-    <para>Install <application>GOK</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install &amp;&amp;
-chmod -v 644 $(pkg-config --variable=prefix \
-      ORBit-2.0)/share/gnome/help/gok/C/legal.xml</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GOK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>It is recommended that you configure your input device as an
-      <quote>Extended</quote> input device. Exact configuration methods
-      depend on the type of hardware attached to your system. See the
-      <filename>README</filename> file in the package source tree and
-      <application>GOK</application> Help for information on how
-      to configure your input device.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>create-branching-keyboard and gok</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/gok/C,gok/*,
-        gtk-doc/html/gok,omf/gok,sounds/freedesktop/stereo}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gok-prog">
-        <term><command>gok</command></term>
-        <listitem>
-          <para>is a dynamic onscreen keyboard utility.</para>
-          <indexterm zone="gok gok-prog">
-            <primary sortas="b-gok">gok</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/gpdf.xml
===================================================================
--- archive/gnome-obsolete/gpdf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 gpdf-download-http "http://ftp.gnome.org/pub/GNOME/sources/gpdf/&gnome-version;/gpdf-&gpdf-version;.tar.bz2">
-  <!ENTITY gpdf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gpdf/&gnome-version;/gpdf-&gpdf-version;.tar.bz2">
-  <!ENTITY gpdf-md5sum "9278cd3b9d06e3b1d364452f0e512fa9">
-  <!ENTITY gpdf-size "1.0 MB">
-  <!ENTITY gpdf-buildsize "36 MB">
-  <!ENTITY gpdf-time "0.5 SBU">
-]>
-
-<sect1 id="gpdf" xreflabel="GPdf-&gpdf-version;">
-  <?dbhtml filename="gpdf.html"?>
-
-
-  <title>GPdf-&gpdf-version;</title>
-
-  <indexterm zone="gpdf">
-    <primary sortas="a-GPdf">GPdf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GPdf</title>
-
-    <para><application>GPdf</application> is a PDF viewer for
-    <application>GNOME</application>. It is based on
-    <application>Xpdf</application> and the <application>GNOME
-    Print</application> Preview widget.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gpdf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gpdf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gpdf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gpdf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gpdf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gpdf-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GPdf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/> and
-    <xref linkend="libgnomeprintui"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tetex"/> or
-    <xref linkend="texlive"/>, and
-    <ulink url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gpdf"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GPdf</title>
-
-    <para>Install <application>GPdf</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gpdf and gnome-pdf-viewer</seg>
-        <seg>GNOME_PDF.server bonobo server</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/gpdf,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/gpdf,
-        $GNOME_PREFIX/share/gnome/help/gpdf,
-        $GNOME_PREFIX/share/gpdf,
-        $GNOME_PREFIX/share/omf/gpdf, and
-        $GNOME_PREFIX/share/pixmaps/gpdf</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpdf-prog">
-        <term><command>gpdf</command></term>
-        <listitem>
-          <para>is a PDF viewer for <application>GNOME</application>.</para>
-          <indexterm zone="gpdf gpdf-prog">
-            <primary sortas="b-gpdf">gpdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/hamster-applet.xml
===================================================================
--- archive/gnome-obsolete/hamster-applet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,120 +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 hamster-applet-download-http "&gnome-download-http;/hamster-applet/&gnome-version;/hamster-applet-&hamster-applet-version;.tar.bz2">
-  <!ENTITY hamster-applet-download-ftp  "&gnome-download-ftp;/hamster-applet/&gnome-version;/hamster-applet-&hamster-applet-version;.tar.bz2">
-  <!ENTITY hamster-applet-md5sum        "ad662fd81a09c5a0e19d1aa733e78588">
-  <!ENTITY hamster-applet-size          "600 KB">
-  <!ENTITY hamster-applet-buildsize     "10 MB">
-  <!ENTITY hamster-applet-time          "0.1 SBU">
-]>
-
-<sect1 id="hamster-applet" xreflabel="hamster-applet-&hamster-applet-version;">
-  <?dbhtml filename="hamster-applet.html"?>
-
-
-  <title>hamster-applet-&hamster-applet-version;</title>
-
-  <indexterm zone="hamster-applet">
-    <primary sortas="a-hamster-applet">hamster-applet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to hamster-applet</title>
-
-    <para>The <application>hamster-applet</application> package is a
-    <application>GNOME</application> applet that allows you to keep track on
-    where are you spending your time.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&hamster-applet-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&hamster-applet-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &hamster-applet-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &hamster-applet-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &hamster-applet-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &hamster-applet-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">hamster-applet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python2"/> with <xref linkend="sqlite"/>
-    <!-- FIXME:ken -->
-    and Gnome-Python-Desktop-2.30.2 (gnomeapplet module only)</para>
-    <!--
-    and <xref linkend="gnome-python-desktop"/> (gnomeapplet module only)</para>
-    -->
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/hamster-applet"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of hamster-applet</title>
-
-    <para>Install <application>hamster-applet</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-time-tracker and hamster-standalone</seg>
-        <seg>_keybinder.so</seg>
-        <seg>/usr/lib/python&python2-majorver;/site-packages/hamster/{keybinder,
-        widgets},
-        <envar>$GNOME_PREFIX</envar>/{lib/hamster-applet,
-        share/{gnome/help/hamster-applet/*,hamster-applet/art}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/java-access-bridge.xml
===================================================================
--- archive/gnome-obsolete/java-access-bridge.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +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 java-access-bridge-download-http "&gnome-download-http;/java-access-bridge/1.26/java-access-bridge-&java-access-bridge-version;.tar.bz2">
-  <!ENTITY java-access-bridge-download-ftp  "&gnome-download-ftp;/java-access-bridge/1.26/java-access-bridge-&java-access-bridge-version;.tar.bz2">
-  <!ENTITY java-access-bridge-md5sum        "baeac0a4f26f66996f62ffa88d6cd19e">
-  <!ENTITY java-access-bridge-size          "304 KB">
-  <!ENTITY java-access-bridge-buildsize     "9 MB">
-  <!ENTITY java-access-bridge-time          "1.3 SBU">
-]>
-
-<sect1 id="java-access-bridge"
-xreflabel="Java Access Bridge-&java-access-bridge-version;">
-  <?dbhtml filename="java-access-bridge.html"?>
-
-
-  <title>Java Access Bridge-&java-access-bridge-version;</title>
-
-  <indexterm zone="java-access-bridge">
-    <primary sortas="a-Java-Access-Bridge">Java Access Bridge</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Java Access Bridge</title>
-
-    <para>The <application>Java Access Bridge</application> package contains
-    Java components which connect the built-in accessibility support in Java
-    Swing applications to the <application>GNOME</application>
-    Accessibility framework, specifically the Assistive Technology Service
-    Provider Interface (AT-SPI).</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&java-access-bridge-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&java-access-bridge-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &java-access-bridge-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &java-access-bridge-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &java-access-bridge-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &java-access-bridge-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Java Access Bridge Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="at-spi"/> and
-    <!-- either --> <xref linkend="openjdk"/> <!-- or <xref linkend="jdk"/> --></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/java-access-bridge"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Java Access Bridge</title>
-
-    <para>Install <application>Java Access Bridge</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &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;
-
-cat $(pkg-config --variable=prefix \
-    ORBit-2.0)/share/jar/accessibility.properties \
-    &gt;&gt; $JAVA_HOME/jre/lib/accessibility.properties &amp;&amp;
-chmod -v 644 $JAVA_HOME/jre/lib/accessibility.properties &amp;&amp;
-
-ln -v -sf $(pkg-config --variable=prefix \
-    ORBit-2.0)/share/jar/gnome-java-bridge.jar \
-    $JAVA_HOME/jre/lib/ext</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><command>cat $(pkg-config ...</command>: This command appends to (or
-    creates) the Java runtime <filename>accessibility.properties</filename>
-    file required for <application>Java Access Bridge</application>.</para>
-
-    <para><command>ln -v -sf $(pkg-config ...</command>: This command creates
-    a link from the Access Bridge <filename class='extension'>jar</filename>
-    file to the Java runtime library extensions directory.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Java Access Bridge</title>
-
-    <sect3 id="java-access-bridge-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.orbitrc</filename></para>
-
-      <indexterm zone="java-access-bridge java-access-bridge-config">
-        <primary sortas="e-AA.orbitrc">~/.orbitrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Before running a Java program with the <application>Java Access
-      Bridge</application>, you should ensure that your
-      <application>GNOME</application> 2 installation enables CORBA traffic
-      over IP from the <application>ORBit2</application> ORB. Do
-      this by adding the following line to <filename>~/.orbitrc</filename>
-      using the following command:</para>
-
-<screen><userinput>cat &gt;&gt; ~/.orbitrc &lt;&lt; "EOF"
-<literal>ORBIIOPIPv4=1</literal>
-
-EOF</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>None</seg>
-        <seg>libjava-access-bridge-jni.{so,a}, gnome-java-bridge.jar, and JNav.jar</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/jar</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjava-access-bridge-jni">
-        <term><filename class='libraryfile'>libjava-access-bridge-jni.{so,a}</filename></term>
-        <listitem>
-          <para>is the JNI interface library.</para>
-          <indexterm zone="java-access-bridge libjava-access-bridge-jni">
-            <primary sortas="c-libjava-access-bridge-jni">libjava-access-bridge-jni.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-java-bridge">
-        <term><filename class='libraryfile'>gnome-java-bridge.jar</filename></term>
-        <listitem>
-          <para>is a <application>Java</application> runtime environment
-          extension that connects the built-in accessibility support in
-          <application>Java Swing</application> applications to the
-          <application>GNOME</application> Accessibility framework.</para>
-          <indexterm zone="java-access-bridge gnome-java-bridge">
-            <primary sortas="c-gnome-java-bridge">gnome-java-bridge.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/libgail-gnome.xml
===================================================================
--- archive/gnome-obsolete/libgail-gnome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +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 libgail-gnome-download-http "&gnome-download-http;/libgail-gnome/1.20/libgail-gnome-&libgail-gnome-version;.tar.bz2">
-  <!ENTITY libgail-gnome-download-ftp  "&gnome-download-ftp;/libgail-gnome/1.20/libgail-gnome-&libgail-gnome-version;.tar.bz2">
-  <!ENTITY libgail-gnome-md5sum        "11fde9cc917c2572c87bfda10cc52751">
-  <!ENTITY libgail-gnome-size          "230 KB">
-  <!ENTITY libgail-gnome-buildsize     "3 MB">
-  <!ENTITY libgail-gnome-time          "0.1 SBU">
-]>
-
-<sect1 id="libgail-gnome" xreflabel="libgail-gnome-&libgail-gnome-version;">
-  <?dbhtml filename="libgail-gnome.html"?>
-
-
-  <title>libgail-gnome-&libgail-gnome-version;</title>
-
-  <indexterm zone="libgail-gnome">
-    <primary sortas="a-Libgail-gnome">Libgail-gnome</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgail-gnome</title>
-
-    <para>The <application>libgail-gnome</application> package contains the
-    <application>GNOME</application> Accessibility Implementation library
-    additions which implement <application>ATK</application> interfaces for
-    <application>libbonoboui</application> and
-    <application>libgnomeui</application> widgets.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgail-gnome-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgail-gnome-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgail-gnome-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgail-gnome-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgail-gnome-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgail-gnome-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgail-gnome Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="at-spi"/>,
-    <xref linkend="gnome-panel"/>, and
-    <xref linkend="libgnomeui"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgail-gnome"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgail-gnome</title>
-
-    <para>Install <application>libgail-gnome</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </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>libgail-gnome.so <application>GTK+</application> module</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgail-gnome-lib">
-        <term><filename class='libraryfile'>libgail-gnome.so</filename></term>
-        <listitem>
-          <para>library module is a <application>GAIL</application> addition
-          which implements <application>ATK</application> interfaces for
-          <application>libbonoboui</application> and
-          <application>libgnomeui</application> widgets.</para>
-          <indexterm zone="libgail-gnome libgail-gnome-lib">
-            <primary sortas="c-libgail-gnome">libgail-gnome.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/libgnomecups.xml
===================================================================
--- archive/gnome-obsolete/libgnomecups.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +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 libgnomecups-download-http "&gnome-download-http;/libgnomecups/0.2/libgnomecups-&libgnomecups-version;.tar.bz2">
-  <!ENTITY libgnomecups-download-ftp  "&gnome-download-ftp;/libgnomecups/0.2/libgnomecups-&libgnomecups-version;.tar.bz2">
-  <!ENTITY libgnomecups-md5sum        "dc4920c15c9f886f73ea74fbff0ae48b">
-  <!ENTITY libgnomecups-size          "349 KB">
-  <!ENTITY libgnomecups-buildsize     "4 MB">
-  <!ENTITY libgnomecups-time          "0.1 SBU">
-]>
-
-<sect1 id="libgnomecups" xreflabel="libgnomecups-&libgnomecups-version;">
-  <?dbhtml filename="libgnomecups.html"?>
-
-
-  <title>libgnomecups-&libgnomecups-version;</title>
-
-  <indexterm zone="libgnomecups">
-    <primary sortas="a-Libgnomecups">Libgnomecups</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomecups</title>
-
-    <para>The <application>libgnomecups</application> package contains a
-    library used to wrap the <application>CUPS</application> API in a
-    <application>GLib</application> fashion, so
-    <application>CUPS</application> code can be cleanly
-    integrated with <application>GLib</application> code.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomecups-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomecups-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomecups-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomecups-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomecups-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomecups-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomecups Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="cups"/>,
-    <xref linkend="glib2"/>, and
-    <xref linkend="perl-xml-parser"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnomecups"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomecups</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>libgnomecups</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgnomecups-1.0.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/include/libgnomecups-1/libgnomecups</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnomecups-lib">
-        <term><filename class='libraryfile'>libgnomecups-1.0.{so,a}</filename></term>
-        <listitem>
-          <para>libraries are used to wrap the <application>CUPS</application>
-          API in a <application>GLib</application> type interface.</para>
-          <indexterm zone="libgnomecups libgnomecups-lib">
-            <primary sortas="c-libgnomecups">libgnomecups-1.0.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/libgnomeprint.xml
===================================================================
--- archive/gnome-obsolete/libgnomeprint.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 libgnomeprint-download-http "&gnome-download-http;/libgnomeprint/2.18/libgnomeprint-&libgnomeprint-version;.tar.bz2">
-  <!ENTITY libgnomeprint-download-ftp  "&gnome-download-ftp;/libgnomeprint/2.18/libgnomeprint-&libgnomeprint-version;.tar.bz2">
-  <!ENTITY libgnomeprint-md5sum        "d66b81ee8aa3b3a33f5efc9a47ce07e3">
-  <!ENTITY libgnomeprint-size          "838 KB">
-  <!ENTITY libgnomeprint-buildsize     "26 MB">
-  <!ENTITY libgnomeprint-time          "0.6 SBU">
-]>
-
-<sect1 id="libgnomeprint" xreflabel="libgnomeprint-&libgnomeprint-version;">
-  <?dbhtml filename="libgnomeprint.html"?>
-
-
-  <title>libgnomeprint-&libgnomeprint-version;</title>
-
-  <indexterm zone="libgnomeprint">
-    <primary sortas="a-Libgnomeprint">Libgnomeprint</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomeprint</title>
-
-    <para>The <application>libgnomeprint</application> package contains
-    <filename class="libraryfile">libgnomeprint</filename> libraries.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomeprint-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomeprint-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomeprint-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomeprint-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomeprint-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomeprint-time;</para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">libgnomeprint Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pango"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="libart_lgpl"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="perl-xml-parser"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgnomecups"/>,
-    <xref linkend="gtk-doc"/>, and
-    <xref linkend="docbook-utils"/></para>
-
-    <para>If you have <xref linkend="cups"/> installed, you must also have
-    <xref linkend="libgnomecups"/> installed or pass
-    <option>--without-cups</option> to the <command>configure</command>
-    command in the instructions below.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnomeprint"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomeprint</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>libgnomeprint</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --disable-gtk-doc &amp;&amp;
-make</userinput></screen>
-
-    <para>The test suite requires <application>Acroread-4</application> to be
-    installed and passing <option>--with-metadata-printer</option> to the
-    <command>configure</command> script. If the previous requirements are met
-    and you wish to run the regression tests, change directories to the
-    <filename class='directory'>tests</filename> directory and issue:
-    <command>./run-test.pl</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><parameter>--disable-gtk-doc</parameter>: This switch prevents
-    rebuilding the documentation during the <command>make</command>
-    command. Remove this parameter if you have
-    <application>GTK-Doc</application> installed and wish to rebuild the
-    documentation.</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>libgnomeprint-2-2.{so,a}, libgnomeprint-clip.{so,a},
-        libgnomeprint-draft.{so,a}, libgnomeprint-frgba.{so,a},
-        libgnomeprint-multipage.{so,a}, libgnomeprint-position.{so,a},
-        libgnomeprint-reorder.{so,a}, libgnomeprint-reverse.{so,a},
-        libgnomeprint-rotate.{so,a}, libgnomeprint-select.{so,a},
-        libgnomeprint-zoom.{so,a}, libgnomeprintcups.{so,a},
-        libgnomeprintlpd.{so,a}, libgnomeprint-custom.{so,a},
-        libgnomeprint-file.{so,a}, and libgnomeprint-lpr.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomeprint-2.2/libgnomeprint/private,
-        lib/libgnomeprint/&libgnomeprint-version;/modules/{filters,transports},
-        share/{gtk-doc/html/libgnomeprint,
-        libgnomeprint/&libgnomeprint-version;/{models/uninstalled,
-        printers/uninstalled}}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnomeprint-2">
-        <term><filename class='libraryfile'>libgnomeprint-2-2.{so,a}</filename></term>
-        <listitem>
-          <para>implements the <application>GNOME</application> Printing
-          Architecture.</para>
-          <indexterm zone="libgnomeprint libgnomeprint-2">
-            <primary sortas="c-libgnomeprint-2-2">libgnomeprint-2-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/libgnomeprintui.xml
===================================================================
--- archive/gnome-obsolete/libgnomeprintui.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +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 libgnomeprintui-download-http "&gnome-download-http;/libgnomeprintui/2.18/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
-  <!ENTITY libgnomeprintui-download-ftp  "&gnome-download-ftp;/libgnomeprintui/2.18/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
-  <!ENTITY libgnomeprintui-md5sum        "66c1cf3a9ead428585c2c44e6110ebb7">
-  <!ENTITY libgnomeprintui-size          "661 KB">
-  <!ENTITY libgnomeprintui-buildsize     "20 MB">
-  <!ENTITY libgnomeprintui-time          "0.3 SBU">
-]>
-
-<sect1 id="libgnomeprintui" xreflabel="libgnomeprintui-&libgnomeprintui-version;">
-  <?dbhtml filename="libgnomeprintui.html"?>
-
-
-  <title>libgnomeprintui-&libgnomeprintui-version;</title>
-
-  <indexterm zone="libgnomeprintui">
-    <primary sortas="a-libgnomeprintui">libgnomeprintui</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomeprintui</title>
-
-    <para>The <application>libgnomeprintui</application> package contains
-    the <filename class="libraryfile">libgnomeprintui</filename>
-    library.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomeprintui-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomeprintui-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomeprintui-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomeprintui-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomeprintui-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomeprintui-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomeprintui Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomecanvas"/>,
-    <xref linkend="gnome-icon-theme"/>, and
-    <xref linkend="libgnomeprint"/></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;/libgnomeprintui"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomeprintui</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>libgnomeprintui</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><option>--enable-gtk-doc</option>: Use this option if you have
-    <application>GTK-Doc</application> installed and wish to build the API
-    documentation, as the source tarball does not contain any pre-built
-    docs.</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>libgnomeprintui-2-2.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomeprintui-2.2/libgnomeprintui,
-        share/{gtk-doc/html/libgnomeprintui,
-        libgnomeprintui/&libgnomeprintui-version;}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnomeprintui-2">
-        <term><filename class='libraryfile'>libgnomeprintui-2-2.{so,a}</filename></term>
-        <listitem>
-          <para>is the GUI portion of the <application>GNOME</application>
-          Printing Architecture implementation.</para>
-          <indexterm zone="libgnomeprintui libgnomeprintui-2">
-            <primary sortas="c-libgnomeprintui-2-2">libgnomeprintui-2-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/liboobs.xml
===================================================================
--- archive/gnome-obsolete/liboobs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,135 +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 liboobs-download-http "&gnome-download-http;/liboobs/&gnome-version;/liboobs-&liboobs-version;.tar.bz2">
-  <!ENTITY liboobs-download-ftp  "&gnome-download-ftp;/liboobs/&gnome-version;/liboobs-&liboobs-version;.tar.bz2">
-  <!ENTITY liboobs-md5sum        "65abd1254c63aea04fc1879c21e0051d">
-  <!ENTITY liboobs-size          "361 KB">
-  <!ENTITY liboobs-buildsize     "9 MB">
-  <!ENTITY liboobs-time          "0.2 SBU">
-]>
-
-<sect1 id="liboobs" xreflabel="liboobs-&liboobs-version;">
-  <?dbhtml filename="liboobs.html"?>
-
-
-  <title>liboobs-&liboobs-version;</title>
-
-  <indexterm zone="liboobs">
-    <primary sortas="a-liboobs">liboobs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liboobs</title>
-
-    <para>The <application>liboobs</application> package is a wrapping library
-    to the System Tools Backends, it provides easy to access GObjects to system
-    configuration details.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&liboobs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&liboobs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &liboobs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &liboobs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &liboobs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &liboobs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liboobs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="system-tools-backends"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/liboobs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liboobs</title>
-
-    <para>Install <application>liboobs</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>liboobs-1.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/liboobs-1.0/oobs,
-        share/gtk-doc/html/liboobs}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liboobs-1">
-        <term><filename class='libraryfile'>liboobs-1.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>liboobs</application> API
-          functions.</para>
-          <indexterm zone="liboobs liboobs-1">
-            <primary sortas="c-liboobs-1">liboobs-1.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/nautilus-cd-burner.xml
===================================================================
--- archive/gnome-obsolete/nautilus-cd-burner.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +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 nautilus-cd-burner-download-http "&gnome-download-http;/nautilus-cd-burner/2.18/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-download-ftp  "&gnome-download-http;/nautilus-cd-burner/2.18/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-md5sum        "fee9ec2f398a6b1eacfd59e239d06837">
-  <!ENTITY nautilus-cd-burner-size          "740 KB">
-  <!ENTITY nautilus-cd-burner-buildsize     "15 MB">
-  <!ENTITY nautilus-cd-burner-time          "0.3 SBU">
-]>
-
-<sect1 id="nautilus-cd-burner"
-xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
-  <?dbhtml filename="nautilus-cd-burner.html"?>
-
-
-  <title>Nautilus CD Burner-&nautilus-cd-burner-version;</title>
-
-  <indexterm zone="nautilus-cd-burner">
-    <primary sortas="a-Nautilus-CD-Burner">Nautilus CD Burner</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nautilus CD Burner</title>
-
-    <para>The <application>Nautilus CD Burner</application> package provides
-    an easy method to write files to a CD or DVD burner with
-    <application>GNOME</application>; by drag-and-dropping files using the
-    <application>GNOME</application> file manager,
-    <application>Nautilus</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nautilus-cd-burner-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nautilus-cd-burner-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nautilus-cd-burner-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nautilus-cd-burner-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nautilus-cd-burner-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nautilus-cd-burner-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nautilus CD Burner Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="nautilus"/>
-    and <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnome-mount"/> and
-    <xref linkend="intltool"/></para>
-
-    <para>Though <application>Nautilus CD Burner</application> happily passes
-    all the <command>configure</command> script checks and then builds
-    successfully without them, the
-    <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink>
-    and <xref linkend="dvd-rw-tools"/> packages are required to be installed or
-    you won't be able to create ISO filesystems or burn CDs and DVDs.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/NautilusCdBurner"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nautilus CD Burner</title>
-
-    <para>Install <application>Nautilus CD Burner</application>
-    by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/nautilus-cd-burner &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/nautilus-cd-burner</parameter>: This parameter causes the
-    libexec files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/nautilus-cd-burner</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>nautilus-cd-burner</seg>
-        <seg>libnautilus-burn.so and gnome-vfs and nautilus modules</seg>
-        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
-        include/libnautilus-burn,
-        lib/nautilus-cd-burner and
-        share/nautilus-cd-burner</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nautilus-cd-burner-prog">
-        <term><command>nautilus-cd-burner</command></term>
-        <listitem>
-          <para>is an extension to <application>Nautilus</application>
-          that lets you burn CDs easily.</para>
-          <indexterm zone="nautilus-cd-burner nautilus-cd-burner-prog">
-            <primary sortas="b-nautilus-cd-burner">nautilus-cd-burner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/nautilus-media.xml
===================================================================
--- archive/gnome-obsolete/nautilus-media.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,103 +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 nautilus-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus-media/0.8/nautilus-media-&nautilus-media-version;.tar.bz2">
-<!ENTITY nautilus-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus-media/0.8/nautilus-media-&nautilus-media-version;.tar.bz2">
-<!ENTITY nautilus-media-md5sum "4ad604430b213a899c1217f5f4633887">
-<!ENTITY nautilus-media-size "418 KB">
-<!ENTITY nautilus-media-buildsize "7.9 MB">
-<!ENTITY nautilus-media-time "0.22 SBU">
-]>
-
-<sect1 id="nautilus-media" xreflabel="Nautilus Media-&nautilus-media-version;">
-<?dbhtml filename="nautilus-media.html"?>
-<title>Nautilus Media-&nautilus-media-version;</title>
-
-<sect2>
-<title>Introduction to <application>Nautilus Media</application></title>
-
-<para>The <application>Nautilus Media</application> package contains
-<application><acronym>GNOME</acronym></application>'s media applications
-used by <command>nautilus</command>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&nautilus-media-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&nautilus-media-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &nautilus-media-md5sum;</para></listitem>
-<listitem><para>Download size: &nautilus-media-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&nautilus-media-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&nautilus-media-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>Nautilus Media</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="gstreamer"/> and <xref linkend="nautilus"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Nautilus Media</application></title>
-
-<para>Install <application>Nautilus Media</application> by running the
-following commands:</para>
-
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--libexecdir=`pkg-config --variable=prefix
-ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
-<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-<para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-<para><parameter>--localstatedir=/var/lib</parameter>: This switch
-puts <application>ScrollKeeper</application> files in
-<filename class="directory">/var/lib/scrollkeeper</filename> instead of
-<filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>Nautilus Media</application> package contains
-<command>gst-thumbnail</command>,
-<command>nautilus-audio-view</command> and support libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>gst-thumbnail</title>
-<para><command>gst-thumbnail</command> thumbnails video files for
-<application>Nautilus</application>.</para></sect3>
-
-<sect3><title>nautilus-audio-view</title>
-<para><command>nautilus-audio-view</command> displays a directory as audio
-tracks.</para></sect3>
-
-</sect2>
-
-</sect1>
-
Index: chive/gnome-obsolete/obsolete.xml
===================================================================
--- archive/gnome-obsolete/obsolete.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<!-- Obsolete packages hrefs, keeping them here just to keep ../add.xml clean.
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alacarte.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bug-buddy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dasher.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deskbar-applet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-accessibility.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf-editor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-audio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-hicolor-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mag.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mount.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-netstatus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-speech.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-themes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs-monikers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-volume-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnopernicus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gok.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hamster-applet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java-access-bridge.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgail-gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomecups.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeprintui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeprint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboobs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus-cd-burner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus-media.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-tools-backends.xml"/>
-
--->
Index: chive/gnome-obsolete/seahorse-plugins.xml
===================================================================
--- archive/gnome-obsolete/seahorse-plugins.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +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 seahorse-plugins-download-http "&gnome-download-http;/seahorse-plugins/&gnome-version;/seahorse-plugins-&seahorse-plugins-version;.tar.bz2">
-  <!ENTITY seahorse-plugins-download-ftp  "&gnome-download-http;/seahorse-plugins/&gnome-version;/seahorse-plugins-&seahorse-plugins-version;.tar.bz2">
-  <!ENTITY seahorse-plugins-md5sum        "cb8a86a1039054b621f6419ac2219695">
-  <!ENTITY seahorse-plugins-size          "1.2 MB">
-  <!ENTITY seahorse-plugins-buildsize     "26 MB">
-  <!ENTITY seahorse-plugins-time          "1.0 SBU">
-]>
-
-<sect1 id="seahorse-plugins" xreflabel="seahorse-plugins-&seahorse-plugins-version;">
-  <?dbhtml filename="seahorse-plugins.html"?>
-
-
-  <title>seahorse-plugins-&seahorse-plugins-version;</title>
-
-  <indexterm zone="seahorse-plugins">
-    <primary sortas="a-seahorse-plugins">seahorse-plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to seahorse-plugins</title>
-
-    <para>The <application>seahorse-plugins</application> package contains
-    plugins and utilities for encryption in
-    <application>GNOME</application>.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&seahorse-plugins-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&seahorse-plugins-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &seahorse-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &seahorse-plugins-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &seahorse-plugins-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &seahorse-plugins-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">seahorse-plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="seahorse"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="avahi"/>,
-    <xref linkend="epiphany"/>,
-    <xref linkend="libbonoboui"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="gedit"/>,
-    <xref linkend="gnome-panel"/>,
-    <xref linkend="nautilus"/>,
-    <xref linkend="rarian"/>, and
-    <xref linkend="shared-mime-info"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/seahorse-plugins"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of seahorse-plugins</title>
-
-    <para>Install <application>seahorse-plugins</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --disable-scrollkeeper \
-            --disable-update-mime-database &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--disable-scrollkeeper</parameter>: Do not make updates to
-    the <application>scrollkeeper</application> database. Remove it if you have
-    <application>rarian</application> installed.</para>
-
-    <para><parameter>--disable-update-mime-database</parameter>: Do not run the
-    <application>update-mime-database</application> utility. Remove it if you
-    have <application>shared-mime-info</application> installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>seahorse-agent, seahorse-preferences, seahorse-tool, and
-        seahorse-applet</seg>
-        <seg>libseahorse-pgp.{so,a} and libnautilus-seahorse.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/{seahorse-applet/*,
-        seahorse-plugins/*},omf/{seahorse-applet,seahorse-plugins},
-        pixmaps/seahorse-plugins/{22x22,48x48,scalable},seahorse-plugins/ui}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="seahorse-agent">
-        <term><command>seahorse-agent</command></term>
-        <listitem>
-          <para>is a <application>seahorse</application> pass phrase caching
-          agent.</para>
-          <indexterm zone="seahorse-plugins seahorse-agent">
-            <primary sortas="b-seahorse-agent">seahorse-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--<varlistentry id="seahorse-preferences">
-        <term><command>seahorse-preferences</command></term>
-        <listitem>
-          <para></para>
-          <indexterm zone="seahorse-plugins seahorse-preferences">
-            <primary sortas="b-seahorse-preferences">seahorse-preferences</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="seahorse-tool">
-        <term><command>seahorse-tool</command></term>
-        <listitem>
-          <para>is a PGP/GnuPG file encryption for the <application>GNOME
-          Desktop</application>.</para>
-          <indexterm zone="seahorse-plugins seahorse-tool">
-            <primary sortas="b-seahorse-tool">seahorse-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--<varlistentry id="seahorse-applet">
-        <term><command>seahorse-applet</command></term>
-        <listitem>
-          <para></para>
-          <indexterm zone="seahorse-plugins seahorse-applet">
-            <primary sortas="b-seahorse-applet">seahorse-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libseahorse-pgp">
-        <term><filename class='libraryfile'>libseahorse-pgp.{so,a}</filename></term>
-        <listitem>
-          <para>is a <application>gedit</application> plugin.</para>
-          <indexterm zone="seahorse-plugins libseahorse-pgp">
-            <primary sortas="c-libseahorse-pgp">libseahorse-pgp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnautilus-seahorse">
-        <term><filename class='libraryfile'>libnautilus-seahorse.{so,a}</filename></term>
-        <listitem>
-          <para>is a <application>Nautilus</application> extension.</para>
-          <indexterm zone="seahorse-plugins libnautilus-seahorse">
-            <primary sortas="c-libnautilus-seahorse">libnautilus-seahorse.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-obsolete/system-tools-backends.xml
===================================================================
--- archive/gnome-obsolete/system-tools-backends.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,137 +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 system-tools-backends-download-http "&gnome-download-http;/system-tools-backends/2.9/system-tools-backends-&system-tools-backends-version;.tar.bz2">
-  <!ENTITY system-tools-backends-download-ftp  "&gnome-download-ftp;/system-tools-backends/2.9/system-tools-backends-&system-tools-backends-version;.tar.bz2">
-  <!ENTITY system-tools-backends-md5sum        "d12f83b03d0b9c2ed31557ed0193997b">
-  <!ENTITY system-tools-backends-size          "450 KB">
-  <!ENTITY system-tools-backends-buildsize     "5 MB">
-  <!ENTITY system-tools-backends-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="system-tools-backends"
-xreflabel="system-tools-backends-&system-tools-backends-version;">
-  <?dbhtml filename="system-tools-backends.html"?>
-
-
-  <title>system-tools-backends-&system-tools-backends-version;</title>
-
-  <indexterm zone="system-tools-backends">
-    <primary sortas="a-System-tools-backends">System-tools-backends</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to system-tools-backends</title>
-
-    <para>The <application>system-tools-backends</application> are a set of
-    cross-platform scripts for Linux and other Unix systems. The backends
-    provide a standard XML interface for modifying the configuration regardless
-    of the distribution being used.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&system-tools-backends-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&system-tools-backends-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &system-tools-backends-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &system-tools-backends-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &system-tools-backends-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &system-tools-backends-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">system-tools-backends Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <xref linkend="dbus-glib"/>, and
-    <xref linkend="polkit"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink
-    url="http://search.cpan.org/~danberr/Net-DBus-0.33.6/">Net::DBus</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/system-tools-backends"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of system-tools-backends</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>system-tools-backends</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>system-tools-backends</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/system-tools-backends-2.0/{files,
-        scripts/{Init,Network,Shares,Time,Users,Utils}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term>System tools backend scripts</term>
-        <listitem>
-          <para>are configuration files, <application>Perl</application>
-          and shell scripts used to perform setup of various desktop frontend
-          processes and services.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-tweak-tool.xml
===================================================================
--- archive/gnome-tweak-tool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 gnome-tweak-tool-download-http
-           "&gnome-download-http;/gnome-tweaks/&gnome-minor-28;/gnome-tweak-tool-&gnome-tweaks-version;.tar.xz">
-  <!ENTITY gnome-tweak-tool-download-ftp
-           "&gnome-download-ftp;/gnome-tweaks/&gnome-minor-28;/gnome-tweak-tool-&gnome-tweaks-version;.tar.xz">
-  <!ENTITY gnome-tweaks-md5sum        "2018fc13a1e61fbaff3ee53b4968d7eb">
-  <!ENTITY gnome-tweaks-size          "248 KB">
-  <!ENTITY gnome-tweaks-buildsize     "3.0 MB">
-  <!ENTITY gnome-tweaks-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-tweaks" xreflabel="gnome-tweaks-&gnome-tweaks-version;" revision="systemd">
-  <?dbhtml filename="gnome-tweaks.html"?>
-
-
-  <title>gnome-tweaks-&gnome-tweaks-version;</title>
-
-  <indexterm zone="gnome-tweaks">
-    <primary sortas="a-gnome-tweaks">gnome-tweaks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Tweaks</title>
-
-    <para>
-      <application>GNOME Tweaks</application> is a simple program used
-      to tweak advanced <application>GNOME</application> settings.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-tweaks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-tweaks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-tweaks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-tweaks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-tweaks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-tweaks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Tweaks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="gsettings-desktop-schemas"/>, and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-tweaks"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Tweaks</title>
-
-    <para>
-      Install <application>GNOME Tweaks</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>
-      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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-tweaks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/gtweak and
-          /usr/share/gnome-tweaks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-tweaks-prog">
-        <term><command>gnome-tweaks</command></term>
-        <listitem>
-          <para>
-            is used to tweak advanced <application>GNOME</application>
-            settings.
-          </para>
-          <indexterm zone="gnome-tweaks gnome-tweaks-prog">
-            <primary sortas="b-gnome-tweaks">gnome-tweaks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome-video-effects.xml
===================================================================
--- archive/gnome-video-effects.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-video-effects-download-http
-           "&gnome-download-http;/gnome-video-effects/0.6/gnome-video-effects-&gnome-video-effects-version;.tar.xz">
-  <!ENTITY gnome-video-effects-download-ftp  " ">
-  <!ENTITY gnome-video-effects-md5sum        "dd2b93c3da1aad22a2e3e3e44402f3d6">
-  <!ENTITY gnome-video-effects-size          "92 KB">
-  <!ENTITY gnome-video-effects-buildsize     "1.8 MB">
-  <!ENTITY gnome-video-effects-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-video-effects" xreflabel="gnome-video-effects-&gnome-video-effects-version;">
-  <?dbhtml filename="gnome-video-effects.html"?>
-
-
-  <title>gnome-video-effects-&gnome-video-effects-version;</title>
-
-  <indexterm zone="gnome-video-effects">
-    <primary sortas="a-gnome-video-effects">gnome-video-effects</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Video Effects</title>
-
-    <para>
-      The <application>GNOME Video Effects</application> package contains
-      a collection of <application>GStreamer</application> effects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-video-effects-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-video-effects-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-video-effects-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-video-effects-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-video-effects-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-video-effects-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Video Effects</title>
-
-    <para>
-      Install <application>GNOME Video Effects</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-video-effects
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/accerciser.xml
===================================================================
--- archive/gnome/accerciser.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +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 accerciser-download-http
-           "&gnome-download-http;/accerciser/3.4/accerciser-&accerciser-version;.tar.xz">
-  <!ENTITY accerciser-download-ftp
-           "&gnome-download-ftp;/accerciser/3.4/accerciser-&accerciser-version;.tar.xz">
-  <!ENTITY accerciser-md5sum        "fba7edb13dd80ef63e6044b411a6a84f">
-  <!ENTITY accerciser-size          "3.0 MB">
-  <!ENTITY accerciser-buildsize     "20 MB">
-  <!ENTITY accerciser-time          "0.4 SBU">
-]>
-
-<sect1 id="accerciser" xreflabel="Accerciser-&accerciser-version;">
-  <?dbhtml filename="accerciser.html"?>
-
-
-  <title>Accerciser-&accerciser-version;</title>
-
-  <indexterm zone="accerciser">
-    <primary sortas="a-Accerciser">Accerciser</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Accerciser</title>
-
-    <para>
-      <application>Accerciser</application> is an accessibility explorer for the
-      <application>GNOME</application> Desktop. It uses <application>At-Spi2</application>
-      to inspect and control widgets, allowing you to check if an application is providing
-      correct information to assistive technologies and automated test frameworks.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&accerciser-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&accerciser-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &accerciser-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &accerciser-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &accerciser-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &accerciser-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Accerciser Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-atk"/>,
-      <xref linkend="ipython"/> and
-      <xref linkend="pyatspi2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/accerciser"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Accerciser</title>
-
-    <para>
-      Install <application>Accerciser</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accerciser
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/accerciser,
-          /usr/share/accerciser and
-          /usr/share/gnome/help/accerciser
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accerciser-prog">
-        <term><command>accerciser</command></term>
-        <listitem>
-          <para>
-            is an interactive Python accessibility explorer
-            for the <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="accerciser accerciser-prog">
-            <primary sortas="b-accerciser">accerciser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/aisleriot.xml
===================================================================
--- archive/gnome/aisleriot.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 aisleriot-download-http "&gnome-download-http;/aisleriot/3.6/aisleriot-&aisleriot-version;.tar.xz">
-  <!ENTITY aisleriot-download-ftp  "&gnome-download-ftp;/aisleriot/3.6/aisleriot-&aisleriot-version;.tar.xz">
-  <!ENTITY aisleriot-md5sum        "70a3ac85ffecbb08b17b047677c99e5d">
-  <!ENTITY aisleriot-size          "4.0 MB">
-  <!ENTITY aisleriot-buildsize     "70 MB">
-  <!ENTITY aisleriot-time          "0.5 SBU">
-]>
-
-<sect1 id="aisleriot" xreflabel="Aisleriot-&aisleriot-version;">
-  <?dbhtml filename="aisleriot.html"?>
-
-
-  <title>Aisleriot-&aisleriot-version;</title>
-
-  <indexterm zone="aisleriot">
-    <primary sortas="a-Aisleriot">Aisleriot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Aisleriot</title>
-
-    <para>
-      <application>Aisleriot</application> (also known as Solitaire or sol) is a
-      collection of card games which are easy to play with the aid of a mouse. The rules
-      for the games have been coded for your pleasure in the
-      <application>GNOME</application> scripting language (Scheme).
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&aisleriot-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&aisleriot-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &aisleriot-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &aisleriot-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &aisleriot-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &aisleriot-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Aisleriot Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="guile"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="librsvg"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/aisleriot"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Aisleriot</title>
-
-    <para>
-      Install <application>Aisleriot</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib &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>
-          sol
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/aisleriot,
-          /usr/share/aisleriot and
-          /usr/share/help/*/aisleriot
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sol">
-        <term><command>sol</command></term>
-        <listitem>
-          <para>
-            is a collection of card games.
-          </para>
-          <indexterm zone="aisleriot sol">
-            <primary sortas="b-sol">sol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/alacarte.xml
===================================================================
--- archive/gnome/alacarte.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +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 alacarte-download-http "&gnome-download-http;/alacarte/3.6/alacarte-&alacarte-version;.tar.xz">
-  <!ENTITY alacarte-download-ftp  "&gnome-download-ftp;/alacarte/3.6/alacarte-&alacarte-version;.tar.xz">
-  <!ENTITY alacarte-md5sum        "4b801fa3125b82d0a29b4ff83d9e9d5b">
-  <!ENTITY alacarte-size          "176 KB">
-  <!ENTITY alacarte-buildsize     "3.4 MB">
-  <!ENTITY alacarte-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="alacarte" xreflabel="Alacarte-&alacarte-version;">
-  <?dbhtml filename="alacarte.html"?>
-
-
-  <title>Alacarte-&alacarte-version;</title>
-
-  <indexterm zone="alacarte">
-    <primary sortas="a-Alacarte">Alacarte</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Alacarte</title>
-
-    <para>
-      <application>Alacarte</application> is a menu editor for
-      <application>GNOME</application> Desktop using the
-      freedesktop.org menu specification.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alacarte-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alacarte-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alacarte-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alacarte-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alacarte-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alacarte-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Alacarte Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-menus"/> and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/alacarte"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Alacarte</title>
-
-    <para>
-      Install <application>Alacarte</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>
-          alacarte
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/Alacarte and
-          /usr/share/alacarte
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="alacarte-prog">
-        <term><command>alacarte</command></term>
-        <listitem>
-          <para>
-            is a menu editor for <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="alacarte alacarte-prog">
-            <primary sortas="b-alacarte">alacarte</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/anjuta.xml
===================================================================
--- archive/gnome/anjuta.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +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 anjuta-download-http "&gnome-download-http;/anjuta/3.4/anjuta-&anjuta-version;.tar.xz">
-  <!ENTITY anjuta-download-ftp  "&gnome-download-ftp;/anjuta/3.4/anjuta-&anjuta-version;.tar.xz">
-  <!ENTITY anjuta-md5sum        "b6a8093a8096a2337db1b50464eec1ea">
-  <!ENTITY anjuta-size          "5.7 MB">
-  <!ENTITY anjuta-buildsize     "220 MB">
-  <!ENTITY anjuta-time          "4.0 SBU">
-]>
-
-<sect1 id="anjuta" xreflabel="Anjuta-&anjuta-version;">
-  <?dbhtml filename="anjuta.html"?>
-
-
-  <title>Anjuta-&anjuta-version;</title>
-
-  <indexterm zone="anjuta">
-    <primary sortas="a-Anjuta">Anjuta</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Anjuta</title>
-
-    <para>
-      <application>Anjuta</application> is a versatile software development studio
-      featuring a number of advanced programming facilities including project
-      management, application wizard, interactive debugger, source editor,
-      version control, GUI designer, profiler.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&anjuta-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&anjuta-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &anjuta-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &anjuta-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &anjuta-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &anjuta-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Anjuta Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdl"/>,
-      <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="gtksourceview"/>,
-      <xref linkend="libgda"/> and
-      <xref linkend="vte"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="autogen"/>,
-      <xref linkend="devhelp"/>,
-      <xref linkend="glade"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="rarian"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="subversion"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/anjuta"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Anjuta</title>
-
-    <para>
-      Install <application>Anjuta</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-packagekit &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-packagekit</option>: This parameter disables use
-      of PackageKit which isn't suitable for BLFS.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          anjuta, anjuta-launcher and anjuta-tags
-        </seg>
-        <seg>
-          libanjuta-3.so
-        </seg>
-        <seg>
-          /usr/include/libanjuta-3.0,
-          /usr/lib/anjuta,
-          /usr/share/anjuta,
-          /usr/share/doc/anjuta,
-          /usr/share/gnome/help/{anjuta-build-tutorial,anjuta-faqs,anjuta-manual},
-          /usr/share/gtk-doc/html/libanjuta and
-          /usr/share/pixmaps/anjuta
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="anjuta-prog">
-        <term><command>anjuta</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Integrated
-            Development Environment.
-          </para>
-          <indexterm zone="anjuta anjuta-prog">
-            <primary sortas="b-anjuta-prog">anjuta</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="anjuta-launcher">
-        <term><command>anjuta-launcher</command></term>
-        <listitem>
-          <para>
-            is invoked by <application>Anjuta</application> to
-            launch programs from within the IDE and to
-            initialize a terminal for a debugging session.
-          </para>
-          <indexterm zone="anjuta anjuta-launcher">
-            <primary sortas="b-anjuta-launcher">anjuta-launcher</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-3">
-        <term><filename class='libraryfile'>libanjuta-3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Anjuta</application> API functions.
-          </para>
-          <indexterm zone="anjuta libanjuta-3">
-            <primary sortas="c-libanjuta-3">libanjuta-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/cantarell-fonts.xml
===================================================================
--- archive/gnome/cantarell-fonts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,122 +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 cantarell-fonts-download-http
-           "&gnome-download-http;/cantarell-fonts/0.0/cantarell-fonts-&cantarell-fonts-version;.tar.xz">
-  <!ENTITY cantarell-fonts-download-ftp
-           "&gnome-download-ftp;/cantarell-fonts/0.0/cantarell-fonts-&cantarell-fonts-version;.tar.xz">
-  <!ENTITY cantarell-fonts-md5sum        "606275190e4c1927ce4b4cfdb55363a2">
-  <!ENTITY cantarell-fonts-size          "308 KB">
-  <!ENTITY cantarell-fonts-buildsize     "1.4 MB">
-  <!ENTITY cantarell-fonts-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="cantarell-fonts" xreflabel="cantarell-fonts-&cantarell-fonts-version;">
-  <?dbhtml filename="cantarell-fonts.html"?>
-
-
-  <title>cantarell-fonts-&cantarell-fonts-version;</title>
-
-  <indexterm zone="cantarell-fonts">
-    <primary sortas="a-cantarell-fonts">cantarell-fonts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cantarell Fonts</title>
-
-    <para>
-      The <application>Cantarell</application> typeface family is
-      a contemporary Humanist sans serif, and is used by the GNOME
-      project for its user interface.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cantarell-fonts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cantarell-fonts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cantarell-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cantarell-fonts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cantarell-fonts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cantarell-fonts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cantarell Fonts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fontconfig"/> and
-      <xref linkend="pkgconfig"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/cantarell-fonts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cantarell Fonts</title>
-
-    <para>
-      Install <application>Cantarell Fonts</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          /usr/share/fonts/cantarell
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/caribou-new.xml
===================================================================
--- archive/gnome/caribou-new.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,197 +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 caribou-download-http "&gnome-download-http;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-download-ftp  "&gnome-download-ftp;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-md5sum        "16b76cd7453b99e2871e8d4da88bf976">
-  <!ENTITY caribou-size          "420 KB">
-  <!ENTITY caribou-buildsize     "13 MB">
-  <!ENTITY caribou-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="caribou" xreflabel="Caribou-&caribou-version;">
-  <?dbhtml filename="caribou.html"?>
-
-
-  <title>Caribou-&caribou-version;</title>
-
-  <indexterm zone="caribou">
-    <primary sortas="a-Caribou">Caribou</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Caribou</title>
-
-    <para>
-      <application>Caribou</application> is an input assistive technology
-      intended for switch and pointer users.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&caribou-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&caribou-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &caribou-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &caribou-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &caribou-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &caribou-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Caribou Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="libxklavier"/>,
-      <xref linkend="pygobject2"/>, and
-      <xref linkend="pygobject3"/> (needed regardless of what version of GTK is in use)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/> and
-      <xref linkend="vala"/> (with Valadoc installed)
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      For most <application>GNOME</application> users, this package is only
-      required as a compile-time dependency for other packages. If
-      you intend to use its keyboard you will require
-      <xref role="runtime" linkend="dbus-python"/>,
-      <xref role="runtime" linkend="dconf"/> and
-      <xref role="runtime" linkend="pyatspi2"/> at runtime.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/caribou"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Caribou</title>
-
-    <para>
-      Install <application>Caribou</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 ./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --disable-gtk2-module \
-            --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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-gtk2-module</parameter>: Because
-      <application>GNOME</application> now uses
-      <application>GTK+-3</application>, this module has no use
-      on a <application>GNOME</application> desktop. Remove
-      this switch if you still want to build the
-      <application>GTK+-2</application> module.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          caribou (library executable),
-          antler (library executable),
-          and caribou-preferences
-        </seg>
-        <seg>
-          libcaribou.so
-        </seg>
-        <seg>
-          /usr/include/libcaribou,
-          /usr/lib/python&python2-majorver;/site-packages/caribou,
-          /usr/share/antler and
-          /usr/share/caribou
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcaribou">
-        <term><filename class="libraryfile">libcaribou.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Caribou</application> API functions.
-          </para>
-          <indexterm zone="caribou libcaribou">
-            <primary sortas="c-libcaribou">libcaribou.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/caribou.xml
===================================================================
--- archive/gnome/caribou.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 caribou-download-http "&gnome-download-http;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-download-ftp  "&gnome-download-ftp;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-md5sum        "02f6c153723ab89f67d5644df6c27b52">
-  <!ENTITY caribou-size          "352 KB">
-  <!ENTITY caribou-buildsize     "10 MB">
-  <!ENTITY caribou-time          "0.1 SBU">
-]>
-
-<sect1 id="caribou" xreflabel="Caribou-&caribou-version;">
-  <?dbhtml filename="caribou.html"?>
-
-
-  <title>Caribou-&caribou-version;</title>
-
-  <indexterm zone="caribou">
-    <primary sortas="a-caribou">caribou</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Caribou</title>
-
-    <para>
-      <application>Caribou</application> is an input assistive technology
-      intended for switch and pointer users.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&caribou-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&caribou-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &caribou-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &caribou-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &caribou-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &caribou-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Caribou Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="libxklavier"/> and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      For most <application>GNOME</application> users, this package is only
-      required as a compile-time dependency for other packages. If
-      you intend to use its keyboard you will require
-      <xref linkend="pyatspi2"/>,
-      <xref linkend="dbus-python"/> and
-      <xref linkend="dconf"/> at runtime.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/caribou"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Caribou</title>
-
-    <para>
-      Install <application>Caribou</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/caribou \
-            --disable-gtk2-module \
-            --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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-gtk2-module</option>: Because <application>GNOME</application>
-      now uses <application>GTK+-3</application>, the module has no use on a
-      <application>GNOME</application> desktop.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          caribou and caribou-preferences
-        </seg>
-        <seg>
-          libcaribou.so
-        </seg>
-        <seg>
-          /usr/include/libcaribou,
-          /usr/lib/caribou,
-          /usr/lib/python&python2-majorver;/site-packages/caribou,
-          /usr/share/antler and
-          /usr/share/caribou
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--      <varlistentry id="caribou-prog">
-        <term><command>caribou</command></term>
-        <listitem>
-          <para>
-            does this .....
-          </para>
-          <indexterm zone="caribou caribou-prog">
-            <primary sortas="b-caribou">caribou</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="caribou-preferences">
-        <term><command>caribou-preferences</command></term>
-        <listitem>
-          <para>
-            does this .....
-          </para>
-          <indexterm zone="caribou caribou-preferences">
-            <primary sortas="b-caribou-preferences">caribou-preferences</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-      <varlistentry id="libcaribou">
-        <term><filename class="libraryfile">libcaribou.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Caribou</application> API functions.
-          </para>
-          <indexterm zone="caribou libcaribou">
-            <primary sortas="c-libcaribou">libcaribou.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/colord-gtk.xml
===================================================================
--- archive/gnome/colord-gtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 colord-gtk-download-http "http://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
-  <!ENTITY colord-gtk-download-ftp  " ">
-  <!ENTITY colord-gtk-md5sum        "f3ad262c060fc50c10805b744be7479d">
-  <!ENTITY colord-gtk-size          "268 KB">
-  <!ENTITY colord-gtk-buildsize     "4.0 MB">
-  <!ENTITY colord-gtk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;">
-  <?dbhtml filename="colord-gtk.html"?>
-
-
-  <title>colord-gtk-&colord-gtk-version;</title>
-
-  <indexterm zone="colord-gtk">
-    <primary sortas="a-colord-gtk">colord-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord GTK</title>
-
-    <para>
-      The <application>Colord GTK</application> package contains
-      <application>GTK+</application> bindings for
-      <application>Colord</application>.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord GTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </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;/colord-gtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord GTK</title>
-
-    <para>
-      Install <application>Colord GTK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala</option>: 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/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          libcolord-gtk.so
-        </seg>
-        <seg>
-          /usr/include/colord-1/colord-gtk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcolord-gtk">
-        <term><filename class="libraryfile">libcolord-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application>
-            <application>GTK+</application> bindings.
-          </para>
-          <indexterm zone="colord-gtk libcolord-gtk">
-            <primary sortas="c-libcolord-gtk">libcolord-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/devhelp.xml
===================================================================
--- archive/gnome/devhelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 devhelp-download-http "&gnome-download-http;/devhelp/3.4/devhelp-&devhelp-version;.tar.xz">
-  <!ENTITY devhelp-download-ftp  "&gnome-download-ftp;/devhelp/3.4/devhelp-&devhelp-version;.tar.xz">
-  <!ENTITY devhelp-md5sum        "d9428af3d308c1f97c2a2eebe6b451c0">
-  <!ENTITY devhelp-size          "484 KB">
-  <!ENTITY devhelp-buildsize     "12 MB">
-  <!ENTITY devhelp-time          "0.3 SBU">
-]>
-
-<sect1 id="devhelp" xreflabel="Devhelp-&devhelp-version;">
-  <?dbhtml filename="devhelp.html"?>
-
-
-  <title>Devhelp-&devhelp-version;</title>
-
-  <indexterm zone="devhelp">
-    <primary sortas="a-Devhelp">Devhelp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Devhelp</title>
-
-    <para>
-      <application>Devhelp</application> is an API documentation browser for GTK+
-      and <application>GNOME</application>. It works natively with
-      <application>GTK Doc</application>.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&devhelp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&devhelp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &devhelp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &devhelp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &devhelp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &devhelp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Devhelp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/> and
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/devhelp"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Devhelp</title>
-
-    <para>
-      Install <application>Devhelp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          devhelp
-        </seg>
-        <seg>
-          libdevhelp-3.so
-        </seg>
-        <seg>
-          /usr/include/devhelp-3.0 and
-          /usr/share/devhelp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="devhelp-prog">
-        <term><command>devhelp</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Developers' Help program.
-          </para>
-          <indexterm zone="devhelp devhelp">
-            <primary sortas="b-devhelp">devhelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdevhelp-3">
-        <term><filename class='libraryfile'>libdevhelp-3.so</filename></term>
-        <listitem>
-          <para>
-            is a library that provides documentation browser functionality.
-          </para>
-          <indexterm zone="devhelp libdevhelp-3">
-            <primary sortas="c-libdevhelp-3">libdevhelp-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/dummy-additional.xml
===================================================================
--- archive/gnome/dummy-additional.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +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">
-
-
-  <title>Applications</title>
-  <para/>
-</sect1>
Index: chive/gnome/dummy-applications.xml
===================================================================
--- archive/gnome/dummy-applications.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +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">
-
-
-  <title>Applications</title>
-  <para/>
-</sect1>
-
Index: chive/gnome/dummy-desktop.xml
===================================================================
--- archive/gnome/dummy-desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +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">
-
-
-  <title>Desktop</title>
-  <para/>
-</sect1>
-
Index: chive/gnome/dummy-other.xml
===================================================================
--- archive/gnome/dummy-other.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +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">
-
-
-  <title>Other Packages</title>
-  <para/>
-</sect1>
Index: chive/gnome/dummy-runtime.xml
===================================================================
--- archive/gnome/dummy-runtime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +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" revision="sysv">
-
-
-  <title>Required Runtime Dependencies</title>
-  <para/>
-</sect1>
-
Index: chive/gnome/dummy-services.xml
===================================================================
--- archive/gnome/dummy-services.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +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">
-
-
-  <title>System Services</title>
-  <para/>
-</sect1>
-
Index: chive/gnome/empathy.xml
===================================================================
--- archive/gnome/empathy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,219 +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 empathy-download-http
-           "&gnome-download-http;/empathy/3.6/empathy-&empathy-version;.tar.xz">
-  <!ENTITY empathy-download-ftp
-           "&gnome-download-ftp;/empathy/3.6/empathy-&empathy-version;.tar.xz">
-  <!ENTITY empathy-md5sum        "b45dc0c996a7068efe897e6a22896943">
-  <!ENTITY empathy-size          "3.3 MB">
-  <!ENTITY empathy-buildsize     "120 MB">
-  <!ENTITY empathy-time          "1.1 SBU">
-]>
-
-<sect1 id="empathy" xreflabel="Empathy-&empathy-version;">
-  <?dbhtml filename="empathy.html"?>
-
-
-  <title>Empathy-&empathy-version;</title>
-
-  <indexterm zone="empathy">
-    <primary sortas="a-Empathy">Empathy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Empathy</title>
-
-    <para>
-      <application>Empathy</application> is an instant messaging program
-      which supports text, voice, and video chat and file transfers over many
-      different protocols.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&empathy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&empathy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &empathy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &empathy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &empathy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &empathy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Empathy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gst2"/>,
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="folks"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="telepathy-farstream"/>,
-      <xref linkend="telepathy-logger"/>,
-      <xref linkend="telepathy-mission-control"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/> and
-      <xref linkend="iso-codes"/>,
-      <xref linkend="nautilus-sendto"/> and
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cheese"/>,
-      <xref linkend="geoclue"/>,
-      <ulink url="&gnome-download-http;/geocode-glib">
-      geocode-glib</ulink>,
-      <ulink url="http://projects.gnome.org/libchamplain/">
-      libchamplain</ulink> and
-      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Protocols)</bridgehead>
-    <para role="optional">
-      <ulink url="http://telepathy.freedesktop.org/releases/telepathy-gabble/">
-      telepathy-gabble</ulink> (Jabber, Google Talk, XMPP),
-      <ulink url="http://telepathy.freedesktop.org/releases/telepathy-haze/">
-      telepathy-haze</ulink> (AIM, ICQ, Yahoo!),
-      <ulink url="http://telepathy.freedesktop.org/releases/telepathy-salut/">
-      telepathy-salut</ulink> (local network "Bonjour" - iChat-compatible) and
-      <ulink url="http://telepathy.freedesktop.org/releases/telepathy-sofiasip/">
-      telepathy-sofiasip</ulink> (SIP)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/empathy"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Empathy</title>
-
-    <para>
-      Install <application>Empathy</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/empathy \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          empathy, empathy-accounts and empathy-debugger
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/empathy,
-          /usr/lib/mission-control-plugins.0,
-          /usr/share/adium,
-          /usr/share/empathy and
-          /usr/share/help/*/empathy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="empathy-prog">
-        <term><command>empathy</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> instant messaging client
-            using <application>Telepathy</application>.
-          </para>
-          <indexterm zone="empathy empathy-prog">
-            <primary sortas="b-empathy">empathy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="empathy-accounts">
-        <term><command>empathy-accounts</command></term>
-        <listitem>
-          <para>
-            is an accounts configuration dialog for
-            <application>Empathy</application>.
-          </para>
-          <indexterm zone="empathy empathy-accounts">
-            <primary sortas="b-empathy-accounts">empathy-accounts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/epiphany-extensions.xml
===================================================================
--- archive/gnome/epiphany-extensions.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,314 +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 epiphany-extensions-download-http
-           "&gnome-download-http;/epiphany-extensions/3.6/epiphany-extensions-&epiphany-extensions-version;.tar.xz">
-  <!ENTITY epiphany-extensions-download-ftp
-           "&gnome-download-ftp;/epiphany-extensions/3.6/epiphany-extensions-&epiphany-extensions-version;.tar.xz">
-  <!ENTITY epiphany-extensions-md5sum     "9bc0c6c65f03a52f681c22ec9ccc0571">
-  <!ENTITY epiphany-extensions-size       "1.4 MB">
-  <!ENTITY epiphany-extensions-buildsize  "21 MB">
-  <!ENTITY epiphany-extensions-time       "0.2 SBU">
-]>
-
-<sect1 id="epiphany-extensions" xreflabel="Epiphany-Extensions-&epiphany-extensions-version;">
-  <?dbhtml filename="epiphany-extensions.html"?>
-
-
-  <title>Epiphany-Extensions-&epiphany-extensions-version;</title>
-
-  <indexterm zone="epiphany-extensions">
-    <primary sortas="a-Epiphany-Extensions">Epiphany-Extensions</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Epiphany Extensions</title>
-
-    <para>
-      <application>Epiphany Extensions</application> is a collection of
-      extensions for <application>Epiphany</application>, the
-      <application>GNOME</application> Web Browser.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&epiphany-extensions-download-http;"/>
-         </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&epiphany-extensions-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &epiphany-extensions-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &epiphany-extensions-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &epiphany-extensions-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &epiphany-extensions-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Epiphany Extensions Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="epiphany"/> and
-      <xref linkend="gnome-doc-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="opensp"/> and
-      <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/epiphany-extensions"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Epiphany Extensions</title>
-
-    <para>
-      Install <application>Epiphany Extensions</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Epiphany Extensions</title>
-
-    <para>
-      The extensions are all turned off until you go to
-      <application>Epiphany</application>'s tools menu and enable
-      the extensions you wish to use.
-    </para>
-
-    <para>
-      To use the html5tube extension, you need to go to <ulink
-      url="http://www.youtube.com/html5">http://www.youtube.com/html5</ulink>
-      and click on 'Join the HTML5 Trial' (needs cookies enabled, and must be
-      repeated for each browser on which you wish to use HTML5).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Extensions</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libactionsextension.so, libadblockextension.so,
-          libautoreloadextension.so,
-          libextensionsmanageruiextension.so,
-          libgesturesextension.so, libgreasemonkeyextension.so,
-          libhtml5tubeextension.so, libpushscrollerextension.so,
-          librssextension.so, libsoupflyextension.so,
-          libtabkeytabnavigateextension.so and
-          libtabstatesextension.so
-        </seg>
-        <seg>
-          /usr/lib/epiphany/3.6/extensions,
-          /usr/share/epiphany/icons/hicolor,
-          /usr/share/epiphany-extensions,
-          /usr/share/gnome/help/epiphany-extensions and
-          /usr/share/omf/epiphany-extensions
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libactionsextension">
-        <term><filename class="libraryfile">libactionsextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for executing arbitrary commands from the context menu.
-          </para>
-          <indexterm zone="epiphany-extensions libactionsextension">
-            <primary sortas="c-libactionsextension">libactionsextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libadblockextension">
-        <term><filename class="libraryfile">libadblockextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for blocking advertisements.
-          </para>
-          <indexterm zone="epiphany-extensions libadblockextension">
-            <primary sortas="c-libadblockextension">libadblockextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libautoreloadextension">
-        <term><filename class="libraryfile">libautoreloadextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for reloading a tab periodically.
-          </para>
-          <indexterm zone="epiphany-extensions libautoreloadextension">
-            <primary sortas="c-libautoreloadextension">libautoreloadextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgesturesextension">
-        <term><filename class="libraryfile">libgesturesextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for performing actions with mouse gestures.
-          </para>
-          <indexterm zone="epiphany-extensions libgesturesextension">
-            <primary sortas="c-libgesturesextension">libgesturesextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgreasemonkeyextension">
-        <term><filename class="libraryfile">libgreasemonkeyextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for running user scripts to modify web page's behaviour.
-          </para>
-          <indexterm zone="epiphany-extensions libgreasemonkeyextension">
-            <primary sortas="c-libgreasemonkeyextension">libgreasemonkeyextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhtml5tubeextension">
-        <term><filename class="libraryfile">libhtml5tubeextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for viewing most Youtube videos using WebKit's HTML5
-            media player.
-          </para>
-          <indexterm zone="epiphany-extensions libhtml5tubeextension">
-            <primary sortas="c-libhtml5tubeextension">libhtml5tubeextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpushscrollerextension">
-        <term><filename class="libraryfile">libpushscrollerextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for dragging the page with the middle mouse button.
-          </para>
-          <indexterm zone="epiphany-extensions libpushscrollerextension">
-            <primary sortas="c-libpushscrollerextension">libpushscrollerextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librssextension">
-        <term><filename class="libraryfile">librssextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for subscribing to a news feed offered by the webpage.
-          </para>
-          <indexterm zone="epiphany-extensions librssextension">
-            <primary sortas="c-librssextension">librssextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsoupflyextension">
-        <term><filename class="libraryfile">libsoupflyextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for debuging the Soup session which WebKit uses.
-          </para>
-          <indexterm zone="epiphany-extensions libsoupflyextension">
-            <primary sortas="c-libsoupflyextension">libsoupflyextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtabkeynavigateextension">
-        <term><filename class="libraryfile">libtabkeynavigateextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for using the tab key to navigate between tabs.
-          </para>
-          <indexterm zone="epiphany-extensions libtabkeynavigateextension">
-            <primary sortas="c-libtabkeynavigateextension">libtabkeynavigateextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtabstatesextension">
-        <term><filename class="libraryfile">libtabstatesextension.so</filename></term>
-        <listitem>
-          <para>
-            is an extension for indicating new content in background tabs.
-          </para>
-          <indexterm zone="epiphany-extensions libtabstatesextension">
-            <primary sortas="c-libtabstatesextension">libtabstatesextension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/evolution-data-server.xml
===================================================================
--- archive/gnome/evolution-data-server.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,314 +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 evolution-data-server-download-http
-           "&gnome-download-http;/evolution-data-server/3.6/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-download-ftp
-           "&gnome-download-ftp;/evolution-data-server/3.6/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-md5sum        "9a66998e1986a003c42222f41ea15d2e">
-  <!ENTITY evolution-data-server-size          "3.9 MB">
-  <!ENTITY evolution-data-server-buildsize     "225 MB">
-  <!ENTITY evolution-data-server-time          "2.2 SBU">
-]>
-
-<sect1 id="evolution-data-server"
-xreflabel="evolution-data-server-&evolution-data-server-version;">
-  <?dbhtml filename="evolution-data-server.html"?>
-
-
-  <title>evolution-data-server-&evolution-data-server-version;</title>
-
-  <indexterm zone="evolution-data-server">
-    <primary sortas="a-evolution-data-server">evolution-data-server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Evolution Data Server</title>
-
-    <para>
-      <application>Evolution Data Server</application> package provides
-      a unified backend for programs that work with contacts, tasks, and calendar
-      information. It was originally developed for
-      <application>Evolution</application> (hence the name), but is now used by
-      other packages as well.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&evolution-data-server-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&evolution-data-server-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &evolution-data-server-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &evolution-data-server-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &evolution-data-server-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &evolution-data-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Evolution Data Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="db"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="gperf"/>,
-      <xref linkend="libgdata"/>,
-      <xref linkend="libical"/> and
-      <xref linkend="nss"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgweather"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="mitkrb"/>,
-      a <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command) and
-      <xref linkend="openldap"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/evolution-data-server"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Evolution Data Server</title>
-
-    <para>
-      Install <application>Evolution Data Server</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/evolution-data-server \
-            --enable-vala-bindings &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!-- To test the results, issue: <command>make check</command>. -->
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala-bindings</option>: This switch enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para>
-      <option>--with-openldap</option>: Use this switch to enable
-      <application>OpenLDAP</application> support in
-      <application>Evolution Data Server</application>.
-    </para>
-
-    <para>
-      <parameter>--with-krb5=/usr</parameter>: Use this switch to
-      enable <application>Kerberos 5</application> support in
-      <application>Evolution Data Server</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <note>
-      <para>
-        To enable many of the optional dependencies, review the information
-        from <command>./configure --help</command> for the necessary parameters
-        you must pass to the <command>configure</command> script.
-      </para>
-    </note>
-
-  </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>
-          libcamel-1.2.so, libebackend-1.2.so, libebook-1.2.so,
-          libecal-1.2.so, libedata-book-1.2.so, libedata-cal-1.2.so,
-          libedataserver-1.2.so and libedataserverui-3.0.so
-        </seg>
-        <seg>
-          /usr/include/evolution-data-server-3.6,
-          /usr/lib/evolution-data-server,
-          /usr/share/evolution-data-server-3.6,
-          /usr/share/gtk-doc/html/camel,
-          /usr/share/gtk-doc/html/libebackend,
-          /usr/share/gtk-doc/html/libebook,
-          /usr/share/gtk-doc/html/libecal
-          /usr/share/gtk-doc/html/libedata-book,
-          /usr/share/gtk-doc/html/libedata-cal,
-          /usr/share/gtk-doc/html/libedataserver,
-          /usr/share/gtk-doc/html/libedataserverui and
-          /usr/share/pixmaps/evolution-data-server
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcamel-1">
-        <term><filename class="libraryfile">libcamel-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Evolution</application> MIME message
-            handling library.
-          </para>
-          <indexterm zone="evolution-data-server libcamel-1">
-            <primary sortas="c-libcamel-1">libcamel-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libebackend-1">
-        <term><filename class="libraryfile">libebackend-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the utility library for
-            <application>Evolution Data Server</application> Backends.
-          </para>
-          <indexterm zone="evolution-data-server libebackend-1">
-            <primary sortas="c-libebackend-1">libebackend-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libebook-1">
-        <term><filename class="libraryfile">libebook-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for <application>Evolution</application>
-            address books.
-          </para>
-          <indexterm zone="evolution-data-server libebook-1">
-            <primary sortas="c-libebook-1">libebook-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libecal-1">
-        <term><filename class="libraryfile">libecal-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for <application>Evolution</application>
-            calendars.
-          </para>
-          <indexterm zone="evolution-data-server libecal-1">
-            <primary sortas="c-libecal-1">libecal-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedata-book-1">
-        <term><filename class="libraryfile">libedata-book-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the backend library for <application>Evolution</application>
-            address books.
-          </para>
-          <indexterm zone="evolution-data-server libedata-book-1">
-            <primary sortas="c-libedata-book-1">libedata-book-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedata-cal-1">
-        <term><filename class="libraryfile">libedata-cal-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the backend library for <application>Evolution</application>
-            calendars.
-          </para>
-          <indexterm zone="evolution-data-server libedata-cal-1">
-            <primary sortas="c-libedata-cal-1">libedata-cal-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedataserver-1">
-        <term><filename class="libraryfile">libedataserver-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the utility library for
-            <application>Evolution Data Server</application>.
-          </para>
-          <indexterm zone="evolution-data-server libedataserver-1">
-            <primary sortas="c-libedataserver-1">libedataserver-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedataserverui-3">
-        <term><filename class="libraryfile">libedataserverui-3.0.so</filename></term>
-        <listitem>
-          <para>
-            is the GUI utility library for
-            <application>Evolution Data Server</application>.
-          </para>
-          <indexterm zone="evolution-data-server libedataserverui-3">
-            <primary sortas="c-libedataserverui-3">libedataserverui-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/evolution.xml
===================================================================
--- archive/gnome/evolution.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +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 evolution-download-http "&gnome-download-http;/evolution/3.6/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/3.6/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "699c29a0179df3866ecc2f972bc626a4">
-  <!ENTITY evolution-size          "12 MB">
-  <!ENTITY evolution-buildsize     "505 MB">
-  <!ENTITY evolution-time          "4.5 SBU">
-]>
-
-<sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
-  <?dbhtml filename="evolution.html" ?>
-
-
-  <title>Evolution-&evolution-version;</title>
-
-  <indexterm zone="evolution">
-    <primary sortas="a-Evolution">Evolution</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Evolution</title>
-
-    <para>
-      The <application>Evolution</application> package contains an
-      integrated mail, calendar and address book suite designed for the
-      <application>GNOME</application> environment.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&evolution-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&evolution-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &evolution-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &evolution-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &evolution-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &evolution-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Evolution Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gtkhtml"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gstreamer10"/>,
-      <xref linkend="libcanberra"/> and
-      <xref linkend="libgweather"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="geoclue"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="http://trac.bjourne.webfactional.com/">
-      gtkimageview</ulink>,
-      <xref linkend="mitkrb"/>,
-      <ulink url="http://projects.gnome.org/libchamplain/">
-      libchamplain</ulink>,
-      <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
-      <xref linkend="openldap"/> and
-      <ulink url="http://sourceforge.net/projects/ytnef/">libytnef</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/evolution"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Evolution</title>
-
-    <para>
-      Install <application>Evolution</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib \
-            --disable-pst-import &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-pst-import</option>: This switch is used to
-      disable the pst-import plugin.
-    </para>
-
-    <para>
-      <option>--with-openldap</option>: This switch will enable
-      <application>OpenLDAP</application> support in
-      <application>Evolution</application>.
-    </para>
-
-    <para>
-      <parameter>--with-krb5=/usr</parameter>: This switch will enable
-      <application>Kerberos 5</application> support in
-      <application>Evolution</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          evolution
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/evolution-3.6,
-          /usr/lib/evolution,
-          /usr/share/evolution,
-          /usr/share/gtk-doc/html/eshell
-          /usr/share/help/*/evolution
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="evolution-prog">
-        <term><command>evolution</command></term>
-        <listitem>
-          <para>
-            is an email, calendar and address book suite for
-            the <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="evolution evolution-prog">
-            <primary sortas="b-evolution">evolution</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/folks-new.xml
===================================================================
--- archive/gnome/folks-new.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,279 +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 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        "62db936e9601e33268e2019b6eb0684e">
-  <!ENTITY folks-size          "481 KB">
-  <!ENTITY folks-buildsize     "33 MB (add 26 MB for tests)">
-  <!ENTITY folks-time          "0.2 SBU (Using parallelism=4, add 0.15 SBU for tests)">
-]>
-
-<sect1 id="folks" xreflabel="Folks-&folks-version;">
-  <?dbhtml filename="folks.html"?>
-
-
-  <title>Folks-&folks-version;</title>
-
-  <indexterm zone="folks">
-    <primary sortas="a-Folks">Folks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Folks</title>
-
-    <para>
-      <application>Folks</application> is a library that
-      aggregates people from multiple sources (e.g,
-      <application>Telepathy</application> connection managers and
-      <application>Evolution Data Server</application>,
-      Facebook, etc.) to create metacontacts.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&folks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&folks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &folks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &folks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &folks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &folks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Folks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="python-dbusmock"/>, and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bluez"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <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
-      <ulink url="https://packages.debian.org/jessie/zeitgeist">Zeitgeist</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/folks"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Folks</title>
-
-    <para>
-      Install <application>Folks</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> from a local
-      X session started with <command>dbus-launch</command>. A few tests may
-      time out.
-    </para>
-      <!-- with 0.13.2, I get the following results:
-         Ok:                   44
-         Expected Fail:         0
-         Fail:                  0
-         Unexpected Pass:       0
-         Skipped:               0
-         Timeout:               0
-         I believe it now has the test suite again. -->
-      <!-- with 0.15.5, I get 3 failures, two of which are related
-           to bluez, so might be because I do not have a bluetooth adapter
-           on this machine. The last one is a timeout. [pierre] -->
-
-    <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>
-
-<!-- Tracker support removed in 0.15.1
-    <para>
-      <option>-Dtracker_backend=true</option>: This switch enables
-      building the <application>Tracker</application> backend.
-      Use it if you have <application>Tracker</application> installed. This
-      functionality is current broken, however, due to an upstream API change
-      in Tracker that hasn't been accounted for in this package.
-    </para>
--->
-
-    <para>
-      <option>-Ddocs=true</option>: This switch enables
-      documentation generation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          folks-import and folks-inspect
-        </seg>
-        <seg>
-          libfolks-dummy.so, libfolks-eds.so, libfolks.so, and
-          libfolks-telepathy.so
-        </seg>
-        <seg>
-          /usr/include/folks and
-          /usr/lib/folks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="folks-import">
-        <term><command>folks-import</command></term>
-        <listitem>
-          <para>
-            is used to import meta-contact information to libfolks
-          </para>
-          <indexterm zone="folks folks-import">
-            <primary sortas="b-folks-import">folks-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="folks-inspect">
-        <term><command>folks-inspect</command></term>
-        <listitem>
-          <para>
-            is used to inspect meta-contact information in libfolks
-          </para>
-          <indexterm zone="folks folks-inspect">
-            <primary sortas="b-folks-inspect">folks-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-eds">
-        <term><filename class="libraryfile">libfolks-eds.so</filename></term>
-        <listitem>
-          <para>
-            contains Evolution specific implementations of the libfolks classes
-          </para>
-          <indexterm zone="folks libfolks-eds">
-            <primary sortas="c-libfolks-eds">libfolks-eds.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="libfolks-libsocialweb">
-        <term><filename class="libraryfile">libfolks-libsocialweb.so</filename></term>
-        <listitem>
-          <para>
-            contains libsocialweb specific implementations of the libfolks classes.
-          </para>
-          <indexterm zone="folks libfolks-libsocialweb">
-            <primary sortas="c-libfolks-libsocialweb">libfolks-libsocialweb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="libfolks">
-        <term><filename class="libraryfile">libfolks.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Folks</application> API functions
-          </para>
-          <indexterm zone="folks libfolks">
-            <primary sortas="c-libfolks">libfolks.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-telepathy">
-        <term><filename class="libraryfile">libfolks-telepathy.so</filename></term>
-        <listitem>
-          <para>
-            contains Telepathy specific implementations of the libfolks classes
-          </para>
-          <indexterm zone="folks libfolks-telepathy">
-            <primary sortas="c-libfolks-telepathy">libfolks-telepathy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="libfolks-tracker">
-        <term><filename class="libraryfile">libfolks-tracker.so</filename></term>
-        <listitem>
-          <para>
-            contains Tracker specific implementations of the libfolks classes.
-          </para>
-          <indexterm zone="folks libfolks-tracker">
-            <primary sortas="c-libfolks-tracker">libfolks-tracker.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/folks.xml
===================================================================
--- archive/gnome/folks.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,264 +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 folks-download-http "&gnome-download-http;/folks/0.8/folks-&folks-version;.tar.xz">
-  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.8/folks-&folks-version;.tar.xz">
-  <!ENTITY folks-md5sum        "5664f85c4acdda2934cbd08a9d3d78e3">
-  <!ENTITY folks-size          "1.5 MB">
-  <!ENTITY folks-buildsize     "70 MB">
-  <!ENTITY folks-time          "0.7 SBU">
-]>
-
-<sect1 id="folks" xreflabel="Folks-&folks-version;">
-  <?dbhtml filename="folks.html"?>
-
-
-  <title>Folks-&folks-version;</title>
-
-  <indexterm zone="folks">
-    <primary sortas="a-Folks">Folks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Folks</title>
-
-    <para>
-      <application>Folks</application> is a library that
-      aggregates people from multiple sources (eg,
-      <application>Telepathy</application> connection managers and eventually
-      <application>Evolution Data Server</application>, Facebook, etc.)
-      to create metacontacts.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&folks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&folks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &folks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &folks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &folks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &folks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Folks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="intltool"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="libzeitgeist"/> and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="evolution-data-server"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&gnome-download-http;/libsocialweb/">
-      libsocialweb</ulink>,
-      <ulink url="http://projects.gnome.org/tracker/">Tracker</ulink> and
-      <ulink url="http://live.gnome.org/Valadoc/">valadoc</ulink>
-      (Required for generating the documentation)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/folks"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Folks</title>
-
-    <para>
-      Install <application>Folks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-vala &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala</option>: This switch enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para>
-      <option>--enable-tracker-backend</option>: This switch enables
-      building of the the <application>Tracker</application> backend.
-    </para>
-
-    <para>
-      <option>--enable-docs</option>: This switch enables
-      documentation generation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          folks-import and folks-inspect
-        </seg>
-        <seg>
-          libfolks-eds.so, libfolks-libsocialweb.so,
-          libfolks.so, libfolks-telepathy.so and
-          libfolks-tracker.so
-        </seg>
-        <seg>
-          /usr/include/folks and
-          /usr/lib/folks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="folks-import">
-        <term><command>folks-import</command></term>
-        <listitem>
-          <para>
-            is used to import meta-contact information to libfolks.
-          </para>
-          <indexterm zone="folks folks-import">
-            <primary sortas="b-folks-import">folks-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="folks-inspect">
-        <term><command>folks-inspect</command></term>
-        <listitem>
-          <para>
-            is used to inspect meta-contact information in libfolks.
-          </para>
-          <indexterm zone="folks folks-inspect">
-            <primary sortas="b-folks-inspect">folks-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-eds">
-        <term><filename class="libraryfile">libfolks-eds.so</filename></term>
-        <listitem>
-          <para>
-            contains Evolution specific implementations of the libfolks classes.
-          </para>
-          <indexterm zone="folks libfolks-eds">
-            <primary sortas="c-libfolks-eds">libfolks-eds.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-libsocialweb">
-        <term><filename class="libraryfile">libfolks-libsocialweb.so</filename></term>
-        <listitem>
-          <para>
-            contains libsocialweb specific implementations of the libfolks classes.
-          </para>
-          <indexterm zone="folks libfolks-libsocialweb">
-            <primary sortas="c-libfolks-libsocialweb">libfolks-libsocialweb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks">
-        <term><filename class="libraryfile">libfolks.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Folks</application> API functions.
-          </para>
-          <indexterm zone="folks libfolks">
-            <primary sortas="c-libfolks">libfolks.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-telepathy">
-        <term><filename class="libraryfile">libfolks-telepathy.so</filename></term>
-        <listitem>
-          <para>
-            contains Telepathy specific implementations of the libfolks classes.
-          </para>
-          <indexterm zone="folks libfolks-telepathy">
-            <primary sortas="c-libfolks-telepathy">libfolks-telepathy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-tracker">
-        <term><filename class="libraryfile">libfolks-tracker.so</filename></term>
-        <listitem>
-          <para>
-            contains Tracker specific implementations of the libfolks classes.
-          </para>
-          <indexterm zone="folks libfolks-tracker">
-            <primary sortas="c-libfolks-tracker">libfolks-tracker.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gdl.xml
===================================================================
--- archive/gnome/gdl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 gdl-download-http "&gnome-download-http;/gdl/3.4/gdl-&gdl-version;.tar.xz">
-  <!ENTITY gdl-download-ftp  "&gnome-download-ftp;/gdl/3.4/gdl-&gdl-version;.tar.xz">
-  <!ENTITY gdl-md5sum        "501f6d2add5aa1758a51f140b9644602">
-  <!ENTITY gdl-size          "512 KB">
-  <!ENTITY gdl-buildsize     "12 MB">
-  <!ENTITY gdl-time          "0.2 SBU">
-]>
-
-<sect1 id="gdl" xreflabel="gdl-&gdl-version;">
-  <?dbhtml filename="gdl.html"?>
-
-
-  <title>gdl-&gdl-version;</title>
-
-  <indexterm zone="gdl">
-    <primary sortas="a-gdl">gdl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gdl</title>
-
-    <para>
-      <application>Gdl</application> is the Gnome Development/Docking Library.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gdl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/gdl"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gdl</title>
-
-    <para>
-      Install <application>Gdl</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgdl-3.so
-        </seg>
-        <seg>
-          /usr/include/libgdl-3.0 and
-          /usr/share/gtk-doc/html/gdl-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdl-3">
-        <term><filename class='libraryfile'>libgdl-3.so</filename></term>
-        <listitem>
-          <para>
-            provides a support library for development tools from the
-            <application>GNOME</application> environment.
-          </para>
-          <indexterm zone="gdl libgdl-3">
-            <primary sortas="c-libgdl-3">libgdl-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gdlmm.xml
===================================================================
--- archive/gnome/gdlmm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +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 gdlmm-download-http "&gnome-download-http;/gdlmm/3.3/gdlmm-&gdlmm-version;.tar.xz">
-  <!ENTITY gdlmm-download-ftp  "&gnome-download-ftp;/gdlmm/3.3/gdlmm-&gdlmm-version;.tar.xz">
-  <!ENTITY gdlmm-md5sum        "01bd3532a597c3f32c9dfdb900ad6a38">
-  <!ENTITY gdlmm-size          "375 KB">
-  <!ENTITY gdlmm-buildsize     "9.2 MB">
-  <!ENTITY gdlmm-time          "0.2 SBU">
-]>
-
-<sect1 id="gdlmm" xreflabel="gdlmm-&gdlmm-version;">
-  <?dbhtml filename="gdlmm.html"?>
-
-
-  <title>gdlmm-&gdlmm-version;</title>
-
-  <indexterm zone="gdlmm">
-    <primary sortas="a-gdlmm">gdlmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gdlmm</title>
-
-    <para>
-      The <application>Gdlmm</application> package contains C++ bindings for the
-      Gdl library.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdlmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdlmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdlmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdlmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdlmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdlmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gdlmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdl"/> and
-      <xref linkend="gtkmm3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gdlmm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gdlmm</title>
-
-    <para>
-      Install <application>Gdlmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgdlmm-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gdlmm-3.0,
-          /usr/lib/gdlmm-3.0,
-          /usr/share/devhelp/books/gdlmm-3.0 and
-          /usr/share/doc/gdlmm-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdlmm-3">
-        <term><filename class='libraryfile'>libgdlmm-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Gdl</application> API classes.
-          </para>
-          <indexterm zone="gdlmm libgdlmm-3">
-            <primary sortas="c-libgdlmm-3">libgdlmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gdm.xml
===================================================================
--- archive/gnome/gdm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,318 +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 gdm-download-http "&gnome-download-http;/gdm/3.6/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/3.6/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-md5sum        "b1924268d1515b8b947acbbe49d72292">
-  <!ENTITY gdm-size          "1.6 MB">
-  <!ENTITY gdm-buildsize     "65 MB">
-  <!ENTITY gdm-time          "0.5 SBU">
-]>
-
-<sect1 id="gdm" xreflabel="GDM-&gdm-version;">
-  <?dbhtml filename="gdm.html"?>
-
-
-  <title>GDM-&gdm-version;</title>
-
-  <indexterm zone="gdm">
-    <primary sortas="a-GDM">GDM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GDM</title>
-
-    <para>
-      <application>GDM</application> is a system service that is
-      responsible for providing graphical logins and managing local
-      and remote displays.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GDM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="accountsservice"/>,
-      <xref linkend="dconf"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="nss"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="iso-codes"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="check"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="consolekit"/>,
-      <xref linkend="gnome-session"/> and either
-      <xref linkend="gnome-shell"/> or
-      <xref linkend="metacity"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gdm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GDM</title>
-
-    <para>
-      It is recommended to have a dedicated user and group to take
-      control of the <command>gdm</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 21 gdm &amp;&amp;
-useradd -c "GDM Daemon Owner" -d /var/lib/gdm -u 21 \
-        -g gdm -s /bin/false gdm &amp;&amp;
-usermod -a -G audio gdm &amp;&amp;
-usermod -a -G video gdm</userinput></screen>
-
-    <para>
-      Install <application>GDM</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --libexecdir=/usr/lib/gdm \
-            --with-initial-vt=7 \
-            --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-            --with-authentication-agent-directory=/usr/lib/polkit-gnome \
-            --with-check-accelerated-directory=/usr/lib/gnome-session \
-            --with-consolekit-directory=/usr/lib/ConsoleKit \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="check"/> and you wish to run
-      the testsuite, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chown -R -v gdm:gdm /var/lib/gdm /var/cache/gdm /var/log/gdm</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-initial-vt=7</parameter>: This switch
-      causes <application>GDM</application> to start on vt7
-      instead of the first free VT.
-    </para>
-
-    <para>
-      <parameter>--with-*-directory=...</parameter>: These switches
-      specify the location of programs that are used at runtime.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-default-pam-config=lfs</parameter>: Use this
-      switch if you did not create <filename>/etc/lfs-release</filename>
-      or distribution auto detection will fail and you will be unable
-      to use <application>GDM</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GDM</title>
-
-    <sect3 id="gdm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gdm/custom.conf</filename>
-      </para>
-
-      <indexterm zone="gdm gdm-config">
-        <primary sortas="e-etc-gdm-custom.conf">
-        /etc/gdm/custom.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The GDM daemon is configured using the
-        <filename>/etc/gdm/custom.conf</filename> file.
-        Default values are stored in GSettings in the
-        <filename>gdm.schemas</filename> file. It is recommended that end-users
-        modify the <filename>/etc/gdm/custom.conf</filename> file
-        because the schemas file may be overwritten when the user updates their
-        system to have a newer version of GDM.
-      </para>
-
-      <important>
-        <para>
-          If the system-wide <application>D-BUS</application> daemon was
-          running during the installation of <application>gdm</application>,
-          ensure you stop and restart the <application>D-BUS</application>
-          daemon before attempting to start <command>gdm</command>.
-        </para>
-      </important>
-
-      <para>
-        <command>gdm</command> can be tested by executing it as the
-        <systemitem class="username">root</systemitem> user. If you wish to stop
-        it you will need to go to a different tty and then kill it.
-      </para>
-
-    </sect3>
-
-    <sect3 id="gdm-init">
-      <title>Boot Script</title>
-
-      <para>
-        To start a graphical login when the system is booted, install the
-        <filename>/etc/rc.d/init.d/gdm</filename> init script included in the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <indexterm zone="gdm gdm-init">
-        <primary sortas="f-gdm">gdm</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-gdm</userinput></screen>
-
-      <para>
-        Now edit <filename>/etc/inittab</filename> with the following
-        command.
-      </para>
-
-<screen role="root"><userinput>sed -i 's/id:3:initdefault:/id:5:initdefault:/' \
-    /etc/inittab</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>
-          gdm and gdm-screenshot
-        </seg>
-        <seg>
-          libgdm.so and libgdmsimplegreeter.so
-        </seg>
-        <seg>
-          /etc/dconf/db/gdm.d,
-          /etc/gdm,
-          /usr/include/gdm,
-          /usr/lib/gdm,
-          /usr/share/gdm,
-          /usr/share/help/*/gdm,
-          /var/cache/gdm,
-          /var/gdm,
-          /var/lib/gdm,
-          /var/log/gdm and
-          /var/run/gdm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdm-prog">
-        <term><command>gdm</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> based login prompt.
-          </para>
-          <indexterm zone="gdm gdm-prog">
-            <primary sortas="b-gdm">gdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdm-screenshot">
-        <term><command>gdm-screenshot</command></term>
-        <listitem>
-          <para>
-            is a <application>GDM</application> screenshot tool.
-          </para>
-          <indexterm zone="gdm gdm-screenshot">
-            <primary sortas="b-gdm-screenshot">gdm-screenshot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/geocode-glib.xml
===================================================================
--- archive/gnome/geocode-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 geocode-glib-download-http
-           "&gnome-download-http;/geocode-glib/0.99/geocode-glib-&geocode-glib-version;.tar.bz2">
-  <!ENTITY geocode-glib-download-ftp
-           "&gnome-download-ftp;/geocode-glib/0.99/geocode-glib-&geocode-glib-version;.tar.bz2">
-  <!ENTITY geocode-glib-md5sum        "73ac778225f35ad996ea0345c5abe4b9">
-  <!ENTITY geocode-glib-size          "300 KB">
-  <!ENTITY geocode-glib-buildsize     "3.0 MB">
-  <!ENTITY geocode-glib-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;">
-  <?dbhtml filename="geocode-glib.html"?>
-
-
-  <title>geocode-glib-&geocode-glib-version;</title>
-
-  <indexterm zone="geocode-glib">
-    <primary sortas="a-geocode-glib">geocode-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Geocode GLib</title>
-
-    <para>
-      The <application>Geocode GLib</application> is a convenience library
-      for the Yahoo! Place Finder APIs. The Place Finder web service allows
-      to do geocoding (finding longitude and latitude from an address), and
-      reverse geocoding (finding an address from coordinates).
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&geocode-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&geocode-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &geocode-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &geocode-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &geocode-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &geocode-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Geocode GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/> and
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/geocode-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Geocode GLib</title>
-
-    <para>
-      Install <application>Geocode GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgeocode-glib.so
-        </seg>
-        <seg>
-          /usr/include/geocode-glib and
-          /usr/share/gtk-doc/html/geocode-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgeocode-glib">
-        <term><filename class="libraryfile">libgeocode-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Geocode GLib</application> API functions.
-          </para>
-          <indexterm zone="geocode-glib libgeocode-glib">
-            <primary sortas="c-libgeocode-glib">libgeocode-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gfbgraph.xml
===================================================================
--- archive/gnome/gfbgraph.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY gfbgraph-download-http "&gnome-download-http;/gfbgraph/0.2/gfbgraph-&gfbgraph-version;.tar.xz">
-  <!ENTITY gfbgraph-download-ftp  "&gnome-download-ftp;/gfbgraph/0.2/gfbgraph-&gfbgraph-version;.tar.xz">
-  <!ENTITY gfbgraph-md5sum        "05af5bd8af691a8e8de265fe061f6705">
-  <!ENTITY gfbgraph-size          "280 KB">
-  <!ENTITY gfbgraph-buildsize     "5.7 MB">
-  <!ENTITY gfbgraph-time          "0.1 SBU">
-]>
-
-<sect1 id="gfbgraph" xreflabel="gfbgraph-&gfbgraph-version;">
-  <?dbhtml filename="gfbgraph.html"?>
-
-
-  <title>gfbgraph-&gfbgraph-version;</title>
-
-  <indexterm zone="gfbgraph">
-    <primary sortas="a-gfbgraph">gfbgraph</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gfbgraph</title>
-
-    <para>
-      The <application>gfbgraph</application> package contains a
-      GObject wrapper for the Facebook Graph API.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gfbgraph-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gfbgraph-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gfbgraph-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gfbgraph-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gfbgraph-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gfbgraph-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gfbgraph Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-online-accounts"/> and
-      <xref linkend="rest"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/gfbgraph"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gfbgraph</title>
-
-    <para>
-      Install <application>gfbgraph</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make libgfbgraphdocdir=/usr/share/doc/gfbgraph-&gfbgraph-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgfbgraph-0.2.so
-        </seg>
-        <seg>
-          /usr/include/gfbgraph-0.2,
-          /usr/share/doc/gfbgraph-&gfbgraph-version;, and
-          /usr/share/gtk-doc/html/gfbgraph-0.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgfbgraph-0.2">
-        <term><filename class="libraryfile">libgfbgraph-0.2.so</filename></term>
-        <listitem>
-          <para>
-            is a GObject wrapper for the Facebook Graph API
-          </para>
-          <indexterm zone="gfbgraph libgfbgraph-0.2">
-            <primary sortas="c-libgfbgraph-0.2">libgfbgraph-0.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/ghex.xml
===================================================================
--- archive/gnome/ghex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 ghex-download-http "&gnome-download-http;/ghex/3.4/ghex-&ghex-version;.tar.xz">
-  <!ENTITY ghex-download-ftp  "&gnome-download-ftp;/ghex/3.4/ghex-&ghex-version;.tar.xz">
-  <!ENTITY ghex-md5sum        "a5be32aa0108ab15012957da1db288e9">
-  <!ENTITY ghex-size          "1.3 MB">
-  <!ENTITY ghex-buildsize     "15 MB">
-  <!ENTITY ghex-time          "0.3 SBU">
-]>
-
-<sect1 id="ghex" xreflabel="Ghex-&ghex-version;">
-  <?dbhtml filename="ghex.html"?>
-
-
-  <title>Ghex-&ghex-version;</title>
-
-  <indexterm zone="ghex">
-    <primary sortas="a-Ghex">Ghex</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ghex</title>
-
-    <para>
-      <application>Ghex</application> allows the user to view and edit data from
-      any file in hex and ASCII.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ghex-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ghex-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ghex-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ghex-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ghex-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ghex-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ghex Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-doc-utils"/> and
-      <xref linkend="gtk3"/>
-     </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/ghex"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ghex</title>
-
-    <para>
-      Install <application>Ghex</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ghex
-        </seg>
-        <seg>
-          libgtkhex-3.so
-        </seg>
-        <seg>
-          /usr/include/gtkhex-3,
-          /usr/share/gnome/help/ghex and
-          /usr/share/omf/ghex
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ghex-prog">
-        <term><command>ghex</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> binary file editor.
-          </para>
-          <indexterm zone="ghex ghex-prog">
-            <primary sortas="b-ghex">ghex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkhex-3">
-        <term><filename class='libraryfile'>libgtkhex-3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Ghex</application> API functions.
-          </para>
-          <indexterm zone="ghex libgtkhex-3">
-            <primary sortas="c-libgtkhex-3">libgtkhex-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/glade.xml
===================================================================
--- archive/gnome/glade.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +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 glade-download-http "&gnome-download-http;/glade/3.12/glade-&glade-version;.tar.xz">
-  <!ENTITY glade-download-ftp  "&gnome-download-ftp;/glade/3.12/glade-&glade-version;.tar.xz">
-  <!ENTITY glade-md5sum        "7923b7127a387db3a053062cd76e8263">
-  <!ENTITY glade-size          "2.4 MB">
-  <!ENTITY glade-buildsize     "60 MB">
-  <!ENTITY glade-time          "0.7 SBU">
-]>
-
-<sect1 id="glade" xreflabel="Glade-&glade-version;">
-  <?dbhtml filename="glade.html"?>
-
-
-  <title>Glade-&glade-version;</title>
-
-  <indexterm zone="glade">
-    <primary sortas="a-Glade">Glade</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Glade</title>
-
-    <para>
-      <application>Glade</application> is a RAD tool to enable quick and easy
-      development of user interfaces for the GTK+ toolkit and the
-      <application>GNOME</application> Desktop environment.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glade-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glade-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glade-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glade-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glade-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glade-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Glade Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-doc-utils"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="rarian"/>
-    </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;/glade"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glade</title>
-
-    <para>
-      Install <application>Glade</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glade and glade-previewer
-        </seg>
-        <seg>
-          libgladeui-2.so
-        </seg>
-        <seg>
-          /usr/include/libgladeui-2.0,
-          /usr/lib/glade,
-          /usr/share/glade,
-          /usr/share/gnome/help/glade,
-          /usr/share/gtk-doc/html/gladeui-2 and
-          /usr/share/omf/glade
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glade-prog">
-        <term><command>glade</command></term>
-        <listitem>
-          <para>
-            is used to create or edit user interface designs
-            for <application>GTK+</application> or
-            <application>GNOME</application> applications.
-          </para>
-          <indexterm zone="glade glade-prog">
-            <primary sortas="b-glade">glade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glade-previewer">
-        <term><command>glade-previewer</command></term>
-        <listitem>
-          <para>
-            is used to preview a <application>Glade</application> UI definition.
-          </para>
-          <indexterm zone="glade glade-previewer">
-            <primary sortas="b-glade-previewer">glade-previewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgladeui-2">
-        <term><filename class='libraryfile'>libgladeui-2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Glade</application> API functions.
-          </para>
-          <indexterm zone="glade libgladeui-2">
-            <primary sortas="c-libgladeui-2">libgladeui-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-applets.xml
===================================================================
--- archive/gnome/gnome-applets.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +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 gnome-applets-download-http
-           "&gnome-download-http;/gnome-applets/3.4/gnome-applets-&gnome-applets-version;.tar.xz">
-  <!ENTITY gnome-applets-download-ftp
-           "&gnome-download-ftp;/gnome-applets/3.4/gnome-applets-&gnome-applets-version;.tar.xz">
-  <!ENTITY gnome-applets-md5sum        "82a4946d10257239214cf18edeeb34c1">
-  <!ENTITY gnome-applets-size          "7.7 MB">
-  <!ENTITY gnome-applets-buildsize     "100 MB">
-  <!ENTITY gnome-applets-time          "1.8 SBU">
-]>
-
-<sect1 id="gnome-applets" xreflabel="gnome-applets-&gnome-applets-version;">
-  <?dbhtml filename="gnome-applets.html"?>
-
-
-  <title>gnome-applets-&gnome-applets-version;</title>
-
-  <indexterm zone="gnome-applets">
-    <primary sortas="a-gnome-applets">gnome-applets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Applets</title>
-
-    <para>
-      The <application>GNOME Applets</application> package contains
-      small applications which generally run in the background and display
-      their output to the <application>GNOME Panel</application>.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-applets-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-applets-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-applets-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-applets-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-applets-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-applets-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Applets Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gnome-icon-theme"/> and
-      <xref linkend="gnome-panel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgnomekbd"/>,
-      <xref linkend="libgtop"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="NetworkManager"/> and
-      <xref linkend="rarian"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gucharmap"/>,
-      <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink> and
-      <xref linkend="pygobject2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-applets"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Applets</title>
-
-    <para>
-      Install <application>GNOME Applets</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-applets &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/gnome-applets</parameter>: This
-      parameter causes the libexec files to be installed in the preferred
-      location of in <filename
-      class="directory">/usr/lib/gnome-applets</filename> instead of
-      <filename class="directory">/usr/libexec</filename>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accessx-status-applet, battstat-applet-2, charpick_applet2,
-          cpufreq-applet, cpufreq-selector, drivemount_applet2,
-          geyes_applet2, gweather-applet-2, invest-applet, invest-chart,
-          mixer_applet2, multiload-applet-2, null_applet,
-          stickynotes_applet and trashapplet
-        </seg>
-        <seg>
-          /usr/lib/bonobo/servers,
-          /usr/lib/python&python2-majorver;/site-packages/invest,
-          /usr/share/gnome/help/{accessx-status,battstat,char-palette,cpufreq-applet},
-          /usr/share/gnome/help/{drivemoun,geyes,gweather,invest-applet},
-          /usr/share/gnome/help/{mixer_applet2,multiload,stickynotes_applet,trashapplet},
-          /usr/share/gnome-applets,
-          /usr/share/omf/{accessx-status,battstat,char-palette},
-          /usr/share/omf/{cpufreq-applet,drivemount,geyes,gweather,invest-applet},
-          /usr/share/omf/{mixer_applet2,multiload,stickynotes_applet} and
-          /usr/share/pixmaps/{accessx-status-applet,cpufreq-applet,stickynotes}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-backgrounds.xml
===================================================================
--- archive/gnome/gnome-backgrounds.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +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 gnome-backgrounds-download-http
-           "&gnome-download-http;/gnome-backgrounds/3.6/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
-  <!ENTITY gnome-backgrounds-download-ftp
-           "&gnome-download-ftp;/gnome-backgrounds/3.6/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
-  <!ENTITY gnome-backgrounds-md5sum        "d057da50157451c1875e37e7654a0212">
-  <!ENTITY gnome-backgrounds-size          "9.7 MB">
-  <!ENTITY gnome-backgrounds-buildsize     "23 MB">
-  <!ENTITY gnome-backgrounds-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-backgrounds" xreflabel="gnome-backgrounds-&gnome-backgrounds-version;">
-  <?dbhtml filename="gnome-backgrounds.html"?>
-
-
-  <title>gnome-backgrounds-&gnome-backgrounds-version;</title>
-
-  <indexterm zone="gnome-backgrounds">
-    <primary sortas="a-gnome-backgrounds">gnome-backgrounds</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Backgrounds</title>
-
-    <para>
-      The <application>GNOME Backgrounds</application> package contains
-      a collection of graphics files which can be used as backgrounds in the
-      <application>GNOME</application> Desktop environment. Additionally,
-      the package creates the proper framework and directory structure so
-      that you can add your own files to the collection.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-backgrounds-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-backgrounds-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-backgrounds-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-backgrounds-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-backgrounds-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-backgrounds-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Backgrounds Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="intltool"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-backgrounds"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Backgrounds</title>
-
-    <para>
-      Install <application>GNOME Backgrounds</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/backgrounds/gnome and
-          /usr/share/gnome-background-properties
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term><filename>GNOME Backgrounds</filename></term>
-        <listitem>
-          <para>
-            are background images for the
-            <application>GNOME</application> Desktop.
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-bluetooth.xml
===================================================================
--- archive/gnome/gnome-bluetooth.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,246 +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 gnome-bluetooth-download-http
-           "&gnome-download-http;/gnome-bluetooth/3.6/gnome-bluetooth-&gnome-bluetooth-version;.tar.xz">
-  <!ENTITY gnome-bluetooth-download-ftp
-           "&gnome-download-ftp;/gnome-bluetooth/3.6/gnome-bluetooth-&gnome-bluetooth-version;.tar.xz">
-  <!ENTITY gnome-bluetooth-md5sum        "a3b0b6c2c542b3264cb0144a4efb3342">
-  <!ENTITY gnome-bluetooth-size          "1.3 MB">
-  <!ENTITY gnome-bluetooth-buildsize     "21 MB">
-  <!ENTITY gnome-bluetooth-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-bluetooth" xreflabel="gnome-bluetooth-&gnome-bluetooth-version;">
-  <?dbhtml filename="gnome-bluetooth.html"?>
-
-
-  <title>gnome-bluetooth-&gnome-bluetooth-version;</title>
-
-  <indexterm zone="gnome-bluetooth">
-    <primary sortas="a-gnome-bluetooth">gnome-bluetooth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Bluetooth</title>
-
-    <para>
-      The <application>GNOME Bluetooth</application> package contains tools
-      for managing and manipulating Bluetooth devices using the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-bluetooth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-bluetooth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-bluetooth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-bluetooth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-bluetooth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-bluetooth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Bluetooth Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnotify"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="nautilus-sendto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="geoclue"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="consolekit"/> and
-      <xref linkend="obexd"/>
-      (Required for bluetooth-sendto to work)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-bluetooth"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Bluetooth</title>
-
-    <para>
-      Install <application>GNOME Bluetooth</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
-
-    <para>
-      For <application>GNOME Bluetooth</application> to work
-      as expected, users need to be allowed to write to
-      <filename>/dev/rfkill</filename>. Create a
-      <application>Udev</application> rule that will allow
-      normal users to write to <filename>/dev/rfkill</filename>
-      with the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /lib/udev/rules.d/61-gnome-bluetooth.rules &lt;&lt; "EOF"
-<literal># Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Updated for udev &gt;= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
-
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bluetooth-applet, bluetooth-sendto and bluetooth-wizard
-        </seg>
-        <seg>
-          libgnome-bluetooth.so
-        </seg>
-        <seg>
-          /usr/include/gnome-bluetooth,
-          /usr/lib/gnome-bluetooth,
-          /usr/share/gnome-bluetooth,
-          /usr/share/gtk-doc/html/gnome-bluetooth and
-          /usr/share/help/*/gnome-bluetooth
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bluetooth-applet">
-        <term><command>bluetooth-applet</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> applet for prompting the
-            user for a Bluetooth passkey (PIN).
-          </para>
-          <indexterm zone="gnome-bluetooth bluetooth-applet">
-            <primary sortas="b-bluetooth-applet">bluetooth-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetooth-sendto">
-        <term><command>bluetooth-sendto</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> application for transferring
-            files over Bluetooth.
-          </para>
-          <indexterm zone="gnome-bluetooth bluetooth-sendto">
-            <primary sortas="b-bluetooth-sendto">bluetooth-sendto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetooth-wizard">
-        <term><command>bluetooth-wizard</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> wizard for setting up
-            devices with the Linux Bluetooth stack.
-          </para>
-          <indexterm zone="gnome-bluetooth bluetooth-wizard">
-            <primary sortas="b-bluetooth-wizard">bluetooth-wizard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnome-bluetooth">
-        <term><filename class="libraryfile">libgnome-bluetooth.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GNOME Bluetooth</application> API
-            functions.
-          </para>
-          <indexterm zone="gnome-bluetooth libgnome-bluetooth">
-            <primary sortas="c-libgnome-bluetooth">libgnome-bluetooth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-boxes.xml
===================================================================
--- archive/gnome/gnome-boxes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +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 gnome-boxes-download-http
-           "&gnome-download-http;/gnome-boxes/3.4/gnome-boxes-&gnome-boxes-version;.tar.xz">
-  <!ENTITY gnome-boxes-download-ftp
-           "&gnome-download-ftp;/gnome-boxes/3.4/gnome-boxes-&gnome-boxes-version;.tar.xz">
-  <!ENTITY gnome-boxes-md5sum        "6f8a5cf5fddad78d90aa369a7a613c72">
-  <!ENTITY gnome-boxes-size          "768 KB">
-  <!ENTITY gnome-boxes-buildsize     "20 MB">
-  <!ENTITY gnome-boxes-time          "0.3 SBU">
-]>
-
-<sect1 id="gnome-boxes" xreflabel="gnome-boxes-&gnome-boxes-version;">
-  <?dbhtml filename="gnome-boxes.html"?>
-
-
-  <title>gnome-boxes-&gnome-boxes-version;</title>
-
-  <indexterm zone="gnome-boxes">
-    <primary sortas="a-gnome-boxes">gnome-boxes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Boxes</title>
-
-    <para>
-      The <application>GNOME Boxes</application> is a
-      simple application used to access remote or virtual
-      systems.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-boxes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-boxes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-boxes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-boxes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-boxes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-boxes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Boxes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-vnc"/>,
-      <xref linkend="libosinfo"/>,
-      <xref linkend="libvirt-glib"/>,
-      <xref linkend="spice-gtk"/>,
-      <xref linkend="tracker"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev and gir-data), and
-      <xref linkend="vala"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-boxes"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Boxes</title>
-
-    <para>
-      Install <application>GNOME Boxes</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-boxes
-        </seg>
-        <seg>
-          /usr/share/gnome-boxes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-boxes-prog">
-        <term><command>gnome-boxes</command></term>
-        <listitem>
-          <para>
-            is used to access remote or virtual machines.
-          </para>
-          <indexterm zone="gnome-boxes gnome-boxes-prog">
-            <primary sortas="b-gnome-boxes">gnome-boxes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-color-manager.xml
===================================================================
--- archive/gnome/gnome-color-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,224 +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 gnome-color-manager-download-http
-           "&gnome-download-http;/gnome-color-manager/3.6/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
-  <!ENTITY gnome-color-manager-download-ftp
-           "&gnome-download-ftp;/gnome-color-manager/3.6/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
-  <!ENTITY gnome-color-manager-md5sum        "820fd4d3c784edfc292e3e2260b0b490">
-  <!ENTITY gnome-color-manager-size          "2.5 MB">
-  <!ENTITY gnome-color-manager-buildsize     "27 MB">
-  <!ENTITY gnome-color-manager-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-color-manager" xreflabel="gnome-color-manager-&gnome-color-manager-version;">
-  <?dbhtml filename="gnome-color-manager.html"?>
-
-
-  <title>gnome-color-manager-&gnome-color-manager-version;</title>
-
-  <indexterm zone="gnome-color-manager">
-    <primary sortas="a-gnome-color-manager">gnome-color-manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Color Manager</title>
-
-    <para>
-      <application>GNOME Color Manager</application> is a session framework
-      for the <application>GNOME</application> desktop environment that makes
-      it easy to manage, install and generate color profiles.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-color-manager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-color-manager-download-ftp;"/>
-         </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-color-manager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-color-manager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-color-manager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-color-manager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Color Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord-gtk"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="lcms2"/> and
-      <xref linkend="libcanberra"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="exiv2"/>,
-      <xref linkend="libexif"/> and
-      <xref linkend="vte"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="clutter-gtk"/> and
-      <ulink url="http://source.clutter-project.org/sources/mash">Mash</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-color-manager"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Color Manager</title>
-
-    <para>
-      Install <application>GNOME Color Manager</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/gnome-color-manager \
-            --disable-packagekit &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-packagekit</option>: This parameter disables use
-      of PackageKit which isn't suitable for BLFS.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcm-calibrate, gcm-import, gcm-inspect,
-          gcm-picker and gcm-viewer
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-color-manager,
-          /usr/share/gnome-color-manager and
-          /usr/share/help/*/gnome-color-manager
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcm-calibrate">
-        <term><command>gcm-calibrate</command></term>
-        <listitem>
-          <para>
-            is the GCM calibrator tool.
-          </para>
-          <indexterm zone="gnome-color-manager gcm-calibrate">
-            <primary sortas="b-gcm-calibrate">gcm-calibrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-import">
-        <term><command>gcm-import</command></term>
-        <listitem>
-          <para>
-            allows you to import ICC profiles supplied by vendors.
-          </para>
-          <indexterm zone="gnome-color-manager gcm-import">
-            <primary sortas="b-gcm-import">gcm-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-inspect">
-        <term><command>gcm-inspect</command></term>
-        <listitem>
-          <para>
-            allows you to inspect your session color-management settings.
-          </para>
-          <indexterm zone="gnome-color-manager gcm-inspect">
-            <primary sortas="b-gcm-inspect">gcm-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-picker">
-        <term><command>gcm-picker</command></term>
-        <listitem>
-          <para>
-            allows you to pick spot colors for use by an attached colorimeter.
-          </para>
-          <indexterm zone="gnome-color-manager gcm-picker">
-            <primary sortas="b-gcm-picker">gcm-picker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-viewer">
-        <term><command>gcm-viewer</command></term>
-        <listitem>
-          <para>
-            allows you to view properties of ICC profiles.
-          </para>
-          <indexterm zone="gnome-color-manager gcm-viewer">
-            <primary sortas="b-gcm-viewer">gcm-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-contacts.xml
===================================================================
--- archive/gnome/gnome-contacts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 gnome-contacts-download-http
-           "&gnome-download-http;/gnome-contacts/3.6/gnome-contacts-&gnome-contacts-version;.tar.xz">
-  <!ENTITY gnome-contacts-download-ftp
-           "&gnome-download-ftp;/gnome-contacts/3.6/gnome-contacts-&gnome-contacts-version;.tar.xz">
-  <!ENTITY gnome-contacts-md5sum        "6af361b582015287d57760d491dc6e34">
-  <!ENTITY gnome-contacts-size          "596 KB">
-  <!ENTITY gnome-contacts-buildsize     "25 MB">
-  <!ENTITY gnome-contacts-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-contacts" xreflabel="gnome-contacts-&gnome-contacts-version;">
-  <?dbhtml filename="gnome-contacts.html"?>
-
-
-  <title>gnome-contacts-&gnome-contacts-version;</title>
-
-  <indexterm zone="gnome-contacts">
-    <primary sortas="a-gnome-contacts">gnome-contacts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Contacts</title>
-
-    <para>
-      <application>GNOME Contacts</application> is a simple contacts application
-      that allows you to view your contacts as well as edit their details and create
-      new contacts. Online integration is an important aspect of GNOME Contacts - it
-      will seamlessly synchronise with the contacts stored in online accounts. If you
-      have the same person in multiple online accounts, GNOME Contacts will
-      automatically link them together into the same contact.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-contacts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-contacts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-contacts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-contacts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-contacts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-contacts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Contacts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="folks"/> (built with e-d-s support),
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gnome-online-accounts"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cheese"/>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-mission-control"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-contacts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Contacts</title>
-
-    <para>
-      Install <application>GNOME Contacts</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts &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>
-          gnome-contacts
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-contacts
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-contacts-prog">
-        <term><command>gnome-contacts</command></term>
-        <listitem>
-          <para>
-            is a program for accessing and storing information about contacts.
-          </para>
-          <indexterm zone="gnome-contacts gnome-contacts-prog">
-            <primary sortas="b-gnome-contacts">gnome-contacts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-control-center.xml
===================================================================
--- archive/gnome/gnome-control-center.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +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 gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/3.6/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-download-ftp
-           "&gnome-download-ftp;/gnome-control-center/3.6/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "13474a477658ccbca7484918edfc19d3">
-  <!ENTITY gnome-control-center-size          "4.7 MB">
-  <!ENTITY gnome-control-center-buildsize     "110 MB">
-  <!ENTITY gnome-control-center-time          "1.0 SBU">
-]>
-
-<sect1 id="gnome-control-center" xreflabel="gnome-control-center-&gnome-control-center-version;">
-  <?dbhtml filename="gnome-control-center.html"?>
-
-
-  <title>gnome-control-center-&gnome-control-center-version;</title>
-
-  <indexterm zone="gnome-control-center">
-    <primary sortas="a-gnome-control-center">gnome-control-center</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Control Center</title>
-
-    <para>
-      The <application>GNOME Control Center</application> package contains the
-      <application>GNOME</application> settings manager.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-control-center-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-control-center-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-control-center-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-control-center-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-control-center-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-control-center-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Control Center Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-menus"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="gnome-settings-daemon"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libgtop"/>,
-      <xref linkend="libpwquality"/> and
-      <xref linkend="mitkrb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref linkend="accountsservice"/> and
-      <xref linkend="consolekit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/>,
-      <xref linkend="gnome-bluetooth"/>,
-      <xref linkend="ibus"/> and
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cheese"/> and
-      <ulink url="&gnome-download-http;/libsocialweb/">
-      libsocialweb</ulink>
-    </para>
-
-    <note>
-      <para>
-        Recommended dependencies are not strictly required for
-        this package to build and function, but you may not get
-        expected results at runtime if you don't install them.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-control-center"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Control Center</title>
-
-    <para>
-      Install <application>GNOME Control Center</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--disable-cups</option>: Use this switch if you have not
-      installed recommended dependency <application>Cups</application>.
-    </para>
-
-    <para>
-      <option>--disable-ibus</option>: Use this switch if you have not
-      installed recommended dependency <application>IBus</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-control-center and gnome-sound-applet
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/control-center-1,
-          /usr/share/gnome-control-center and
-          /usr/share/sounds/gnome
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-control-center-prog">
-        <term><command>gnome-control-center</command></term>
-        <listitem>
-          <para>
-            is a graphical user interface used to configure various
-            aspects of <application>GNOME</application>.
-          </para>
-          <indexterm zone="gnome-control-center gnome-control-center-prog">
-            <primary sortas="b-gnome-control-center">gnome-control-center</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-sound-applet">
-        <term><command>gnome-sound-applet</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Volume Control Applet.
-          </para>
-          <indexterm zone="gnome-control-center gnome-sound-applet">
-            <primary sortas="b-gnome-sound-applet">gnome-sound-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-dbus-python.xml
===================================================================
--- archive/gnome/gnome-dbus-python.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +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="GNOME-dbus-python">
-  <?dbhtml filename="gnome-dbus-python.html"?>
-
-
-  <title>dbus-python-&dbus-python-version;</title>
-
-  <para>The <xref linkend="dbus-python"/> package is located in the
-  &apos;System Utilities&apos; chapter and is required by GNOME but is not a direct
-  dependency of any GNOME package, therefore the package is mentioned within the
-  GNOME Core Packages (Shell Fallback section) chapter to ensure it is
-  installed.</para>
-
-</sect1>
Index: chive/gnome/gnome-desktop-file-utils.xml
===================================================================
--- archive/gnome/gnome-desktop-file-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +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="GNOME-desktop-file-utils">
-  <?dbhtml filename="gnome-desktop-file-utils.html"?>
-
-
-  <title>desktop-file-utils-&desktop-file-utils-version;</title>
-
-  <para>The <xref linkend="desktop-file-utils"/> package is located in the
-  &apos;General Utilities&apos; chapter and is required by GNOME but is not
-  a direct dependency of any GNOME package, therefore the package is
-  mentioned within the GNOME Core Packages (Libraries section) chapter to
-  ensure it is installed.</para>
-
-</sect1>
Index: chive/gnome/gnome-devel-docs.xml
===================================================================
--- archive/gnome/gnome-devel-docs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +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 gnome-devel-docs-download-http
-           "&gnome-download-http;/gnome-devel-docs/3.4/gnome-devel-docs-&gnome-devel-docs-version;.tar.xz">
-  <!ENTITY gnome-devel-docs-download-ftp
-           "&gnome-download-ftp;/gnome-devel-docs/3.4/gnome-devel-docs-&gnome-devel-docs-version;.tar.xz">
-  <!ENTITY gnome-devel-docs-md5sum        "041dc56bda5a542c404351ea4efb2898">
-  <!ENTITY gnome-devel-docs-size          "5.9 MB">
-  <!ENTITY gnome-devel-docs-buildsize     "52 MB">
-  <!ENTITY gnome-devel-docs-time          "1.8 SBU">
-]>
-
-<sect1 id="gnome-devel-docs" xreflabel="gnome-devel-docs-&gnome-devel-docs-version;">
-  <?dbhtml filename="gnome-devel-docs.html"?>
-
-
-  <title>gnome-devel-docs-&gnome-devel-docs-version;</title>
-
-  <indexterm zone="gnome-devel-docs">
-    <primary sortas="a-gnome-devel-docs">gnome-devel-docs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Devel Docs</title>
-
-    <para>
-      The <application>GNOME Devel Docs</application> package contains documentation
-      on a11y for developing the <application>GNOME</application> Desktop environment.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-devel-docs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-devel-docs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-devel-docs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-devel-docs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-devel-docs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-devel-docs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Devel Docs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-doc-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-devel-docs"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Devel Docs</title>
-
-    <para>
-      Install <application>GNOME Devel Docs</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          /usr/share/gnome/help/{accessibility-devel-guide,gnome-devel-demos},
-          /usr/share/gnome/help/{hig-book,integration-guide} and
-          /usr/share/gnome/help/{optimization-guide,platform-overview}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-dictionary.xml
===================================================================
--- archive/gnome/gnome-dictionary.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +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 gnome-dictionary-download-http
-           "&gnome-download-http;/gnome-dictionary/3.6/gnome-dictionary-&gnome-dictionary-version;.tar.xz">
-  <!ENTITY gnome-dictionary-download-ftp
-           "&gnome-download-ftp;/gnome-dictionary/3.6/gnome-dictionary-&gnome-dictionary-version;.tar.xz">
-  <!ENTITY gnome-dictionary-md5sum        "99ee031b6abfaddc42c195a7a4041e6e">
-  <!ENTITY gnome-dictionary-size          "2.1 MB">
-  <!ENTITY gnome-dictionary-buildsize     "23 MB">
-  <!ENTITY gnome-dictionary-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-dictionary" xreflabel="gnome-dictionary-&gnome-dictionary-version;">
-  <?dbhtml filename="gnome-dictionary.html"?>
-
-
-  <title>gnome-dictionary-&gnome-dictionary-version;</title>
-
-  <indexterm zone="gnome-dictionary">
-    <primary sortas="a-gnome-dictionary">gnome-dictionary</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Dictionary</title>
-
-    <para>
-      The <application>GNOME Dictionary</application> package contains
-      dictionary for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-dictionary-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-dictionary-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-dictionary-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-dictionary-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-dictionary-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-dictionary-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Dictionary Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="yelp-xsl"/>
-    </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;/gnome-dictionary"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Dictionary</title>
-
-    <para>
-      Install <application>GNOME Dictionary</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-dictionary
-        </seg>
-        <seg>
-          libgdict.so
-        </seg>
-        <seg>
-          /usr/include/gdict-1.0,
-          /usr/share/gdict-1.0,
-          /usr/share/gnome-dictionary,
-          /usr/share/gtk-doc/html/gdict and
-          /usr/share/help/*/gnome-dictionary
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-dictionary-prog">
-        <term><command>gnome-dictionary</command></term>
-        <listitem>
-          <para>
-            is used to look up words on dictionaries.
-          </para>
-          <indexterm zone="gnome-dictionary gnome-dictionary-prog">
-            <primary sortas="b-gnome-dictionary">gnome-dictionary</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdict">
-        <term><filename class="libraryfile">libgdict.so</filename></term>
-        <listitem>
-          <para>
-            is <application>GNOME Dictionary</application> client library.
-          </para>
-          <indexterm zone="gnome-dictionary libgdict">
-            <primary sortas="c-libgdict">libgdict.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-disk-utility.xml
===================================================================
--- archive/gnome/gnome-disk-utility.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/3.6/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/3.6/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "ff6e0a50a3a6aa9a8d9aa8b19d304485">
-  <!ENTITY gnome-disk-utility-size          "1.2 MB">
-  <!ENTITY gnome-disk-utility-buildsize     "32 MB">
-  <!ENTITY gnome-disk-utility-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;">
-  <?dbhtml filename="gnome-disk-utility.html"?>
-
-
-  <title>gnome-disk-utility-&gnome-disk-utility-version;</title>
-
-  <indexterm zone="gnome-disk-utility">
-    <primary sortas="a-gnome-disk-utility">gnome-disk-utility</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Disk Utility</title>
-
-    <para>
-      The <application>GNOME Disk Utility</application> package provides
-      applications used for dealing with storage devices.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-disk-utility-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-disk-utility-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-disk-utility-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-disk-utility-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-disk-utility-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-disk-utility-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Disk Utility Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libpwquality"/> and
-      <xref linkend="udisks2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-disk-utility"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Disk Utility</title>
-
-    <para>
-      Install <application>GNOME Disk Utility</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-disk-image-mounter and gnome-disks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-disk-utility
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-disk-image-mounter">
-        <term><command>gnome-disk-image-mounter</command></term>
-        <listitem>
-          <para>
-            is used to set up disk images.
-          </para>
-          <indexterm zone="gnome-disk-utility gnome-disk-image-mounter">
-            <primary sortas="b-gnome-disk-image-mounter">gnome-disk-image-mounter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-disks">
-        <term><command>gnome-disks</command></term>
-        <listitem>
-          <para>
-            is used to to inspect, format, partition and configure disks
-            and block devices.
-          </para>
-          <indexterm zone="gnome-disk-utility gnome-disks">
-            <primary sortas="b-gnome-disks">gnome-disks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-doc-utils.xml
===================================================================
--- archive/gnome/gnome-doc-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +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 gnome-doc-utils-download-http
-           "&gnome-download-http;/gnome-doc-utils/0.20/gnome-doc-utils-&gnome-doc-utils-version;.tar.xz">
-  <!ENTITY gnome-doc-utils-download-ftp
-           "&gnome-download-ftp;/gnome-doc-utils/0.20/gnome-doc-utils-&gnome-doc-utils-version;.tar.xz">
-  <!ENTITY gnome-doc-utils-md5sum        "3c64ad7bacd617b04999e4a168afaac5">
-  <!ENTITY gnome-doc-utils-size          "516 KB">
-  <!ENTITY gnome-doc-utils-buildsize     "17 MB">
-  <!ENTITY gnome-doc-utils-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-doc-utils" xreflabel="gnome-doc-utils-&gnome-doc-utils-version;">
-  <?dbhtml filename="gnome-doc-utils.html"?>
-
-
-  <title>gnome-doc-utils-&gnome-doc-utils-version;</title>
-
-  <indexterm zone="gnome-doc-utils">
-    <primary sortas="a-gnome-doc-utils">gnome-doc-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Doc Utils</title>
-
-    <para>
-      The <application>GNOME Doc Utils</application> package is a collection
-      of documentation utilities for the <application>GNOME</application> project.
-      Notably, it contains utilities for building documentation and all auxiliary
-      files in your source tree, and it contains the DocBook XSLT stylesheets that
-      were once distributed with <application>Yelp</application>.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-doc-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-doc-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-doc-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-doc-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-doc-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-doc-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Doc Utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="intltool"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="python2"/> (Required to be installed prior to <xref linkend="libxml2"/>) and
-      <xref linkend="which"/>
-      <!-- (Every package that uses gnome-doc-utils requires
-      which but no configure script references it) -->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
-    </para>
-
-    <para>
-      <application>Rarian</application> is listed as recommended even though
-      <application>GNOME Doc Utils</application> will build fine without it.
-      If you don't install <application>Rarian</application> (and you pass the
-      the appropriate flag to the <command>configure</command> command so that
-      it will build without it), functionality will be missing that is expected
-      later in other <application>GNOME</application> packages.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-doc-utils"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Doc Utils</title>
-
-    <para>
-      Install <application>GNOME Doc Utils</application>
-      by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <segtitle>Installed Stylesheets</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-doc-prepare, gnome-doc-tool and xml2po
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/xml2po,
-          /usr/share/gnome-doc-utils,
-          /usr/share/xml/gnome,
-          /usr/share/xml/mallard,
-          /usr/share/gnome/help/gnome-doc-make and
-          /usr/share/gnome/help/gnome-doc-xslt
-        </seg>
-        <seg>
-          Custom DocBook XSLT stylesheets
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-doc-prepare">
-        <term><command>gnome-doc-prepare</command></term>
-        <listitem>
-          <para>
-            prepares a package to use
-            <application>GNOME Doc Utils</application>.
-          </para>
-          <indexterm zone="gnome-doc-utils gnome-doc-prepare">
-            <primary sortas="b-gnome-doc-prepare">gnome-doc-prepare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-doc-tool">
-        <term><command>gnome-doc-tool</command></term>
-        <listitem>
-          <para>
-            is used to convert documents to either HTML or XHTML.
-          </para>
-          <indexterm zone="gnome-doc-utils gnome-doc-tool">
-            <primary sortas="b-gnome-doc-tool">gnome-doc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xml2po">
-        <term><command>xml2po</command></term>
-        <listitem>
-          <para>
-            is a <application>Python</application> script used to
-            translate XML documents.
-          </para>
-          <indexterm zone="gnome-doc-utils xml2po">
-            <primary sortas="b-xml2po">xml2po</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-documents.xml
===================================================================
--- archive/gnome/gnome-documents.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +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 gnome-documents-download-http
-           "&gnome-download-http;/gnome-documents/0.4/gnome-documents-&gnome-documents-version;.tar.xz">
-  <!ENTITY gnome-documents-download-ftp
-           "&gnome-download-ftp;/gnome-documents/0.4/gnome-documents-&gnome-documents-version;.tar.xz">
-  <!ENTITY gnome-documents-md5sum        "465de85bf9bac48ff300b1bf6aa5851c">
-  <!ENTITY gnome-documents-size          "492 KB">
-  <!ENTITY gnome-documents-buildsize     "10 MB">
-  <!ENTITY gnome-documents-time          "0.4 SBU">
-]>
-
-<sect1 id="gnome-documents" xreflabel="gnome-documents-&gnome-documents-version;">
-  <?dbhtml filename="gnome-documents.html"?>
-
-
-  <title>gnome-documents-&gnome-documents-version;</title>
-
-  <indexterm zone="gnome-documents">
-    <primary sortas="a-gnome-documents">gnome-documents</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Documents</title>
-
-    <para>
-      <application>GNOME Documents</application> is a document viewer which supports
-      local documents (using the <application>Tracker</application> search engine) and
-      Google Documents. For local documents, this appears to be restricted to PDF and PS
-      files.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-documents-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-documents-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-documents-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-documents-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-documents-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-documents-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Documents Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="evince"/> (with introspection support enabled),
-      <xref linkend="gjs"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="libgdata"/> and
-      <xref linkend="tracker"/>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependency</bridgehead>
-    <para role="optional">
-      Although this package uses <application>Evince</application>,
-      it needs <xref linkend="gimp"/> to display documents.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-documents"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Documents</title>
-
-    <para>
-      Install <application>GNOME Documents</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/gnome-documents &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/gnome-documents</parameter>: This
-      parameter ensures <filename>gd-tracker-gdata-miner</filename> is not installed in
-      <filename class="directory">/usr/libexec</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-documents
-        </seg>
-        <seg>
-          /usr/lib/gnome-documents and
-          /usr/share/gnome-documents
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-documents-prog">
-        <term><command>gnome-documents</command></term>
-        <listitem>
-          <para>
-            displays (indexed) shared and local documents.
-          </para>
-          <indexterm zone="gnome-documents gnome-documents-prog">
-            <primary sortas="b-gnome-documents">gnome-documents</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-font-viewer.xml
===================================================================
--- archive/gnome/gnome-font-viewer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +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 gnome-font-viewer-download-http
-           "&gnome-download-http;/gnome-font-viewer/3.4/gnome-font-viewer-&gnome-font-viewer-version;.tar.xz">
-  <!ENTITY gnome-font-viewer-download-ftp
-           "&gnome-download-ftp;/gnome-font-viewer/3.4/gnome-font-viewer-&gnome-font-viewer-version;.tar.xz">
-  <!ENTITY gnome-font-viewer-md5sum        "f21c9174c263bf0928d82ddf01d4e6a5">
-  <!ENTITY gnome-font-viewer-size          "284 KB">
-  <!ENTITY gnome-font-viewer-buildsize     "4.6 MB">
-  <!ENTITY gnome-font-viewer-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-font-viewer" xreflabel="gnome-font-viewer-&gnome-font-viewer-version;">
-  <?dbhtml filename="gnome-font-viewer.html"?>
-
-
-  <title>gnome-font-viewer-&gnome-font-viewer-version;</title>
-
-  <indexterm zone="gnome-font-viewer">
-    <primary sortas="a-gnome-font-viewer">gnome-font-viewer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Font Viewer</title>
-
-    <para>
-      The <application>GNOME Font Viewer</application> package contains
-      font viewer for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-font-viewer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-font-viewer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-font-viewer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-font-viewer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-font-viewer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-font-viewer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Font Viewer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-font-viewer"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Font Viewer</title>
-
-    <para>
-      Install <application>GNOME Font Viewer</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-font-viewer and gnome-thumbnail-font
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-font-viewer-prog">
-        <term><command>gnome-font-viewer</command></term>
-        <listitem>
-          <para>
-            is the GNOME Font Viewer.
-          </para>
-          <indexterm zone="gnome-font-viewer gnome-font-viewer-prog">
-            <primary sortas="b-gnome-font-viewer">gnome-font-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-games.xml
===================================================================
--- archive/gnome/gnome-games.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,372 +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 gnome-games-download-http
-           "&gnome-download-http;/gnome-games/3.6/gnome-games-&gnome-games-version;.tar.xz">
-  <!ENTITY gnome-games-download-ftp
-           "&gnome-download-ftp;/gnome-games/3.6/gnome-games-&gnome-games-version;.tar.xz">
-  <!ENTITY gnome-games-md5sum                   "4f57151eefcb5de4349c2b5f570eff64">
-  <!ENTITY gnome-games-size                     "19 MB">
-  <!ENTITY gnome-games-buildsize                "170 MB">
-  <!ENTITY gnome-games-time                     "1.2 SBU">
-]>
-
-<sect1 id="gnome-games" xreflabel="gnome-games-&gnome-games-version;">
-  <?dbhtml filename="gnome-games.html"?>
-
-
-  <title>gnome-games-&gnome-games-version;</title>
-
-  <indexterm zone="gnome-games">
-    <primary sortas="a-gnome-ames">gnome-games</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Games</title>
-
-    <para>
-      The <application>GNOME Games</application> is a collection
-      of simple, but addictive games from the
-      <application>GNOME</application> Desktop project.
-      They represent many of the popular games and include card games,
-      puzzle games and arcade games.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-games-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-games-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-games-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-games-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-games-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-games-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Games Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="pygobject3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-games"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Games</title>
-
-    <para>
-      Some of the <application>GNOME Games</application> game binaries
-      need to be setgid to track high scores. Create a separate user and group
-      for games by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /var/games &amp;&amp;
-groupadd -g 60 games &amp;&amp;
-useradd -c "Games High Score Owner" -d /var/games \
-        -g games -s /bin/false -u 60 games &amp;&amp;
-chown -v games:games /var/games</userinput></screen>
-
-    <para>
-      Install <application>GNOME Games</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --localstatedir=/var &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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-setgid</option>: This will prevent the setgid bit
-      on the executables from being set. It provides system administrators
-      with the option to disable setgid binaries, though it also means that the
-      functionality to save high game scores will be disabled.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glchess, glines, gnect, gnibbles, gnobots2, gnome-mahjongg,
-          gnome-sudoku, gnomine, gnotravex, gnotski, gtali, iagno,
-          lightsoff, quadrapassel and swell-foop
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/gnome_sudoku,
-          /usr/share/glchess,
-          /usr/share/glines,
-          /usr/share/gnect,
-          /usr/share/gnibbles,
-          /usr/share/gnobots2,
-          /usr/share/gnome-mahjongg,
-          /usr/share/gnome-sudoku,
-          /usr/share/gnomine,
-          /usr/share/gnotravex,
-          /usr/share/gnotski,
-          /usr/share/gtali,
-          /usr/share/help/*/glchess,
-          /usr/share/help/*/glines,
-          /usr/share/help/*/gnect,
-          /usr/share/help/*/gnibbles,
-          /usr/share/help/*/gnobots2,
-          /usr/share/help/*/gnome-mahjongg,
-          /usr/share/help/*/gnome-sudoku,
-          /usr/share/help/*/gnomine,
-          /usr/share/help/*/gnotravex,
-          /usr/share/help/*/gnotski,
-          /usr/share/help/*/gtali,
-          /usr/share/help/*/iagno,
-          /usr/share/help/*/lightsoff,
-          /usr/share/help/*/quadrapassel,
-          /usr/share/help/*/swell-foop,
-          /usr/share/iagno,
-          /usr/share/lightsoff,
-          /usr/share/quadrapassel,
-          /usr/share/swell-foop and
-          /var/games
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glchess">
-        <term><command>glchess</command></term>
-        <listitem>
-          <para>
-            is a chess game which supports several chess engines.
-          </para>
-          <indexterm zone="gnome-games glchess">
-            <primary sortas="b-glchess">glchess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glines">
-        <term><command>glines</command></term>
-        <listitem>
-          <para>
-            is a game which involves moving balls around the grid and try
-            and form lines of the same colour to make them disappear.
-          </para>
-          <indexterm zone="gnome-games glines">
-            <primary sortas="b-glines">glines</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnect">
-        <term><command>gnect</command></term>
-        <listitem>
-          <para>
-            is a classic game where each player tries to make a line of four
-            disks before their opponent.
-          </para>
-          <indexterm zone="gnome-games gnect">
-            <primary sortas="b-gnect">gnect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnibbles">
-        <term><command>gnibbles</command></term>
-        <listitem>
-          <para>
-            is a "worm" game. You pilot a worm around a maze trying to
-            collect diamonds. With each diamond your worm grows and navigation
-            becomes ever more difficult.
-          </para>
-          <indexterm zone="gnome-games gnibbles">
-            <primary sortas="b-gnibbles">gnibbles</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnobots2">
-        <term><command>gnobots2</command></term>
-        <listitem>
-          <para>
-            is a classic BSD robots game where you have to avoid a hoard of
-            robots who are trying to kill you.
-          </para>
-          <indexterm zone="gnome-games gnobots2">
-            <primary sortas="b-gnobots2">gnobots2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-mahjongg">
-        <term><command>gnome-mahjongg</command></term>
-        <listitem>
-          <para>
-            is a tile-based solitaire game with an oriental flavor. Remove
-            tiles in matching pairs from a pile to try and dismantle it.
-          </para>
-          <indexterm zone="gnome-games gnome-mahjongg">
-            <primary sortas="b-gnome-mahjongg">gnome-mahjongg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-sudoku">
-        <term><command>gnome-sudoku</command></term>
-        <listitem>
-          <para>
-            is a logic game with a Japanese name that has recently exploded
-            in popularity.
-          </para>
-          <indexterm zone="gnome-games gnome-sudoku">
-            <primary sortas="b-gnome-sudoku">gnome-sudoku</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnomine">
-        <term><command>gnomine</command></term>
-        <listitem>
-          <para>
-            is a game where you clear mines from a board using hints from
-            squares you have already uncovered.
-          </para>
-          <indexterm zone="gnome-games gnomine">
-            <primary sortas="b-gnomine">gnomine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnotravex">
-        <term><command>gnotravex</command></term>
-        <listitem>
-          <para>
-            is a puzzle game where you have to match a grid of tiles together.
-          </para>
-          <indexterm zone="gnome-games gnotravex">
-            <primary sortas="b-gnotravex">gnotravex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnotski">
-        <term><command>gnotski</command></term>
-        <listitem>
-          <para>
-            is a series of sliding block puzzles.
-          </para>
-          <indexterm zone="gnome-games gnotski">
-            <primary sortas="b-gnotski">gnotski</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtali">
-        <term><command>gtali</command></term>
-        <listitem>
-          <para>
-            is an ancient Roman game.
-          </para>
-          <indexterm zone="gnome-games gtali">
-            <primary sortas="b-gtali">gtali</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iagno">
-        <term><command>iagno</command></term>
-        <listitem>
-          <para>
-            is a game where the goal is to control all the disks on the
-            board by trapping your opponents disks between two of yours.
-          </para>
-          <indexterm zone="gnome-games iagno">
-            <primary sortas="b-iagno">iagno</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="quadrapassel">
-        <term><command>quadrapassel</command></term>
-        <listitem>
-          <para>
-            is a Russian game of fitting falling geometric shapes.
-          </para>
-          <indexterm zone="gnome-games quadrapassel">
-            <primary sortas="b-quadrapassel">quadrapassel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-gvfs.xml
===================================================================
--- archive/gnome/gnome-gvfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +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="GNOME-gvfs">
-  <?dbhtml filename="gnome-gvfs.html"?>
-
-
-  <title>gvfs-&gvfs-version;</title>
-
-  <para>The <xref linkend="gvfs"/> package is located in
-  the System Utilities chapter and is recommended in a GNOME
-  installation. This package is not a direct dependency of any GNOME
-  package, therefore it is mentioned within the GNOME Core Packages
-  chapter to ensure it is installed.</para>
-
-</sect1>
Index: chive/gnome/gnome-intro.xml
===================================================================
--- archive/gnome/gnome-intro.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE partintro 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;
-]>
-
-<partintro>
-
-  <title>Introduction to GNOME</title>
-
-  <!-- <warning id="gnome_broken" xreflabel="SVN GNOME is Broken">
-    <para>The <application>GLib</application>/<application>GTK+</application>
-    tool stack in the current SVN book is not compatible with this version
-    of GNOME. If you want to build GNOME using these instructions, you should
-    follow the stable BLFS 6.2.0 book (<ulink url="../stable/gnome/gnome.html"/>),
-    including
-    using the versions of the packages listed there. The BLFS development team
-    is working as hard as possible to bring the book up to GNOME-2.18.x.</para>
-  </warning> -->
-
-  <!-- <para>This chapter presents the instructions to install a complete
-  GNOME-&gnome-version;&gnome-minor-version; desktop environment; and a limited
-  GNOME 1.4 library environment that is sufficient to run GNOME 1.4
-  applications included in this book. The order of the pages follows the build
-  order defined by the GNOME development team and documented in the <ulink
-  url="http://www.gnome.org/start/&gnome-version;/notes/en/rninstallation.html">
-  Release Notes</ulink>.</para> -->
-
-  <para>This chapter presents the instructions to install a complete
-  GNOME-&gnome-version;&gnome-minor-version; desktop environment. The order of
-  the installed packages follows the build order defined by the GNOME
-  development team and has been thoroughly tested by the BLFS team.</para>
-
-  <para>The installation of GNOME-&gnome-version;&gnome-minor-version; is a
-  large undertaking and one we would like to see you complete with the least
-  amount of stress. One of the first goals in this installation is to protect
-  your previously installed software, especially if you are testing GNOME on
-  your machine. GNOME-&gnome-version; packages utilize the
-  <option>--prefix=option</option> passed to <command>configure</command>,
-  so you will use that and an environment variable (<envar>GNOME_PREFIX</envar>)
-  to add flexibility to the installation.</para>
-
-  <para>To install GNOME as your desktop of choice, it is recommended that you
-  install using <option>--prefix=/usr</option>. If you are not sure that you
-  are going to keep the GNOME installation, or you think you will update to the
-  newest releases as they become available, you should install with
-  <option>--prefix=/opt/gnome-&gnome-version;&gnome-minor-version;</option>.
-  Setting the environment variable and the additional edits required by the
-  second option are covered in the Pre-Installation Configuration
-  section.</para>
-
-  <para>If you choose the second option, removal of
-  GNOME-&gnome-version;&gnome-minor-version; is as easy as removing the edits
-  from the pre-installation page and issuing the following command (you may
-  need to become the <systemitem class='username'>root</systemitem>
-  user):</para>
-
-<screen role="root"><userinput>rm -rf /opt/gnome-&gnome-version;&gnome-minor-version;</userinput></screen>
-
-  <para>If your system was completely built per LFS and BLFS instructions,
-  you have a very good chance of using
-  GNOME-&gnome-version;&gnome-minor-version; after your first installation. If
-  you are a typical LFS user, you have made modifications to the instructions
-  along the way knowing that you have to take those modifications into account
-  on future installations. You should have no problems integrating
-  GNOME-&gnome-version;&gnome-minor-version; into your unique setup, but you
-  will have to install well over 50 packages before you can run GNOME through
-  any testing (assuming your windowing system is preinstalled and tested). You
-  should anticipate that you will be rebuilding GNOME at least once to make
-  adjustments for your setup.</para>
-
-  <!-- <para>If you are building a GNOME 1.4 library environment, you would install
-  only those libraries in the GNOME 1.4 chapter
-  <emphasis role='strong'>and</emphasis> any dependencies listed on those
-  pages, whether labeled or not. GNOME packages without pages in the book are
-  simply installed with:</para>
-
-<screen><userinput>./configure -prefix=/opt/gnome-1.4 &amp;&amp;
-make</userinput></screen>
-
-  <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  <para>These instructions are simplistic to facilitate removal of
-  GNOME 1.4 from BLFS systems when it is no longer necessary. These
-  instructions may be refined later to comply with BLFS standards for file
-  locations, specifically
-  <filename class='directory'>/opt/gnome/etc</filename> to
-  <filename class='directory'>/etc</filename> and
-  <filename class='directory'>/opt/gnome/var</filename> to
-  <filename class='directory'>/var</filename>. You should consider using
-  the GNOME 1.4 hint located at <ulink url="&hints-root;"/> if you have no
-  interest in GNOME-&gnome-version;&gnome-minor-version;.</para> -->
-
-  <bridgehead renderas="sect3">Alternate Installation Methods</bridgehead>
-  <para>As was previously mentioned, building a GNOME desktop from sources is a
-  significant project. Some may find it too tedious or time-consuming to perform
-  a full installation following the BLFS book. You may wish to review the
-  automated methods mentioned in the GNOME-&gnome-version; <ulink
-  url="http://www.gnome.org/start/&gnome-version;/notes/en/rninstallation.html">Release
-  Notes</ulink>. Note that using any other method to install
-  GNOME-&gnome-version;&gnome-minor-version; other than using the BLFS
-  instructions cannot be supported by the BLFS team. Alternate methods are only
-  mentioned as a courtesy to builders who would like to build GNOME from sources
-  but do not have the time/desire/patience/whatever to follow the BLFS
-  book.</para>
-
-
-</partintro>
Index: chive/gnome/gnome-js-common.xml
===================================================================
--- archive/gnome/gnome-js-common.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +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 gnome-js-common-download-http
-           "&gnome-download-http;/gnome-js-common/0.1/gnome-js-common-&gnome-js-common-version;.tar.bz2">
-  <!ENTITY gnome-js-common-download-ftp
-           "&gnome-download-ftp;/gnome-js-common/0.1/gnome-js-common-&gnome-js-common-version;.tar.bz2">
-  <!ENTITY gnome-js-common-md5sum        "a4147d24622ab0f1d01e9921a3bf501b">
-  <!ENTITY gnome-js-common-size          "277 KB">
-  <!ENTITY gnome-js-common-buildsize     "2.2 MB">
-  <!ENTITY gnome-js-common-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-js-common" xreflabel="gnome-js-common-&gnome-js-common-version;">
-  <?dbhtml filename="gnome-js-common.html"?>
-
-
-  <title>gnome-js-common-&gnome-js-common-version;</title>
-
-  <indexterm zone="gnome-js-common">
-    <primary sortas="a-gnome-js-common">gnome-js-common</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME JS Common</title>
-
-    <para>
-      The <application>GNOME JS Common</application> package provides
-      common modules for <application>GNOME</application> JavaScript bindings.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-js-common-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-js-common-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-js-common-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-js-common-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-js-common-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-js-common-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME JS Common Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="seed"/> (Note that seed
-      <emphasis>requires</emphasis> GNOME JS Common).
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-js-common"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME JS Common</title>
-
-    <para>
-      Install <application>GNOME JS Common</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-js and
-          /usr/share/doc/gnome_js_common
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-media.xml
===================================================================
--- archive/gnome/gnome-media.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +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 gnome-media-download-http "&gnome-download-http;/gnome-media/2.32/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/2.32/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-md5sum        "06fc8c67add34c98bc484e0dbc404d41">
-  <!ENTITY gnome-media-size          "2.7 MB">
-  <!ENTITY gnome-media-buildsize     "38 MB">
-  <!ENTITY gnome-media-time          "0.5 SBU">
-]>
-
-<sect1 id="gnome-media" xreflabel="gnome-media-&gnome-media-version;">
-  <?dbhtml filename="gnome-media.html"?>
-
-
-  <title>gnome-media-&gnome-media-version;</title>
-
-  <indexterm zone="gnome-media">
-    <primary sortas="a-GNOME Media">GNOME Media</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Media</title>
-
-    <para>The <application>GNOME Media</application> package contains
-    <application>GNOME</application>'s media applications.</para>
-
-    &lfs70_checked;
-
-    <para>This is a legacy GNOME-2 package which has been deprecated by the
-    GNOME developers and will be removed from the book in due course. If you
-    are not building a GNOME desktop, this can provide a volume control / mixer
-    application, but you may wish to consider simpler alternatives:</para>
-
-    <para><ulink url="http://volumecontrol.sourceforge.net/">volumecontrol</ulink>,
-    is a simple volume control and mixer which requires
-    <xref linkend="gtk2"/>, and
-    <xref linkend="alsa-utils"/>. Use ./autogen.sh to configure it.</para>
-
-    <para><ulink url="http://gvolwheel.sourceforge.net/">gvolwheel</ulink>
-    provides a volume control in a tray icon, for minimalist desktops. It uses
-    <xref linkend="intltool"/>, <xref linkend="perl-xml-parser"/>, and there are
-    different versions for <xref linkend="gtk2"/> (0.7) or
-    <xref linkend="gtk3"/> (0.9).</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-media-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-media-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-media-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-media-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-media-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-media-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcanberra"/>,
-      <xref linkend="GConf"/>,
-      <xref linkend="gnome-doc-utils"/>
-      <xref linkend="gstreamer"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
-         recorder),
-      <xref linkend="libglade"/>,
-      <!-- libunique in the book will be updated to 3.0 during the gnome-3 changes,
-      that version is too new -->
-      <xref linkend="pulseaudio"/> (with
-      <ulink url="&gnome-download-http;/libunique/1.1/libunique-1.1.6.tar.bz2">libunique-1</ulink>),
-      and <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-media"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Media</title>
-
-    <para>Install <application>GNOME Media</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-old-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-media &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-media</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-media</filename> instead
-    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-audio-profiles-properties, gnome-sound-recorder,
-        gnome-volume-control, and gstreamer-properties</seg>
-        <seg>libgnome-media-profiles.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-media/profiles,
-        share/{gnome-media/{pixmaps,sounds},gnome-sound-recorder/ui,
-        gnome/help/{gnome-audio-profiles/*,gnome-sound-recorder/*,
-        gnome-volume-control/*,gstreamer-properties/*},
-        gstreamer-properties/icons,omf/{gnome-audio-profiles,
-        gnome-sound-recorder,gnome-volume-control,gstreamer-properties},
-        sounds/gnome/default/alerts}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-sound-recorder">
-        <term><command>gnome-sound-recorder</command></term>
-        <listitem>
-          <para>is <application>GNOME</application>'s recorder.</para>
-          <indexterm zone="gnome-media gnome-sound-recorder">
-            <primary sortas="b-gnome-sound-recorder">gnome-sound-recorder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-volume-control">
-        <term><command>gnome-volume-control</command></term>
-        <listitem>
-          <para>is <application>GNOME</application>'s mixer with volume
-          applet.</para>
-          <indexterm zone="gnome-media gnome-volume-control">
-            <primary sortas="b-gnome-volume-control">gnome-volume-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gstreamer-properties">
-        <term><command>gstreamer-properties</command></term>
-        <listitem>
-          <para>is a GUI front-end to <application>GStreamer</application>'s
-          audio/video input/output parameters.</para>
-          <indexterm zone="gnome-media gstreamer-properties">
-            <primary sortas="b-gstreamer-properties">gstreamer-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-menus.xml
===================================================================
--- archive/gnome/gnome-menus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 gnome-menus-download-http
-           "&gnome-download-http;/gnome-menus/3.6/gnome-menus-&gnome-menus-version;.tar.xz">
-  <!ENTITY gnome-menus-download-ftp
-           "&gnome-download-ftp;/gnome-menus/3.6/gnome-menus-&gnome-menus-version;.tar.xz">
-  <!ENTITY gnome-menus-md5sum        "c48775f704e7c542496d1fa1a84b2bfd">
-  <!ENTITY gnome-menus-size          "416 KB">
-  <!ENTITY gnome-menus-buildsize     "8.5 MB">
-  <!ENTITY gnome-menus-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-menus" xreflabel="gnome-menus-&gnome-menus-version;">
-  <?dbhtml filename="gnome-menus.html"?>
-
-
-  <title>gnome-menus-&gnome-menus-version;</title>
-
-  <indexterm zone="gnome-menus">
-    <primary sortas="a-gnome-menus">gnome-menus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Menus</title>
-
-    <para>
-      The <application>GNOME Menus</application> package contains an
-      implementation of the draft
-      <ulink url="http://www.freedesktop.org/Standards/menu-spec">
-      Desktop Menu Specification</ulink> from freedesktop.org. It also
-      contains the <application>GNOME</application> menu layout configuration
-      files, <filename>.directory</filename> files and a menu related utility
-      program.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-menus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-menus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-menus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-menus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-menus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-menus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Menus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="intltool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-menus"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Menus</title>
-
-    <para>
-      Install <application>GNOME Menus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gmenu-simple-editor
-        </seg>
-        <seg>
-          libgnome-menu.so
-        </seg>
-        <seg>
-          /etc/xdg/menus,
-          /usr/include/gnome-menus-3.0,
-          /usr/lib/python&python2-majorver;/site-packages/GMenuSimpleEditor and
-          /usr/share/gnome-menus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gmenu-simple-editor">
-        <term><command>gmenu-simple-editor</command></term>
-        <listitem>
-          <para>
-            is used to modify <application>GNOME</application> Menu layout.
-          </para>
-          <indexterm zone="gnome-menus gmenu-simple-editor">
-            <primary sortas="b-gmenu-simple-editor">gmenu-simple-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnome-menu">
-        <term><filename class="libraryfile">libgnome-menu.so</filename></term>
-        <listitem>
-          <para>
-            contains functions required to support
-            <application>GNOME</application>'s implementation of the
-            Desktop Menu Specification.
-          </para>
-          <indexterm zone="gnome-menus libgnome-menu">
-            <primary sortas="c-libgnome-menu">libgnome-menu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-online-accounts.xml
===================================================================
--- archive/gnome/gnome-online-accounts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,212 +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 gnome-online-accounts-download-http
-           "&gnome-download-http;/gnome-online-accounts/3.6/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-download-ftp
-           "&gnome-download-ftp;/gnome-online-accounts/3.6/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-md5sum        "178faf9ed1a57c306612d61423b9874e">
-  <!ENTITY gnome-online-accounts-size          "572 KB">
-  <!ENTITY gnome-online-accounts-buildsize     "25 MB">
-  <!ENTITY gnome-online-accounts-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-online-accounts" xreflabel="gnome-online-accounts-&gnome-online-accounts-version;">
-  <?dbhtml filename="gnome-online-accounts.html"?>
-
-
-  <title>gnome-online-accounts-&gnome-online-accounts-version;</title>
-
-  <indexterm zone="gnome-online-accounts">
-    <primary sortas="a-gnome-online-accounts">gnome-online-accounts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Online Accounts</title>
-
-    <para>
-      The <application>GNOME Online Accounts</application> package contains a
-      framework used to access the user's online accounts.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-online-accounts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-online-accounts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-online-accounts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-online-accounts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-online-accounts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-online-accounts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Online Accounts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gcr"/>,
-      <xref linkend="libgnome-keyring"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="librest"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="json-glib"/> and
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="mitkrb"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-online-accounts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Online Accounts</title>
-
-    <para>
-      Install <application>GNOME Online Accounts</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/gnome-online-accounts \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-kerberos</option>: Use this switch if you have installed
-      <xref linkend="mitkrb"/> and wish to use it with
-      <application>GNOME Online Accounts</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          goa-daemon
-        </seg>
-        <seg>
-          libgoa-1.0.so and libgoa-backend-1.0.so
-        </seg>
-        <seg>
-          /usr/include/goa-1.0,
-          /usr/lib/gnome-online-accounts and
-          /usr/share/gtk-doc/html/goa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="goa-daemon">
-        <term><command>goa-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME Online Accounts</application> Daemon.
-          </para>
-          <indexterm zone="gnome-online-accounts goa-daemon">
-            <primary sortas="b-goa-daemon">goa-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgoa-1">
-        <term><filename class="libraryfile">libgoa-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GNOME Online Accounts</application>
-            API functions.
-          </para>
-          <indexterm zone="gnome-online-accounts libgoa-1">
-            <primary sortas="c-libgoa-1">libgoa-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgoa-backend-1">
-        <term><filename class="libraryfile">libgoa-backend-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <application>GNOME Online Accounts</application>
-            backends.
-          </para>
-          <indexterm zone="gnome-online-accounts libgoa-backend-1">
-            <primary sortas="c-libgoa-backend-1">libgoa-backend-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-panel.xml
===================================================================
--- archive/gnome/gnome-panel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +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 gnome-panel-download-http
-           "&gnome-download-http;/gnome-panel/3.6/gnome-panel-&gnome-panel-version;.tar.xz">
-  <!ENTITY gnome-panel-download-ftp
-           "&gnome-download-ftp;/gnome-panel/3.6/gnome-panel-&gnome-panel-version;.tar.xz">
-  <!ENTITY gnome-panel-md5sum        "f394ad73babbce95fd0bb65ec6fd3519">
-  <!ENTITY gnome-panel-size          "2.4 MB">
-  <!ENTITY gnome-panel-buildsize     "72 MB">
-  <!ENTITY gnome-panel-time          "0.6 SBU">
-]>
-
-<sect1 id="gnome-panel" xreflabel="gnome-panel-&gnome-panel-version;">
-  <?dbhtml filename="gnome-panel.html"?>
-
-
-  <title>gnome-panel-&gnome-panel-version;</title>
-
-  <indexterm zone="gnome-panel">
-    <primary sortas="a-gnome-panel">gnome-panel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Panel</title>
-
-    <para>
-      <application>GNOME Panel</application> is an area on the desktop from
-      which you can run applications and applets, and perform other tasks.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-panel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-panel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-panel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-panel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-panel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-panel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Panel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/>,
-      <xref linkend="GConf"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gnome-menus"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libgweather"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libwnck"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="NetworkManager"/> and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <note>
-      <para>
-        The <application>libxml2</application>
-        <application>Python</application> module must have been built during the
-        installation of <application>libxml2</application> else the
-        <application>GNOME Panel</application> build will fail.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-panel"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Panel</title>
-
-    <para>
-      Install <application>GNOME Panel</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-applets &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-desktop-item-edit, gnome-panel and panel-test-applets
-        </seg>
-        <seg>
-          libpanel-applet-4.so
-        </seg>
-        <seg>
-          /usr/include/gnome-panel-4.0,
-          /usr/lib/gnome-applets,
-          /usr/share/gnome-applets,
-          /usr/share/gtk-doc/html/panel-applet-4.0,
-          /usr/share/help/*/clock and
-          /usr/share/help/*/fish
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-panel-prog">
-        <term><command>gnome-panel</command></term>
-        <listitem>
-          <para>
-            provides the panels for the the <application>GNOME</application>
-            Desktop.
-          </para>
-          <indexterm zone="gnome-panel gnome-panel-prog">
-            <primary sortas="b-gnome-panel">gnome-panel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpanel-applet-4">
-        <term><filename class="libraryfile">libpanel-applet-4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for development of small applications
-            (applets) which may be embedded in the panel.
-          </para>
-          <indexterm zone="gnome-panel libpanel-applet-4">
-            <primary sortas="c-libpanel-applet-4">libpanel-applet-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-power-manager.xml
===================================================================
--- archive/gnome/gnome-power-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +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 gnome-power-manager-download-http
-     "&gnome-download-http;/gnome-power-manager/&gnome-minor;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
-  <!ENTITY gnome-power-manager-download-ftp
-     "&gnome-download-ftp;/gnome-power-manager/&gnome-minor;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
-  <!ENTITY gnome-power-manager-md5sum        "7aa1d63d0abba3aacd994ff7ff184369">
-  <!ENTITY gnome-power-manager-size          "456 KB">
-  <!ENTITY gnome-power-manager-buildsize     "8.6 MB">
-  <!ENTITY gnome-power-manager-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;">
-  <?dbhtml filename="gnome-power-manager.html"?>
-
-
-  <title>gnome-power-manager-&gnome-power-manager-version;</title>
-
-  <indexterm zone="gnome-power-manager">
-    <primary sortas="a-gnome-power-manager">gnome-power-manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Power Manager</title>
-
-    <para>
-      The <application>GNOME Power Manager</application> package contains
-      a tool used to report on power management on the system.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-power-manager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-power-manager-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-power-manager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-power-manager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-power-manager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-power-manager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Power Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/> (to generate man pages) which will require
-      <xref linkend="perl-sgmlspm"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-power-manager"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Power Manager</title>
-
-    <para>
-      Install <application>GNOME Power Manager</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-power-statistics
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-power-statistics">
-        <term><command>gnome-power-statistics</command></term>
-        <listitem>
-          <para>
-            is used to visualize the power consumption of laptop hardware.
-          </para>
-          <indexterm zone="gnome-power-manager gnome-power-statistics">
-            <primary
-            sortas="b-gnome-power-statistics">gnome-power-statistics</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-screensaver.xml
===================================================================
--- archive/gnome/gnome-screensaver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +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 gnome-screensaver-download-http
-           "&gnome-download-http;/gnome-screensaver/3.6/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
-  <!ENTITY gnome-screensaver-download-ftp
-           "&gnome-download-ftp;/gnome-screensaver/3.6/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
-  <!ENTITY gnome-screensaver-md5sum        "881cc58daa7cd8602737912ae5715cc8">
-  <!ENTITY gnome-screensaver-size          "556 KB">
-  <!ENTITY gnome-screensaver-buildsize     "13 MB">
-  <!ENTITY gnome-screensaver-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-screensaver" xreflabel="gnome-screensaver-&gnome-screensaver-version;">
-  <?dbhtml filename="gnome-screensaver.html"?>
-
-
-  <title>gnome-screensaver-&gnome-screensaver-version;</title>
-
-  <indexterm zone="gnome-screensaver">
-    <primary sortas="a-gnome-screensaver">gnome-screensaver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Screensaver</title>
-
-    <para>
-      The <application>GNOME Screensaver</application> package contains a
-      screen saver and locker designed to have simple, sane, secure defaults
-      and be well integrated with the desktop. It supports locking down of
-      configuration settings, has translations into many languages and
-      convenient user switching.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-screensaver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-screensaver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-screensaver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-screensaver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-screensaver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-screensaver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Screensaver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gnome-desktop"/> and
-      <xref linkend="linux-pam"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgnomekbd"/>,
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-screensaver"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Screensaver</title>
-
-    <para>
-      Install <application>GNOME Screensaver</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's|etc/pam\.d"|etc"|' data/Makefile.in &amp;&amp;
-./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-screensaver \
-            --with-pam-prefix=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's|etc/pam\.d"|etc|' data/Makefile.in</command>:
-      This command is used so that an erroneous message to copy the PAM
-      configuration file is not displayed.
-    </para>
-
-    <para>
-      <parameter>--with-pam-prefix=/etc</parameter>: This parameter is
-      used so that the <application>Linux PAM</application> configuration file
-      for the <application>GNOME Screensaver</application> application is
-      installed in the correct location.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GNOME Screensaver</title>
-
-    <sect3 id="gnome-screensaver-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/pam.d/gnome-screensaver</filename>
-      </para>
-
-      <indexterm zone="gnome-screensaver gnome-screensaver-config">
-        <primary sortas="e-etc-pam.d-gnome-screensaver">
-        /etc/pam.d/gnome-screensaver</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <sect4>
-        <title>Linux PAM Configuration</title>
-
-        <para>
-          The default <application>GNOME Screensaver</application> configuration
-          file does not work with a BLFS system. Replace the existing file with
-          one that can be used on a BLFS system by issuing the following command
-          as the <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/gnome-screensaver &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/gnome-screensaver
-
-auth     include        system-auth
-auth     optional       pam_gnome_keyring.so
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/gnome-screensaver</literal>
-EOF
-chmod -v 644 /etc/pam.d/gnome-screensaver</userinput></screen>
-
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-screensaver and gnome-screensaver-command
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-screensaver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-screensaver-prog">
-        <term><command>gnome-screensaver</command></term>
-        <listitem>
-          <para>
-            is a screensaver and screen-locking program designed to work
-            seamlessly with the <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="gnome-screensaver gnome-screensaver-prog">
-            <primary sortas="b-gnome-screensaver">gnome-screensaver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-screensaver-command">
-        <term><command>gnome-screensaver-command</command></term>
-        <listitem>
-          <para>
-            is a tool used for controlling an already running instance
-            of <application>GNOME Screensaver</application>.
-          </para>
-          <indexterm zone="gnome-screensaver gnome-screensaver-command">
-            <primary sortas="b-gnome-screensaver-command">gnome-screensaver-command</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-search-tool.xml
===================================================================
--- archive/gnome/gnome-search-tool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +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 gnome-search-tool-download-http
-           "&gnome-download-http;/gnome-search-tool/3.6/gnome-search-tool-&gnome-search-tool-version;.tar.xz">
-  <!ENTITY gnome-search-tool-download-ftp
-           "&gnome-download-ftp;/gnome-search-tool/3.6/gnome-search-tool-&gnome-search-tool-version;.tar.xz">
-  <!ENTITY gnome-search-tool-md5sum        "6aed3d63b77ceb0685a57300bc057a7e">
-  <!ENTITY gnome-search-tool-size          "672 KB">
-  <!ENTITY gnome-search-tool-buildsize     "17 MB">
-  <!ENTITY gnome-search-tool-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-search-tool" xreflabel="gnome-search-tool-&gnome-search-tool-version;">
-  <?dbhtml filename="gnome-search-tool.html"?>
-
-
-  <title>gnome-search-tool-&gnome-search-tool-version;</title>
-
-  <indexterm zone="gnome-search-tool">
-    <primary sortas="a-gnome-search-tool">gnome-search-tool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Search Tool</title>
-
-    <para>
-      The <application>GNOME Search Tool</application> package is an
-      utility used for finding files on your system.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-search-tool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-search-tool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-search-tool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-search-tool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-search-tool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-search-tool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Search Tool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-search-tool"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Search Tool</title>
-
-    <para>
-      Install <application>GNOME Search Tool</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-search-tool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/gnome-search-tool and
-          /usr/share/pixmaps/gsearchtool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-search-tool-prog">
-        <term><command>gnome-search-tool</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Search Tool.
-          </para>
-          <indexterm zone="gnome-search-tool gnome-search-tool-prog">
-            <primary sortas="b-gnome-search-tool">gnome-search-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-session.xml
===================================================================
--- archive/gnome/gnome-session.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,248 +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 gnome-session-download-http
-           "&gnome-download-http;/gnome-session/3.6/gnome-session-&gnome-session-version;.tar.xz">
-  <!ENTITY gnome-session-download-ftp
-           "&gnome-download-ftp;/gnome-session/3.6/gnome-session-&gnome-session-version;.tar.xz">
-  <!ENTITY gnome-session-md5sum        "355730543dbcc166f331d806cd0da22d">
-  <!ENTITY gnome-session-size          "716 KB">
-  <!ENTITY gnome-session-buildsize     "20 MB">
-  <!ENTITY gnome-session-time          "0.3 SBU">
-]>
-
-<sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;">
-  <?dbhtml filename="gnome-session.html"?>
-
-
-  <title>gnome-session-&gnome-session-version;</title>
-
-  <indexterm zone="gnome-session">
-    <primary sortas="a-gnome-session">gnome-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Session</title>
-
-    <para>
-      The <application>GNOME Session</application> package contains
-      the <application>GNOME</application> session manager.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="json-glib"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="consolekit"/> (if you intend to use startx to initiate
-      your <application>GNOME</application> desktop)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-session"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Session</title>
-
-    <para>
-      Install <application>GNOME Session</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/gnome-session &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-docbook-docs</option>: This switch is used to
-      enable building of the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="gnome-session-config">
-    <title>Configuring GNOME Session</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        If you are not using <application>GDM</application> to start your
-        <application>GNOME</application> desktop, you will need to invoke
-        <command>gnome-session</command> <emphasis>instead of</emphasis> invoking
-        a window-manager directly.  All of the packages in the 'Desktop' section of
-        this chapter need to be installed first, and some of the 'Applications' -
-        particularly <application>GNOME Terminal</application>
-        (<application>xterm</application> does not  install a '.desktop' file and
-        so not appear in the menus).
-      </para>
-
-      <para>
-        When <command>gnome-session</command> is run, it invokes the necessary
-        daemons and either <application>Metacity</application> or
-        <application>gnome-shell</application>. A desktop manager such as
-        <application>GDM</application> will invoke <application>ConsoleKit</application>
-        before the window manager, but if you use <command>startx</command> the first
-        invocation after booting may fail because the daemon is not already running,
-        so it is invoked first.
-      </para>
-
-      <para>
-        To automatically start the <application>gnome-session</application>
-        window manager when you issue the <command>startx</command> command,
-        backup your current <filename>~/.xinitrc</filename> before proceeding.
-        Note that you will be able to invoke <application>GNOME Terminal</application>
-        from the menu, so there is no reason to invoke <command>xterm</command> here.
-        Create a new <filename>.xinitrc</filename> using this command:
-      </para>
-
-      <indexterm zone="metacity gnome-session-config">
-        <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-      </indexterm>
-
-<screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>exec ck-launch-session dbus-launch --exit-with-session gnome-session</literal>
-EOF</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>
-          gnome-session, gnome-session-properties and gnome-session-quit
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-session,
-          /usr/share/doc/gnome-session and
-          /usr/share/gnome-session
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-session-prog">
-        <term><command>gnome-session</command></term>
-        <listitem>
-          <para>
-            is used to start up the <application>GNOME</application>
-            Desktop environment.
-          </para>
-          <indexterm zone="gnome-session gnome-session-prog">
-            <primary sortas="b-gnome-session">gnome-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-session-properties">
-        <term><command>gnome-session-properties</command></term>
-        <listitem>
-          <para>
-            allows the users to configure which applications should be
-            started at login.
-          </para>
-          <indexterm zone="gnome-session gnome-session-properties">
-            <primary sortas="b-gnome-session-properties">gnome-session-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-session-quit">
-        <term><command>gnome-session-quit</command></term>
-        <listitem>
-          <para>
-            is used to end the <application>GNOME</application> Session.
-          </para>
-          <indexterm zone="gnome-session gnome-session-quit">
-            <primary sortas="b-gnome-session-quit">gnome-session-quit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-settings-daemon.xml
===================================================================
--- archive/gnome/gnome-settings-daemon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +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 gnome-settings-daemon-download-http
-           "&gnome-download-http;/gnome-settings-daemon/3.6/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
-  <!ENTITY gnome-settings-daemon-download-ftp
-           "&gnome-download-ftp;/gnome-settings-daemon/3.6/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
-  <!ENTITY gnome-settings-daemon-md5sum        "362803ee1f1a0aa02e3c7df61ef82309">
-  <!ENTITY gnome-settings-daemon-size          "1.5 MB">
-  <!ENTITY gnome-settings-daemon-buildsize     "70 MB">
-  <!ENTITY gnome-settings-daemon-time          "0.7 SBU">
-]>
-
-<sect1 id="gnome-settings-daemon" xreflabel="gnome-settings-daemon-&gnome-settings-daemon-version;">
-  <?dbhtml filename="gnome-settings-daemon.html"?>
-
-
-  <title>gnome-settings-daemon-&gnome-settings-daemon-version;</title>
-
-  <indexterm zone="gnome-settings-daemon">
-    <primary sortas="a-gnome-settings-daemon">gnome-settings-daemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Settings Daemon</title>
-
-    <para>
-      The <application>GNOME Settings Daemon</application> is responsible
-      for setting various parameters of a <application>GNOME Session</application>
-      and the applications that run under it.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-settings-daemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-settings-daemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-settings-daemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-settings-daemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-settings-daemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-settings-daemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Settings Daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="libgnomekbd"/>,
-      <xref linkend="libwacom"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="upower"/> and
-      <xref linkend="xorg-wacom-driver"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/>,
-      <xref linkend="ibus"/> and
-      <xref linkend="nss"/>
-    </para>
-
-    <note>
-      <para>
-        Recommended dependencies are not strictly required for
-        this package to build and function, but you may not get
-        expected results at runtime if you don't install them.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-settings-daemon"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Settings Daemon</title>
-
-    <para>
-      Install <application>GNOME Settings Daemon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-settings-daemon \
-            --disable-packagekit \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!-- To test the results, issue <command>make check</command>. -->
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-packagekit</option>: This switch disables use
-      of PackageKit which isn't suitable for BLFS.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--disable-cups</option>: Use this switch if you have not
-      installed recommended dependency <application>Cups</application>.
-    </para>
-
-    <para>
-      <option>--disable-ibus</option>: Use this switch if you have not
-      installed recommended dependency <application>IBus</application>.
-    </para>
-
-    <para>
-      <option>--disable-smartcard-support</option>: Use this switch if
-      you have not installed recommended dependency
-      <application>NSS</application> and wish to disable SmartCard
-      support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-settings-daemon
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /etc/gnome-settings-daemon,
-          /usr/include/gnome-settings-daemon-3.0,
-          /usr/lib/gnome-settings-daemon,
-          /usr/lib/gnome-settings-daemon-3.0,
-          /usr/share/gnome-settings-daemon and
-          /usr/share/gnome-settings-daemon-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-settings-daemon-prog">
-        <term><command>gnome-settings-daemon</command></term>
-        <listitem>
-          <para>
-            is responsible for setting the various preference parameters of
-            a <application>GNOME</application> session and the applications
-            that run under it.
-          </para>
-          <indexterm zone="gnome-settings-daemon gnome-settings-daemon-prog">
-            <primary sortas="b-gnome-settings-daemon">gnome-settings-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-shared-mime-info.xml
===================================================================
--- archive/gnome/gnome-shared-mime-info.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +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="GNOME-shared-mime-info">
-  <?dbhtml filename="gnome-shared-mime-info.html"?>
-
-
-  <title>shared-mime-info-&shared-mime-info-version;</title>
-
-  <para>The <xref linkend="shared-mime-info"/> package is located in
-  the &apos;X Libraries&apos; chapter and is required by GNOME but is not a
-  direct dependency of any GNOME package, therefore the package is
-  mentioned within the GNOME Core Packages (Libraries section) chapter to
-  ensure it is installed.</para>
-
-</sect1>
Index: chive/gnome/gnome-shell.xml
===================================================================
--- archive/gnome/gnome-shell.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +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 gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/3.6/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-download-ftp
-           "&gnome-download-ftp;/gnome-shell/3.6/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "6d00d16fd54fa0d0e5d4b3a7dcad0bfe">
-  <!ENTITY gnome-shell-size          "1.4 MB">
-  <!ENTITY gnome-shell-buildsize     "50 MB">
-  <!ENTITY gnome-shell-time          "0.6 SBU">
-]>
-
-<sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;">
-  <?dbhtml filename="gnome-shell.html"?>
-
-
-  <title>gnome-shell-&gnome-shell-version;</title>
-
-  <indexterm zone="gnome-shell">
-    <primary sortas="a-gnome-shell">gnome-shell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Shell</title>
-
-    <para>
-      The <application>GNOME Shell</application> is the core user interface of
-      the <application>GNOME</application> Desktop environment.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-shell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-shell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-shell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-shell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-shell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-shell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Shell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="gjs"/>,
-      <xref linkend="gnome-menus"/>,
-      <xref linkend="gnome-settings-daemon"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libcroco"/>,
-      <xref linkend="libgnome-keyring"/>,
-      <xref linkend="mutter"/>,
-      <xref linkend="NetworkManager"/> and
-      <xref linkend="telepathy-logger"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnome-bluetooth"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="accountsservice"/>,
-      <xref linkend="caribou"/>,
-      <xref linkend="dconf"/>,
-      <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gnome-icon-theme-symbolic"/> and
-      <xref linkend="telepathy-mission-control"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-shell"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Shell</title>
-
-    <para>
-      Install <application>GNOME Shell</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-shell &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-shell, gnome-shell-extension-prefs and gnome-shell-extension-tool and
-          gnome-shell-pref-tool
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-shell,
-          /usr/share/gnome-shell and
-          /usr/share/gtk-doc/html/shell
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-shell-prog">
-        <term><command>gnome-shell</command></term>
-        <listitem>
-          <para>
-            provides the core user interface functions for the
-            <application>GNOME</application> 3 Desktop.
-          </para>
-          <indexterm zone="gnome-shell gnome-shell-prog">
-            <primary sortas="b-gnome-shell">gnome-shell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="gnome-shell-extension-prefs">
-        <term><command>gnome-shell-extension-prefs</command></term>
-        <listitem>
-          <para>
-            does this .....
-          </para>
-          <indexterm zone="gnome-shell gnome-shell-extension-prefs">
-            <primary sortas="b-gnome-shell-extension-prefs">gnome-shell-extension-prefs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-shell-extension-tool">
-        <term><command>gnome-shell-extension-tool</command></term>
-        <listitem>
-          <para>
-            does this .....
-          </para>
-          <indexterm zone="gnome-shell gnome-shell-extension-tool">
-            <primary sortas="b-gnome-shell-extension-tool">gnome-shell-extension-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-system-log.xml
===================================================================
--- archive/gnome/gnome-system-log.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +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 gnome-system-log-download-http
-           "&gnome-download-http;/gnome-system-log/3.6/gnome-system-log-&gnome-system-log-version;.tar.xz">
-  <!ENTITY gnome-system-log-download-ftp
-           "&gnome-download-ftp;/gnome-system-log/3.6/gnome-system-log-&gnome-system-log-version;.tar.xz">
-  <!ENTITY gnome-system-log-md5sum        "6615535fe8acf095c7e89b4f01caddc4">
-  <!ENTITY gnome-system-log-size          "1.2 MB">
-  <!ENTITY gnome-system-log-buildsize     "19 MB">
-  <!ENTITY gnome-system-log-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-system-log" xreflabel="gnome-system-log-&gnome-system-log-version;">
-  <?dbhtml filename="gnome-system-log.html"?>
-
-
-  <title>gnome-system-log-&gnome-system-log-version;</title>
-
-  <indexterm zone="gnome-system-log">
-    <primary sortas="a-gnome-system-log">gnome-system-log</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME System Log</title>
-
-    <para>
-      The <application>GNOME System Log</application> package contains a
-      simple utility used to display system log files.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-system-log-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-system-log-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-system-log-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-system-log-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-system-log-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-system-log-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME System Log Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-system-log"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME System Log</title>
-
-    <para>
-      Install <application>GNOME System Log</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-system-log
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/gnome-system-log
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-system-log-prog">
-        <term><command>gnome-system-log</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> System Log Viewer.
-          </para>
-          <indexterm zone="gnome-system-log gnome-system-log-prog">
-            <primary sortas="b-gnome-system-log">gnome-system-log</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-tweak-tool.xml
===================================================================
--- archive/gnome/gnome-tweak-tool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +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 gnome-tweak-tool-download-http
-           "&gnome-download-http;/gnome-tweak-tool/3.6/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
-  <!ENTITY gnome-tweak-tool-download-ftp
-           "&gnome-download-ftp;/gnome-tweak-tool/3.6/gnome-tweak-tool-&gnome-tweak-tool-version;.tar.xz">
-  <!ENTITY gnome-tweak-tool-md5sum        "82ea8aeb1a1d7fd8532695b743b3a437">
-  <!ENTITY gnome-tweak-tool-size          "220 KB">
-  <!ENTITY gnome-tweak-tool-buildsize     "3.2 MB">
-  <!ENTITY gnome-tweak-tool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-tweak-tool" xreflabel="gnome-tweak-tool-&gnome-tweak-tool-version;">
-  <?dbhtml filename="gnome-tweak-tool.html"?>
-
-
-  <title>gnome-tweak-tool-&gnome-tweak-tool-version;</title>
-
-  <indexterm zone="gnome-tweak-tool">
-    <primary sortas="a-gnome-tweak-tool">gnome-tweak-tool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Tweak Tool</title>
-
-    <para>
-      <application>GNOME Tweak Tool</application> is a simple program used
-      to tweak advanced <application>GNOME</application> settings.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-tweak-tool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-tweak-tool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-tweak-tool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-tweak-tool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-tweak-tool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-tweak-tool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Tweak Tool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gsettings-desktop-schemas"/> and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-tweak-tool"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Tweak Tool</title>
-
-    <para>
-      Install <application>GNOME Tweak Tool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-tweak-tool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/gtweak and
-          /usr/share/gnome-tweak-tool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-tweak-tool-prog">
-        <term><command>gnome-tweak-tool</command></term>
-        <listitem>
-          <para>
-            is used to tweak advanced <application>GNOME</application>
-            settings.
-          </para>
-          <indexterm zone="gnome-tweak-tool gnome-tweak-tool-prog">
-            <primary sortas="b-gnome-tweak-tool">gnome-tweak-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-user-docs.xml
===================================================================
--- archive/gnome/gnome-user-docs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 gnome-user-docs-download-http
-           "&gnome-download-http;/gnome-user-docs/3.6/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-download-ftp
-           "&gnome-download-ftp;/gnome-user-docs/3.6/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-md5sum        "6301088417ce005772922e0e7ce0db4c">
-  <!ENTITY gnome-user-docs-size          "7.8 MB">
-  <!ENTITY gnome-user-docs-buildsize     "120 MB">
-  <!ENTITY gnome-user-docs-time          "1.0 SBU">
-]>
-
-<sect1 id="gnome-user-docs" xreflabel="gnome-user-docs-&gnome-user-docs-version;">
-  <?dbhtml filename="gnome-user-docs.html"?>
-
-
-  <title>gnome-user-docs-&gnome-user-docs-version;</title>
-
-  <indexterm zone="gnome-user-docs">
-    <primary sortas="a-gnome-user-docs">gnome-user-docs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME User Docs</title>
-
-    <para>
-      The <application>GNOME User Docs</application> package contains
-      documentation for <application>GNOME</application>.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-user-docs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-user-docs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-user-docs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-user-docs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-user-docs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-user-docs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME User Docs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-user-docs"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME User Docs</title>
-
-    <para>
-      Install <application>GNOME User Docs</application>
-      by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-       <seg>
-          None
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/gnome-help and
-          /usr/share/help/*/system-admin-guide
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-user-share.xml
===================================================================
--- archive/gnome/gnome-user-share.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 gnome-user-share-download-http
-           "&gnome-download-http;/gnome-user-share/3.0/gnome-user-share-&gnome-user-share-version;.tar.xz">
-  <!ENTITY gnome-user-share-download-ftp
-           "&gnome-download-ftp;/gnome-user-share/3.0/gnome-user-share-&gnome-user-share-version;.tar.xz">
-  <!ENTITY gnome-user-share-md5sum        "dff4e0eb468e61f3de4a2e6843c7d679">
-  <!ENTITY gnome-user-share-size          "996 KB">
-  <!ENTITY gnome-user-share-buildsize     "10 MB">
-  <!ENTITY gnome-user-share-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-user-share" xreflabel="gnome-user-share-&gnome-user-share-version;">
-  <?dbhtml filename="gnome-user-share.html"?>
-
-
-  <title>gnome-user-share-&gnome-user-share-version;</title>
-
-  <indexterm zone="gnome-user-share">
-    <primary sortas="a-gnome-user-share">gnome-user-share</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME User Share</title>
-
-    <para>
-      The <application>GNOME User Share</application> package allows easy
-      user-level file sharing via WebDAV or ObexFTP. The shared files are
-      announced on the network by <application>Avahi</application>.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-user-share-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-user-share-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-user-share-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-user-share-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-user-share-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-user-share-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME User Share Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-bluetooth"/>,
-      <xref linkend="libcanberra"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref linkend="mod_dnssd"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nautilus"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-user-share"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME User Share</title>
-
-    <para>
-      Install <application>GNOME User Share</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gnome-user-share  \
-            --with-modules-path=/usr/lib/apache &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-   <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-file-share-properties and gnome-user-share
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-user-share,
-          /usr/share/gnome-user-share and
-          /usr/share/help/*/gnome-user-share
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-file-share-properties">
-        <term><command>gnome-file-share-properties</command></term>
-        <listitem>
-          <para>
-            is a tool used to manage shares.
-          </para>
-          <indexterm zone="gnome-user-share gnome-file-share-properties">
-            <primary sortas="b-gnome-file-share-properties">gnome-file-share-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/grilo-plugins.xml
===================================================================
--- archive/gnome/grilo-plugins.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +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 grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-md5sum       "184163b248efc064d8b6558cf297fb73">
-  <!ENTITY grilo-plugins-size         "1016 KB">
-  <!ENTITY grilo-plugins-buildsize    "24 MB (all plugins)">
-  <!ENTITY grilo-plugins-time         "0.3 SBU">
-]>
-
-<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
-  <?dbhtml filename="grilo-plugins.html"?>
-
-
-  <title>Grilo-Plugins-&grilo-plugins-version;</title>
-
-  <indexterm zone="grilo-plugins">
-    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo-Plugins</title>
-
-    <para><application>Grilo-Plugins</application> is a collection of plugins
-    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
-    Rai.tv, Tracker, Youtube, between others) to make media discovery and
-    browsing easy for applications that support <application>Grilo</application>
-    framework, such as <application>Totem</application> (some plugins are
-    disabled in <application>Totem</application>).</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-plugins-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-plugins-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="grilo"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gmime"/> (Podcasts),
-      <xref linkend="json-glib"/> (TMDB),
-      <xref linkend="lua"/> (Lua Factory),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/">gnome-online-accounts</ulink> (Flickr, Pocket),
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gom">gom</ulink> (Bookmarks),
-      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libgdata/">libgdata</ulink> (YouTube),
-      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (YouTube),
-      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
-      (to configure Flickr personal accounts),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art),
-      <ulink url="https://launchpad.net/python-dbusmock/trunk">python-dbusmock</ulink> (dLeyna runtime tests), and
-      <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo-Plugins</title>
-
-    <para>Install <application>Grilo-Plugins</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>make check 2&gt;&amp;1 | tee check.log</command>.
-      A summary can be obtained with
-      <command>grep -E 'PASS|FAIL' check.log</command>.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test which plugins are installed and that <xref linkend="grilo"/> is
-      working, issue  <command>grl-inspect-0.2</command> or
-      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
-    </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>
-          Several under /usr/lib/grilo-0.2, with names related to the
-          respective plugins.
-        </seg>
-
-        <seg>
-          /usr/lib/grilo-0.2,
-          /usr/share/grilo-plugins and
-          /usr/share/help/C/{examples,grilo-plugins}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/grilo.xml
===================================================================
--- archive/gnome/grilo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +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 grilo-download-http "&gnome-download-http;/grilo/0.2/grilo-&grilo-version;.tar.xz">
-  <!ENTITY grilo-download-ftp  "&gnome-download-ftp;/grilo/0.2/grilo-&grilo-version;.tar.xz">
-  <!ENTITY grilo-md5sum       "7e124e3dc1350c2576a84fd18a901d21">
-  <!ENTITY grilo-size         "604 KB">
-  <!ENTITY grilo-buildsize    "14 MB">
-  <!ENTITY grilo-time         "0.2 SBU">
-]>
-
-<sect1 id="grilo" xreflabel="Grilo-&grilo-version;">
-  <?dbhtml filename="grilo.html"?>
-
-
-  <title>Grilo-&grilo-version;</title>
-
-  <indexterm zone="grilo">
-    <primary sortas="a-Grilo">Grilo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo</title>
-
-    <para><application>Grilo</application> is a framework focused on making
-    media discovery and browsing easy for applications and application
-    developers.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="grilo-plugins"/> (runtime), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (if installed at build time, make sure
-      avahi-daemon is running as a system daemon, started by
-      bootscript/systemd unit),
-      <xref linkend="docbook-utils"/>, and
-      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
-      (to configure flickr personal accounts)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo</title>
-
-    <para>Install <application>Grilo</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- testsuite exists, but does nothing -->
-    <para>This package does not have a testsuite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>grilo-test-ui-0.2, grl-inspect-0.2 and grl-launch-0.2</seg>
-        <seg>libgrilo-0.2.so, libgrlnet-0.2.so and libgrlpls-0.2.so</seg>
-        <seg>/usr/include/grilo-0.2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grilo-test-ui">
-        <term><command>grilo-test-ui-0.2</command></term>
-        <listitem>
-          <para>is a simple playground application that you can use to test the
-          framework and its plugins.</para>
-          <indexterm zone="grilo grilo-test-ui">
-            <primary sortas="b-grilo-test-ui">grilo-test-ui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grl-inspect">
-        <term><command>grl-inspect-0.2</command></term>
-        <listitem>
-          <para>is a tool that prints out information on available Grilo
-          sources.</para>
-          <indexterm zone="grilo grl-inspect">
-            <primary sortas="b-grl-inspect">grl-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grl-launch">
-        <term><command>grl-launch-0.2</command></term>
-        <listitem>
-          <para>is a tool to run <application>Grilo</application> operations
-          from command line.</para>
-          <indexterm zone="grilo grl-launch">
-            <primary sortas="b-grl-launch">grl-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrilo">
-        <term><filename class='libraryfile'>libgrilo.so</filename></term>
-        <listitem>
-          <para>provides the Grilo framework.</para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrilo">libgrilo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrlnet">
-        <term><filename class='libraryfile'>libgrlnet.so</filename></term>
-        <listitem>
-          <para>provides Grilo networking helpers for plug-ins.</para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrlnet">libgrlnet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrlpls">
-        <term><filename class='libraryfile'>libgrlpls.so</filename></term>
-        <listitem>
-          <para>provides playlist handling functions.</para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrlpls">libgrlpls.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gssdp.xml
===================================================================
--- archive/gnome/gssdp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +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 gssdp-download-http "&gnome-download-http;/gssdp/0.12/gssdp-&gssdp-version;.tar.xz">
-  <!ENTITY gssdp-download-ftp  "&gnome-download-ftp;/gssdp/0.12/gssdp-&gssdp-version;.tar.xz">
-  <!ENTITY gssdp-md5sum        "e7ac04abe7349a89d13d0ab4ee7d2e1b">
-  <!ENTITY gssdp-size          "260 KB">
-  <!ENTITY gssdp-buildsize     "4.8 MB">
-  <!ENTITY gssdp-time          "0.1 SBU">
-]>
-
-<sect1 id="gssdp" xreflabel="gssdp-&gssdp-version;">
-  <?dbhtml filename="gssdp.html"?>
-
-
-  <title>gssdp-&gssdp-version;</title>
-
-  <indexterm zone="gssdp">
-    <primary sortas="a-gssdp">gssdp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gssdp</title>
-
-    <para>
-      The <application>Gssdp</application> package provides a GObject based API for
-      handling resource discovery and announcement over SSDP (Simple Service Discovery
-      Protocol).
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gssdp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gssdp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gssdp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gssdp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gssdp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gssdp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gssdp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gssdp"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gssdp</title>
-
-    <para>
-      Install <application>Gssdp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gssdp-device-sniffer
-        </seg>
-        <seg>
-          libgssdp-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gssdp-1.0,
-          /usr/share/gtk-doc/html/gssdp and
-          /usr/share/gssdp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gssdp-device-sniffer">
-        <term><command>gssdp-device-sniffer</command></term>
-        <listitem>
-          <para>
-            is a device sniffer tool based on
-            <application>Gssdp</application> framework.
-          </para>
-          <indexterm zone="gssdp gssdp-device-sniffer">
-            <primary sortas="b-gssdp-device-sniffer">gssdp-device-sniffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgssdp-1">
-        <term><filename class='libraryfile'>libgssdp-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Gssdp</application> API functions.
-          </para>
-          <indexterm zone="gssdp libgssdp-1">
-            <primary sortas="c-libgssdp-1">libgssdp-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gtk-vnc.xml
===================================================================
--- archive/gnome/gtk-vnc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,235 +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 gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/0.5/gtk-vnc-&gtk-vnc-version;.tar.xz">
-  <!ENTITY gtk-vnc-download-ftp  "&gnome-download-ftp;/gtk-vnc/0.5/gtk-vnc-&gtk-vnc-version;.tar.xz">
-  <!ENTITY gtk-vnc-md5sum        "591f5c0efff931336cba5b56e0c64e0d">
-  <!ENTITY gtk-vnc-size          "380 KB">
-  <!ENTITY gtk-vnc-buildsize     "10 MB">
-  <!ENTITY gtk-vnc-time          "0.2 SBU">
-]>
-
-<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
-  <?dbhtml filename="gtk-vnc.html"?>
-
-
-  <title>gtk-vnc-&gtk-vnc-version;</title>
-
-  <indexterm zone="gtk-vnc">
-    <primary sortas="a-gtk-vnc">gtk-vnc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtk VNC</title>
-
-    <para>
-      The <application>Gtk VNC</application> package contains a VNC viewer widget
-      for <application>GTK+</application>. It is built using coroutines allowing
-      it to be completely asynchronous while remaining single threaded.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-vnc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-vnc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-vnc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-vnc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-vnc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-vnc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtk VNC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="gnutls"/> and
-      <xref linkend="intltool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="pulseaudio"/> and
-      <xref linkend="xulrunner"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtk-vnc"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtk VNC</title>
-
-    <para>
-      Install <application>Gtk VNC</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-gtk=3.0 \
-            --enable-vala \
-            --without-sasl &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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gtk=3.0</parameter>: This switch enables
-      building of the <application>GTK+ 3</application> library
-      instead of the <application>GTK+ 2</application> one.
-    </para>
-
-    <para>
-      <option>--enable-vala</option>: This switch enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para>
-      <option>--without-sasl</option>: This switch disables the use of
-      <application>Cyrus SASL</application> for authentication. Remove
-      it if you have installed <application>Cyrus SASL</application>
-      and wish to enable it for  authentication.
-    </para>
-
-    <para>
-      <option>--enable-plugin</option>: This switch enables building of
-      the browser plugin.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gvnccapture
-        </seg>
-        <seg>
-          libgtk-vnc-2.0.so, libgvnc-1.0.so and libgvncpulse-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gtk-vnc-2.0,
-          /usr/include/gvnc-1.0 and
-          /usr/include/gvncpulse-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gvnccapture">
-        <term><command>gvnccapture</command></term>
-        <listitem>
-          <para>
-            is used to capture image from VNC server.
-          </para>
-          <indexterm zone="gtk-vnc gvnccapture">
-            <primary sortas="b-gvnccapture">gvnccapture</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-vnc-2">
-        <term><filename class="libraryfile">libgtk-vnc-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GTK+ 3</application> bindings for
-            <application>Gtk VNC</application>.
-          </para>
-          <indexterm zone="gtk-vnc libgtk-vnc-2">
-            <primary sortas="c-libgtk-vnc-2.0">libgtk-vnc-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvnc-1">
-        <term><filename class="libraryfile">libgvnc-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the GObject bindings for <application>Gtk VNC</application>.
-          </para>
-          <indexterm zone="gtk-vnc libgvnc-1">
-            <primary sortas="c-libgvnc-1.0">libgvnc-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvncpulse-1">
-        <term><filename class="libraryfile">libgvncpulse-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>PulseAudio</application> bridge for
-            <application>Gtk VNC</application>.
-          </para>
-          <indexterm zone="gtk-vnc libgvncpulse-1">
-            <primary sortas="c-libgvncpulse-1.0">libgvncpulse-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gtkhtml.xml
===================================================================
--- archive/gnome/gtkhtml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +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 gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.6/gtkhtml-&gtkhtml-version;.tar.xz">
-  <!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.6/gtkhtml-&gtkhtml-version;.tar.xz">
-  <!ENTITY gtkhtml-md5sum        "83276483fee23680b19bcba83e7e4315">
-  <!ENTITY gtkhtml-size          "1.1 MB">
-  <!ENTITY gtkhtml-buildsize     "50 MB">
-  <!ENTITY gtkhtml-time          "0.5 SBU">
-]>
-
-<sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;">
-  <?dbhtml filename="gtkhtml.html"?>
-
-
-  <title>GtkHTML-&gtkhtml-version;</title>
-
-  <indexterm zone="gtkhtml">
-    <primary sortas="a-GtkHTML">GtkHTML</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkHTML</title>
-
-    <para>
-      The <application>GtkHTML</application> package contains a
-      lightweight HTML rendering/printing/editing engine.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkhtml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkhtml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkhtml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkhtml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkhtml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkhtml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkHTML Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="enchant"/>,
-      <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="iso-codes"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtkhtml"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkHTML</title>
-
-    <para>
-      Install <application>GtkHTML</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>
-          gtkhtml-editor-test
-        </seg>
-        <seg>
-          libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so
-        </seg>
-        <seg>
-          /usr/include/libgtkhtml-4.0 and
-          /usr/share/gtkhtml-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtkhtml-editor-test">
-        <term><command>gtkhtml-editor-test</command></term>
-        <listitem>
-          <para>
-            is a simple HTML editor widget.
-          </para>
-          <indexterm zone="gtkhtml gtkhtml-editor-test">
-            <primary sortas="b-gtkhtml-editor-test">gtkhtml-editor-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkhtml-4">
-        <term><filename class="libraryfile">libgtkhtml-4.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to render HTML within applications.
-          </para>
-          <indexterm zone="gtkhtml libgtkhtml-4">
-            <primary sortas="c-libgtkhtml-4">libgtkhtml-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gtksourceviewmm.xml
===================================================================
--- archive/gnome/gtksourceviewmm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 gtksourceviewmm-download-http
-           "&gnome-download-http;/gtksourceviewmm/3.2/gtksourceviewmm-&gtksourceviewmm-version;.tar.xz">
-  <!ENTITY gtksourceviewmm-download-ftp
-           "&gnome-download-ftp;/gtksourceviewmm/3.2/gtksourceviewmm-&gtksourceviewmm-version;.tar.xz">
-  <!ENTITY gtksourceviewmm-md5sum        "4ddec81dae02d0681db3ca131a42c59e">
-  <!ENTITY gtksourceviewmm-size          "725 KB">
-  <!ENTITY gtksourceviewmm-buildsize     "23 MB">
-  <!ENTITY gtksourceviewmm-time          "0.5 SBU">
-]>
-
-<sect1 id="gtksourceviewmm" xreflabel="gtksourceviewmm-&gtksourceviewmm-version;">
-  <?dbhtml filename="gtksourceviewmm.html"?>
-
-
-  <title>gtksourceviewmm-&gtksourceviewmm-version;</title>
-
-  <indexterm zone="gtksourceviewmm">
-    <primary sortas="a-gtksourceviewmm">gtksourceviewmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceViewmm</title>
-
-    <para>
-      The <application>GtksSourceViewmm</application> application is a C++
-      wrapper for the <application>GtkSourceView</application> widget library.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceviewmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceviewmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceviewmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceviewmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceviewmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceviewmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceViewmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtksourceview"/> and
-      <xref linkend="gtkmm3"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtksourceviewmm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceViewmm</title>
-
-    <para>
-      Install <application>GtkSourceViewmm</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgtksourceviewmm-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gtksourceviewmm-3.0,
-          /usr/lib/gtksourceviewmm-3.0,
-          /usr/share/share/devhelp/books/gtksourceviewmm-3.0 and
-          /usr/share/doc/gtksourceviewmm-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceviewmm-3">
-        <term><filename class='libraryfile'>libgtksourceviewmm-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GtkSourceView</application> API classes.
-          </para>
-          <indexterm zone="gtksourceviewmm libgtksourceviewmm-3">
-            <primary sortas="c-libgtksourceviewmm-3">libgtksourceviewmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gupnp-av.xml
===================================================================
--- archive/gnome/gupnp-av.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 gupnp-av-download-http "&gnome-download-http;/gupnp-av/0.10/gupnp-av-&gupnp-av-version;.tar.xz">
-  <!ENTITY gupnp-av-download-ftp  "&gnome-download-ftp;/gupnp-av/0.10/gupnp-av-&gupnp-av-version;.tar.xz">
-  <!ENTITY gupnp-av-md5sum        "a42af0751f8b0bacdda0741d3a515fec">
-  <!ENTITY gupnp-av-size          "284 KB">
-  <!ENTITY gupnp-av-buildsize     "8.1 MB">
-  <!ENTITY gupnp-av-time          "0.1 SBU">
-]>
-
-<sect1 id="gupnp-av" xreflabel="gupnp-av-&gupnp-av-version;">
-  <?dbhtml filename="gupnp-av.html"?>
-
-
-  <title>gupnp-av-&gupnp-av-version;</title>
-
-  <indexterm zone="gupnp-av">
-    <primary sortas="a-gupnp-av">gupnp-av</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GUPnP AV</title>
-
-    <para>
-      The <application>GUPnP AV</application> package contains a library to ease
-      handling of UPnP A/V profiles.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gupnp-av-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gupnp-av-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gupnp-av-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gupnp-av-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gupnp-av-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gupnp-av-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GUPnP AV Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gupnp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/gupnp-av"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GUPnP AV</title>
-
-    <para>
-      Install <application>GUPnP AV</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgupnp-av-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gupnp-av-1.0 and
-          /usr/share/gtk-doc/html/gupnp-av
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgupnp-av-1">
-        <term><filename class='libraryfile'>libgupnp-av-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GUPnP AV</application> API functions.
-          </para>
-          <indexterm zone="gupnp-av libgupnp-av-1">
-            <primary sortas="c-libgupnp-av-1">libgupnp-av-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gupnp-dlna.xml
===================================================================
--- archive/gnome/gupnp-dlna.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +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 gupnp-dlna-download-http
-           "&gnome-download-http;/gupnp-dlna/0.6/gupnp-dlna-&gupnp-dlna-version;.tar.xz">
-  <!ENTITY gupnp-dlna-download-ftp
-           "&gnome-download-ftp;/gupnp-dlna/0.6/gupnp-dlna-&gupnp-dlna-version;.tar.xz">
-  <!ENTITY gupnp-dlna-md5sum        "4e3151125de991f474f728c1c5343ab1">
-  <!ENTITY gupnp-dlna-size          "260 KB">
-  <!ENTITY gupnp-dlna-buildsize     "4.7 MB">
-  <!ENTITY gupnp-dlna-time          "0.1 SBU">
-]>
-
-<sect1 id="gupnp-dlna" xreflabel="gupnp-dlna-&gupnp-dlna-version;">
-  <?dbhtml filename="gupnp-dlna.html"?>
-
-
-  <title>gupnp-dlna-&gupnp-dlna-version;</title>
-
-  <indexterm zone="gupnp-dlna">
-    <primary sortas="a-gupnp-dlna">gupnp-dlna</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GUPnP DLNA</title>
-
-    <para>
-      The <application>GUPnP DLNA</application> package contains a library that
-      provides DLNA-related functionality for MediaServers.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gupnp-dlna-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gupnp-dlna-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gupnp-dlna-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gupnp-dlna-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gupnp-dlna-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gupnp-dlna-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GUPnP DLNA Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst-plugins-good"/>,
-      <xref linkend="gst-plugins-bad"/>,
-      <xref linkend="gst-plugins-ugly"/> and
-      <xref linkend="gst-ffmpeg"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gupnp-dlna"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GUPnP DLNA</title>
-
-    <para>
-      Install <application>GUPnP DLNA</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gupnp-dlna-info and gupnp-dlna-ls-profiles
-        </seg>
-        <seg>
-          libgupnp-dlna-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gupnp-dlna-1.0,
-          /usr/share/gtk-doc/html/gupnp-dlna and
-          /usr/share/gupnp-dlna
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gupnp-dlna-info">
-        <term><command>gupnp-dlna-info</command></term>
-        <listitem>
-          <para>
-            is a program used to extract DLNA and related metadata.
-          </para>
-          <indexterm zone="gupnp-dlna gupnp-dlna-info">
-            <primary sortas="b-gupnp-dlna-info">gupnp-dlna-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gupnp-dlna-ls-profiles">
-        <term><command>gupnp-dlna-ls-profiles</command></term>
-        <listitem>
-          <para>
-            is a program used to list all the DLNA profiles supported
-            by <application>GUPnP DLNA</application>.
-          </para>
-          <indexterm zone="gupnp-dlna gupnp-dlna-ls-profiles">
-            <primary sortas="b-gupnp-dlna-ls-profiles">gupnp-dlna-ls-profiles</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgupnp-dlna-1">
-        <term><filename class='libraryfile'>libgupnp-dlna-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GUPnP DLNA</application> API functions.
-          </para>
-          <indexterm zone="gupnp-dlna libgupnp-dlna-1">
-            <primary sortas="c-libgupnp-dlna-1">libgupnp-dlna-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gupnp-vala.xml
===================================================================
--- archive/gnome/gupnp-vala.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,108 +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 gupnp-vala-download-http
-           "&gnome-download-http;/gupnp-vala/0.10/gupnp-vala-&gupnp-vala-version;.tar.xz">
-  <!ENTITY gupnp-vala-download-ftp
-           "&gnome-download-ftp;/gupnp-vala/0.10/gupnp-vala-&gupnp-vala-version;.tar.xz">
-  <!ENTITY gupnp-vala-md5sum        "7ffe2fff14ae8adf3111e09008862b5c">
-  <!ENTITY gupnp-vala-size          "88 KB">
-  <!ENTITY gupnp-vala-buildsize     "832 KB">
-  <!ENTITY gupnp-vala-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gupnp-vala" xreflabel="gupnp-vala-&gupnp-vala-version;">
-  <?dbhtml filename="gupnp-vala.html"?>
-
-
-  <title>gupnp-vala-&gupnp-vala-version;</title>
-
-  <indexterm zone="gupnp-vala">
-    <primary sortas="a-gupnp-vala">gupnp-vala</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GUPnP Vala</title>
-
-    <para>
-      The <application>GUPnP Vala</application> package contains Vala bindings for
-      the GUPnP framework.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gupnp-vala-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gupnp-vala-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gupnp-vala-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gupnp-vala-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gupnp-vala-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gupnp-vala-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GUPnP Vala Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gupnp-av"/>,
-      <xref linkend="gupnp-dlna"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gupnp-vala"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GUPnP Vala</title>
-
-    <para>
-      Install <application>GUPnP Vala</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>
-
-</sect1>
Index: chive/gnome/gupnp.xml
===================================================================
--- archive/gnome/gupnp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +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 gupnp-download-http "&gnome-download-http;/gupnp/0.18/gupnp-&gupnp-version;.tar.xz">
-  <!ENTITY gupnp-download-ftp  "&gnome-download-ftp;/gupnp/0.18/gupnp-&gupnp-version;.tar.xz">
-  <!ENTITY gupnp-md5sum        "1086654db47def9fbe9fc54c1228d663">
-  <!ENTITY gupnp-size          "352 KB">
-  <!ENTITY gupnp-buildsize     "8.5 MB">
-  <!ENTITY gupnp-time          "0.2 SBU">
-]>
-
-<sect1 id="gupnp" xreflabel="gupnp-&gupnp-version;">
-  <?dbhtml filename="gupnp.html"?>
-
-
-  <title>gupnp-&gupnp-version;</title>
-
-  <indexterm zone="gupnp">
-    <primary sortas="a-gupnp">gupnp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GUPnP</title>
-
-    <para>
-      <application>GUPnP</application> is an elegant, object-oriented open source
-      framework for creating UPnP devices and control points, written in C using GObject
-      and libsoup.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gupnp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gupnp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gupnp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gupnp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gupnp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gupnp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GUPnP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gssdp"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gupnp"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GUPnP</title>
-
-    <para>
-      Install <application>GUPnP</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gupnp-binding-tool
-        </seg>
-        <seg>
-          libgupnp-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gupnp-1.0 and
-          /usr/share/gtk-doc/html/gupnp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gupnp-binding-tool">
-        <term><command>gupnp-binding-tool</command></term>
-        <listitem>
-          <para>
-            creates C convenience wrappers for UPnP services.
-          </para>
-          <indexterm zone="gupnp gupnp-binding-tool">
-            <primary sortas="b-gupnp-binding-tool">gupnp-binding-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgupnp-1">
-        <term><filename class='libraryfile'>libgupnp-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GUPnP</application> API functions.
-          </para>
-          <indexterm zone="gupnp libgupnp-1">
-            <primary sortas="c-libgupnp-1">libgupnp-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libchamplain-again.xml
===================================================================
--- archive/gnome/libchamplain-again.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 libchamplain-download-http
-           "&gnome-download-http;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-download-ftp
-           "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-md5sum        "2b17ba53d88840f73f22ead3a905f475">
-  <!ENTITY libchamplain-size          "220 KB">
-  <!ENTITY libchamplain-buildsize     "5.7 MB">
-  <!ENTITY libchamplain-time          "0.1 SBU">
-]>
-
-<sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;">
-  <?dbhtml filename="libchamplain.html"?>
-
-
-  <title>libchamplain-&libchamplain-version;</title>
-
-  <indexterm zone="libchamplain">
-    <primary sortas="a-libchamplain">libchamplain</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libchamplain</title>
-
-    <para>
-      The <application>libchamplain</application> package contains a
-      Clutter-based widget that is used to display rich and interactive maps.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libchamplain-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libchamplain-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libchamplain-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libchamplain-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libchamplain-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libchamplain-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libchamplain Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libsoup3"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/jiuka/memphis/wiki/LibMemphis">libmemphis</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libchamplain</title>
-
-    <para>
-      Install <application>libchamplain</application> by running the following
-      commands:
-    </para>
-
-<!-- Because there is still rudimentary autotools support, there is already a
-     build directory. Change into it and continue. -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-          libchamplain-0.12.so and libchamplain-gtk-0.12.so
-        </seg>
-        <seg>
-          /usr/include/champlain-0.12 and
-          /usr/share/gtk-doc/html/champlain-0.12
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libchamplain-0.12">
-        <term><filename class="libraryfile">libchamplain-0.12.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libchamplain</application> API functions
-          </para>
-          <indexterm zone="libchamplain libchamplain-0.12">
-            <primary sortas="c-libchamplain-0.12">libchamplain-0.12.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libchamplain-gtk-0.12">
-        <term><filename class="libraryfile">libchamplain-gtk-0.12.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libchamplain</application> GTK+ bindings
-          </para>
-          <indexterm zone="libchamplain libchamplain-gtk-0.12">
-            <primary sortas="c-libchamplain-gtk-0.12">libchamplain-gtk-0.12.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libchamplain.xml
===================================================================
--- archive/gnome/libchamplain.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,188 +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 libchamplain-download-http
-           "&gnome-download-http;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-download-ftp
-           "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-md5sum        "f0d63225c2efa8b367ebf205fa40862a">
-  <!ENTITY libchamplain-size          "572 KB">
-  <!ENTITY libchamplain-buildsize     "19 MB">
-  <!ENTITY libchamplain-time          "0.4 SBU">
-]>
-
-<sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;">
-  <?dbhtml filename="libchamplain.html"?>
-
-
-  <title>libchamplain-&libchamplain-version;</title>
-
-  <indexterm zone="libchamplain">
-    <primary sortas="a-libchamplain">libchamplain</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libchamplain</title>
-
-    <para>
-      The <application>libchamplain</application> is a Clutter based widget
-      used to display rich, eye-candy and interactive maps.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libchamplain-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libchamplain-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libchamplain-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libchamplain-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libchamplain-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libchamplain-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libchamplain Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="libsoup"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </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;/libchamplain"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libchamplain</title>
-
-    <para>
-      Install <application>libchamplain</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala</option>: This option 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/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libchamplain-0.12.so and libchamplain-gtk-0.12.so
-        </seg>
-        <seg>
-          /usr/include/{libchamplain-0.12,libchamplain-gtk-0.12} and
-          /usr/share/gtk-doc/html/{libchamplain,libchamplain-gtk}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libchamplain-0">
-        <term><filename class="libraryfile">libchamplain-0.12.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libchamplain</application> API functions.
-          </para>
-          <indexterm zone="libchamplain libchamplain-0">
-            <primary sortas="c-libchamplain-">libchamplain-0.12.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libchamplain-gtk-0">
-        <term><filename class="libraryfile">libchamplain-gtk-0.12.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libchamplain</application> GTK+ bindings.
-          </para>
-          <indexterm zone="libchamplain libchamplain-gtk-0">
-            <primary sortas="c-libchamplain-gtk-0">libchamplain-gtk-0.12.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libgda.xml
===================================================================
--- archive/gnome/libgda.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,297 +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 libgda-download-http "&gnome-download-http;/libgda/5.0/libgda-&libgda-version;.tar.xz">
-  <!ENTITY libgda-download-ftp  "&gnome-download-ftp;/libgda/5.0/libgda-&libgda-version;.tar.xz">
-  <!ENTITY libgda-md5sum        "58efdf8f727b5a0b1e5fb35d19ee76a7">
-  <!ENTITY libgda-size          "11 MB">
-  <!ENTITY libgda-buildsize     "196 MB">
-  <!ENTITY libgda-time          "3.8 SBU">
-]>
-
-<sect1 id="libgda" xreflabel="libgda-&libgda-version;">
-  <?dbhtml filename="libgda.html"?>
-
-
-  <title>libgda-&libgda-version;</title>
-
-  <indexterm zone="libgda">
-    <primary sortas="a-libgda">libgda</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgda</title>
-
-    <para>
-      The <application>libgda</application> package provides a database access
-      library for the <application>GNOME</application> project.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgda-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgda-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgda-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgda-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgda-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgda-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgda Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libgnome-keyring"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="db"/>,
-      <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gtksourceview"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="mysql"/>,
-      <xref linkend="openldap"/> and
-      <xref linkend="postgresql"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libgda"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgda</title>
-
-    <para>
-      Install <application>libgda</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-system-sqlite &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that the
-      output is voluminous, and some tests appear to need the package to have been
-      installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-system-sqlite</option>: use the system version of
-      <application>Sqlite3</application>.  Note that you must have compiled
-      <application>Sqlite3</application> with -DSQLITE_ENABLE_COLUMN_METADATA
-      otherwise the internal version will be used.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gda-browser-5.0, gda-control-center-5.0, gda-list-config-5.0,
-          gda-list-jdbc-providers-5.0, gda-list-server-op-5.0,
-          gda-sql-5.0, gda-test-connection-5.0 and gdaui-demo-5.0
-        </seg>
-        <seg>
-          libgda-5.0.so, libgda-report-5.0.so, libgda-ui-5.0.so and
-          libgda-xslt-5.0.so
-        </seg>
-        <seg>
-          /etc/libgda-5.0,
-          /usr/include/libgda-5.0,
-          /usr/lib/libgda-5.0,
-          /usr/share/gnome/help/{gda-browser,gda-sql},
-          /usr/share/gtk-doc/html/{gda-browser,libgda-5.0} and
-          /usr/share/libgda-5.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gda-browser-5.0">
-        <term><command>gda-browser-5.0</command></term>
-        <listitem>
-          <para>
-            is a graphical tool to provide a quick access to a database's
-            structure and contents.
-          </para>
-          <indexterm zone="libgda gda-browser-5.0">
-            <primary sortas="b-gda-browser-5.0">gda-browser-5.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-control-center-5.0">
-        <term><command>gda-control-center-5.0</command></term>
-        <listitem>
-          <para>
-            is a configuration tool for <application>libgda</application>.
-          </para>
-          <indexterm zone="libgda gda-control-center-5.0">
-            <primary sortas="b-gda-control-center-5.0">gda-control-center-5.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-list-config-5.0">
-        <term><command>gda-list-config-5.0</command></term>
-        <listitem>
-          <para>
-            lists all the declared data sources and all the installed providers.
-          </para>
-          <indexterm zone="libgda gda-list-config-5.0">
-            <primary sortas="b-gda-list-config-5.0">gda-list-config-5.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-list-server-op-5.0">
-        <term><command>gda-list-server-op-5.0</command></term>
-        <listitem>
-          <para>
-            lists available DDL operations for one or all of the installed providers.
-          </para>
-          <indexterm zone="libgda gda-list-server-op-5.0">
-            <primary sortas="b-gda-list-server-op-5.0">gda-list-server-op-5.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-sql-5.0">
-        <term><command>gda-sql-5.0</command></term>
-        <listitem>
-          <para>
-            is an interactive commandline tool used to run SQL commands.
-          </para>
-          <indexterm zone="libgda gda-sql-5.0">
-            <primary sortas="b-gda-sql-5.0">gda-sql-5.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gda-test-connection-5.0">
-        <term><command>gda-test-connection-5.0</command></term>
-        <listitem>
-          <para>
-            is a 'ping' like tool to test connectivity to databases.
-          </para>
-          <indexterm zone="libgda gda-test-connection-5.0">
-            <primary sortas="b-gda-test-connection-5.0">gda-test-connection-5.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-5">
-        <term><filename class='libraryfile'>libgda-5.0.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Data Access library.
-          </para>
-          <indexterm zone="libgda libgda-5">
-            <primary sortas="c-libgda-5">libgda-5.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-ui-5">
-        <term><filename class='libraryfile'>libgda-ui-5.0.so</filename></term>
-        <listitem>
-          <para>
-            is the GDA UI extension.
-          </para>
-          <indexterm zone="libgda libgda-ui-5">
-            <primary sortas="c-libgda-ui-5">libgda-ui-5.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgda-xslt-5">
-        <term><filename class='libraryfile'>libgda-xslt-5.0.so</filename></term>
-        <listitem>
-          <para>
-            is the GDA XSLT extension.
-          </para>
-          <indexterm zone="libgda libgda-xslt-5">
-            <primary sortas="c-libgda-xslt-5">libgda-xslt-5.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libgdata.xml
===================================================================
--- archive/gnome/libgdata.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 libgdata-download-http "&gnome-download-http;/libgdata/0.13/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-download-ftp  "&gnome-download-ftp;/libgdata/0.13/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-md5sum        "8790767a3700d146e859ce870229f8e7">
-  <!ENTITY libgdata-size          "1.2 MB">
-  <!ENTITY libgdata-buildsize     "45 MB">
-  <!ENTITY libgdata-time          "0.5 SBU">
-]>
-
-<sect1 id="libgdata" xreflabel="libgdata-&libgdata-version;">
-  <?dbhtml filename="libgdata.html"?>
-
-
-  <title>libgdata-&libgdata-version;</title>
-
-  <indexterm zone="libgdata">
-    <primary sortas="a-libgdata">libgdata</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgdata</title>
-
-    <para>
-      The <application>libgdata</application> package is a GLib-based
-      library for accessing online service APIs using the GData protocol, most
-      notably, Google's services. It provides APIs to access the common Google
-      services and has full asynchronous support.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgdata-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgdata-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgdata-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgdata-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgdata-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgdata-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgdata Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="libsoup"/> and
-      <xref linkend="liboauth"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk3"/>
-    </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;/libgdata"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgdata</title>
-
-    <para>
-      Install <application>libgdata</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that
-      the tests need network access.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgdata.so
-        </seg>
-        <seg>
-          /usr/include/libgdata and
-          /usr/share/gtk-doc/html/gdata
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdata-lib">
-        <term><filename class="libraryfile">libgdata.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgdata</application> API functions.
-          </para>
-          <indexterm zone="libgdata libgdata-lib">
-            <primary sortas="c-libgdata">libgdata.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libgnomekbd.xml
===================================================================
--- archive/gnome/libgnomekbd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +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 libgnomekbd-download-http
-           "&gnome-download-http;/libgnomekbd/3.6/libgnomekbd-&libgnomekbd-version;.tar.xz">
-  <!ENTITY libgnomekbd-download-ftp
-           "&gnome-download-ftp;/libgnomekbd/3.6/libgnomekbd-&libgnomekbd-version;.tar.xz">
-  <!ENTITY libgnomekbd-md5sum        "2f000ed5aa11454936c846a784e484c7">
-  <!ENTITY libgnomekbd-size          "368 KB">
-  <!ENTITY libgnomekbd-buildsize     "8.5 MB">
-  <!ENTITY libgnomekbd-time          "0.1 SBU">
-]>
-
-<sect1 id="libgnomekbd" xreflabel="libgnomekbd-&libgnomekbd-version;">
-  <?dbhtml filename="libgnomekbd.html"?>
-
-
-  <title>libgnomekbd-&libgnomekbd-version;</title>
-
-  <indexterm zone="libgnomekbd">
-    <primary sortas="a-libgnomekbd">libgnomekbd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomekbd</title>
-
-    <para>
-      The <application>libgnomekbd</application> package contains xkb hooks
-      used by the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgnomekbd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgnomekbd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgnomekbd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgnomekbd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgnomekbd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgnomekbd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomekbd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="libxklavier"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libgnomekbd"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomekbd</title>
-
-    <para>
-      Install <application>libgnomekbd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gkbd-keyboard-display
-        </seg>
-        <seg>
-          libgnomekbd.so and libgnomekbdui.so
-        </seg>
-        <seg>
-          /usr/include/libgnomekbd and
-          /usr/share/libgnomekbd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnomekbd-lib">
-        <term><filename class="libraryfile">libgnomekbd.so</filename></term>
-        <listitem>
-          <para>
-            contain the X keyboard API functions used to support xkb on the
-            <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="libgnomekbd libgnomekbd-lib">
-            <primary sortas="c-libgnomekbd">libgnomekbd.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnomekbdui">
-        <term><filename class="libraryfile">libgnomekbdui.so</filename></term>
-        <listitem>
-          <para>
-            contains the UI widgets for <application>libgnomekbd</application>.
-          </para>
-          <indexterm zone="libgnomekbd libgnomekbdui">
-            <primary sortas="c-libgnomekbdui">libgnomekbdui.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libgweather.xml
===================================================================
--- archive/gnome/libgweather.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +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 libgweather-download-http
-           "&gnome-download-http;/libgweather/3.6/libgweather-&libgweather-version;.tar.xz">
-  <!ENTITY libgweather-download-ftp
-           "&gnome-download-ftp;/libgweather/3.6/libgweather-&libgweather-version;.tar.xz">
-  <!ENTITY libgweather-md5sum        "29ec69bc04c12a1642046a7044f9e305">
-  <!ENTITY libgweather-size          "3.8 MB">
-  <!ENTITY libgweather-buildsize     "115 MB">
-  <!ENTITY libgweather-time          "1.8 SBU">
-]>
-
-<sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;">
-  <?dbhtml filename="libgweather.html"?>
-
-
-  <title>libgweather-&libgweather-version;</title>
-
-  <indexterm zone="libgweather">
-    <primary sortas="a-libgweather">libgweather</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgweather</title>
-
-    <para>
-      The <application>libgweather</application> package is a library used
-      to access weather information from online services for numerous
-      locations.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgweather-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgweather-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgweather-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgweather-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgweather-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgweather-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgweather Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/libgweather"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgweather</title>
-
-    <para>
-      Install <application>libgweather</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-locations-compression &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-locations-compression</option>: This switch enables
-      compression of <filename>Locations.xml</filename> files.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgweather-3.so
-        </seg>
-        <seg>
-          /usr/include/libgweather-3.0,
-          /usr/share/gtk-doc/html/libgweather-3.0 and
-          /usr/share/libgweather
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgweather-3">
-        <term><filename class="libraryfile">libgweather-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow the retrieval of weather
-            information.
-          </para>
-          <indexterm zone="libgweather libgweather-3">
-            <primary sortas="c-libgweather-3">libgweather-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libgxps.xml
===================================================================
--- archive/gnome/libgxps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,239 +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 libgxps-download-http "&gnome-download-http;/libgxps/0.2/libgxps-&libgxps-version;.tar.xz">
-  <!ENTITY libgxps-download-ftp  "&gnome-download-ftp;/libgxps/0.2/libgxps-&libgxps-version;.tar.xz">
-  <!ENTITY libgxps-md5sum        "65bec2033ff71307f429dc3f91d60233">
-  <!ENTITY libgxps-size          "296 KB">
-  <!ENTITY libgxps-buildsize     "7.0 MB">
-  <!ENTITY libgxps-time          "0.2 SBU">
-]>
-
-<sect1 id="libgxps" xreflabel="libgxps-&libgxps-version;">
-  <?dbhtml filename="libgxps.html"?>
-
-
-  <title>libgxps-&libgxps-version;</title>
-
-  <indexterm zone="libgxps">
-    <primary sortas="a-libgxps">libgxps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgxps</title>
-
-    <para>
-      The <application>libgxps</application> package contains
-      GObject based library and utilities for handling and
-      rendering XPS documents.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgxps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgxps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgxps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgxps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgxps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgxps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgxps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/> and
-      <xref linkend="libarchive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libgxps"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgxps</title>
-
-    <para>
-      Install <application>libgxps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/_gir_CFLAGS/s#$# -I/usr/include/cairo#' libgxps/Makefile.in &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/_gir_CFLAGS/s#$# -I/usr/include/cairo#'
-      libgxps/Makefile.in</command>: This sed fixes a problem compiling if you
-      have Gobject Introspection installed. It has no effect if Gobject
-      Introspection is not installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xpstojpeg, xpstopdf, xpstopng, xpstops and xpstosvg
-        </seg>
-        <seg>
-          libgxps.so
-        </seg>
-        <seg>
-          /usr/include/libgxps and /usr/share/gtk-doc/html/libgxps
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xpstojpeg">
-        <term><command>xpstojpeg</command></term>
-        <listitem>
-          <para>
-            is the XPS to JPEG converter.
-          </para>
-          <indexterm zone="libgxps xpstojpeg">
-            <primary sortas="b-xpstojpeg">xpstojpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstopdf">
-        <term><command>xpstopdf</command></term>
-        <listitem>
-          <para>
-            is the XPS to PDF converter.
-          </para>
-          <indexterm zone="libgxps xpstopdf">
-            <primary sortas="b-xpstopdf">xpstopdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstopng">
-        <term><command>xpstopng</command></term>
-        <listitem>
-          <para>
-            is the XPS to PNG converter.
-          </para>
-          <indexterm zone="libgxps xpstopng">
-            <primary sortas="b-xpstopng">xpstopng</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstops">
-        <term><command>xpstops</command></term>
-        <listitem>
-          <para>
-            is the XPS to PostScript converter.
-          </para>
-          <indexterm zone="libgxps xpstops">
-            <primary sortas="b-xpstops">xpstops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstosvg">
-        <term><command>xpstosvg</command></term>
-        <listitem>
-          <para>
-            is the XPS to SVG converter.
-          </para>
-          <indexterm zone="libgxps xpstosvg">
-            <primary sortas="b-xpstosvg">xpstosvg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgxps-lib">
-        <term><filename class="libraryfile">libgxps.so</filename></term>
-        <listitem>
-          <para>
-            contains the libgxps API functions.
-          </para>
-          <indexterm zone="libgxps libgxps-lib">
-            <primary sortas="c-libgxps">libgxps.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/liboauth.xml
===================================================================
--- archive/gnome/liboauth.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,185 +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 liboauth-download-http "&sourceforge-repo;/liboauth/liboauth-&liboauth-version;.tar.gz">
-  <!ENTITY liboauth-download-ftp  " ">
-  <!ENTITY liboauth-md5sum        "46881d24bc7107dc0c66ef250f03d95e">
-  <!ENTITY liboauth-size          "492 KB">
-  <!ENTITY liboauth-buildsize     "3.5 MB">
-  <!ENTITY liboauth-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liboauth" xreflabel="liboauth-&liboauth-version;">
-  <?dbhtml filename="liboauth.html"?>
-
-
-  <title>liboauth-&liboauth-version;</title>
-
-  <indexterm zone="liboauth">
-    <primary sortas="a-liboauth">liboauth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liboauth</title>
-
-    <para>
-      <application>liboauth</application> is a collection of POSIX-C functions
-      implementing the OAuth Core RFC 5849 standard. Liboauth provides functions
-      to escape and encode parameters according to OAuth specification and
-      offers high-level functionality to sign requests or verify OAuth signatures
-      as well as perform HTTP requests.
-    </para>
-
-    &lfs73_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liboauth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liboauth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liboauth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liboauth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liboauth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liboauth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liboauth Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/> and
-      <xref linkend="openssl"/> or
-      <xref linkend="nss"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to build documentation).
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/liboauth"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liboauth</title>
-
-    <para>
-      Install <application>liboauth</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/>, issue <command>make dox</command>
-      to build documentation.
-    </para>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built documentation previously, install it with following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/doc/liboauth-&liboauth-version; &amp;&amp;
-cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</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>
-      <option>--enable-nss</option>: Use this switch if you want to
-      use Mozilla NSS instead of <application>OpenSSL</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liboauth.so
-        </seg>
-        <seg>
-          /usr/share/doc/liboauth-&liboauth-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liboauth-lib">
-        <term><filename class="libraryfile">liboauth.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to escape and encode stings according to
-            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.
-          </para>
-          <indexterm zone="liboauth liboauth-lib">
-            <primary sortas="c-liboauth">liboauth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libpwquality.xml
===================================================================
--- archive/gnome/libpwquality.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,210 +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 libpwquality-download-http
-           "https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-&libpwquality-version;.tar.bz2">
-  <!ENTITY libpwquality-download-ftp  " ">
-  <!ENTITY libpwquality-md5sum        "beb56c9028a713d936e04cc3c50c541d">
-  <!ENTITY libpwquality-size          "352 KB">
-  <!ENTITY libpwquality-buildsize     "4.5 MB">
-  <!ENTITY libpwquality-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libpwquality" xreflabel="libpwquality-&libpwquality-version;">
-  <?dbhtml filename="libpwquality.html"?>
-
-
-  <title>libpwquality-&libpwquality-version;</title>
-
-  <indexterm zone="libpwquality">
-    <primary sortas="a-libpwquality">libpwquality</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpwquality</title>
-
-    <para>
-      The <application>libpwquality</application> package contains a library
-      used for password quality checking and generation of random passwords
-      that pass the checks.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpwquality-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpwquality-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpwquality-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpwquality-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpwquality-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpwquality-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libpwquality Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cracklib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/> and
-      <xref linkend="python2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libpwquality"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpwquality</title>
-
-    <para>
-      Install <application>libpwquality</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-securedir=/lib/security \
-            --disable-python-bindings \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-python-bindings</option>: This switch disables
-      building of the optional <application>Python</application>
-      bindings. Remove it if you have installed
-      <application>Python</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pwmake and pwscore
-        </seg>
-        <seg>
-          libpwquality.so and pam_pwquality.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pwmake">
-        <term><command>pwmake</command></term>
-        <listitem>
-          <para>
-            is a simple configurable tool for generating random
-            and relatively easily pronounceable passwords.
-          </para>
-          <indexterm zone="libpwquality pwmake">
-            <primary sortas="b-pwmake">pwmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwscore">
-        <term><command>pwscore</command></term>
-        <listitem>
-          <para>
-            is a simple tool for checking quality of a password.
-          </para>
-          <indexterm zone="libpwquality pwscore">
-            <primary sortas="b-pwscore">pwscore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpwquality-lib">
-        <term><filename class="libraryfile">libpwquality.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for checking the password quality.
-          </para>
-          <indexterm zone="libpwquality libpwquality-lib">
-            <primary sortas="c-libpwquality">libpwquality.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pam_pwquality">
-        <term><filename class="libraryfile">pam_pwquality.so</filename></term>
-        <listitem>
-          <para>
-            is a <application>Linux PAM</application> module used to perform
-            password quality checking.
-          </para>
-          <indexterm zone="libpwquality pam_pwquality">
-            <primary sortas="c-pam_pwquality">pam_pwquality.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/librest.xml
===================================================================
--- archive/gnome/librest.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +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 librest-download-http "&gnome-download-http;/rest/0.7/rest-&librest-version;.tar.xz">
-  <!ENTITY librest-download-ftp  "&gnome-download-ftp;/rest/0.7/rest-&librest-version;.tar.xz">
-  <!ENTITY librest-md5sum        "639d51e9e9276726db93b1b4c46887f2">
-  <!ENTITY librest-size          "300 KB">
-  <!ENTITY librest-buildsize     "7.0 MB">
-  <!ENTITY librest-time          "0.2 SBU">
-]>
-
-<sect1 id="librest" xreflabel="librest-&librest-version;">
-  <?dbhtml filename="librest.html"?>
-
-
-  <title>librest-&librest-version;</title>
-
-  <indexterm zone="librest">
-    <primary sortas="a-librest">librest</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to librest</title>
-
-    <para>
-      <application>librest</application> was designed to make it easier to access
-      web services that claim to be "RESTful". It includes convenience wrappers
-      for libsoup and libxml to ease remote use of the RESTful API.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&librest-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&librest-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &librest-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &librest-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &librest-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &librest-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">librest Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cacerts"/> and
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/librest"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of librest</title>
-
-    <para>
-      Install <application>librest</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-ca-certificates=/etc/ssl/ca-bundle.crt &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-ca-certificates=/etc/ssl/ca-bundle.crt</parameter>:
-      The configure script needs to be pointed to the certificates.
-    </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>
-          librest-0.7.so and librest-extras-0.7.so
-        </seg>
-        <seg>
-          /usr/include/rest-0.7 and
-          /usr/share/gtk-doc/html/rest-0.7
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="librest-0">
-        <term><filename class="libraryfile">librest-0.7.so</filename></term>
-        <listitem>
-          <para>
-            contains the RESTful Web API Query functions.
-          </para>
-          <indexterm zone="librest librest-0">
-            <primary sortas="c-librest-0">librest-0.7.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librest-extras-0">
-        <term><filename class="libraryfile">librest-extras-0.7.so</filename></term>
-        <listitem>
-          <para>
-            contains extra RESTful Web API Query functions.
-          </para>
-          <indexterm zone="librest librest-extras-0">
-            <primary sortas="c-librest-extras-0">librest-extras-0.7.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libunique3.xml
===================================================================
--- archive/gnome/libunique3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 libunique3-download-http "&gnome-download-http;/libunique/3.0/libunique-&libunique3-version;.tar.xz">
-  <!ENTITY libunique3-download-ftp  "&gnome-download-ftp;/libunique/3.0/libunique-&libunique3-version;.tar.xz">
-  <!ENTITY libunique3-md5sum        "a52dfbd0fee80f645b74227ade4f01ee">
-  <!ENTITY libunique3-size          "288 KB">
-  <!ENTITY libunique3-buildsize     "5.2 MB">
-  <!ENTITY libunique3-time          "0.2 SBU">
-]>
-
-<sect1 id="libunique3" xreflabel="libunique-&libunique3-version;">
-  <?dbhtml filename="libunique3.html"?>
-
-
-  <title>libunique-&libunique3-version;</title>
-
-  <indexterm zone="libunique3">
-    <primary sortas="a-libunique">libunique</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunique</title>
-
-    <para>
-      The <application>libunique</application> package contains a
-      library for writing single instance applications.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunique3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunique3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunique3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunique3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunique3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunique3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunique Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/libunique3"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunique</title>
-
-    <para>
-      Install <application>libunique</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libunique-3.0.so
-        </seg>
-        <seg>
-          /usr/include/unique-3.0 and
-          /usr/share/gtk-doc/html/unique-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunique-3">
-        <term><filename class="libraryfile">libunique-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libunique</application> API functions
-            for single instance support.
-          </para>
-          <indexterm zone="libunique3 libunique-3">
-            <primary sortas="c-libunique-3">libunique-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/libwacom.xml
===================================================================
--- archive/gnome/libwacom.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 libwacom-download-http "&gnome-download-http;/libwacom/0.5/libwacom-&libwacom-version;.tar.xz">
-  <!ENTITY libwacom-download-ftp  "&gnome-download-ftp;/libwacom/0.5/libwacom-&libwacom-version;.tar.xz"> -->
-  <!ENTITY libwacom-download-http "&sourceforge-repo;/linuxwacom/libwacom-0.6.tar.bz2">
-  <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "b1193c0e1e5400b2f1c97cf8fbee3ff3">
-  <!ENTITY libwacom-size          "372 KB">
-  <!ENTITY libwacom-buildsize     "4.2 MB">
-  <!ENTITY libwacom-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;">
-  <?dbhtml filename="libwacom.html"?>
-
-
-  <title>libwacom-&libwacom-version;</title>
-
-  <indexterm zone="libwacom">
-    <primary sortas="a-libwacom">libwacom</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwacom</title>
-
-    <para>
-      The <application>libwacom</application> package contains a library used
-      to identify wacom tablets and their model-specific features.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwacom-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwacom-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwacom-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwacom-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwacom-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwacom-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwacom Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libwacom"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwacom</title>
-
-    <para>
-      Install <application>libwacom</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libwacom-list-local-devices
-        </seg>
-        <seg>
-          libwacom.so
-        </seg>
-        <seg>
-          /usr/include/libwacom-1.0 and
-          /usr/share/libwacom
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libwacom-lib">
-        <term><filename class="libraryfile">libwacom.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for accessing Wacom information.
-          </para>
-          <indexterm zone="libwacom libwacom-lib">
-            <primary sortas="c-libwacom">libwacom.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/metacity.xml
===================================================================
--- archive/gnome/metacity.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +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 metacity-download-http "&gnome-download-http;/metacity/2.34/metacity-&metacity-version;.tar.xz">
-  <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/2.34/metacity-&metacity-version;.tar.xz">
-  <!ENTITY metacity-md5sum        "6d89b71672d4fa49fc87f83d610d0ef6">
-  <!ENTITY metacity-size          "1.6 MB">
-  <!ENTITY metacity-buildsize     "45 MB">
-  <!ENTITY metacity-time          "0.4 SBU">
-
-]>
-
-<sect1 id="metacity" xreflabel="Metacity-&metacity-version;">
-  <?dbhtml filename="metacity.html" ?>
-
-
-  <title>Metacity-&metacity-version;</title>
-
-  <indexterm zone="metacity">
-    <primary sortas="a-metacity">Metacity</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Metacity</title>
-
-    <para>
-      <application>Metacity</application> is the fallback window manager for
-      <application>GNOME</application>, used if the video driver does not provide
-      hardware acceleration. It is conventionally run from <command>gnome-session</command>,
-      which will start the necessary <application>GNOME</application> daemons.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&metacity-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&metacity-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &metacity-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &metacity-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &metacity-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &metacity-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Metacity Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="yelp-xsl"/> and
-      <xref linkend="zenity"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="notification-daemon"/> and
-      <xref linkend="polkit-gnome"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/metacity"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Metacity</title>
-
-    <para>
-      Install <application>Metacity</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          metacity, metacity-message, metacity-theme-viewer and
-          metacity-window-demo
-        </seg>
-        <seg>
-          libmetacity-private.so
-        </seg>
-        <seg>
-          /usr/include/metacity-1,
-          /usr/share/gnome/wm-properties,
-          /usr/share/help/*/creating-metacity-themes,
-          /usr/share/metacity,
-          /usr/share/themes/AgingGorilla/metacity-1,
-          /usr/share/themes/Atlanta/metacity-1,
-          /usr/share/themes/Bright/metacity-1,
-          /usr/share/themes/Crux/metacity-1,
-          /usr/share/themes/Esco/metacity-1,
-          /usr/share/themes/Metabox/metacity-1 and
-          /usr/share/themes/Simple/metacity-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="metacity-prog">
-        <term><command>metacity</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> fallback window manager,
-            used when the video driver does not support acceleration.
-          </para>
-          <indexterm zone="metacity metacity-prog">
-            <primary sortas="b-metacity">metacity</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="metacity-theme-viewer">
-        <term><command>metacity-theme-viewer</command></term>
-        <listitem>
-          <para>
-            allows you to preview any installed
-            <application>Metacity</application> theme. When designing a new
-            <application>Metacity</application> theme, you can use
-            <command>metacity-theme-viewer</command> to measure the performance
-            of a window frame option, and to preview the option.
-          </para>
-          <indexterm zone="metacity metacity-theme-viewer">
-            <primary
-            sortas="b-metacity-theme-viewer">metacity-theme-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="metacity-window-demo">
-        <term><command>metacity-window-demo</command></term>
-        <listitem>
-          <para>
-            demonstrates various kinds of windows that window managers and
-            window manager themes should handle.
-          </para>
-          <indexterm zone="metacity metacity-window-demo">
-            <primary sortas="b-metacity-window-demo">metacity-window-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/mobile-broadband-provider-info.xml
===================================================================
--- archive/gnome/mobile-broadband-provider-info.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,128 +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 mobile-broadband-provider-info-download-http
-           "&sources-anduin-http;/m/mobile-broadband-provider-info-&mobile-broadband-provider-info-version;.tar.xz">
-  <!ENTITY mobile-broadband-provider-info-download-ftp
-           "&sources-anduin-ftp;/m/mobile-broadband-provider-info-&mobile-broadband-provider-info-version;.tar.xz">
-  <!ENTITY mobile-broadband-provider-info-md5sum        "dfa66a77ce27071b0882e2f822eecde5">
-  <!ENTITY mobile-broadband-provider-info-size          "69 KB">
-  <!ENTITY mobile-broadband-provider-info-buildsize     "648 KB">
-  <!ENTITY mobile-broadband-provider-info-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mobile-broadband-provider-info" xreflabel="mobile-broadband-provider-info-&mobile-broadband-provider-info-version;">
-  <?dbhtml filename="mobile-broadband-provider-info.html"?>
-
-
-  <title>mobile-broadband-provider-info-&mobile-broadband-provider-info-version;</title>
-
-  <indexterm zone="mobile-broadband-provider-info">
-    <primary sortas="a-mobile-broadband-provider-info">mobile-broadband-provider-info</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mobile Broadband Provider Info</title>
-
-    <para>
-      The <application>Mobile Broadband Provider Info</application> package
-      contains listings of mobile broadband (3G) providers and associated network
-      and plan information.
-    </para>
-
-    &lfs70_checked;
-
-    <note>
-      <para>
-        The full url for this package is too long to fit on a page. The source
-        originates at
-        <ulink url="http://ftp.gnome.org/pub/gnome/sources/mobile-broadband-provider-info/20120614/"/>
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mobile-broadband-provider-info-download-http;">
-          HTTP link to mobile-broadband-provider-info-&mobile-broadband-provider-info-version;.tar.xz
-          </ulink>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           Download (FTP): <ulink url="&mobile-broadband-provider-info-download-ftp;">
-           FTP link to mobile-broadband-provider-info-&mobile-broadband-provider-info-version;.tar.xz
-           </ulink>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mobile-broadband-provider-info-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mobile-broadband-provider-info-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mobile-broadband-provider-info-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mobile-broadband-provider-info-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mobile-broadband-provider-info"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mobile Broadband Provider Info</title>
-
-    <para>
-      Install <application>Mobile Broadband Provider Info</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          /usr/share/mobile-broadband-provider-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/mousetweaks.xml
===================================================================
--- archive/gnome/mousetweaks.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +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 mousetweaks-download-http
-           "&gnome-download-http;/mousetweaks/3.6/mousetweaks-&mousetweaks-version;.tar.xz">
-  <!ENTITY mousetweaks-download-ftp
-           "&gnome-download-ftp;/mousetweaks/3.6/mousetweaks-&mousetweaks-version;.tar.xz">
-  <!ENTITY mousetweaks-md5sum        "1ebd0e8a269045cc2ed50d3528fffb75">
-  <!ENTITY mousetweaks-size          "280 KB">
-  <!ENTITY mousetweaks-buildsize     "5.5 MB">
-  <!ENTITY mousetweaks-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mousetweaks" xreflabel="Mousetweaks-&mousetweaks-version;">
-  <?dbhtml filename="mousetweaks.html"?>
-
-
-  <title>Mousetweaks-&mousetweaks-version;</title>
-
-  <indexterm zone="mousetweaks">
-    <primary sortas="a-Mousetweaks">Mousetweaks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mouse Tweaks</title>
-
-    <para>
-      The <application>Mouse Tweaks</application> package provides mouse
-      accessibility enhancements for the <application>GNOME</application>
-      desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mousetweaks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mousetweaks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mousetweaks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mousetweaks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mousetweaks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mousetweaks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mouse Tweaks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gsettings-desktop-schemas"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mousetweaks"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mouse Tweaks</title>
-
-    <para>
-      Install <application>Mouse Tweaks</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          mousetweaks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/mousetweaks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mousetweaks-prog">
-        <term><command>mousetweaks</command></term>
-        <listitem>
-          <para>
-            is a collection of accessibility enhancements for pointing
-            devices.
-          </para>
-          <indexterm zone="mousetweaks mousetweaks-prog">
-            <primary sortas="b-mousetweaks">mousetweaks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/mutter.xml
===================================================================
--- archive/gnome/mutter.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,221 +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 mutter-download-http "&gnome-download-http;/mutter/3.6/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/3.6/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "f04273e3e40b484dd0e36f7e8f5783ef">
-  <!ENTITY mutter-size          "1.6 MB">
-  <!ENTITY mutter-buildsize     "50 MB">
-  <!ENTITY mutter-time          "0.4 SBU">
-]>
-
-<sect1 id="mutter" xreflabel="Mutter-&mutter-version;">
-  <?dbhtml filename="mutter.html"?>
-
-
-  <title>Mutter-&mutter-version;</title>
-
-  <indexterm zone="mutter">
-    <primary sortas="a-Mutter">Mutter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mutter</title>
-
-    <para>
-      <application>Mutter</application> is the window manager for
-      <application>GNOME</application>. It is not invoked directly, but from
-      <application>gnome-session</application> (on a machine with a hardware
-      accelerated video driver).
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mutter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mutter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mutter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mutter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mutter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mutter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="zenity"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libcanberra"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mutter"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mutter</title>
-
-    <para>
-      Install <application>Mutter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mutter, mutter-message, mutter-theme-viewer and
-          mutter-window-demo
-        </seg>
-        <seg>
-          libmutter.so
-        </seg>
-        <seg>
-          /usr/include/mutter,
-          /usr/lib/mutter and
-          /usr/share/mutter
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mutter-prog">
-        <term><command>mutter</command></term>
-        <listitem>
-          <para>
-            is a <application>Clutter</application> based compositing
-            <application>GTK+</application> Window Manager.
-          </para>
-          <indexterm zone="mutter mutter-prog">
-            <primary sortas="b-mutter">mutter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutter-message">
-        <term><command>mutter-message</command></term>
-        <listitem>
-          <para>
-            is a command used to send a message to
-            <application>Mutter</application>.
-          </para>
-          <indexterm zone="mutter mutter-message">
-            <primary sortas="b-mutter-message">mutter-message</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutter-theme-viewer">
-        <term><command>mutter-theme-viewer</command></term>
-        <listitem>
-          <para>
-            is used to preview any installed
-            <application>Mutter</application> theme.
-          </para>
-          <indexterm zone="mutter mutter-theme-viewer">
-            <primary sortas="b-mutter-theme-viewer">mutter-theme-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutter-window-demo">
-        <term><command>mutter-window-demo</command></term>
-        <listitem>
-          <para>
-            is a <application>Mutter</application> demo program.
-          </para>
-          <indexterm zone="mutter mutter-window-demo">
-            <primary sortas="b-mutter-window-demo">mutter-window-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mutter</application> API functions.
-          </para>
-          <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/nautilus-sendto.xml
===================================================================
--- archive/gnome/nautilus-sendto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +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 nautilus-sendto-download-http
-           "&gnome-download-http;/nautilus-sendto/3.6/nautilus-sendto-&nautilus-sendto-version;.tar.xz">
-  <!ENTITY nautilus-sendto-download-ftp
-           "&gnome-download-ftp;/nautilus-sendto/3.6/nautilus-sendto-&nautilus-sendto-version;.tar.xz">
-  <!ENTITY nautilus-sendto-md5sum        "8c3378e9af42c0609663ec8305b3dbbb">
-  <!ENTITY nautilus-sendto-size          "376 KB">
-  <!ENTITY nautilus-sendto-buildsize     "8.0 MB">
-  <!ENTITY nautilus-sendto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="nautilus-sendto" xreflabel="Nautilus-Sendto-&nautilus-sendto-version;">
-  <?dbhtml filename="nautilus-sendto.html"?>
-
-
-  <title>Nautilus-Sendto-&nautilus-sendto-version;</title>
-
-  <indexterm zone="nautilus-sendto">
-    <primary sortas="a-Nautilus-Sendto">Nautilus-Sendto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nautilus Sendto</title>
-
-    <para>
-      The <application>Nautilus Sendto</application> package provides the
-      <application>Nautilus</application> file manager with a context menu
-      component for quickly sending files to accounts in an
-      <application>Evolution</application> email address book, contacts on a
-      <application>Pidgin</application>, <application>Gajim</application> instant
-      messaging list, through <application>Thunderbird</application>, or through
-      <application>Claws Mail</application> (formerly <application>Sylpheed
-      Claws</application>).
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nautilus-sendto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nautilus-sendto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nautilus-sendto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nautilus-sendto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nautilus-sendto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nautilus-sendto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nautilus Sendto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="nautilus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="evolution-data-server"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://live.gnome.org/GUPnP/">GUPnP</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/nautilus-sendto"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nautilus Sendto</title>
-
-    <para>
-      Install <application>Nautilus Sendto</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nautilus-sendto
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/nautilus-sendto,
-          /usr/lib/nautilus-sendto,
-          /usr/share/gtk-doc/html/nautilus-sendto and
-          /usr/share/nautilus-sendto
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nautilus-sendto-prog">
-        <term><command>nautilus-sendto</command></term>
-        <listitem>
-          <para>
-            is a convenience application used to send a file via email
-            or instant messenger.
-          </para>
-          <indexterm zone="nautilus-sendto nautilus-sendto-prog">
-            <primary sortas="b-nautilus-sendto">nautilus-sendto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/nemiver.xml
===================================================================
--- archive/gnome/nemiver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +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 nemiver-download-http "&gnome-download-http;/nemiver/0.9/nemiver-&nemiver-version;.tar.xz">
-  <!ENTITY nemiver-download-ftp  "&gnome-download-ftp;/nemiver/0.9/nemiver-&nemiver-version;.tar.xz">
-  <!ENTITY nemiver-md5sum        "37330e7291bfcc578d36add5274dd70e">
-  <!ENTITY nemiver-size          "2.3 MB">
-  <!ENTITY nemiver-buildsize     "195 MB">
-  <!ENTITY nemiver-time          "2.5 SBU">
-]>
-
-<sect1 id="nemiver" xreflabel="Nemiver-&nemiver-version;">
-  <?dbhtml filename="nemiver.html"?>
-
-
-  <title>Nemiver-&nemiver-version;</title>
-
-  <indexterm zone="nemiver">
-    <primary sortas="a-Nemiver">Nemiver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nemiver</title>
-
-    <para>
-      <application>Nemiver</application> is an ongoing attempt to write
-      a standalone graphical debugger that integrates well in the
-      <application>GNOME</application> Desktop environment.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nemiver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nemiver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nemiver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nemiver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nemiver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nemiver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nemiver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/>,
-      <xref linkend="gdb"/>,
-      <xref linkend="gdlmm"/>,
-      <xref linkend="ghex"/>,
-      <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtksourceviewmm"/>,
-      <xref linkend="libgtop"/> and
-      <xref linkend="vte"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="boost"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/nemiver"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nemiver</title>
-
-    <para>
-      Install <application>Nemiver</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nemiver
-        </seg>
-        <seg>
-          /usr/include/nemiver,
-          /usr/lib/nemiver,
-          /usr/share/gnome/help/nemiver,
-          /usr/share/nemiver and
-          /usr/share/omf/nemiver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nemiver-prog">
-        <term><command>nemiver</command></term>
-        <listitem>
-          <para>
-            is the graphical debugger for <application>GNOME</application>.
-          </para>
-          <indexterm zone="nemiver nemiver-prog">
-            <primary sortas="b-nemiver">nemiver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/orca.xml
===================================================================
--- archive/gnome/orca.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 orca-download-http "&gnome-download-http;/orca/3.6/orca-&orca-version;.tar.xz">
-  <!ENTITY orca-download-ftp  "&gnome-download-ftp;/orca/3.6/orca-&orca-version;.tar.xz">
-  <!ENTITY orca-md5sum        "819d2c2551f4119a4f0dcee2490bad8b">
-  <!ENTITY orca-size          "3.6 MB">
-  <!ENTITY orca-buildsize     "65 MB">
-  <!ENTITY orca-time          "0.2 SBU">
-]>
-
-<sect1 id="orca" xreflabel="Orca-&orca-version;">
-  <?dbhtml filename="orca.html"?>
-
-
-  <title>Orca-&orca-version;</title>
-
-  <indexterm zone="orca">
-    <primary sortas="a-Orca">Orca</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Orca</title>
-
-    <para>
-      <application>Orca</application> enables users with limited or no vision
-      to use the <application>GNOME</application> Desktop and applications
-      effectively. It provides a number of features, including magnification,
-      focus tracking, braille output, automatic screen reading and more.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&orca-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&orca-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &orca-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &orca-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &orca-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &orca-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Orca Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="pygobject3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.mielke.cc/brltty/">BRLTTY</ulink>
-      (required for braille output, must have
-      <xref linkend="pyrex"/> installed first),
-      <ulink url="http://code.google.com/p/liblouis/">liblouis</ulink>
-      (required for contracted braille) and
-      <ulink url="http://devel.freebsoft.org/speechd/">speech dispatcher</ulink>
-      (required for speech synthesis)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/orca"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Orca</title>
-
-    <para>
-      Install <application>Orca</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
-          orca
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/orca,
-          /usr/share/help/*/orca and
-          /usr/share/orca
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="orca-prog">
-        <term><command>orca</command></term>
-        <listitem>
-          <para>
-            is a GUI menu interface used to access and configure the
-            various functionality parameters provided for users with
-            limited vision.
-          </para>
-          <indexterm zone="orca orca-prog">
-            <primary sortas="b-orca">orca</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/rygel.xml
===================================================================
--- archive/gnome/rygel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,160 +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 rygel-download-http "&gnome-download-http;/rygel/0.14/rygel-&rygel-version;.tar.xz">
-  <!ENTITY rygel-download-ftp  "&gnome-download-ftp;/rygel/0.14/rygel-&rygel-version;.tar.xz">
-  <!ENTITY rygel-md5sum        "ab8dcbe298f72770aafeaf1599f0555e">
-  <!ENTITY rygel-size          "1.3 MB">
-  <!ENTITY rygel-buildsize     "50 MB">
-  <!ENTITY rygel-time          "1.0 SBU">
-]>
-
-<sect1 id="rygel" xreflabel="Rygel-&rygel-version;">
-  <?dbhtml filename="rygel.html"?>
-
-
-  <title>Rygel-&rygel-version;</title>
-
-  <indexterm zone="rygel">
-    <primary sortas="a-Rygel">Rygel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rygel</title>
-
-    <para>
-      <application>Rygel</application> is a home media solution that allows you to
-      easily share audio, video and pictures, and control of media player on your home
-      network. In technical terms it is both a UPnP AV MediaServer and MediaRenderer
-      implemented through a plug-in mechanism.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rygel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rygel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rygel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rygel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rygel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rygel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Rygel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gupnp-vala"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="libgee"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/rygel"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rygel</title>
-
-    <para>
-      Install <application>Rygel</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-mediathek-plugin</option> : This parameter will create a plugin
-      for German Public TV (ARD and ZDF).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rygel and rygel-preferences
-        </seg>
-        <seg>
-          /usr/include/rygel-1.0,
-          /usr/lib/rygel-1.0 and
-          /usr/share/rygel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rygel-prog">
-        <term><command>rygel</command></term>
-        <listitem>
-          <para>
-            is the media server.
-          </para>
-          <indexterm zone="rygel rygel-prog">
-            <primary sortas="b-rygel">rygel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/seed.xml
===================================================================
--- archive/gnome/seed.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 seed-download-http "&gnome-download-http;/seed/3.2/seed-&seed-version;.tar.xz">
-  <!ENTITY seed-download-ftp  "&gnome-download-ftp;/seed/3.2/seed-&seed-version;.tar.xz">
-  <!ENTITY seed-md5sum        "792ac48542019bd14f8d639a9e401c0a">
-  <!ENTITY seed-size          "667 KB">
-  <!ENTITY seed-buildsize     "13 MB">
-  <!ENTITY seed-time          "0.1 SBU">
-]>
-
-<sect1 id="seed" xreflabel="Seed-&seed-version;">
-  <?dbhtml filename="seed.html"?>
-
-
-  <title>Seed-&seed-version;</title>
-
-  <indexterm zone="seed">
-    <primary sortas="a-Seed">Seed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Seed</title>
-
-    <para>
-      <application>Seed</application> is a JavaScript interpreter.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&seed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&seed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &seed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &seed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &seed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &seed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Seed Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-js-common"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="webkitgtk"/>
-    </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;/seed"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Seed</title>
-
-    <para>
-      Install <application>Seed</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          seed
-        </seg>
-        <seg>
-          libseed-gtk3.so
-        </seg>
-        <seg>
-          /usr/include/seed-gtk3,
-          /usr/lib/seed-gtk3,
-          /usr/share/doc/seed,
-          /usr/share/gtk-doc/html/seed and
-          /usr/share/seed-gtk3
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="seed-prog">
-        <term><command>seed</command></term>
-        <listitem>
-          <para>
-            is the command line JavaScript interpreter.
-          </para>
-          <indexterm zone="seed seed-prog">
-            <primary sortas="b-seed">seed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libseed-gtk3">
-        <term><filename class="libraryfile">libseed-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Seed</application> API functions.
-          </para>
-          <indexterm zone="seed libseed-gtk3">
-            <primary sortas="c-libseed-gtk3">libseed-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/sound-juicer.xml
===================================================================
--- archive/gnome/sound-juicer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +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 sound-juicer-download-http
-          "&gnome-download-http;/sound-juicer/3.4/sound-juicer-&sound-juicer-version;.tar.xz">
-  <!ENTITY sound-juicer-download-ftp
-           "&gnome-download-ftp;/sound-juicer/3.4/sound-juicer-&sound-juicer-version;.tar.xz">
-  <!ENTITY sound-juicer-md5sum        "a913b246260ccf3843ea779ae9cdb5e7">
-  <!ENTITY sound-juicer-size          "1.9 MB">
-  <!ENTITY sound-juicer-buildsize     "22 MB">
-  <!ENTITY sound-juicer-time          "0.6 SBU">
-]>
-
-<sect1 id="sound-juicer" xreflabel="Sound-Juicer-&sound-juicer-version;">
-  <?dbhtml filename="sound-juicer.html"?>
-
-
-  <title>Sound-Juicer-&sound-juicer-version;</title>
-
-  <indexterm zone="sound-juicer">
-    <primary sortas="a-Sound-Juicer">Sound-Juicer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sound Juicer</title>
-
-    <para>
-      The <application>Sound Juicer</application> package contains the
-      simple CD ripping tool which is useful for extracting the audio tracks
-      from audio compact discs and converting them into audio files. It can
-      also play the audio tracks directly from the CD, allowing you to preview
-      the CD before ripping it.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sound-juicer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sound-juicer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sound-juicer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sound-juicer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sound-juicer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sound-juicer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sound Juicer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libcanberra"/> and
-      <xref linkend="libmusicbrainz3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="rarian"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst-plugins-good"/>
-      (for the flacenc and wavenc plugins) and
-      <xref linkend="gst-plugins-ugly"/>
-      (for the lame plugin)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/sound-juicer"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sound Juicer</title>
-
-    <para>
-      Install <application>Sound Juicer</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Sound Juicer</title>
-
-    <sect3 id="sound-juicer-config">
-      <title>Configuration Information</title>
-
-      <para>
-        Configuration is accomplished by using the
-        <quote>Preferences</quote> drop-down menu option.
-        For information on how to configure
-        <command>sound-juicer</command> to use
-        <application>LAME</application> as the default
-        encoding method (creating  MP3 files as the default)
-        see the <application>Sound Juicer</application>
-        Help section.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sound-juicer
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome/help/sound-juicer,
-          /usr/share/omf/sound-juicer and
-          /usr/share/sound-juicer
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sound-juicer-prog">
-        <term><command>sound-juicer</command></term>
-        <listitem>
-          <para>
-            is a graphical CD extraction (ripping) tool based on
-            <application>GTK+</application> and
-            <application>GStreamer</application>.
-          </para>
-          <indexterm zone="sound-juicer sound-juicer-prog">
-            <primary sortas="b-sound-juicer">sound-juicer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/sushi.xml
===================================================================
--- archive/gnome/sushi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +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 sushi-download-http "&gnome-download-http;/sushi/0.4/sushi-&sushi-version;.tar.xz">
-  <!ENTITY sushi-download-ftp  "&gnome-download-ftp;/sushi/0.4/sushi-&sushi-version;.tar.xz">
-  <!ENTITY sushi-md5sum        "b5021f3120f6452c41ee1d1d660e46f9">
-  <!ENTITY sushi-size          "292 KB">
-  <!ENTITY sushi-buildsize     "5.5 MB">
-  <!ENTITY sushi-time          "0.3 SBU">
-]>
-
-<sect1 id="sushi" xreflabel="Sushi-&sushi-version;">
-  <?dbhtml filename="sushi.html"?>
-
-
-  <title>Sushi-&sushi-version;</title>
-
-  <indexterm zone="sushi">
-    <primary sortas="a-Sushi">Sushi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sushi</title>
-
-    <para>
-      The <application>Sushi</application> package contains a quick file previewer
-      for <application>Nautilus</application>.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sushi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sushi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sushi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sushi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sushi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sushi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sushi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="clutter-gst"/>,
-      <xref linkend="evince"/>,
-      <xref linkend="gjs"/>,
-      <xref linkend="gtksourceview"/> and
-      <xref linkend="libmusicbrainz3"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/sushi"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sushi</title>
-
-    <para>
-      Install <application>Sushi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/sushi &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/sushi</parameter>: This parameter
-      ensures <filename>sushi-start</filename> is installed in a FHS-compliant
-      location.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sushi
-        </seg>
-        <seg>
-          libsushi-1.0.so
-        </seg>
-        <seg>
-          /usr/lib/sushi and
-          /usr/share/sushi
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sushi-prog">
-        <term><command>sushi</command></term>
-        <listitem>
-          <para>
-            is a graphical file viewer.
-          </para>
-          <indexterm zone="sushi sushi-prog">
-            <primary sortas="b-sushi-prog">sushi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsushi-1">
-        <term><filename class='libraryfile'>libsushi-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Sushi</application> API functions.
-          </para>
-          <indexterm zone="sushi libsushi-1">
-            <primary sortas="c-libsushi-1">libsushi-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/telepathy-farstream.xml
===================================================================
--- archive/gnome/telepathy-farstream.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 telepathy-farstream-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-&telepathy-farstream-version;.tar.gz">
-  <!ENTITY telepathy-farstream-download-ftp  " ">
-  <!ENTITY telepathy-farstream-md5sum        "d154350f9f1e3bdba87617c0668481a5">
-  <!ENTITY telepathy-farstream-size          "584 KB">
-  <!ENTITY telepathy-farstream-buildsize     "6.0 MB">
-  <!ENTITY telepathy-farstream-time          "0.1 SBU">
-]>
-
-<sect1 id="telepathy-farstream" xreflabel="telepathy-farstream-&telepathy-farstream-version;">
-  <?dbhtml filename="telepathy-farstream.html"?>
-
-
-  <title>telepathy-farstream-&telepathy-farstream-version;</title>
-
-  <indexterm zone="telepathy-farstream">
-    <primary sortas="a-telepathy-farstream">telepathy-farstream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Farstream</title>
-
-    <para>
-      The <application>Telepathy Farstream</application> is a
-      <application>Telepathy</application> client library that
-      uses <application>Farstream</application> to handle Call
-      channels.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-farstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-farstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-farstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-farstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-farstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-farstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Farstream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="farstream"/> and
-      <xref linkend="telepathy-glib"/>
-    </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;/telepathy-farstream"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Farstream</title>
-
-    <para>
-      Install <application>Telepathy Farstream</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-farstream.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0/telepathy-farstream and
-          /usr/share/gtk-doc/html/telepathy-farstream
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-farstream">
-        <term><filename class="libraryfile">libtelepathy-farstream.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Farstream</application> API functions.
-          </para>
-          <indexterm zone="telepathy-farstream libtelepathy-farstream">
-            <primary sortas="c-libtelepathy-farstream">libtelepathy-farstream.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/telepathy-glib.xml
===================================================================
--- archive/gnome/telepathy-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +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 telepathy-glib-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "bfc8a1b94c7a268f15d4d92b83460987">
-  <!ENTITY telepathy-glib-size          "3.7 MB">
-  <!ENTITY telepathy-glib-buildsize     "240 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </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;/telepathy-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy GLlib</title>
-
-    <para>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala-bindings \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala-bindings</option>: 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/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions.
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/telepathy-logger.xml
===================================================================
--- archive/gnome/telepathy-logger.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 telepathy-logger-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
-  <!ENTITY telepathy-logger-download-ftp  " ">
-  <!ENTITY telepathy-logger-md5sum        "e513eaa767344821073a0b7bb8b45217">
-  <!ENTITY telepathy-logger-size          "528 KB">
-  <!ENTITY telepathy-logger-buildsize     "16 MB">
-  <!ENTITY telepathy-logger-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-logger" xreflabel="telepathy-logger-&telepathy-logger-version;">
-  <?dbhtml filename="telepathy-logger.html"?>
-
-
-  <title>telepathy-logger-&telepathy-logger-version;</title>
-
-  <indexterm zone="telepathy-logger">
-    <primary sortas="a-telepathy-logger">telepathy-logger</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Logger</title>
-
-    <para>
-      The <application>Telepathy Logger</application> package is a headless
-      observer client that logs information received by the
-      <application>Telepathy</application> framework. It features pluggable
-      backends to log different sorts of messages in different formats.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-logger-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-logger-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-logger-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-logger-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-logger-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-logger-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Logger Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="intltool"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/telepathy-logger"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Logger</title>
-
-    <para>
-      Install <application>Telepathy Logger</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/telepathy \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          telepathy-logger
-        </seg>
-        <seg>
-          libtelepathy-logger.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-logger-0.2,
-          /usr/lib/telepathy,
-          /usr/share/gtk-doc/html/telepathy-logger and
-          /usr/share/telepathy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="telepathy-logger-prog">
-        <term><command>telepathy-logger</command></term>
-        <listitem>
-          <para>
-            is the <application>Telepathy Logger</application> D-Bus service.
-          </para>
-          <indexterm zone="telepathy-logger telepathy-logger-prog">
-            <primary sortas="b-telepathy-logger">telepathy-logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtelepathy-logger">
-        <term><filename class="libraryfile">libtelepathy-logger.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy Logger</application> API functions.
-          </para>
-          <indexterm zone="telepathy-logger libtelepathy-logger">
-            <primary sortas="c-libtelepathy-logger">libtelepathy-logger.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/telepathy-mission-control.xml
===================================================================
--- archive/gnome/telepathy-mission-control.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +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 telepathy-mission-control-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
-  <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "e06fb0399ec435e59c74d79a2ace8a2d">
-  <!ENTITY telepathy-mission-control-size          "1.0 MB">
-  <!ENTITY telepathy-mission-control-buildsize     "25 MB">
-  <!ENTITY telepathy-mission-control-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
-  <?dbhtml filename="telepathy-mission-control.html"?>
-
-
-  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
-
-  <indexterm zone="telepathy-mission-control">
-    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Mission Control</title>
-
-    <para>
-      <application>Telepathy Mission Control</application> is an account manager
-      and channel dispatcher for the <application>Telepathy</application>
-      framework, allowing user interfaces  and other clients to share connections
-      to real-time communication services without conflicting.
-    </para>
-
-    &lfs73_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-mission-control-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-mission-control-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-mission-control-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-mission-control-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgnome-keyring"/>,
-      <xref linkend="NetworkManager"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://gitorious.org/accounts-sso">
-      libaccounts-glib</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-mission-control"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Mission Control</title>
-
-    <para>
-      Install <application>Telepathy Mission Control</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/telepathy \
-            --enable-gnome-keyring \
-            --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</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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mc-tool, mc-wait-for-name and mission-control-5
-        </seg>
-        <seg>
-          libmission-control-plugins.so
-        </seg>
-        <seg>
-          /usr/include/mission-control-5.5,
-          /usr/lib/telepathy and
-          /usr/share/gtk-doc/html/mission-control-plugins
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mc-tool">
-        <term><command>mc-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to manipulate Mission Control accounts.
-          </para>
-          <indexterm zone="telepathy-mission-control mc-tool">
-            <primary sortas="b-mc-tool">mc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mc-wait-for-name">
-        <term><command>mc-wait-for-name</command></term>
-        <listitem>
-          <para>
-            waits for a (D-Bus) bus name that will (after a while) be provided
-            automatically by the desktop session.
-          </para>
-          <indexterm zone="telepathy-mission-control mc-wait-for-name">
-            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mission-control-5">
-        <term><command>mission-control-5</command></term>
-        <listitem>
-          <para>
-            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.
-          </para>
-          <indexterm zone="telepathy-mission-control mission-control-5">
-            <primary sortas="b-mission-control-5">mission-control-5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmission-control-plugins">
-        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Mission Control</application> plugin API functions.
-          </para>
-          <indexterm zone="telepathy-mission-control libmission-control-plugins">
-            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/totem.xml
===================================================================
--- archive/gnome/totem.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,243 +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 totem-download-http
-     "&gnome-download-http;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-download-ftp
-     "&gnome-download-ftp;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "e475febf5f4b709fcd1e90b47fae99d6">
-  <!ENTITY totem-size          "3.1 MB">
-  <!ENTITY totem-buildsize     "55 MB">
-  <!ENTITY totem-time          "0.6 SBU">
-]>
-
-<sect1 id="totem" xreflabel="Totem-&totem-version;">
-  <?dbhtml filename="totem.html"?>
-
-
-  <title>Totem-&totem-version;</title>
-
-  <indexterm zone="totem">
-    <primary sortas="a-Totem">Totem</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Totem</title>
-
-    <para>
-      <application>Totem</application> package contains the official
-      movie player of the <application>GNOME</application> Desktop based on
-      <application>GStreamer</application>. It features a playlist, a full-screen
-      mode, seek and volume controls, as well as keyboard navigation. This is
-      useful for playing any <application>GStreamer</application> supported file,
-      DVD, VCD or digital CD.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&totem-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&totem-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &totem-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &totem-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &totem-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &totem-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Totem Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="clutter-gst"/>,
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="gst10-plugins-good"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libpeas"/>, and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="appstream-glib"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="grilo-plugins"/> (Channels),
-      <xref linkend="nautilus"/>,
-      <xref linkend="pygobject3"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (if installed at build time, make sure
-      avahi-daemon is running as a system daemon, started by
-      bootscript/systemd unit),
-      <xref linkend="brasero"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="http://www.lirc.org">LIRC</ulink>,
-      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>, and
-      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-libav"/>,
-      <xref linkend="gst10-plugins-ugly"/>, and
-      <xref linkend="libdvdcss"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/totem"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Totem</title>
-
-    <para>
-      Install <application>Totem</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note><para>Unlike other video players like <xref linkend="vlc"/>,
-    <application>Totem</application> requires a DVD to be mounted in order to
-    be recognized.  Not all window managers do this automatically.  In this
-    case the <command>mount</command> command must normally be used.  One
-    alternative to manual mounting is to use <xref linkend="autofs"/>.  For
-    instance, if following the configuration instructions in that package, the
-    command <command>totem /media/auto/cd</command> can be used to play a
-    DVD.</para></note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          totem, totem-audio-preview, and totem-video-thumbnailer
-        </seg>
-        <seg>
-          libtotem.so
-        </seg>
-        <seg>
-          /usr/include/totem,
-          /usr/lib/totem,
-          /usr/libexec/totem,
-          /usr/share/gtk-doc/html/totem,
-          /usr/share/help/*/totem, and
-          /usr/share/totem
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="totem-prog">
-        <term><command>totem</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> Desktop movie player based
-            on <application>GStreamer</application>.
-          </para>
-          <indexterm zone="totem totem-prog">
-            <primary sortas="b-totem">totem</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="totem-video-thumbnailer">
-        <term><command>totem-video-thumbnailer</command></term>
-        <listitem>
-          <para>
-            is a video thumbnailer for the <application>GNOME</application>
-            Desktop used internally by <application>GNOME</application>
-            applications such as <application>Nautilus</application> to
-            generate PNG thumbnails of video files. While it is possible to
-            invoke it manually, it is usually done automatically by
-            <application>Nautilus</application>.
-          </para>
-          <indexterm zone="totem totem-video-thumbnailer">
-            <primary sortas="b-totem-video-thumbnailer">totem-video-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtotem">
-        <term><filename class="libraryfile">libtotem.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Totem</application> API functions.
-          </para>
-          <indexterm zone="totem libtotem">
-            <primary sortas="c-libtotem">libtotem.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/tracker-miners.xml
===================================================================
--- archive/gnome/tracker-miners.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +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"?>
-
-
-  <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: chive/gnome/tracker.xml
===================================================================
--- archive/gnome/tracker.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,358 +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/0.14/tracker-&tracker-version;.tar.xz">
-  <!ENTITY tracker-download-ftp  "&gnome-download-ftp;/tracker/0.14/tracker-&tracker-version;.tar.xz">
-  <!ENTITY tracker-md5sum        "f3a871beeebf86fd752863ebd22af9ac">
-  <!ENTITY tracker-size          "5.8 MB">
-  <!ENTITY tracker-buildsize     "105 MB">
-  <!ENTITY tracker-time          "1.5 SBU">
-]>
-
-<sect1 id="tracker" xreflabel="Tracker-&tracker-version;">
-  <?dbhtml filename="tracker.html"?>
-
-
-  <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 a semantic data storage for desktop
-      and mobile devices.
-    </para>
-
-    &lfs70_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="gtk3"/>,
-      <xref linkend="gstreamer"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="intltool"/>,
-      <xref linkend="libgee"/>,
-      <xref linkend="librest"/>,
-      <xref linkend="poppler"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnome-panel"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libgnome-keyring"/>,
-      <xref linkend="libgsf"/>,
-      <xref linkend="nautilus"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="totem-pl-parser"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://cihar.com/software/enca/">Enca</ulink>,
-      <xref linkend="evolution"/>,
-      <xref linkend="exempi"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="gtk-doc"/> (requires dia and Graphviz),
-      <ulink url="http://sourceforge.net/projects/libcue/">libcue</ulink>,
-      <xref linkend="libexif"/>,
-      <ulink url="http://libiptcdata.sourceforge.net/">libiptcdata</ulink>,
-      <xref linkend="libosinfo"/> and
-      <xref linkend="taglib"/>
-    </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>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/tracker-0.14 \
-            --disable-miner-firefox \
-            --disable-miner-thunderbird &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/tracker-0.14</parameter>: This
-      parameter is used so that the helper programs are installed in
-      <filename class="directory">/usr/lib/tracker-0.14</filename>
-      instead of <filename class="directory">/usr/libexec</filename>.
-    </para>
-
-    <para>
-      <option>--disable-miner-*</option>: These miners have been
-      reported to cause problems, so we turn them off.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring tracker</title>
-
-    <para>
-      There is no configuration required. If <application>gnome-documents</application>
-      has been installed on the <application>GNOME</application> desktop,
-      <application>gnome-session</application> will start the indexing of local PDF and
-      PS files. If you wish to index these files in other circumstances, you can run:
-      <command>tracker-control -s</command>
-    </para>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          tracker-control, tracker-explorer, tracker-import,
-          tracker-info, tracker-needle, tracker-preferences,
-          tracker-search, tracker-sparql, tracker-stats and
-          tracker-tag
-        </seg>
-        <seg>
-          libtracker-extract-0.14.so, libtracker-miner-0.14.so and
-          libtracker-sparql-0.14.so
-        </seg>
-        <seg>
-          /usr/include/tracker-0.14,
-          /usr/lib/tracker-0.14,
-          /usr/share/gtk-doc/html/libtracker-{extract,miner,sparql},
-          /usr/share/tracker and
-          /usr/share/tracker-tests
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tracker-control">
-        <term><command>tracker-control</command></term>
-        <listitem>
-          <para>
-            manages and checks status of all Tracker processes and data.
-          </para>
-          <indexterm zone="tracker tracker-control">
-            <primary sortas="b-tracker-control">tracker-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-import">
-        <term><command>tracker-import</command></term>
-        <listitem>
-          <para>
-            allows data to be imported to the database by providing files
-            with Turtle content.
-          </para>
-          <indexterm zone="tracker tracker-import">
-            <primary sortas="b-tracker-import">tracker-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-info">
-        <term><command>tracker-info</command></term>
-        <listitem>
-          <para>
-            asks for all the known metadata available for the given file.
-          </para>
-          <indexterm zone="tracker tracker-info">
-            <primary sortas="b-tracker-info">tracker-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-needle">
-        <term><command>tracker-needle</command></term>
-        <listitem>
-          <para>
-            is a graphical front end for Tracker which has similar
-            features to tracker-search
-          </para>
-          <indexterm zone="tracker tracker-needle">
-            <primary sortas="b-tracker-needle">tracker-needle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-preferences">
-        <term><command>tracker-preferences</command></term>
-        <listitem>
-          <para>
-            is a graphical configuration front end for the tracker-miner-fs.
-          </para>
-          <indexterm zone="tracker tracker-preferences">
-            <primary sortas="b-tracker-preferences">tracker-preferences</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-search">
-        <term><command>tracker-search</command></term>
-        <listitem>
-          <para>
-             searches all indexed content for an expression.
-          </para>
-          <indexterm zone="tracker tracker-search">
-            <primary sortas="b-tracker-search">tracker-search</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-sparql">
-        <term><command>tracker-sparql</command></term>
-        <listitem>
-          <para>
-            allows the caller to run an RDF query on the database.
-          </para>
-          <indexterm zone="tracker tracker-sparql">
-            <primary sortas="b-tracker-sparql">tracker-sparql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-stats">
-        <term><command>tracker-stats</command></term>
-        <listitem>
-          <para>
-            returns statistics based on the ontology classes outlined
-            in the Nepomuk ontology specification.
-          </para>
-          <indexterm zone="tracker tracker-stats">
-            <primary sortas="b-tracker-stats">tracker-stats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker-tag">
-        <term><command>tracker-tag</command></term>
-        <listitem>
-          <para>
-            allows the caller add tags, remove tags and list tags by
-            URN or to list all tags and the files associated with them.
-          </para>
-          <indexterm zone="tracker tracker-tag">
-            <primary sortas="b-tracker-tag">tracker-tag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker-extract-0">
-        <term><filename class='libraryfile'>libtracker-extract-0.14.so</filename></term>
-        <listitem>
-          <para>
-            contains functions required to develop metadata extractors for 3rd party file
-            types.
-          </para>
-          <indexterm zone="tracker libtracker-extract-0">
-            <primary sortas="c-libtracker-extract-0">libtracker-extract-0.14.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker-miner-0">
-        <term><filename class='libraryfile'>libtracker-miner-0.14.so</filename></term>
-        <listitem>
-          <para>
-            contains functions required to develop tracker data miners.
-          </para>
-          <indexterm zone="tracker libtracker-miner-0">
-            <primary sortas="c-libtracker-miner-0">libtracker-miner-0.14.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker-sparql-0">
-        <term><filename class='libraryfile'>libtracker-sparql-0.14.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for performing SPARQL queries and updates in the Tracker Store.
-          </para>
-          <indexterm zone="tracker libtracker-sparql-0">
-            <primary sortas="c-libtracker-sparql-0">libtracker-sparql-0.14.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/tracker2.xml
===================================================================
--- archive/gnome/tracker2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,225 +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"?>
-
-
-  <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: chive/gnome/vinagre.xml
===================================================================
--- archive/gnome/vinagre.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 vinagre-download-http "&gnome-download-http;/vinagre/3.6/vinagre-&vinagre-version;.tar.xz">
-  <!ENTITY vinagre-download-ftp  "&gnome-download-ftp;/vinagre/3.6/vinagre-&vinagre-version;.tar.xz">
-  <!ENTITY vinagre-md5sum        "e41e875b458e7e536e3c00608b1d07cd">
-  <!ENTITY vinagre-size          "2.4 MB">
-  <!ENTITY vinagre-buildsize     "25 MB">
-  <!ENTITY vinagre-time          "0.2 SBU">
-]>
-
-<sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;">
-  <?dbhtml filename="vinagre.html"?>
-
-
-  <title>Vinagre-&vinagre-version;</title>
-
-  <indexterm zone="vinagre">
-    <primary sortas="a-Vinagre">Vinagre</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vinagre</title>
-
-    <para>
-      <application>Vinagre</application> is a VNC client for the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vinagre-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vinagre-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vinagre-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vinagre-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vinagre-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vinagre-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vinagre Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gtk-vnc"/>,
-      <xref linkend="libsecret"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional">
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="vala"/> and
-      <xref linkend="vte"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> and
-      <ulink url="http://spice-space.org/">Spice GTK</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/vinagre"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vinagre</title>
-
-    <para>
-      Install <application>Vinagre</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>
-          vinagre
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/vinagre and
-          /usr/share/vinagre
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vinagre-prog">
-        <term><command>vinagre</command></term>
-        <listitem>
-          <para>
-            is a remote desktop viewer for the
-            <application>GNOME</application> Desktop.
-          </para>
-          <indexterm zone="vinagre vinagre-prog">
-            <primary sortas="b-vinagre">vinagre</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/vino.xml
===================================================================
--- archive/gnome/vino.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,193 +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 vino-download-http "&gnome-download-http;/vino/3.6/vino-&vino-version;.tar.xz">
-  <!ENTITY vino-download-ftp  "&gnome-download-ftp;/vino/3.6/vino-&vino-version;.tar.xz">
-  <!ENTITY vino-md5sum        "3054d9d0f9c70e0cd198f87ebcb61e3f">
-  <!ENTITY vino-size          "732 KB">
-  <!ENTITY vino-buildsize     "19 MB">
-  <!ENTITY vino-time          "0.2 SBU">
-]>
-
-<sect1 id="vino" xreflabel="Vino-&vino-version;">
-  <?dbhtml filename="vino.html"?>
-
-
-  <title>Vino-&vino-version;</title>
-
-  <indexterm zone="vino">
-    <primary sortas="a-Vino">Vino</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vino</title>
-
-    <para>
-      The <application>Vino</application> package is a VNC server for
-      <application>GNOME</application>. VNC is a protocol that allows remote
-      display of a user's desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vino-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vino-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vino-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vino-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vino-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vino-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vino Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="NetworkManager"/> and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gnutls"/> and
-      <xref linkend="libgcrypt"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/vino"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vino</title>
-
-    <para>
-      Install <application>Vino</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/vino &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-
-      <seglistitem>
-        <seg>
-          vino-passwd, vino-preferences and vino-server
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/vino and
-          /usr/share/vino
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vino-passwd">
-        <term><command>vino-passwd</command></term>
-        <listitem>
-          <para>
-            is used to update <application>Vino</application> password.
-          </para>
-          <indexterm zone="vino vino-passwd">
-            <primary sortas="b-vino-passwd">vino-passwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vino-preferences">
-        <term><command>vino-preferences</command></term>
-        <listitem>
-          <para>
-            is a GUI tool used to configure the machine for
-            VNC Access.
-          </para>
-          <indexterm zone="vino vino-preferences">
-            <primary sortas="b-vino-preferences">vino-preferences</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vino-server">
-        <term><command>vino-server</command></term>
-        <listitem>
-          <para>
-            is the <application>Vino</application> VNC server.
-          </para>
-          <indexterm zone="vino vino-server">
-            <primary sortas="b-vino-server">vino-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/yelp-tools.xml
===================================================================
--- archive/gnome/yelp-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +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 yelp-tools-download-http
-           "&gnome-download-http;/yelp-tools/3.4/yelp-tools-&yelp-tools-version;.tar.xz">
-  <!ENTITY yelp-tools-download-ftp
-           "&gnome-download-ftp;/yelp-tools/3.4/yelp-tools-&yelp-tools-version;.tar.xz">
-  <!ENTITY yelp-tools-md5sum        "8435aac25edbc530f878e93440c3d262">
-  <!ENTITY yelp-tools-size          "192 KB">
-  <!ENTITY yelp-tools-buildsize     "1.5 MB">
-  <!ENTITY yelp-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="yelp-tools" xreflabel="yelp-tools-&yelp-tools-version;">
-  <?dbhtml filename="yelp-tools.html"?>
-
-
-  <title>yelp-tools-&yelp-tools-version;</title>
-
-  <indexterm zone="yelp-tools">
-    <primary sortas="a-yelp-tools">yelp-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Yelp Tools</title>
-
-    <para>
-      <application>Yelp Tools</application> is a collection of
-      scripts and build utilities to help create, manage, and publish
-      documentation for Yelp and the web. Most of the heavy lifting
-      is done by packages like Yelp Xsl and itstool. This package just
-      wraps things up in a developer-friendly way.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yelp-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yelp-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yelp-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yelp-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yelp-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yelp-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Yelp Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/yelp-tools"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Yelp Tools</title>
-
-    <para>
-      Install <application>Yelp 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 Programs</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          yelp-build, yelp-check and yelp-new
-        </seg>
-        <seg>
-          /usr/share/yelp-tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="yelp-build">
-        <term><command>yelp-build</command></term>
-        <listitem>
-          <para>
-            is used to build output formats from
-            Mallard or DocBook files.
-          </para>
-          <indexterm zone="yelp-tools yelp-build">
-            <primary sortas="b-yelp-build">yelp-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yelp-check">
-        <term><command>yelp-check</command></term>
-        <listitem>
-          <para>
-            is used to keep track of the work while you write.
-          </para>
-          <indexterm zone="yelp-tools yelp-check">
-            <primary sortas="b-yelp-check">yelp-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yelp-new">
-        <term><command>yelp-new</command></term>
-        <listitem>
-          <para>
-            is used to create a new Mallard page file
-            from a template.
-          </para>
-          <indexterm zone="yelp-tools yelp-new">
-            <primary sortas="b-yelp-new">yelp-new</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/zenity-new.xml
===================================================================
--- archive/gnome/zenity-new.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 zenity-download-http "&gnome-download-http;/zenity/&gnome-minor-42;/zenity-&zenity-version;.tar.xz">
-  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-minor-42;/zenity-&zenity-version;.tar.xz">
-  <!ENTITY zenity-md5sum        "876ce3ab0304ad7591736238ad97795a">
-  <!ENTITY zenity-size          "2.9 MB">
-  <!ENTITY zenity-buildsize     "15 MB">
-  <!ENTITY zenity-time          "0.1 SBU">
-]>
-
-<sect1 id="zenity" xreflabel="Zenity-&zenity-version;">
-  <?dbhtml filename="zenity.html"?>
-
-
-  <title>Zenity-&zenity-version;</title>
-
-  <indexterm zone="zenity">
-    <primary sortas="a-Zenity">Zenity</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Zenity</title>
-
-    <para>
-      <application>Zenity</application> is a rewrite of
-      <application>gdialog</application>, the <application>GNOME</application>
-      port of <application>dialog</application> which allows you to display
-      <application>GTK+</application> dialog boxes from the command line and
-      shell scripts.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&zenity-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&zenity-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &zenity-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &zenity-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &zenity-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &zenity-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Zenity Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="itstool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/zenity"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Zenity</title>
-
-    <para>
-      First, adjust Zenity to properly use <xref linkend="webkitgtk" role="nodep"/>
-      if it is present:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/webkit2gtk-4.0/webkit2gtk-4.1/' meson.build</userinput></screen>
-
-    <para>
-      Install <application>Zenity</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build    &amp;&amp;
-
-meson --prefix=/usr --buildtype=release -Dlibnotify=true .. &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gdialog and zenity
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/zenity and
-          /usr/share/zenity
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdialog">
-        <term><command>gdialog</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> wrapper script which
-            can be used with legacy scripts
-          </para>
-          <indexterm zone="zenity gdialog">
-            <primary sortas="b-gdialog">gdialog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zenity-prog">
-        <term><command>zenity</command></term>
-        <listitem>
-          <para>
-            is a program that will display <application>GTK+</application>
-            dialogs, and return the user's input
-          </para>
-          <indexterm zone="zenity zenity-prog">
-            <primary sortas="b-zenity">zenity</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/zenity.xml
===================================================================
--- archive/gnome/zenity.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +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 zenity-download-http "&gnome-download-http;/zenity/3.6/zenity-&zenity-version;.tar.xz">
-  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/3.6/zenity-&zenity-version;.tar.xz">
-  <!ENTITY zenity-md5sum        "a9ba39d7286ec172f726c938d911e933">
-  <!ENTITY zenity-size          "3.5 MB">
-  <!ENTITY zenity-buildsize     "24 MB">
-  <!ENTITY zenity-time          "0.1 SBU">
-]>
-
-<sect1 id="zenity" xreflabel="Zenity-&zenity-version;">
-  <?dbhtml filename="zenity.html"?>
-
-
-  <title>Zenity-&zenity-version;</title>
-
-  <indexterm zone="zenity">
-    <primary sortas="a-Zenity">Zenity</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Zenity</title>
-
-    <para>
-      <application>Zenity</application> is a rewrite of
-      <application>gdialog</application>, the <application>GNOME</application>
-      port of <application>dialog</application> which allows you to display
-      <application>GTK+</application> dialog boxes from the command line and
-      shell scripts.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&zenity-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&zenity-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &zenity-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &zenity-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &zenity-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &zenity-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Zenity Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/zenity"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Zenity</title>
-
-    <para>
-      Install <application>Zenity</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gdialog and zenity
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/zenity and
-          /usr/share/zenity
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdialog">
-        <term><command>gdialog</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> wrapper script which
-            can be used with legacy scripts.
-          </para>
-          <indexterm zone="zenity gdialog">
-            <primary sortas="b-gdialog">gdialog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zenity-prog">
-        <term><command>zenity</command></term>
-        <listitem>
-          <para>
-            is a program that will display <application>GTK+</application>
-            dialogs, and return the user's input.
-          </para>
-          <indexterm zone="zenity zenity-prog">
-            <primary sortas="b-zenity">zenity</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnucash.xml
===================================================================
--- archive/gnucash.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,317 +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 gnucash-download-http
-  "&sourceforge-repo;/gnucash/gnucash-&gnucash-version;.tar.bz2">
-  <!ENTITY gnucash-download-ftp
-  " ">
-  <!ENTITY gnucash-src-md5sum     "e59f94a8c4cf41f47a9e74ba725bde45">
-  <!ENTITY gnucash-size           "9 MB">
-  <!ENTITY gnucash-buildsize      "207 MB">
-  <!ENTITY gnucash-time           "2.0 SBU">
-  <!ENTITY gnucash-docs-version   "2.4.1">
-  <!ENTITY gnucash-docs-download
-  "&sourceforge-repo;/gnucash/gnucash-docs-&gnucash-docs-version;.tar.gz">
-  <!ENTITY gnucash-docs-md5sum    "38daeb3b15f296726ee8124122040f08">
-  <!ENTITY gnucash-docs-size      "32.5 MB">
-  <!ENTITY gnucash-docs-buildsize "27 MB">
-  <!ENTITY gnucash-docs-time      "0.5 SBU">
-]>
-
-<sect1 id="gnucash" xreflabel="GnuCash-&gnucash-version;">
-  <?dbhtml filename="gnucash.html" ?>
-
-
-  <title>GnuCash-&gnucash-version;</title>
-
-  <indexterm zone="gnucash">
-    <primary sortas="a-GnuCash">GnuCash</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GnuCash</title>
-
-    <para><application>GnuCash</application> is a personal finance
-    manager.</para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnucash-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnucash-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnucash-src-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnucash-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnucash-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnucash-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnucash-&gnucash-version;-guile-2_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Help documentation: <ulink url="&gnucash-docs-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnucash-docs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnucash-docs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnucash-docs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnucash-docs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GnuCash Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="guile"/>,
-      <xref linkend="libgnomeui"/>,
-      <xref linkend="gnome-vfs"/>,
-      <xref linkend="slib"/>,
-      <xref linkend="goffice"/> and
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://libdbi.sourceforge.net/">libdbi</ulink> (and
-      <ulink url="http://libdbi-drivers.sourceforge.net/">libdbi drivers</ulink>) and
-      <ulink url="ftp://ftp.gnu.org/pub/gnu/guile/">Guile-www</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required for the Help System)</bridgehead>
-    <para role="optional">
-      <xref linkend="rarian"/> and
-      <xref linkend="yelp"/> (run-time requirement to view the Help documents).
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for On-Line Banking)</bridgehead>
-    <para role="optional">
-      <ulink url="http://libofx.sourceforge.net/">LibOFX</ulink> (requires
-      <xref linkend="opensp"/> and <xref linkend="curl"/>),
-      <ulink url="http://sourceforge.net/projects/ktoblzcheck">KtoBlzCheck</ulink> and
-      <ulink url="http://www.aquamaniac.de/aqbanking/">AqBanking</ulink> (requires
-      <ulink url="http://gwenhywfar.sourceforge.net/">Gwenhywfar</ulink> and
-      <ulink url="http://www.libchipcard.de/">libchipcard3</ulink>)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnucash"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GnuCash</title>
-
-    <para>Install <application>GnuCash</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../gnucash-&gnucash-version;-guile-2_fixes-1.patch &amp;&amp;
-
-./configure --prefix=/usr           \
-            --sysconfdir=/etc/gnome \
-            --disable-dbi           \
-            --with-html-engine=webkit &amp;&amp;
-make</userinput></screen>
-
-    <para> If you wish to create the API documentation in HTML format, you must
-    have <xref linkend="doxygen"/> and <xref linkend="graphviz"/> installed,
-    then issue:</para>
-
-<screen><userinput>make doc</userinput></screen>
-
-      <para>If you wish to create the API Design Guide in several formats, you
-      must have <xref linkend="texlive"/> installed and issue:</para>
-
-<screen><userinput>make -C src/doc/design html pdf ps</userinput></screen>
-
-    <para>
-      The test suite is currently broken due to problems with
-      <application>Guile 2</application>.
-      <!-- To test the results, issue: <command>make check</command>.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you want to install the Help documentation system, you must have
-      <xref linkend="yelp"/> and <xref linkend="rarian"/> installed in order to
-      view the Help documents. Unpack the additional tarball, change into the
-      <filename class="directory">gnucash-docs-&gnucash-docs-version;</filename>
-      source directory and issue the following commands as an unprivileged
-      user:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      HTML versions of the Users Guide can be created if the DocBook XML tools
-      are installed (<xref linkend="libxslt"/>, <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/>). A PDF version of the Users Guide can be
-      created if you have <xref linkend="docbook-utils"/>,
-      and <xref linkend="fop"/> installed.
-      Issue the following commands to create the documentation:
-    </para>
-
-<screen><userinput>make -C guide html &amp;&amp;
-make -C guide pdf</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the Users Guide, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p                           /usr/share/doc/gnucash-&gnucash-docs-version; &amp;&amp;
-cp -v -R guide/C/gnucash-guide/*   /usr/share/doc/gnucash-&gnucash-docs-version; &amp;&amp;
-cp -v    guide/C/gnucash-guide.pdf /usr/share/doc/gnucash-&gnucash-docs-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This installs
-    configuration files in
-    <filename class="directory">/etc/gnome/gnucash</filename> instead of
-    <filename class="directory">/usr/etc/gnucash</filename>.</para>
-
-    <para>
-      <parameter>--with-html-engine=webkit</parameter>: Use
-      <xref linkend="webkitgtk"/> (configured <option>--with-gtk=2.0</option>)
-      instead of gtkhtml : the default is Gtkhtml-3 which does not build on
-      current <application>Glib2</application> without various changes.
-    </para>
-
-    <para>
-      <command>--disable-dbi</command>: Add this option if you've not installed
-      <application>libdbi</application> and one or more of its database drivers.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GnuCash</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        If you wish to use <application>GnuCash</application> to retrieve
-        stock price quotes, you'll need to
-        install the following <application>Perl</application> modules:
-        <xref linkend="perl-lwp"/>, <xref linkend="perl-date-manip"/>,
-        <xref linkend="perl-html-parser"/>,
-        <xref linkend="perl-html-tableextract"/>,
-        <xref linkend="perl-crypt-ssleay"/> and
-        <xref linkend="perl-finance-quote"/>. Alternatively, you can run the
-        <command>gnc-fq-update</command> script as the
-        <systemitem class="username">root</systemitem> user.
-      </para>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnc-fq-check, gnc-fq-dump, gnc-fq-helper, gnc-fq-update,
-          gnucash, gnucash-env, gnucash-make-guids, gnucash-valgrind and
-          update-gnucash-gconf
-        </seg>
-        <seg>
-          libgnc-backend-sql.so, libgnc-backend-xml-utils.so,
-          libgnc-business-ledger.so,libgnc-core-utils.so, libgnc-gnome.so,
-          libgnc-module.so, libgnc-qof.so and numerous support libraries
-          installed in <filename class="directory">/usr/lib/gnucash</filename>
-        </seg>
-        <seg>
-          /opt/gnome/gnucash,
-          /usr/include/gnucash,
-          /usr/lib/gnucash,
-          /usr/libexec/gnucash and
-          /usr/share/doc/gnucash-&gnucash-version;.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnucash-prog">
-        <term><command>gnucash</command></term>
-        <listitem>
-          <para>is a personal finance manager.</para>
-          <indexterm zone="gnucash gnucash-prog">
-            <primary sortas="b-gnucash">gnucash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/gnupg.xml
===================================================================
--- archive/gnupg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,188 +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 gnupg-download-http " ">
-  <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
-  <!ENTITY gnupg-md5sum        "58bb873ecf17d3205a98c545248d7b04">
-  <!ENTITY gnupg-size          "3.5 MB">
-  <!ENTITY gnupg-buildsize     "46 MB">
-  <!ENTITY gnupg-time          "0.4 SBU">
-]>
-
-<sect1 id="gnupg" xreflabel="GnuPG-&gnupg-version;">
-  <?dbhtml filename="gnupg.html"?>
-
-
-  <title>GnuPG-&gnupg-version;</title>
-
-  <indexterm zone="gnupg">
-    <primary sortas="a-GnuPG">GnuPG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GnuPG</title>
-
-    <para>The <application>GnuPG</application> package contains a
-    public/private key encryptor. This is useful for signing
-    files or emails as proof of identity and preventing tampering with
-    the contents of the file or email. For a more enhanced version of
-    GnuPG which supports S/MIME, see the <xref linkend="gnupg2"/>
-    package.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnupg-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnupg-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnupg-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnupg-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnupg-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnupg-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GnuPG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="libusb-compat"/>,
-    <xref linkend="curl"/>,
-    an <xref linkend="server-mail"/>, and
-    <ulink url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnupg"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GnuPG</title>
-
-    <para>Install <application>GnuPG</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="texlive"/>
-    installed and you wish to create documentation in alternate formats, issue
-    the following command:</para>
-
-<screen><userinput>make -C doc pdf html</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Note that if you have already installed <application>GnuPG
-    2</application>, the instructions below will overwrite
-    <filename>/usr/share/man/man1/gpg-zip.1</filename>. Now, as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
-cp      -v          /usr/share/gnupg/FAQ \
-                    /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
-install -v -m644    doc/{highlights-1.4.txt,OpenPGP,samplekeys.asc,DETAILS} \
-                    /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
-
-    <para>If you created alternate formats of the documentation, install it
-    using the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cp -v -R doc/gnupg1.{html,pdf} /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--libexecdir=/usr/lib</parameter>: This command
-    creates a <filename class="directory">gnupg</filename> directory in
-    <filename class="directory">/usr/lib</filename> instead of
-    <filename class="directory">/usr/libexec</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gpg, gpg-zip, gpgsplit, and gpgv</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/gnupg, /usr/share/gnupg and
-        /usr/share/doc/gnupg-&gnupg-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpg">
-        <term><command>gpg</command></term>
-        <listitem>
-          <para>is the backend (command-line interface) for
-          this OpenPGP implementation.</para>
-          <indexterm zone="gnupg gpg">
-            <primary sortas="b-gpg">gpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-zip">
-        <term><command>gpg-zip</command></term>
-        <listitem>
-          <para>shell script that implements a gpg-ized version of
-          <command>tar</command>.</para>
-          <indexterm zone="gnupg gpg-zip">
-            <primary sortas="b-gpg-zip">gpg-zip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgsplit">
-        <term><command>gpgsplit</command></term>
-        <listitem>
-          <para>separates key rings.</para>
-          <indexterm zone="gnupg gpgsplit">
-            <primary sortas="b-gpgsplit">gpgsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgv">
-        <term><command>gpgv</command></term>
-        <listitem>
-          <para>is a verify only version of <command>gpg</command>.</para>
-          <indexterm zone="gnupg gpgv">
-            <primary sortas="b-gpgv">gpgv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/goffice.xml
===================================================================
--- archive/goffice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 goffice-download-http
-  "&gnome-download-http;/goffice/0.8/goffice-&goffice-version;.tar.bz2">
-  <!ENTITY goffice-download-ftp
-  "&gnome-download-ftp;/goffice/0.8/goffice-&goffice-version;.tar.bz2">
-  <!ENTITY goffice-md5sum        "b4c924457163e02daf8a8d2428f51d10">
-  <!ENTITY goffice-size          "2.2 MB">
-  <!ENTITY goffice-buildsize     "86 MB">
-  <!ENTITY goffice-time          "1.2 SBU">
-]>
-
-<sect1 id="goffice" xreflabel="GOffice-&goffice-version;">
-  <?dbhtml filename="goffice.html"?>
-
-
-  <title>GOffice-&goffice-version;</title>
-
-  <indexterm zone="goffice">
-    <primary sortas="a-GOffice">GOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GOffice</title>
-
-    <para>
-      The <application>GOffice</application> package contains a library of
-      <application>GLib</application>/<application>GTK</application> document
-      centric objects and utilities. This is useful for performing common
-      operations for document centric applications that are conceptually simple,
-      but complex to implement fully. Some of the operations provided by the
-      <application>GOffice</application> library include support for plugins,
-      load/save routines for application documents and undo/redo functions.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&goffice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&goffice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &goffice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &goffice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &goffice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &goffice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="intltool"/>,
-      <xref linkend="libgsf"/>, and
-      <xref linkend="which"/>
-    </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;/goffice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GOffice</title>
-
-    <para>
-      Install <application>GOffice</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's#info (r, NULL#full&amp;, 0#' goffice/utils/regutf8.c &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-static</option>: This switch prevents the static
-      libraries in this package being built and installed.
-    </para>
-
-    <para>
-      <command>sed -i 's#info (r, NULL#full&amp;, 0#'
-      goffice/utils/regutf8.c</command>: This sed removes a reference to
-      pcre_info, a deprecated function that was removed from
-      <application>PCRE-8.30</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-	<seg>
-	  None
-	</seg>
-        <seg>libgoffice-08.so and numerous support plugins.</seg>
-        <seg>
-          /usr/include/libgoffice-0.8,
-          /usr/lib/goffice,
-          /usr/share/gtk-doc/html/goffice-0.8, and
-          /usr/share/pixmaps/goffice.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgoffice">
-        <term><filename class='libraryfile'>libgoffice-0.8.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions to provide support for document centric
-            objects and utilities.
-          </para>
-          <indexterm zone="goffice libgoffice">
-            <primary sortas="c-libgoffice-0.8">libgoffice-0.8.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/gperf.xml
===================================================================
--- archive/gperf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 gperf-download-http "http://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
-  <!ENTITY gperf-download-ftp  "ftp://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
-  <!ENTITY gperf-md5sum        "c1f1db32fb6598d6a93e6e88796a8632">
-  <!ENTITY gperf-size          "968 KB">
-  <!ENTITY gperf-buildsize     "6.5 MB">
-  <!ENTITY gperf-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gperf" xreflabel="Gperf-&gperf-version;">
-  <?dbhtml filename="gperf.html"?>
-
-
-  <title>Gperf-&gperf-version;</title>
-
-  <indexterm zone="gperf">
-    <primary sortas="a-Gperf">Gperf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gperf</title>
-
-    <para><application>Gperf</application> generates a perfect hash function
-    from a key set.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gperf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gperf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gperf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gperf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gperf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gperf-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gperf"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gperf</title>
-
-    <para>Install <application>Gperf</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version; &amp;&amp;
-make</userinput></screen>
-
-<!--  gperf.texi is broken.  Fixing the texi file breaks 'make install'
-      without TeXlive installed.
-    <para>If desired, create a text version of the documentation by issuing
-    the following command:</para>
-
-<screen><userinput>makeinfo -o doc/gperf.txt - -plaintext doc/gperf.texi</userinput></screen>
--->
-
-    <para>To test the results, issue: <command>make check</command>. There
-    should be no output from the <command>diff</command> commands.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-<!--install -m644 -v doc/gperf.{dvi,ps,pdf,txt} \ -->
-install -m644 -v doc/gperf.{dvi,ps,pdf} \
-                 /usr/share/doc/gperf-&gperf-version; &amp;&amp;
-
-pushd /usr/share/info &amp;&amp;
-  rm -v dir &amp;&amp;
-  for FILENAME in *; do
-    install-info $FILENAME dir 2>/dev/null
-  done &amp;&amp;
-popd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf,txt} ...</command>:
-    This command installs documentation. Modify the command (remove ',txt') if
-    you did not build the text version.</para>
--->
-
-    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf} ...</command>:
-    This command installs documentation.</para>
-
-    <para><command>pushd ... popd</command>: This set of commands rebuilds the
-    <filename>/usr/share/info/dir</filename> file as the installation failed
-    to do so.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gperf</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gperf-prog">
-        <term><command>gperf</command></term>
-        <listitem>
-          <para>generates a perfect hash function from a key set.</para>
-          <indexterm zone="gperf gperf-prog">
-            <primary sortas="b-gperf">gperf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gst-ffmpeg.xml
===================================================================
--- archive/gst-ffmpeg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,137 +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 gst-ffmpeg-download-http "http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-&gst-ffmpeg-version;.tar.bz2">
-  <!ENTITY gst-ffmpeg-download-ftp  " ">
-  <!ENTITY gst-ffmpeg-md5sum        "7f5beacaf1312db2db30a026b36888c4">
-  <!ENTITY gst-ffmpeg-size          "4.6 MB">
-  <!ENTITY gst-ffmpeg-buildsize     "272 MB">
-  <!ENTITY gst-ffmpeg-time          "2.9 SBU">
-]>
-
-<sect1 id="gst-ffmpeg" xreflabel="gst-ffmpeg-&gst-ffmpeg-version;">
-  <?dbhtml filename="gst-ffmpeg.html"?>
-
-
-  <title>gst-ffmpeg-&gst-ffmpeg-version;</title>
-
-  <indexterm zone="gst-ffmpeg">
-    <primary sortas="a-gst-ffmpeg">gst-ffmpeg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gst FFMpeg</title>
-
-    <para>
-      The <application>Gst FFMpeg</application> contains GStreamer plugins
-      for <application>FFMpeg</application>.
-    </para>
-
-    &lfs77_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-ffmpeg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-ffmpeg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-ffmpeg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-ffmpeg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-ffmpeg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-ffmpeg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gst-ffmpeg-&gst-ffmpeg-version;-gcc-4.7-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gst FFMpeg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/> and
-      <xref linkend="yasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gst-ffmpeg"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gst FFMpeg</title>
-
-    <para>
-      Install <application>Gst FFMpeg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -p1 &lt; ../gst-ffmpeg-&gst-ffmpeg-version;-gcc-4.7-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed GStreamer Plugins</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgstffmpeg.so, libgstffmpegscale.so and libgstpostproc.so
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gst-plugins-bad.xml
===================================================================
--- archive/gst-plugins-bad.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,230 +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 gst-plugins-bad-download-http "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-&gst-plugins-bad-version;.tar.xz">
-  <!ENTITY gst-plugins-bad-download-ftp  " ">
-  <!ENTITY gst-plugins-bad-md5sum        "e4822fa2cc933768e2998311a1565979">
-  <!ENTITY gst-plugins-bad-size          "3.1 MB">
-  <!ENTITY gst-plugins-bad-buildsize     "140 MB (depending on which optional dependencies are fulfilled)">
-  <!ENTITY gst-plugins-bad-time          "2.0 SBU">
-]>
-
-<sect1 id="gst-plugins-bad" xreflabel="gst-plugins-bad-&gst-plugins-bad-version;">
-  <?dbhtml filename="gst-plugins-bad.html"?>
-
-
-  <title>gst-plugins-bad-&gst-plugins-bad-version;</title>
-
-  <indexterm zone="gst-plugins-bad">
-    <primary sortas="a-GStreamer-Bad-Plug-ins">GStreamer Bad Plug-ins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gstreamer Bad Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Bad Plug-ins</application> package contains a set
-      a set of plug-ins that aren't up to par compared to the rest. They might be
-      close to being good quality, but they're missing something - be it a good
-      code review, some documentation, a set of tests, a real live maintainer,
-      or some actual wide use.  Also see the <xref linkend="gst-plugins-good"/>,
-      <xref linkend="gst-plugins-ugly"/> and <xref linkend="gst-ffmpeg"/> packages.
-    </para>
-
-    &lfs77_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-plugins-bad-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-plugins-bad-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-plugins-bad-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-plugins-bad-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-plugins-bad-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-plugins-bad-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Bad Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="faac"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="llvm"/>,
-      <xref linkend="openssl"/> and
-      <xref linkend="xvid"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="faad2"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libass"/>,
-      <xref linkend="libmusicbrainz"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libsndfile"/>,
-      <xref linkend="libvdpau"/>,
-      <xref linkend="neon"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="soundtouch"/>,
-      <ulink url="http://www.celt-codec.org/">celt</ulink>,
-      <ulink url="http://diracvideo.org/">Dirac</ulink>,
-      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
-      <ulink url="http://code.google.com/p/game-music-emu/">Game Music Emu</ulink>,
-      <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
-      <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
-      <ulink url="http://libcdaudio.sourceforge.net/">libcdaudio</ulink>,
-      <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
-      <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
-      <ulink url="http://libiptcdata.sourceforge.net/">libiptcdata</ulink>,
-      <ulink url="http://code.google.com/p/libkate/">libkate</ulink>,
-      <ulink url="http://sourceforge.net/projects/farsight/files/libmimic/">libmimic</ulink>,
-      <ulink url="http://sourceforge.net/projects/libmms">libmms</ulink>,
-      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
-      <ulink url="http://www.musepack.net/">libmpcdec</ulink>,
-      <ulink url="http://code.google.com/p/musicip-libofa/">libofa</ulink>,
-      <ulink url="http://mjpeg.sourceforge.net/">MJPEG Tools</ulink>,
-      <ulink url="http://kcat.strangesoft.net/openal.html">OpenAL</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <ulink url="http://rtmpdump.mplayerhq.hu/">rtmpdump</ulink>,
-      <ulink url="http://diracvideo.org/">Schroedinger</ulink>,
-      <ulink url="http://www.soft-switch.org/">SpanDSP</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencore-amr/">VO AACENC</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencore-amr/">VO AMRWBENC</ulink>,
-      <ulink url="https://github.com/Mindwerks/wildmidi">WildMidi</ulink>,
-      <ulink url="http://zbar.sourceforge.net/">ZBAR</ulink> and
-      <ulink url="http://zapping.sourceforge.net/ZVBI/index.html">ZVBI</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
-    <para>
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gst-plugins-bad"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Bad Plug-ins</title>
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <para>Fix some code when building with libvpx-1.4.0 and later:</para>
-
-<screen><userinput>sed -e '/Some compatibility/ s:*/::' \
-    -e '/const char/ i*/'            \
-    -i  ext/vp8/gstvp8utils.h</userinput></screen>
-
-    <para>Prevent a miscompilation caused by a change in the output from
-    <application>cpp in gcc-5</application> which leads to crashes.</para>
-
-<screen><userinput>sed -i -e 's/ GST_CHECK_FAAD_VERSION / /' \
-       -e '/"GST_CHECK_FAAD_VERSION/{
-           s/GST_CHECK_FAAD_VERSION //
-           s/""/"$"/ }' configure</userinput></screen>
-
-    <para>
-      Install <application>Gstreamer Bad Plug-ins</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --with-gtk=3.0 --disable-examples &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that
-      tests for some of the items may fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gtk=3.0</parameter>: Build against <application>GTK+ 3</application>
-      instead of the default <application>GTK+ 2</application>; recommended for a
-      <application>GNOME</application> Desktop.
-    </para>
-
-    <para>
-      <parameter>--disable-examples</parameter>: If the dependencies for the camera
-      driver have been satisfied, the associated example code fails to build.
-    </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>
-          libgstbasecamerabinsrc-0.10.so, libgstbasevideo-0.10.so,
-          libgstcodecparsers-0.10.so, libgstphotography-0.10.so,
-          libgstsignalprocessor-0.10.so and libgstvdp-0.10.so
-        </seg>
-        <seg>
-          /usr/include/gstreamer-0.10/gst/{basecamerabinsrc,codecparsers,interfaces},
-          /usr/include/gstreamer-0.10/gst/{signalprocessor,vdpau,video} and
-          /usr/share/gtk-doc/gst-plugins-bad-libs-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gst-plugins-base.xml
===================================================================
--- archive/gst-plugins-base.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,234 +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 gst-plugins-base-download-http "&gnome-download-http;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
-  <!ENTITY gst-plugins-base-download-ftp  "&gnome-download-ftp;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
-  <!ENTITY gst-plugins-base-md5sum        "3d2337841b132fe996e5eb2396ac9438">
-  <!ENTITY gst-plugins-base-size          "2.3 MB">
-  <!ENTITY gst-plugins-base-buildsize     "105 MB">
-  <!ENTITY gst-plugins-base-time          "1.7 SBU">
-]>
-
-<sect1 id="gst-plugins-base"
-       xreflabel="gst-plugins-base-&gst-plugins-base-version;">
-  <?dbhtml filename="gst-plugins-base.html"?>
-
-
-  <title>gst-plugins-base-&gst-plugins-base-version;</title>
-
-  <indexterm zone="gst-plugins-base">
-    <primary sortas="a-GStreamer-Base-Plug-ins">GStreamer Base Plug-ins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Base Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Base Plug-ins</application> is a
-      well-groomed and well-maintained collection of
-      <application>GStreamer</application> plug-ins and elements, spanning the
-      range of possible types of elements one would want to write for
-      <application>GStreamer</application>. It also contains helper libraries
-      and base classes useful for writing elements. A wide range of video and
-      audio decoders, encoders, and filters are included. Also see the
-      <xref linkend="gst-plugins-bad"/>, <xref linkend="gst-plugins-good"/>,
-      <xref linkend="gst-plugins-ugly"/>, and <xref linkend="gst-ffmpeg"/>
-      packages.
-    </para>
-
-    &lfs77_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-plugins-base-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-plugins-base-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-plugins-base-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-plugins-base-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-plugins-base-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-plugins-base-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch :
-          <ulink url="&patch-root;/gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Base Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gstreamer"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libogg"/>,
-      <xref linkend="libtheora"/>,
-      <xref linkend="libvorbis"/>, and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cdparanoia"/>,
-      <xref linkend="gtk3"/> (required to build the examples),
-      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <xref linkend="check"/> (required to run the unit regression tests), and
-      <xref linkend="valgrind"/>
-      (optionaly used during the unit regression tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required to Rebuild the API
-    Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gst-plugins-base"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Base Plug-ins</title>
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <para>
-      First, if you are using i686, fix a compile problem inroduced by
-      <application>&gcc-490;</application>:
-    </para>
-
-<screen role="nodump"><userinput>patch -Np1 -i ../gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch</userinput></screen>
-
-    <para>
-      Install <application>GStreamer Base Plug-ins</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the unit regression tests, issue: <command>make check</command>.
-      There are many other <filename>Makefile</filename> targets you can specify
-      for running the tests, issue <command>make -C tests/check help</command>
-      to see the complete list.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gst-visualise-0.10
-        </seg>
-        <seg>
-          libgstapp-0.10.so, libgstaudio-0.10.so, libgstcdda-0.10.so, libgstfft-0.10.so,
-          libgstinterfaces-0.10.so, libgstnetbuffer-0.10.so, libgstpbutils-0.10.so,
-          libgstriff-0.10.so, libgstrtp-0.10.so, libgstrtsp-0.10.so, libgstsdp-0.10.so,
-          libgsttag-0.10.so and libgstvideo-0.10.so
-        </seg>
-        <seg>
-          /usr/include/gstreamer-0.10/gst/{app,audio,cdda,fft,floatcast,interfaces,netbuffer}
-          /usr/include/gstreamer-0.10/gst/{pbutils,riff,rtp,rtsp,sdp,tag,video},
-          /usr/share/gst-plugins-base,
-          /usr/share/gtk-doc/html/gst-plugins-base-libs-0.10 and
-          /usr/share/gtk-doc/html/gst-plugins-base-plugins-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gst-visualise">
-        <term><command>gst-visualise-0.10</command></term>
-        <listitem>
-          <para>
-            is used to run a basic <application>GStreamer</application>
-            pipeline to display a graphical visualisation of an audio stream.
-          </para>
-          <indexterm zone="gst-plugins-base gst-visualise">
-            <primary sortas="b-gst-visualise">gst-visualise-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gst-plugins-good.xml
===================================================================
--- archive/gst-plugins-good.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +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 gst-plugins-good-download-http
-          "&gnome-download-http;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
-  <!ENTITY gst-plugins-good-download-ftp
-           "&gnome-download-ftp;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
-  <!ENTITY gst-plugins-good-md5sum        "555845ceab722e517040bab57f9ace95">
-  <!ENTITY gst-plugins-good-size          "2.6 MB">
-  <!ENTITY gst-plugins-good-buildsize     "110 MB">
-  <!ENTITY gst-plugins-good-time          "1.2 SBU">
-]>
-
-<sect1 id="gst-plugins-good" xreflabel="gst-plugins-good-&gst-plugins-good-version;">
-  <?dbhtml filename="gst-plugins-good.html"?>
-
-
-  <title>gst-plugins-good-&gst-plugins-good-version;</title>
-
-  <indexterm zone="gst-plugins-good">
-    <primary sortas="a-GStreamer-Good-Plug-ins">GStreamer Good Plug-ins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Good Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Good Plug-ins</application> is a set of
-      plug-ins considered by the <application>GStreamer</application> developers
-      to have good quality code, correct functionality, and the preferred
-      license (LGPL for the plug-in code, LGPL or LGPL-compatible for the
-      supporting library). A wide range of video and audio decoders, encoders,
-      and filters are included. Also see the <xref linkend="gst-plugins-ugly"/>,
-      <xref linkend="gst-plugins-bad"/>  and <xref linkend="gst-ffmpeg"/>
-      packages.
-    </para>
-
-    &lfs77_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-plugins-good-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-plugins-good-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-plugins-good-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-plugins-good-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-plugins-good-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-plugins-good-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Good Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="GConf"/> and
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="gtk3"/> (required to build the examples),
-      <xref linkend="libdv"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="taglib"/>,
-      <xref linkend="v4l-utils"/>,
-      <ulink url="http://www.jackaudio.org">JACK</ulink>,
-      <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
-      (requires
-         <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/"> libraw1394</ulink>),
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>,
-      <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/">libiec61883</ulink>,
-      <ulink url="http://downloads.us.xiph.org/releases/libshout/">libshout</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>, and
-      <ulink url="http://www.wavpack.com/">WavPack</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
-    <para>
-      <xref linkend="valgrind"/>
-    </para>
-
-    <bridgehead renderas="sect4">
-      Optional (Required to Rebuild the API Documentation)
-    </bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gst-plugins-good"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Good Plug-ins</title>
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <para>
-      Install <application>GStreamer Good Plug-ins</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i -e "/input:/d" sys/v4l2/gstv4l2bufferpool.c &amp;&amp;
-sed -i -e "/case V4L2_CID_HCENTER/d" -e "/case V4L2_CID_VCENTER/d" sys/v4l2/v4l2_calls.c &amp;&amp;
-./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-gtk=3.0 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the unit regression tests, issue: <command>make check</command>.
-      There are many other <filename>Makefile</filename> targets you can specify
-      for running the tests, issue <command>make -C tests/check help</command>
-      to see the complete list.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not rebuild the API documentation by passing
-      <option>--enable-gtk-doc</option> to the <command>configure</command>
-      script and you wish to install the pre-built documentation, issue the
-      following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make -C docs/plugins install-data</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i -e "..."</command>: These <command>sed</command>
-      commands fix building with recent kernels.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/gst-plugins-good-plugins-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gst-plugins-ugly.xml
===================================================================
--- archive/gst-plugins-ugly.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +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 gst-plugins-ugly-download-http
-           "http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-&gst-plugins-ugly-version;.tar.xz">
-  <!ENTITY gst-plugins-ugly-download-ftp  " ">
-  <!ENTITY gst-plugins-ugly-md5sum        "ba26045c8c8c91f0d48d327ccf53ac0c">
-  <!ENTITY gst-plugins-ugly-size          "864 KB">
-  <!ENTITY gst-plugins-ugly-buildsize     "20 MB">
-  <!ENTITY gst-plugins-ugly-time          "0.3 SBU">
-]>
-
-<sect1 id="gst-plugins-ugly" xreflabel="gst-plugins-ugly-&gst-plugins-ugly-version;">
-  <?dbhtml filename="gst-plugins-ugly.html"?>
-
-
-  <title>gst-plugins-ugly-&gst-plugins-ugly-version;</title>
-
-  <indexterm zone="gst-plugins-ugly">
-    <primary sortas="a-GStreamer-Ugly-Plug-ins">GStreamer Ugly Plug-ins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Ugly Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Ugly Plug-ins</application> is a set of plug-ins
-      considered by the <application>GStreamer</application> developers  to have
-      good quality and correct functionality, but distributing them might pose
-      problems. The license on either the plug-ins or the supporting libraries
-      might not be how the <application>GStreamer</application> developers would
-      like. The code might be widely known to present patent problems. Also see
-      the <xref linkend="gst-plugins-bad"/>, <xref linkend="gst-plugins-good"/>
-      and <xref linkend="gst-ffmpeg"/> packages.
-    </para>
-
-    &lfs77_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-plugins-ugly-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-plugins-ugly-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-plugins-ugly-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-plugins-ugly-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-plugins-ugly-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-plugins-ugly-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gst-plugins-ugly-&gst-plugins-ugly-version;-libcdio_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Ugly Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lame"/>,
-      <xref linkend="libdvdnav"/> and
-      <xref linkend="libdvdread"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="liba52"/>,
-      <xref linkend="libcdio"/>,
-      <xref linkend="libmad"/>,
-      <xref linkend="libmpeg2"/>,
-      <xref linkend="x264"/>,
-      <ulink url="http://packages.debian.org/source/sid/libsidplay">libsidplay</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore AMR</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>, and
-      <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
-    <para>
-      <xref linkend="valgrind"/>
-    </para>
-
-    <bridgehead renderas="sect4">
-      Optional (Required to Rebuild the API Documentation)
-    </bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gst-plugins-ugly"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Ugly Plug-ins</title>
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-      needs to be installed before this application.
-    </para></note>
-
-    <para>
-      Install <application>GStreamer Ugly Plug-ins</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gst-plugins-ugly-&gst-plugins-ugly-version;-libcdio_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the unit regression tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not rebuild the API documentation by passing
-      <option>--enable-gtk-doc</option> to the <command>configure</command>
-      script and you wish to install the pre-built documentation, issue the
-      following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make -C docs/plugins install-data</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/gst-plugins-ugly-plugins-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/gstreamer.xml
===================================================================
--- archive/gstreamer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,331 +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 gstreamer-download-http "&gnome-download-http;/gstreamer/0.10/gstreamer-&gstreamer-version;.tar.xz">
-  <!ENTITY gstreamer-download-ftp  "&gnome-download-ftp;/gstreamer/0.10/gstreamer-&gstreamer-version;.tar.xz">
-  <!ENTITY gstreamer-md5sum        "15389c73e091b1dda915279c388b9cb2">
-  <!ENTITY gstreamer-size          "2.9 MB">
-  <!ENTITY gstreamer-buildsize     "90 MB">
-  <!ENTITY gstreamer-time          "1.2 SBU">
-]>
-
-<sect1 id="gstreamer" xreflabel="GStreamer-&gstreamer-version;">
-  <?dbhtml filename="gstreamer.html"?>
-
-
-  <title>GStreamer-&gstreamer-version;</title>
-
-  <indexterm zone="gstreamer">
-    <primary sortas="a-GStreamer">GStreamer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer</title>
-<!--
-    <para>
-      <application>GStreamer</application> is a streaming media framework that
-      enables applications to share a common set of plugins for things like
-      video decoding and encoding, audio encoding and decoding, audio and video
-      filters, audio visualisation, Web streaming and anything else that streams
-      in real-time or otherwise. It is modelled after research software worked
-      on at the Oregon Graduate Institute. After installing
-      <application>GStreamer</application>, you'll likely need to install one or
-      more of the <xref linkend="gst-plugins-bad"/>,
-      <xref linkend="gst-plugins-good"/>, <xref linkend="gst-plugins-ugly"/> and
-      <xref linkend="gst-ffmpeg"/> packages.
-    </para>
--->
-    &lfs77_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gstreamer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gstreamer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gstreamer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gstreamer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gstreamer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gstreamer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gsl"/>,
-      <xref linkend="valgrind"/>
-      (optionally used during the unit regression tests)
-    </para>
-
-    <bridgehead renderas="sect4">
-      Optional (Required to rebuild the API Documentation)
-    </bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required to Build Manuals)</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gs"/>
-      <xref linkend="libxslt"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gstreamer"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer</title>
-
-    <para>
-      Install <application>GStreamer</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i  -e '/YYLEX_PARAM/d'                                       \
-        -e '/parse-param.*scanner/i %lex-param { void *scanner }' \
-            gst/parse/grammar.y &amp;&amp;
-
-./configure --prefix=/usr \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. There are
-      many other <filename>Makefile</filename> targets you can specify for
-      running the tests, issue <command>make -C tests/check help</command>
-      to see the complete list.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/gstreamer-0.10/design &amp;&amp;
-install -v -m644 docs/design/*.txt \
-                    /usr/share/doc/gstreamer-0.10/design &amp;&amp;
-
-if [ -d /usr/share/doc/gstreamer-0.10/faq/html ]; then
-    chown -v -R root:root \
-        /usr/share/doc/gstreamer-0.10/*/html
-fi</userinput></screen>
-
-    <sect3>
-      <title>Testing the Installation</title>
-
-      <para>
-        To test the functionality of the
-        <application>GStreamer</application> installation, you can run a
-        simple test as an unprivileged user (you may have to run
-        <command>ldconfig</command> as the
-        <systemitem class="username">root</systemitem> user before
-        attempting the test).
-      </para>
-
-<screen><userinput>gst-launch -v fakesrc num_buffers=5 ! fakesink</userinput></screen>
-
-      <para>
-        If the command outputs a series of messages from fakesrc and
-        fakesink, everything is okay.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... gst/parse/grammar.y</command>: This command corrects
-      a problem caused by the most recent version of Bison.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--enable-docbook</option>: This parameter is used to build
-      HTML, PDF and PostScript versions of the
-      <application>GStreamer</application> User's Manual, FAQ and Writer's
-      Guide. Note that you must have all the listed dependencies installed.
-    </para>
-
-    <para>
-      <command>chown -v -R root:root ...</command>: The documentation is
-      installed with the ownership of the user who untarred and built the
-      package. This command changes the ownership of the installed
-      documentation files to root:root, and is only executed if the
-      documentation files were built and installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gst-feedback, gst-feedback-0.10, gst-inspect, gst-inspect-0.10,
-          gst-launch, gst-launch-0.10, gst-typefind, gst-typefind-0.10,
-          gst-xmlinspect, gst-xmlinspect-0.10, gst-xmllaunch and
-          gst-xmllaunch-0.10
-        </seg>
-        <seg>
-          libgstbase-0.10.so, libgstcheck-0.10.so, libgstcontroller-0.10.so,
-          libgstdataprotocol-0.10.so, libgstnet-0.10.so and
-          libgstreamer-0.10.so
-        </seg>
-        <seg>
-          /usr/include/gstreamer-0.10,
-          /usr/lib/gstreamer-0.10,
-          /usr/libexec/gstreamer-0.10,
-          /usr/share/gtk-doc/html/gstreamer-0.10,
-          /usr/share/gtk-doc/html/gstreamer-libs-0.10 and
-          /usr/share/gtk-doc/html/gstreamer-plugins-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gst-feedback">
-        <term><command>gst-feedback-0.10</command></term>
-        <listitem>
-          <para>
-            generates debug info for <application>GStreamer</application>
-            bug reports.
-          </para>
-          <indexterm zone="gstreamer gst-feedback">
-            <primary sortas="b-gst-feedback">gst-feedback-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-inspect">
-        <term><command>gst-inspect-0.10</command></term>
-        <listitem>
-          <para>
-            prints information about a
-            <application>GStreamer</application> plugin or element.
-          </para>
-          <indexterm zone="gstreamer gst-inspect">
-            <primary sortas="b-gst-inspect">gst-inspect-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-launch">
-        <term><command>gst-launch-0.10</command></term>
-        <listitem>
-          <para>
-            is a tool that builds and runs basic
-            <application>GStreamer</application> pipelines.
-          </para>
-          <indexterm zone="gstreamer gst-launch">
-            <primary sortas="b-gst-launch">gst-launch-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-typefind">
-        <term><command>gst-typefind-0.10</command></term>
-        <listitem>
-          <para>
-            uses the <application>GStreamer</application> type finding system
-            to determine the relevant <application>GStreamer</application>
-            plugin to parse or decode a file, and determine the corresponding
-            MIME type.
-          </para>
-          <indexterm zone="gstreamer gst-typefind">
-            <primary sortas="b-gst-typefind">gst-typefind-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-xmlinspect">
-        <term><command>gst-xmlinspect-0.10</command></term>
-        <listitem>
-          <para>
-            prints information about a <application>GStreamer</application>
-            plugin or element in XML document format.
-          </para>
-          <indexterm zone="gstreamer gst-xmlinspect">
-            <primary sortas="b-gst-xmlinspect">gst-xmlinspect-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-xmllaunch">
-        <term><command>gst-xmllaunch-0.10</command></term>
-        <listitem>
-          <para>
-            is used to build and run a basic <application>GStreamer</application>
-            pipeline, loading it from an XML description.
-          </para>
-          <indexterm zone="gstreamer gst-xmllaunch">
-            <primary sortas="b-gst-xmllaunch">gst-xmllaunch-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gsview.xml
===================================================================
--- archive/gsview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +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 gsview-download-http "http://gd.tuwien.ac.at/publishing/ghostscript/ghostgum/gsview-&gsview-version;.tar.gz">
-  <!ENTITY gsview-download-ftp  " ">
-  <!-- <!ENTITY gsview-download-ftp  "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-&gsview-version;.tar.gz"> -->
-  <!ENTITY gsview-md5sum        "21c81819af0eeb42ac5ee6499f4a7116">
-  <!ENTITY gsview-size          "931 KB">
-  <!ENTITY gsview-buildsize     "11.4 MB">
-  <!ENTITY gsview-time          "0.1 SBU">
-]>
-
-<sect1 id="gsview" xreflabel="GSview-&gsview-version;">
-  <?dbhtml filename="gsview.html"?>
-
-
-  <title>GSview-&gsview-version;</title>
-
-  <indexterm zone="gsview">
-    <primary sortas="a-GSview">GSview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GSview</title>
-
-    <para><application>GSview</application> is a viewer for PostScript
-    and PDF using <application>X</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gsview-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gsview-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gsview-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gsview-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gsview-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gsview-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/gsview-&gsview-version;-pstotext-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GSview Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GTK"/>, and
-    <xref linkend="gs"/><!-- or <xref linkend="espgs"/> --></para>
-
-    <para>Note that you must build the shared
-    <filename class="libraryfile">libgs.so</filename> library during the
-    Ghostscript installation else the <command>gsview</command> program will
-    fail at run-time.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gsview"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GSview</title>
-
-    <para><application>GSview</application> uses <command>netscape</command>
-    to browse through the online help. BLFS does not install
-    <application>Netscape</application>, but has other browsers from which to
-    choose. You can create a symlink from your preferred browser to
-    <command>/usr/bin/netscape</command>, or simply edit
-    <filename>srcunx/gvxreg.c</filename> using the following <command>sed</command>
-    script with your browser's executable file name
-    substituted for <replaceable>&lt;browser&gt;</replaceable>:</para>
-
-<screen><userinput>sed -i 's:netscape:<replaceable>&lt;browser&gt;</replaceable>:' srcunx/gvxreg.c</userinput></screen>
-
-    <!-- Pending investigation as to whether or not this is necessary for GPL
-         Ghostscript.
-
-    <para>The <application>GSview</application> package has not been updated in
-    quite a while and does not accommodate the recent versions of the
-    <application>ESP Ghostscript</application> package. If you installed
-    <xref linkend="espgs"/> as your Ghostscript application, you must modify
-    the maximum version of Ghostscript allowed. Make the modification using
-    the following command: </para>
-
-<screen><userinput>sed -i 's:999:99999:' src/gvcver.h</userinput></screen> -->
-
-    <para>Install <application>GSview</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../gsview-&gsview-version;-pstotext-1.patch &amp;&amp;
-sed 's:/local::' srcunx/unx.mak &gt; Makefile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed 's:/local::' srcunx/unx.mak &gt; Makefile</command>:
-    This command changes the default installation directory to
-    <filename class="directory">/usr</filename> during the creation of the
-    <filename>Makefile</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GSview</title>
-
-    <sect3 id="gsview-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/gsview/*</filename></para>
-
-      <indexterm zone="gsview gsview-config">
-        <primary sortas="e-etc-gsview">/etc/gsview/*</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gsview and gsview-help</seg>
-        <seg>None</seg>
-        <seg>/etc/gsview and /usr/share/doc/gsview-&gsview-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsview-prog">
-        <term><command>gsview</command></term>
-        <listitem>
-          <para>is a viewer for PostScript (PS) and PDF files.</para>
-          <indexterm zone="gsview gsview-prog">
-            <primary sortas="b-gsview">gsview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsview-help">
-        <term><command>gsview-help</command></term>
-        <listitem>
-          <para>is a script for displaying help files in your chosen
-          browser.</para>
-          <indexterm zone="gsview gsview-help">
-            <primary sortas="b-gsview-help">gsview-help</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gtk-xfce-engine.xml
===================================================================
--- archive/gtk-xfce-engine.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +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 gtk-xfce-engine-download-http
-           "http://archive.xfce.org/src/archive/gtk-xfce-engine/3.2/gtk-xfce-engine-&gtk-xfce-engine-version;.tar.bz2">
-  <!ENTITY gtk-xfce-engine-download-ftp  " ">
-  <!ENTITY gtk-xfce-engine-md5sum        "363d6c16a48a00e26d45c45c2e1fd739">
-  <!ENTITY gtk-xfce-engine-size          "368 KB">
-  <!ENTITY gtk-xfce-engine-buildsize     "7.0 MB">
-  <!ENTITY gtk-xfce-engine-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gtk-xfce-engine" xreflabel="gtk-xfce-engine-&gtk-xfce-engine-version;">
-  <?dbhtml filename="gtk-xfce-engine.html"?>
-
-
-  <title>gtk-xfce-engine-&gtk-xfce-engine-version;</title>
-
-  <indexterm zone="gtk-xfce-engine">
-    <primary sortas="a-gtk-xfce-engine">gtk-xfce-engine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK Xfce Engine</title>
-
-    <para>
-      The <application>GTK Xfce Engine</application> package contains several
-      <application>GTK+ 2</application> and <application>GTK+ 3</application>
-      themes and libraries needed to display them.
-      This is useful for customising the appearance of your
-      <application>Xfce</application> desktop.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-xfce-engine-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-xfce-engine-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-xfce-engine-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-xfce-engine-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-xfce-engine-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-xfce-engine-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK Xfce Engine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtk-xfce-engine"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK Xfce Engine</title>
-
-    <para>
-      Install <application>GTK Xfce Engine</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's/\xd6/\xc3\x96/' gtk-3.0/xfce_style_types.h &amp;&amp;
-./configure --prefix=/usr --enable-gtk3              &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/\xd6/\xc3\x96/' ...</command>: The script
-      <command>glib-mkenums</command> has now been rewritten from
-      <application>perl</application> to <application>python</application>
-      and will crash when it encounters an ISO-8859-1 character in a comment.
-      This sed converts that character to UTF-8.
-    </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>
-          libxfce.so (in /usr/lib/gtk-&gtk2-libdir;/engines,
-          /usr/lib/gtk-3.0/3.0.0/theming-engines), and
-          /usr/share/themes/Xfce* (21 variations)
-        </seg>
-        <seg>
-          Xfce, Xfce-4.0, Xfce-4.2, Xfce-4.4, Xfce-4.6, Xfce-b5, Xfce-basic,
-          Xfce-cadmium, Xfce-curve, Xfce-dawn, Xfce-dusk, Xfce-kde2,
-          Xfce-kolors, Xfce-light, Xfce-orange, Xfce-redmondxp, Xfce-saltlake,
-          Xfce-smooth, Xfce-stellar, Xfce-winter in /usr/share/themes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxfce">
-        <term><filename class="libraryfile">libxfce.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow <application>Xfce</application> to
-            apply and change <application>GTK+ 2</application> and
-            <application>GTK+ 3</application> themes.
-          </para>
-          <indexterm zone="gtk-xfce-engine libxfce">
-            <primary sortas="c-libxfce">libxfce.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gtkhtml.xml
===================================================================
--- archive/gtkhtml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +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 gtkhtml-download-http "&gnome-download-http;/gtkhtml/4.10/gtkhtml-&gtkhtml-version;.tar.xz">
-  <!ENTITY gtkhtml-download-ftp  "&gnome-download-http;/gtkhtml/4.10/gtkhtml-&gtkhtml-version;.tar.xz">
-  <!ENTITY gtkhtml-md5sum        "a8538daed73de3fb5c7747d05139ef79">
-  <!ENTITY gtkhtml-size          "1.0 MB">
-  <!ENTITY gtkhtml-buildsize     "46 MB">
-  <!ENTITY gtkhtml-time          "0.5 SBU">
-]>
-
-<sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;" revision="systemd">
-  <?dbhtml filename="gtkhtml.html"?>
-
-
-  <title>GtkHTML-&gtkhtml-version;</title>
-
-  <indexterm zone="gtkhtml">
-    <primary sortas="a-GtkHTML">GtkHTML</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkHTML</title>
-
-    <para>
-      The <application>GtkHTML</application> package contains a
-      lightweight HTML rendering/printing/editing engine.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkhtml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkhtml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkhtml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkhtml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkhtml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkhtml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkHTML Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="enchant"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="iso-codes"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://glade.gnome.org/">Glade</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gtkhtml"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkHTML</title>
-
-    <para>
-      Fix a build issue with <xref linkend="enchant"/>:
-    </para>
-
-<screen><userinput>sed 's@pwl@session@' -i components/editor/gtkhtml-spell-checker.c</userinput></screen>
-
-    <para>
-      Install <application>GtkHTML</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtkhtml-editor-test
-        </seg>
-        <seg>
-          libgtkhtml-4.0.so and libgtkhtml-editor-4.0.so
-        </seg>
-        <seg>
-          /usr/include/libgtkhtml-4.0 and
-          /usr/share/gtkhtml-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtkhtml-editor-test">
-        <term><command>gtkhtml-editor-test</command></term>
-        <listitem>
-          <para>
-            is a simple HTML editor widget.
-          </para>
-          <indexterm zone="gtkhtml gtkhtml-editor-test">
-            <primary sortas="b-gtkhtml-editor-test">gtkhtml-editor-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkhtml-4">
-        <term><filename class="libraryfile">libgtkhtml-4.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to render HTML within applications.
-          </para>
-          <indexterm zone="gtkhtml libgtkhtml-4">
-            <primary sortas="c-libgtkhtml-4">libgtkhtml-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gtkmm2.xml
===================================================================
--- archive/gtkmm2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +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 gtkmm2-download-http "&gnome-download-http;/gtkmm/2.24/gtkmm-&gtkmm2-version;.tar.xz">
-  <!ENTITY gtkmm2-download-ftp  "&gnome-download-ftp;/gtkmm/2.24/gtkmm-&gtkmm2-version;.tar.xz">
-  <!ENTITY gtkmm2-md5sum        "6c59ae8bbff48fad9132f23af347acf1">
-  <!ENTITY gtkmm2-size          "11 MB">
-  <!ENTITY gtkmm2-buildsize     "426 MB (with tests)">
-  <!ENTITY gtkmm2-time          "3.4 SBU (with tests)">
-]>
-
-<sect1 id="gtkmm2" xreflabel="Gtkmm-&gtkmm2-version;">
-  <?dbhtml filename="gtkmm2.html"?>
-
-
-  <title>Gtkmm-&gtkmm2-version;</title>
-
-  <indexterm zone="gtkmm2">
-    <primary sortas="a-gtkmm2">gtkmm2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtkmm</title>
-
-    <para>
-      The <application>Gtkmm</application> package provides a C++ interface to
-      <application>GTK+ 2</application>. It can be installed alongside
-      <xref linkend="gtkmm3"/> (the <application>GTK+ 3</application> version)
-      with no namespace conflicts.
-    </para>
-
-    &lfs111_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkmm2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkmm2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkmm2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkmm2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkmm2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkmm2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atkmm"/>,
-      <xref linkend="gtk2"/> and
-      <xref linkend="pangomm"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtkmm2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtkmm</title>
-
-    <para>
-      First, fix the documents directory name:
-    </para>
-
-<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/gtkmm-&gtkmm2-version;/' \
-    -i docs/Makefile.in</userinput></screen>
-
-    <para>
-      Install <application>Gtkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgdkmm-2.4.so and libgtkmm-2.4.so
-        </seg>
-        <seg>
-          /usr/include/gdkmm-2.4,
-          /usr/include/gtkmm-2.4,
-          /usr/lib/gdkmm-2.4,
-          /usr/lib/gtkmm-2.4, and
-          /usr/share/{devhelp/books/gtkmm-2.4,doc/gtkmm-&gtkmm2-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdkmm-2">
-        <term><filename class="libraryfile">libgdkmm-2.4.so</filename></term>
-        <listitem>
-        <para>
-          contains the GDK API classes
-        </para>
-          <indexterm zone="gtkmm2 libgdkmm-2">
-            <primary sortas="c-libgdkmm-2">libgdkmm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkmm-2">
-        <term><filename class="libraryfile">libgtkmm-2.4.so</filename></term>
-        <listitem>
-        <para>
-          contains the <application>GTK+</application> API classes
-        </para>
-          <indexterm zone="gtkmm2 libgtkmm-2">
-            <primary sortas="c-libgtkmm-2">libgtkmm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gtksourceview2.xml
===================================================================
--- archive/gtksourceview2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 gtksourceview2-download-http
-           "&gnome-download-http;/gtksourceview/2.10/gtksourceview-&gtksourceview2-version;.tar.gz">
-  <!ENTITY gtksourceview2-download-ftp
-           "&gnome-download-ftp;/gtksourceview/2.10/gtksourceview-&gtksourceview2-version;.tar.gz">
-  <!ENTITY gtksourceview2-md5sum        "220db5518e3f7fa06c980f057b22ba62">
-  <!ENTITY gtksourceview2-size          "2.0 MB">
-  <!ENTITY gtksourceview2-buildsize     "31 MB">
-  <!ENTITY gtksourceview2-time          "0.3 SBU">
-]>
-
-<sect1 id="gtksourceview2" xreflabel="gtksourceview-&gtksourceview2-version;">
-  <?dbhtml filename="gtksourceview2.html"?>
-
-
-  <title>gtksourceview-&gtksourceview2-version;</title>
-
-  <indexterm zone="gtksourceview2">
-    <primary sortas="a-gtksourceview">gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+ 2</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs77_checked; &gcc5_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </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;/gtksourceview2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgtksourceview-2.0.so
-        </seg>
-        <seg>
-          /usr/include/gtksourceview-2.0,
-          /usr/share/gtk-doc/html/gtksourceview-2.0 and
-          /usr/share/gtksourceview-2.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-2">
-        <term><filename class="libraryfile">libgtksourceview-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget.
-          </para>
-          <indexterm zone="gtksourceview2 libgtksourceview-2">
-            <primary sortas="c-libgtksourceview-2">libgtksourceview-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gvolwheel.xml
===================================================================
--- archive/gvolwheel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +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 gvolwheel-download-http "&sourceforge-repo;/gvolwheel/gvolwheel-&gvolwheel-version;.tar.gz">
-  <!ENTITY gvolwheel-download-ftp  "">
-  <!ENTITY gvolwheel-md5sum        "4f04f00cdb875894c96b8a3ff8a9edb9">
-  <!ENTITY gvolwheel-size          "340 KB">
-  <!ENTITY gvolwheel-buildsize     "2.8 MB">
-  <!ENTITY gvolwheel-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gvolwheel" xreflabel="gvolwheel-&gvolwheel-version;">
-  <?dbhtml filename="gvolwheel.html"?>
-
-
-  <title>gvolwheel-&gvolwheel-version;</title>
-
-  <indexterm zone="gvolwheel">
-    <primary sortas="a-gvolwheel">gvolwheel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gvolwheel</title>
-
-    <para>
-      The <application>Gvolwheel</application> package provides a lightweight
-      volume control with a tray icon.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gvolwheel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gvolwheel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gvolwheel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gvolwheel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gvolwheel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gvolwheel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gvolwheel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-utils"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="perl-xml-parser"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gvolwheel"/>
-    </para>
-  </sect2>
-
-  <sect2 role="kernel"  id="gvolwheel-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      In the Device Drivers &rArr; Sound card support &rArr; Advanced Linux
-      Sound Architecture section of the kernel configuration, ensure that OSS Mixer
-      API (CONFIG_SND_MIXER_OSS) is selected. If necessary, recompile and install
-      your new kernel.
-    </para>
-
-    <indexterm zone="gvolwheel gvolwheel-kernel">
-      <primary sortas="d-gvolwheel">gvolwheel</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gvolwheel</title>
-
-    <para>
-      Install <application>Gvolwheel</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' Makefile.in &amp;&amp;
-./configure --prefix=/usr --enable-oss &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' ...</command>:
-      This ensures that the documentation into a versioned directory.
-    </para>
-
-    <para>
-      <parameter>--enable-oss</parameter>: without this, the program will not
-      run unless <command>alsamixer</command> has been run.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuring gvolwheel">
-    <title>Configuring Gvolwheel</title>
-
-    <para>
-      Before using this application, use <command>alsamixer</command> to
-      ensure the channels are not muted, and are set to suitable levels so
-      that the master volume control will provide suitable levels. Once
-      <command>gvolwheel</command> is running you can, if you wish,
-      right-click on its icon in the tray to change it to control the PCM
-      volume instead of the  master volume. Depending on your theme settings,
-      you may also wish to tick &quot;Use Gnome Icons&quot;.
-    </para>
-
-    <para>
-      If you middle-click on the icon, it will mute the volume, that is, it
-      will set it to zero : do not confuse this with the mute/unmute controls in
-      e.g. <command>alsamixer</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gvolwheel
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/gvolwheel-&gvolwheel-version; and
-          /usr/share/pixmaps/gvolwheel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gvolwheel-prog">
-        <term><command>gvolwheel</command></term>
-        <listitem>
-          <para>
-            is a lightweight volume control that sits in a tray.
-          </para>
-          <indexterm zone="gvolwheel gvolwheel">
-            <primary sortas="b-gvolwheel">gvolwheel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gwrap.xml
===================================================================
--- archive/gwrap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +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 gwrap-download-http "http://www.gnucash.org/pub/g-wrap/source/g-wrap-&gwrap-version;.tar.gz">
-  <!ENTITY gwrap-download-ftp  "&gentoo-ftp-repo;/g-wrap-&gwrap-version;.tar.gz">
-  <!ENTITY gwrap-md5sum        "bf29b8b563cc27d9f7fd90a6243653aa">
-  <!ENTITY gwrap-size          "403 KB">
-  <!ENTITY gwrap-buildsize     "6.0 MB">
-  <!ENTITY gwrap-time          "0.2 SBU">
-]>
-
-<sect1 id="gwrap" xreflabel="G-Wrap-&gwrap-version;">
-  <?dbhtml filename="gwrap.html"?>
-
-
-  <title>G-Wrap-&gwrap-version;</title>
-
-  <indexterm zone="gwrap">
-    <primary sortas="a-G-Wrap">G-Wrap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to G-Wrap</title>
-
-    <para>The <application>G-Wrap</application> package contains tools for
-    exporting <application>C</application> libraries into
-    <application>Scheme</application> interpreters.</para>
-
-    <!-- The version used here is
-    considered a development version, however it has been confirmed to be a
-    reliable replacement for the 'stable' version. The 'stable' version of
-    <application>G-Wrap</application> will not build against the recent
-    versions of <application>Guile</application> and
-    <application>SLIB</application> and there will be no further development
-    in the 'stable' series. For further information, please visit the
-    <application>G-Wrap</application> homepage at
-    <ulink url="http://www.nongnu.org/g-wrap/"/>.</para> -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gwrap-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gwrap-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gwrap-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gwrap-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gwrap-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gwrap-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">G-Wrap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="slib"/> and
-    <xref linkend="GLib"/></para>
-
-    <!-- <para>If you are building <application>G-Wrap</application> as a dependency
-    for <application>GnuCash</application>, ensure you have
-    <application>GLib</application>-1 installed and you pass the
-    <envar>GLIB_XXX</envar> environment variables to the
-    <command>configure</command> script as shown below.</para> -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink
-    url="http://www.gnu.org/software/guile-gtk/">guile-gtk</ulink> and
-    <xref linkend="libffi"/> or <xref linkend="gcc"/> (build Java so that
-    <filename class='libraryfile'>libffi</filename> is built)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gwrap"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of G-Wrap</title>
-
-    <para>Install <application>G-Wrap</application> by running the following
-    commands:</para>
-
-<!-- <screen><userinput>GLIB_CFLAGS=$(glib-config -\-cflags) \
-GLIB_LIBS=$(glib-config -\-libs) \ -->
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="texlive"/> installed and wish to create
-    alternate formats of the documentation, issue the following
-    commands:</para>
-
-<screen><userinput>cd doc &amp;&amp;
-texi2pdf g-wrap.texi &amp;&amp;
-texi2html g-wrap.texi &amp;&amp;
-makeinfo --plaintext -o g-wrap.txt g-wrap.texi &amp;&amp;
-mv texinfo.tex texinfo.tex.SAVE &amp;&amp;
-texi2dvi g-wrap.texi &amp;&amp;
-dvips -o g-wrap.ps g-wrap.dvi &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>If you created the alternate formats of the documentation, install
-    it using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/g-wrap-&gwrap-version; &amp;&amp;
-install -v -m644 doc/g-wrap.{pdf,html,txt,dvi,ps} \
-                 /usr/share/doc/g-wrap-&gwrap-version;</userinput></screen>
-  </sect2>
-
-  <!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>GLIB_CFLAGS=$(glib-config ...) GLIB_LIBS=$(glib-config ...)
-    ./configure ...</command>: The <command>configure</command> script does
-    not pull in the proper <application>GLib</application>-1
-    <envar>CFLAGS</envar> and <envar>LIBS</envar> parameters so
-    <command>glib-config</command> is used to set them. Omit setting them like
-    this if you are not building <application>G-Wrap</application> as a
-    dependency for <application>GnuCash</application> and only issue the
-    <command>./configure</command> command instead.</para>
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>g-wrap-config</seg>
-        <seg>libgw-glib.{so,a}, libgw-gtk.{so,a}, libgw-standard.{so,a},
-        libgw-wct.{so,a}, libgwrap-glib.{so,a} and libgwrap-wct.{so,a}</seg>
-        <!-- <seg>/usr/lib/libffi.{so,a}, /usr/lib/libgw-guile-*.{so,a} and
-        /usr/lib/libgwrap-*.{so,a}</seg> -->
-        <seg>/usr/include/g-wrap, /usr/share/doc/g-wrap-&gwrap-version; and
-        /usr/share/guile/site</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="g-wrap-config">
-        <term><command>g-wrap-config</command></term>
-        <listitem>
-          <para>is a tool to generate <envar>CFLAGS</envar> for linking
-          <application>C</application> code to the
-          <application>Scheme</application> runtime libraries.</para>
-          <indexterm zone="gwrap g-wrap-config">
-            <primary sortas="b-g-wrap-config">g-wrap-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/hal.xml
===================================================================
--- archive/hal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,602 +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 hal-download-http      "http://hal.freedesktop.org/releases/hal-&hal-version;.tar.bz2">
-  <!ENTITY hal-download-ftp       " ">
-  <!ENTITY hal-md5sum             "c627d8fb0f9afff94f3c687b5216bc06">
-  <!ENTITY hal-size               "924 KB">
-  <!ENTITY hal-buildsize          "25 MB">
-  <!ENTITY hal-time               "0.5 SBU">
-
-  <!ENTITY hal-info-version       "20091130">
-  <!ENTITY hal-info-download-http "http://hal.freedesktop.org/releases/hal-info-&hal-info-version;.tar.bz2">
-  <!ENTITY hal-info-download-ftp  " ">
-  <!ENTITY hal-info-md5sum        "995b8d2dbfb0646b07c92bb8d23cbcf1">
-  <!ENTITY hal-info-size          "108 KB">
-]>
-
-<sect1 id="hal" xreflabel="HAL-&hal-version;">
-  <?dbhtml filename="hal.html"?>
-
-
-  <title>HAL-&hal-version;</title>
-
-  <indexterm zone="hal">
-    <primary sortas="a-HAL">HAL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to HAL</title>
-
-    <para><application>HAL</application> is a hardware abstraction layer, which
-    is a piece of software that provides a view of the various hardware
-    attached to a system. In addition to this, <application>HAL</application>
-    keeps detailed metadata for each piece of hardware and provides hooks such
-    that system and desktop-level software can react to changes in the hardware
-    configuration in order to maintain system policy.</para>
-
-    <para>The most important goal of <application>HAL</application> is to
-    provide plug-and-play facilities for UNIX-like desktops with focus on
-    providing a rich and extensible description of device characteristics and
-    features. One example of the functionality provided by
-    <application>HAL</application> is when you plug in a USB storage device.
-    <application>HAL</application> can automatically create a mount point in
-    <filename class="directory">/media</filename> and mount the device.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&hal-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&hal-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &hal-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &hal-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &hal-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &hal-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Package Download</bridgehead>
-    <itemizedlist spacing='compact'>
-      <title>Required Hardware Data</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&hal-info-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&hal-info-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &hal-info-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &hal-info-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">HAL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pciutils"/>
-    (with a current <filename>pci.ids</filename> file) and
-    <xref linkend="usbutils"/>
-    (with a current <filename>usb.ids</filename> file)</para>
-
-    <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
-    <para role="optional"><xref linkend="xmlto"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>,
-    <xref linkend="acl"/>,
-    <xref linkend="gperf"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/PolicyKit">PolicyKit</ulink>,
-    <xref linkend="consolekit"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="parted"/>, and
-    <ulink url="https://fedorahosted.org/libsmbios/">libsmbios</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/hal"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of HAL</title>
-
-    <para>You must create a dedicated user and group before installing the
-    package. Though the default BLFS instructions run the
-    <application>HAL</application> daemon as the
-    <systemitem class="username">root</systemitem> user, a configuration file
-    is installed which has the dedicated user's name hard-coded in it. This
-    causes a confusing message to be generated when starting the
-    <application>D-BUS</application> daemon. Issue the following commands as
-    the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -fg 19 haldaemon &amp;&amp;
-useradd -c "HAL Daemon User" -d /dev/null -u 19 \
-        -g haldaemon -s /bin/false haldaemon || [ $? == 9 ]</userinput></screen>
-
-    <para>Install <application>HAL</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/hal \
-            --localstatedir=/var \
-            --docdir=/usr/share/doc/hal-&hal-version; \
-            --enable-policy-kit=no &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>Install the <application>HAL</application> hardware data with the
-    following commands:</para>
-
-<screen><userinput>tar -xf ../hal-info-&hal-info-version;.tar.bz2 &amp;&amp;
-cd hal-info-&hal-info-version; &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc</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>--libexecdir=/usr/lib/hal</parameter>: This parameter
-    forces the installation of libexec files to
-    <filename class='directory'>/usr/lib/hal</filename> instead of
-    <filename class='directory'>/usr/libexec</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This parameter forces
-    the creation of the <filename>pid</filename> file to
-    <filename class='directory'>/var/run/hald</filename> instead of
-    <filename class='directory'>/usr/var/run/hald</filename>.</para>
-
-    <para><parameter>--enable-policy-kit=no</parameter>: This parameter is
-    required if PolicyKit is not installed. Remove it if PolicyKit is
-    installed.</para>
-
-    <para><parameter>--enable-docbook-docs
-    --docdir=/usr/share/doc/hal-&hal-version;</parameter>: If <xref
-    linkend="xmlto"/> is available, these parameters enable the
-    <application>HAL</application> specification documentation to be
-    built.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Run-Time Dependencies</title>
-
-    <para>A few more packages enable more functionality in
-    <application>HAL</application> at run-time.
-    These include <xref linkend="eject"/>, <ulink
-    url="http://www.nongnu.org/dmidecode/">dmidecode</ulink>,
-    <xref linkend="lvm2"/> (device-mapper),
-    <ulink url="http://luks.endorphin.org/dm-crypt">Cryptsetup-LUKS</ulink>, and
-    <ulink url="http://pm-utils.freedesktop.org/wiki/">pm-utils</ulink>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring HAL</title>
-
-    <sect3 id="hal-config">
-      <title>Config Files</title>
-      <para><filename>/etc/dbus-1/system.d/hal.conf</filename>,
-      <filename>/etc/dbus-1/system.d/halusers.conf</filename> and
-      <filename>/etc/hal/*</filename></para>
-
-      <indexterm zone="hal hal-config">
-        <primary sortas="e-etc-dbus-1-system.d-hal.conf">/etc/dbus-1/system.d/hal.conf</primary>
-      </indexterm>
-
-      <indexterm zone="hal hal-config">
-        <primary sortas="e-etc-dbus-1-system.d-halusers.conf">/etc/dbus-1/system.d/halusers.conf</primary>
-      </indexterm>
-
-      <indexterm zone="hal hal-config">
-        <primary sortas="e-etc-hal-star">/etc/hal/*</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-    <sect4><title>Allowing users to invoke HAL methods</title>
-
-      <para>The default setup for <application>HAL</application> is to allow
-      only certain users to invoke methods such as Mount(). These are
-      the <systemitem class="username">root</systemitem> user and the user
-      determined to be at the active console using <ulink
-      url="&blfs-wiki;/linux-pam">pam_console</ulink>. If you are not set
-      up to use <xref linkend="linux-pam"/> and <ulink
-      url="&blfs-wiki;/linux-pam">pam_console</ulink>, create a group that
-      is allowed to invoke <application>HAL</application> methods with the
-      following commands:</para>
-
-<screen role="root"><userinput>groupadd -fg 61 halusers &amp;&amp;
-cat &gt; /etc/dbus-1/system.d/halusers.conf &lt;&lt; "EOF"
-<literal>&lt;!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-&lt;busconfig&gt;
-
- &lt;!-- Allow users in the halusers group invoke HAL methods --&gt;
- &lt;policy group="halusers"&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.Volume"/&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/&gt;
- &lt;/policy&gt;
-
-&lt;/busconfig&gt;</literal>
-EOF</userinput></screen>
-
-      <para>Now add the users you would like to the <systemitem
-      class="groupname">halusers</systemitem> group to use
-      <application>HAL</application>.</para>
-
-<screen role="root"><userinput>usermod -a -G halusers <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <para>Note that these users still need
-      to have appropriate permissions to access the devices that
-      <application>HAL</application> will invoke its methods on.</para>
-
-      <para>With the above configuration in place, authorized users now
-      have the ability to unmount disk partitions mounted at non-standard
-      locations such as <filename class='directory'>/pub</filename>. If
-      you'd like to restrict this policy to only drives which are considered
-      removable or hotpluggable, add the following configuration file as
-      the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/hal/fdi/policy/no-fixed-drives.fdi &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
-
-&lt;!-- Don't allow HAL methods on disks that are not
-     removable or hotpluggable --&gt;
-
-&lt;deviceinfo version="0.2"&gt;
-&lt;device&gt;
-  &lt;match key="@block.storage_device:storage.hotpluggable" bool="false"&gt;
-    &lt;match key="@block.storage_device:storage.removable" bool="false"&gt;
-      &lt;merge key="volume.ignore" type="bool"&gt;true&lt;/merge&gt;
-    &lt;/match&gt;
-  &lt;/match&gt;
-&lt;/device&gt;
-&lt;/deviceinfo&gt;</literal>
-EOF</userinput></screen>
-      </sect4>
-
-      <sect4><title>Installing mount helpers</title>
-      <para><application>HAL</application> only provides the methods such
-      as Mount() to act on hardware. In order to take advantage of these,
-      a <application>HAL</application> event handler such as <ulink
-      url="http://ivman.sourceforge.net/">Ivman</ulink> should be
-      installed.</para>
-      <!-- FIXME: is Ivman still alive? -->
-      <!-- FIXME: explicitly name the mount helpers
-           from KDE (???) and Xfce (exo-mount) -->
-      </sect4>
-
-      <sect4><title>Changing default mount options</title>
-      <para>In some cases, it is necessary to specify some default mount
-      options for filesystems. E.g., in non-English environments, the
-      <option>iocharset</option> and <option>codepage</option> options
-      are needed for filesystems of Windows origin in order to show
-      national characters correctly. Also, due to a
-      <ulink url="https://launchpad.net/bugs/133567">bug</ulink> in the
-      Linux kernel version in LFS (2.6.22.x), you may want to pass the
-      <option>usefree</option> option to vfat filesystems in order to reduce
-      the time needed to determine the amount of free space on the
-      filesystem.</para>
-
-      <para>Google search results for <quote>hal default mount options</quote>
-      are still full of recommendations to create <filename>*.fdi</filename>
-      files mentioning either
-      <option>volume.policy</option> or <option>storage.policy</option> keys.
-      Such recommendations worked for HAL-0.4.x only and are invalid now.
-      For HAL-&hal-version;, mount options are expected to be handled
-      as follows:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>An event handler from the desktop environment receives an
-          event describing the newly-added storage device.</para>
-        </listitem>
-        <listitem>
-          <para>If the storage device is not already mentioned in
-          <filename>/etc/fstab</filename>, mount options are fetched from
-          a database of user preferences, which is specific to the desktop
-          environment, and passed back to HAL.
-          This process can be influenced by the filesystem type
-          and possibly other volume properties available from HAL.</para>
-        </listitem>
-        <listitem>
-          <para>If the options are in the list of permitted ones, HAL
-          mounts the volume.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The important point above is that the configuration procedure is
-      desktop-specific. However, as of December, 2007, only GNOME allows the
-      user to set default mount options on a per-filesystem basis,
-      as described in the next paragraph.
-      KDE allows the mount options to be set only on a per-volume basis,
-      not per-filesystem, which is a
-      <ulink url="http://bugs.kde.org/show_bug.cgi?id=133456">bug</ulink>,
-      because, as mentioned in the report, <quote>for every new device (let's
-      say your friend's USB stick) you have to first not mount it, then change
-      options and then mount</quote>. Xfce, if compiled with HAL support,
-      <ulink url="http://bugzilla.xfce.org/show_bug.cgi?id=2891">hard-codes</ulink>
-      the mount options without any means to override them,
-      which is even worse.
-      <!-- (for BLFS editors only: they mention policy-kit as a future
-           solution, but, from the description, policy-kit looks like
-           an XML-ized sudo-like configuration parser, which has nothing
-           common with the "default mount options" problem. -->
-      In KDE and Xfce, if the built-in default mount options are not suitable,
-      it is needed to mention every possible removable storage device in
-      <filename>/etc/fstab</filename> with the correct options, thus mostly
-      defeating the point of installing HAL.</para>
-
-      <para>In order to adjust the default mount options, GNOME users should
-      change the
-      <systemitem>/system/storage/default_options/[fs_type]/mount_options</systemitem>
-      GConf key <!--either using <xref linkend="gconf-editor"/>, or -->from the
-      command line, as demonstrated in the following example:</para>
-
-<screen><userinput>gconftool-2 --type list --list-type=string \
-    --set /system/storage/default_options/vfat/mount_options \
-    "[shortname=mixed,uid=,usefree,iocharset=koi8-r,codepage=866]"</userinput></screen>
-
-      <para>See more details in the gnome-mount(1) manual page.</para>
-      </sect4>
-
-      <sect4><title>Adding allowed mount options</title>
-      <para>The list of mount options permitted in the default HAL
-      configuration resides in the
-      <filename>/usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi</filename>
-      file. GNOME and KDE users may want to use options not in this
-      list (in the above example, this applies to the <option>usefree</option>
-      option). In this case, as <systemitem class="username">root</systemitem>
-      user, create a custom policy file that mentions unknown mount
-      options:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/hal/fdi/policy/user-options.fdi &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
-
-&lt;!--
-This file is used to set custom options to the HAL policy settings.
-The default policy settings are defined in files contained in the
-/usr/share/hal/fdi/policy subdirectories. User defined customizations
-should be in files contained in the /etc/hal/fdi/policy directory.
---&gt;
-
-&lt;deviceinfo version="0.2"&gt;
-  &lt;device&gt;
-
-    &lt;!-- this is to be able to mount media in drives we cannot poll,
-         e.g. IDE Zip Drives and PC style floppy drives --&gt;
-    &lt;match key="storage.media_check_enabled" bool="false"&gt;
-      &lt;match key="storage.no_partitions_hint" bool="true"&gt;
-        &lt;append key="volume.mount.valid_options" type="strlist"&gt;usefree&lt;/append&gt;
-        &lt;!-- Insert other options here --&gt;
-      &lt;/match&gt;
-    &lt;/match&gt;
-
-    &lt;match key="volume.fsusage" string="filesystem"&gt;
-
-      &lt;!-- allow these mount options for vfat --&gt;
-      &lt;match key="volume.fstype" string="vfat"&gt;
-        &lt;append key="volume.mount.valid_options" type="strlist"&gt;usefree&lt;/append&gt;
-        &lt;!-- Insert other options here --&gt;
-      &lt;/match&gt;
-    &lt;/match&gt;
-
-  &lt;/device&gt;
-&lt;/deviceinfo&gt;</literal>
-EOF</userinput></screen>
-
-    </sect4>
-    </sect3>
-
-    <sect3  id="hal-init">
-      <title>Boot Script</title>
-
-      <para>To automatically start the <command>hald</command> daemon
-      when the system is rebooted, install the
-      <filename>/etc/rc.d/init.d/haldaemon</filename>
-      bootscript from the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="hal hal-init">
-        <primary sortas="f-haldaemon">haldaemon</primary>
-      </indexterm>
-
-      <important>
-        <para>If the system-wide <application>D-BUS</application> daemon was
-        running during the installation of <application>HAL</application>,
-        ensure you stop and restart the <application>D-BUS</application>
-        daemon before attempting to start the <command>hald</command>
-        daemon.</para>
-      </important>
-
-<screen role="root"><userinput>make install-haldaemon</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>hal-device, hal-disable-polling,
-        hal-find-by-capability, hal-find-by-property, hal-get-property,
-        hal-is-caller-locked-out, hal-lock, hal-set-property, hald and
-        lshal</seg>
-        <seg>libhal.{so,a} and libhal-storage,{so,a}</seg>
-        <seg>/etc/hal, /usr/include/hal, /usr/lib/hal,
-        /usr/share/doc/hal-&hal-version;, /usr/share/hal, /var/cache/hald,
-        /var/lib/hal, and /var/run/hald</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hal-device">
-        <term><command>hal-device</command></term>
-        <listitem>
-          <para>is used to create, remove or show a
-          <application>HAL</application> device.</para>
-          <indexterm zone="hal hal-device">
-            <primary sortas="b-hal-device">hal-device</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-disable-polling">
-        <term><command>hal-disable-polling</command></term>
-        <listitem>
-          <para>can be used to to disable and enable media detection on
-          drives with removable storage.</para>
-          <indexterm zone="hal hal-disable-polling">
-            <primary sortas="b-hal-disable-polling">hal-disable-polling</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-find-by-capability">
-        <term><command>hal-find-by-capability</command></term>
-        <listitem>
-          <para>prints the Unique Device Identifiers for
-          <application>HAL</application> device objects of a given
-          capability.</para>
-          <indexterm zone="hal hal-find-by-capability">
-            <primary sortas="b-hal-find-by-capability">hal-find-by-capability</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-find-by-property">
-        <term><command>hal-find-by-property</command></term>
-        <listitem>
-          <para>prints the Unique Device Identifiers for
-          <application>HAL</application> device objects where a given property
-          assumes a given value.</para>
-          <indexterm zone="hal hal-find-by-property">
-            <primary sortas="b-hal-find-by-property">hal-find-by-property</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-get-property">
-        <term><command>hal-get-property</command></term>
-        <listitem>
-          <para>retrieves a property from a device.</para>
-          <indexterm zone="hal hal-get-property">
-            <primary sortas="b-hal-get-property">hal-get-property</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-set-property">
-        <term><command>hal-set-property</command></term>
-        <listitem>
-          <para>attempts to set property for a device. Note that, due to
-          security considerations, it may not be possible to set a
-          property.</para>
-          <indexterm zone="hal hal-set-property">
-            <primary sortas="b-hal-set-property">hal-set-property</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-is-caller-locked-out">
-        <term><command>hal-is-caller-locked-out</command></term>
-        <listitem>
-          <para>determines if a specific caller is locked out of a specific
-          <application>D-Bus</application> interface on a specific device.</para>
-          <indexterm zone="hal hal-is-caller-locked-out">
-            <primary sortas="b-hal-is-caller-locked-out">hal-is-caller-locked-out</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hald">
-        <term><command>hald</command></term>
-        <listitem>
-          <para>is the <application>HAL</application> daemon program.</para>
-          <indexterm zone="hal hald">
-            <primary sortas="b-hald">hald</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lshal">
-        <term><command>lshal</command></term>
-        <listitem>
-          <para>shows all devices and their properties. If the --monitor option
-          is given then the device list and all devices are monitored for
-          changes.</para>
-          <indexterm zone="hal lshal">
-            <primary sortas="b-lshal">lshal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhal">
-        <term><filename class='libraryfile'>libhal.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions required by the
-          <application>HAL</application> programs.</para>
-          <indexterm zone="hal libhal">
-            <primary sortas="c-libhal">libhal.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhal-storage">
-        <term><filename class='libraryfile'>libhal-storage.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions required by the
-          <application>HAL</application> storage and volume utility
-          programs.</para>
-          <indexterm zone="hal libhal-storage">
-            <primary sortas="c-libhal-storage">libhal-storage.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/haveged.xml
===================================================================
--- archive/haveged.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 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-size          "488 KB">
-  <!ENTITY haveged-buildsize     "21 MB (with tests)">
-  <!ENTITY haveged-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="haveged" xreflabel="Haveged-&haveged-version;">
-  <?dbhtml filename="haveged.html"?>
-
-
-  <title>Haveged-&haveged-version;</title>
-
-  <indexterm zone="haveged">
-    <primary sortas="a-Haveged">Haveged</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Haveged</title>
-
-    <para>
-      The <application>Haveged</application> package contains a daemon
-      that generates an unpredictable stream of random numbers
-      and feeds the /dev/random device.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&haveged-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&haveged-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &haveged-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &haveged-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &haveged-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &haveged-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/haveged"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Haveged</title>
-
-    <para>
-      Install <application>Haveged</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mkdir -pv    /usr/share/doc/haveged-&haveged-version; &amp;&amp;
-cp -v README /usr/share/doc/haveged-&haveged-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring haveged</title>
-
-    <sect3  id="haveged-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want the <application>Haveged</application> daemon to
-        start automatically when the system is booted, install the
-        <filename>/etc/rc.d/init.d/haveged</filename> init script included
-        in the <xref linkend="bootscripts"/> package (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-      <para revision="systemd">
-        If you want the <application>Haveged</application> daemon to
-        start automatically when the system is booted, install the
-        <filename>haveged.service</filename> unit included in the
-        <xref linkend="systemd-units"/> package (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-      <indexterm zone="haveged haveged-init">
-        <primary sortas="f-haveged">haveged</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-haveged</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          haveged
-        </seg>
-        <seg>
-          libhavege.so
-        </seg>
-        <seg>
-          /usr/include/haveged and
-          /usr/share/doc/haveged-&haveged-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="haveged-prog">
-        <term><command>haveged</command></term>
-        <listitem>
-          <para>
-            is a daemon that generates an unpredictable stream of random
-            numbers harvested from the indirect effects of hardware events
-            based on hidden processor states (caches, branch  predictors, memory
-            translation tables, etc)
-          </para>
-          <indexterm zone="haveged haveged-prog">
-            <primary sortas="b-haveged-prog">haveged</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/hdwids.xml
===================================================================
--- archive/hdwids.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 hdwids-download-http "&sources-anduin-other-http;/hdwids-&hdwids-version;.tar.xz">
-  <!ENTITY hdwids-download-ftp  " ">
-  <!ENTITY hdwids-md5sum        "9064167bafde9a89bc890ec842783a53">
-  <!ENTITY hdwids-size          "1.2 MB">
-  <!ENTITY hdwids-buildsize     "7.0 MB">
-  <!ENTITY hdwids-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hdwids" xreflabel="hdwids-&hdwids-version;">
-  <?dbhtml filename="hdwids.html"?>
-
-
-  <title>hdwids-&hdwids-version;</title>
-
-  <indexterm zone="hdwids">
-    <primary sortas="a-hdwids">hdwids</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to hdwids</title>
-
-    <para>
-      The <application>hdwids</application> package contains provides USB and
-      PCI data.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hdwids-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hdwids-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hdwids-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hdwids-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hdwids-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hdwids-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>The <application>hdwids</application> tarballs are not generated by
-    the maintainers. The source tarball above was created by the BLFS team by
-    pulling a git version, and removing .git*. BLFS made no changes to the
-    existing source files.</para>
-<!--
-    <bridgehead renderas="sect3">hdwids Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libusb"/>
-    </para>-->
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/hdwids"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of hdwids</title>
-
-    <para>
-      Install <application>hdwids</application> by running the following
-      commands, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for ids in pci.ids usb.ids; do
-  install -vDm644 $ids usr/share/hwdata/$ids
-done &amp;&amp;
-unset ids</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-/-disable-zlib</option>: This stops
-      <application>hdwids</application> from installing a
-      compressed <filename>usb.ids</filename>  alongside the
-      uncompressed one.
-    </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>
-          None
-        </seg>
-        <seg>
-          /usr/share/hwdata
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsusb">
-        <term><command>lsusb</command></term>
-        <listitem>
-          <para>
-            is a utility for displaying information about all USB buses
-            in the system and all devices connected to them.
-          </para>
-          <indexterm zone="hdwids lsusb">
-            <primary sortas="b-lsusb">lsusb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>-->
-
-  </sect2>
-
-</sect1>
Index: chive/heimdal.xml
===================================================================
--- archive/heimdal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1138 +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 heimdal-download-http "http://www.h5l.org/dist/src/heimdal-&heimdal-version;.tar.gz">
-  <!ENTITY heimdal-download-ftp  "ftp://ftp.pdc.kth.se/pub/heimdal/src/heimdal-&heimdal-version;.tar.gz">
-  <!ENTITY heimdal-md5sum        "31d08bbf47a77827fe97ef3f52b4c9c4">
-  <!ENTITY heimdal-size          "6.0 MB">
-  <!ENTITY heimdal-buildsize     "205 MB">
-  <!ENTITY heimdal-time          "3.9 SBU (additional 2.3 SBU to run the test suite)">
-]>
-
-<sect1 id="heimdal" xreflabel="Heimdal-&heimdal-version;">
-  <?dbhtml filename="heimdal.html"?>
-
-
-  <title>Heimdal-&heimdal-version;</title>
-
-  <indexterm zone="heimdal">
-    <primary sortas="a-Heimdal">Heimdal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Heimdal</title>
-
-    <para><application>Heimdal</application> is a free implementation
-    of Kerberos 5 that aims to be compatible with MIT Kerberos 5 and is
-    backward compatible with Kerberos 4. Kerberos is a network authentication
-    protocol. Basically it preserves the integrity of passwords in any
-    untrusted network (like the Internet). Kerberized applications work
-    hand-in-hand with sites that support Kerberos to ensure that passwords
-    cannot be stolen or compromised. A Kerberos installation will make changes
-    to the authentication mechanisms on your network and will overwrite several
-    programs and daemons from the <application>Shadow</application>,
-    <application>Inetutils</application> and
-    <application>Qpopper</application> packages. See
-    <ulink url="&files-anduin;/heimdal-overwrites"/> for a complete list of
-    all the files and commands to rename each of them.</para>
-
-    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&heimdal-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&heimdal-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &heimdal-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &heimdal-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &heimdal-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &heimdal-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/heimdal-&heimdal-version;-otp_fixes-1.patch"/></para>
-      </listitem>
-      <!-- <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/heimdal-&heimdal-version;-libss-1.patch"/></para>
-      </listitem> -->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Heimdal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required to Build the Server-Side Tools</bridgehead>
-    <para role="required"><xref linkend="db"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="openssl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="sqlite"/>,
-    <xref linkend="x-window-system"/>,
-    <xref linkend="libcap2"/>, and
-    <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink> (with this
-    <ulink url="&patch-root;/libcap-ng-0.6.4-2.6.36_kernel_fix-1.patch">patch</ulink>
-    if the Linux kernel version is &gt;=2.6.36)</para>
-
-    <note>
-      <para>Some sort of time synchronization facility on your system
-      (like <xref linkend="ntp"/>) is required since Kerberos won't
-      authenticate if the time differential between a kerberized client
-      and the KDC server is more than 5 minutes.</para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/heimdal"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Heimdal</title>
-
-    <warning>
-      <para>Ensure you really need a Kerberos installation before you decide
-      to install this package. Failure to install and configure the package
-      correctly can alter your system so that users cannot log in.</para>
-    </warning>
-
-    <para>Install <application>Heimdal</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../heimdal-&heimdal-version;-otp_fixes-1.patch &amp;&amp;
-sed -i 's|/var/heimdal|/var/lib/heimdal|' \
-       `grep -lr "/var/heimdal" doc kadmin kdc lib` &amp;&amp;
-
-./configure --prefix=/usr \
-            --sysconfdir=/etc/heimdal \
-            --libexecdir=/usr/sbin \
-            --localstatedir=/var/lib/heimdal \
-            --datadir=/var/lib/heimdal \
-            --with-hdbdir=/var/lib/heimdal \
-            --with-readline=/usr \
-            --enable-kcm &amp;&amp;
-make &amp;&amp;
-
-install -v -m755 -d doc/html                                    &amp;&amp;
-make -C doc html                                                &amp;&amp;
-mv -v doc/heimdal.html doc/html/heimdal                         &amp;&amp;
-mv -v doc/hx509.html   doc/html/hx509                           &amp;&amp;
-makeinfo --html --no-split -o doc/heimdal.html doc/heimdal.texi &amp;&amp;
-makeinfo --html --no-split -o doc/hx509.html   doc/hx509.texi   &amp;&amp;
-makeinfo --plaintext       -o doc/heimdal.txt  doc/heimdal.texi &amp;&amp;
-makeinfo --plaintext       -o doc/hx509.txt    doc/hx509.texi</userinput></screen>
-
-    <para>If you have <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>
-    installed and wish to create PDF and Postscript forms of the documentation,
-    change into the <filename class='directory'>doc</filename> directory and
-    issue any or all of the following commands:</para>
-
-<screen><userinput>pushd doc                        &amp;&amp;
-texi2pdf            heimdal.texi &amp;&amp;
-texi2dvi            heimdal.texi &amp;&amp;
-dvips -o heimdal.ps heimdal.dvi  &amp;&amp;
-texi2pdf            hx509.texi   &amp;&amp;
-texi2dvi            hx509.texi   &amp;&amp;
-dvips -o hx509.ps   hx509.dvi    &amp;&amp;
-popd</userinput></screen>
-
-    <para>To test the results, issue: <command>make -k check</command>. The
-    <command>check-iprop</command> test is known to fail but all others should
-    pass.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/heimdal-&heimdal-version;        &amp;&amp;
-install -v -m644    doc/{heimdal,hx509}.{html,txt} \
-                    doc/{init-creds,layman.asc}    \
-                    /usr/share/doc/heimdal-&heimdal-version;        &amp;&amp;
-cp      -v -R       doc/html \
-                    destdir/usr/share/doc/heimdal-&heimdal-version; &amp;&amp;
-
-mv -v /bin/login          /bin/login.SHADOW &amp;&amp;
-mv -v /bin/su             /bin/su.SHADOW    &amp;&amp;
-mv -v /usr/bin/{login,su} /bin              &amp;&amp;
-ln -v -sf ../../bin/login /usr/bin          &amp;&amp;
-
-for LINK in   \
-    lib{otp,kafs,krb5,hx509,sqlite3,asn1,roken,crypto,wind}; do
-        mv -v     /usr/lib/${LINK}.so.* /lib &amp;&amp;
-        ln -v -sf ../../lib/$(readlink  /usr/lib/${LINK}.so) \
-                  /usr/lib/${LINK}.so
-done &amp;&amp;
-
-mv -v     /usr/lib/$(readlink /usr/lib/libdb.so) \
-          /usr/lib/libdb-?.so \
-          /lib &amp;&amp;
-ln -v -sf ../../lib/$(readlink /usr/lib/libdb.so) \
-          /usr/lib/libdb.so &amp;&amp;
-
-ldconfig</userinput></screen>
-
-    <para>If you built any of the additional forms of documentation, install it
-    using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m644 doc/{heimdal,hx509}.{dvi,ps,pdf} \
-                 /usr/share/doc/heimdal-&heimdal-version;</userinput></screen>
-
-    <para>If you wish to use the <xref linkend="cracklib"/> library to enforce
-    strong passwords in the KDC database, issue the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>sed -e 's|/usr/pkg|/usr|' \
-    -e 's|/usr/lib/cracklib_dict|/lib/cracklib/pw_dict|' \
-    -e 's|/var/heimdal|/var/lib/heimdal|' \
-        lib/kadm5/check-cracklib.pl \
-     > /bin/krb5-check-cracklib.pl &amp;&amp;
-
-chmod -v 755 /bin/krb5-check-cracklib.pl</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ... `grep -lr "/var/heimdal"
-    doc kadmin kdc lib`</command>: This command is used to change the
-    hard-coded references in the documentation files from
-    <filename class='directory'>/var/heimdal</filename> to the FHS compliant
-    <filename class='directory'>/var/lib/heimdal</filename> directory
-    name.</para>
-
-    <para><parameter>--libexecdir=/usr/sbin</parameter>: This switch causes
-    the daemon programs to be installed into
-    <filename class="directory">/usr/sbin</filename>.</para>
-
-    <tip>
-      <para>If you want to preserve all your existing
-      <application>Inetutils</application> package daemons, install the
-      <application>Heimdal</application> daemons into
-      <filename class="directory">/usr/sbin/heimdal</filename> (or wherever
-      you want). Since these programs will be called from
-      <command>(x)inetd</command> or <filename>rc</filename> scripts, it
-      really doesn't matter where they are installed, as long as they are
-      correctly specified in the <filename>/etc/(x)inetd.conf</filename> file
-      and <filename>rc</filename> scripts. If you choose something other than
-      <filename class="directory">/usr/sbin</filename>, you may want to move
-      some of the user programs (such as <command>kadmin</command>) to
-      <filename class="directory">/usr/sbin</filename> manually so they'll be
-      in the privileged user's default <envar>PATH</envar>.</para>
-    </tip>
-
-    <para><parameter>--localstatedir=/var/lib/heimdal</parameter>,
-    <parameter>--datadir=/var/lib/heimdal</parameter> and
-    <parameter>--with-hdbdir=/var/lib/heimdal</parameter>: These parameters
-    are used so that the KDC database and associated files will all reside
-    in <filename class='directory'>/var/lib/heimdal</filename>.</para>
-
-    <para><parameter>--with-readline=/usr</parameter>: This parameter must be
-    used so that the <command>configure</command> script properly locates the
-    installed <application>Readline</application> package.</para>
-
-    <para><parameter>--enable-kcm</parameter>: This parameter enables building
-    the Kerberos Credentials Manager.</para>
-
-    <para><option>--with-sqlite3=/usr</option>: This parameter must be
-    used so that the <command>configure</command> script properly locates the
-    installed <application>Sqlite3</application> package.</para>
-
-    <para><option>--with-openldap=/usr</option> and
-    <option>--enable-hdb-openldap-module</option>: These parameters must be
-    used so that the <command>configure</command> script properly locates the
-    installed <application>OpenLDAP</application> package in order to build the
-    module allowing an LDAP backend database.</para>
-
-    <para><command>mv ... ...SHADOW</command>, <command>mv ... /bin</command>
-    and <command> ln ... /usr/bin</command>: The <command>login</command>
-    and <command>su</command> programs installed by
-    <application>Heimdal</application> belong in the
-    <filename class="directory">/bin</filename> directory. The
-    <command>login</command> program is symlinked because
-    <application>Heimdal</application> is expecting to find it in
-    <filename class="directory">/usr/bin</filename>. The old executables from
-    the <application>Shadow</application> package are preserved before the move
-    so that they can be restored if you experience problems logging into the
-    system after the <application>Heimdal</application> package is installed
-    and configured.</para>
-
-    <para><command>for LINK in ...; do ...; done</command>,
-    <command>mv ... /lib</command> and
-    <command>ln ... /usr/lib/libdb.so</command>: The <command>login</command>
-    and <command>su</command> programs previously moved into the
-    <filename class='directory'>/lib</filename> directory link against
-    <application>Heimdal</application> libraries as well as libraries provided
-    by the <application>OpenSSL</application> and
-    <application>Berkeley DB</application> packages. These
-    libraries are also moved to <filename class="directory">/lib</filename>
-    so they are FHS compliant and also in case
-    <filename class="directory">/usr</filename> is located on a separate
-    partition which may not always be mounted.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Heimdal</title>
-
-    <sect3 id="heimdal-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/heimdal/*</filename></para>
-
-      <indexterm zone="heimdal heimdal-config">
-        <primary sortas="e-etc-heimdal">/etc/heimdal/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-        <note>
-          <para>All the configuration steps shown below must be accomplished
-          by the <systemitem class='username'>root</systemitem> user unless
-          otherwise noted.</para>
-        </note>
-
-      <sect4>
-        <title>Master KDC Server Configuration</title>
-
-        <para>Many of the commands below use
-        <replaceable>&lt;replaceable&gt;</replaceable> tags to identify places
-        where you need to substitute information specific to your network.
-        Ensure you replace everything in these tags (there will be no angle
-        brackets when you are done) with your site-specific information.</para>
-
-        <para>Create the Kerberos configuration file with the following
-        commands:</para>
-
-<screen role="root"><userinput>install -v -m755 -d /etc/heimdal &amp;&amp;
-cat &gt; /etc/heimdal/krb5.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/heimdal/krb5.conf
-
-[libdefaults]
-    default_realm = <replaceable>&lt;EXAMPLE.COM&gt;</replaceable>
-    encrypt = true
-
-[realms]
-    <replaceable>&lt;EXAMPLE.COM&gt;</replaceable> = {
-        kdc = <replaceable>&lt;hostname.example.com&gt;</replaceable>
-        admin_server = <replaceable>&lt;hostname.example.com&gt;</replaceable>
-        kpasswd_server = <replaceable>&lt;hostname.example.com&gt;</replaceable>
-    }
-
-[domain_realm]
-    .<replaceable>&lt;example.com&gt;</replaceable> = <replaceable>&lt;EXAMPLE.COM&gt;</replaceable>
-
-[logging]
-    kdc = FILE:/var/log/kdc.log
-    admin_server = FILE:/var/log/kadmin.log
-    default = FILE:/var/log/krb.log
-
-# End /etc/heimdal/krb5.conf</literal>
-EOF
-chmod -v 644 /etc/heimdal/krb5.conf</userinput></screen>
-
-        <para>You will need to substitute your domain and proper hostname
-        for the occurrences of the <replaceable>&lt;hostname&gt;</replaceable>
-        and <replaceable>&lt;EXAMPLE.COM&gt;</replaceable> names.</para>
-
-        <para><option>default_realm</option> should be the name of your
-        domain changed to ALL CAPS. This isn't required, but both
-        <application>Heimdal</application> and <application>MIT
-        Kerberos</application> recommend it.</para>
-
-        <para><option>encrypt = true</option> provides encryption of all
-        traffic between kerberized clients and servers. It's not necessary
-        and can be left off. If you leave it off, you can encrypt all traffic
-        from the client to the server using a switch on the client program
-        instead. The <option>[realms]</option> parameters tell the client
-        programs where to look for the KDC authentication services. The
-        <option>[domain_realm]</option> section maps a domain
-        to a realm.</para>
-
-        <para>Store the master password in a key file using the following
-        commands:</para>
-
-<screen role="root"><userinput>install -v -m755 -d /var/lib/heimdal &amp;&amp;
-kstash</userinput></screen>
-
-        <para>Create the KDC database:</para>
-
-<screen role="root"><userinput>kadmin -l</userinput></screen>
-
-        <para>The commands below will prompt you for information about the
-        principles. Choose the defaults for now unless you know what you are
-        doing and need to specify different values. You can go in later and
-        change the defaults, should you feel the need. You may use the up and
-        down arrow keys to use the history feature of <command>kadmin</command>
-        in a similar manner as the <command>bash</command> history
-        feature.</para>
-
-        <para>At the <prompt>kadmin&gt;</prompt> prompt, issue the following
-        statement:</para>
-
-<screen role="root"><userinput>init <replaceable>&lt;EXAMPLE.COM&gt;</replaceable></userinput></screen>
-
-        <para>The database must now be populated with at least one principle
-        (user). For now, just use your regular login name or root. You may
-        create as few, or as many principles as you wish using the following
-        statement:</para>
-
-<screen role="root"><userinput>add <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
-
-        <para>The KDC server and any machine running kerberized
-        server daemons must have a host key installed:</para>
-
-<screen role="root"><userinput>add --random-key host/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
-
-        <para>After choosing the defaults when prompted, you will have to
-        export the data to a keytab file:</para>
-
-<screen role="root"><userinput>ext host/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
-
-        <para>This should have created a file in
-        <filename class="directory">/etc/heimdal</filename> named
-        <filename>krb5.keytab</filename>. This file should have 600
-        (root rw only) permissions. Keeping the keytab file from public access
-        is crucial to the overall security of the Kerberos installation.</para>
-
-        <para>Eventually, you'll want to add server daemon principles to the
-        database and extract them to the keytab file. You do this in the same
-        way you created the host principles. Below is an example:</para>
-
-<screen role="root"><userinput>add --random-key ftp/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
-
-        <para>(choose the defaults)</para>
-
-<screen role="root"><userinput>ext ftp/<replaceable>&lt;hostname.example.com&gt;</replaceable></userinput></screen>
-
-        <para>Exit the <command>kadmin</command> program (use
-        <command>quit</command> or <command>exit</command>) and return back
-        to the shell prompt. Start the KDC daemon manually, just to test out
-        the installation:</para>
-
-<screen role="root"><userinput>/usr/sbin/kdc &amp;</userinput></screen>
-
-        <para>Attempt to get a TGT (ticket granting ticket) with
-        the following command:</para>
-
-<screen><userinput>kinit <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
-
-        <para>You will be prompted for the password you created. After you get
-        your ticket, you should list it with the following command:</para>
-
-<screen><userinput>klist</userinput></screen>
-
-        <para>Information about the ticket should be displayed on
-        the screen.</para>
-
-        <para>To test the functionality of the <filename>keytab</filename> file,
-        issue the following command:</para>
-
-<screen><userinput>ktutil list</userinput></screen>
-
-        <para>This should dump a list of the host principals, along with the
-        encryption methods used to access the principals.</para>
-
-        <para>At this point, if everything has been successful so far, you
-        can feel fairly confident in the installation, setup and configuration
-        of your new <application>Heimdal</application> Kerberos 5
-        installation.</para>
-
-        <para>If you wish to use the <xref linkend="cracklib"/> library to
-        enforce strong passwords in the KDC database, you must do two things.
-        First, add the following lines to the
-        <filename>/etc/heimdal/krb5.conf</filename> configuration file:</para>
-
-<screen><literal>[password_quality]
-    policies = builtin:external-check
-    external_program = /bin/krb5-check-cracklib.pl</literal></screen>
-
-        <para>Next you must install the
-        <application>Crypt::Cracklib</application>
-        <application>Perl</application> module. Download it from the CPAN
-        site. The URL at the time of this writing is <ulink
-        url="http://www.cpan.org/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.5.tar.gz"/>.
-        After unpacking the tarball and changing into the newly created
-        directory, issue the following command to add the BLFS
-        <application>Cracklib</application> dictionary location to one of the
-        source files:</para>
-
-<screen><userinput>sed -i 's|pw_dict|&amp;\n\t\t/lib/cracklib/pw_dict|' Cracklib.pm</userinput></screen>
-
-        <para>Then use the standard <command>perl Makefile.PL</command>;
-        <command>make</command>; <command>make test</command>;
-        <command>make install</command> commands.</para>
-
-        <para id="heimdal-init">Install the
-        <filename>/etc/rc.d/init.d/heimdal</filename> init script included
-        in the <xref linkend="bootscripts"/> package:</para>
-
-        <indexterm zone="heimdal heimdal-init">
-          <primary sortas="f-heimdal">heimdal</primary>
-        </indexterm>
-
-<screen role="root"><userinput>make install-heimdal</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>Using Kerberized Client Programs</title>
-
-        <para>To use the kerberized client programs (<command>telnet</command>,
-        <command>ftp</command>, <command>rsh</command>,
-        <command>rxterm</command>, <command>rxtelnet</command>,
-        <command>rcp</command>, <command>xnlock</command>), you first must get
-        a TGT. Use the <command>kinit</command> program to get the ticket.
-        After you've acquired the ticket, you can use the kerberized programs
-        to connect to any kerberized server on the network. You will not be
-        prompted for authentication until your ticket expires (default is one
-        day), unless you specify a different user as a command line argument
-        to the program.</para>
-
-        <para>The kerberized programs will connect to non-kerberized daemons,
-        warning you that authentication is not encrypted.</para>
-
-        <para>In order to use the <application>Heimdal</application>
-        <application>X</application> programs, you'll need to add a service
-        port entry to the <filename>/etc/services</filename> file for the
-        <command>kxd</command> server. There is no 'standardized port number'
-        for the 'kx' service in the IANA database, so you'll have to pick an
-        unused port number. Add an entry to the <filename>services</filename>
-        file similar to the entry below (substitute your chosen port number
-        for <replaceable>&lt;49150&gt;</replaceable>):</para>
-
-<screen><literal>kx              <replaceable>&lt;49150&gt;</replaceable>/tcp   # Heimdal kerberos X
-kx              <replaceable>&lt;49150&gt;</replaceable>/udp   # Heimdal kerberos X</literal></screen>
-
-        <para>For additional information consult <ulink
-        url="&hints-root;/downloads/files/heimdal.txt">the
-        Heimdal hint</ulink> on which the above instructions are based.</para>
-
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>afslog, ftp, ftpd, gss, hprop, hpropd, hxtool, iprop-log,
-        ipropd-master, ipropd-slave, kadmin, kadmind, kauth, kcm, kdc,
-        kdestroy, kdigest, kf, kfd, kgetcred, kimpersonate, kinit, klist,
-        kpasswd, kpasswdd, krb5-check-cracklib.pl, krb5-config, kstash,
-        ktutil, kx, kxd, login, mk_cmds-krb5, otp, otpprint, pagsh, pfrom,
-        popper, push, rcp, rsh, rshd, rxtelnet, rxterm, string2key, su,
-        telnet, telnetd, tenletxr, verify_krb5_conf and xnlock</seg>
-
-        <seg>hdb_ldap.{so,a}, libasn1.{so,a},
-        libgssapi.{so,a}, libhdb.{so,a}, libheimntlm.{so,a}, libhx509.{so,a},
-        libkadm5clnt.{so,a}, libkadm5srv.{so,a}, libkafs.{so,a},
-        libkdc.{so,a}, libkrb5.{so,a}, libotp.{so,a}, libroken.{so,a},
-        libsl.{so,a}, libss-krb5.{so,a} and wind.{so,a}</seg>
-
-        <seg>/etc/heimdal, /usr/include/gssapi, /usr/include/kadm5,
-        /usr/include/krb5, /usr/include/roken,
-        /usr/share/doc/heimdal-&heimdal-version; and /var/lib/heimdal</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="afslog">
-        <term><command>afslog</command></term>
-        <listitem>
-          <para>obtains AFS tokens for a number of cells.</para>
-          <indexterm zone="heimdal afslog">
-            <primary sortas="b-afslog">afslog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftp">
-        <term><command>ftp</command></term>
-        <listitem>
-          <para>is a kerberized FTP client.</para>
-          <indexterm zone="heimdal ftp">
-            <primary sortas="b-ftp">ftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpd">
-        <term><command>ftpd</command></term>
-        <listitem>
-          <para>is a kerberized FTP daemon.</para>
-          <indexterm zone="heimdal ftpd">
-            <primary sortas="b-ftpd">ftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hprop">
-        <term><command>hprop</command></term>
-        <listitem>
-          <para> takes a principal database in a specified format and converts
-          it into a stream of <application>Heimdal</application> database
-          records.</para>
-          <indexterm zone="heimdal hprop">
-            <primary sortas="b-hprop">hprop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hpropd">
-        <term><command>hpropd</command></term>
-        <listitem>
-          <para>is a server that receives a database sent by
-          <command>hprop</command> and writes it as a local database.</para>
-          <indexterm zone="heimdal hpropd">
-            <primary sortas="b-hpropd">hpropd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iprop-log">
-        <term><command>iprop-log</command></term>
-        <listitem>
-          <para>is used to maintain the iprop log file.</para>
-          <indexterm zone="heimdal iprop-log">
-            <primary sortas="b-iprop-log">iprop-log</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipropd-master">
-        <term><command>ipropd-master</command></term>
-        <listitem>
-          <para>is a daemon which runs on the master KDC
-          server which incrementally propagates changes to the KDC
-          database to the slave KDC servers.</para>
-          <indexterm zone="heimdal ipropd-master">
-            <primary sortas="b-ipropd-master">ipropd-master</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipropd-slave">
-        <term><command>ipropd-slave</command></term>
-        <listitem>
-          <para>is a daemon which runs on the slave KDC
-          servers which incrementally propagates changes to the KDC
-          database from the master KDC server.</para>
-          <indexterm zone="heimdal ipropd-slave">
-            <primary sortas="b-ipropd-slave">ipropd-slave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kadmin">
-        <term><command>kadmin</command></term>
-        <listitem>
-          <para>is a utility used to make modifications to the Kerberos
-          database.</para>
-          <indexterm zone="heimdal kadmin">
-            <primary sortas="b-kadmin">kadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kadmind">
-        <term><command>kadmind</command></term>
-        <listitem>
-          <para>is a server for administrative access to the Kerberos
-          database.</para>
-          <indexterm zone="heimdal kadmind">
-            <primary sortas="b-kadmind">kadmind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kauth">
-        <term><command>kauth</command></term>
-        <listitem>
-          <para>is a symbolic link to the <command>kinit</command>
-          program.</para>
-          <indexterm zone="heimdal kauth">
-            <primary sortas="g-kauth">kauth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcm">
-        <term><command>kcm</command></term>
-        <listitem>
-          <para>is a process based credential cache for Kerberos
-          tickets.</para>
-          <indexterm zone="heimdal kcm">
-            <primary sortas="b-kcm">kcm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdc">
-        <term><command>kdc</command></term>
-        <listitem>
-          <para>is a Kerberos 5 server.</para>
-          <indexterm zone="heimdal kdc">
-            <primary sortas="b-kdc">kdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdestroy">
-        <term><command>kdestroy</command></term>
-        <listitem>
-          <para>removes a principle's current set of tickets.</para>
-          <indexterm zone="heimdal kdestroy">
-            <primary sortas="b-kdestroy">kdestroy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kf">
-        <term><command>kf</command></term>
-        <listitem>
-          <para>is a program which forwards tickets to a remote host through
-          an authenticated and encrypted stream.</para>
-          <indexterm zone="heimdal kf">
-            <primary sortas="b-kf">kf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kfd">
-        <term><command>kfd</command></term>
-        <listitem>
-          <para>is a server used to receive forwarded tickets.</para>
-          <indexterm zone="heimdal kfd">
-            <primary sortas="b-kfd">kfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kgetcred">
-        <term><command>kgetcred</command></term>
-        <listitem>
-          <para>obtains a ticket for a service.</para>
-          <indexterm zone="heimdal kgetcred">
-            <primary sortas="b-kgetcred">kgetcred</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kinit">
-        <term><command>kinit</command></term>
-        <listitem>
-          <para>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.</para>
-          <indexterm zone="heimdal kinit">
-            <primary sortas="b-kinit">kinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="klist">
-        <term><command>klist</command></term>
-        <listitem>
-          <para>reads and displays the current tickets in the credential
-          cache.</para>
-          <indexterm zone="heimdal klist">
-            <primary sortas="b-klist">klist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpasswd">
-        <term><command>kpasswd</command></term>
-        <listitem>
-          <para>is a program for changing Kerberos 5 passwords.</para>
-          <indexterm zone="heimdal kpasswd">
-            <primary sortas="b-kpasswd">kpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpasswdd">
-        <term><command>kpasswdd</command></term>
-        <listitem>
-          <para>is a Kerberos 5 password changing server.</para>
-          <indexterm zone="heimdal kpasswdd">
-            <primary sortas="b-kpasswdd">kpasswdd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krb5-config-prog">
-        <term><command>krb5-config</command></term>
-        <listitem>
-          <para>gives information on how to link programs against
-          <application>Heimdal</application> libraries.</para>
-          <indexterm zone="heimdal krb5-config-prog">
-            <primary sortas="b-krb5-config">krb5-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kstash">
-        <term><command>kstash</command></term>
-        <listitem>
-          <para>stores the KDC master password in a file.</para>
-          <indexterm zone="heimdal kstash">
-            <primary sortas="b-kstash">kstash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktutil">
-        <term><command>ktutil</command></term>
-        <listitem>
-          <para>is a program for managing Kerberos keytabs.</para>
-          <indexterm zone="heimdal ktutil">
-            <primary sortas="b-ktutil">ktutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kx">
-        <term><command>kx</command></term>
-        <listitem>
-          <para>is a program which securely forwards
-          <application>X</application> connections.</para>
-          <indexterm zone="heimdal kx">
-            <primary sortas="b-kx">kx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kxd">
-        <term><command>kxd</command></term>
-        <listitem>
-          <para>is the daemon for <command>kx</command>.</para>
-          <indexterm zone="heimdal kxd">
-            <primary sortas="b-kxd">kxd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="login">
-        <term><command>login</command></term>
-        <listitem>
-          <para>is a kerberized login program.</para>
-          <indexterm zone="heimdal login">
-            <primary sortas="b-login">login</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="otp">
-        <term><command>otp</command></term>
-        <listitem>
-          <para>manages one-time passwords.</para>
-          <indexterm zone="heimdal otp">
-            <primary sortas="b-otp">otp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="otpprint">
-        <term><command>otpprint</command></term>
-        <listitem>
-          <para>prints lists of one-time passwords.</para>
-          <indexterm zone="heimdal otpprint">
-            <primary sortas="b-otpprint">otpprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pfrom">
-        <term><command>pfrom</command></term>
-        <listitem>
-          <para>is a script that runs <command>push --from</command>.</para>
-          <indexterm zone="heimdal pfrom">
-            <primary sortas="b-pfrom">pfrom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="popper">
-        <term><command>popper</command></term>
-        <listitem>
-          <para>is a kerberized POP-3 server.</para>
-          <indexterm zone="heimdal popper">
-            <primary sortas="b-popper">popper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="push">
-        <term><command>push</command></term>
-        <listitem>
-          <para>is a kerberized POP mail retrieval client.</para>
-          <indexterm zone="heimdal push">
-            <primary sortas="b-push">push</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcp">
-        <term><command>rcp</command></term>
-        <listitem>
-          <para>is a kerberized rcp client program.</para>
-          <indexterm zone="heimdal rcp">
-            <primary sortas="b-rcp">rcp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rsh">
-        <term><command>rsh</command></term>
-        <listitem>
-          <para>is a kerberized rsh client program.</para>
-          <indexterm zone="heimdal rsh">
-            <primary sortas="b-rsh">rsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rshd">
-        <term><command>rshd</command></term>
-        <listitem>
-          <para>is a kerberized rsh server.</para>
-          <indexterm zone="heimdal rshd">
-            <primary sortas="b-rshd">rshd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rxtelnet">
-        <term><command>rxtelnet</command></term>
-        <listitem>
-          <para>starts a secure <command>xterm</command> window with a
-          <command>telnet</command> to a given host and forwards
-          <application>X</application> connections.</para>
-          <indexterm zone="heimdal rxtelnet">
-            <primary sortas="b-rxtelnet">rxtelnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rxterm">
-        <term><command>rxterm</command></term>
-        <listitem>
-          <para>starts a secure remote <command>xterm</command>.</para>
-          <indexterm zone="heimdal rxterm">
-            <primary sortas="b-rxterm">rxterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="string2key">
-        <term><command>string2key</command></term>
-        <listitem>
-          <para>maps a password into a key.</para>
-          <indexterm zone="heimdal string2key">
-            <primary sortas="b-string2key">string2key</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="su">
-        <term><command>su</command></term>
-        <listitem>
-          <para>is a kerberized su client program.</para>
-          <indexterm zone="heimdal su">
-            <primary sortas="b-su">su</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telnet">
-        <term><command>telnet</command></term>
-        <listitem>
-          <para>is a kerberized telnet client program.</para>
-          <indexterm zone="heimdal telnet">
-            <primary sortas="b-telnet">telnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telnetd">
-        <term><command>telnetd</command></term>
-        <listitem>
-          <para>is a kerberized telnet server.</para>
-          <indexterm zone="heimdal telnetd">
-            <primary sortas="b-telnetd">telnetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tenletxr">
-        <term><command>tenletxr</command></term>
-        <listitem>
-          <para>forwards <application>X</application> connections
-          backwards.</para>
-          <indexterm zone="heimdal tenletxr">
-            <primary sortas="b-tenletxr">tenletxr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="verify_krb5_conf">
-        <term><command>verify_krb5_conf</command></term>
-        <listitem>
-          <para>checks <filename>krb5.conf</filename> file for obvious
-          errors.</para>
-          <indexterm zone="heimdal verify_krb5_conf">
-            <primary sortas="b-verify_krb5_conf">verify_krb5_conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xnlock">
-        <term><command>xnlock</command></term>
-        <listitem>
-          <para>is a program that acts as a secure screen saver for
-          workstations running <application>X</application>.</para>
-          <indexterm zone="heimdal xnlock">
-            <primary sortas="b-xnlock">xnlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasn1">
-        <term><filename class='libraryfile'>libasn1.{so,a}</filename></term>
-        <listitem>
-          <para>provides the ASN.1 and DER functions to encode and decode
-          the Kerberos TGTs.</para>
-          <indexterm zone="heimdal libasn1">
-            <primary sortas="c-libasn1">libasn1.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgssapi">
-        <term><filename class='libraryfile'>libgssapi.{so,a}</filename></term>
-        <listitem>
-          <para>contain the Generic Security Service Application Programming
-          Interface (GSSAPI) functions which provides security
-          services to callers in a generic fashion, supportable with a range of
-          underlying mechanisms and technologies and hence allowing source-level
-          portability of applications to different environments.</para>
-          <indexterm zone="heimdal libgssapi">
-            <primary sortas="c-libgssapi">libgssapi.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhdb">
-        <term><filename class='libraryfile'>libhdb.{so,a}</filename></term>
-        <listitem>
-          <para>is a <application>Heimdal</application> Kerberos 5
-          authentication/authorization database access library.</para>
-          <indexterm zone="heimdal libhdb">
-            <primary sortas="c-libhdb">libhdb.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkadm5clnt">
-        <term><filename class='libraryfile'>libkadm5clnt.{so,a}</filename></term>
-        <listitem>
-          <para>contains the administrative authentication and password
-          checking functions required by Kerberos 5 client-side programs.</para>
-          <indexterm zone="heimdal libkadm5clnt">
-            <primary sortas="c-libkadm5clnt">libkadm5clnt.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkadm5srv">
-        <term><filename class='libraryfile'>libkadm5srv.{so,a}</filename></term>
-        <listitem>
-          <para>contain the administrative authentication and password
-          checking functions required by Kerberos 5 servers.</para>
-          <indexterm zone="heimdal libkadm5srv">
-            <primary sortas="c-libkadm5srv">libkadm5srv.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkafs">
-        <term><filename class='libraryfile'>libkafs.{so,a}</filename></term>
-        <listitem>
-          <para>contains the functions required to authenticated to AFS.</para>
-          <indexterm zone="heimdal libkafs">
-            <primary sortas="c-libkafs">libkafs.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkrb5">
-        <term><filename class='libraryfile'>libkrb5.{so,a}</filename></term>
-        <listitem>
-          <para>is an all-purpose Kerberos 5 library.</para>
-          <indexterm zone="heimdal libkrb5">
-            <primary sortas="c-libkrb5">libkrb5.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libotp">
-        <term><filename class='libraryfile'>libotp.{so,a}</filename></term>
-        <listitem>
-          <para>contains the functions required to handle authenticating
-          one time passwords.</para>
-          <indexterm zone="heimdal libotp">
-            <primary sortas="c-libotp">libotp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libroken">
-        <term><filename class='libraryfile'>libroken.{so,a}</filename></term>
-        <listitem>
-          <para>is a library containing Kerberos 5 compatibility
-          functions.</para>
-          <indexterm zone="heimdal libroken">
-            <primary sortas="c-libroken">libroken.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/ibus.xml
===================================================================
--- archive/ibus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +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 ibus-download-http "http://ibus.googlecode.com/files/ibus-&ibus-version;.tar.gz">
-  <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "6ce27a692d2d4881e9898f3798dcf91c">
-  <!ENTITY ibus-size          "1.9 MB">
-  <!ENTITY ibus-buildsize     "40 MB">
-  <!ENTITY ibus-time          "0.5 SBU">
-]>
-
-<sect1 id="ibus" xreflabel="IBus-&ibus-version;">
-  <?dbhtml filename="ibus.html"?>
-
-
-  <title>IBus-&ibus-version;</title>
-
-  <indexterm zone="ibus">
-    <primary sortas="a-IBus">IBus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IBus</title>
-
-    <para>
-      <application>IBus</application> is an Intelligent Input Bus. It is a new
-      input framework for Linux OS. It provides full featured and user friendly
-      input method user interface.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ibus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ibus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ibus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ibus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ibus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ibus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">IBus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/> and
-      <xref linkend="iso-codes"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="gtk-doc"/>, and
-      <xref linkend="pyxdg"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ibus"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IBus</title>
-
-    <para>
-      Install <application>IBus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/ibus &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Two
-      tests may fail due to problems with the tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-gtk2</option>: This switch disables building
-      of the <application>GTK+ 2</application> immodule. Use it if
-      you have not installed <application>GTK+ 2</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ibus, ibus-daemon, and ibus-setup
-        </seg>
-        <seg>
-          libibus-1.0.so and im-ibus.so
-          (<application>GTK+ Immodule</application>)
-        </seg>
-        <seg>
-          /etc/dconf/db/ibus.d,
-          /usr/include/ibus-1.0,
-          /usr/lib/ibus,
-          /usr/share/gtk-doc/html/ibus, and
-          /usr/share/ibus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ibus-daemon">
-        <term><command>ibus-daemon</command></term>
-        <listitem>
-          <para>
-            is the Intelligent Input Bus Daemon.
-          </para>
-          <indexterm zone="ibus ibus-daemon">
-            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ibus-setup">
-        <term><command>ibus-setup</command></term>
-        <listitem>
-          <para>
-            is the <application>GTK+</application> program used to configure
-            the <command>ibus-daemon</command>.
-          </para>
-          <indexterm zone="ibus ibus-setup">
-            <primary sortas="b-ibus-setup">ibus-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libibus-1.0">
-        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>IBus</application> API functions.
-          </para>
-          <indexterm zone="ibus libibus-1.0">
-            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/icedtea-sound.xml
===================================================================
--- archive/icedtea-sound.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +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 icedtea-sound-download-http "http://icedtea.classpath.org/download/source/icedtea-sound-&icedtea-sound-version;.tar.xz">
-  <!ENTITY icedtea-sound-download-ftp  " ">
-  <!ENTITY icedtea-sound-md5sum        "e4d8013735ae517c015327924dabf3ed">
-  <!ENTITY icedtea-sound-size          "1.44 MB">
-  <!ENTITY icedtea-sound-buildsize     "4.4 MB">
-  <!ENTITY icedtea-sound-time          "0.1 SBU">
-]>
-
-<sect1 id="icedtea-sound" xreflabel="IcedTea-Sound-&icedtea-sound-version;">
-  <?dbhtml filename="icedtea-sound.html"?>
-
-
-  <title>IcedTea-Sound-&icedtea-sound-version;</title>
-
-  <indexterm zone="icedtea-sound">
-    <primary sortas="a-icedtea-sound">IcedTea-Sound</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IcedTea-Sound</title>
-
-    <para>
-      The <application>IcedTea-Sound</application> package contains the
-      <xref linkend="pulseaudio"/> provider which was removed from IcedTea
-      itself from version 2.5.0 onwards. More providers may be included in
-      the future.
-    </para>
-
-    <para>
-      Because of pulseaudio real-time capabilities, the pulseaudio provider
-      is said to provide smoother sound than the default alsa provider.
-    </para>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&icedtea-sound-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&icedtea-sound-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &icedtea-sound-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &icedtea-sound-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &icedtea-sound-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &icedtea-sound-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">IcedTea-Sound Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openjdk"/> or <xref linkend="java"/> (remember to
-      configure as described in the <xref linkend="openjdk"/> page), and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/icedtea-sound"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IcedTea-Sound</title>
-
-    <para>
-      Install <application>IcedTea-Sound</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput> ./configure --with-jdk-home=${JAVA_HOME} --disable-docs &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>case $(uname -m) in
-  i?86   ) ARCH=i386 ;;
-  x86_64 ) ARCH=amd64 ;;
-esac &amp;&amp;
-
-install icedtea-sound.jar ${JAVA_HOME}/jre/lib/ext &amp;&amp;
-install build/native/libicedtea-sound.so ${JAVA_HOME}/jre/lib/$ARCH &amp;&amp;
-unset ARCH</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-jdk-home=...</parameter>: This parameter specifies
-      the location of your JDK.
-    </para>
-
-    <para>
-      <parameter>--disable-docs</parameter>: Disable building the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring IcedTea-Sound</title>
-
-    <sect3 id="icedtea-sound-config">
-      <title>Config Files</title>
-      <para>
-        <filename>${JAVA_HOME}/jre/lib/sound.properties</filename>
-      </para>
-
-      <indexterm zone="icedtea-sound icedtea-sound-config">
-        <primary
-        sortas="e-jre-lib-sound.properties">${JAVA_HOME}/jre/lib/sound.properties</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The default installation of OpenJDK uses the ALSA provider. You have
-        to specify the PulseAudio provider in the
-        <filename>sound.properties</filename> file, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; ${JAVA_HOME}/jre/lib/sound.properties &lt;&lt; "EOF"
-<literal># Begin PulseAudio provider additions:
-
-javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioClip
-javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioSourceDataLine
-javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioTargetDataLine
-
-# End PulseAudio provider additions</literal>
-EOF</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          libicedtea-sound.so and icedtea-sound.jar.
-        </seg>
-        <seg>
-          None.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libicedtea-sound">
-        <term><filename class="libraryfile">libicedtea-sound.so</filename></term>
-        <listitem>
-          <para>
-            contains the sound provider(s) bindings.
-          </para>
-          <indexterm zone="icedtea-sound libicedtea-sound">
-            <primary sortas="c-libicedtea-sound">libicedtea-sound.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/icedtea-web.xml
===================================================================
--- archive/icedtea-web.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,253 +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 icedtea-web-download-http "http://icedtea.wildebeest.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
-  <!ENTITY icedtea-web-download-ftp  " ">
-  <!ENTITY icedtea-web-md5sum        "f55d3b47c657a3603b05c637ca8a4572">
-  <!ENTITY icedtea-web-size          "2.0 MB">
-  <!ENTITY icedtea-web-buildsize     "35 MB">
-  <!ENTITY icedtea-web-time          "0.3 SBU">
-]>
-
-<sect1 id="icedtea-web" xreflabel="IcedTea-Web-&icedtea-web-version;">
-  <?dbhtml filename="icedtea-web.html"?>
-
-
-  <title>IcedTea-Web-&icedtea-web-version;</title>
-
-  <indexterm zone="icedtea-web">
-    <primary sortas="a-IcedTea-Web">IcedTea-Web</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IcedTea-Web</title>
-
-    <para>The <application>IcedTea-Web</application> package contains both a
-    <application>Java</application> browser plugin, and a new webstart
-    implementation, licensed under GPLV3.</para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&icedtea-web-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&icedtea-web-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &icedtea-web-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &icedtea-web-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &icedtea-web-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &icedtea-web-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">IcedTea-Web Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="npapi-sdk"/>, and
-      <xref linkend="openjdk"/> or
-      <xref linkend="java"/> (remember to configure as described in the
-      <xref linkend="ojdk-conf"/> page),
-    </para>
-
-    <bridgehead renderas="sect4">Required at runtime, a web browser,
-    such as:</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="epiphany"/> or
-<!-- support removed in firefox-52, see https://support.mozilla.org/en-US/kb/npapi-plugins      <xref linkend="firefox"/>,
-      <xref role="runtime" linkend="midori"/>, or -->
-      <xref role="runtime" linkend="seamonkey"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/>,
-      <xref linkend="mercurial"/>,
-      <ulink url="http://emma.sourceforge.net/">EMMA</ulink>, and
-      <ulink url="http://www.eclemma.org/jacoco/">JACOCO</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/icedtea-web"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IcedTea-Web</title>
-
-    <para>Install <application>IcedTea-Web</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=${JAVA_HOME}/jre    \
-            --with-jdk-home=${JAVA_HOME} \
-            --disable-docs               \
-            --mandir=${JAVA_HOME}/man &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>
-<!-- mandb should not be in installation, rather in configuration. If
-     the JAVA environment is configured as per the book, just running
-     mandb should update the whatis database with anything in ${JAVA_HOME}/man.
-     We do not have a mandb command in other pacakges.
-mandb -c ${JAVA_HOME}/man</userinput></screen>-->
-
-    <para>To test the man pages are correctly installed, issue <command>man policyeditor</command> to display the respective man page.</para>
-
-    <para>If desired, you may install a .desktop file corresponding to an entry in a desktop menu for <command>policyeditor</command>, as <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -Dm0644 itweb-settings.desktop /usr/share/applications/itweb-settings.desktop &amp;&amp;
-install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-jdk-home</parameter>: This switch provides the
-    location of the installed <application>JDK</application>.</para>
-
-    <para><parameter>--disable-docs</parameter>: This switch disables
-    installation of additional developer-related documentation. Omit this
-    switch if you would like to do development work on
-    <application>IcedTea-Web</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuration Information</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create a
-    symbolic link to the plugin from your browser(s) plugins directory.
-    For example, for <xref linkend="seamonkey"/>:</para>
-
-<screen role="root"><userinput>install -dm755 /usr/lib/mozilla/plugins &amp;&amp;
-ln -s ${JAVA_HOME}/jre/lib/IcedTeaPlugin.so /usr/lib/mozilla/plugins/</userinput></screen>
-
-    <important>
-      <para>The plugin must be a symlink for it to work. If not, the browsers
-      will crash when you attempt to load a <application>Java</application>
-      application.</para>
-    </important>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-
-      <seglistitem>
-        <seg>itweb-settings, javaws, and policyeditor</seg>
-        <seg>IcedTeaPlugin.so, jsobject.jar, netx.jar, plugin.jar</seg>
-        <seg>${JAVA_HOME}/jre/share/icedtea-web</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="itweb-settings">
-        <term><command>itweb-settings</command></term>
-        <listitem>
-          <para>allows customization of the browser plugin and
-          <application>javaws</application>.</para>
-          <indexterm zone="icedtea-web itweb-settings">
-            <primary sortas="b-itweb-settings">itweb-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javaws-itweb">
-        <term><command>javaws</command></term>
-        <listitem>
-          <para>launches Java application/applets hosted on a network.</para>
-          <indexterm zone="icedtea-web javaws-itweb">
-            <primary sortas="b-javaws">javaws</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="policyeditor-itweb">
-        <term><command>policyeditor</command></term>
-        <listitem>
-          <para>view and modify security policy settings, including
-          certificates, for javaws and the browser plugin.</para>
-          <indexterm zone="icedtea-web policyeditor-itweb">
-            <primary sortas="b-policyeditor">policyeditor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="IcedTeaPlugin">
-        <term><filename class='libraryfile'>IcedTeaPlugin.so</filename></term>
-        <listitem>
-          <para>is the <application>Java</application> browser plugin.</para>
-          <indexterm zone="icedtea-web IcedTeaPlugin">
-            <primary sortas="c-IcedTeaPlugin">IcedTeaPlugin.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsobjectjar">
-        <term><filename class='libraryfile'>jsobject.jar</filename></term>
-        <listitem>
-          <para>contains functions to manipulate JavaScript objects from
-          JAVA code.</para>
-          <indexterm zone="icedtea-web jsobjectjar">
-            <primary sortas="c-jsobjectjar">jsobject.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="netxjar">
-        <term><filename class='libraryfile'>netx.jar</filename></term>
-        <listitem>
-          <para>contains functions for the
-          <application>IcedTea-Web</application>
-          webstart implementation (NetX).</para>
-          <indexterm zone="icedtea-web netxjar">
-            <primary sortas="c-netxjar">netx.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pluginjar">
-        <term><filename class='libraryfile'>plugin.jar</filename></term>
-        <listitem>
-          <para>contains functions for the
-          <application>IcedTea-Web</application>
-          <application>Java</application> plugin.</para>
-          <indexterm zone="icedtea-web pluginjar">
-            <primary sortas="c-pluginjar">plugin.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/ijs.xml
===================================================================
--- archive/ijs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 ijs-download-http "https://www.openprinting.org/download/ijs/download/ijs-&ijs-version;.tar.bz2">
-  <!ENTITY ijs-download-ftp  " ">
-  <!ENTITY ijs-md5sum        "896fdcb7a01c586ba6eb81398ea3f6e9">
-  <!ENTITY ijs-size          "252 KB">
-  <!ENTITY ijs-buildsize     "2.2 MB">
-  <!ENTITY ijs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="ijs" xreflabel="IJS-&ijs-version;">
-  <?dbhtml filename="ijs.html"?>
-
-
-  <title>IJS-&ijs-version;</title>
-
-  <indexterm zone="ijs">
-    <primary sortas="a-IJS">IJS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IJS</title>
-
-    <para>
-      The <application>IJS</application> package contains a
-      library which implements a protocol for transmission
-      of raster page images.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ijs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ijs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ijs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ijs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ijs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ijs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ijs"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IJS</title>
-
-    <para>
-      Install <application>IJS</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --mandir=/usr/share/man \
-            --enable-shared \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          ijs_client_example, ijs-config and ijs_server_example
-        </seg>
-        <seg>
-          libijs.so
-        </seg>
-        <seg>
-          /usr/include/ijs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ijs-config">
-        <term><command>ijs-config</command></term>
-        <listitem>
-          <para>
-            is a program that is used to determine the compiler and
-            linker flags that should be used to compile and link
-            programs that use IJS.
-          </para>
-          <indexterm zone="ijs ijs-config">
-            <primary sortas="b-ijs-config">ijs-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libijs">
-        <term><filename class="libraryfile">libijs.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>IJS</application> API functions.
-          </para>
-          <indexterm zone="ijs libijs">
-            <primary sortas="c-libijs">libijs.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/imagemagick6.xml
===================================================================
--- archive/imagemagick6.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,438 +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 imagemagick6-patch-version "93">
-
-  <!ENTITY imagemagick6-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;.tar.xz">
-  <!ENTITY imagemagick6-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;.tar.xz">
-  <!ENTITY imagemagick6-md5sum        "ddbb2bed4145e3f7b0ff6c105ddbf612">
-  <!ENTITY imagemagick6-size          "8.7 MB">
-  <!ENTITY imagemagick6-buildsize     "158 MB, with typical dependencies (add 40 MB for tests)">
-  <!ENTITY imagemagick6-time          "0.9 SBU (Using parallelism=4; add 1.9 SBU for tests)">
-]>
-
-<!-- Editors: It is highly unlikely that the buildsize (disk space used) will
-     be less than the figure shown above. Unless you have installed *all* the
-     delegate dependencies, you will see a smaller buildsize, but what is
-     currently listed above is the space one would require if all the
-     dependencies available in the book are installed.
-
-     [bdubbs 2019-92-09]  Reduced SBU and disk space for libraries only.
-     
-     [bdubbs 2018-08-26] I upddated the above stats slightly for 8.3. All BLFS
-     dependencies were installed except gimp and texlive. Note that at this 
-     writing the only packages in the book that use this are gimp and 
-     inkscape. 
-
-     [pierre 2017-02-14] For a build of 6.9.7-8 with dependencies available in
-     the book, but with the configure command as below, I got 179 MB (2.3 SBU)
-     (and 472 KB (0.8 SBU) for the validation suite).
-
-     For a non-full build of 6.9.3-8 I got an actual space of 173 MB and running
-     the validation suite does not increase the net space. I recommend running
-     that instead of check (after the install)!
-
-     Following comments preserved from when we did a full install of -6.
-
-     Marked as 'typical' because nobody builds ALL the optional extras [ken]
-
-     [bdubbs] I do; at least the internal ones.  I still got only 200 MB.
-
-     Saved the "full" 450MB as a comment - feel free to update this iff you
-     do build all dependencies, it's probably a lot bigger now.
-
-     [bdubbs] Just removed it.  I don't think it adds anything.
-
-     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.
-
-     For those of us who touch this infrequently:
-     DPS/dpsXclient is from apple so not relevant to linux builds
-     GVC is part of Graphviz and documented in the explanations
-     LQR is Liquid Rescale  
-     
-     -->
-
-<sect1 id="imagemagick6" xreflabel="ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version; libraries">
-  <?dbhtml filename="imagemagick6.html"?>
-
-
-  <title>ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;</title>
-
-  <indexterm zone="imagemagick6">
-    <primary sortas="a-ImageMagick-6 libraries">ImageMagick-6 libraries</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ImageMagick-6 libraries</title>
-
-    <para>
-      <application>ImageMagick</application> underwent many changes in its
-      libraries between versions 6 and 7. Most packages in BLFS which use
-      <application>ImageMagick</application> can use version 7, but for the
-      others this page will install only the libraries, headers and general
-      documentation (not programs, manpages, perl modules), and it will
-      rename the unversioned pkgconfig files so that they do not overwrite the
-      same-named files from version 7.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&imagemagick6-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&imagemagick6-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &imagemagick6-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &imagemagick6-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &imagemagick6-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &imagemagick6-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;-libs_only-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The <application>ImageMagick</application> source releases are updated
-        frequently and the version shown above may no longer be available from
-        the download locations. You can download a more recent version and use
-        the existing BLFS instructions to install it. Chances are that it will
-        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>
-        directory at <literal>ftp.ImageMagick.org/pub/ImageMagick</literal> you
-        can download it from the BLFS package server at Oregon State University: 
-        <ulink url="ftp://ftp.osuosl.org/pub/blfs/conglomeration/ImageMagick/"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">ImageMagick-6 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para>
-      The optional dependencies listed below should be installed if you need
-      support for the specific format or the conversion tool the dependency
-      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.
-      Additional information about the dependencies can be found in the
-      <filename>Install-unix.txt</filename> file located in the source tree as
-      well as issuing the <command>./configure --help</command> command. A
-      summary of this information, as well as some additional notes can be
-      viewed on-line at <ulink
-      url="http://www.imagemagick.org/script/advanced-unix-installation.php"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional System Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="fftw"/>,
-      <xref linkend="p7zip"/> (LZMA),
-      <xref linkend="sane"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="xdg-utils"/>,
-      <xref linkend="xterm2"/>,
-      <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
-      <ulink url="http://www.openpgp.org/about/">PGP</ulink> or
-      <xref linkend="gnupg2"/>
-      (you'll have to do some hacking to use <application>GnuPG</application>),
-      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates">Profiles</ulink>,
-      and
-      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (for raw formats
-      listed in
-      <ulink url="http://imagemagick.org/script/formats.php">
-      http://www.imagemagick.org/www/formats.html</ulink>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="jasper"/>,
-      <xref role="nodep" linkend="lcms"/> or
-      <xref linkend="lcms2"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libgxps"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libraw"/> (RAW_R),
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="pango"/>,
-      <ulink url="http://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
-      FlashPIX (libfpx)</ulink>,
-      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
-      <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/HOST-Oman/libraqm/">libraqm</ulink>,
-      <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://www.agocg.ac.uk/train/cgm/ralcgm.htm">RALCGM</ulink>
-      (or <ulink url="http://www.mcmurchy.com/ralcgm/ralcgm-3.51.tar.gz">ralcgm</ulink>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="dejavu-fonts"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="gimp"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="inkscape"/>,
-      <ulink url="http://www.blender.org/">Blender</ulink>,
-      <ulink url="http://corefonts.sourceforge.net/">corefonts</ulink>,
-      <ulink url="http://www.ghostscript.com/download/gpcldnld.html">GhostPCL</ulink>,
-      <ulink url="http://www.gnuplot.info/">Gnuplot</ulink>,
-      <ulink url="http://www.povray.org/">POV-Ray</ulink>, and
-      <ulink url="http://www.radiance-online.org/">Radiance</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Conversion Tools</bridgehead>
-    <para role="optional">
-      <xref linkend="enscript"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      <ulink url="http://autotrace.sourceforge.net/">AutoTrace</ulink>,
-      <ulink url="http://www.lizardtech.com/downloads/category/">
-      GeoExpress Command Line Utilities, AKA MrSID Utilities (binary package)</ulink>,
-      <ulink url="http://www.gnu.org/software/hp2xx/">hp2xx</ulink>,
-      <ulink url="https://fossies.org/linux/www/old/html2ps-1.0b7.tar.gz/">html2ps</ulink>,
-      <ulink url="http://wvware.sourceforge.net/">libwmf</ulink>,
-      <ulink url="https://sk1project.net/uc2/">UniConvertor</ulink>, and
-      <ulink url="http://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink>
-      (or <ulink url="http://www.mcmurchy.com/urt/urt-3.1b.tar.gz">URT-3.1b</ulink>)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <!-- share the main page -->
-    <ulink url="&blfs-wiki;/imagemagick"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ImageMagick-6 libraries</title>
-
-    <para>
-      Install <application>ImageMagick</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;-libs_only-1.patch &amp;&amp;
-autoreconf -fi                                          &amp;&amp;
-./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --enable-hdri     \
-            --with-modules    \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make DOCUMENTATION_PATH=/usr/share/doc/imagemagick-&imagemagick6-version; install-libs-only</userinput></screen>
-
-    <para>
-      To test the installation, issue: <command>make check</command>.
-      <!-- in 6.9.9-9 make check runs tests-validate-*  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. The result summary may be obtained with <command>grep
-      "validation suite" validate.log</command>.--> Note that the EPS, PS, and PDF
-      tests require a working <application>Ghostscript</application>. One test
-      in 'make check' needs <quote>Helvetica</quote> from <quote>Ghostscript
-      Standard Fonts</quote>, which are optionally installed in
-      <xref linkend="gs"/> - that test, and one other, might fail, but all the
-      validation can still pass.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -Np1 -i
-        ../ImageMagick-&imagemagick6-version;-imagemagick6_libs_only-1.patch</command>:
-        Move unversioned pkgconfig files to versioned names and provide an option to
-        only install libraries and associated files.
-    </para>
-
-    <para>
-      <parameter>--enable-hdri</parameter>: Enables building of a
-      high dynamic range version of ImageMagick.
-    </para>
-
-    <para>
-      <parameter>--with-modules</parameter>: Enables support for
-      dynamically loadable modules.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-gslib</option>: Enables support to use the
-      <application>Ghostscript</application> shared library.
-    </para>
-
-    <para>
-      <option>--with-rsvg</option>: Enables support to use the
-      <application>librsvg</application> library.
-    </para>
-
-    <para>
-      <option>--with-autotrace</option>: Enables support to use
-      the <application>Autotrace</application> library.
-    </para>
-
-    <para>
-      <option>--with-wmf</option>: Enables support to use the
-      <application>libwmf</application> library.
-    </para>
-
-    <para>
-      <option>--with-gvc</option>: Enables support to use
-      <application>GraphViz</application>.
-    </para>
-
-    <para>
-      <option>--with-windows-font-dir=
-      <replaceable>&lt;Some/Directory&gt;</replaceable></option>:
-      This option specifies the directory where the Windows CoreFonts are
-      installed.
-    </para>
-
-    <para>
-      <option>--with-dejavu-font-dir=
-      <replaceable>&lt;Some/Directory&gt;</replaceable></option>:
-      This option specifies the directory where the DejaVu fonts are
-      installed.
-    </para>
-
-    <para>
-      The options and parameters listed above are the only ones you should
-      have to pass to the <command>configure</command> script to activate all
-      the delegate dependencies. All other dependencies will be automatically
-      detected and utilized in the build if they are installed.
-    </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>
-          libMagickCore-6.Q16HDRI.so,
-          libMagickWand-6.Q16HDRI.so and
-          libMagick++-6.Q16HDRI.so
-        </seg>
-        <seg>
-          /etc/ImageMagick-6,
-          /usr/include/ImageMagick-6,
-          /usr/lib/ImageMagick-&imagemagick6-version;,
-          /usr/share/doc/ImageMagick-&imagemagick6-version;, and
-          /usr/share/ImageMagick-6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="libMagickCore-6.Q16HDRI">
-      <term><filename class="libraryfile">libMagickCore-6.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          provides the C API for ImageMagick.
-        </para>
-        <indexterm zone="imagemagick6 libMagickCore-6.Q16HDRI">
-          <primary sortas="c-libMagickCore-6.Q16HDRI">libMagickCore-6.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickWand-6.Q16HDRI">
-      <term><filename class="libraryfile">libMagickWand-6.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          is the recommended C API for ImageMagick. Unlike the MagickCore API it
-          uses  only a few opaque types.
-        </para>
-        <indexterm zone="imagemagick6 libMagickWand-6.Q16HDRI">
-          <primary sortas="c-libMagickWand-6.Q16HDRI">libMagickWand-6.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickpp-6.Q16HDRI">
-      <term><filename class="libraryfile">libMagick++-6.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          provides the C++ API for ImageMagick.
-        </para>
-        <indexterm zone="imagemagick6 libMagickpp-6.Q16HDRI">
-          <primary sortas="c-libMagick++-6.Q16HDRI">libMagick++-6.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/inetutils.xml
===================================================================
--- archive/inetutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,283 +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 inetutils-download-http "http://gd.tuwien.ac.at/gnu/gnusrc/inetutils/inetutils-&inetutils-version;.tar.gz">
-  <!ENTITY inetutils-download-ftp  "ftp://ftp.gnu.org/gnu/inetutils/inetutils-&inetutils-version;.tar.gz">
-  <!ENTITY inetutils-md5sum        "944f7196a2b3dba2d400e9088576000c">
-  <!ENTITY inetutils-size          "1.9 MB">
-  <!ENTITY inetutils-buildsize     "23 MB">
-  <!ENTITY inetutils-time          "0.4 SBU">
-]>
-
-<sect1 id="inetutils" xreflabel="Inetutils-&inetutils-version;">
-  <?dbhtml filename="inetutils.html"?>
-
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-   <title>Introduction to Inetutils</title>
-
-    <para>The <application>Inetutils</application> package contains network
-    clients and servers. If you are building on an LFS platform, this package
-    was installed during LFS and only the clients (telnet, ftp, etc.) were
-    installed. These instructions allow you to install the server programs.
-    Note that most of the <application>Inetutils</application> servers are
-    insecure and should only be used on trusted networks.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&inetutils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&inetutils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &inetutils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &inetutils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &inetutils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &inetutils-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Inetutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="tcpwrappers"/>,
-      <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, and
-      <xref linkend="mitkrb"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/inetutils"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <para>Install <application>Inetutils</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --libexecdir=/usr/sbin \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --disable-logger       \
-            --disable-syslogd      \
-            --disable-whois        \
-            --disable-ifconfig     \
-            --disable-hostname     \
-            --disable-clients      &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--disable-logger</parameter>: This switch prevents
-    <application>Inetutils</application> installing a <command>logger</command>
-    program, which is installed in the LFS book.</para>
-
-    <para><parameter>--disable-syslogd</parameter>: This switch prevents
-    <application>Inetutils</application> installing a system log daemon, which is
-    installed in the LFS book.</para>
-
-    <para><option>--disable-whois</option>: This switch prevents
-    <application>Inetutils</application> installing an outdated
-    <command>whois</command> client. Add this option if you plan on installing
-    <xref linkend="whois"/>.</para>
-
-    <para><option>--disable-ifconfig</option>: This switch prevents
-    <application>Inetutils</application> from installing an
-    <command>ifconfig</command> command. Use this parameter if you have
-    <application>Net-Tools</application> installed and wish to keep its version
-    of <command>ifconfig</command>.</para>
-
-    <para><option>--disable-hostname</option>: This switch prevents
-    <application>Inetutils</application> from installing a
-    <command>hostname</command> command. Use this parameter if you have
-    the version of this program supplied by the either the
-    <application>Coreutils</application> package or the
-    <application>Net-Tools</application> package and wish to keep it.</para>
-
-    <para><parameter>--disable-clients</parameter>: This switch prevents
-    <application>Inetutils</application> installing any of the client programs
-    (most of which were build during LFS) and only installs the server
-    programs.</para>
-
-    <para><option>--with-wrap</option>: This switch makes
-    <application>Inetutils</application> compile against
-    <application>tcp-wrappers</application>. Add this option if you want to
-    utilize <application>tcp-wrappers</application>.</para>
-
-    <para><option>--with-pam</option>: This switch makes
-    <application>Inetutils</application> link against
-    <application>Linux-PAM</application> libraries.
-    Add this option if you want to utilize PAM.</para>
-
-    <para><option>--disable-servers</option>: Some of the servers included with
-    <application>Inetutils</application> are insecure in nature and in some cases
-    better alternatives exist. You can choose this switch to enable only the
-    servers you need, avoiding the installation of unneeded servers.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>A list of the installed programs not included here, along with their
-    short descriptions can be found at
-    <ulink url="&lfs-root;/chapter06/inetutils.html#contents-inetutils"/>.</para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ftpd, hostname, ifconfig, inetd, rexecd, rlogind, rshd,
-        talkd, telnetd, tftpd, uucpd and whois</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ftpd-inetutils">
-        <term><command>ftpd</command></term>
-        <listitem>
-          <para>is a DARPA Internet File Transfer Protocol Server.</para>
-          <indexterm zone="inetutils ftpd-inetutils">
-            <primary sortas="b-ftpd">ftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="inetd">
-        <term><command>inetd</command></term>
-        <listitem>
-          <para>is an Internet super-server. <!-- Note that the <xref linkend="xinetd"/>
-          package provides a much better server that does the same thing.--></para>
-          <indexterm zone="inetutils inetd">
-            <primary sortas="b-inetd">inetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rexecd-inetutils">
-        <term><command>rexecd</command></term>
-        <listitem>
-          <para>is a remote execution server.</para>
-          <indexterm zone="inetutils rexecd-inetutils">
-            <primary sortas="b-rexecd">rexecd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rlogind-inetutils">
-        <term><command>rlogind</command></term>
-        <listitem>
-          <para>is a remote login server.</para>
-          <indexterm zone="inetutils rlogind-inetutils">
-            <primary sortas="b-rlogind">rlogind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rshd-inetutils">
-        <term><command>rshd</command></term>
-        <listitem>
-          <para>is a remote shell server.</para>
-          <indexterm zone="inetutils rshd-inetutils">
-            <primary sortas="b-rshd">rshd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="talkd">
-        <term><command>talkd</command></term>
-        <listitem>
-          <para>is a remote user communication server.</para>
-          <indexterm zone="inetutils talkd">
-            <primary sortas="b-talkd">talkd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telnetd-inetutils">
-        <term><command>telnetd</command></term>
-        <listitem>
-          <para>is a DARPA TELNET protocol server.</para>
-          <indexterm zone="inetutils telnetd-inetutils">
-            <primary sortas="b-telnetd">telnetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tftpd">
-        <term><command>tftpd</command></term>
-        <listitem>
-          <para>is an Internet Trivial File Transfer Protocol server.</para>
-          <indexterm zone="inetutils tftpd">
-            <primary sortas="b-tftpd">tftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uucpd">
-        <term><command>uucpd</command></term>
-        <listitem>
-          <para>is a server for supporting UUCP
-          connections over networks.</para>
-          <indexterm zone="inetutils uucpd">
-            <primary sortas="b-uucpd">uucpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whois-inetutils">
-        <term><command>whois</command></term>
-        <listitem>
-          <para>is a client for the whois directory service. Note that the
-          <xref linkend="whois"/> package provides a much better client.</para>
-          <indexterm zone="inetutils whois-inetutils">
-            <primary sortas="b-whois">whois</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/initdtools.xml
===================================================================
--- archive/initdtools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,123 +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 initd-tools-download-http "https://people.freedesktop.org/~dbn/initd-tools/releases/initd-tools-&initd-tools-version;.tar.gz">
-  <!ENTITY initd-tools-download-ftp  " ">
-  <!ENTITY initd-tools-md5sum        "ab6377700ace81ec5a556ebdbae1d8d9">
-  <!ENTITY initd-tools-size          "291 KB">
-  <!ENTITY initd-tools-buildsize     "2.6 MB">
-  <!ENTITY initd-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="initd-tools" xreflabel="Initd-tools-&initd-tools-version;">
-  <?dbhtml filename="initd-tools.html"?>
-
-
-  <title>Initd-tools-&initd-tools-version;</title>
-
-  <indexterm zone="initd-tools">
-    <primary sortas="a-initd-tools">initd-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to initd-tools</title>
-
-    <para>The <application>initd-tools</application> package contains
-    programs to install and remove LSB based bootscripts. </para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&initd-tools-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&initd-tools-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &initd-tools-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &initd-tools-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &initd-tools-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &initd-tools-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/initd_tools"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-
-    <title>Installation of initd-tools</title>
-
-    <para>Install <application>initd-tools</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/ --mandir=/usr/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>install_initd and remove_initd</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/lsb</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="install_initd">
-        <term><command>install_initd</command></term>
-        <listitem>
-          <para>installs a boot script and the necessary symbolic links
-          using LSB methodology.</para>
-          <indexterm zone="initd-tools install_initd">
-            <primary sortas="b-install_initd">install_initd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="remove_initd">
-        <term><command>remove_initd</command></term>
-        <listitem>
-          <para>removes a boot script and the necessary symbolic links
-          using LSB methodology.</para>
-          <indexterm zone="initd-tools remove_initd">
-            <primary sortas="b-remove_initd">remove_initd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/inputrc.xml
===================================================================
--- archive/inputrc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,99 +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="postlfs-config-inputrc" xreflabel="Introduction to /etc/inputrc">
-  <?dbhtml filename="inputrc.html"?>
-
-
-  <title>Introduction to /etc/inputrc</title>
-
-  <indexterm zone="postlfs-config-inputrc">
-    <primary sortas="e-etc-inputrc">/etc/inputrc</primary>
-  </indexterm>
-
-  <indexterm zone="postlfs-config-inputrc">
-    <primary sortas="e-AA.inputrc">~/.inputrc</primary>
-  </indexterm>
-
-  <para><filename>/etc/inputrc</filename> deals with the mapping of the
-  keyboard for certain situations.  This file is the start-up file used by
-  <application>readline</application>, the input related library used by
-  <application>bash</application> and most other shells.</para>
-
-  <para>For more information see <command>info bash</command>&mdash;<emphasis
-  role="strong">Node: Readline Init</emphasis> file as well as
-  <command>info readline</command>. There is a lot that can be done with this
-  one rc file.</para>
-
-  <para>Global values are set in <filename>/etc/inputrc</filename>.
-  Personal user values are set in <filename>~/.inputrc</filename>. The
-  <filename>~/.inputrc</filename> file will override the global settings
-  file.  A later page sets up <application>Bash</application> to use
-  <filename>/etc/inputrc</filename> if there is no <filename>.inputrc</filename>
-  for a user when   <filename>/etc/profile</filename> is read (usually at login).
-  If you   want your system to use both, or don't want <emphasis>global</emphasis>
-  keyboard handling, it is a good idea to place a default
-  <filename>.inputrc</filename> into the <filename
-  class="directory">/etc/skel</filename> directory for use with new users.</para>
-
-  <para>Below is a base <filename>/etc/inputrc</filename> along with
-  comments to explain what the various options do.  Note that comments
-  can <emphasis>not</emphasis> be on the same line as commands.</para>
-
-  <para>If you will create an <filename>.inputrc</filename> in
-  <filename class="directory">/etc/skel</filename> using the command below,
-  change the command's output to <filename>/etc/skel/.inputrc</filename> and
-  be sure to check/set permissions afterward. Then you can just copy that
-  file to <filename>/etc/inputrc</filename> and the home directory
-  of any user already existing in the system, including <systemitem
-  class="username">root</systemitem>, that needs
-  a private version of the file.  Be sure to use the <option>-p</option>
-  parameter of <command>cp</command> to maintain permissions and be sure to
-  change owner and group appropriately.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
-<literal># Begin /etc/inputrc
-
-# Make sure everything is not output to one line
-set horizontal-scroll-mode Off
-
-# Enable 8bit input
-set meta-flag On
-set input-meta On
-
-# Turns off 8th bit stripping
-set convert-meta Off
-
-# Keep the 8th bit for display
-set output-meta On
-
-# none, visible or audible
-set bell-style none
-
-# All of the following map the escape sequence of the
-# value contained inside the 1st argument to the
-# readline specific functions
-
-"\eOd": backward-word
-"\eOc": forward-word
-
-# for linux console
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-
-# for xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# End /etc/inputrc</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: chive/intltool.xml
===================================================================
--- archive/intltool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,206 +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 intltool-download-http "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
-  <!ENTITY intltool-download-ftp  " ">
-  <!ENTITY intltool-md5sum        "23fbd879118253cb99aeac067da5f591">
-  <!ENTITY intltool-size          "188 KB">
-  <!ENTITY intltool-buildsize     "1.4 MB">
-  <!ENTITY intltool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="intltool" xreflabel="Intltool-&intltool-version;">
-  <?dbhtml filename="intltool.html"?>
-
-
-  <title>Intltool-&intltool-version;</title>
-
-  <indexterm zone="intltool">
-    <primary sortas="a-Intltool">Intltool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Intltool</title>
-
-    <para>
-      The <application>Intltool</application> is an internationalization
-      tool used for extracting translatable strings from source files,
-      collecting the extracted strings with messages from traditional
-      source files (<filename class="directory">&lt;source
-      directory&gt;/&lt;package&gt;/po</filename>) and merging the
-      translations into <filename>.xml</filename>,
-      <filename>.desktop</filename> and <filename>.oaf</filename> files.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&intltool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&intltool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &intltool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &intltool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &intltool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &intltool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Intltool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="perl-xml-parser"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/intltool"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intltool</title>
-
-    <para>
-      Install <application>Intltool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D doc/I18N-HOWTO \
-    /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          intltool-extract, intltool-merge, intltool-prepare,
-          intltool-update and intltoolize
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/intltool-&intltool-version; and
-          /usr/share/intltool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="intltoolize">
-        <term><command>intltoolize</command></term>
-        <listitem>
-          <para>
-            prepares a package to use
-            <application>intltool</application>.
-          </para>
-          <indexterm zone="intltool intltoolize">
-            <primary sortas="b-intltoolize">intltoolize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-extract">
-        <term><command>intltool-extract</command></term>
-        <listitem>
-          <para>
-            generates header files that can be read by
-            <command>gettext</command>.
-          </para>
-          <indexterm zone="intltool intltool-extract">
-            <primary sortas="b-intltool-extract">intltool-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-merge">
-        <term><command>intltool-merge</command></term>
-        <listitem>
-          <para>
-            merges translated strings into various file types.
-          </para>
-          <indexterm zone="intltool intltool-merge">
-            <primary sortas="b-intltool-merge">intltool-merge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-prepare">
-        <term><command>intltool-prepare</command></term>
-        <listitem>
-          <para>
-            updates pot files and merges them with translation files.
-          </para>
-          <indexterm zone="intltool intltool-prepare">
-            <primary sortas="b-intltool-prepare">intltool-prepare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-update">
-        <term><command>intltool-update</command></term>
-        <listitem>
-          <para>
-            updates the <filename>po</filename> template files and merges
-            them with the translations.
-          </para>
-          <indexterm zone="intltool intltool-update">
-            <primary sortas="b-intltool-update">intltool-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/ispell.xml
===================================================================
--- archive/ispell.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY ispell-download-http "http://membled.com/work/patches/ispell/ispell-&ispell-version;.tar.bz2">
-  <!ENTITY ispell-download-ftp " ">
-  <!ENTITY ispell-md5sum "d5d867e62776524f60b3b5dcc3d8014f">
-  <!ENTITY ispell-size "1.2 MB">
-  <!ENTITY ispell-buildsize "11 MB">
-  <!ENTITY ispell-time "less than 0.1 SBU">
-]>
-
-<sect1 id="ispell" xreflabel="ispell-&ispell-version;">
-  <?dbhtml filename="ispell.html"?>
-
-
-  <title>Ispell-&ispell-version;</title>
-
-  <indexterm zone="ispell">
-    <primary sortas="a-Ispell">Ispell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ispell</title>
-
-    <para>The <application>ispell</application> package contains a spell
-    checker that can handle international languages.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ispell-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ispell-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ispell-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ispell-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ispell-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ispell-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ispell"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ispell</title>
-
-    <para>The first step is to create <filename>local.h</filename>.</para>
-
-<screen><userinput>sed -e "s:/usr/local:/usr:g" -e "s:/lib:/share/ispell:" \
-    local.h.linux > local.h</userinput></screen>
-
-    <para>By default, <application>ispell</application> only installs an American
-    English dictionary. To set up other languages, check out the
-    <filename>config.X</filename> file for the #define entry to append to
-    <filename>local.h</filename>.</para>
-
-    <para>Build <application>ispell</application> using the
-    following commands:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>To test the build, issue: <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -e "s:/usr/local:/usr:g" -e "s:/lib:/share/ispell:"
-    local.h.linux > local.h</command>: This command corrects the
-    installation directories of the package.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ispell</seg>
-        <seg>None</seg>
-        <seg>/usr/share/ispell</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ispell-prog">
-        <term><command>ispell</command></term>
-        <listitem>
-          <para>is used for spell checking.</para>
-          <indexterm zone="ispell ispell-prog">
-            <primary sortas="b-ispell">ispell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/jadetex.xml
===================================================================
--- archive/jadetex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,298 +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 jadetex-download-http "&sourceforge-repo;/jadetex/jadetex-&jadetex-version;.tar.gz">
-  <!ENTITY jadetex-download-ftp  "&gentoo-ftp-repo;/jadetex-&jadetex-version;.tar.gz">
-  <!ENTITY jadetex-md5sum        "634dfc172fbf66a6976e2c2c60e2d198">
-  <!ENTITY jadetex-size          "103 KB">
-  <!ENTITY jadetex-buildsize     "9.3 MB">
-  <!ENTITY jadetex-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="jadetex" xreflabel="JadeTeX-&jadetex-version;">
-  <?dbhtml filename="jadetex.html"?>
-
-
-  <title>JadeTeX-&jadetex-version;</title>
-
-  <indexterm zone="jadetex">
-    <primary sortas="a-JadeTeX">JadeTeX</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JadeTeX</title>
-
-    <para>The <application>JadeTeX</application> package is a companion package
-    to the <application>OpenJade</application> DSSSL processor.
-    <application>JadeTeX</application> transforms high level LaTeX macros into
-    DVI/PostScript and Portable Document Format (PDF) forms.</para>
-
-    &lfs70_checked;
-
-    <important>
-      <para>Do not install this package if you have already installed
-      <xref linkend="texlive"/>. The <application>TeX Live</application>
-      installation includes the <application>JadeTeX</application>
-      components.</para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&jadetex-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&jadetex-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &jadetex-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &jadetex-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jadetex-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &jadetex-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended demo files: <ulink
-        url="&sources-anduin-http;/j/jadetex-3.13-demo.tar.bz2"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JadeTeX Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="texlive"/> and
-    <xref linkend="openjade"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/jadetex"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JadeTeX</title>
-
-    <para>If you downloaded the demo files tarball, unpack it along with the
-    source tarball. It will unpack as a
-    <filename class='directory'>demo</filename> directory in the root of the
-    source tree.</para>
-
-    <para>First, as the <systemitem class="username">root</systemitem> user,
-    make some required modifications to the <filename>texmf.cnf</filename>
-    file already installed on the system by the <application>texlive</application>
-    package, then build a new <filename>latex.fmt</filename> file using the
-    following commands:</para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>sed -i.orig -e "s/original texmf.cnf/modified texmf.cnf/" \
-            -e "s/memory hog.../&amp;\npool_size.context = 750000/" \
-    $(kpsewhich texmf.cnf) &amp;&amp;
-cat &gt;&gt; $(kpsewhich texmf.cnf) &lt;&lt; "EOF"
-<literal>
-% The following 3 sections added for JadeTeX
-
-% latex settings
-main_memory.latex = 1100000
-param_size.latex = 1500
-stack_size.latex = 1500
-hash_extra.latex = 15000
-string_vacancies.latex = 45000
-pool_free.latex = 47500
-nest_size.latex = 500
-save_size.latex = 5000
-pool_size.latex = 500000
-max_strings.latex = 55000
-font_mem_size.latex= 400000
-
-% jadetex settings
-main_memory.jadetex = 1500000
-param_size.jadetex = 1500
-stack_size.jadetex = 1500
-hash_extra.jadetex = 50000
-string_vacancies.jadetex = 45000
-pool_free.jadetex = 47500
-nest_size.jadetex = 500
-save_size.jadetex = 5000
-pool_size.jadetex = 500000
-max_strings.jadetex = 55000
-
-% pdfjadetex settings
-main_memory.pdfjadetex = 2500000
-param_size.pdfjadetex = 1500
-stack_size.pdfjadetex = 1500
-hash_extra.pdfjadetex = 50000
-string_vacancies.pdfjadetex = 45000
-pool_free.pdfjadetex = 47500
-nest_size.pdfjadetex = 500
-save_size.pdfjadetex = 5000
-pool_size.pdfjadetex = 500000
-max_strings.pdfjadetex = 55000
-</literal>
-EOF
-LATEX_FMT_DIR="$(kpsewhich -expand-var '$TEXMFSYSVAR')/web2c" &amp;&amp;
-mv -v $(kpsewhich latex.fmt) $(kpsewhich latex.fmt).orig &amp;&amp;
-mv -v $LATEX_FMT_DIR/latex.log $LATEX_FMT_DIR/latex.log.orig &amp;&amp;
-fmtutil-sys --byfmt latex</userinput></screen>
-
-    <para>Install <application>JadeTex</application> using the following
-    commands:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m755 -d \
-    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex/config &amp;&amp;
-install -v -m644 dsssl.def jadetex.ltx *.sty \
-    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex &amp;&amp;
-install -v -m644 {,pdf}jadetex.ini \
-    $(kpsewhich -expand-var '$TEXMFLOCAL')/tex/jadetex/config &amp;&amp;
-FMTUTIL_CNF="$(kpsewhich fmtutil.cnf)" &amp;&amp;
-mv $FMTUTIL_CNF $FMTUTIL_CNF.orig &amp;&amp;
-cat $FMTUTIL_CNF.orig - &gt;&gt; $FMTUTIL_CNF &lt;&lt; "EOF"
-<literal>
-# JadeTeX formats:
-jadetex         etex            -               "&amp;latex"     jadetex.ini
-pdfjadetex      pdfetex         -               "&amp;pdflatex"  pdfjadetex.ini
-</literal>
-EOF
-mv -v $(kpsewhich -expand-var '$TEXMFMAIN')/ls-R \
-      $(kpsewhich -expand-var '$TEXMFMAIN')/ls-R.orig &amp;&amp;
-mv -v $(kpsewhich -expand-var '$TEXMFSYSVAR')/ls-R \
-      $(kpsewhich -expand-var '$TEXMFSYSVAR')/ls-R.orig &amp;&amp;
-mktexlsr &amp;&amp;
-fmtutil-sys --byfmt jadetex &amp;&amp;
-fmtutil-sys --byfmt pdfjadetex &amp;&amp;
-mktexlsr &amp;&amp;
-ln -v -sf $(which etex) /usr/bin/jadetex &amp;&amp;
-ln -v -sf $(which pdfetex) /usr/bin/pdfjadetex &amp;&amp;
-install -v -m644 -D index.html \
-    /usr/share/doc/jadetex-&jadetex-version;/index.html &amp;&amp;
-install -v -m644 *.1 /usr/share/man/man1</userinput></screen>
-
-    <para>If you downloaded the demo files tarball, issue the following
-    commands as an unprivileged user to test the functionality of the new
-    <application>JadeTex</application> installation:</para>
-
-<screen><userinput>cd demo &amp;&amp;
-openjade -t tex -d demo.dsl demo.sgm &amp;&amp;
-jadetex demo.tex &amp;&amp;
-pdfjadetex demo.tex &amp;&amp;
-ls -lrt &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>The commands should complete without errors or warnings and create
-    <filename>demo.dvi</filename> and <filename>demo.pdf</filename> files.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e ... -e ... $(kpsewhich texmf.cnf)</command>:
-    This command uses <command>kpsewhich</command> to locate the installed
-    <filename>texmf.cnf</filename>. The first change is used to modify the
-    header of the file so that if <application>texlive</application> is upgraded,
-    the file won't get overwritten. The next change adds a parameter to
-    increase ConTeXt's memory size to accommodate
-    <application>JadeTeX</application>.</para>
-
-    <para><command>fmtutil-sys ...</command>: These commands are used to build
-    the <filename>latex.fmt</filename>, <filename>jadetex.fmt</filename> and
-    <filename>pdfjadetex.fmt</filename> files. Additionally, the command
-    automagically places the files in the correct directory.</para>
-
-    <para><command>mktexlsr; ln -v -sf tex ...; ln -v -sf pdftex ...</command>:
-    The <application>JadeTeX</application> programs are actually just symlinks
-    to the <application>texlive</application> programs. <command>mktexlsr</command>
-    updates <application>texlive</application>'s <filename>ls-R</filename> databases
-    used by the <filename class='libraryfile'>libkpathsea</filename> library so
-    that <application>texlive</application> knows to use the
-    <application>JadeTeX</application> <filename>.fmt</filename> files when
-    <command>jadetex</command> or <command>pdfjadetex</command> is called.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring JadeTeX</title>
-
-    <sect3>
-      <title>Config Files</title>
-
-      <para><filename>jadetex.dtx</filename> in the
-      <application>JadeTeX</application> source tree.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>If you need to modify the default <application>JadeTeX</application>
-      macro settings, see the
-      <ulink url="http://jadetex.sourceforge.net/#index-div-d18e397">
-      <application>JadeTeX</application> FAQ</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>jadetex and pdfjadetex</seg>
-        <seg>None</seg>
-        <seg>/usr/share/texmf-local and
-        /usr/share/doc/jadetex-&jadetex-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jadetex-prog">
-        <term><command>jadetex</command></term>
-        <listitem>
-          <para>transforms LaTeX macros created by
-          <application>OpenJade</application> into DVI/PostScript forms.</para>
-          <indexterm zone="jadetex jadetex-prog">
-            <primary sortas="b-jadetex">jadetex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfjadetex">
-        <term><command>pdfjadetex</command></term>
-        <listitem>
-          <para>transforms LaTeX macros created by
-          <application>OpenJade</application> into Portable Document Format
-          (PDF) forms.</para>
-          <indexterm zone="jadetex pdfjadetex">
-            <primary sortas="b-pdfjadetex">pdfjadetex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/jdk.SAVE
===================================================================
--- archive/jdk.SAVE	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,962 +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 jdk-download-binary       "http://java.sun.com/javase/downloads/index.jsp">
-  <!ENTITY jdk-bin-md5sum            "f7528500c17c09546566e05988beda86">
-  <!ENTITY jdk-bin-size              "67 MB">
-  <!ENTITY jdk-bin-buildsize         "207 MB">
-  <!ENTITY jdk-bin-version           "6u5">
-
-  <!ENTITY jdk-source-jrl-md5sum     "83390379fb9f3193e93a9d5eed5b31d9">
-  <!ENTITY jdk-source-bin-md5sum     "8b6f1b8d8dec051c18385539111141ec">
-  <!ENTITY jdk-source-moz-md5sum     "6dcaf7af16211617adff5d672a8b79f4">
-
-  <!ENTITY jdk-source-jrl-size       "111 MB">
-  <!ENTITY jdk-source-bin-size       "2 MB">
-  <!ENTITY jdk-source-moz-size       "8.2 MB">
-
-  <!ENTITY jdk-src-buildsize         "1.5 GB">
-  <!ENTITY jdk-time                  "12.5 SBU (for both installations)">
-  <!ENTITY jdk-version-string        "6u3">
-  <!ENTITY jdk-bin-version-string    "1.6.0_05">
-
-  <!ENTITY jdk-download-source-jrl "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-src-b05-jrl-24_sep_2007.jar">
-  <!ENTITY jdk-download-source-bin "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-bin-b05-jrl-24_sep_2007.jar">
-  <!ENTITY jdk-download-source-moz "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-mozilla_headers-b05-unix-24_sep_2007.jar">
-
-]>
-
-<sect1 id="jdk" xreflabel="JDK-&jdk-version;">
-  <?dbhtml filename="jdk.html" ?>
-
-
-  <title>JDK-&jdk-version;</title>
-
-  <indexterm zone="jdk">
-    <primary sortas="a-JDK">JDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JDK</title>
-
-    <para>The <application>JDK</application> package contains
-    Sun's <application>Java</application> development environment. This is
-    useful for developing <application>Java</application> programs and provides
-    the runtime environment necessary to run <application>Java</application>
-    programs.  It also includes a plug-in for browsers so that they can be
-    <application>Java</application> aware.</para>
-
-    <!-- Previously, the plugin included
-    in the <application>JDK</application> binary package was unusable on LFS
-    owing to incompatibilities with <application>GCC</application>-3 compiled
-    browsers.  This is not the case anymore.</para> -->
-
-    <para>The <application>JDK</application> comes in two flavors, a
-    precompiled binary and a source package. You will first need to download
-    and install the binary version of the <application>JDK</application>
-    (you'll need to click and agree to the <quote>Sun Microsystems, Inc.
-    Binary Code License Agreement</quote>). To build from the source, you
-    will need to read, and agree to the Sun
-    <!--<ulink url="&patch-root;/jdk-Readme.txt">-->Java Research License<!--</ulink>-->.
-    You will also need to download the additional files and patches to
-    complete the source build as detailed below. Note that in some countries
-    you cannot download the source code.</para>
-
-    <warning><para>Sun has recently decided not to provide JRL sources for
-    the latest update versions of the JDK.  The source build instructions and
-    patches are here for reference only, and contain known security
-    vulnerabilities.  For more information, please see Sun Alerts
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-231246-1">231246</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233321-1">233321</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233322-1">233322</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233323-1">233323</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233324-1">233324</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233325-1">233325</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233326-1">233326</ulink>, and
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233327-1">233327</ulink>.</para>
-    <para>  Sun is actively working on a GPL'd version of the JDK, titled
-    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
-    This new JDK will be licensed under the
-    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
-    Public License, version 2, with the Classpath Exception</ulink>.
-    A stable OpenJDK was not available at the time of writing.</para></warning>
-
-
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (jdk-&jdk-bin-version;-linux-i586.bin):
-        <ulink url="&jdk-download-binary;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &jdk-bin-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &jdk-bin-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jdk-bin-buildsize;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Source Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>JRL Source
-          <simplelist>
-            <member><ulink url="&jdk-download-source-jrl;"/></member>
-            <member>&jdk-source-jrl-md5sum;</member>
-            <member>&jdk-source-jrl-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Source Binaries
-          <simplelist>
-            <member><ulink url="&jdk-download-source-bin;"/></member>
-            <member>&jdk-source-bin-md5sum;</member>
-            <member>&jdk-source-bin-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Mozilla Headers
-          <simplelist>
-            <member><ulink url="&jdk-download-source-moz;"/></member>
-            <member>&jdk-source-moz-md5sum;</member>
-            <member>&jdk-source-moz-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jdk-src-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &jdk-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <bridgehead renderas="sect4">Required Patches</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-version-string;-gcc4-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-version-string;-motif_fixes-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-version-string;-remove_fixed_paths-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies (for binary
-    installation)</bridgehead>
-    <para role="optional">
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="cups"/>, and
-    <xref linkend="gtk2"/></para>
-
-    <bridgehead renderas="sect4">Additional Requirements
-    (for source build, including optional requirements)</bridgehead>
-    <para role="required">
-    <xref linkend="cpio"/>,
-    <xref linkend="ksh"/>,
-    <xref linkend="unzip"/>,
-    <xref linkend="which"/>, and
-    <xref linkend="zip"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/jdk"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JDK</title>
-
-    <para>The instructions below install both the binary and source versions.
-    You may stop after installing the binary version or continue on installing
-    the source version. You can choose to keep either or both.</para>
-
-    <tip>
-      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
-      command below unpacks the distribution into a
-      <filename class='directory'>jdk&jdk-bin-version-string;</filename>
-      directory.  You will be required to view, and then accept (by entering a
-      <keycap>y</keycap> keypress), a license agreement before any files are
-      unpacked. If you are scripting (automating) the build, you'll need to
-      account for this. There is information about automating build commands
-      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
-      the end of this section, specific information for automating this type of
-      installation is discussed.</para>
-    </tip>
-
-    <para>Normally in BLFS, the files are unpacked into a subdirectory
-    and the starting point for the installation procedures is that
-    location.  For this application only, start in the directory where all
-    the downloaded files are located.</para>
-
-    <para>Install the binary <application>JDK</application> with the
-    following commands:</para>
-
-<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
-./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
-
-    <note><para>The installation will end with a message
-    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
-    javaprefix is unset in the environment.  This is by design as
-    <application>GTK+</application> may not be installed during the
-    installation, however, the installation will still exit with a zero error
-    value if scripting the build.</para></note>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cd jdk&jdk-bin-version-string; &amp;&amp;
-install -v -m755 -d /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-mv -v * /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-chown -v -R root:root /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-ln -v -sf xawt/libmawt.so \
-    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>Recent versions of libX11 break libmawt
-    when used with the Xinerama extension.  While still the
-    <systemitem class="username">root</systemitem> user, apply the
-    following sed to the installed binary to work around this
-    problem:</para>
-
-<screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
-    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
-
-    <para>The binary version is now installed.</para>
-
-    <para>If you don't want to compile the source or are not in a position to
-    download the source owing to license restrictions, skip ahead to the
-    configuration section.</para>
-
-    <para>Save the existing path, and append the recently installed
-    <application>JDK</application>.</para>
-
-<screen><userinput>export JAVA_HOME=/opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-export PATH_HOLD=${PATH} &amp;&amp;
-export PATH=${PATH}:${JAVA_HOME}/bin</userinput></screen>
-
-    <para>The source code is contained in self-extracting
-    <filename class='extension'>jar</filename> files.  You
-    will need to be in a windowed environment to extract the sources.
-    Create a directory to store the extracted sources.  Choose the newly
-    created <filename class="directory">jdk-build</filename> directory
-    when prompted for the target directory.</para>
-
-<screen><userinput>mkdir jdk-build &amp;&amp;
-cd jdk-build &amp;&amp;
-for JAR in ../jdk-&jdk-version-string;*.jar
-    do java -jar ${JAR}
-done</userinput></screen>
-
-    <para>Apply all the patches downloaded above:</para>
-
-<screen><userinput>for PATCH in ../jdk-&jdk-version-string;*.patch
-    do patch -Np1 -i ${PATCH}
-done</userinput></screen>
-
-    <para>Use the following commands to apply some minor changes that
-    are a little more specific to BLFS, such as lack of a gcc-2.9
-    compiler, removing a broken demo, and forcing to link to shared
-    libraries.  See the 'Command Explanations' section for more detail:</para>
-
-<screen><userinput>sed -i '/^.*linux)/ { N; /.*/ { N; /.*/d }}' \
-    deploy/make/plugin/{adapter,nscore}/Makefile &amp;&amp;
-sed -i '/.*mtrace.*/ { N; /.*/ s/.*mtrace.*\n.*/\t  mtrace/ }' \
-    j2se/make/mkdemo/jvmti/Makefile &amp;&amp;
-sed -i 's/= true/= false/' \
-    j2se/make/common/shared/Compiler-gcc.gmk</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/X11R6_symlink.xml"/>
-
-    <!-- <para>If your <application>X Window System</application> is installed into
-    any prefix other than <filename class="directory">/usr/X11R6</filename>,
-    execute the following commands, replacing
-    <replaceable>&lt;PREFIX&gt;</replaceable> with the installation prefix of
-    the <application>X Window System</application>:</para>
-
-<screen><userinput>for file in `find . -name Makefile \
-    -or -name Imakefile -or -name *.gmk`
-do sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' $file
-done &amp;&amp;
-sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' \
-    j2se/src/solaris/native/sun/awt/fontpath.c \
-    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.Sun.properties \
-    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.RedHat.3.properties</userinput></screen> -->
-
-    <para>Set/unset some variables which affect the build:</para>
-
-<screen><userinput>export ALT_BOOTDIR=${JAVA_HOME} &amp;&amp;
-export CLASSPATH_HOLD=${CLASSPATH} &amp;&amp;
-export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts &amp;&amp;
-export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin &amp;&amp;
-export MILESTONE="03-BLFS" &amp;&amp;
-export BUILD_NUMBER="b05" &amp;&amp;
-export INSANE=true &amp;&amp;
-export DEV_ONLY=true &amp;&amp;
-export SKIP_FASTDEBUG_BUILD=true &amp;&amp;
-unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</userinput></screen>
-
-      <warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make
-      the build fail. If you are interested in optimizing the build, set
-      OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.  -O3, even in
-      OTHER_C{,XX}FLAGS, is known to cause a build failure.</para></warning>
-
-
-    <para>Additionally, if you would like to <command>make</command> in
-    parallel, add the following:</para>
-
-<screen><userinput>export HOTSPOT_BUILD_JOBS=<replaceable>&lt;3&gt;</replaceable></userinput></screen>
-
-    <para>Build the <application>JDK</application> with the following
-    commands. There will be a few messages about missing files that look like
-    errors. These are caused by not meeting the expected build environment
-    (Red Hat).  As long as the build doesn't stop, the messages
-    are harmless.</para>
-
-<screen><userinput>pushd control/make &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-    <para>To test the results, you can run one of the provided demo programs
-    using the newly created <command>java</command> binary. Issue the
-    following commands:</para>
-
-<screen><userinput>pushd control/build/linux-i586/j2sdk-image/demo/jfc/Java2D &amp;&amp;
-../../../bin/java -jar Java2Demo.jar &amp;&amp;
-popd</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    install the <application>JDK</application>:</para>
-
-<screen role="root"><userinput>pushd control/build/linux-i586 &amp;&amp;
-cp -v -a j2sdk-image /opt/jdk-&jdk-version-string; &amp;&amp;
-chown -v -R root:root /opt/jdk-&jdk-version-string; &amp;&amp;
-ln -v -sf xawt/libmawt.so  /opt/jdk-&jdk-version-string;/jre/lib/i386/ &amp;&amp;
-popd</userinput></screen>
-
-    <para>Restore the unprivileged user's environment using the following
-    commands:</para>
-
-<screen><userinput>export JAVA_HOME=${ALT_BOOTDIR} &amp;&amp;
-export CLASSPATH=${CLASSPATH_HOLD} &amp;&amp;
-export PATH=${PATH_HOLD} &amp;&amp;
-unset PATH_HOLD ALT_BOOTDIR CLASSPATH_HOLD \
-    ALT_CACERTS_FILE ALT_MOZILLA_HEADERS_PATH \
-    BUILD_NUMBER MILESTONE INSANE DEV_ONLY \
-    SKIP_FASTDEBUG_BUILD</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '/^.*linux)/...</command>: This command disables
-    the build of a gcc-2.9 compatible browser plugin.  LFS does not contain
-    gcc-2.9, and hasn't in quite a few years.</para>
-
-    <para><command>sed -i '/.*mtrace.*/...</command>: This command disables
-    building of the broken 'waiters' demo.</para>
-
-    <para><command>sed -i 's/= true/= false/'...</command>: This command
-    forces the compiler to link against the standard C libraries
-    dynamically.</para>
-
-    <para><command>export ALT_BOOTDIR=${JAVA_HOME}</command>: This variable sets
-    the location of the bootstrap <application>JDK</application>.</para>
-
-    <para><command>export ALT_CACERTS_FILE...</command>: Specifies the
-    certificate file to use (from the installed binary
-    <application>JDK</application>).</para>
-
-    <para><command>export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/</command>:
-    This tells the build exactly where to find the
-    <application>Mozilla</application> headers.  This has changed since the
-    previous version and is not mentioned in the installation documentation
-    included with the package source.</para>
-
-    <para><command>export MILESTONE="03-BLFS"</command>: This appends
-    the string '03-BLFS' to the buld number.  'internal' is
-    unconditionally added if MILESTONE is unset.  This is similar
-    to the format used by Sun for the official release.</para>
-
-    <para><command>export BUILD_NUMBER="b05"</command>:
-    This will help you identify the compiled version of the runtime
-    environment and virtual machine by appending this information to
-    the version string. This is the same build number used by Sun to
-    identify the official release.</para>
-
-    <para><command>export INSANE=true</command>: The certified platform for the
-    build is Redhat Enterprise Advanced Server 2.1. This variable ensures that
-    all the errors related to compiling on a non-certified platform will be
-    displayed as warnings instead of errors.</para>
-
-    <para><command>export DEV_ONLY=true</command>: This command
-    skips compiling the comparison build.</para>
-
-    <para><command>export SKIP_FASTDEBUG_BUILD=true</command>: This command
-    skips building of the debug version.  Omit this command if you need
-    to build the fastdebug target.</para>
-
-    <para><command>unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</command>:
-    These variables cause miscompilation of the build. Never set them.</para>
-
-    <para><command>ln -sf xawt/libmawt.so
-    /opt/jdk-&jdk-version-string;/jre/lib/i386/</command>: This fixes
-    linking issues with other applications that expect to find the
-    <application>motif</application> libraries with the other
-    <application>JDK</application> libraries.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring JDK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>There are now two Java 2 SDKs installed in
-      <filename>/opt</filename>. You should decide on which one you
-      would like to use as the default. For example if you decide to use the
-      precompiled <application>JDK</application>, do the following as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -v -nsf jdk-bin-&jdk-bin-version; /opt/jdk</userinput></screen>
-
-    <para>The information below assumes your system is set up using the
-    instructions found in
-    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
-    extract the relevant information below and incorporate it into your
-    system's startup files if your system is set up differently.</para>
-
-    <para>Add the following <filename>jdk.sh</filename> shell startup file to
-    the <filename>/etc/profile.d</filename> directory with the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/jdk.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk
-
-# Adjust PATH
-pathappend ${JAVA_HOME}/bin PATH
-
-# Auto Java CLASSPATH
-# Copy jar files to, or create symlinks in this directory
-AUTO_CLASSPATH_DIR=/usr/lib/classpath
-pathprepend . CLASSPATH
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-export JAVA_HOME CLASSPATH
-unset AUTO_CLASSPATH_DIR
-unset dir
-
-# End /etc/profile.d/jdk.sh</literal>
-EOF</userinput></screen>
-
-    <para>The <application>Java</application> plugin is located in
-    <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns7/</filename>.
-    Make a symbolic link to the file in that directory from your browser(s)
-    plugins directory.</para>
-
-    <important>
-      <para>The plugin must be a symlink for it to work. If not, the browsers
-      will crash when you attempt to load a <application>Java</application>
-      application.</para>
-    </important>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
-        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
-        javaws, jconsole, jdb, jhat, jinfo, jmap, jps,
-        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
-        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
-        schemagen, serialver, servertool, tnameserv, unpack200,
-        wsgen, wsimport, and xjc</seg>
-        <seg><envar>$JAVA_HOME</envar>/lib/*,
-        <envar>$JAVA_HOME</envar>/jre/lib/*,
-        and libjavaplugin_oji.so</seg>
-        <seg>/opt/jdk-&jdk-version-string;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appletviewer">
-        <term><command>appletviewer</command></term>
-        <listitem>
-          <para>runs Java applets outside of the context of a browser.</para>
-          <indexterm zone="jdk appletviewer">
-            <primary sortas="b-appletviewer">appletviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apt">
-        <term><command>apt</command></term>
-        <listitem>
-          <para>is an annotation processing tool.</para>
-          <indexterm zone="jdk apt">
-            <primary sortas="b-apt">apt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extcheck">
-        <term><command>extcheck</command></term>
-        <listitem>
-          <para>checks a specified jar file for title and version conflicts
-          with any extensions installed in the <application>JDK</application>
-          software.</para>
-          <indexterm zone="jdk extcheck">
-            <primary sortas="b-extcheck">extcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="HtmlConverter">
-        <term><command>HtmlConverter</command></term>
-        <listitem>
-          <para>adds Java auto download to html and asp pages. </para>
-          <indexterm zone="jdk HtmlConverter">
-            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idlj">
-        <term><command>idlj</command></term>
-        <listitem>
-          <para>generates Java bindings from a given IDL file.</para>
-          <indexterm zone="jdk idlj">
-            <primary sortas="b-idlj">idlj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jar">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>combines multiple files into a single jar archive.</para>
-          <indexterm zone="jdk jar">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>signs jar files and verifies the signatures and integrity
-          of a signed jar file.</para>
-          <indexterm zone="jdk jarsigner">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java">
-        <term><command>java</command></term>
-        <listitem>
-          <para>launches a Java application by starting a Java runtime
-          environment, loading a specified class and invoking its main
-          method.</para>
-          <indexterm zone="jdk java">
-            <primary sortas="b-java">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>reads class and interface definitions, written in the
-          Java programming language, and compiles them into bytecode
-          class files.</para>
-          <indexterm zone="jdk javac">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>parses the declarations and documentation comments in a
-          set of Java source files and produces a corresponding set of
-          HTML pages describing the classes, interfaces,constructors,
-          methods, and fields.</para>
-          <indexterm zone="jdk javadoc">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javah">
-        <term><command>javah</command></term>
-        <listitem>
-          <para>generates C header and source files
-          that are needed to implement native methods.</para>
-          <indexterm zone="jdk javah">
-            <primary sortas="b-javah">javah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>disassembles a Java class file.</para>
-          <indexterm zone="jdk javap">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-rmi.cgi">
-        <term><command>java-rmi.cgi</command></term>
-        <listitem>
-          <para>is the Java RMI client.</para>
-          <indexterm zone="jdk java-rmi.cgi">
-            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javaws">
-        <term><command>javaws</command></term>
-        <listitem>
-          <para>launches Java application/applets hosted on a network.</para>
-          <indexterm zone="jdk javaws">
-            <primary sortas="b-javaws">javaws</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>is a graphical console tool to monitor and manage both
-          local and remote Java applications and virtual machines.</para>
-          <indexterm zone="jdk jconsole">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>is a simple command-line debugger for Java classes.</para>
-          <indexterm zone="jdk jdb">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhat">
-        <term><command>jhat</command></term>
-        <listitem>
-          <para>parses a java heap dump file and allows viewing
-          in a webbrowser.</para>
-          <indexterm zone="jdk jhat">
-            <primary sortas="b-jhat">jhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>prints Java configuration information for a given Java
-          process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jinfo">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>prints shared object memory maps or heap memory details
-          of a given process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jmap">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>lists the instrumented JVMs on the target system.</para>
-          <indexterm zone="jdk jps">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>is a command line script shell.</para>
-          <indexterm zone="jdk jrunscript">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsadebugd">
-        <term><command>jsadebugd</command></term>
-        <listitem>
-          <para>attaches to a Java process or core file and acts as a
-          debug server.</para>
-          <indexterm zone="jdk jsadebugd">
-            <primary sortas="b-jsadebugd">jsadebugd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>prints Java stack traces of Java threads for a given
-          Java process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jstack">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>displays performance statistics for an instrumented JVM.</para>
-          <indexterm zone="jdk jstat">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>is an RMI server application that monitors for the creation
-          and termination of instrumented JVMs.</para>
-          <indexterm zone="jdk jstatd">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>is a key and certificate management utility.</para>
-          <indexterm zone="jdk keytool">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="native2ascii">
-        <term><command>native2ascii</command></term>
-        <listitem>
-          <para> converts files that contain non-supported character encoding
-          into files containing Latin-1 or Unicode-encoded characters.</para>
-          <indexterm zone="jdk native2ascii">
-            <primary sortas="b-native2ascii">native2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="orbd">
-        <term><command>orbd</command></term>
-        <listitem>
-          <para>is used to enable clients to transparently locate and invoke
-          persistent objects on servers in the CORBA environment.</para>
-          <indexterm zone="jdk orbd">
-            <primary sortas="b-orbd">orbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pack200">
-        <term><command>pack200</command></term>
-        <listitem>
-          <para>is a Java application that transforms a jar file into a
-          compressed pack200 file using the Java gzip compressor.</para>
-          <indexterm zone="jdk pack200">
-            <primary sortas="b-pack200">pack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="policytool">
-        <term><command>policytool</command></term>
-        <listitem>
-          <para>creates and manages a policy file graphically.</para>
-          <indexterm zone="jdk policytool">
-            <primary sortas="b-policytool">policytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmic">
-        <term><command>rmic</command></term>
-        <listitem>
-          <para>generates stub and skeleton class files for remote objects
-          from the names of compiled Java classes that contain remote
-          object implementations.</para>
-          <indexterm zone="jdk rmic">
-            <primary sortas="b-rmic">rmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmid">
-        <term><command>rmid</command></term>
-        <listitem>
-          <para>starts the activation system daemon.</para>
-          <indexterm zone="jdk rmid">
-            <primary sortas="b-rmid">rmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>creates and starts a remote object registry on the specified
-          port on the current host.</para>
-          <indexterm zone="jdk rmiregistry">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="schemagen">
-        <term><command>schemagen</command></term>
-        <listitem>
-          <para>is a Java XML binding schema generator.</para>
-          <indexterm zone="jdk schemagen">
-            <primary sortas="b-schemagen">schemagen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>returns the serialVersionUID for one or more classes in a
-          form suitable for copying into an evolving class.</para>
-          <indexterm zone="jdk serialver">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="servertool">
-        <term><command>servertool</command></term>
-        <listitem>
-          <para>provides an ease-of-use interface for application programmers
-          to register, unregister, startup and shutdown a server.</para>
-          <indexterm zone="jdk servertool">
-            <primary sortas="b-servertool">servertool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tnameserv">
-        <term><command>tnameserv</command></term>
-        <listitem>
-          <para>starts the Java IDL name server.</para>
-          <indexterm zone="jdk tnameserv">
-            <primary sortas="b-tnameserv">tnameserv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unpack200">
-        <term><command>unpack200</command></term>
-        <listitem>
-          <para>is a native implementation that transforms a packed file
-          produced by <application>pack200</application> into a jar
-          file.</para>
-          <indexterm zone="jdk unpack200">
-            <primary sortas="b-unpack200">unpack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsgen">
-        <term><command>wsgen</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts used in JAX-WS
-          web services.</para>
-          <indexterm zone="jdk wsgen">
-            <primary sortas="b-wsgen">wsgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsimport">
-        <term><command>wsimport</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts.</para>
-          <indexterm zone="jdk wsimport">
-            <primary sortas="b-wsimport">wsimport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xjc">
-        <term><command>xjc</command></term>
-        <listitem>
-          <para>is a Java XML binding compiler.</para>
-          <indexterm zone="jdk xjc">
-            <primary sortas="b-xjc">xjc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/jdk.xml
===================================================================
--- archive/jdk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,699 +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 jdk-download-http   "http://java.sun.com/javase/downloads/index.jsp">
-  <!ENTITY jdk-md5sum          "ad5ee976522bf5767100a8b4b981c690">
-  <!ENTITY jdk-size            "85 MB">
-  <!ENTITY jdk-buildsize       "250 MB">
-  <!ENTITY jdk-bin-version     "6u18">
-  <!ENTITY jdk-build-time      "0.1 SBU">
-  <!ENTITY jdk-version-string  "1.6.0_18">
-
-]>
-
-<sect1 id="jdk" xreflabel="JDK-&jdk-version;">
-  <?dbhtml filename="jdk.html" ?>
-
-
-  <title>JDK-&jdk-version;</title>
-
-  <indexterm zone="jdk">
-    <primary sortas="a-JDK">JDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JDK</title>
-
-    <para>The <application>JDK</application> package contains
-    Sun's <application>Java</application> development environment. This is
-    useful for developing <application>Java</application> programs and provides
-    the runtime environment necessary to run <application>Java</application>
-    programs.  It also includes a plug-in for browsers so that they can be
-    <application>Java</application> aware.</para>
-
-
-<!--
-    <note><para>Sun has recently decided not to provide JRL sources for
-    the latest update versions of the JDK. Sun is actively working on a GPL'd
-    version of the JDK, titled
-    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
-    This new JDK will be licensed under the
-    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
-    Public License, version 2, with the Classpath Exception</ulink>.
-    A stable OpenJDK was not available at the time of writing.</para></note>
--->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (jdk-&jdk-bin-version;-linux-i586.bin):
-        <ulink url="&jdk-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &jdk-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &jdk-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jdk-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &jdk-build-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="cups"/>, and
-    <xref linkend="gtk2"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/jdk"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JDK</title>
-
-    <tip>
-      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
-      command below unpacks the distribution into a
-      <filename class='directory'>jdk&jdk-version-string;</filename>
-      directory.  You will be required to view, and then accept (by entering a
-      <keycap>y</keycap> keypress), a license agreement before any files are
-      unpacked. If you are scripting (automating) the build, you'll need to
-      account for this. There is information about automating build commands
-      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
-      the end of this section, specific information for automating this type of
-      installation is discussed.</para>
-    </tip>
-
-    <para>Normally in BLFS, the files are unpacked into a subdirectory
-    and the starting point for the installation procedures is that
-    location.  For this application only, start in the directory where all
-    the downloaded files are located.</para>
-
-    <para>Install the <application>JDK</application> with the
-    following commands:</para>
-
-<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
-./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
-
-    <note><para>The installation will end with a message
-    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
-    javaprefix is unset in the environment.  This is by design as
-    <application>GTK+</application> may not be installed during the
-    installation, however, the installation will still exit with a zero error
-    value if scripting the build.</para></note>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cd jdk&jdk-version-string; &amp;&amp;
-install -v -m755 -d /opt/jdk-&jdk-bin-version; &amp;&amp;
-mv -v * /opt/jdk-&jdk-bin-version; &amp;&amp;
-chown -v -R root:root /opt/jdk-&jdk-bin-version; &amp;&amp;
-ln -v -sf xawt/libmawt.so \
-    /opt/jdk-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>Recent versions of libX11 break libmawt
-    when used with the Xinerama extension.  While still the
-    <systemitem class="username">root</systemitem> user, apply the
-    following sed to work around this problem:</para>
-
-<screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
-    /opt/jdk-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>ln -sf xawt/libmawt.so
-    /opt/jdk-&jdk-bin-version;/jre/lib/i386/</command>: This fixes
-    linking issues with other applications that expect to find the
-    <application>motif</application> libraries with the other
-    <application>JDK</application> libraries.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring JDK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-    a symlink to the installation directory:</para>
-
-<screen role="root"><userinput>ln -v -nsf jdk-&jdk-bin-version; /opt/jdk</userinput></screen>
-
-    <para>The information below assumes your system is set up using the
-    instructions found in
-    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
-    extract the relevant information below and incorporate it into your
-    system's startup files if your system is set up differently.</para>
-
-    <para>Add the following <filename>jdk.sh</filename> shell startup file to
-    the <filename>/etc/profile.d</filename> directory with the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/jdk.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk
-
-# Adjust PATH
-pathappend ${JAVA_HOME}/bin PATH
-
-# Auto Java CLASSPATH
-# Copy jar files to, or create symlinks in this directory
-AUTO_CLASSPATH_DIR=/usr/lib/classpath
-pathprepend . CLASSPATH
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-export JAVA_HOME CLASSPATH
-unset AUTO_CLASSPATH_DIR
-unset dir
-
-# End /etc/profile.d/jdk.sh</literal>
-EOF</userinput></screen>
-
-    <para>The <application>Java</application> plugin is located at
-    <filename class="directory">$JAVA_HOME/jre/lib/i386/libnpjp2.so</filename>.
-    Make a symbolic link to the file from your browser(s) plugins
-    directory.</para>
-
-    <important>
-      <para>The plugin must be a symlink for it to work. If not, the browsers
-      will crash when you attempt to load a <application>Java</application>
-      application.</para>
-    </important>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
-        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
-        javaws, jconsole, jcontrol, jdb, jhat, jinfo, jmap, jps,
-        jrunscript, jsadebugd, jstack, jstat, jstatd, jvisualvm, keytool,
-        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
-        schemagen, serialver, servertool, tnameserv, unpack200,
-        wsgen, wsimport, and xjc</seg>
-        <seg><envar>$JAVA_HOME</envar>/lib/*,
-        <envar>$JAVA_HOME</envar>/jre/lib/*</seg>
-        <seg>/opt/jdk-&jdk-bin-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appletviewer">
-        <term><command>appletviewer</command></term>
-        <listitem>
-          <para>runs Java applets outside of the context of a browser.</para>
-          <indexterm zone="jdk appletviewer">
-            <primary sortas="b-appletviewer">appletviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apt">
-        <term><command>apt</command></term>
-        <listitem>
-          <para>is an annotation processing tool.</para>
-          <indexterm zone="jdk apt">
-            <primary sortas="b-apt">apt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extcheck">
-        <term><command>extcheck</command></term>
-        <listitem>
-          <para>checks a specified jar file for title and version conflicts
-          with any extensions installed in the <application>JDK</application>
-          software.</para>
-          <indexterm zone="jdk extcheck">
-            <primary sortas="b-extcheck">extcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="HtmlConverter">
-        <term><command>HtmlConverter</command></term>
-        <listitem>
-          <para>adds Java auto download to html and asp pages. </para>
-          <indexterm zone="jdk HtmlConverter">
-            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idlj">
-        <term><command>idlj</command></term>
-        <listitem>
-          <para>generates Java bindings from a given IDL file.</para>
-          <indexterm zone="jdk idlj">
-            <primary sortas="b-idlj">idlj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jar">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>combines multiple files into a single jar archive.</para>
-          <indexterm zone="jdk jar">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>signs jar files and verifies the signatures and integrity
-          of a signed jar file.</para>
-          <indexterm zone="jdk jarsigner">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java">
-        <term><command>java</command></term>
-        <listitem>
-          <para>launches a Java application by starting a Java runtime
-          environment, loading a specified class and invoking its main
-          method.</para>
-          <indexterm zone="jdk java">
-            <primary sortas="b-java">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>reads class and interface definitions, written in the
-          Java programming language, and compiles them into bytecode
-          class files.</para>
-          <indexterm zone="jdk javac">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>parses the declarations and documentation comments in a
-          set of Java source files and produces a corresponding set of
-          HTML pages describing the classes, interfaces,constructors,
-          methods, and fields.</para>
-          <indexterm zone="jdk javadoc">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javah">
-        <term><command>javah</command></term>
-        <listitem>
-          <para>generates C header and source files
-          that are needed to implement native methods.</para>
-          <indexterm zone="jdk javah">
-            <primary sortas="b-javah">javah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>disassembles a Java class file.</para>
-          <indexterm zone="jdk javap">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-rmi.cgi">
-        <term><command>java-rmi.cgi</command></term>
-        <listitem>
-          <para>is the Java RMI client.</para>
-          <indexterm zone="jdk java-rmi.cgi">
-            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javaws">
-        <term><command>javaws</command></term>
-        <listitem>
-          <para>launches Java application/applets hosted on a network.</para>
-          <indexterm zone="jdk javaws">
-            <primary sortas="b-javaws">javaws</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>is a graphical console tool to monitor and manage both
-          local and remote Java applications and virtual machines.</para>
-          <indexterm zone="jdk jconsole">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jcontrol">
-        <term><command>jcontrol</command></term>
-        <listitem>
-          <para>is a graphical control panel for Java.</para>
-          <indexterm zone="jdk jcontrol">
-            <primary sortas="b-jcontrol">jcontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>is a simple command-line debugger for Java classes.</para>
-          <indexterm zone="jdk jdb">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhat">
-        <term><command>jhat</command></term>
-        <listitem>
-          <para>parses a java heap dump file and allows viewing
-          in a webbrowser.</para>
-          <indexterm zone="jdk jhat">
-            <primary sortas="b-jhat">jhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>prints Java configuration information for a given Java
-          process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jinfo">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>prints shared object memory maps or heap memory details
-          of a given process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jmap">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>lists the instrumented JVMs on the target system.</para>
-          <indexterm zone="jdk jps">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>is a command line script shell.</para>
-          <indexterm zone="jdk jrunscript">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsadebugd">
-        <term><command>jsadebugd</command></term>
-        <listitem>
-          <para>attaches to a Java process or core file and acts as a
-          debug server.</para>
-          <indexterm zone="jdk jsadebugd">
-            <primary sortas="b-jsadebugd">jsadebugd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>prints Java stack traces of Java threads for a given
-          Java process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jstack">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>displays performance statistics for an instrumented JVM.</para>
-          <indexterm zone="jdk jstat">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>is an RMI server application that monitors for the creation
-          and termination of instrumented JVMs.</para>
-          <indexterm zone="jdk jstatd">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jvisualvm">
-        <term><command>jvisualvm</command></term>
-        <listitem>
-          <para>is an intuitive graphical user interface that provides detailed
-          information about Java applications while they are running on a given
-          JVM.</para>
-          <indexterm zone="jdk jvisualvm">
-            <primary sortas="b-jvisualvm">jvisualvm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>is a key and certificate management utility.</para>
-          <indexterm zone="jdk keytool">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="native2ascii">
-        <term><command>native2ascii</command></term>
-        <listitem>
-          <para> converts files that contain non-supported character encoding
-          into files containing Latin-1 or Unicode-encoded characters.</para>
-          <indexterm zone="jdk native2ascii">
-            <primary sortas="b-native2ascii">native2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="orbd">
-        <term><command>orbd</command></term>
-        <listitem>
-          <para>is used to enable clients to transparently locate and invoke
-          persistent objects on servers in the CORBA environment.</para>
-          <indexterm zone="jdk orbd">
-            <primary sortas="b-orbd">orbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pack200">
-        <term><command>pack200</command></term>
-        <listitem>
-          <para>is a Java application that transforms a jar file into a
-          compressed pack200 file using the Java gzip compressor.</para>
-          <indexterm zone="jdk pack200">
-            <primary sortas="b-pack200">pack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="policytool">
-        <term><command>policytool</command></term>
-        <listitem>
-          <para>creates and manages a policy file graphically.</para>
-          <indexterm zone="jdk policytool">
-            <primary sortas="b-policytool">policytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmic">
-        <term><command>rmic</command></term>
-        <listitem>
-          <para>generates stub and skeleton class files for remote objects
-          from the names of compiled Java classes that contain remote
-          object implementations.</para>
-          <indexterm zone="jdk rmic">
-            <primary sortas="b-rmic">rmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmid">
-        <term><command>rmid</command></term>
-        <listitem>
-          <para>starts the activation system daemon.</para>
-          <indexterm zone="jdk rmid">
-            <primary sortas="b-rmid">rmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>creates and starts a remote object registry on the specified
-          port on the current host.</para>
-          <indexterm zone="jdk rmiregistry">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="schemagen">
-        <term><command>schemagen</command></term>
-        <listitem>
-          <para>is a Java XML binding schema generator.</para>
-          <indexterm zone="jdk schemagen">
-            <primary sortas="b-schemagen">schemagen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>returns the serialVersionUID for one or more classes in a
-          form suitable for copying into an evolving class.</para>
-          <indexterm zone="jdk serialver">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="servertool">
-        <term><command>servertool</command></term>
-        <listitem>
-          <para>provides an ease-of-use interface for application programmers
-          to register, unregister, startup and shutdown a server.</para>
-          <indexterm zone="jdk servertool">
-            <primary sortas="b-servertool">servertool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tnameserv">
-        <term><command>tnameserv</command></term>
-        <listitem>
-          <para>starts the Java IDL name server.</para>
-          <indexterm zone="jdk tnameserv">
-            <primary sortas="b-tnameserv">tnameserv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unpack200">
-        <term><command>unpack200</command></term>
-        <listitem>
-          <para>is a native implementation that transforms a packed file
-          produced by <application>pack200</application> into a jar
-          file.</para>
-          <indexterm zone="jdk unpack200">
-            <primary sortas="b-unpack200">unpack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsgen">
-        <term><command>wsgen</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts used in JAX-WS
-          web services.</para>
-          <indexterm zone="jdk wsgen">
-            <primary sortas="b-wsgen">wsgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsimport">
-        <term><command>wsimport</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts.</para>
-          <indexterm zone="jdk wsimport">
-            <primary sortas="b-wsimport">wsimport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xjc">
-        <term><command>xjc</command></term>
-        <listitem>
-          <para>is a Java XML binding compiler.</para>
-          <indexterm zone="jdk xjc">
-            <primary sortas="b-xjc">xjc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/jinja2.xml
===================================================================
--- archive/jinja2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +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 Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
-  <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "&Jinja2-md5sum;">
-  <!ENTITY Jinja2-size          "264 KB">
-  <!ENTITY Jinja2-buildsize     "1.9 MB">
-  <!ENTITY Jinja2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Jinja2 -->
-  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;" revision="sysv">
-
-    <title>Jinja2-&Jinja2-version;</title>
-
-    <indexterm zone="Jinja2">
-      <primary sortas="a-Jinja2">Jinja2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Jinja2 Module</title>
-
-      <para>
-        <application>Jinja2</application> is a <application>Python</application>
-        module that implements a simple pythonic template language.
-      </para>
-
-      <note revision="systemd">
-        <para>
-          <application>Jinja2</application> was installed in LFS.
-          The instruction is only kept here for SysV revision.
-        </para>
-      </note>
-
-      &lfs113_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Jinja2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Jinja2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Jinja2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Jinja2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="MarkupSafe"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Jinja2</title>
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        Install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Jinja2</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2 and
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: chive/js.xml
===================================================================
--- archive/js.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,226 +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 JS-download-http "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs&JS-version;.tar.gz">
-<!--  <!ENTITY JS-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/js/mozjs&JS-version;.tar.gz">-->
-  <!ENTITY JS-download-ftp " ">
-  <!ENTITY JS-md5sum        "20b6f8f1140ef6e47daa3b16965c9202">
-  <!ENTITY JS-size          "6.5 MB">
-  <!ENTITY JS-buildsize     "1.2 GB">
-  <!ENTITY JS-time          "5.0 SBU">
-]>
-
-<sect1 id="JS" xreflabel="JS-&JS-version;">
-  <?dbhtml filename="js.html"?>
-
-
-  <title>JS-&JS-version;</title>
-
-  <indexterm zone="JS">
-    <primary sortas="a-JS">JS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C/C++.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&JS-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&JS-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &JS-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &JS-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &JS-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &JS-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libffi"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="python2"/> and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/JS"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <para>
-      Install <application>JS</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>cd js/src &amp;&amp;
-
-sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl &amp;&amp;
-
-./configure --prefix=/usr       \
-            --enable-readline   \
-            --enable-threadsafe \
-            --with-system-ffi   \
-            --with-system-nspr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-find /usr/include/js-17.0/            \
-     /usr/lib/libmozjs-17.0.a         \
-     /usr/lib/pkgconfig/mozjs-17.0.pc \
-     -type f -exec chmod -v 644 {} \;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... config/milestone.pl</command>: Fix an
-      issue caused by perl-5.22.0 and later.
-    </para>
-
-    <para>
-      <parameter>--enable-threadsafe</parameter>: This switch enables
-      support for multiple threads.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables
-      <application>Readline</application> support in JS shell.
-    </para>
-
-    <para>
-      <parameter>--with-system-ffi</parameter>: This switch forces the
-      package to link to the system version of <application>libffi</application>
-      instead of using its included, and now old, version.
-    </para>
-
-    <para>
-      <parameter>--with-system-nspr</parameter>: This switch forces the
-      package to link to the system version of <application>NSPR</application>
-      instead of using its included, and now old, version.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          js17 and js17-config
-        </seg>
-        <seg>
-          libmozjs-17.0.a and libmozjs-17.0.so
-        </seg>
-        <seg>
-          /usr/include/js-17.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js17">
-        <term><command>js17</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the JavaScript engine.
-          </para>
-          <indexterm zone="JS js17">
-            <primary sortas="b-js17">js17</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js17-config">
-        <term><command>js17-config</command></term>
-        <listitem>
-          <para>
-            is used to find out <application>JS</application>
-            compiler and linker flags.
-          </para>
-          <indexterm zone="JS js17-config">
-            <primary sortas="b-js17-config">js17-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs">
-        <term><filename class="libraryfile">libmozjs-17.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mozilla JavaScript</application> API functions.
-          </para>
-          <indexterm zone="JS libmozjs">
-            <primary sortas="c-libmozjs">libmozjs-17.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/js2.xml
===================================================================
--- archive/js2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,231 +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 JS2-download-http "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-&JS2-version;.tar.bz2">
-<!--  <!ENTITY JS2-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/js/mozjs-&JS2-version;.tar.bz2">-->
-  <!ENTITY JS2-download-ftp " ">
-  <!ENTITY JS2-md5sum        "5db79c10e049a2dc117a6e6a3bc78a8e">
-  <!ENTITY JS2-size          "15 MB">
-  <!ENTITY JS2-buildsize     "1.8 GB">
-  <!ENTITY JS2-time          "4.2 SBU (additional 1.6 SBU for the tests)">
-]>
-
-<sect1 id="JS2" xreflabel="JS2-&JS2-version;">
-  <?dbhtml filename="JS2.html"?>
-
-
-  <title>JS-&JS2-version;</title>
-
-  <indexterm zone="JS2">
-    <primary sortas="a-JS2">JS2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C/C++.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&JS2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&JS2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &JS2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &JS2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &JS2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &JS2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libffi"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="python2"/> and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/JS2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <note><para>
-      This package can be installed without problems, if you have
-      installed <xref linkend="JS"/>. It is necessary to set
-      <command>SHELL=/bin/bash</command> if you are working in chroot.
-    </para></note>
-
-    <para>
-      Install <application>JS</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>cd js/src &amp;&amp;
-
-sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl &amp;&amp;
-
-./configure --prefix=/usr       \
-            --enable-readline   \
-            --enable-threadsafe \
-            --with-system-ffi   \
-            --with-system-nspr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-find /usr/include/mozjs-24/         \
-     /usr/lib/libmozjs-24.a         \
-     /usr/lib/pkgconfig/mozjs-24.pc \
-     -type f -exec chmod -v 644 {} \;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... config/milestone.pl</command>: Fix an
-      issue caused by perl-5.22.0 and later.
-    </para>
-
-    <para>
-      <parameter>--enable-threadsafe</parameter>: This switch enables
-      support for multiple threads.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables
-      <application>Readline</application> support in JS shell.
-    </para>
-
-    <para>
-      <parameter>--with-system-ffi</parameter>: This switch forces the
-      package to link to the system version of <application>libffi</application>
-      instead of using its included, and now old, version.
-    </para>
-
-    <para>
-      <parameter>--with-system-nspr</parameter>: This switch forces the
-      package to link to the system version of <application>NSPR</application>
-      instead of using its included, and now old, version.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          js24 and js24-config
-        </seg>
-        <seg>
-          libmozjs-24.a and libmozjs-24.so
-        </seg>
-        <seg>
-          /usr/include/mozjs-24
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js24">
-        <term><command>js24</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the JavaScript engine.
-          </para>
-          <indexterm zone="JS2 js24">
-            <primary sortas="b-js24">js24</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js24-config">
-        <term><command>js24-config</command></term>
-        <listitem>
-          <para>
-            is used to find out <application>JS</application>
-            compiler and linker flags.
-          </para>
-          <indexterm zone="JS2 js24-config">
-            <primary sortas="b-js24-config">js24-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs2">
-        <term><filename class="libraryfile">libmozjs-24.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mozilla JavaScript</application> API functions.
-          </para>
-          <indexterm zone="JS2 libmozjs2">
-            <primary sortas="c-libmozjs2">libmozjs-24.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/js38.xml
===================================================================
--- archive/js38.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,253 +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 js38-download-http "&sources-anduin-http;/mozjs/mozjs-&JS38-version;.rc0.tar.bz2">
-  <!ENTITY js38-download-ftp  " ">
-  <!ENTITY js38-md5sum        "cb602e21f5fc798b88163a3aa4e03e0a">
-  <!ENTITY js38-size          "24 MB">
-  <!ENTITY js38-buildsize     "896 MB">
-  <!ENTITY js38-time          "3.3 SBU">
-]>
-
-<sect1 id="js38" xreflabel="js38-&JS38-version;">
-  <?dbhtml filename="js38.html"?>
-
-
-  <title>JS-&JS38-version;</title>
-
-  <indexterm zone="js38">
-    <primary sortas="a-js38">js38</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js38-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js38-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js38-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js38-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js38-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js38-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js38-&JS38-version;-upstream_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JS38 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="python2"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js38"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <warning>
-      <para>The tarball extracts to mozjs-38.0.0, rather than what is
-      listed in the download section.</para>
-    </warning>
-
-    <para>
-      First, apply a patch to fix the build and to prevent segmentation
-      faults.
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../js38-&JS38-version;-upstream_fixes-2.patch</userinput></screen>
-
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-<!-- Spaces are significant in <screen> sections -->
-<screen><userinput>cd js/src &amp;&amp;
-autoconf2.13 &amp;&amp;
-
-./configure --prefix=/usr       \
-            --with-intl-api     \
-            --with-system-zlib  \
-            --with-system-ffi   \
-            --with-system-nspr  \
-            --with-system-icu   \
-            --enable-threadsafe \
-            --enable-readline   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-pushd /usr/include/mozjs-38 &amp;&amp;
-for link in `find . -type l`; do
-    header=`readlink $link`
-    rm -f $link
-    cp -pv $header $link
-    chmod 644 $link
-done &amp;&amp;
-popd &amp;&amp;
-
-chown -Rv root.root /usr/include/mozjs-38</userinput></screen>
-
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>autoconf2.13</command>: This command regenerates the configure
-      script with the changes from the patch.
-    </para>
-
-    <para>
-      <parameter>--with-*</parameter>: These parameters allow the build system
-      to use system versions of the above libraries. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-    
-    <para>
-      <parameter>--enable-threadsafe</parameter>: This switch enables support
-      for multiple threads at one time. This increases performance as well as
-      stability.
-    </para>
-
-    <para>
-      <command>for link in</command>...: This command replaces links to the
-      build directory, with files copied from the build directory.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries)</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js38 and js38-config
-        </seg>
-        <!-- Yes, the static library is required. -->
-        <seg>
-          libmozjs-38.so and libjs_static.ajs
-        </seg>
-        <seg>
-          /usr/include/mozjs-38
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js3-js38">
-        <term><command>js38</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine.
-          </para>
-          <indexterm zone="js38 js38">
-            <primary sortas="b-js38">js38</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js38-config">
-        <term><command>js38-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags.
-          </para>
-          <indexterm zone="js38 js38-config">
-            <primary sortas="b-js38-config">js38-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-38">
-        <term><filename class="libraryfile">libmozjs-38.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions.
-          </para>
-          <indexterm zone="js38 libmozjs-38">
-            <primary sortas="c-libmozjs38">libmozjs-38.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/js52.xml
===================================================================
--- archive/js52.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +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 js52-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS52-version;.tar.gz">
-  <!ENTITY js52-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS52-version;.tar.gz">
-  <!ENTITY js52-md5sum        "72bd9a715ed1ab70b2aebe92969f6b63">
-  <!ENTITY js52-size          "36 MB">
-  <!ENTITY js52-buildsize     "627 MB">
-  <!ENTITY js52-time          "6.4 SBU">
-]>
-
-<sect1 id="js52" xreflabel="js52-&JS52-version;">
-  <?dbhtml filename="js52.html"?>
-
-
-  <title>JS-&JS52-version;</title>
-
-  <indexterm zone="js52">
-    <primary sortas="a-js52">js52</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C. This package is present for GJS and polkit.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js52-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js52-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js52-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js52-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js52-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js52-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JS52 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="xorg7-lib"/>, and
-      <!-- <xref linkend="yasm"/>, -->
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js52"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-    &shell-env;
-
-<screen><userinput>cd js/src &amp;&amp;
-
-grep -rl -- '-Werror=format' |
-    xargs sed -i 's/error=format/no-&amp;/' &amp;&amp;
-
-./configure --prefix=/usr       \
-            --with-intl-api     \
-            --with-system-zlib  \
-            --with-system-nspr  \
-            --with-system-icu   \
-            --enable-readline   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>grep -rl ...</command>: Allows building with GCC-9.1.
-    </para>
-
-    <para>
-      <parameter>--with-*</parameter>: These parameters allow the build system
-      to use system versions of the above libriares. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-<!--    
-    <para>
-      <parameter>- -enable-threadsafe</parameter>: This switch enables support
-      for multiple threads at one time. This increases performance as well as
-      stability.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries)</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js52 and js52-config
-        </seg>
-        <!-- Yes, the static library is required. -->
-        <seg>
-          libmozjs-52.so and libjs_static.ajs
-        </seg>
-        <seg>
-          /usr/include/mozjs-52
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js5-js52">
-        <term><command>js52</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine.
-          </para>
-          <indexterm zone="js52 js52">
-            <primary sortas="b-js52">js52</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js52-config">
-        <term><command>js52-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags.
-          </para>
-          <indexterm zone="js52 js52-config">
-            <primary sortas="b-js52-config">js52-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-52">
-        <term><filename class="libraryfile">libmozjs-52.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions.
-          </para>
-          <indexterm zone="js52 libmozjs-52">
-            <primary sortas="c-libmozjs52">libmozjs-52.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/js60.xml
===================================================================
--- archive/js60.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +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 js60-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS60-version;.tar.bz2">
-  <!ENTITY js60-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS60-version;.tar.bz2">
-  <!ENTITY js60-md5sum        "5eda38cc08a3594a3f2c3cc185d4f15b">
-  <!ENTITY js60-size          "31 MB">
-  <!ENTITY js60-buildsize     "640 MB"> <!-- The buildsize is over 4GB! Actually installed is much smaller. -->
-  <!ENTITY js60-time          "6.6 SBU">
-]>
-
-<sect1 id="js60" xreflabel="js60-&JS60-version;">
-  <?dbhtml filename="js60.html"?>
-
-
-  <title>JS-&JS60-version;</title>
-
-  <indexterm zone="js60">
-    <primary sortas="a-js60">js60</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js60-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js60-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js60-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js60-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js60-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js60-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js60-&JS60-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">JS60 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="which"/>,
-      <!--<xref linkend="yasm"/>,--> and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js60"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <!--caution>
-      <para>
-        If you are upgrading JS60 from a previously installed old version,
-        save all work and exit your GNOME Session if you have one running.
-        Replacing the JS60 binary will cause the GNOME Shell to crash and return
-        you to your display manager or TTY. After installing the new version,
-        reinstall <xref linkend="gjs"/>. Polkit is unaffected.
-      </para>
-    </caution-->
-<!--
-    <para>
-      First, apply a security patch:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../js60-&JS60-version;-security_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-<!--    &shell-env;-->
-
-     <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/mozconfigure.xml"/>
-     </note>
-
-<screen><userinput>mkdir mozjs-build &amp;&amp;
-cd    mozjs-build &amp;&amp;
-
-../js/src/configure --prefix=/usr       \
-                    --with-intl-api     \
-                    --with-system-zlib  \
-                    --with-system-icu   \
-                    --disable-jemalloc  \
-                    --enable-readline   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-*</parameter>: These parameters allow the build system
-      to use system versions of the above libriares. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-    
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in JS60. jemalloc causes a conflict with glibc.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js60 and js60-config
-        </seg>
-        <seg>
-          libmozjs-60.so and libjs_static.ajs <!-- The AJS file doesn't
-          conflict with the one from js52 like originally thought -->
-        </seg>
-        <seg>
-          /usr/include/mozjs-60
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js6-js60">
-        <term><command>js60</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine.
-          </para>
-          <indexterm zone="js60 js60">
-            <primary sortas="b-js60">js60</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js60-config">
-        <term><command>js60-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags.
-          </para>
-          <indexterm zone="js60 js60-config">
-            <primary sortas="b-js60-config">js60-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-60">
-        <term><filename class="libraryfile">libmozjs-60.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions.
-          </para>
-          <indexterm zone="js60 libmozjs-60">
-            <primary sortas="c-libmozjs60">libmozjs-60.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/js68.xml
===================================================================
--- archive/js68.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,306 +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 js68-download-http "&mozilla-http;/firefox/releases/&JS68-version;esr/source/firefox-&JS68-version;esr.source.tar.xz">
-  <!ENTITY js68-download-ftp  " ">
-  <!ENTITY js68-md5sum        "80ae7816399f20cc61c9b15495b2341d">
-  <!ENTITY js68-size          "299 MB">
-  <!ENTITY js68-buildsize     "2.8 GB (30 MB installed after removing 31MB static lib)">
-  <!ENTITY js68-time          "2.1 SBU (with parallelism = 4)">
-]>
-
-<sect1 id="js68" xreflabel="js68-&JS68-version;">
-  <?dbhtml filename="js68.html"?>
-
-
-  <title>JS-&JS68-version;</title>
-
-  <indexterm zone="js68">
-    <primary sortas="a-js68">js68</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C. JS68 is taken from Firefox.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js68-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js68-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js68-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js68-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js68-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js68-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JS68 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="python2"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="llvm"/> (with <application>Clang</application>),
-      <xref linkend="nasm"/>, and
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js68"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <caution>
-      <para>
-        If you are upgrading JS68 from a previously installed old version,
-        save all work and exit your GNOME Session if you have one running.
-        Replacing the JS68 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-&JS68-version;esr.tar.xz</filename> and
-        change into the <filename>firefox-&JS68-version;</filename> folder.
-      </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>
-
-    </note>
-
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-     <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/mozconfigure.xml"/>
-     </note>
-
-
-<screen><userinput>sed '21,+4d' -i js/moz.configure &amp;&amp;
-
-mkdir obj &amp;&amp;
-cd    obj &amp;&amp;
-
-CC=gcc CXX=g++ LLVM_OBJDUMP=/bin/false       \
-../js/src/configure --prefix=/usr            \
-                    --with-intl-api          \
-                    --with-system-zlib       \
-                    --with-system-icu        \
-                    --disable-jemalloc       \
-                    --disable-debug-symbols  \
-                    --enable-readline        \
-                    --enable-unaligned-private-values &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -v /usr/lib/libjs_static.ajs</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed '21,+4d' js/moz.configure</command>: Firefox building
-      system searches for <command>rustc</command> and
-      <command>cargo</command>.
-      Since we are building the standalone JS engine instead of the entire
-      browser, they are not actually used.
-      Remove the reference to them so we can
-      build JS68 without <xref role="nodep" linkend="rust"/> installed.
-    </para>
-
-    <para>
-      <envar>CC=gcc CXX=g++</envar>: Upstream now prefers
-      <application>clang</application>, override it like other Mozilla
-      packages in BLFS book.
-    </para>
-
-    <para>
-      <envar>LLVM_OBJDUMP=/bin/false</envar>: The firefox build system
-      searches for <command>llvm-objdump</command>.
-      Since we are building the standalone JS engine instead of the entire
-      browser, they are not actually used.
-      Override it so we can build JS68 without
-      <xref role="nodep" linkend="llvm"/> installed.
-    </para>
-
-    <para>
-      <parameter>--with-*</parameter>: These parameters allow the build system
-      to use system versions of the above libraries. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-    
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in JS68. jemalloc causes a conflict with glibc.
-    </para>
-
-    <para>
-      <parameter>--disable-debug-symbols</parameter>: Don't generate debug
-      symbols since they are very large and most users won't need it. Remove
-      it if you want to debug JS68.
-    </para>
-
-    <para>
-      <parameter>--enable-unaligned-private-values</parameter>: This switch
-      allows the code using JS68 not to align all pointers in the same way
-      JS68 does.  <xref linkend="gjs"/> requires JS68 to be built with this
-      switch.
-    </para>
-
-    <para>
-      <command>rm -v /usr/lib/libjs_static.ajs</command>: Remove a large
-      static library which is not used by any BLFS package.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js68 and js68-config
-        </seg>
-        <seg>
-          libmozjs-68.so
-        </seg>
-        <seg>
-          /usr/include/mozjs-68
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js6-js68">
-        <term><command>js68</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine.
-          </para>
-          <indexterm zone="js68 js68">
-            <primary sortas="b-js68">js68</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js68-config">
-        <term><command>js68-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags.
-          </para>
-          <indexterm zone="js68 js68-config">
-            <primary sortas="b-js68-config">js68-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-68">
-        <term><filename class="libraryfile">libmozjs-68.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions.
-          </para>
-          <indexterm zone="js68 libmozjs-68">
-            <primary sortas="c-libmozjs68">libmozjs-68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/js91.xml
===================================================================
--- archive/js91.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,388 +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;
-
-<!-- for when firefox and js91 use same version
-  <!ENTITY ff91-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 ff91-version       "&JS91-version;"> -->
-
-<!-- <!ENTITY ff91-version       "&firefox-version;">-->
-  <!ENTITY js91-download-http "&mozilla-http;/firefox/releases/&JS91-version;esr/source/firefox-&JS91-version;esr.source.tar.xz">
-  <!ENTITY js91-download-ftp  " ">
-  <!ENTITY js91-md5sum        "63f84a77e8266256428c77895ecfb481">
-  <!ENTITY js91-size          "362 MB">
-  <!ENTITY js91-buildsize     "3.0 GB (38 MB installed after removing 33MB static lib)">
-  <!ENTITY js91-time          "2.1 SBU (with parallelism=4)">
-]>
-
-<sect1 id="js91" xreflabel="JS-&JS91-version;">
-  <?dbhtml filename="js91.html"?>
-
-
-  <title>JS-&JS91-version;</title>
-
-  <indexterm zone="js91">
-    <primary sortas="a-js91">js91</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> (also referred as
-      <application>SpiderMonkey</application>) is Mozilla's JavaScript and
-      WebAssembly Engine, written in C++ and Rust.
-      In BLFS, the source code of JS is taken from Firefox.
-    </para>
-
-    <!-- To editors: make sure polkit work with mozjs before
-         tagging mozjs.  -->
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js91-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js91-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js91-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js91-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js91-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js91-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js-&JS91-version;-python_3_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">JS91 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="icu"/>,
-      <xref linkend="rust"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- If clang is installed, it will be used instead of gcc.
-           gcc does not work for 32-bit system w/o -msse2 -mfpmath=sse:
-           https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 -->
-      <xref linkend="llvm"/> (with <application>Clang</application>,
-      required for 32-bit system without SSE2 capability)
-    </para>
-
-    <!-- It seems nasm is only used for aarch64-win64. -->
-    <!--bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nasm"/>
-    </para-->
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js91"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <note>
-      <para>
-        Unlike most other packages in BLFS, the instructions below require you
-        to untar <filename>firefox-&JS91-version;esr.tar.xz</filename> and
-        change into the <filename>firefox-&JS91-version;</filename> folder.
-      </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>
-
-    </note>
-<!-- not needed when using clang.  Upstream bug at
-     https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
-    <para>
-      If building on a 32 bit machine, the following sed works around an issue
-      with an incompatible <quote>double</quote> type in one header file:
-    </para>
-
-<screen><userinput>case "$(uname -m)" in
-    i?86) sed -e '/typedef[ ]*double/s/double/long double/' \
-              -i modules/fdlibm/src/math_private.h ;;
-esac</userinput></screen>
--->
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-    <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/mozconfigure.xml"/>
-
-      <para>
-        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-        the rust code will use all processors.
-      </para>
-    </note>
-
-    <para>
-      First remove an obsolete flag in python code, that has been removed
-      in python-3.11:
-    </para>
-
-<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
-
-    <para>
-      Then run:
-    </para>
-
-<screen><userinput>mkdir obj &amp;&amp;
-cd    obj &amp;&amp;
-
-sh ../js/src/configure.in --prefix=/usr            \
-                          --with-intl-api          \
-                          --with-system-zlib       \
-                          --with-system-icu        \
-                          --disable-jemalloc       \
-                          --disable-debug-symbols  \
-                          --enable-readline        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the JS test suite, issue:
-      <command>make -C js/src check-jstests
-      JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled"</command>.
-      It's recommended to redirect the output into a log.
-      <!-- recheck when ICU gets upgraded -->
-      Because we are building with system ICU, more than one hundred tests
-      (out of a total of more than 40,000) are known to fail.
-    </para>
-    <para>
-      To run the JIT test suite, issue:
-      <command>make -C js/src check-jit-test
-      JITTEST_EXTRA_ARGS="--timeout 300"</command>.
-    </para>
-
-    <caution>
-      <para>
-        An issue in the installation process causes any running program which
-        links to JS91 shared library (for example, GNOME Shell) to crash if
-        JS91 is upgraded or reinstalled.  To work around this issue, remove
-        the old version of the JS91 shared library before installation:
-      </para>
-
-<screen role="root"><userinput>rm -fv /usr/lib/libmozjs-91.so</userinput></screen>
-    </caution>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -v /usr/lib/libjs_static.ajs &amp;&amp;
-sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js91-config</userinput></screen>
-
-  </sect2>
-
-  <!-- Several gjs-1.65.90 tests fail with js91.  Not sure why.
-       OTOH an "otherwise" GNOME-3.36 environment works fine. -->
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sh ../js/src/configure.in</command>:
-      <filename>configure.in</filename> is actually a shell script, but
-      the executable bit is not set in its permission mode so it's needed
-      to explicitly run it with <command>sh</command>.
-    </para>
-
-    <para>
-      <parameter>--with-intl-api</parameter>: This enables the
-      internationalization functions required by
-      <application>Gjs</application>.
-    </para>
-
-    <para>
-      <parameter>--with-system-*</parameter>: These parameters allow the build system
-      to use system versions of the above libraries. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in JS91. jemalloc is only intended for
-      the Firefox browser environment. For other applications using JS91,
-      if JS91 uses jemalloc, the application may crash as items allocated
-      in jemalloc allocator are freed on system (glibc) allocator.
-    </para>
-
-    <para>
-      <parameter>--disable-debug-symbols</parameter>: Don't generate debug
-      symbols since they are very large and most users won't need it. Remove
-      it if you want to debug JS91.
-    </para>
-
-    <para>
-      <command>rm -v /usr/lib/libjs_static.ajs</command>: Remove a large
-      static library which is not used by any BLFS package.
-    </para>
-
-    <para>
-      <command>sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js91-config</command>:
-      Prevent <command>js91-config</command> from using buggy CFLAGS.
-    </para>
-
-    <para>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Pass these environment variables
-      to the configure script if you wish to continue to use gcc, g++
-      (by exporting them and unset them after the installation, or simply
-      prepending them before the
-      <command>sh ../js/src/configure.in</command> command).  If you are
-      building on a 32-bit system, also see below.
-    </para>
-
-    <para>
-      <option><envar>CXXFLAGS="-msse2 -mfpmath=sse"</envar></option>:
-      Use SSE2 instead of 387 for double-precision floating-point
-      operations.  It's needed by GCC to satisfy the expectations of
-      upstream (Mozilla) developers with floating-point arithmetic.
-      Use it if you are building this package on a 32-bit system with
-      GCC (if Clang is not installed or GCC is explicitly specified).
-      Note that this will cause JS to crash on a processor without SSE2
-      capability.  If you are running the system on such an old processor,
-      Clang is strictly needed.  This setting is not needed on 64-bit
-      systems because all 64-bit x86 processors support SSE2 and the 64-bit
-      compilers (both Clang and GCC) use SSE2 by default.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js91 and js91-config
-        </seg>
-        <seg>
-          libmozjs-91.so
-        </seg>
-        <seg>
-          /usr/include/mozjs-91
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js91-js91">
-        <term><command>js91</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine
-          </para>
-          <indexterm zone="js91 js91">
-            <primary sortas="b-js91">js91</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js91-config">
-        <term><command>js91-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags
-          </para>
-          <indexterm zone="js91 js91-config">
-            <primary sortas="b-js91-config">js91-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-91">
-        <term><filename class="libraryfile">libmozjs-91.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions
-          </para>
-          <indexterm zone="js91 libmozjs-91">
-            <primary sortas="c-libmozjs91">libmozjs-91.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/juffed.xml
===================================================================
--- archive/juffed.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,248 +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 juffed-download-http "&sources-anduin-http;/juffed/juffed-&juffed-version;.tar.xz">
-  <!ENTITY juffed-download-ftp  " ">
-  <!ENTITY juffed-md5sum        "5d211f5aadcb3d7365b5a6127d3d275f">
-  <!ENTITY juffed-size          "1.3 MB">
-  <!ENTITY juffed-buildsize     "22 MB">
-  <!ENTITY juffed-time          "0.8 SBU">
-]>
-
-<sect1 id="juffed" xreflabel="juffed-&juffed-version;">
-  <?dbhtml filename="juffed.html"?>
-
-
-  <title>juffed-&juffed-version;</title>
-
-  <indexterm zone="juffed">
-    <primary sortas="a-juffed">juffed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JuffEd</title>
-
-    <para>
-      The <application>JuffEd</application> package is a Qt based editor with
-      support for multiple tabs. It is simple and clear, but very powerful.
-      It supports language syntax highlighting, auto-indents in accordance with
-      file type, code blocks folding, matching braces highlighting with instant
-      jumps between them, powerful search and replacing text using regular
-      expressions (including multiline ones) with the opportunity to use
-      matches \1, \2, &hellip; in substitutions, a terminal emulator, saving
-      named sessions and many other features.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&juffed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&juffed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &juffed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &juffed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &juffed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &juffed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The source tarball shown above was created by the BLFS team by cloning
-      the source code repository, finding the correct version to rename
-      accordingly the source code directory, removing <filename
-      class="directory">.git</filename> directory and <filename
-      class="directory">.gitignore</filename> file, and finally making the
-      compressed tarball. No other modification has been made.
-    </para>
-
-    <bridgehead renderas="sect3">JuffEd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qscintilla"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="qtermwidget"/> (for the terminal)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="desktop-file-utils"/> and
-      <ulink url="http://cihar.com/software/enca/">Enca</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/juffed"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JuffEd</title>
-
-    <para>
-      For compilation with <application>Qt4</application>, see <quote>Command
-      Explanations</quote> below. Install
-      <application>JuffEd</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i 's/"64"/""/' cmake/LibSuffix.cmake                                     &amp;&amp;
-sed -i '/JUFFED_LIBRARY/s/)$/ qtermwidget5)/' plugins/terminal/CMakeLists.txt &amp;&amp;
-
-mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TERMINAL=ON                 \
-      -DUSE_QT5=true                      \
-      ..       &amp;&amp;
-
-LIBRARY_PATH=$LXQT_PREFIX/lib make</userinput></screen>
-
-    <para>
-      The choice of <filename class="directory">/usr</filename> prefix is due
-      to the general characteristics of this program, which can be used
-      without <application>LXQt</application>.
-    </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>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... LibSuffix.cmake</command>: Removes the 64 from /lib64.
-    </para>
-
-    <para>
-      <command>sed -i '/JUFFED_LIBRARY/s/)$/ qtermwidget5)/'</command>: Allows this
-      package to build against current <xref linkend="qtermwidget"/>.
-    </para>
-
-    <para>
-      <envar>LIBRARY_PATH=$LXQT_PREFIX/lib</envar>: This environment
-      variable is needed for the linker to find a required library.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TERMINAL=ON</parameter>: This switch is used in order
-      to enable building the terminal. Toggle to <quote>OFF</quote> or remove
-      the switch, if you do not wish it.
-    </para>
-
-    <para>
-      <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
-      build this application linked to <application>Qt5</application>. Toggle
-      to <quote>false</quote>, if you prefer to use
-      <application>Qt4</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          juffed
-        </seg>
-        <seg>
-          libjuff.so,
-          libjuffed-engine-qsci.so and
-          plugins under /usr/lib/juffed/plugins
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/juffed
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="juffed-prog">
-        <term><command>juffed</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt</application> based text editor.
-          </para>
-          <indexterm zone="juffed juffed-prog">
-            <primary sortas="b-juffed">juffed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjuff">
-        <term><filename class="libraryfile">libjuff.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JuffEd</application> API functions.
-          </para>
-          <indexterm zone="juffed libjuff">
-            <primary sortas="c-libjuff">libjuff.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjuffed-engine-qsci">
-        <term><filename class="libraryfile">libjuffed-engine-qsci.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>QScintilla</application> bindings.
-          </para>
-          <indexterm zone="juffed libjuffed-engine-qsci">
-            <primary sortas="c-libjuffed-engine-qsci">libjuffed-engine-qsci.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/junit.xml
===================================================================
--- archive/junit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 junit-download-http "https://github.com/junit-team/junit&junit-major;/archive/r&junit-version;/junit&junit-major;-r&junit-version;.tar.gz">
-  <!ENTITY junit-download-ftp  " ">
-  <!ENTITY junit-md5sum        "22578a9b35cbb71d556a2e625c576c81">
-  <!ENTITY junit-size          "433 KB">
-  <!ENTITY junit-buildsize     "27 MB">
-  <!ENTITY junit-time          "0.2 SBU (with documentation, using 4 cores; add maven <quote>artifacts</quote> download time)">
-]>
-
-<sect1 id="junit" xreflabel="JUnit-&junit-version;">
-  <?dbhtml filename="junit.html"?>
-
-
-  <title>JUnit-&junit-version;</title>
-
-  <indexterm zone="junit">
-    <primary sortas="a-JUnit">JUnit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JUnit</title>
-
-    <para>
-      The <application>JUnit</application> package contains a simple, open
-      source framework to write and run repeatable tests. It is an instance of
-      the xUnit architecture for unit testing frameworks. JUnit features include
-      assertions for testing expected results, test fixtures for sharing common
-      test data, and test runners for running tests.
-    </para>
-
-    &lfs83_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&junit-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&junit-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &junit-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &junit-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &junit-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &junit-time;</para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-             url="&patch-root;/junit&junit-major;-r&junit-version;-simplify_NoExitSecurityManager-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="maven"/> and
-      <xref linkend="unzip"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/junit"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JUnit</title>
-    <para>
-      First remove a test, which fails with <application>Java 10</application>.
-    </para>
-
-<screen><userinput>sed -e '/MethodsSorted/i    @Ignore' \
-    -i src/test/java/org/junit/runners/model/TestClassTest.java</userinput></screen>
-
-    <para>
-      Replace deprecated SecurityManager code:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../junit4-r&junit-version;-simplify_NoExitSecurityManager-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Junit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mvn -DjdkVersion=1.6 install</userinput></screen>
-
-    <para>
-      The tests are run as part of the command above.
-    </para>
-
-    <para>
-      If you wish to generate the documentation, issue:
-    </para>
-
-<screen><userinput>mvn site</userinput></screen>
-
-    <para>
-      Install the files in the final location as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d             /usr/share/java/junit-&junit-version; &amp;&amp;
-cp -v target/junit-&junit-version;.jar     /usr/share/java/junit-&junit-version; &amp;&amp;
-cp -v lib/hamcrest-core-1.3.jar /usr/share/java/junit-&junit-version;</userinput></screen>
-
-    <para>
-      if the documentation was built, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-<screen role="root"><userinput>install -v -m755 -d    /usr/share/doc/junit-&junit-version; &amp;&amp;
-cp -v -R target/site/* /usr/share/doc/junit-&junit-version;</userinput></screen>
-
-
-    <para>
-      If you have followed the instructions in <xref linkend="ojdk-conf"/>,
-      there is nothing more to do: the <envar>CLASSPATH</envar> variable
-      would be automatically updated.
-    </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>hamcrest-core and junit jar files</seg>
-        <seg>/usr/share/doc/junit-&junit-version; and
-             /usr/share/java/junit-&junit-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="junit.jar">
-        <term><filename class='libraryfile'>junit-&junit-version;.jar</filename></term>
-        <listitem>
-          <para>contains java classes to support the xUnit framework testing
-          architecture.</para>
-          <indexterm zone="junit junit.jar">
-            <primary sortas="c-junit.jar">junit-&junit-version;.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hamcrest-core">
-        <term><filename class='libraryfile'>hamcrest-core-1.3.jar</filename></term>
-        <listitem>
-          <para>contains java classes to support matchers used in xUnit
-          tests.</para>
-          <indexterm zone="junit hamcrest-core">
-            <primary sortas="c-hamcrest-core">hamcrest-core-1.3.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde-apidocs-xinclude.xml
===================================================================
--- archive/kde-apidocs-xinclude.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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" >
-
-<note>
-  <para>If you wish to create the API documentation and you have
-  <application>Doxygen</application> and
-  <application>Graphviz</application> installed,
-  <command>make apidox</command> must be done before
-  <command>make install</command>.</para>
-</note>
Index: chive/kde-sysconfdir-xinclude.xml
===================================================================
--- archive/kde-sysconfdir-xinclude.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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" >
-
-<note>
-  <para>The <parameter>--sysconfdir</parameter> parameter must be the
-  same as the command used in <xref linkend="kdelibs-install"/>.</para>
-</note>
Index: chive/kde/add/add.xml
===================================================================
--- archive/kde/add/add.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kde-add">
-  <?dbhtml filename="add.html"?>
-
-  <title>KDE Additional Packages</title>
-
-  <para>Each of the packages in this chapter depend on the base
-  <application>Trinity/KDE3</application> installation procedures, but each is an
-  independent group of programs that can be optionally installed.  Few users
-  will want to install every package, but instead review and install only the
-  ones desired.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeadmin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenetwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeakode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdemultimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdegraphics.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeedu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeaccessibility.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdetoys.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdegames.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeartwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeaddons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-i18n.xml"/>
-
-</chapter>
Index: chive/kde/add/kde-i18n.xml
===================================================================
--- archive/kde/add/kde-i18n.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 kde-i18n-download-http "&trinity-repo-http;/kde-i18n/">
-  <!ENTITY kde-i18n-download-ftp  "&trinity-repo-ftp;/kde-i18n/">
-  <!ENTITY kde-i18n-md5sum        "<ulink url='&trinity-repo-http;/kde-i18n/MD5SUMS'/>">
-  <!ENTITY kde-i18n-size          "789 KB to 29 MB (average is about 3 MB)">
-  <!ENTITY kde-i18n-buildsize     "varies">
-  <!ENTITY kde-i18n-time          "varies">
-]>
-
-<sect1 id="kde-i18n">
-  <?dbhtml filename="kde-i18n.html"?>
-
-
-  <title>Kde-i18n-&kde-version;</title>
-
-  <indexterm zone="kde-i18n">
-    <primary sortas="a-kde-i18n">Kde-i18n</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-i18n</title>
-
-    <para><application>Kde-i18n</application> is a set of internationalization
-    packages to customize <application>KDE</application> for different
-    languages and locales around the world.</para>
-
-    <para>This section has not been tested by the BLFS Editors.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-i18n-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-i18n-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-i18n-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-i18n-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-i18n-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-i18n-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Download Details</bridgehead>
-
-    <para><application>KDE</application> has 71 separate
-    internationalization packages in the form of:</para>
-
-<screen><literal>kde-i18n-<replaceable>&lt;xx&gt;</replaceable>-3.5.10.tar.bz2</literal></screen>
-
-    <para>where the <replaceable>&lt;xx&gt;</replaceable> is a two to five letter code
-    for the country covered.  Download the package(s) you need from
-    the directories above.  Note that the packages have not been renamed from the
-    kde-3.5.10 distribution.</para>
-
-    <bridgehead renderas="sect3">Kde-i18n Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libxml2"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde-i18n"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-  <title>Installation of Kde-i18n</title>
-
-    <para>Install <application>kde-i18n</application> with:</para>
-
-<screen><userinput>./configure --prefix=$TRINITY_PREFIX &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Kde-i18n</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>To use translated programs, select Control Center &mdash;&gt;
-      Personalization &mdash;&gt; Country &amp; Language &mdash;&gt; Language
-      in your <application>K Desktop Environment</application>.</para>
-
-    </sect3>
-
-  </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>Internationalization support for <application>KDE3/Trinity</application></seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <indexterm zone="kde-i18n">
-      <primary sortas="c-kde-i18n">KDE Internationalization</primary>
-    </indexterm>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeaccessibility.xml
===================================================================
--- archive/kde/add/kdeaccessibility.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +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 kdeaccessibility-download-http "&trinity-repo-http;/kdeaccessibility-&trinity-version;.tar.gz">
-  <!ENTITY kdeaccessibility-download-ftp  "&trinity-repo-ftp;/kdeaccessibility-&trinity-version;.tar.gz">
-  <!ENTITY kdeaccessibility-md5sum        "ce31b01c1831046fb28aab172f2423bf">
-  <!ENTITY kdeaccessibility-size          "8.7 MB">
-  <!ENTITY kdeaccessibility-buildsize     "197 MB">
-  <!ENTITY kdeaccessibility-time          "1.6 SBU">
-]>
-
-<sect1 id="kdeaccessibility" xreflabel="kdeaccessibility-&trinity-version;">
-  <?dbhtml filename="kdeaccessibility.html"?>
-
-
-  <title>Kdeaccessibility-&trinity-version;</title>
-
-  <indexterm zone="kdeaccessibility">
-    <primary sortas="a-kdeaccessibility">Kdeaccessibility</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeaccessibility</title>
-
-    <para><application>Kdeaccessibility</application> provides
-    <application>KDE</application> programs to aid handicapped users.  Programs
-    include a screen magnifier, a text to speech plugin service to allow an
-    application to speak using the DCOP interface, and an application for
-    computer speech for mute users.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeaccessibility-download-http;"/>
-      </para></listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeaccessibility-download-ftp;"/>
-      </para></listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeaccessibility-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdeaccessibility-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeaccessibility-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeaccessibility-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdeaccessibility Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="alsa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="akode"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeaccessibility"/></para>
-
-  </sect2>
-
-  <sect2 id="kdeaccessibility-runtime-dependencies"
-         xreflabel="KDE Accessability Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>Several <application>KDE</application> accessibility  programs access
-    other programs at run time for rendering speech from text. These include
-    <xref linkend="freetts"/>,
-    <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>,
-    <ulink url="http://www.speech.cs.cmu.edu/flite/index.html">Festival Lite</ulink>,
-    <ulink url='http://epos.ure.cas.cz/'>Epos</ulink>, or
-    <ulink url='http://tcts.fpms.ac.be/synthesis/mbrola.html'>MBROLA</ulink>
-    with optionally
-    <ulink url='http://www.ikp.uni-bonn.de/dt/forsch/phonetik/hadifix/HADIFIXforMBROLA.html'>Txt2pho</ulink>.</para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeaccessibility</title>
-
-    <para>Install <application>kdeaccessibility</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX \
-            --with-qt-dir=$QTDIR     \
-            --enable-closure         \
-            --with-alsa              \
-            --with-extra-includes=$TRINITY_PREFIX/include \
-            --with-extra-libs=$TRINITY_PREFIX/lib         &amp;&amp;
-
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kmag, kmousetool, and kmouth</seg>
-        <seg>kdeaccessibility support libraries</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kmag">
-        <term><command>kmag</command></term>
-        <listitem>
-          <para>is a screen magnifier for <application>KDE</application>.</para>
-          <indexterm zone="kdeaccessibility kmag">
-            <primary sortas="b-kmag">kmag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmousetool">
-        <term><command>kmousetool</command></term>
-        <listitem>
-          <para>is a utility which clicks the mouse whenever the mouse
-          cursor pauses briefly.</para>
-          <indexterm zone="kdeaccessibility kmousetool">
-            <primary sortas="b-kmousetool">kmousetool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmouth">
-        <term><command>kmouth</command></term>
-        <listitem>
-          <para>is an application that enables persons that cannot
-          speak to let their computers speak.</para>
-          <indexterm zone="kdeaccessibility kmouth">
-            <primary sortas="b-kmouth">kmouth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeaddons.xml
===================================================================
--- archive/kde/add/kdeaddons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,133 +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 kdeaddons-download-http "&trinity-repo-http;/kdeaddons-&trinity-version;.tar.gz">
-  <!ENTITY kdeaddons-download-ftp  "&trinity-repo-ftp;/kdeaddons-&trinity-version;.tar.gz">
-  <!ENTITY kdeaddons-md5sum        "f5fa96a5d99d1bc33600f609881eaee6">
-  <!ENTITY kdeaddons-size          "1.5 MB">
-  <!ENTITY kdeaddons-buildsize     "209 MB">
-  <!ENTITY kdeaddons-time          "2.2 SBU">
-]>
-
-<sect1 id="kdeaddons" xreflabel="kdeaddons-&trinity-version;">
-  <?dbhtml filename="kdeaddons.html"?>
-
-
-  <title>Kdeaddons-&trinity-version;</title>
-
-  <indexterm zone="kdeaddons">
-    <primary sortas="a-kdeaddons">Kdeaddons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeaddons</title>
-
-    <para><application>Kdeaddons</application> provides additional plugins for
-    <application>konqueror</application>, <application>kate</application>, and
-    <application>kicker</application>.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeaddons-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeaddons-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeaddons-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdeaddons-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeaddons-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeaddons-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdeaddons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="kdenetwork"/>,
-      <xref linkend="kdemultimedia"/>,
-      <xref linkend="kdepim"/>,
-      <xref linkend="kdegames"/>,
-      <xref linkend="db"/>,
-      <!-- <xref linkend="xmms"/>, -->and
-      <xref linkend="sdl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeaddons"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeaddons</title>
-
-    <para>Install <application>kdeaddons</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX \
-            --enable-closure         \
-            --sysconfdir=/etc        \
-            --localstatedir=/var     \
-            --with-extra-libs=$TRINITY_PREFIX/lib &amp;&amp;
-
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Miscellaneous <application>KDE</application> support programs</seg>
-        <seg>Additional plugins, libraries, and  scripts for <application>KDE</application>
-        applications</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <indexterm zone="kdeaddons">
-      <primary sortas="c-kdeaddons">KDE plugins and scripts</primary>
-    </indexterm>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeadmin.xml
===================================================================
--- archive/kde/add/kdeadmin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +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 kdeadmin-download-http "&trinity-repo-http;/kdeadmin-&trinity-version;.tar.gz">
-  <!ENTITY kdeadmin-download-ftp  "&trinity-repo-ftp;/kdeadmin-&trinity-version;.tar.gz">
-  <!ENTITY kdeadmin-md5sum        "b8bbabf353070a3e730464e0ce2960e2">
-  <!ENTITY kdeadmin-size          "1.9 MB">
-  <!ENTITY kdeadmin-buildsize     "132 MB">
-  <!ENTITY kdeadmin-time          "1.4 SBU">
-]>
-
-<sect1 id="kdeadmin">
-  <?dbhtml filename="kdeadmin.html"?>
-
-
-  <title>Kdeadmin-&trinity-version;</title>
-
-  <indexterm zone="kdeadmin">
-    <primary sortas="a-kdeadmin">Kdeadmin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeadmin</title>
-
-    <para><application>Kdeadmin</application> provides several
-    <application>KDE</application> clients useful for managing a system.
-    Clients include programs for managing users, initialization files, cron,
-    and network connections.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeadmin-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeadmin-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeadmin-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdeadmin-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeadmin-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeadmin-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdeadmin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/> and
-      <ulink url="http://lilo.go.dyndns.org/">LILO</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeadmin"/></para>
-
-  </sect2>
-
-  <sect2 id="kdeadmin-runtime-dependencies"
-         xreflabel="KDE Admin Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para><command>kcron</command> requires a cron implementation, such as
-    Vixie Cron, at run time. It is not compatible with <xref linkend="fcron"/>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeadmin</title>
-
-    <para>Install <application>kdeadmin</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX \
-            --enable-closure         \
-            --sysconfdir=/etc        \
-            --localstatedir=/var     \
-            --with-extra-libs=$TRINITY_PREFIX/lib &amp;&amp;
-
-make</userinput></screen>
-
-   <para>This package does not come with a test suite.</para>
-
-   <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>cp -v /usr/share/... admin/...</command>:
-    Ensure the .m4 files are consistent with the current autotools version.</para>
-
-    <para><command>sed ... admin/acinclude.m4.in</command>:
-    Update the paths to the Trinity libraries.</para>
-
-    <para><command>make -f admin/Makefile.common</command>: Create the configure
-    script.</para>
-
-    <para><parameter>--with-extra-libs=$TRINITY_PREFIX/lib</parameter>: This
-    option ensure the Trinity libraries are found in the
-    <filename>Makefile</filename>s.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kcron, kdat, kpackage, ksysv, kuser, and secpolicy</seg>
-        <seg>kcm_knetworkconfmodule.so, kfile_deb.so, and kfile_rpm.so</seg>
-        <seg>$TRINITY_PREFIX/lib/trinity</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="kcron">
-      <term><command>kcron</command></term>
-      <listitem>
-        <para>is a  task scheduler.</para>
-        <indexterm zone="kdeadmin kcron">
-          <primary sortas="b-kcron">kcron</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="kdat">
-      <term><command>kdat</command></term>
-      <listitem>
-        <para>is a tar-based tape archiver.</para>
-        <indexterm zone="kdeadmin kdat">
-          <primary sortas="b-kdat">kdat</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="kpackage">
-      <term><command>kpackage</command></term>
-      <listitem>
-        <para>is a package manager.</para>
-        <indexterm zone="kdeadmin kpackage">
-          <primary sortas="b-kpackage">kpackage</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="ksysv">
-      <term><command>ksysv</command></term>
-      <listitem>
-        <para>is a Sys V-Init editor.</para>
-        <indexterm zone="kdeadmin ksysv">
-          <primary sortas="b-ksysv">ksysv</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="kuser">
-      <term><command>kuser</command></term>
-      <listitem>
-        <para>is a  graphical user manager.</para>
-        <indexterm zone="kdeadmin kuser">
-          <primary sortas="b-kuser">kuser</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeakode.xml
===================================================================
--- archive/kde/add/kdeakode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +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 akode-version       "2.0.2">
-  <!ENTITY akode-download-http "&trinity-repo-http;/akode-&akode-version;.tar.bz2">
-  <!ENTITY akode-download-ftp  "&trinity-repo-ftp;/akode-&akode-version;.tar.bz2">
-  <!ENTITY akode-md5sum        "659ced0c9c735cb3e55b9138ff02342c">
-  <!ENTITY akode-size          "468 KB">
-  <!ENTITY akode-buildsize     "6.6 MB">
-  <!ENTITY akode-time          "0.3 SBU">
-]>
-
-<sect1 id="kdeakode" xreflabel="kdeakode-&akode-version;">
-  <?dbhtml filename="kdeakode.html"?>
-
-
-  <title>Akode-&akode-version;</title>
-
-  <indexterm zone="kdeakode">
-    <primary sortas="a-kdeakode">Akode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Akode</title>
-
-    <para>In the current version of <application>Kdemultimedia</application>, some
-    of the functionality provided by the package has been moved into a
-    separate project named <application>Akode</application>. In order for
-    <application>Kdemultimedia</application> to provide the removed
-    functionality, you must install the <application>Akode</application>
-    package first. </para>
-
-    &lfs70_checked;
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdemultimedia"/></para>
-
-  </sect2>
-
-  <sect2 role="package" id="akode" xreflabel="Akode-&akode-version;">
-    <title>Akode-&akode-version;</title>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&akode-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&akode-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &akode-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &akode-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &akode-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &akode-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch (for FFmpeg support): <ulink
-        url="&patch-root;/akode-&akode-version;-consolidated_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Akode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-     <para role="optional">
-       <xref linkend="pkgconfig"/>
-       <xref linkend="flac"/>,
-       <xref linkend="speex"/>,
-       <xref linkend="libmad"/>,
-       <xref linkend="alsa"/>,
-       <xref linkend="libvorbis"/>,
-       <xref linkend="pulseaudio"/>,
-       <xref linkend="ffmpeg"/> (support is experimental),
-       <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
-         Code</ulink> (a.k.a. libsamplerate), and
-       <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
-    </para>
-
-    <bridgehead renderas="sect3">Installation of Akode</bridgehead>
-
-<screen><userinput>patch -Np1 -i ../akode-&akode-version;-consolidated_fixes-1.patch &amp;&amp;
-./configure --prefix=$TRINITY_PREFIX --without-ffmpeg   &amp;&amp;
-make</userinput></screen>
-
-      <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--without-ffmpeg</parameter>: This option disables the
-    experimental <application>FFmpeg</application> support in
-    <application>Akode</application>, as the build fails if it is enabled.
-    You can remove this switch to enable
-    the experimental <application>FFmpeg</application> support, however, the
-    functionality of <application>Akode</application> built with
-    <application>FFmpeg</application> support has not been tested by the
-    BLFS editors.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>akode-config and akodeplay</seg>
-        <seg>libakode.so, libakode_alsa_sink.so, libakode_mpc_decoder.so,
-        libakode_mpeg_decoder.so, libakode_oss_sink.so, and libakode_xiph_decoder.so</seg>
-        <seg>include/akode</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="artsbuilder">
-        <term><command>artsbuilder</command></term>
-        <listitem>
-          <para>is a tool to create new structures of small connected
-          <application>aRts</application> modules.</para>
-          <indexterm zone="kdemultimedia artsbuilder">
-            <primary sortas="b-artsbuilder">artsbuilder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeartwork.xml
===================================================================
--- archive/kde/add/kdeartwork.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +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 kdeartwork-download-http "&trinity-repo-http;/kdeartwork-&trinity-version;.tar.gz">
-  <!ENTITY kdeartwork-download-ftp  "&trinity-repo-ftp;/kdeartwork-&trinity-version;.tar.gz">
-  <!ENTITY kdeartwork-md5sum        "24f85eb3e5a9106de48a3e81d2575ffe">
-  <!ENTITY kdeartwork-size          "26.6 MB">
-  <!ENTITY kdeartwork-buildsize     "132 MB">
-  <!ENTITY kdeartwork-time          "0.5 SBU">
-]>
-
-<sect1 id="kdeartwork" xreflabel="kdeartwork-&trinity-version;">
-  <?dbhtml filename="kdeartwork.html"?>
-
-
-  <title>Kdeartwork-&trinity-version;</title>
-
-  <indexterm zone="kdeartwork">
-    <primary sortas="a-kdeartwork">Kdeartwork</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeartwork</title>
-
-    <para><application>Kdeartwork</application> provides additional
-    <application>KDE</application> themes, screensavers, sounds, wallpapers,
-    widget styles, and window styles.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeartwork-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeartwork-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeartwork-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdeartwork-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeartwork-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeartwork-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdeartwork Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="libart_lgpl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xscreensaver"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeartwork"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeartwork</title>
-
-    <para>Install <application>kdeartwork</application> with:</para>
-
-<screen><userinput>MAKEDIR=/tmp/buildkdeart &amp;&amp;
-KDEART=`pwd`             &amp;&amp;
-rm -rf   $MAKEDIR        &amp;&amp;
-mkdir -p $MAKEDIR        &amp;&amp;
-cd       $MAKEDIR        &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-      -DCMAKE_VERBOSE_MAKEFILE=ON            \
-      -DWITH_XSCREENSAVER=ON                 \
-      -DWITH_LIBART=ON                       \
-      -DWITH_OPENGL=ON                       \
-      -DWITH_ARTS=ON                         \
-      -DBUILD_ALL=ON                         \
-      $KDEART            &amp;&amp;
-
-unset KDEART MAKEDIR     &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 Objects</segtitle>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>additional themes, screensavers, sounds, backgrounds, and
-        widget styles for <application>KDE</application></seg>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <indexterm zone="kdeartwork">
-      <primary sortas="g-kdeartwork">KDE Artwork</primary>
-    </indexterm>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeedu.xml
===================================================================
--- archive/kde/add/kdeedu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,291 +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 kdeedu-download-http "&trinity-repo-http;/kdeedu-&trinity-version;.tar.gz">
-  <!ENTITY kdeedu-download-ftp  "&trinity-repo-ftp;/kdeedu-&trinity-version;.tar.gz">
-  <!ENTITY kdeedu-md5sum        "37a14a67c4d00babc3015c6a31698cb0">
-  <!ENTITY kdeedu-size          "29.6 MB">
-  <!ENTITY kdeedu-buildsize     "825 MB">
-  <!ENTITY kdeedu-time          "6.6 SBU">
-]>
-
-<sect1 id="kdeedu" xreflabel="kdeedu-&trinity-version;">
-  <?dbhtml filename="kdeedu.html"?>
-
-
-  <title>Kdeedu-&trinity-version;</title>
-
-  <indexterm zone="kdeedu">
-    <primary sortas="a-kdeedu">Kdeedu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-  <title>Introduction to Kdeedu</title>
-
-    <para><application>Kdeedu</application> provides
-    <application>KDE</application> programs useful in learning.  Programs
-    include a touch typing tutor, a program to help revise/teach Latin, a
-    desktop planetarium, an application to study Spanish verbforms, and the
-    classic hangman game for children.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeedu-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeedu-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeedu-md5sum;</para></listitem>
-      <listitem>
-        <para>Download size: &kdeedu-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeedu-buildsize;</para>
-        </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeedu-time;</para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-       <listitem>
-         <para>Required patch: <ulink
-            url="ftp://ftp.kde.org/pub/kde/security_patches/post-3.4.2-kdeedu.diff"/></para>
-       </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdeedu Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libusb-compat"/>,
-      <ulink url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink>,
-      <ulink url="http://pauillac.inria.fr/ocaml/">OCaml</ulink>, and
-      <ulink url="http://www.recherche.enac.fr/opti/facile/">FaCiLe module for OCaml</ulink>.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeedu"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeedu</title>
-
-    <para>Install <application>kdeedu</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in
-make -f admin/Makefile.common                                 &amp;&amp;
-
-export LIBRARY_PATH=$TRINITY_PREFIX/lib                       &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX \
-            --enable-closure         \
-            --sysconfdir=/etc        \
-            --localstatedir=/var     \
-            --with-extra-libs=$TRINITY_PREFIX/lib             &amp;&amp;
-
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>flashkard, kalzium, kbruch, keduca, khangman, kig, kiten,
-        klettres, kmathtool, kmessedwords, kmplot, kpercentage, kstars, ktouch,
-        kverbos, and kvoctrain</seg>
-        <seg>Several kdeedu specific libraries</seg>
-        <seg>Several subdirectories of $KDE_PREFIX/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kalzium">
-        <term><command>kalzium</command></term>
-        <listitem>
-          <para>is a program which shows you the Periodic System of Elements.</para>
-          <indexterm zone="kdeedu kalzium">
-            <primary sortas="b-kalzium">kalzium</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbruch">
-        <term><command>kbruch</command></term>
-        <listitem>
-          <para>is a small program to generate tasks with fractions.</para>
-          <indexterm zone="kdeedu kbruch">
-            <primary sortas="b-kbruch">kbruch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keduca">
-        <term><command>keduca</command></term>
-        <listitem>
-          <para>is flash card application, which allows you to make
-          interactive form based tests..</para>
-          <indexterm zone="kdeedu keduca">
-            <primary sortas="b-keduca">keduca</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="khangman">
-        <term><command>khangman</command></term>
-        <listitem>
-          <para>is the classical hangman game for children, adapted for
-          <application>KDE</application>.</para>
-          <indexterm zone="kdeedu khangman">
-            <primary sortas="b-khangman">khangman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kig">
-        <term><command>kig</command></term>
-        <listitem>
-          <para>is a <application>KDE</application> application for
-          Interactive Geometry.</para>
-          <indexterm zone="kdeedu kig">
-            <primary sortas="b-kig">kig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kiten">
-        <term><command>kiten</command></term>
-        <listitem>
-          <para>is a Japanese reference/study tool for
-          <application>KDE</application>.</para>
-          <indexterm zone="kdeedu kiten">
-            <primary sortas="b-kiten">kiten</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="klettres">
-        <term><command>klettres</command></term>
-        <listitem>
-          <para>is an alphabet tutor (French).</para>
-          <indexterm zone="kdeedu klettres">
-            <primary sortas="b-klettres">klettres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmessedwords">
-        <term><command>kmessedwords</command></term>
-        <listitem>
-          <para>is a simple mind-training word game.</para>
-          <indexterm zone="kdeedu kmessedwords">
-            <primary sortas="b-kmessedwords">kmessedwords</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmplot">
-        <term><command>kmplot</command></term>
-        <listitem>
-          <para>is a mathematical function plotter for <application>KDE</application>.</para>
-          <indexterm zone="kdeedu kmplot">
-            <primary sortas="b-kmplot">kmplot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpercentage">
-        <term><command>kpercentage</command></term>
-        <listitem>
-          <para>is a small math application that will help pupils to improve their
-          skills in calculating percentages.</para>
-          <indexterm zone="kdeedu kpercentage">
-            <primary sortas="b-kpercentage">kpercentage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kstars">
-        <term><command>kstars</command></term>
-        <listitem>
-          <para>is a desktop planetarium.</para>
-          <indexterm zone="kdeedu kstars">
-            <primary sortas="b-kstars">kstars</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktouch">
-        <term><command>ktouch</command></term>
-        <listitem>
-          <para>is a touch typing tutor.</para>
-          <indexterm zone="kdeedu ktouch">
-            <primary sortas="b-ktouch">ktouch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kverbos">
-        <term><command>kverbos</command></term>
-        <listitem>
-          <para>is an application specially designed to study Spanish
-          verb forms.</para>
-          <indexterm zone="kdeedu kverbos">
-            <primary sortas="b-kverbos">kverbos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kvoctrain">
-        <term><command>kvoctrain</command></term>
-        <listitem>
-          <para>is a vocabulary trainer.</para>
-          <indexterm zone="kdeedu kvoctrain">
-            <primary sortas="b-kvoctrain">kvoctrain</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdegames.xml
===================================================================
--- archive/kde/add/kdegames.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +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 kdegames-download-http "&trinity-repo-http;/kdegames-&trinity-version;.tar.gz">
-  <!ENTITY kdegames-download-ftp  "&trinity-repo-ftp;/kdegames-&trinity-version;.tar.gz">
-  <!ENTITY kdegames-md5sum        "6c63e161050939f53921bfceb923a19e">
-  <!ENTITY kdegames-size          "10.3 MB">
-  <!ENTITY kdegames-buildsize     "412 MB">
-  <!ENTITY kdegames-time          "3.4 SBU">
-]>
-
-<sect1 id="kdegames" xreflabel="kdegames-&trinity-version;">
-  <?dbhtml filename="kdegames.html"?>
-
-
-  <title>Kdegames-&trinity-version;</title>
-
-  <indexterm zone="kdegames">
-    <primary sortas="a-kdegames">Kdegames</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdegames</title>
-
-    <para><application>Kdegames</application> provides many interesting
-    games.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdegames-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdegames-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdegames-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdegames-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdegames-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdegames-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdegames Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="graphviz"/> and
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdegames"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdegames</title>
-
-    <para>Install <application>kdegames</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX                      \
-            --with-qt-dir=$QTDIR                          \
-            --enable-closure                              \
-            --with-extra-includes=$TRINITY_PREFIX/include \
-            --with-extra-libs=$TRINITY_PREFIX/lib         &amp;&amp;
-
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>a compilation of various games</seg>
-        <seg>Support libraries for kdegames</seg>
-        <seg>Subdirectories of $TRINITY_PREFIX/{include,share}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <indexterm zone="kdegames">
-       <primary sortas="b-kdegames">KDE Games</primary>
-    </indexterm>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdegraphics.xml
===================================================================
--- archive/kde/add/kdegraphics.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,403 +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 kdegraphics-download-http "&trinity-repo-http;/kdegraphics-&trinity-version;.tar.gz">
-  <!ENTITY kdegraphics-download-ftp  "&trinity-repo-ftp;/kdegraphics-&trinity-version;.tar.gz">
-  <!ENTITY kdegraphics-md5sum        "a75c254cd1060343cd04c6744bce6798">
-  <!ENTITY kdegraphics-size          "7.3 MB">
-  <!ENTITY kdegraphics-buildsize     "162 MB">
-  <!ENTITY kdegraphics-time          "2.7 SBU">
-]>
-
-<sect1 id="kdegraphics" xreflabel="kdegraphics-&trinity-version;">
-  <?dbhtml filename="kdegraphics.html"?>
-
-
-  <title>Kdegraphics-&trinity-version;</title>
-
-  <indexterm zone="kdegraphics">
-    <primary sortas="a-kdegraphics">Kdegraphics</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdegraphics</title>
-
-    <para><application>Kdegraphics</application> provides
-    <application>KDE</application> programs to manage the video display and
-    graphical output.  Applications include PDF, DVI, and Postscript viewers,
-    an application to adjust monitor gamma correction, a 3D modeling
-    application to generate POV-Ray scenes, and a scanner application.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdegraphics-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdegraphics-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdegraphics-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdegraphics-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdegraphics-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdegraphics-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required Patch:
-          <ulink url=""/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Kdegraphics Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="libart_lgpl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libtiff"/>,
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
-         (not recommended: obsolete, abandoned upstream,
-         needed only for the <command>kuickshow</command> image viewer,
-      <xref linkend="lcms"/>,
-      <xref linkend="poppler-014"/>
-        (<filename class='libraryfile'>libpoppler-qt.so</filename> must have
-        been built),
-      <xref linkend="sane"/>,
-      <!-- There is an internal copy of Xpdf and there are *no* hooks to any
-           outside version. Commenting this out for now <xref linkend="xpdf"/>, -->
-      <xref linkend="texlive"/>,
-      <xref linkend="fribidi"/>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
-      <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-      <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
-      <ulink url="http://www.rerecognition.com/">KADMOS</ulink> (a commercial
-        OCR engine),
-      <ulink url="http://pages.cs.wisc.edu/~ghost/gv/index.htm">Ghostview</ulink>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdegraphics"/></para>
-
-  </sect2>
-
-  <sect2 id="kdegraphics-runtime-dependencies"
-         xreflabel="KDE Graphics Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>The <command>kooka</command> utility is a scanning and OCR program.
-    In order for <command>kooka</command> to utilize the OCR capabilities, you
-    must install an OCR engine. <command>kooka</command> provides full OCR
-    support using the <ulink url="http://www.rerecognition.com/">KADMOS</ulink>
-    and <ulink url="http://sourceforge.net/projects/jocr">GOCR</ulink> engines
-    and partial support using the <ulink
-    url="https://savannah.gnu.org/projects/ocrad/">Ocrad</ulink> engine.</para>
-
-    <para>The <command>kghostview</command> program requires a ghostscript
-    interpreter from <xref linkend="gs"/> to process PS or PDF files.</para>
-
-    <para>The <command>kpovmodeler</command> program requires
-    <ulink url="http://www.povray.org/">POV-Ray</ulink> to render 3D scenes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdegraphics</title>
-
-    <para>Install <application>kdegraphics</application> with:</para>
-
-<screen><userinput>KDEGRAPHICS=`pwd`        &amp;&amp;
-MAKEDIR=/tmp/kdegraphics &amp;&amp;
-rm -rf   $MAKEDIR        &amp;&amp;
-mkdir -p $MAKEDIR        &amp;&amp;
-cd       $MAKEDIR        &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-      -DCMAKE_VERBOSE_MAKEFILE=ON            \
-      -DQT_VERSION=3                         \
-      -DCMAKE_CXX_FLAGS="-fpermissive"       \
-      -DWITH_TIFF=ON                         \
-      -DWITH_PAM=ON                          \
-      -DBUILD_ALL=ON                         \
-      -DBUILD_KAMERA=OFF                     \
-      -DBUILD_KSVG=OFF                       \
-      -DBUILD_KUICKSHOW=OFF                  \
-      -DBUILD_LIBKSCAN=OFF                   \
-      -DBUILD_KOOKA=OFF                      \
-      -DBUILD_KGHOSTVIEW=OFF                 \
-      -DBUILD_KFILE_PLUGINS=OFF              \
-      $KDEGRAPHICS                          &amp;&amp;
-
-unset KDEGRAPHICS MAKEDIR &amp;&amp;
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DBUILD_KAMERA</option>: Requires libgphoto2.</para>
-    <para><option>-DBUILD_KSVG</option>: Requires fribidi.</para>
-    <para><option>-DBUILD_KUICKSHOW</option>: Requires imlib (obsolete).</para>
-    <para><option>-DBUILD_LIBKSCAN</option>: Requires sane.</para>
-    <para><option>-DBUILD_KFILE_PLUGINS</option>: Requires poppler.</para>
-    <para><option>-DBUILD_KOOKA</option>: Requires LIBKSCAN.</para>
-    <para><option>-DWITH_LIBPAPER</option>: Requires libpaper (manage paper characteristics).</para>
-    <para><option>-DWITH_T1LIB</option>: Requires t1lib (generate glyphs from Type 1 fonts).</para>
-    <para><option>-DWITH_OPENEXR</option>: Requires OpenEXR (High def image format).</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kcolorchooser, kcoloredit, kdvi, kfax, kfaxview, kghostview,
-        kiconedit, kolourpaint, kooka, kpdf, kpovmodeler, kruler, ksnapshot,
-        kuickshow, kview, kviewshell, mrmlsearch, printnodetest, svgdisplay,
-        and xf86gammacfg</seg>
-        <seg>kio_kamera and several other kdegraphics specific libraries and
-        support modules</seg>
-        <seg>The following subdirectories in &kde-dir;: include/{svg,
-        kviewshell, libtext2path-0.1}, share/applnk/Graphics, share/apps/{too
-        many to list}, and share/config/magic</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kcolorchooser">
-        <term><command>kcolorchooser</command></term>
-        <listitem>
-          <para>is a color chooser for a given pallette.</para>
-          <indexterm zone="kdegraphics kcolorchooser">
-            <primary sortas="b-kcolorchooser">kcolorchooser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcoloredit">
-        <term><command>kcoloredit</command></term>
-        <listitem>
-          <para>is a color pallette editor.</para>
-          <indexterm zone="kdegraphics kcoloredit">
-            <primary sortas="b-kcoloredit">kcoloredit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdvi">
-        <term><command>kdvi</command></term>
-        <listitem>
-          <para>is a DVI viewer.</para>
-          <indexterm zone="kdegraphics kdvi">
-            <primary sortas="b-kdvi">kdvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kfax">
-        <term><command>kfax</command></term>
-        <listitem>
-          <para>is a FAX viewer.</para>
-          <indexterm zone="kdegraphics kfax">
-            <primary sortas="b-kfax">kfax</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kfaxview">
-        <term><command>kfaxview</command></term>
-        <listitem>
-          <para>is a FAX previewer used with
-          <command>kviewshell</command>.</para>
-          <indexterm zone="kdegraphics kfaxview">
-            <primary sortas="b-kfaxview">kfaxview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kghostview">
-        <term><command>kghostview</command></term>
-        <listitem>
-          <para>is a PS/PDF viewer.</para>
-          <indexterm zone="kdegraphics kghostview">
-            <primary sortas="b-kghostview">kghostview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kiconedit">
-        <term><command>kiconedit</command></term>
-        <listitem>
-          <para>is an icon editor.</para>
-          <indexterm zone="kdegraphics kiconedit">
-            <primary sortas="b-kiconedit">kiconedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kolourpaint">
-        <term><command>kolourpaint</command></term>
-        <listitem>
-          <para>is a paint program.</para>
-          <indexterm zone="kdegraphics kolourpaint">
-            <primary sortas="b-kolourpaint">kolourpaint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kooka">
-        <term><command>kooka</command></term>
-        <listitem>
-          <para>is a raster image scan program.</para>
-          <indexterm zone="kdegraphics kooka">
-            <primary sortas="b-kooka">kooka</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpdf">
-        <term><command>kpdf</command></term>
-        <listitem>
-          <para>is a PDF viewer.</para>
-          <indexterm zone="kdegraphics kpdf">
-            <primary sortas="b-kpdf">kpdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpovmodeler">
-        <term><command>kpovmodeler</command></term>
-        <listitem>
-          <para>is a graphical 3D modeler, which can generate scenes for
-          <ulink url="http://www.povray.org/">POV-Ray</ulink>.</para>
-          <indexterm zone="kdegraphics kpovmodeler">
-            <primary sortas="b-kpovmodeler">kpovmodeler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kruler">
-        <term><command>kruler</command></term>
-        <listitem>
-          <para>is a screen ruler.</para>
-          <indexterm zone="kdegraphics kruler">
-            <primary sortas="b-kruler">kruler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ksnapshot">
-        <term><command>ksnapshot</command></term>
-        <listitem>
-          <para> is a screen capture program.</para>
-          <indexterm zone="kdegraphics ksnapshot">
-            <primary sortas="b-ksnapshot">ksnapshot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kuickshow">
-        <term><command>kuickshow</command></term>
-        <listitem>
-          <para>is an image viewer.</para>
-          <indexterm zone="kdegraphics kuickshow">
-            <primary sortas="b-kuickshow">kuickshow</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kview">
-        <term><command>kview</command></term>
-        <listitem>
-          <para>is another image viewer.</para>
-          <indexterm zone="kdegraphics kview">
-            <primary sortas="b-kview">kview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kviewshell">
-        <term><command>kviewshell</command></term>
-        <listitem>
-          <para>is a generic framework for the KDE viewer
-          applications.</para>
-          <indexterm zone="kdegraphics kviewshell">
-            <primary sortas="b-kviewshell">kviewshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xf86gammacfg">
-        <term><command>xf86gammacfg</command></term>
-        <listitem>
-          <para>is a simple tool for monitor gamma correction.</para>
-          <indexterm zone="kdegraphics xf86gammacfg">
-            <primary sortas="b-xf86gammacfg">xf86gammacfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kio_kamera">
-        <term><command>kio_kamera</command></term>
-        <listitem>
-          <para>is an ioslave that allows you to view and download images from a
-          digital camera using the <userinput>kamera:/</userinput> URL in
-          <command>konqueror</command>.</para>
-          <indexterm zone="kdegraphics kio_kamera">
-            <primary sortas="c-kio_kamera">kio_kamera</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdemultimedia.xml
===================================================================
--- archive/kde/add/kdemultimedia.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,275 +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 kdemultimedia-download-http "&trinity-repo-http;/kdemultimedia-&trinity-version;.tar.gz">
-  <!ENTITY kdemultimedia-download-ftp  "&trinity-repo-ftp;/kdemultimedia-&trinity-version;.tar.gz">
-  <!ENTITY kdemultimedia-md5sum        "6d906b8a8fd0928e01ecd600175381c0">
-  <!ENTITY kdemultimedia-size          "5.7 MB">
-  <!ENTITY kdemultimedia-buildsize     "534 MB">
-  <!ENTITY kdemultimedia-time          "6.7 SBU">
-]>
-
-<sect1 id="kdemultimedia" xreflabel="kdemultimedia-&trinity-version;">
-  <?dbhtml filename="kdemultimedia.html"?>
-
-
-  <title>Kdemultimedia-&trinity-version;</title>
-
-  <indexterm zone="kdemultimedia">
-    <primary sortas="a-kdemultimedia">Kdemultimedia</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdemultimedia</title>
-
-    <para><application>Kdemultimedia</application> provides several
-    <application>KDE</application> programs to work with sound.  Programs
-    include applications for a jukebox, a soundcard mixer, a midi and karaoke
-    player, and a recording application for
-    <application>aRts</application>.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdemultimedia-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdemultimedia-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdemultimedia-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdemultimedia-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdemultimedia-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdemultimedia-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch (if <application>libtunepimp</application>
-        &gt;= 0.4.x is installed): <ulink
-        url="&patch-root;/kdemultimedia-&kde-version;-libtunepimp_0.4.x-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Kdemultimedia Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="akode"/>,
-      <xref linkend="alsa"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cdparanoia"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="audiofile"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="xine-lib"/>,
-      <xref linkend="flac"/> (built with <xref linkend="libogg"/> support),
-      <ulink url="http://gstreamer.freedesktop.org/src/gstreamer/">gstreamer-0.8
-        (later versions are not supported)</ulink>,
-      <xref linkend="libtheora"/>,
-      <ulink url="http://developer.kde.org/~wheeler/taglib.html">TagLib</ulink>,
-      <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
-        (requires <xref linkend="libmusicbrainz"/>),
-      <xref linkend="graphviz"/>, and
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdemultimedia</title>
-
-    <para>Install <application>kdemultimedia</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@" \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-sed -i -e 's@^gentable_LDADD.*$@&amp; -L$(TRINITY_PREFIX)/lib@' \
-          noatun/library/Makefile.in                          &amp;&amp;
-
-export LIBRARY_PATH=$TRINITY_PREFIX/lib                       &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX                         \
-            --with-qt-dir=$QTDIR                             \
-            --enable-closure                                 \
-            --with-vorbis                                    \
-            --with-alsa                                      \
-            --with-audiofile                                 \
-            --with-flac                                      \
-            --with-akode                                     \
-            --with-cdparanoia                                \
-            --with-kscd-cdda                                 \
-            --with-lame                                      \
-            --with-xine                                      \
-            --with-theora                                    \
-            --with-extra-includes=$TRINITY_PREFIX/include    \
-            --with-extra-libs=$TRINITY_PREFIX/lib:$QTDIR/lib &amp;&amp;
-
-make</userinput></screen>
-
-    <para>Remove and '--with-' statements for those dependencies not installed.</para>
-
-<!--
-    The apidox target has been removed from this package.
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
--->
-
-     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>artsbuilder, artscontrol, juk, kaboodle, kaudiocreator, kmid,
-        kmix, kmixctrl, krec, kscd, midisend, mpeglibartsplay, noatun,
-        workman2cddb.pl, yaf-cdda, yaf-mpgplay, yaf-splay, yaf-tplay,
-        yaf-vorbis, and yaf-yuv</seg>
-        <seg>Numerous kdemultimedia specific libraries</seg>
-        <seg>The following subdirectories in $KDE_PREFIX: include/{libkcddb,
-        mpeglib, noatun}, lib/mcop/Noatun, and
-        share/apps/{too many to list}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="artsbuilder">
-        <term><command>artsbuilder</command></term>
-        <listitem>
-          <para>is a tool to create new structures of small connected
-          <application>aRts</application> modules.</para>
-          <indexterm zone="kdemultimedia artsbuilder">
-            <primary sortas="b-artsbuilder">artsbuilder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="juk">
-        <term><command>juk</command></term>
-        <listitem>
-          <para>is a jukebox, tagger, and music collection manager.</para>
-          <indexterm zone="kdemultimedia juk">
-            <primary sortas="b-juk">juk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kaboodle">
-        <term><command>kaboodle</command></term>
-        <listitem>
-          <para>is a multimedia player.</para>
-          <indexterm zone="kdemultimedia kaboodle">
-            <primary sortas="b-kaboodle">kaboodle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kaudiocreator">
-        <term><command>kaudiocreator</command></term>
-        <listitem>
-          <para>is a front-end tool for ripping audio CDs and
-          encoding the wav files.</para>
-          <indexterm zone="kdemultimedia kaudiocreator">
-            <primary sortas="b-kaudiocreator">kaudiocreator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmid">
-        <term><command>kmid</command></term>
-        <listitem>
-          <para>is a midi/karaoke player.</para>
-          <indexterm zone="kdemultimedia kmid">
-            <primary sortas="b-kmid">kmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmix">
-        <term><command>kmix</command></term>
-        <listitem>
-          <para>is a sound mixer.</para>
-          <indexterm zone="kdemultimedia kmix">
-            <primary sortas="b-kmix">kmix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krec">
-        <term><command>krec</command></term>
-        <listitem>
-          <para>is a recording frontend for <application>aRts</application>.</para>
-          <indexterm zone="kdemultimedia krec">
-            <primary sortas="b-krec">krec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kscd">
-        <term><command>kscd</command></term>
-        <listitem>
-          <para>is a CD player.</para>
-          <indexterm zone="kdemultimedia kscd">
-            <primary sortas="b-kscd">kscd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="noatun">
-        <term><command>noatun</command></term>
-        <listitem>
-          <para>is another multimedia player.</para>
-          <indexterm zone="kdemultimedia noatun">
-            <primary sortas="b-noatun">noatun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdenetwork.xml
===================================================================
--- archive/kde/add/kdenetwork.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,357 +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 kdenetwork-download-http "&trinity-repo-http;/kdenetwork-&trinity-version;.tar.gz">
-  <!ENTITY kdenetwork-download-ftp  "&trinity-repo-ftp;/kdenetwork-&trinity-version;.tar.gz">
-  <!ENTITY kdenetwork-md5sum        "349f197c9af4bf0d9b8773f26829415e">
-  <!ENTITY kdenetwork-size          "8.6 MB">
-  <!ENTITY kdenetwork-buildsize     "98 MB">
-  <!ENTITY kdenetwork-time          "5.1 SBU">
-]>
-
-<sect1 id="kdenetwork" xreflabel="kdenetwork-&trinity-version;">
-  <?dbhtml filename="kdenetwork.html"?>
-
-
-  <title>Kdenetwork-&trinity-version;</title>
-
-  <indexterm zone="kdenetwork">
-    <primary sortas="a-kdenetwork">Kdenetwork</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdenetwork</title>
-
-    <para><application>Kdenetwork</application> provides several
-    <application>KDE</application> applications useful in a networking
-    environment.  Applications include clients for chat, PPP, news, instant
-    messages, and similar programs.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdenetwork-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdenetwork-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdenetwork-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdenetwork-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdenetwork-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdenetwork-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdenetwork-&trinity-version;-upstream_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdenetwork Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openssl"/>, and
-      <xref linkend="speex"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="ppp"/>,
-      <xref linkend="wireless_tools"/>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">v4l-utils (Video 4 Linux)</ulink>,
-      <ulink url="http://linux.softpedia.com/progDownload/gsmlib-Download-15052.html">gsmlib</ulink>,
-      <ulink url="http://meanwhile.sourceforge.net">Meanwhile</ulink>,
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>, and
-      <ulink url="http://toxygen.net/libgadu/">libgadu (Polish)</ulink>,
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdenetwork"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdenetwork</title>
-
-    <note><para>The following installation procedures assume that the
-    recommended dependencies as well as v4l-utils and wireless_tools are
-    installed.  Examine CMakeLists.txt to determine other options.</para>
-
-    <para>v4l-utils must be installed to build any kopete (instant
-    messenger) plugin.</para>
-    </note>
-
-    <para>Install <application>kdenetwork</application> with:</para>
-
-<screen><userinput>patch -Np1 -i ../kdenetwork-&trinity-version;-upstream_fixes-1.patch &amp;&amp;
-
-MAKEDIR=/tmp/buildkdenet &amp;&amp;
-KDENET=`pwd`             &amp;&amp;
-rm -rf   $MAKEDIR        &amp;&amp;
-mkdir -p $MAKEDIR        &amp;&amp;
-cd       $MAKEDIR        &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX    \
-      -DCMAKE_VERBOSE_MAKEFILE=ON               \
-      -DWITH_JINGLE=ON                          \
-      -DWITH_SPEEX=ON                           \
-      -DWITH_WEBCAM=ON                          \
-      -DWITH_GSM=OFF                            \
-      -DWITH_ARTS=ON                            \
-      -DBUILD_KOPETE_PROTOCOL_ALL=ON            \
-      -DBUILD_KOPETE_PROTOCOL_GADU=OFF          \
-      -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF     \
-      -DBUILD_KOPETE_PLUGIN_ALL=ON              \
-      -DBUILD_ALL=ON                            \
-      $KDENET            &amp;&amp;
-
-unset MAKEDIR KDENET     &amp;&amp;
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-    <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="configuration">
-    <title>Configuring Kdenetwork</title>
-
-    <sect3 id='kdenetwork-config'>
-      <title>Config Files</title>
-
-      <para><filename>/etc/lisarc</filename> and
-      <filename>~/.lisarc</filename></para>
-
-      <indexterm zone="kdenetwork kdenetwork-config">
-        <primary sortas="e-AA.lisarc">~/.lisarc</primary>
-      </indexterm>
-
-      <indexterm zone="kdenetwork kdenetwork-config">
-        <primary sortas="e-etc-lisarc">/etc/lisarc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id='kdenetwork-init'>
-      <title>Configuration Information</title>
-
-      <para>To utilize the LAN Browser of <command>konqueror</command> you will
-      need to create the <filename>/etc/lisarc</filename> file and start the
-      <command>lisa</command> daemon. Create <filename>/etc/lisarc</filename>
-      by filling out the information in the <quote>Guided LISa Setup</quote>
-      section of the <quote>LISa Daemon</quote> tab on the <quote>Control
-      Center</quote> &mdash; <quote>Internet &amp; Network</quote> &mdash;
-      <quote>Local Network Browsing</quote> dialog box.</para>
-
-      <para>Install the <filename>/etc/rc.d/init.d/lisa</filename> init script
-      included in the <xref linkend="bootscripts"/>
-      package.</para>
-
-<screen role="root"><userinput>make install-lisa</userinput></screen>
-
-      <indexterm zone="kdenetwork kdenetwork-init">
-        <primary sortas="f-kdenetwork">lisa</primary>
-      </indexterm>
-
-      <para>There is no explicit configuration for the rest of the
-      <application>kdenetwork</application> package, however some individual
-      programs need to be set up with user information.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-
-        <seg>dsirc, feedbrowser, kdict, kget, knewstickerstub, kopete, kppp,
-        krdc, krfb, ksirc, ktalkd, kwifimanager, lisa, rssclient, rssservice,
-        stunserver, and some additional support scripts</seg>
-
-        <seg>libkdeinit_kdict.so, libkdeinit_ksirc.so, libkopete.so,
-        libkopete_msn_shared.so, libkopete_oscar.so, libkopete_videodevice.so,
-        librss.so</seg>
-
-        <seg>$TRINITY_PREFIX/include/{kopete,rss}, $TRINITY_PREFIX/lib/trinity</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kdict">
-        <term><command>kdict</command></term>
-        <listitem>
-          <para> is a graphical client for the Dictionary Server Protocol
-          (DICT).</para>
-          <indexterm zone="kdenetwork kdict">
-            <primary sortas="b-kdict">kdict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kget">
-        <term><command>kget</command></term>
-        <listitem>
-          <para>allows you to group downloads.</para>
-          <indexterm zone="kdenetwork kget">
-            <primary sortas="b-kget">kget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="knewsticker">
-        <term><command>knewsticker</command></term>
-        <listitem>
-          <para>is a news applet for the <application>KDE</application> Application
-          Launcher Panel.</para>
-          <indexterm zone="kdenetwork knewsticker">
-            <primary sortas="b-knewsticker">knewsticker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kopete">
-        <term><command>kopete</command></term>
-        <listitem>
-          <para> is <application>KDE</application>'s multi-protocol instant
-          messenger client.</para>
-          <indexterm zone="kdenetwork kopete">
-            <primary sortas="b-kopete">kopete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpf">
-        <term><command>kpf</command></term>
-        <listitem>
-          <para>allows you to share files over a network.</para>
-          <indexterm zone="kdenetwork kpf">
-            <primary sortas="b-kpf">kpf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kppp">
-        <term><command>kppp</command></term>
-        <listitem>
-          <para>is a dial-up utility.</para>
-          <indexterm zone="kdenetwork kppp">
-            <primary sortas="b-kppp">kppp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krdc">
-        <term><command>krdc</command></term>
-        <listitem>
-          <para>is a client application that allows you to view or even control the
-          desktop session on another machine that is running a compatible
-          (VNC) server.</para>
-          <indexterm zone="kdenetwork krdc">
-            <primary sortas="b-krdc">krdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="krfb">
-        <term><command>krfb</command></term>
-        <listitem>
-          <para> is a server application that allows you to share your current
-          session with a user on another machine, who can use a VNC client to
-          view or even control the desktop.</para>
-          <indexterm zone="kdenetwork krfb">
-            <primary sortas="b-krfb">krfb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ksirc">
-        <term><command>ksirc</command></term>
-        <listitem>
-          <para>is a chat client.</para>
-          <indexterm zone="kdenetwork ksirc">
-            <primary sortas="b-ksirc">ksirc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktalkd">
-        <term><command>ktalkd</command></term>
-        <listitem>
-          <para>is an enhanced <command>talk</command> daemon&mdash;a program
-          to handle incoming <command>talk</command> requests, announce them
-          and allow you to respond to them using a talk client.</para>
-          <indexterm zone="kdenetwork ktalkd">
-            <primary sortas="b-ktalkd">ktalkd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwifimanager">
-        <term><command>kwifimanager</command></term>
-        <listitem>
-          <para>is used to configure and monitor wireless LAN cards.</para>
-          <indexterm zone="kdenetwork kwifimanager">
-            <primary sortas="b-kwifimanager">kwifimanager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lisa">
-        <term><command>lisa</command></term>
-        <listitem>
-          <para>is intended to provide a kind of network neighborhood, but only
-          relying on the TCP/IP protocol stack.</para>
-          <indexterm zone="kdenetwork lisa">
-            <primary sortas="b-lisa">lisa</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdepim.xml
===================================================================
--- archive/kde/add/kdepim.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,350 +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 kdepim-download-http "&trinity-repo-http;/kdepim-&trinity-version;.tar.gz">
-  <!ENTITY kdepim-download-ftp  "&trinity-repo-ftp;/kdepim-&trinity-version;.tar.gz">
-  <!ENTITY kdepim-md5sum        "4488062d5400bdd99642fe0b72ebcf9a">
-  <!ENTITY kdepim-size          "12.8 MB">
-  <!ENTITY kdepim-buildsize     "347 MB">
-  <!ENTITY kdepim-time          "6.4 SBU">
-]>
-
-<sect1 id="kdepim" xreflabel="kdepim-&trinity-version;">
-  <?dbhtml filename="kdepim.html"?>
-
-
-  <title>Kdepim-&trinity-version;</title>
-
-  <indexterm zone="kdepim">
-    <primary sortas="a-kdepim">Kdepim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdepim</title>
-
-    <para><application>Kdepim</application> provides several
-    <application>KDE</application> programs for managing personal information.
-    Programs include a contact manager, calendar, mail utilities, newsreader,
-    X.509 certificate manager, and sticky notes.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdepim-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdepim-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdepim-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdepim-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdepim-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdepim-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdepim-&kde-version;-charset-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">Kdepim Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="gnupg2"/>, and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="kdeaccessibility"/>,
-      <xref linkend="kdemultimedia"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="pilot-link"/>,
-      <xref linkend="gnupg"/> or
-      <xref linkend="gpgme"/>,
-      <ulink url="http://www.opensync.org">OpenSync</ulink>,
-      <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
-      <ulink url="http://www.gnokii.org/">gnokii</ulink>,
-      <ulink url="http://www.bluez.org">BlueZ</ulink>,
-      <xref linkend="boost"/>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdepim"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdepim</title>
-
-    <para>Install <application>kdepim</application> with:</para>
-
-<screen><userinput>MAKEDIR=/tmp/buildpim &amp;&amp;
-KDEPIM=`pwd`          &amp;&amp;
-rm -rf   $MAKEDIR     &amp;&amp;
-mkdir -p $MAKEDIR     &amp;&amp;
-cd       $MAKEDIR     &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-      -DCMAKE_VERBOSE_MAKEFILE=ON            \
-      -DWITH_ARTS=ON                         \
-      -DBUILD_ALL=ON                         \
-      -DBUILD_INDEXLIB=OFF                   \
-      $KDEPIM         &amp;&amp;
-
-unset KDEPIM MAKEDIR  &amp;&amp;
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DBUILD_INDEXLIB=OFF</option>: This option requires
-    <ulink url="http://www.boost.org">Boost</ulink>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>akregator, kaddressbook, kalarm, kandy, karm,
-        kitchensync, kleopatra, kmail, knode, knotes, konsolekalendar,
-        kontact, korganizer, korn, kpilot,
-        ktnef, kwatchgnupg, and supporting programs</seg>
-        <seg>Numerous kdepim specific libraries</seg>
-        <seg>Numerous subdirectories in $KDE_PREFIX/{include,share}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="akregator">
-        <term><command>akregator</command></term>
-        <listitem>
-          <para>is a program to read <acronym>RSS</acronym> and
-          other online news feeds.</para>
-          <indexterm zone="kdepim akregator">
-            <primary sortas="b-akregator">akregator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kaddressbook">
-        <term><command>kaddressbook</command></term>
-        <listitem>
-          <para>is the <application>KDE</application> address book.</para>
-          <indexterm zone="kdepim kaddressbook">
-            <primary sortas="b-kaddressbook">kaddressbook</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kalarm">
-        <term><command>kalarm</command></term>
-        <listitem>
-          <para>is a system to provide reminder messages.</para>
-          <indexterm zone="kdepim kalarm">
-            <primary sortas="b-kalarm">kalarm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kandy">
-        <term><command>kandy</command></term>
-        <listitem>
-          <para>is a program to synchronize mobile phone numbers.</para>
-          <indexterm zone="kdepim kandy">
-            <primary sortas="b-kandy">kandy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="karm">
-        <term><command>karm</command></term>
-        <listitem>
-          <para> is a personal time tracker.</para>
-          <indexterm zone="kdepim karm">
-            <primary sortas="b-karm">karm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kitchensync">
-        <term><command>kitchensync</command></term>
-        <listitem>
-          <para>is the universal syncing tool and framework for kde.</para>
-          <indexterm zone="kdepim kitchensync">
-            <primary sortas="b-kitchensync">kitchensync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kleopatra">
-        <term><command>kleopatra</command></term>
-        <listitem>
-          <para>is a tool for managing X.509 certificates in
-          a <application>GpgSM</application> keybox and for retrieving
-          certificates from <acronym>LDAP</acronym> servers.</para>
-          <indexterm zone="kdepim kleopatra">
-            <primary sortas="b-kleopatra">kleopatra</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmail">
-        <term><command>kmail</command></term>
-        <listitem>
-          <para>is <application>KDE</application>'s email client.</para>
-          <indexterm zone="kdepim kmail">
-            <primary sortas="b-kmail">kmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="knode">
-        <term><command>knode</command></term>
-        <listitem>
-          <para> is the <application>KDE</application> newsreader.</para>
-          <indexterm zone="kdepim knode">
-            <primary sortas="b-knode">knode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="knotes">
-        <term><command>knotes</command></term>
-        <listitem>
-          <para> is a popup notes utility.</para>
-          <indexterm zone="kdepim knotes">
-            <primary sortas="b-knotes">knotes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="konsolekalendar">
-        <term><command>konsolekalendar</command></term>
-        <listitem>
-          <para>is a command line interface to <application>KDE</application>
-          calendars.</para>
-          <indexterm zone="kdepim konsolekalendar">
-            <primary sortas="b-konsolekalendar">konsolekalendar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kontact">
-        <term><command>kontact</command></term>
-        <listitem>
-          <para>is the integrated solution to personal information management
-                (PIM) needs.</para>
-          <indexterm zone="kdepim kontact">
-            <primary sortas="b-kontact">kontact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="korganizer">
-        <term><command>korganizer</command></term>
-        <listitem>
-          <para>is a personal calendar/todo system.</para>
-          <indexterm zone="kdepim korganizer">
-            <primary sortas="b-korganizer">korganizer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="korn">
-        <term><command>korn</command></term>
-        <listitem>
-          <para>is a <application>KDE</application> mail checker that has the capabilities to
-                dock itself to <command>kicker</command>.</para>
-          <indexterm zone="kdepim korn">
-            <primary sortas="b-korn">korn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpilot">
-        <term><command>kpilot</command></term>
-        <listitem>
-          <para>is a program to synchronize a Palm-Pilot.</para>
-          <indexterm zone="kdepim kpilot">
-            <primary sortas="b-kpilot">kpilot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktnef">
-        <term><command>ktnef</command></term>
-        <listitem>
-          <para>allows handling mail attachments using the TNEF format.
-          Those attachments are usually found in mails coming
-          from <trademark class="registered">Microsoft</trademark>
-          mail servers and embed the mail properties as well as the
-          actual attachments.</para>
-          <indexterm zone="kdepim ktnef">
-            <primary sortas="b-ktnef">ktnef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwatchgnupg">
-        <term><command>kwatchgnupg</command></term>
-        <listitem>
-          <para>is simple<application>GnuPG</application> log viewer.</para>
-          <indexterm zone="kdepim kwatchgnupg">
-            <primary sortas="b-kwatchgnupg">kwatchgnupg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdetoys.xml
===================================================================
--- archive/kde/add/kdetoys.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 kdetoys-download-http "&trinity-repo-http;/kdetoys-&trinity-version;.tar.gz">
-  <!ENTITY kdetoys-download-ftp  "&trinity-repo-ftp;/kdetoys-&trinity-version;.tar.gz">
-  <!ENTITY kdetoys-md5sum        "823dd778c1e9e15972a509f4eee4434d">
-  <!ENTITY kdetoys-size          "2.9 MB">
-  <!ENTITY kdetoys-buildsize     "49 MB">
-  <!ENTITY kdetoys-time          "0.6 SBU">
-]>
-
-<sect1 id="kdetoys" xreflabel="kdetoys-&trinity-version;">
-  <?dbhtml filename="kdetoys.html"?>
-
-
-  <title>Kdetoys-&trinity-version;</title>
-
-  <indexterm zone="kdetoys">
-    <primary sortas="a-kdetoys">Kdetoys</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdetoys</title>
-
-    <para><application>Kdetoys</application> includes
-    <application>KDE</application> applications for a world clock, an applet
-    showing the phases of the moon, and the ability to track weather
-    stations.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdetoys-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdetoys-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdetoys-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdetoys-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdetoys-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdetoys-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdetoys Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdetoys"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdetoys</title>
-
-    <para>Install <application>kdetoys</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX                      \
-            --with-qt-dir=$QTDIR                          \
-            --enable-closure                              \
-            --with-extra-libs=$TRINITY_PREFIX/lib         &amp;&amp;
-
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>amor, kmoon, kodo, kteatime, ktux, kweather, and kworldclock</seg>
-        <seg>kdetoys support libraries</seg>
-        <seg>Support subdirectories in $KDE_PREFIX/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="amor">
-        <term><command>amor</command></term>
-        <listitem>
-          <para>Amusing Misuse of Resources.</para>
-          <indexterm zone="kdetoys amor">
-            <primary sortas="b-amor">amor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmoon">
-        <term><command>kmoon</command></term>
-        <listitem>
-          <para>is a Moon phase indicator.</para>
-          <indexterm zone="kdetoys kmoon">
-            <primary sortas="b-kmoon">kmoon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kodo">
-        <term><command>kodo</command></term>
-        <listitem>
-          <para>measures your desktop mileage.</para>
-          <indexterm zone="kdetoys kodo">
-            <primary sortas="b-kodo">kodo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kteatime">
-        <term><command>kteatime</command></term>
-        <listitem>
-          <para>times your tea brewing.</para>
-          <indexterm zone="kdetoys kteatime">
-            <primary sortas="b-kteatime">kteatime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktux">
-        <term><command>ktux</command></term>
-        <listitem>
-          <para>small Tux crossing stars.</para>
-          <indexterm zone="kdetoys ktux">
-            <primary sortas="b-ktux">ktux</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kworldclock">
-        <term><command>kworldclock</command></term>
-        <listitem>
-          <para>shows which parts of the world are currently experiencing daylight,
-          and which parts are currently in night. It also shows the current
-          time in a range of cities around the world.</para>
-          <indexterm zone="kdetoys kworldclock">
-            <primary sortas="b-kworldclock">kworldclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/add/kdeutils.xml
===================================================================
--- archive/kde/add/kdeutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,317 +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 kdeutils-download-http "&trinity-repo-http;/kdeutils-&trinity-version;.tar.gz">
-  <!ENTITY kdeutils-download-ftp  "&trinity-repo-ftp;/kdeutils-&trinity-version;.tar.gz">
-  <!ENTITY kdeutils-md5sum        "e2cd6695606c5c91b3380dcc7f1a6a83">
-  <!ENTITY kdeutils-size          "2.8 MB">
-  <!ENTITY kdeutils-buildsize     "271 MB">
-  <!ENTITY kdeutils-time          "3.3 SBU">
-]>
-
-<sect1 id="kdeutils" xreflabel="kdeutils-&trinity-version;">
-  <?dbhtml filename="kdeutils.html"?>
-
-
-  <title>Kdeutils-&trinity-version;</title>
-
-  <indexterm zone="kdeutils">
-    <primary sortas="a-kdeutils">Kdeutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeutils</title>
-
-    <para><application>Kdeutils</application> provides
-    <application>KDE</application> programs for miscellaneous tasks.  Programs
-    include a calculator, a note taker, a basic editor, a floppy disk manager,
-    and a binary editor.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdeutils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdeutils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdeutils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdeutils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdeutils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdeutils-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdeutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdebase"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-      <ulink url="http://tpctl.sourceforge.net/">tpctl</ulink> (for Thinkpad support),
-      <xref linkend="python2"/>,
-      <ulink url="http://www.xmms.org/">XMMS</ulink>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdeutils"/></para>
-
-  </sect2>
-
-  <sect2 id="kdeutils-runtime-dependencies"
-         xreflabel="KDE Utils Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>Several programs included in <application>kdeutils</application>
-    are frontends for other software, and so require these external programs
-    to be present at run time. <command>kgpg</command> requires
-    <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>, <command>kdessh</command>
-    requires <xref linkend="openssh"/>, while <command>irkick</command> requires
-    <ulink url="http://www.lirc.org">LIRC</ulink>. The <command>ark</command>
-    program will require appropriate utilities to handle various archives,
-    including <xref linkend="zip"/>, <xref linkend="unzip"/>,
-    <xref linkend="openjdk"/> <!--  or <xref linkend="jdk"/> --> (for the
-    <command>jar</command> program),
-    <xref linkend="unrar"/>, <ulink url="http://www.rarlabs.com">rar</ulink>
-    (binary only shareware),
-    <ulink url="http://p7zip.sourceforge.net">p7zip</ulink>,
-    <ulink url="http://packages.debian.org/source/unstable/zoo">zoo</ulink>, and
-    <ulink url="http://packages.debian.org/source/unstable/ncompress">
-    ncompress</ulink>.</para>
-
-  </sect2>
-
-  <sect2 role="installation" >
-    <title>Installation of Kdeutils</title>
-
-    <para>Install <application>kdeutils</application> with:</para>
-
-<screen><userinput>cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
-cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
-sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@"   \
-          admin/acinclude.m4.in                               &amp;&amp;
-make -f admin/Makefile.common                                 &amp;&amp;
-
-./configure --prefix=$TRINITY_PREFIX                      \
-            --with-qt-dir=$QTDIR                          \
-            --enable-closure                              \
-            --with-extra-includes=$TRINITY_PREFIX/include \
-            --with-extra-libs=$TRINITY_PREFIX/lib         &amp;&amp;
-
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ark, irkick, kcalc, kcharselect, kdessh, kdf, kedit, kfloppy,
-        kgpg, khexedit, kjots, klaptop_acpi_helper, klaptop_check,
-        kregexpeditor, ktimer, kwalletmanager, kwikdisk, and superkaramba</seg>
-        <seg>Several kdeutils specific libraries</seg>
-        <seg>Several subdirectories in $KDE_PREFIX/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ark">
-        <term><command>ark</command></term>
-        <listitem>
-          <para>is an archiving tool.</para>
-          <indexterm zone="kdeutils ark">
-            <primary sortas="b-ark">ark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="irkick">
-        <term><command>irkick</command></term>
-        <listitem>
-          <para>is the infrastructure for <application>KDE</application>'s Infrared
-          Remote Control functionality; <command>irkick</command> is the server
-          component of that infrastructure.</para>
-          <indexterm zone="kdeutils irkick">
-            <primary sortas="b-irkick">irkick</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcalc">
-        <term><command>kcalc</command></term>
-        <listitem>
-          <para>is a scientific calculator.</para>
-          <indexterm zone="kdeutils kcalc">
-            <primary sortas="b-kcalc">kcalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcharselect">
-        <term><command>kcharselect</command></term>
-        <listitem>
-          <para>is a character selector applet.</para>
-          <indexterm zone="kdeutils kcharselect">
-            <primary sortas="b-kcharselect">kcharselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdessh">
-        <term><command>kdessh</command></term>
-        <listitem>
-          <para>is a graphical interface to <xref linkend="openssh"/></para>
-          <indexterm zone="kdeutils kdessh">
-            <primary sortas="b-kdessh">kdessh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdf">
-        <term><command>kdf</command></term>
-        <listitem>
-          <para>is a disk usage viewer.</para>
-          <indexterm zone="kdeutils kdf">
-            <primary sortas="b-kdf">kdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kedit">
-        <term><command>kedit</command></term>
-        <listitem>
-          <para>is a text editor.</para>
-          <indexterm zone="kdeutils kedit">
-            <primary sortas="b-kedit">kedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kfloppy">
-        <term><command>kfloppy</command></term>
-        <listitem>
-          <para>is a floppy formatter.</para>
-          <indexterm zone="kdeutils kfloppy">
-            <primary sortas="b-kfloppy">kfloppy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kgpg">
-        <term><command>kgpg</command></term>
-        <listitem>
-          <para>a simple graphical interface for <xref linkend="gnupg"/>.</para>
-          <indexterm zone="kdeutils kgpg">
-            <primary sortas="b-kgpg">kgpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="khexedit">
-        <term><command>khexedit</command></term>
-        <listitem>
-          <para>is a binary editor.</para>
-          <indexterm zone="kdeutils khexedit">
-            <primary sortas="b-khexedit">khexedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjots">
-        <term><command>kjots</command></term>
-        <listitem>
-          <para>is a note taker.</para>
-          <indexterm zone="kdeutils kjots">
-            <primary sortas="b-kjots">kjots</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kregexpeditor">
-        <term><command>kregexpeditor</command></term>
-        <listitem>
-          <para>is an editor for editing regular expressions in a
-          graphical style (in contrast to the ASCII syntax).</para>
-          <indexterm zone="kdeutils kregexpeditor">
-            <primary sortas="b-kregexpeditor">kregexpeditor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktimer">
-        <term><command>ktimer</command></term>
-        <listitem>
-          <para>is a task scheduler.</para>
-          <indexterm zone="kdeutils ktimer">
-            <primary sortas="b-ktimer">ktimer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwalletmanager">
-        <term><command>kwalletmanager</command></term>
-        <listitem>
-          <para>provides a secure way to manage passwords.</para>
-          <indexterm zone="kdeutils kwalletmanager">
-            <primary sortas="b-kwalletmanager">kwalletmanager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="superkaramba">
-        <term><command>superkaramba</command></term>
-        <listitem>
-          <para>is a tool to create interactive widgets on a
-          <application>KDE</application> desktop.</para>
-          <indexterm zone="kdeutils superkaramba">
-            <primary sortas="b-superkaramba">superkaramba</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/core/arts.xml
===================================================================
--- archive/kde/core/arts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,269 +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 arts-download-http "&trinity-repo-http;/arts-&trinity-version;.tar.gz">
-  <!ENTITY arts-download-ftp  "&trinity-repo-ftp;/arts-&trinity-version;.tar.gz">
-  <!ENTITY arts-md5sum        "109124dabb1aaa9d44eb32e43b549142">
-  <!ENTITY arts-size          "920 KB">
-  <!ENTITY arts-buildsize     "36 MB">
-  <!ENTITY arts-time          "0.6 SBU">
-]>
-
-<sect1 id="aRts" xreflabel="aRts-&trinity-version;">
-  <?dbhtml filename="aRts.html"?>
-
-
-  <title>aRts-&trinity-version;</title>
-
-  <indexterm zone='aRts'>
-    <primary sortas='a-ARts'>aRts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to aRts</title>
-
-    <para>The Analog Real-time Synthesizer (<application>aRts</application>)
-    provides sound support for <application>Trinity</application> programs
-    and libraries.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&arts-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&arts-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &arts-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &arts-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &arts-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &arts-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">aRts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa"/>,
-      <xref linkend="audiofile"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="libmad"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="pkgconfig"/>, and
-      <xref linkend="qt"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/arts"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of aRts</title>
-
-    <note><para>When extracted, the <application>aRts</application> tar
-    file expands into the directory
-    <filename class='directory'>dependencies/arts</filename>.</para></note>
-
-    <para>Install <application>aRts</application> by running
-    the following commands:</para>
-
-<screen><userinput>BUILD=/tmp/buildarts &amp;&amp;
-ARTS=`pwd`           &amp;&amp;
-rm -rf   $BUILD      &amp;&amp;
-mkdir -p $BUILD      &amp;&amp;
-cd       $BUILD      &amp;&amp;
-
-cmake $ARTS                              \
-  -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-  -DCMAKE_VERBOSE_MAKEFILE=ON &amp;&amp;
-
-unset ARTS BUILD     &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><userinput>ARTS=`pwd`</userinput>: This command saves the
-    location of the <application>aRts</application> source code.</para>
-
-    <para><userinput>rm -rf /tmp/buildarts; mkdir -p /tmp/buildarts; cd
-    /tmp/buildarts</userinput>:  The developers strongly recommend building
-    Trinity components in a directory separate from the source code.  These
-    commands ensure a clean starting location for the build process.</para>
-
-    <para><option>-DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX</option>: This option
-    is the equivalent of the ./configure <option>--prefix</option>
-    option.</para>
-
-    <para><option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This option
-    provides verrbose messages when <userinput>make</userinput> is
-    run.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>artsc-config, artscat, artsd, artsdsp, artsplay, artsrec,
-        artsshell, artswrapper, and mcopidl </seg>
-
-        <seg>aRts libraries</seg>
-
-        <seg>The following subdirectories of $TRINITY_PREFIX: bin,
-        include/arts, include/artsc, and lib/mcop</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="artsc-config">
-        <term><command>artsc-config</command></term>
-        <listitem>
-          <para>is a utility to assist developers using the
-          <application>aRts</application> C API.</para>
-          <indexterm zone="aRts  artsc-config">
-            <primary sortas="b-artsc-config">artsc-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artscat">
-        <term><command>artscat</command></term>
-        <listitem>
-          <para>is a simple utility to send raw audio data to the sound server.</para>
-          <indexterm zone="aRts artscat">
-            <primary sortas="b-artscat">artscat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsd">
-        <term><command>artsd</command></term>
-        <listitem>
-          <para>is a daemon that provides access to the sound hardware resources.</para>
-          <indexterm zone="aRts artsd">
-            <primary sortas="b-artsd">artsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsdsp">
-        <term><command>artsdsp</command></term>
-        <listitem>
-          <para>provides an interim solution that allows most of legacy
-          sound applications to run unchanged.</para>
-          <indexterm zone="aRts artsdsp">
-            <primary sortas="b-artsdsp">artsdsp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaRts">
-        <term><filename class='libraryfile'>aRts Libraries</filename></term>
-        <listitem>
-          <para>contains functions that support <application>aRts</application>
-          programs.</para>
-          <indexterm zone="aRts libaRts">
-            <primary sortas="c-libaRts">aRts Libraries</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsplay">
-        <term><command>artsplay</command></term>
-        <listitem>
-          <para>is a simple utility to play a sound file.</para>
-          <indexterm zone="aRts artsplay">
-            <primary sortas="b-artsplay">artsplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsrec">
-        <term><command>artsrec</command></term>
-        <listitem>
-          <para>is a simple utility to record audio input.</para>
-          <indexterm zone="aRts artsrec">
-            <primary sortas="b-artsrec">artsrec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artsshell">
-        <term><command>artsshell</command></term>
-        <listitem>
-          <para>is intended as a utility to perform miscellaneous functions
-          related to the sound server.</para>
-          <indexterm zone="aRts artsshell">
-            <primary sortas="b-artsshell">artsshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="artswrapper">
-        <term><command>artswrapper</command></term>
-        <listitem>
-          <para>is a small wrapper program which simply sets real-time priority
-          (running as <systemitem class="username">root</systemitem>)
-          and then executes <command>artsd</command> as a non-root user.</para>
-          <indexterm zone="aRts artswrapper">
-            <primary sortas="b-artswrapper">artswrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcopidl">
-        <term><command>mcopidl</command></term>
-        <listitem>
-          <para>is the Interface Definition Language (IDL) file compiler for MCOP, the
-          Multimedia Communication Protocol used by <application>aRts</application>.</para>
-          <indexterm zone="aRts  mcopidl">
-            <primary sortas="b-mcopidl">mcopidl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-<!--
-    <para>To find out information about <application>aRts</application> and the
-    various programs included in the package, see <ulink
-    url="http://docs.kde.org/development/en/kdemultimedia/artsbuilder/">The
-    <application>aRts</application> Handbook</ulink>. For information in languages
-    other then English, see the <ulink url="http://docs.kde.org/">KDE
-    Documentation</ulink> and navigate to the <application>aRts</application>
-    documentation in your language.</para>
--->
-  </sect2>
-
-</sect1>
Index: chive/kde/core/config.xml
===================================================================
--- archive/kde/core/config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,84 +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="kde-core-config">
-  <?dbhtml filename="config.html"?>
-
-
-  <title>Configuring the Core Trinity/KDE3 Packages</title>
-
-  <para>Back up your existing <filename>~/.xinitrc</filename> file
-  and create a new <filename>.xinitrc</filename> file to start
-  <application>Trinity/KDE3</application>:</para>
-
-<screen><userinput>echo "exec startkde" &gt; ~/.xinitrc</userinput></screen>
-
-  <indexterm zone="kde-core-config">
-    <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-  </indexterm>
-
-  <para>If you have <xref linkend="dbus"/> installed, you can start the
-  <application>D-BUS</application> session daemon here as well. Starting the
-  session daemon here has the added bonus that it will exit when you log out
-  of your <application>Trinity/KDE3</application> session. If you wish to start the
-  daemon here, use the following command instead of the one shown above:</para>
-
-<screen><userinput>echo "exec dbus-launch --exit-with-session startkde" &gt;&gt; ~/.xinitrc</userinput></screen>
-
-  <note>
-    <para>Check the <filename>~/.xinitrc</filename> file and ensure you have
-    no other window managers or other <application>X</application> applications
-    mentioned before <application>KDE</application>.</para>
-  </note>
-
-  <para>If you installed the <xref linkend="desktop-file-utils"/> package,
-  ensure the <envar>XDG_DATA_DIRS</envar> and <envar>XDG_CONFIG_DIRS</envar>
-  environment variables are configured properly as explained in that package
-  and update the MIME-type application database (as <systemitem
-  class="username">root</systemitem>):</para>
-
-<screen role="root"><userinput>update-desktop-database</userinput></screen>
-
-  <para>Ensure all libraries can be found with (as
-  <systemitem class="username">root</systemitem>):</para>
-
-<screen role="root"><userinput>ldconfig</userinput></screen>
-
-  <para>At this point you can bring up <application>Trinity/KDE3</application> with:</para>
-
-<screen><userinput>startx</userinput></screen>
-
-   <para>Set the PATHs used for the installation in the login startup
-   files.  If you installed <application>Trinity/KDE3</application> in the
-   recommended versioned directory, /opt/trinity-&trinity-version;, create a
-   generic symbiolic link as the <systemitem class="username">root</systemitem>
-   user:</para>
-
-<screen role='root'><userinput>ln -sf trinity-&trinity-version; /opt/trinity</userinput></screen>
-
-   <para>Now update the search path for dynamic libraries and update the cache.
-   As the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>echo "/opt/trinity/lib" &gt;&gt; /etc/ld.so.conf &amp;&amp;
-ldconfig</userinput></screen>
-
-   <para>Set the paths.  Thee are several ways to do this.  You can edit
-   <filename>/etc/profile</filename>, or <filename>~/.bash_/profile</filename>
-   to add the paths.  If you used the recommended procedure in <xref
-   linkend='postlfs-config-profile'/>, run the following as the <systemitem
-   class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
-<literal>
-pathprepend /opt/trinity/bin                   PATH
-pathappend  /opt/trinity/share/man             MANPATH
-pathappend  /opt/trinity/lib/pkgconfig         PKG_CONFIG_PATH</literal>
-EOF</userinput></screen>
-
-  <para>To set the paths immediately, run <userinput>source /etc/profile</userinput>.</para>
-
-</sect1>
Index: chive/kde/core/core.xml
===================================================================
--- archive/kde/core/core.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kde-core">
-  <?dbhtml filename="core.html"?>
-
-  <title>Trinity/KDE3 Core Packages</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="arts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tqtinterface.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebase.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
-
-</chapter>
Index: chive/kde/core/kdebase.xml
===================================================================
--- archive/kde/core/kdebase.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 kdebase-download-http "&trinity-repo-http;/kdebase-&trinity-version;.tar.gz">
-  <!ENTITY kdebase-download-ftp  "&trinity-repo-ftp;/kdebase-&trinity-version;.tar.gz">
-  <!ENTITY kdebase-md5sum        "d1f7e1f94eeb46b981fe1ba144179840">
-  <!ENTITY kdebase-size          "28.3 MB">
-  <!ENTITY kdebase-buildsize     "179 MB">
-  <!ENTITY kdebase-time          "6.6 SBU">
-]>
-
-<sect1 id="kdebase" xreflabel="kdebase-&trinity-version;">
-  <?dbhtml filename="kdebase.html"?>
-
-
-  <title>Kdebase-&trinity-version;</title>
-
-  <indexterm zone="kdebase">
-    <primary sortas="a-kdebase">Kdebase</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdebase</title>
-
-    <para><application>kdebase</application> is the last mandatory package
-    required for the <application>Trinity/KDE3 Desktop Environment</application>. It
-    provides various applications, infrastructure files and libraries.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdebase-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdebase-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdebase-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdebase-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdebase-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdebase-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdebase Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdelibs"/> and
-      <xref linkend="dbus-qt3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="aRts"/>,
-      <xref linkend="libart_lgpl"/>, and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>,
-      <xref linkend="libusb-compat"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="sudo"/>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for api documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdebase"/></para>
-
-  </sect2>
-
-  <sect2 id="kdebase-runtime-dependencies"
-         xreflabel="KDE Base Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>Note that there are two additional packages you can install that
-    are used at run-time for <command>konqueror</command> ioslave protocols.
-    You can install the <ulink
-    url="http://mtools.linux.lu/?power-to-the-parliament">Mtools</ulink>
-    package to enable the <quote>floppy</quote> ioslave protocol. This will
-    allow easy access to the floppy disk drives on your system. The <ulink
-    url="http://packages.debian.org/stable/source/hfsplus">hfsplus</ulink>
-    package can be installed to access HFS+ partitions on a Mac OS system
-    using the <quote>mac</quote> ioslave.</para>
-
-    <para>One additional package that can be used at run time is <xref
-    linkend="pciutils"/>.  This enables the <application>KDE Info
-    Center</application> to use <application>lspci</application> for its "pci"
-    info section.</para>
-
-    <para>Another package usable at run time is <ulink
-    url="http://www.htdig.org">htdig</ulink>. The enables <command>
-    khelpcenter</command> to create a search index for the KDE application
-    manuals.</para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdebase</title>
-
-    <para>Install <application>kdebase</application> with:</para>
-
-<screen><userinput>MAKEDIR=/tmp/buildbase &amp;&amp;
-KDEBASE=`pwd`          &amp;&amp;
-rm -rf   $MAKEDIR      &amp;&amp;
-mkdir -p $MAKEDIR      &amp;&amp;
-cd       $MAKEDIR      &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-      -DCMAKE_VERBOSE_MAKEFILE=ON            \
-      -DWITH_ARTS=ON                         \
-      -DWITH_SHADOW=ON                       \
-      -DWITH_XCURSOR=ON                      \
-      -DWITH_XFIXES=ON                       \
-      -DWITH_XRANDR=ON                       \
-      -DWITH_XRENDER=ON                      \
-      -DWITH_XDAMAGE=ON                      \
-      -DWITH_XEXT=ON                         \
-      -DWITH_XDMCP=ON                        \
-      -DWITH_XINERAMA=ON                     \
-      -DWITH_SAMBA=ON                        \
-      -DWITH_LIBUSB=ON                       \
-      -DWITH_SUDO_KDESU_BACKEND=ON           \
-      -DBUILD_ALL=ON                         \
-      -DWITH_XCOMPOSITE=ON                   \
-      $KDEBASE         &amp;&amp;
-
-unset KDEBASE MAKEDIR</userinput></screen>
-
-    <para>Some of the optional support programs for <application>kdebase</application>
-    must be specified by the user.  The option is in the form "-DWITH_PKG=ON" and
-    the following options are recognozed for 'PKG': , SAMBA, LIBUSB,
-    SUDO_KDESU_BACKEND, LDAP, OPENEXR, SASL, LIBRAW1394, HAL, PAM, and I8K (Dell
-    Laptop Extensions).</para>
-
-    <para>The <userinput>cmake</userinput> step does not pick up all the required
-    libraries and paths.  One special problem is that libtirpc.so is required
-    for nfs and is not detected.  Fix these problems with:</para>
-
-<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib:/lib &amp;&amp;
-find -name link.txt -exec sed -i -e "s@-lICE@&amp; -lX11 -lXrender -ltirpc@" {} \;</userinput></screen>
-
-    <para>Now, continue with the build:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Kdebase</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>There is no real configuration necessary for this package other
-      than to ensure you follow the steps outlined in the last section of
-      this chapter, <xref linkend="kde-core-config"/>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>appletproxy, drkonqi, extensionproxy, genkdmconf, kaccess,
-        kappfinder, kapplymousetheme, kasbar, kate, kblankscrn.kss,
-        kbookmarkmerger, kcheckpass, kcheckrunning, kcminit, kcminit_startup,
-        kcontrol, kcontroledit, kdcop, kdebugdialog, kdeeject, kdeinstallktheme,
-        kdepasswd, kdeprintfax, kdesktop, kdesktop_lock, kdesu, kdesud, kdialog,
-        kdm, kdm_config, kdm_greet, kdmctl, keditbookmarks, keditfiletype,
-        kfind, kfmclient, kfontinst, kfontview, khc_docbookdig.pl, khc_htdig.pl,
-        khc_htsearch.pl, khc_indexbuilder, khc_mansearch.pl, khelpcenter,
-        khotkeys, kicker, kinfocenter (link to kcontrol), kio_media_mounthelper,
-        kio_system_documenthelper, kjobviewer, klipper,
-        klocaldomainurifilterhelper, kmenuedit, knetattach, kompmgr, konqueror,
-        konsole, kpager, kpersonalizer, kpm, kprinter, krandom.kss, krandrtray,
-        krdb, kreadconfig, krootimage, ksmserver, ksplash, ksplashsimple, kstart,
-        ksysguard, ksysguardd, ksystraycmd, ktip, ktrash, kwebdesktop, kwin,
-        kwin_killer_helper, kwin_rules_dialog, kwrite, kwriteconfig, kxkb,
-        nspluginscan, nspluginviewer, and startkde</seg>
-        <seg>Numerous KDE support libraries, helper modules, and kioslaves</seg>
-        <seg>/etc/xdg/menus/applications-merged and the following subdirectories
-        of &kde-dir;/: include/{kate, ksgrd, ksplash, kwin},
-        lib/kconf_update_bin, share/{applnk, apps/{too many to list},
-        config, config.kcfg, desktop-directories, doc/kdm, fonts,
-        /mimelnk/{fonts, media, print}, services/{searchproviders,
-        useragentstrings}, sounds, templates, wallpapers, and /var/lib/kdm</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kate">
-        <term><command>kate</command></term>
-        <listitem>
-          <para> is a programmer's text editor for <application>KDE</application>.</para>
-          <indexterm zone="kdebase kate">
-            <primary sortas="b-kate">kate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcontrol">
-        <term><command>kcontrol</command></term>
-        <listitem>
-          <para> is the <application>KDE</application> Control Center.</para>
-          <indexterm zone="kdebase kcontrol">
-            <primary sortas="b-kcontrol">kcontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdebugdialog">
-        <term><command>kdebugdialog</command></term>
-        <listitem>
-          <para>is a dialog box for managing diagnostic messages at runtime.</para>
-          <indexterm zone="kdebase kdebugdialog">
-            <primary sortas="b-kdebugdialog">kdebugdialog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdesu">
-        <term><command>kdesu</command></term>
-        <listitem>
-          <para>is a graphical front end for the Unix
-          <command>su</command> command.</para>
-          <indexterm zone="kdebase kdesu">
-            <primary sortas="b-kdesu">kdesu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdm">
-        <term><command>kdm</command></term>
-        <listitem>
-          <para>is the <application>KDE</application> display manager
-          (a replacement for <command>xdm</command>).</para>
-          <indexterm zone="kdebase kdm">
-            <primary sortas="b-kdm">kdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kfind">
-        <term><command>kfind</command></term>
-        <listitem>
-          <para>is a utility to find files.</para>
-          <indexterm zone="kdebase kfind">
-            <primary sortas="b-kfind">kfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="khelpcenter">
-        <term><command>khelpcenter</command></term>
-        <listitem>
-          <para>is the <application>KDE</application> help tool.</para>
-          <indexterm zone="kdebase khelpcenter">
-            <primary sortas="b-khelpcenter">khelpcenter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kicker">
-        <term><command>kicker</command></term>
-        <listitem>
-          <para>is the <application>KDE</application> control panel.</para>
-          <indexterm zone="kdebase kicker">
-            <primary sortas="b-kicker">kicker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kinfocenter">
-        <term><command>kinfocenter</command></term>
-        <listitem>
-          <para>provides a centralized and convenient overview of your
-          <application>KDE</application> and system settings.</para>
-          <indexterm zone="kdebase kinfocenter">
-            <primary sortas="b-kinfocenter">kinfocenter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kioslaves">
-        <term>kioslaves</term>
-        <listitem>
-          <para>are support modules designed to be intimately familiar with a
-          certain protocol, so that a standard interface (most often these are
-          used by <command>konqueror</command>) can be used to get at data from
-          any number of places. Examples are the http and ftp kioslaves,
-          which will retrieve data from an http or ftp server respectively.</para>
-          <indexterm zone="kdebase kioslaves">
-            <primary sortas="c-kioslaves">kioslaves</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="klipper">
-        <term><command>klipper</command></term>
-        <listitem>
-          <para> is a clipboard utility.</para>
-          <indexterm zone="kdebase klipper">
-            <primary sortas="b-klipper">klipper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmenuedit">
-        <term><command>kmenuedit</command></term>
-        <listitem>
-          <para>is a utility to rearrange or add items to the K-menu.</para>
-          <indexterm zone="kdebase kmenuedit">
-            <primary sortas="b-kmenuedit">kmenuedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="konqueror">
-        <term><command>konqueror</command></term>
-        <listitem>
-          <para>is a filesystem and web browser.</para>
-          <indexterm zone="kdebase konqueror">
-            <primary sortas="b-konqueror">konqueror</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="konsole">
-        <term><command>konsole</command></term>
-        <listitem>
-          <para>is a highly configurable <application>X</application>
-          terminal emulator.</para>
-          <indexterm zone="kdebase konsole">
-            <primary sortas="b-konsole">konsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpager">
-        <term><command>kpager</command></term>
-        <listitem>
-          <para>provides a thumbnail view of all virtual desktops.</para>
-          <indexterm zone="kdebase kpager">
-            <primary sortas="b-kpager">kpager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kprinter">
-        <term><command>kprinter</command></term>
-        <listitem>
-          <para>is the printing module in <application>KDE</application>. It
-          manages the actual printing from <application>KDE</application>
-          applications. It handles print job administration and handles printer and
-          print system management.</para>
-          <indexterm zone="kdebase kprinter">
-            <primary sortas="b-kprinter">kprinter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ksplash">
-        <term><command>ksplash</command></term>
-        <listitem>
-          <para>is a splash screen that shows the progress of an application
-          that is loading.</para>
-          <indexterm zone="kdebase ksplash">
-            <primary sortas="b-ksplash">ksplash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ksysguard">
-        <term><command>ksysguard</command></term>
-        <listitem>
-          <para>is a network enabled task manager and system monitor application,
-          with the additional functionality of <command>top</command>.</para>
-          <indexterm zone="kdebase ksysguard">
-            <primary sortas="b-ksysguard">ksysguard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwrite">
-        <term><command>kwrite</command></term>
-        <listitem>
-          <para>is a text editor for <application>KDE</application>.</para>
-          <indexterm zone="kdebase kwrite">
-            <primary sortas="b-kwrite">kwrite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kxkb">
-        <term><command>kxkb</command></term>
-        <listitem>
-          <para>is a keyboard layout switching utility based on the X11 xkb
-          extension.</para>
-          <indexterm zone="kdebase kxkb">
-            <primary sortas="b-kxkb">kxkb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/core/kdelibs.xml
===================================================================
--- archive/kde/core/kdelibs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,259 +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 kdelibs-download-http "&trinity-repo-http;/kdelibs-&trinity-version;.tar.gz">
-  <!ENTITY kdelibs-download-ftp  "&trinity-repo-ftp;/kdelibs-&trinity-version;.tar.gz">
-  <!ENTITY kdelibs-md5sum        "f62eefb63b4ba2141b4c576f859806dd">
-  <!ENTITY kdelibs-size          "16.6 MB">
-  <!ENTITY kdelibs-buildsize     "408 MB">
-  <!ENTITY kdelibs-time          "5.5 SBU">
-]>
-
-<sect1 id="kdelibs" xreflabel="kdelibs-&trinity-version;">
-  <?dbhtml filename="kdelibs.html"?>
-
-
-  <title>Kdelibs-&trinity-version;</title>
-
-  <indexterm zone="kdelibs">
-    <primary sortas="a-kdelibs">Kdelibs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdelibs</title>
-
-    <para>This package includes programs and libraries that are central to the
-    development and execution of a <application>Trinity/KDE3</application> program,
-    as well as internationalization files for these libraries, miscellaneous
-    HTML documentation, and theme modules.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdelibs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdelibs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdelibs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdelibs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdelibs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdelibs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="tqtinterface"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="aRts"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libart_lgpl"/>,
-      <xref linkend="libidn"/>, and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="libtiff"/>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-      <ulink url="http://www.ivrix.org.il/projects/spell-checker/">Hspell</ulink>,
-      <xref linkend="sudo"/>, and
-      <ulink url="http://packages.debian.org/sid/libutempter">utempter</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdelibs"/></para>
-
-  </sect2>
-
-  <sect2 id="kdelibs-runtime-dependencies"
-         xreflabel="KDE Libraries Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>The <application>Trinity/KDE3</application> libraries access other programs at
-    run time. One additional package that has not been mentioned already is
-    <ulink url="http://packages.debian.org/unstable/source/pmount/">
-    pmount</ulink>.  This enables auto-mounting of hotplugged devices at
-    /media/[device_name] for any user without any fstab modification. It is
-    needed to enable the full integration of <application>KDE</application>
-    with <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation" id="kdelibs-install"
-         xreflabel="the installation of kdelibs">
-    <title>Installation of Kdelibs</title>
-
-    <para>Install <application>kdelibs</application> with:</para>
-
-<screen><userinput>MAKEDIR=/tmp/buildlibs &amp;&amp;
-KDELIBS=`pwd`          &amp;&amp;
-rm -rf   $MAKEDIR      &amp;&amp;
-mkdir -p $MAKEDIR      &amp;&amp;
-cd       $MAKEDIR      &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-      -DCMAKE_VERBOSE_MAKEFILE=ON            \
-      $KDELIBS         &amp;&amp;
-unset KDELIBS MAKEDIR</userinput></screen>
-
-    <para>Some of the optional support programs for <application>kdelibs</application>
-    must be specified by the user.  The option is in the form "-DWITH_PKG=ON" and
-    the following options are recognozed for 'PKG': TIFF, LIBIDN, LIBART,
-    OPENEXR, UTEMPTER, ASPELL, HSPELL, and AVAHI. Other optional support
-    programs such as CUPS are automatically recognized if present.</para>
-
-    <para>If your installation of <application>Xorg</application> is
-    not in the <filename class='directory'>/usr</filename> hierarchy,
-    ensure the linking commands search in the correct place:</para>
-
-<screen><userinput>find -name link.txt -exec sed -i -e "s@-lX11@&amp; -L$XORG_PREFIX/lib@" {} \;</userinput></screen>
-
-    <para>Continue with the build:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <note>
-      <para>If you wish to create the API documentation and you have
-      <application>Doxygen</application> and
-      <application>Graphviz</application> installed, it must be done before the
-      <command>make install</command>. This applies to all packages which can
-      utilize <application>Doxygen</application>.</para>
-
-      <para>The <command>make apidox</command> command generates a lot of
-      errors and warnings.  In some cases it complains that Helvetica fonts are
-      missing and substitutes a font that does not fit boxes properly.  You can
-      add the font by downloading the <ulink
-      url="ftp://ftp.tug.ctan.org/pub/tex-archive/nonfree/support/ghostscript/AFPL/GhostPCL/">
-      URW Fonts </ulink> and
-      unpacking them into <filename class='directory'>~/.fonts</filename>.
-      <command>fc-cache</command> should also be run to update the font
-      properties on your system.</para>
-
-      <para>The documents generated are HTML and are found in <filename
-      class='directory'>$TRINITY_PREFIX/share/doc/HTML/en/kdelibs-apidocs</filename>.
-      </para>
-    </note>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ... kio/kio/kdirwatch.cpp</command>: This command is
-    necessary to prevent a conflict in linux headers.  The equivalent
-    instructions that are deleted are now within glibc.</para>
-
-    <para><parameter>- -prefix=&kde-dir;</parameter>: This option tells the process
-    to install the package in <filename class="directory">&kde-dir;</filename>.</para>
-
-    <para><parameter>- -disable-debug</parameter>: This option causes the
-    package to be compiled without debugging code.</para>
-
-    <para><parameter>- -disable-dependency-tracking</parameter>: This option
-    speeds up one time builds.</para>
-
-    <para><parameter>- -sysconfdir=/etc/kde</parameter>: This option places
-    configuration files in compliance with the <ulink
-    url='http://www.pathname.com/fhs/pub/fhs-2.3.html#ETCHOSTSPECIFICSYSTEMCONFIGURATION'
-    >Filesystem Hierarchy Standard</ulink>.  If you omit this parameter, the
-    configuration files will be placed in <filename
-    class='directory'>$KDE_PREFIX/etc</filename> which may be desirable if
-    you have multiple versions of <application>KDE</application> installed.</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Numerous <application>KDE</application> support programs:
-        artsmessage, checkXML, cupsdconf, cupsdoprint, dcop, dcopclient,
-        dcopfind, dcopidl, dcopidl2cpp, dcopidlng, dcopobject, dcopquit,
-        dcopref, dcopserver, dcopserver_shutdown, dcopstart, filesharelist,
-        fileshareset, imagetops, kab2kabc, kaddprinterwizard, kbuildsycoca,
-        kcmshell, kconf_update, kconfig_compiler, kcookiejar, kde-config,
-        kde-menu, kded, kdeinit, kdeinit_shutdown, kdeinit_wrapper, kdesu_stub,
-        kdontchangethehostname, kdostartupconfig, kfile, kfmexec, kgrantpty,
-        khotnewstuff, kinstalltheme, kio_http_cache_cleaner, kio_uiserver,
-        kioexec, kioslave, klauncher, kmailservice, kpac_dhcp_helper,
-        ksendbugmail, kshell, kstartupconfig, ksvgtopng, ktelnetservice,
-        ktradertest, kunittestmodrunner, kwrapper, lnusertemp,
-        make_driver_db_cups, make_driver_db_lpr, makekdewidgets, meinproc,
-        preparetips, and start_kdeinit</seg>
-        <seg>Numerous <application>KDE</application> libraries and helper
-        modules</seg>
-        <seg>/etc/kde and the following subdirectories of &kde-dir;/:
-        include/{dnssd, dom, kabc, kate, kdeprint, kdesu, khexedit, kio, kjs,
-        kmdi, kmediaplayer, knewstuff, kparts, kresources, ksettings, kspell2,
-        ktexteditor, kunittest, libkmid}, lib/kde3, and share/{applications,
-        apps, autostart, config, doc, emoticons, icons, mimelnk, services} </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kdelib-programs">
-        <term>KDE Support Programs</term>
-        <listitem>
-          <para>are essential support programs needed by other
-          <application>KDE</application> applications.</para>
-          <indexterm zone="kdelibs kdelib-programs">
-            <primary sortas="b-kdelib-programs">KDE Support Programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kde-libraries">
-        <term>KDE Libraries</term>
-        <listitem>
-          <para>contain essential functions that are needed by
-          <application>KDE</application> applications.</para>
-          <indexterm zone="kdelibs kde-libraries">
-            <primary sortas="c-kde-libraries">kde-libraries</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>The number of programs and libraries installed by
-    <application>kdelibs</application> prohibits an explanation of each one
-    in this section.</para>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/core/pre-install-config.xml
===================================================================
--- archive/kde/core/pre-install-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +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="kde-pre-install-config">
-  <?dbhtml filename="pre-install-config.html"?>
-
-
-  <title>Trinity/KDE3 Pre-installation Configuration</title>
-
-  <para>Based on your preference, set TRINITY_PREFIX.</para>
-
-  <para>One option is to put <application>Trinity/KDE3</application> into the
-  <filename class='directory'>/usr</filename> hierarchy.  This creates a
-  simpler setup but is more difficult to try multiple versions of
-  <application>Trinity/KDE3</application>.</para>
-
-<screen><userinput>export TRINITY_PREFIX=/usr</userinput></screen>
-
-  <para>The Trinty developers and BLFS editors recommend installing Trinity in
-  the <filename class='directory'>/opt</filename> directory in order to support
-  using one version while building another.</para>
-
-<screen><userinput>export TRINITY_PREFIX=/opt/trinity-&trinity-version;</userinput></screen>
-
-  <para>Using this option requires updates to the PATH, PKG_CONFIG_PATH, and
-  library search path:</para>
-
-  <itemizedlist>
-    <listitem>
-    <para>Update PATH</para>
-<screen><userinput>export PATH=$TRINITY_PREFIX/bin:$PATH</userinput></screen>
-    </listitem>
-
-    <listitem>
-    <para>Update PKG_CONFIG_PATH</para>
-<screen><userinput>export PKG_CONFIG_PATH=$TRINITY_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH</userinput></screen>
-    </listitem>
-
-    <listitem>
-    <para>Update the library search path</para>
-<screen><userinput>export LD_LIBRARY_PATH=$TRINITY_PREFIX/lib:$LD_LIBRARY_PATH</userinput></screen>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>The instructions for making these changes permanent are in
-  <xref linkend='kde-core-config'/>.</para>
-
-  <para>There are two other environment variables that need to be set to build
-  <application>Trinity/KDE3</application>. These are needed for all the
-  <userinput>cmake</userinput> based packages:</para>
-
-<screen><userinput>export CMAKE_PREFIX_PATH=/opt/qt:$TRINITY_PREFIX         &amp;&amp;
-
-CMAKE_INCLUDE_PATH=/opt/qt/include:/usr/include/dbus-1.0 &amp;&amp;
-export CMAKE_INCLUDE_PATH=$CMAKE_INCLUDE_PATH:$TRINITY_PREFIX/include</userinput></screen>
-
-  <para>You should also consider installing the <xref linkend="desktop-file-utils"/>
-  package. Though not required, this package will allow you to easily use
-  existing <filename>.desktop</filename> files in
-  <filename class='directory'>/usr/share/applications</filename> (and any other
-  locations identified by <envar>XDG_DATA_DIRS</envar>), and automatically add
-  these applications to the menu system.</para>
-
-</sect1>
Index: chive/kde/core/tqtinterface.xml
===================================================================
--- archive/kde/core/tqtinterface.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,268 +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 tqtinterface-download-http "&trinity-repo-http;/tqtinterface-&trinity-version;.tar.gz">
-  <!ENTITY tqtinterface-download-ftp  "&trinity-repo-ftp;/tqtinterface-&trinity-version;.tar.gz">
-  <!ENTITY tqtinterface-md5sum        "d54cc9fd0b35555298efd17c32471a2b">
-  <!ENTITY tqtinterface-size          "1 MB">
-  <!ENTITY tqtinterface-buildsize     "10 MB">
-  <!ENTITY tqtinterface-time          "0.6 SBU">
-]>
-
-<sect1 id="tqtinterface" xreflabel="tqtinterface-&trinity-version;">
-  <?dbhtml filename="tqtinterface.html"?>
-
-
-  <title>tqtinterface-&trinity-version;</title>
-
-  <indexterm zone='tqtinterface'>
-    <primary sortas='a-tqtinterface'>tqtinterface</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to tqtinterface</title>
-
-    <para>The <application>tqtinterface</application> package  includes
-    libraries that abstract the underlying Qt system from the actual Trinity
-    code, allowing easy, complete upgrades to new versions of Qt.  </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tqtinterface-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tqtinterface-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tqtinterface-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tqtinterface-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tqtinterface-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tqtinterface-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">tqtinterface Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tqtinterface"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of tqtinterface</title>
-
-    <note><para>When extracted, the <application>tqtinterfac</application> tar
-    file expands into the directory <filename
-    class='directory'>dependencies/tqtinterface</filename>.</para></note>
-
-    <para>Install <application>tqtinterface</application> by running
-    the following commands:</para>
-
-<screen><userinput>sed -i -e '/PKG/s@/usr@${EXEC_INSTALL_PREFIX}@' CMakeLists.txt &amp;&amp;
-BUILD=/tmp/tqt   &amp;&amp;
-TQT=`pwd`        &amp;&amp;
-rm -rf   $BUILD  &amp;&amp;
-mkdir -p $BUILD  &amp;&amp;
-cd       $BUILD  &amp;&amp;
-
-cmake $TQT                               \
-  -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-  -DCMAKE_VERBOSE_MAKEFILE=ON            \
-  -DQT_VERSION=3 &amp;&amp;
-
-unset TQT BUILD  &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><userinput>sed ... CMakeLists.txt</userinput>: This command changes
-    the location of <filename>tqt.pc</filename> to the $TRINITY_PREFIX
-    directory hierarchy.</para>
-
-    <para><userinput>TQT=`pwd`</userinput>: This command saves the
-    location of the source code.</para>
-
-    <para><userinput>rm -rf $BUIL; mkdir -p $BUILD; cd $BUILD</userinput>:  The
-    developers strongly recommend building Trinity components in a directory
-    separate from the source code.  These commands ensure a clean starting
-    location for the build process.</para>
-
-    <para><option>-QT_VERSION=3</option>: This option is required for this
-    package.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>convert_qt_tqt1,
-        convert_qt_tqt2,
-        convert_qt_tqt3,
-        dcopidl-tqt,
-        dcopidl2cpp-tqt,
-        dcopidlng-tqt,
-        mcopidl-tqt,
-        moc-tqt,
-        tmoc,
-        tqt-replace,
-        tqt-replace-stream,
-        uic-tqt
-        </seg>
-
-        <seg>libtqassistantclient.so and libtqt.so</seg>
-
-        <seg>$TRINITY_PREFIX/include/tqt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-<!--
-    TODO
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tqtinterfacec-config">
-        <term><command>tqtinterfacec-config</command></term>
-        <listitem>
-          <para>is a utility to assist developers using the
-          <application>aRts</application> C API.</para>
-          <indexterm zone="aRts  tqtinterfacec-config">
-            <primary sortas="b-tqtinterfacec-config">tqtinterfacec-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfacecat">
-        <term><command>tqtinterfacecat</command></term>
-        <listitem>
-          <para>is a simple utility to send raw audio data to the sound server.</para>
-          <indexterm zone="aRts tqtinterfacecat">
-            <primary sortas="b-tqtinterfacecat">tqtinterfacecat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfaced">
-        <term><command>tqtinterfaced</command></term>
-        <listitem>
-          <para>is a daemon that provides access to the sound hardware resources.</para>
-          <indexterm zone="aRts tqtinterfaced">
-            <primary sortas="b-tqtinterfaced">tqtinterfaced</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfacedsp">
-        <term><command>tqtinterfacedsp</command></term>
-        <listitem>
-          <para>provides an interim solution that allows most of legacy
-          sound applications to run unchanged.</para>
-          <indexterm zone="aRts tqtinterfacedsp">
-            <primary sortas="b-tqtinterfacedsp">tqtinterfacedsp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaRts">
-        <term><filename class='libraryfile'>aRts Libraries</filename></term>
-        <listitem>
-          <para>contains functions that support <application>aRts</application>
-          programs.</para>
-          <indexterm zone="aRts libaRts">
-            <primary sortas="c-libaRts">aRts Libraries</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfaceplay">
-        <term><command>tqtinterfaceplay</command></term>
-        <listitem>
-          <para>is a simple utility to play a sound file.</para>
-          <indexterm zone="aRts tqtinterfaceplay">
-            <primary sortas="b-tqtinterfaceplay">tqtinterfaceplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfacerec">
-        <term><command>tqtinterfacerec</command></term>
-        <listitem>
-          <para>is a simple utility to record audio input.</para>
-          <indexterm zone="aRts tqtinterfacerec">
-            <primary sortas="b-tqtinterfacerec">tqtinterfacerec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfaceshell">
-        <term><command>tqtinterfaceshell</command></term>
-        <listitem>
-          <para>is intended as a utility to perform miscellaneous functions
-          related to the sound server.</para>
-          <indexterm zone="aRts tqtinterfaceshell">
-            <primary sortas="b-tqtinterfaceshell">tqtinterfaceshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tqtinterfacewrapper">
-        <term><command>tqtinterfacewrapper</command></term>
-        <listitem>
-          <para>is a small wrapper program which simply sets real-time priority
-          (running as <systemitem class="username">root</systemitem>)
-          and then executes <command>tqtinterfaced</command> as a non-root user.</para>
-          <indexterm zone="aRts tqtinterfacewrapper">
-            <primary sortas="b-tqtinterfacewrapper">tqtinterfacewrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcopidl">
-        <term><command>mcopidl</command></term>
-        <listitem>
-          <para>is the Interface Definition Language (IDL) file compiler for MCOP, the
-          Multimedia Communication Protocol used by <application>aRts</application>.</para>
-          <indexterm zone="aRts  mcopidl">
-            <primary sortas="b-mcopidl">mcopidl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-    -->
-  </sect2>
-
-</sect1>
Index: chive/kde/devel/devel.xml
===================================================================
--- archive/kde/devel/devel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kde-devel">
-  <?dbhtml filename="devel.html"?>
-
-  <title>KDE Software and WEB Development Packages</title>
-
-  <para>These <application>KDE</application> applications are generally of
-  interest to software or WEB developers.  General users can skip them without
-  a loss of functionality.  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdesdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevelop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdewebdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebindings.xml"/>
-
-</chapter>
Index: chive/kde/devel/kdebindings.xml
===================================================================
--- archive/kde/devel/kdebindings.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +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 kdebindings-download-http "&kde-download-http;/kdebindings-&kde-version;.tar.bz2">
-  <!ENTITY kdebindings-download-ftp  "&kde-download-ftp;/kdebindings-&kde-version;.tar.bz2">
-  <!ENTITY kdebindings-md5sum        "7d5119160ac3688ac1a63954d03ab4a8">
-  <!ENTITY kdebindings-size          "5.5 MB">
-  <!ENTITY kdebindings-buildsize     "428 MB">
-  <!ENTITY kdebindings-time          "20 SBU">
-]>
-
-<sect1 id="kdebindings" xreflabel="kdebindings-&kde-version;">
-  <?dbhtml filename="kdebindings.html"?>
-
-
-  <title>Kdebindings-&kde-version;</title>
-
-  <indexterm zone="kdebindings">
-    <primary sortas="a-kdebindings">Kdebindings</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdebindings</title>
-
-    <para>The <application>kdebindings</application> provides the ability to
-    write <application>KDE</application> applications in a variety of languages
-    including Ruby, Perl, Python, Java, JavaScript, C#, and Smoke.  For
-    details see <ulink url='http://developer.kde.org/language-bindings/'/></para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdebindings-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdebindings-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdebindings-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdebindings-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdebindings-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdebindings-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdebindings-&kde-version;-python-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdebindings-&kde-version;-ruby-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdebindings Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="libxslt"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="GLib"/>,
-    <xref linkend="GTK"/>, -->
-    <xref linkend="python2"/>,
-    <xref linkend="ruby"/>,
-    <xref linkend="openjdk"/>, <!-- or <xref linkend="jdk"/>, -->
-    <xref linkend="seamonkey"/>,
-    <ulink url="http://http://www.riverbankcomputing.co.uk/qscintilla/index.php">QScintilla</ulink>,
-    <ulink url="http://go-mono.org">Mono</ulink>,
-    <ulink url="http://www.southern-storm.com.au/portable_net.html">DotGNU Portable.NET</ulink>, and
-    <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyId=3A1C93FA-7462-47D0-8E56-8DD34C6292F0&amp;displaylang=en">Rotor</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdebindings"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdebindings</title>
-
-    <para><emphasis>Note</emphasis>: If KDE is installed in
-    <filename class='directory'>/opt/kde-&kde-version;</filename>, you'll need
-    to make a modification before the build using the following command:</para>
-
-<screen><userinput>sed -i -e 's@/usr@/opt/kde-&kde-version;@' \
-    python/pykde/configure.py</userinput></screen>
-
-    <para>Install <application>kdebindings</application> with:</para>
-
-<screen><userinput>sed -i 's%echo "yes" | @PYTHON@ configure.py%&amp; -y qt-mt%' \
-    python/Makefile.in &amp;&amp;
-
-patch -Np1 -i $DIR/kdebindings-3.5.10-ruby-1.patch   &amp;&amp;
-patch -Np1 -i $DIR/kdebindings-3.5.10-python-1.patch &amp;&amp;
-
-./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ... python/Makefile.in</command>:
-    Specifies that the <filename class='libraryfile'>libqt-mt.so</filename> library
-    should be used to build the pyqt bindings. <command>configure.py</command>
-    will fail if it finds both <filename class='libraryfile'>libqt-mt.so</filename>
-    and <filename class='libraryfile'>libqt.so</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Several support programs for software development</seg>
-        <seg><application>KDE</application> bindings for various programming
-        languages</seg>
-        <seg>Subdirectories of /usr/lib and $KDE_PREFIX/share</seg>
-      </seglistitem>
-
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/devel/kdesdk.xml
===================================================================
--- archive/kde/devel/kdesdk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +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 kdesdk-download-http "&kde-download-http;/kdesdk-&kde-version;.tar.bz2">
-  <!ENTITY kdesdk-download-ftp  "&kde-download-ftp;/kdesdk-&kde-version;.tar.bz2">
-  <!ENTITY kdesdk-md5sum        "ad711d1ce09242bd13b73a9a005f3143">
-  <!ENTITY kdesdk-size          "5.0 MB">
-  <!ENTITY kdesdk-buildsize     "111 MB">
-  <!ENTITY kdesdk-time          "7.5 SBU">
-]>
-
-<sect1 id="kdesdk" xreflabel="kdesdk-&kde-version;">
-  <?dbhtml filename="kdesdk.html"?>
-
-
-  <title>Kdesdk-&kde-version;</title>
-
-  <indexterm zone="kdesdk">
-    <primary sortas="a-kdesdk">Kdesdk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdesdk</title>
-
-    <para><application>Kdesdk</application> provides several applications
-    useful for developers.  Programs include a version control system front-end
-    for <application>CVS</application>, a program to view the differences
-    between files, a UML Modeller, and a profile data visualization
-    tool.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdesdk-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdesdk-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdesdk-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdesdk-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdesdk-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdesdk-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdesdk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref linkend="libjpeg"/>,
-       <xref linkend="subversion"/>,
-       <xref linkend="libxml2"/>,
-       <xref linkend="libxslt"/>, and
-       <xref linkend="db"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="kdepim"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdesdk"/></para>
-
-  </sect2>
-
-  <sect2 id="kdesdk-runtime-dependencies"
-         xreflabel="KDE SDK Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para><ulink url="http://www.valgrind.org">Valgrind</ulink> and
-    <xref linkend="cvs"/> are needed at run time for there respective
-    frontends, <command>kcachegrind</command> and <command>cervisia</command></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdesdk</title>
-
-    <para>Install <application>kdesdk</application> with:</para>
-
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cervisia, kbabel, kcachegrind, kompare, and umbrello</seg>
-        <seg>Several kdesdk specific libraries</seg>
-        <seg>Several subdirectories in $KDE_PREFIX/{include,share}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cervisia">
-        <term><command>cervisia</command></term>
-        <listitem>
-          <para>provides a graphical view of CVS.</para>
-          <indexterm zone="kdesdk cervisia">
-            <primary sortas="b-cervisia">cervisia</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbabel">
-        <term><command>kbabel</command></term>
-        <listitem>
-          <para>is a suite of an advanced PO file editor comprising
-          <command>kbabel</command>, a multi functional
-          <command>catalogmanager</command> and a dictionary for translators
-          <command>kbabeldict</command>.</para>
-          <indexterm zone="kdesdk kbabel">
-            <primary sortas="b-kbabel">kbabel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcachegrind">
-        <term><command>kcachegrind</command></term>
-        <listitem>
-          <para>is a <application>KDE</application> frontend for
-          <command>cachegrind</command>, part of
-          <application>Valgrind</application>.</para>
-          <indexterm zone="kdesdk kcachegrind">
-            <primary sortas="b-kcachegrind">kcachegrind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kompare">
-        <term><command>kompare</command></term>
-        <listitem>
-          <para>is a program to view the differences between files.</para>
-          <indexterm zone="kdesdk kompare">
-            <primary sortas="b-kompare">kompare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umbrello">
-        <term><command>umbrello</command></term>
-        <listitem>
-          <para>is a UML modelling diagram tool.</para>
-          <indexterm zone="kdesdk umbrello">
-            <primary sortas="b-umbrello">umbrello</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/devel/kdevelop.xml
===================================================================
--- archive/kde/devel/kdevelop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 kdevelop-download-http "&kde-download-http;/kdevelop-&kdevelop-version;.tar.bz2">
-  <!ENTITY kdevelop-download-ftp  "&kde-download-ftp;/kdevelop-&kdevelop-version;.tar.bz2">
-  <!ENTITY kdevelop-md5sum        "06aa12a89b2c09968a92e1d8b575819c">
-  <!ENTITY kdevelop-size          "9.1 MB">
-  <!ENTITY kdevelop-buildsize     "188 MB (additional 22 MB for API docs)">
-  <!ENTITY kdevelop-time          "16.8 SBU (additional 0.3 SBU for API docs)">
-]>
-
-<sect1 id="kdevelop" xreflabel="kdevelop-&kdevelop-version;">
-  <?dbhtml filename="kdevelop.html"?>
-
-
-  <title>Kdevelop-&kdevelop-version;</title>
-
-  <indexterm zone="kdevelop">
-    <primary sortas="a-kdevelop">Kdevelop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdevelop</title>
-
-    <para><application>Kdevelop</application> provides an Integrated
-    Development Environment (IDE) to be used for a wide variety of programming
-    tasks.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdevelop-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdevelop-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdevelop-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdevelop-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdevelop-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdevelop-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdevelop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="kdesdk"/>, and
-    <xref linkend="libxml2"/>.</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python2"/>,
-    <ulink url="http://sourceforge.net/projects/docbase/">DocBase</ulink>,
-    <xref linkend="graphviz"/>, and
-    <xref linkend="doxygen"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdevelop"/></para>
-
-  </sect2>
-
-  <sect2 id="kdevelop-runtime-dependencies"
-         xreflabel="KDevelop Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para><application>KDevelop</application> can make use of a large
-    number of external compilers or interpreters for supported languages,
-    version control systems, build tools , and debuggers at run time.
-    Refer to <ulink url="http://www.kdevelop.org/index.html?filename=3.5/requirements.html"/>
-    and the <ulink url="http://docs.kde.org/development/en/kdevelop/kdevelop/">
-    KDevelop User Manual</ulink> to find out if your development
-    environment is supported.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdevelop</title>
-
-    <para>Install <application>kdevelop</application> with:</para>
-
-<screen><userinput>sed -i -e 's/ kdevutil$//' buildtools/lib/widgets/Makefile.in &amp;&amp;
-./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
-
-    <note>
-      <para>If you wish to create the API documentation and you have
-      <application>Doxygen</application> and
-      <application>Graphviz</application> installed run the command
-      <command>make apidox</command>.</para>
-    </note>
-
-    <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>
-
-    <para>If you created the API documentation, install it  as the <systemitem
-    class="username">root</systemitem> user with:</para>
-
-<screen role="root"><userinput>make install-apidox</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e 's/ kdevutil$//'
-    buildtools/lib/widgets/Makefile.in</command>: Remove a duplicate entry on a
-    line in the <filename>Makefile</filename> that causes the build of the API
-    documentation to fail.</para>
-
-    <!--
-
-    This is surely wrong.  I can find a reference to kdevbdb at all, but
-    even if it were there, it would be a subdirectory of &kde-dir;.
-
-    <para><command>chown -v -R root:root &kde-dir;/kdevbdb</command>: If
-    <application>kdevelop</application> is built by any user other than
-    <systemitem class="username">root</systemitem> the installed
-    <application>Berkeley-DB</application> files will have incorrect ownership.
-    This command changes the ownership to root:root.</para> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kdevelop and supporting programs</seg>
-        <seg>Supporting kdevelop libraries</seg>
-        <seg>Supporting subdirectories in $KDE_PREFIX/{include,share}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kdevelop-prog">
-        <term><command>kdevelop</command></term>
-        <listitem>
-          <para>is an Integrated Development Environment to be used for a wide
-          variety of programming tasks in many programming languages.</para>
-          <indexterm zone="kdevelop kdevelop-prog">
-            <primary sortas="b-kdevelop">kdevelop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/devel/kdewebdev.xml
===================================================================
--- archive/kde/devel/kdewebdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +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 kdewebdev-download-http "&kde-download-http;/kdewebdev-&kde-version;.tar.bz2">
-  <!ENTITY kdewebdev-download-ftp  "&kde-download-ftp;/kdewebdev-&kde-version;.tar.bz2">
-  <!ENTITY kdewebdev-md5sum        "7188f351158ca5a7613c3de4a6854b37">
-  <!ENTITY kdewebdev-size          "6.0 MB">
-  <!ENTITY kdewebdev-buildsize     "106 MB">
-  <!ENTITY kdewebdev-time          "6.1 SBU">
-]>
-
-<sect1 id="kdewebdev" xreflabel="kdewebdev-&kde-version;">
-  <?dbhtml filename="kdewebdev.html"?>
-
-
-  <title>Kdewebdev-&kde-version;</title>
-
-  <indexterm zone="kdewebdev">
-    <primary sortas="a-kdewebdev">Kdewebdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdewebdev</title>
-
-    <para><application>Kdewebdev</application> includes
-    <application>KDE</application> based programmers' utilities to generate GUI
-    dialogs, a Web IDE, a stylesheet debugger, and a utility to search and
-    replace strings.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdewebdev-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdewebdev-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdewebdev-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdewebdev-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdewebdev-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdewebdev-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdewebdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="libxslt"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="kdesdk"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdewebdev"/></para>
-
-  </sect2>
-
-  <sect2 id="kdewebdev-runtime-dependencies"
-         xreflabel="KDE Webdev Runtime Dependencies">
-    <title>Run-Time Dependencies</title>
-
-    <para>The <application>Quanta</application> application included in
-    <application>kdewebdev</application> can use several other utilities
-    at run time.  <xref linkend="html-tidy"/> can be used to check the validity
-    of HTML documents. <ulink url="http://gubed.sf.net">Gubed</ulink> is
-    useful for debugging PHP scripts. <xref linkend="gnupg"/> or
-    <xref linkend="gnupg2"/> can be used for checking digital signatures.
-    Kompare, from <xref linkend="kdesdk"/> can be used to view changes to
-    files modified outside of <application>Quanta</application>. Cervisia,
-    also from <xref linkend="kdesdk"/>, is useful for interacting with CVS.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdewebdev</title>
-
-    <para>Install <application>kdewebdev</application> with:</para>
-
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>kxsldbg and quanta</seg>
-        <seg>kdewebdev specific libraries</seg>
-        <seg>Several subdirectories in $KDE_PREFIX/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kxsldbg">
-        <term><command>kxsldbg</command></term>
-        <listitem>
-          <para>is a GUI front-end to <command>xsldbg</command>,
-          the XSLT debugger.</para>
-          <indexterm zone="kdewebdev kxsldbg">
-            <primary sortas="b-kxsldbg">kxsldbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="quanta">
-        <term><command>quanta</command></term>
-        <listitem>
-          <para>is a web development tool that strives to be neutral and
-          transparent to all markup languages, while supporting popular
-          web-based scripting languages, CSS, and other emerging W3C
-          recommendations.</para>
-          <indexterm zone="kdewebdev quanta">
-            <primary sortas="b-quanta">quanta</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kde/kde-intro.xml
===================================================================
--- archive/kde/kde-intro.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE partintro 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;
-]>
-
-<partintro>
-  <title>Introduction to Trinity/KDE3</title>
-
-  <para>Trinity is a project that aims to keep the KDE 3.5 computing style
-  alive, as well as keeping the existing code base current.  It is a
-  comprehensive desktop environment that builds on an <application>X Window
-  System</application> and <application>Qt</application> version 3 to provide a
-  window manager and many user tools, including a browser, word processor,
-  spreadsheet, presentation package, games, and numerous other utilities. It
-  provides extensive capabilities for customization.</para>
-
-  <para>The <application>Trinity/KDE3</application> instructions are divided into
-  three parts. The first part, the core packages, are needed for the rest of
-  <application>Trinity/KDE3</application> to work. The second part presents additional
-  packages which provide functionality in various areas (multimedia, graphics, etc.)
-  The third part provides resources for software and web developers.</para>
-
-  <para>There are two alternatives for installing
-  <application>Trinity/KDE3</application>.  Option one, that is used by most of
-  the commercial distributions, is to install
-  <application>Trinity/KDE3</application> in the standard system prefix:
-  <filename class="directory">/usr</filename>. This option allows the use of
-  <application>Trinity/KDE3</application> without the need for any additional
-  configuration such as modification of various environment variables or
-  configuration files. Option two, recommended by the Trinity developers and
-  BLFS Editors is to install it in a unique prefix such as <filename
-  class="directory">/opt/trinity</filename> or <filename
-  class="directory">/opt/trinity-&trinity-version;</filename>. This option
-  allows for easy removal of the <application>Trinity/KDE3</application>
-  version or maintenance of multiple versions for testing.</para>
-
-  <para>The <application>Trinity/KDE3</application> pakages are undergoing
-  constant upgrades.  With the 3.5.13 version, the core packages are
-  configured with <userinput>cmake</userinput> and the rest are built using the
-  traditional <userinput>configure</userinput> command.</para>
-
-  <tip>
-    <para>All the <application>Trinity/KDE3</application> packages that are
-    built with <userinput>configure</userinput> are comprised of various
-    components. The default is to install most of the components. If specific
-    components are to be eliminated, the way is to set the variable
-    <envar>DO_NOT_COMPILE</envar>. This comes in handy when there are problems
-    compiling a particular component.</para>
-
-<screen><userinput>DO_NOT_COMPILE="component1 component2" \
-    ./configure --prefix=$TRINITY_PREFIX ...</userinput></screen>
-
-  </tip>
-
-</partintro>
Index: chive/kde/kde.xml
===================================================================
--- archive/kde/kde.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part 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;
-]>
-
-<part id="kde" xreflabel="Trinity/KDE3">
-  <?dbhtml filename="kde.html" dir="kde"?>
-
-  <title>Trinity/KDE3</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devel/devel.xml"/> -->
-
-</part>
Index: chive/keybinder2.xml
===================================================================
--- archive/keybinder2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +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 keybinder2-download-http
-           "https://github.com/kupferlauncher/keybinder/releases/download/v&keybinder2-version;/keybinder-&keybinder2-version;.tar.gz">
-  <!ENTITY keybinder2-download-ftp " ">
-  <!ENTITY keybinder2-md5sum        "a6d7caae0dcb040b08692b008a68a507">
-  <!ENTITY keybinder2-size          "384 KB">
-  <!ENTITY keybinder2-buildsize     "2.8 MB">
-  <!ENTITY keybinder2-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="keybinder2" xreflabel="keybinder-&keybinder2-version;">
-  <?dbhtml filename="keybinder.html" ?>
-
-
-  <title>keybinder-&keybinder2-version;</title>
-
-  <indexterm zone="keybinder2">
-    <primary sortas="a-keybinder2">keybinder2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keybinder</title>
-
-    <para>
-      The <application>keybinder</application> package contains a utility
-      library registering global <application>X</application> keyboard
-      shortcuts.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keybinder2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keybinder2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keybinder2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keybinder2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keybinder2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keybinder2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">keybinder Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="pygtk"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="lua"/> (currently broken because an older lua version
-      is required)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of keybinder</title>
-
-    <para>
-      Install <application>keybinder</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-lua &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-lua</parameter>: Use this switch to disable <xref
-      linkend="lua"/> bindings (currently broken, because older lua version is
-      required).
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libkeybinder.so and
-          /usr/lib/python&python2-majorver;/site-packages/keybinder/_keybinder.so
-        </seg>
-        <seg>
-          /usr/lib/python&python2-majorver;/site-packages/keybinder and
-          /usr/share/gtk-doc/html/keybinder
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keybinder2-lib">
-        <term><filename class="libraryfile">libkeybinder.so</filename></term>
-        <listitem>
-          <para>
-            is the library that registers global <application>X</application>
-            keyboard shortcuts
-          </para>
-          <indexterm zone="keybinder2 keybinder2-lib">
-            <primary sortas="c-keybinder2">libkeybinder.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/konq.xml
===================================================================
--- archive/konq.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,18 +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="konq" xreflabel="Konqueror-&kde-version;">
-  <?dbhtml filename="konq.html" ?>
-
-
-  <title>Konqueror-&kde-version;</title>
-
-  <para><command>konqueror</command> is the default graphical web browser for
-  the <application>KDE</application> desktop environment. It is packaged and
-  installed with <xref linkend="kdebase"/>.</para>
-
-</sect1>
Index: chive/ksh.xml
===================================================================
--- archive/ksh.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,197 +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 ksh-download-http  "http://www.research.att.com/~gsf/download/tgz/ast-ksh.&ksh-version;.tgz">
-  <!ENTITY ksh-download-ftp   " ">
-  <!ENTITY ksh-md5sum         "630096418741335fd757cda3f054aa11">
-  <!ENTITY ksh-size           "1.7 MB">
-
-  <!ENTITY init-download-http "http://www.research.att.com/~gsf/download/tgz/INIT.&ksh-version;.tgz">
-  <!ENTITY init-download-ftp  " ">
-  <!ENTITY init-md5sum        "adb05b9940046d3ca6b4b24038131725">
-  <!ENTITY init-size          "350 KB">
-
-  <!ENTITY ksh-buildsize      "34 MB">
-  <!ENTITY ksh-time           "1.5 SBU">
-]>
-
-<sect1 id="ksh" xreflabel="ksh-&ksh-version;">
-  <?dbhtml filename="ksh.html"?>
-
-
-  <title>ksh-&ksh-version;</title>
-
-  <indexterm zone="ksh">
-    <primary sortas="a-ksh">ksh</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ksh</title>
-
-    <para><application>ksh</application> is the AT&amp;T Korn Shell.</para>
-
-    <note>
-      <para>You must agree to the terms of the CPL-1.0 license in order to
-      download the software. The download site is password protected, and the
-      username and password are listed at the bottom of
-      <ulink url="http://www.research.att.com/~gsf/license/cpl-1.0.html">this
-      license</ulink>.</para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Ksh Download (HTTP): <ulink url="&ksh-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Ksh Download (FTP): <ulink url="&ksh-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Ksh Download MD5 sum: &ksh-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Ksh Download size: &ksh-size;</para>
-      </listitem>
-      <listitem>
-        <para>INIT Download (HTTP): <ulink url="&init-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>INIT Download (FTP): <ulink url="&init-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>INIT Download MD5 sum: &init-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>INIT Download size: &init-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ksh-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ksh-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ksh"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ksh</title>
-
-    <para>Unlike other BLFS packages, you will need to first create a working
-    directory in which to extract the sources and perform the build.  Install
-    <application>ksh</application> by running the following commands:</para>
-
-<screen><userinput>mkdir ksh &amp;&amp;
-cd ksh &amp;&amp;
-tar -xf ../INIT.&ksh-version;.tgz &amp;&amp;
-tar -xf ../ast-ksh.&ksh-version;.tgz &amp;&amp;
-bin/package make</userinput></screen>
-
-    <para>The test suite for this package requires other packages from the
-    AT&amp;T ast software library, namely <application>nmake</application>,
-    in which case, you'd be better to install the
-    <application>ast-base</application> package using the same
-    instructions. The <application>package</application> command will accept
-    a <parameter>test</parameter> argument to test the package.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m755 arch/linux.i386/bin/ksh /bin &amp;&amp;
-install -v -m644 arch/linux.i386/man/man1/sh.1 \
-    /usr/share/man/man1/ksh.1 &amp;&amp;
-install -v -m755 -d /usr/share/doc/ksh-&ksh-version; &amp;&amp;
-install -v -m644 lib/package/{ast-ksh,INIT}.html \
-    /usr/share/doc/ksh-&ksh-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>bin/package make</command>: This command rebuilds the ast
-    <application>INIT</application> package and builds the ast
-    <application>ksh</application> package.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ksh</title>
-
-    <sect3 id="ksh-config">
-      <title>Config Files</title>
-
-      <para><application>ksh</application> sources
-      <filename>/etc/profile</filename>,
-      <filename>/etc/suid_profile</filename>, and
-      <filename>$HOME/.profile</filename>.</para>
-
-      <indexterm zone="ksh ksh-config">
-        <primary sortas="e-etc-profile">/etc/profile</primary>
-      </indexterm>
-
-      <indexterm zone="ksh ksh-config">
-        <primary sortas="e-AHOME-.profile">$HOME/.profile</primary>
-      </indexterm>
-
-      <indexterm zone="ksh ksh-config">
-        <primary sortas="e-etc-suid-profile">/etc/suid_profile</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Update <filename>/etc/shells</filename> to include the
-      <application>ksh</application> shell by issuing the following command
-      as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
-<literal>/bin/ksh</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ksh</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/ksh-&ksh-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ksh-prog">
-        <term><command>ksh</command></term>
-        <listitem>
-          <para>is the AT&amp;T ast Korn shell.</para>
-          <indexterm zone="ksh ksh-prog">
-            <primary sortas="b-ksh">ksh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/kuserfeedback.xml
===================================================================
--- archive/kuserfeedback.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kuserfeedback-download-http "https://download.kde.org/stable/kuserfeedback/kuserfeedback-&kuserfeedback-version;.tar.xz">
-  <!ENTITY kuserfeedback-download-ftp  " ">
-  <!ENTITY kuserfeedback-md5sum        "d5e787de6cf0001f23133694dbffd96f">
-  <!ENTITY kuserfeedback-size          "228 KB">
-  <!ENTITY kuserfeedback-buildsize     "24 MB">
-  <!ENTITY kuserfeedback-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="kuserfeedback" xreflabel="kuserfeedback-&kuserfeedback-version;">
-  <?dbhtml filename="kuserfeedback.html"?>
-
-  <title>kuserfeedback-&kuserfeedback-version;</title>
-
-  <indexterm zone="kuserfeedback">
-    <primary sortas="a-kuserfeedback">kuserfeedback</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kuserfeedback</title>
-
-    <para>
-      The <application>kuserfeedback</application> package contains a
-     	framework for collecting user feedback for applications via telemetry
-      and surveys.
-    </para>
-
-    <note>
-      <para>
-        This packages is not used by kf6.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kuserfeedback-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kuserfeedback-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kuserfeedback-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kuserfeedback-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kuserfeedback-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kuserfeedback-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kuserfeedback Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kuserfeedback</title>
-
-    <para>
-      Install <application>kuserfeedback</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  \
-      -DBUILD_TESTING=OFF         \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          UserFeedbackConsole and 
-          userfeedbackctl
-        </seg>
-        <seg>
-          libKUserFeedbackCore.so and
-          libKUserFeedbackWidgets.so
-        </seg>
-        <seg>
-          /usr/include/KUserFeedback,
-          /usr/lib/qml/org/kde/userfeedback,
-          /usr/lib/cmake/KUserFeedback,
-          /usr/share/KDE/UserFeedbackConsole, and
-          /usr/share/qlogging-categories5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lcms.xml
===================================================================
--- archive/lcms.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,255 +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 lcms-download-http "&sourceforge-dl;/lcms/lcms-&lcms-version;.tar.gz">
-  <!ENTITY lcms-download-ftp  " ">
-  <!ENTITY lcms-md5sum        "8af94611baf20d9646c7c2c285859818">
-  <!ENTITY lcms-size          "927 KB">
-  <!ENTITY lcms-buildsize     "27 MB">
-  <!ENTITY lcms-time          "0.5 SBU">
-]>
-
-<sect1 id="lcms" xreflabel="Little CMS-&lcms-version;">
-  <?dbhtml filename="lcms.html"?>
-
-
-  <title>Little CMS-&lcms-version;</title>
-
-  <indexterm zone="lcms">
-    <primary sortas="a-little-cms">Little CMS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Little CMS</title>
-
-    <para>
-      The <application>Little CMS</application> library is used by other
-      programs to provide color management facilities.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lcms-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lcms-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lcms-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lcms-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lcms-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lcms-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lcms-&lcms-version;-cve_2013_4276-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Little CMS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libtiff"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="python2"/> (with
-      <xref linkend="swig"/> also)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Little CMS</title>
-
-    <para>
-      Install <application>Little CMS</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lcms-&lcms-version;-cve_2013_4276-1.patch &amp;&amp;
-
-./configure --prefix=/usr --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/lcms-&lcms-version; &amp;&amp;
-install -v -m644    README.1ST doc/* \
-                    /usr/share/doc/lcms-&lcms-version;</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>
-      <option>--with-python</option>: Use this parameter if
-      <application>Python</application> and
-      <application>SWIG</application> are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>icc2ps, icclink, icctrans, wtpt and
-        optionally, jpegicc, tiffdiff and tifficc</seg>
-        <seg>liblcms.so and the optional _lcms.so Python module</seg>
-        <seg>/usr/share/doc/lcms-&lcms-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="icc2ps">
-        <term><command>icc2ps</command></term>
-        <listitem>
-          <para>
-            generates PostScript CRD or CSA from ICC profiles
-          </para>
-          <indexterm zone="lcms icc2ps">
-            <primary sortas="b-icc2ps">icc2ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icclink">
-        <term><command>icclink</command></term>
-        <listitem>
-          <para>
-            links two or more profiles into a single device link profile
-          </para>
-          <indexterm zone="lcms icclink">
-            <primary sortas="b-icclink">icclink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icctrans">
-        <term><command>icctrans</command></term>
-        <listitem>
-          <para>
-            is a color space conversion calculator
-          </para>
-          <indexterm zone="lcms icctrans">
-            <primary sortas="b-icctrans">icctrans</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpegicc">
-        <term><command>jpegicc</command></term>
-        <listitem>
-          <para>
-            is an ICC profile applier for JPEG files
-          </para>
-          <indexterm zone="lcms jpegicc">
-            <primary sortas="b-jpegicc">jpegicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tifficc">
-        <term><command>tifficc</command></term>
-        <listitem>
-          <para>
-            is an ICC profile applier for TIFF files
-          </para>
-          <indexterm zone="lcms tifficc">
-            <primary sortas="b-tifficc">tifficc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffdiff">
-        <term><command>tiffdiff</command></term>
-        <listitem>
-          <para>
-            is a TIFF compare utility
-          </para>
-          <indexterm zone="lcms tiffdiff">
-            <primary sortas="b-tiffdiff">tiffdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wtpt">
-        <term><command>wtpt</command></term>
-        <listitem>
-          <para>
-            shows media white of profiles, identifying black body locus
-          </para>
-          <indexterm zone="lcms wtpt">
-            <primary sortas="b-wtpt">wtpt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblcms">
-        <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
-          </para>
-          <indexterm zone="lcms liblcms">
-            <primary sortas="c-liblcms">liblcms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/leafnode.xml
===================================================================
--- archive/leafnode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,328 +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 leafnode-download-http "&sourceforge-repo;/leafnode/leafnode-&leafnode-version;.tar.bz2">
-  <!ENTITY leafnode-download-ftp "ftp://ftp.gwdg.de/pub/linux/mirrors/sunsite/system/news/transport/leafnode-&leafnode-version;.tar.bz2">
-  <!ENTITY leafnode-md5sum "88552c5cc91cb27146c8906b2d33289d">
-  <!ENTITY leafnode-size "428 KB">
-  <!ENTITY leafnode-buildsize "6.2 MB">
-  <!ENTITY leafnode-time "0.1 SBU">
-]>
-
-<sect1 id="leafnode" xreflabel="Leafnode-&leafnode-version;">
-  <?dbhtml filename="leafnode.html"?>
-
-
-  <title>Leafnode-&leafnode-version;</title>
-
-  <indexterm zone="leafnode">
-    <primary sortas="a-Leafnode">Leafnode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Leafnode</title>
-
-    <para><application>Leafnode</application> is an NNTP server designed
-    for small sites to provide a local USENET spool.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&leafnode-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&leafnode-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &leafnode-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &leafnode-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &leafnode-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &leafnode-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Leafnode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pcre"/> and
-    <xref linkend="tcpwrappers"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- <xref linkend="xinetd"/> and -->
-      <xref linkend="fcron"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/leafnode"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Leafnode</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-     the group and user <systemitem class="username">news</systemitem>,
-    if not present:</para>
-
-<screen role="root"><userinput>groupadd -g 36 news &amp;&amp;
-useradd -c "Leafnode News Server" -d /var/spool/news -g news \
-        -u 36 news</userinput></screen>
-
-    <para>Install <application>Leafnode</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-    --localstatedir=/var --sysconfdir=/etc/leafnode \
-    --with-lockfile=/var/lock/leafnode/fetchnews.lck &amp;&amp;
-make</userinput></screen>
-    <para>To test the results, issue: <command>make check</command>.</para>
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--localstatedir=/var</parameter>: Change the default
-    spool directory of <filename class="directory">/usr/var</filename>.</para>
-
-    <para><parameter>--sysconfdir=/etc/leafnode</parameter>:
-    <application>Leafnode</application> reads its configuration data from a
-    file called <filename>config</filename> which will be created in
-    <filename class="directory">/etc/leafnode</filename> to
-    avoid any potential conflict with other packages.</para>
-
-    <para><command>make update</command>: Run this command if you are upgrading
-    from a very old version of <application>Leafnode</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Leafnode</title>
-
-    <sect3 id="leafnode-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/leafnode/config</filename>,
-      <filename>/etc/nntpserver</filename>,
-      <filename>/etc/sysconfig/createfiles</filename>
-      <filename>/etc/inetd.conf</filename> or
-      <!-- <filename>/etc/xinetd.conf</filename> or
-      <filename>/etc/xinetd.d/nntp</filename>--></para>
-
-      <indexterm zone="leafnode leafnode-config">
-        <primary sortas="e-etc-leafnode-config">/etc/leafnode/config</primary>
-      </indexterm>
-
-      <indexterm zone="leafnode leafnode-config">
-        <primary sortas="e-etc-nntpserver">/etc/nntpserver</primary>
-      </indexterm>
-<!--
-      <indexterm zone="leafnode leafnode-config">
-        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-      </indexterm>
--->
-      <indexterm zone="leafnode leafnode-config">
-        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="leafnode leafnode-config">
-        <primary sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
-      </indexterm>
-<!--
-      <indexterm zone="leafnode leafnode-config">
-        <primary sortas="e-etc-xinetd.d-nntp">/etc/xinetd.d/nntp</primary>
-      </indexterm>
--->
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The <filename>/etc/leafnode/config</filename> file must be
-      edited to reflect the name of the upstream NNTP provider. Copy the
-      example configuration file to <filename>/etc/leafnode/config</filename>
-      and save the original for reference:</para>
-
-<screen role="root"><userinput>cp /etc/leafnode/config.example /etc/leafnode/config</userinput></screen>
-
-      <para>Change the</para>
-
-<screen><literal>server = </literal></screen>
-
-      <para>entry to reflect your news provider.</para>
-
-      <para>The <filename>/etc/nntpserver</filename> file must contain
-      127.0.0.1 to prevent news clients from reading news from the upstream
-      feed. Create this file using the following command:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/nntpserver &lt;&lt; "EOF"
-<literal>127.0.0.1</literal>
-
-EOF</userinput></screen>
-
-      <para>The <command>/etc/rc.d/init.d/cleanfs</command> script, part
-      of the LFS bootscript package, will remove the
-      <filename class="directory">/var/lock/leafnode</filename> directory
-      during the system boot sequence. Install the following line in the
-      <filename>/etc/sysconfig/createfiles</filename> file to re-create the
-      directory:</para>
-
-<screen><literal>/var/lock/leafnode   dir   2775   news   news</literal></screen>
-
-      <para><application>Leafnode</application> may be configured to
-      use <command>inetd</command> by adding an entry to the
-      <filename>/etc/inetd.conf</filename> file with the following
-      command:</para>
-
-<screen role="root"><userinput>echo "nntp stream tcp nowait news /usr/sbin/tcpd /usr/sbin/leafnode" \
-&gt;&gt; /etc/inetd.conf</userinput></screen>
-
-      <para>Issue a <command>killall -HUP inetd</command> to reread the
-      changed <filename>inetd.conf</filename> file.</para>
-<!--
-      <para>If you use <command>xinetd</command>, the following command will
-      create the <application>Leafnode</application> file as
-      <filename>/etc/xinetd.d/nntp</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/xinetd.d/nntp &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd.d/nntp
-
-        service nntp
-        {
-           flags           = NAMEINARGS NOLIBWRAP
-           socket_type     = stream
-           protocol        = tcp
-           wait            = no
-           user            = news
-           server          = /usr/sbin/tcpd
-           server_args     = /usr/sbin/leafnode
-           instances       = 7
-           per_source      = 3
-        }
-
-# End /etc/xinetd.d/nntp</literal>
-EOF</userinput></screen>
-
-      <para>Issue a <command>killall -HUP xinetd</command> to reread the
-      changed <filename>xinetd.conf</filename> file.</para>
--->
-      <para>Add entries to the <systemitem class="username">root</systemitem>
-      or <systemitem class="username">news</systemitem> user's crontab to run
-      the <command>fetchnews</command> and <command>texpire</command> commands
-      at the desired time intervals.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>applyfilter, checkgroups, fetchnews, leafnode,
-        leafnode-version, newsq, and texpire</seg>
-        <seg>None</seg>
-        <seg>/etc/leafnode, /var/lock/leafnode, and /var/spool/news</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="applyfilter">
-        <term><command>applyfilter</command></term>
-        <listitem>
-          <para>filters newsgroup articles according to regular
-          expressions.</para>
-          <indexterm zone="leafnode applyfilter">
-            <primary sortas="b-applyfilter">applyfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="checkgroups">
-        <term><command>checkgroups</command></term>
-        <listitem>
-          <para>inserts newsgroup titles into the newsgroup database.</para>
-          <indexterm zone="leafnode checkgroups">
-            <primary sortas="b-checkgroups">checkgroups</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fetchnews">
-        <term><command>fetchnews</command></term>
-        <listitem>
-          <para>sends posted articles to and retrieves new articles from an
-          upstream news server.</para>
-          <indexterm zone="leafnode fetchnews">
-            <primary sortas="b-fetchnews">fetchnews</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="leafnode-prog">
-        <term><command>leafnode</command></term>
-        <listitem>
-          <para>is an NNTP server daemon.</para>
-          <indexterm zone="leafnode leafnode-prog">
-            <primary sortas="b-leafnode">leafnode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="leafnode-version">
-        <term><command>leafnode-version</command></term>
-        <listitem>
-          <para>prints the <application>Leafnode</application> version.</para>
-          <indexterm zone="leafnode leafnode-version">
-            <primary sortas="b-leafnode-version">leafnode-version</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newsq">
-        <term><command>newsq</command></term>
-        <listitem>
-          <para>shows articles waiting to be sent upstream.</para>
-          <indexterm zone="leafnode newsq">
-            <primary sortas="b-newsq">newsq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texpire">
-        <term><command>texpire</command></term>
-        <listitem>
-          <para>expires old articles and unread groups.</para>
-          <indexterm zone="leafnode texpire">
-            <primary sortas="b-texpire">texpire</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lesstif.xml
===================================================================
--- archive/lesstif.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,322 +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 lesstif-download-http "&sourceforge-repo;/lesstif/lesstif-&lesstif-version;.tar.bz2">
-  <!ENTITY lesstif-download-ftp  " ">
-  <!ENTITY lesstif-md5sum        "754187dbac09fcf5d18296437e72a32f">
-  <!ENTITY lesstif-size          "2.4 MB">
-  <!ENTITY lesstif-buildsize     "160 MB (includes building and running the test suite)">
-  <!ENTITY lesstif-time          "4.1 SBU (includes building the test suite)">
-]>
-
-<sect1 id="lesstif" xreflabel="LessTif-&lesstif-version;">
-  <?dbhtml filename="lesstif.html" ?>
-
-
-  <title>LessTif-&lesstif-version;</title>
-
-  <indexterm zone="lesstif">
-    <primary sortas="a-LessTif">LessTif</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LessTif</title>
-
-    <para>The <application>LessTif</application> package contains an Open
-    Source version of <application>OSF/Motif</application>.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&lesstif-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&lesstif-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &lesstif-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &lesstif-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &lesstif-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &lesstif-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/lesstif-&lesstif-version;-testsuite_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LessTif Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-lib"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="lynx"/> or <xref linkend="Links"/>
-    (used to generate the <filename>INSTALL</filename> documentation file) and
-    <ulink url="http://dmalloc.com">Dmalloc</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/lesstif"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LessTif</title>
-
-    <para>First, rename a man page file that conflicts with
-    <application>perl</application>:</para>
-
-    <screen><userinput>pushd doc/lessdox/widgets                      &amp;&amp;
-sed -i -e 's/\tShell.3/\tshell.3/' Makefile.in &amp;&amp;
-mv Shell.3 shell.3                             &amp;&amp;
-popd</userinput></screen>
-
-    <para>Install <application>LessTif</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../lesstif-&lesstif-version;-testsuite_fix-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --sysconfdir=/etc/X11 \
-            --disable-debug \
-            --enable-production \
-            --with-xdnd \
-            --x-includes=$XORG_PREFIX/include \
-            --x-libraries=$XORG_PREFIX/lib &amp;&amp;
-sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" clients/Motif-2.1/mwm/Makefile &amp;&amp;
-make rootdir=/usr/share/doc/lesstif-&lesstif-version;</userinput></screen>
-
-    <para>This package requires that it is installed before the test suite is
-    run. The commands to run the tests are located a bit later in the
-    instructions.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make rootdir=/usr/share/doc/lesstif-&lesstif-version; install &amp;&amp;
-ldconfig</userinput></screen>
-
-    <para>Applicatons that utilize Xorg libraries often, and incorrectly,
-    expect to find configuration files in
-    <filename class="directory">$XORG_PREFIX/lib/X11</filename>.  While still
-    the <systemitem class="username">root</systemitem> user, create a
-    compatibility symlink with the following command:</para>
-
-<screen role="root"><userinput>ln -v -sf /etc/X11/mwm $XORG_PREFIX/lib/X11</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--disable-debug</parameter>: Do not generate debugging
-    information.</para>
-
-    <para><parameter>--enable-production</parameter>: Build the release version
-    of the <application>LessTif</application> libraries.</para>
-
-    <para><parameter>--with-xdnd</parameter>: Enable XDND GNOME compatibility
-    support.</para>
-
-    <para><parameter>rootdir=/usr/share/doc/lesstif-&lesstif-version;</parameter>:
-    This installs the documentation into an appropriate directory instead of the
-    non-FHS compliant <filename class="directory">/usr/LessTif</filename>
-    directory.</para>
-
-    <para><parameter>--x-includes</parameter> and
-    <parameter>--x-libraries</parameter>: tells the build system where to find
-    the Xorg headers and libraries.</para>
-
-    <para><command>sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@"
-    clients/Motif-2.1/mwm/Makefile</command>: This corrects the installation
-    prefix for the mwm directory for FHS compliance.</para>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing LessTif</title>
-
-    <para>It is advisable to test the installation of
-    <application>LessTif</application> using the included test suite. It is
-    not required to install any of the resulting binaries to validate the
-    installation. Issue the following commands to build the test suite:</para>
-
-<screen><userinput>cd test &amp;&amp;
-./configure &amp;&amp;
-make</userinput></screen>
-
-    <para>To run the tests, issue the following commands:</para>
-
-<screen><userinput>cd Xm &amp;&amp;
-./testall *</userinput></screen>
-
-    <para>You may need to manually close four of the test windows. The first
-    one is from <command>test28</command> in the
-    <filename class='directory'>list</filename> directory. The second one is
-    from <command>test10</command> in the
-    <filename class='directory'>menushell</filename> directory. You should
-    click on the button in the window and choose <quote>exit</quote> (do it
-    twice) to finish the test. The third test is from <command>test20</command>
-    in the <filename class='directory'>PushButton</filename> and the last one
-    is from <command>test24</command> in the
-    <filename class='directory'>scrolledwindow</filename> directory.</para>
-
-    <!-- Last test run: 86 failed out of 605. -->
-
-    <para>As many as 101 tests are known to fail. The patch applied at the
-    beginning of the installation created a file used to compare known failures
-    to the failures from the test run. This file was created from an
-    installation using the current LFS book and should be a fairly accurate
-    representation of the failures you'll encounter. You could see some minor
-    variances, however.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LessTif</title>
-
-    <sect3 id="lesstif-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/X11/mwm/system.mwmrc</filename> and
-      <filename>~/.mwmrc</filename></para>
-
-      <indexterm zone="lesstif lesstif-config">
-        <primary sortas="e-AA.mwmrc">~/.mwmrc</primary>
-      </indexterm>
-
-      <indexterm zone="lesstif lesstif-config">
-        <primary
-        sortas="e-etc-X11-mwm-system.mwmrc">/etc/X11/mwm/system.mwmrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The config files are used to customize the behavior of the
-      <command>mwm</command> window manager. Information about customizing
-      these files can be found in the <filename>mwmrc(5)</filename> man
-      page.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>motif-config, mwm, mxmkmf, uil, and xmbind</seg>
-        <seg>libDtPrints.so, libMrm.so, libUil.so, and libXm.so</seg>
-        <seg>/etc/X11/mwm, /usr/include/Xm, /usr/include/Mrm,
-        /usr/include/uil, /usr/include/Dt, /usr/lib/LessTif, and
-        /usr/share/doc/lesstif-&lesstif-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="motif-config">
-        <term><command>motif-config</command></term>
-        <listitem>
-          <para>is used to find out configuration information for packages
-          needing to link to the <application>LessTif</application>
-          libraries.</para>
-          <indexterm zone="lesstif motif-config">
-            <primary sortas="b-motif-config">motif-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mwm">
-        <term><command>mwm</command></term>
-        <listitem>
-          <para>is a window manager that adheres largely to the
-          <application>Motif</application> <command>mwm</command>
-          specification.</para>
-          <indexterm zone="lesstif mwm">
-            <primary sortas="b-mwm">mwm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mxmkmf">
-        <term><command>mxmkmf</command></term>
-        <listitem>
-          <para>is the <application>LessTif</application> version of
-          <command>xmkmf</command> which creates a
-          <filename>Makefile</filename> from an
-          <filename>Imakefile</filename>.</para>
-          <indexterm zone="lesstif mxmkmf">
-            <primary sortas="b-mxmkmf">mxmkmf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uil">
-        <term><command>uil</command></term>
-        <listitem>
-          <para>is a user interface language compiler which translates a
-          plain text description of the user interface of a
-          <application>Motif</application> application into a
-          machine-readable form.</para>
-          <indexterm zone="lesstif uil">
-            <primary sortas="b-uil">uil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmbind">
-        <term><command>xmbind</command></term>
-        <listitem>
-          <para> configures the virtual key bindings of
-          <application>LessTif</application> applications.</para>
-          <indexterm zone="lesstif xmbind">
-            <primary sortas="b-xmbind">xmbind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXm">
-        <term><filename class='libraryfile'>libXm.so</filename></term>
-        <listitem>
-          <para>is an <application>OSF/Motif</application> source code
-          compatible library for the <application>X Window
-          System</application>. You can download an excellent reference
-          guide (mainly for programmers) for the Motif-2.1 specification
-          from <ulink
-          url="http://unc.dl.sourceforge.net/lesstif/6B_book.pdf"/>.</para>
-          <indexterm zone="lesstif libXm">
-            <primary sortas="c-libXm">libXm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libXp.xml
===================================================================
--- archive/libXp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +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 libXp-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXp-&libXp-version;.tar.bz2">
-  <!ENTITY libXp-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXp-&libXp-version;.tar.bz2">
-  <!ENTITY libXp-md5sum        "bb038577c7f4e42a1b675fa6451bc4aa">
-  <!ENTITY libXp-size          "292 KB">
-  <!ENTITY libXp-buildsize     "4.9 MB">
-  <!ENTITY libXp-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libXp" xreflabel="libXp-&libXp-version;">
-  <?dbhtml filename="libXp.html"?>
-
-
-  <title>libXp-&libXp-version;</title>
-
-  <indexterm zone="libXp">
-    <primary sortas="a-libXp">libXp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libXp</title>
-
-    <para>The <application>libXp</application> package contains a library
-    implementing the X Print Protocol.</para>
-
-    &not-katamari;
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libXp-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libXp-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libXp-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libXp-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libXp-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libXp-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libXp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="printproto"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libXp"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libXp</title>
-
-    <para>Install <application>libXp</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>libXp.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libXp-lib">
-        <term><filename class='libraryfile'>libXp.so</filename></term>
-        <listitem>
-          <para>is the library of X authority database routines.</para>
-          <indexterm zone="libXp libXp">
-            <primary sortas="c-libXp">libXp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libart_lgpl.xml
===================================================================
--- archive/libart_lgpl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,123 +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 libart_lgpl-download-http "&gnome-download-http;/libart_lgpl/2.3/libart_lgpl-&libart_lgpl-version;.tar.bz2">
-  <!ENTITY libart_lgpl-download-ftp  "&gnome-download-ftp;/libart_lgpl/2.3/libart_lgpl-&libart_lgpl-version;.tar.bz2">
-  <!ENTITY libart_lgpl-md5sum        "08559ff3c67fd95d57b0c5e91a6b4302">
-  <!ENTITY libart_lgpl-size          "321 KB">
-  <!ENTITY libart_lgpl-buildsize     "5 MB">
-  <!ENTITY libart_lgpl-time          "0.1 SBU">
-]>
-
-<sect1 id="libart_lgpl" xreflabel="libart_lgpl-&libart_lgpl-version;">
-  <?dbhtml filename="libart_lgpl.html"?>
-
-
-  <title>libart_lgpl-&libart_lgpl-version;</title>
-
-  <indexterm zone="libart_lgpl">
-    <primary sortas="a-Libart_lgpl">Libart-lgpl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libart_lgpl</title>
-
-    <para>The <application>libart_lgpl</application> package contains the
-    <filename class="libraryfile">libart</filename> libraries. These are
-    useful for high-performance 2D graphics.</para>
-
-    &lfs73_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libart_lgpl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libart_lgpl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libart_lgpl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libart_lgpl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libart_lgpl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libart_lgpl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libart_lgpl-&libart_lgpl-version;-upstream_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libart_lgpl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libart_lgpl</title>
-
-    <para>Install <application>libart_lgpl</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../libart_lgpl-&libart_lgpl-version;-upstream_fixes-1.patch &amp;&amp;
-./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 Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>libart2-config</seg>
-        <seg>libart_lgpl_2.{so,a}</seg>
-        <seg>/usr/include/libart-2.0/libart_lgpl</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libart_lgpl_2">
-        <term><filename class='libraryfile'>libart_lgpl_2.{so,a}</filename></term>
-        <listitem>
-          <para>is used as the anti-aliased render engine for
-          <application>libgnomecanvas</application> and as a graphics support
-          library for many other packages.</para>
-          <indexterm zone="libart_lgpl libart_lgpl_2">
-            <primary sortas="c-libart_lgpl_2">libart_lgpl_2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libcroco.xml
===================================================================
--- archive/libcroco.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,193 +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 libcroco-download-http "&gnome-download-http;/libcroco/0.6/libcroco-&libcroco-version;.tar.xz">
-  <!ENTITY libcroco-download-ftp  "&gnome-download-ftp;/libcroco/0.6/libcroco-&libcroco-version;.tar.xz">
-  <!ENTITY libcroco-md5sum        "c80c5a8385011a0260dce6bd0da93dce">
-  <!ENTITY libcroco-size          "480 KB">
-  <!ENTITY libcroco-buildsize     "10 MB (with tests)">
-  <!ENTITY libcroco-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libcroco" xreflabel="libcroco-&libcroco-version;">
-  <?dbhtml filename="libcroco.html"?>
-
-
-  <title>libcroco-&libcroco-version;</title>
-
-  <indexterm zone="libcroco">
-    <primary sortas="a-libcroco">libcroco</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcroco</title>
-
-    <para>
-      The <application>libcroco</application> package contains
-      a standalone CSS2 parsing and manipulation library.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcroco-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcroco-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcroco-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcroco-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcroco-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcroco-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcroco Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </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;/libcroco"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcroco</title>
-
-    <para>
-      Install <application>libcroco</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To execute the test suite, run <command>make -k test</command>.  Some
-      tests fail: searching files in wrong location, locale problems
-      (character codes compared to characters), float point numbers not
-      properly rounded to the same number of places are some of the
-      reasons.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          croco-0.6-config and csslint-0.6
-        </seg>
-        <seg>
-          libcroco-0.6.so
-        </seg>
-        <seg>
-          /usr/include/libcroco-0.6 and
-          /usr/share/gtk-doc/html/libcroco
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="croco-0.6-config">
-        <term><command>croco-0.6-config</command></term>
-        <listitem>
-          <para>
-            is a helper script for building with <filename class="libraryfile">libcroco-0.6.so</filename>.
-          </para>
-          <indexterm zone="libcroco croco-0.6-config">
-            <primary sortas="b-croco-0.6-config">croco-0.6-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="csslint-0.6">
-        <term><command>csslint-0.6</command></term>
-        <listitem>
-          <para>
-            is used to parse one or more CSS files specified on
-            the command line.
-          </para>
-          <indexterm zone="libcroco csslint-0.6">
-            <primary sortas="b-csslint-0.6">csslint-0.6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcroco-0">
-        <term><filename class="libraryfile">libcroco-0.6.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions for CSS2 parsing and manipulation.
-          </para>
-          <indexterm zone="libcroco libcroco-0">
-            <primary sortas="c-libcroco-0">libcroco-0.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libdazzle.xml
===================================================================
--- archive/libdazzle.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +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 libdazzle-download-http "&gnome-download-http;/libdazzle/3.44/libdazzle-&libdazzle-version;.tar.xz">
-  <!ENTITY libdazzle-download-ftp  "&gnome-download-ftp;/libdazzle/3.44/libdazzle-&libdazzle-version;.tar.xz">
-  <!ENTITY libdazzle-md5sum        "203815dd90239ff732c19fc700417c74">
-  <!ENTITY libdazzle-size          "448 KB">
-  <!ENTITY libdazzle-buildsize     "15 MB (with tests)">
-  <!ENTITY libdazzle-time          "0.2 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="libdazzle" xreflabel="libdazzle-&libdazzle-version;">
-  <?dbhtml filename="libdazzle.html"?>
-
-
-  <title>libdazzle-&libdazzle-version;</title>
-
-  <indexterm zone="libdazzle">
-    <primary sortas="a-libdazzle">libdazzle</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdazzle</title>
-
-    <para>
-      <application>libdazzle</application> is a companion library to GObject
-      and GTK+ that adds APIs for special graphical effects.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdazzle-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdazzle-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdazzle-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdazzle-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdazzle-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdazzle-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdazzle Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdazzle</title>
-
-    <para>
-      Install <application>libdazzle</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!--Two tests may fail due to a theme parsing error.-->
-    </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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          dazzle-list-counters
-        </seg>
-        <seg>
-          libdazzle-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libdazzle-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dazzle-list-counters">
-        <term><command>dazzle-list-counters</command></term>
-        <listitem>
-          <para>
-            lists counters that are in use by a process
-          </para>
-          <indexterm zone="libdazzle dazzle-list-counters">
-            <primary sortas="b-dazzle-list-counters">dazzle-list-counters</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdazzle-lib">
-        <term><filename class="libraryfile">libdazzle-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for graphical effects
-          </para>
-          <indexterm zone="libdazzle libdazzle">
-            <primary sortas="c-libdazzle">libdazzle-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/libdbusmenuqt.xml
===================================================================
--- archive/libdbusmenuqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdbusmenu-qt-download-http "https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_&libdbusmenu-qt-version;.orig.tar.gz">
-  <!ENTITY libdbusmenu-qt-download-ftp  " ">
-  <!ENTITY libdbusmenu-qt-md5sum        "8b90312bd8654e026d814d4db986ce5e">
-  <!ENTITY libdbusmenu-qt-size          "48 KB">
-  <!ENTITY libdbusmenu-qt-buildsize     "4.6 MB">
-  <!ENTITY libdbusmenu-qt-time          "0.4 SBU">
-]>
-
-<sect1 id="libdbusmenu-qt" xreflabel="libdbusmenu-qt-&libdbusmenu-qt-version;">
-  <?dbhtml filename="libdbusmenu-qt.html"?>
-
-
-  <title>libdbusmenu-qt-&libdbusmenu-qt-version;</title>
-
-  <indexterm zone="libdbusmenu-qt">
-    <primary sortas="a-libdbusmenu-qt">libdbusmenu-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdbusmenu-qt</title>
-
-    <para>
-      This library provides a <application>Qt</application> implementation
-      of the DBusMenu specification that exposes menus via DBus.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdbusmenu-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdbusmenu-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdbusmenu-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdbusmenu-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdbusmenu-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdbusmenu-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdbusmenu-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt5-alternate"/>
-    </para>
-
-<!-- needs Qt4
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for building the API documentation)
-    </para>-->
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdbusmenu-qt</title>
-
-    <para>
-      Install <application>libdbusmenu-qt</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  \
-      -DWITH_DOC=OFF              \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <!--
-    <para>
-      To test the results (<xref linkend="qjson"/> must be installed),
-      issue: <command>make -k check</command>. One test is known to fail.
-    </para>
-    -->
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to build without debugging symbols and apply a higher level of
-      compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DWITH_DOC=OFF</parameter>: This option is set to avoid
-      trying to build the API documentation which requires obsolete Qt4.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libdbusmenu-qt5.so</seg>
-        <seg>/usr/lib/cmake/dbusmenu-qt5 and
-             /usr/include/dbusmenu-qt5</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-automoc4">
-        <term><command>automoc4</command></term>
-        <listitem>
-          <para>
-            is a testing utility for libdbusmenu-qt-generated build trees.
-          </para>
-          <indexterm zone="a-automoc4 automoc4">
-            <primary sortas="b-automoc4">automoc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: chive/libdiscid.xml
===================================================================
--- archive/libdiscid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 libdiscid-download-http "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-&libdiscid-version;.tar.gz">
-  <!ENTITY libdiscid-download-ftp  "ftp://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-&libdiscid-version;.tar.gz">
-  <!ENTITY libdiscid-md5sum        "2812bb678f5142efdfd0d0f7d6ea87d6">
-  <!ENTITY libdiscid-size          "396 KB">
-  <!ENTITY libdiscid-buildsize     "3.1 MB (with tests)">
-  <!ENTITY libdiscid-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libdiscid" xreflabel="libdiscid-&libdiscid-version;">
-  <?dbhtml filename="libdiscid.html"?>
-
-
-  <title>libdiscid-&libdiscid-version;</title>
-
-  <indexterm zone="libdiscid">
-    <primary sortas="a-libdiscid">libdiscid</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdiscid</title>
-
-    <para>
-      The <application>libdiscid</application> package contains a library for
-      creating MusicBrainz DiscIDs from audio CDs. It reads a CD's table of
-      contents (TOC) and generates an identifier which can be used to lookup the
-      CD at MusicBrainz (<ulink url="https://musicbrainz.org"/>). Additionally, it
-      provides a submission URL for adding the DiscID to the database.
-    </para>
-
-    &lfs113_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdiscid-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdiscid-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdiscid-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdiscid-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdiscid-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdiscid-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libdiscid"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdiscid</title>
-
-    <para>
-      Install <application>libdiscid</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdiscid.so
-        </seg>
-        <seg>
-          /usr/include/discid
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdiscid-lib">
-        <term><filename class="libraryfile">libdiscid.so</filename></term>
-        <listitem>
-          <para>
-            contains the DiscID API functions
-          </para>
-          <indexterm zone="libdiscid libdiscid-lib">
-            <primary sortas="c-libdiscid">libdiscid.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libelf.xml
===================================================================
--- archive/libelf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,111 +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 libelf-download-http "http://www.mr511.de/software/libelf-&libelf-version;.tar.gz">
-  <!ENTITY libelf-download-ftp  " ">
-  <!ENTITY libelf-md5sum        "4136d7b4c04df68b686570afa26988ac">
-  <!ENTITY libelf-size          "145 KB">
-  <!ENTITY libelf-buildsize     "3 MB">
-  <!ENTITY libelf-time          "0.1 SBU">
-]>
-
-<sect1 id="libelf" xreflabel="libelf-&libelf-version;">
-  <?dbhtml filename="libelf.html"?>
-
-
-  <title>libelf-&libelf-version;</title>
-
-  <indexterm zone="libelf">
-    <primary sortas="a-libelf">libelf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libelf</title>
-
-    <para>The <application>libelf</application> package is a object file access
-    library. It lets you read, modify or create ELF files in an
-    architecture-independent way.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libelf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libelf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libelf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libelf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libelf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libelf-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libelf"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libelf</title>
-
-    <para>Install <application>libelf</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libelf.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libelf-lib">
-        <term><filename class='libraryfile'>libelf.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>libelf</application> API
-          functions.</para>
-          <indexterm zone="libelf libelf-lib">
-            <primary sortas="c-libelf">libelf.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libesmtp.xml
===================================================================
--- archive/libesmtp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +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 libesmtp-download-http "http://brianstafford.info/libesmtp/libesmtp-&libesmtp-version;.tar.bz2">
-  <!ENTITY libesmtp-download-ftp  " ">
-  <!ENTITY libesmtp-md5sum        "bf3915e627fd8f35524a8fdfeed979c8">
-  <!ENTITY libesmtp-size          "364 KB">
-  <!ENTITY libesmtp-buildsize     "7.1 MB">
-  <!ENTITY libesmtp-time          "0.1 SBU">
-]>
-
-<sect1 id="libesmtp" xreflabel="libESMTP-&libesmtp-version;">
-  <?dbhtml filename="libesmtp.html"?>
-
-
-  <title>libESMTP-&libesmtp-version;</title>
-
-  <indexterm zone="libesmtp">
-    <primary sortas="a-libESMTP">libESMTP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libESMTP</title>
-
-    <para>The <application>libESMTP</application> package contains the
-    <application>libESMTP</application> libraries which are used by some programs
-    to manage email submission to a mail transport layer.</para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libesmtp-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libesmtp-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libesmtp-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libesmtp-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libesmtp-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libesmtp-time;</para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">libESMTP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/></para>
--->
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libesmtp"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libESMTP</title>
-
-    <para>Fix a build issue with OpenSSL-1.1.0:</para>
-
-<screen><userinput>sed 's@SSL_library_init@SSL_new@g' -i configure.ac &amp;&amp;
-autoreconf -fi</userinput></screen>
-
-    <para>Install <application>libESMTP</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>libesmtp-config</seg>
-        <seg>libesmtp.{so,a} and <application>libESMTP</application>
-        SASL plugins</seg>
-        <seg>/usr/lib/esmtp-plugins</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libesmtp-config">
-        <term><command>libesmtp-config</command></term>
-        <listitem>
-          <para>displays version information and the options used to
-          compile <application>libESMTP</application>.</para>
-          <indexterm zone="libesmtp libesmtp-config">
-            <primary sortas="b-libesmtp-config">libesmtp-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesmtp-lib">
-        <term><filename class='libraryfile'>libesmtp.{so,a}</filename></term>
-        <listitem>
-          <para>is used to manage submission of electronic mail to a Mail
-          Transport Agent.</para>
-          <indexterm zone="libesmtp libesmtp-lib">
-            <primary sortas="c-libesmtp">libesmtp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesmtp-plugins">
-        <term><filename class='libraryfile'>libesmtp SASL plugins</filename></term>
-        <listitem>
-          <para>are used to integrate <application>libesmtp</application> with
-          SASL authentication.</para>
-          <indexterm zone="libesmtp libesmtp-plugins">
-            <primary sortas="c-libesmtp-sasl-plugins">libesmtp SASL plugins</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libfame.xml
===================================================================
--- archive/libfame.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +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 libfame-download-http "&sourceforge-repo;/fame/libfame-&libfame-version;.tar.gz">
-  <!ENTITY libfame-download-ftp  "&gentoo-ftp-repo;/libfame-&libfame-version;.tar.gz">
-  <!ENTITY libfame-md5sum        "880085761e17a3b4fc41f4f6f198fd3b">
-  <!ENTITY libfame-size          "290 KB">
-  <!ENTITY libfame-buildsize     "6.6 MB">
-  <!ENTITY libfame-time          "0.2 SBU">
-]>
-
-<sect1 id="libfame" xreflabel="libFAME-&libfame-version;">
-  <?dbhtml filename="libfame.html"?>
-
-
-  <title>libFAME-&libfame-version;</title>
-
-  <indexterm zone="libfame">
-    <primary sortas="a-LibFAME">LibFAME</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libFAME</title>
-
-    <para><application>libFAME</application> is a fast (real-time) MPEG-1 as
-    well as MPEG-4 rectangular and arbitrary shaped video encoding library.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libfame-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libfame-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libfame-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libfame-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libfame-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libfame-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/libfame-&libfame-version;-gcc34-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libfame"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libFAME</title>
-
-    <para>Install <application>libFAME</application> by running
-    the following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../libfame-&libfame-version;-gcc34-1.patch &amp;&amp;
-sed -i 's/$CC --version/$CC -dumpversion/' configure &amp;&amp;
-./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="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i 's/$CC --version/$CC -dumpversion/'
-    configure</command>: This command causes the <command>configure</command>
-    script to use a different command to find out the version of the compiler.
-    Without this command, the -fstrict-aliasing flag is not added to the
-    <envar>CFLAGS</envar> variable in the various
-    <filename>Makefile</filename>s.</para>
-
-    <para><option>--enable-sse</option>: This option is off by default and
-    should be set on if your machine has SSE capability. One way to find out if
-    you have SSE is to issue <command>cat /proc/cpuinfo</command> and see if
-    <computeroutput>sse</computeroutput> is listed in the flags.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>libfame-config</seg>
-        <seg>libfame.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfame-config">
-        <term><command>libfame-config</command></term>
-        <listitem>
-          <para>provides configuration information for
-          <filename class="libraryfile">libfame</filename>.</para>
-          <indexterm zone="libfame libfame-config">
-            <primary sortas="b-libfame-config">libfame-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfame-lib">
-        <term><filename class='libraryfile'>libfame.{so,a}</filename></term>
-        <listitem>
-          <para>provides functions for the video encoding programs.</para>
-          <indexterm zone="libfame libfame-lib">
-            <primary sortas="c-libfame">libfame.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libffi.xml
===================================================================
--- archive/libffi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY libffi-download-http "https://sourceware.org/ftp/libffi/libffi-&libffi-version;.tar.gz">
-  <!ENTITY libffi-download-ftp  "ftp://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
-  <!ENTITY libffi-md5sum        "83b89587607e3eb65c70d361f13bab43">
-  <!ENTITY libffi-size          "920 KB">
-  <!ENTITY libffi-buildsize     "6.1 MB (additional 1.7 MB for the tests)">
-  <!ENTITY libffi-time          "less than 0.1 SBU (additional 0.4 SBU for the tests)">
-]>
-
-<sect1 id="libffi" xreflabel="libffi-&libffi-version;">
-  <?dbhtml filename="libffi.html"?>
-
-
-  <title>libffi-&libffi-version;</title>
-
-  <indexterm zone="libffi">
-    <primary sortas="a-libffi">libffi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libffi</title>
-
-    <para>
-      The <application>libffi</application> library provides a portable,
-      high level programming interface to various calling conventions.  This
-      allows a programmer to call any function specified by a call interface
-      description at run time.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libffi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libffi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libffi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libffi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libffi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libffi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libffi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dejagnu"/> (required to run the testsuite)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libffi"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libffi</title>
-
-    <para>
-      Install <application>libffi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
-    -i include/Makefile.in &amp;&amp;
-
-sed -e '/^includedir/ s/=.*$/=@includedir@/' \
-    -e 's/^Cflags: -I${includedir}/Cflags:/' \
-    -i libffi.pc.in        &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed ... include/Makefile.in</command> and
-    <command>sed ... libffi.pc.in</command>: Makes the package install headers 
-    into the standardized <filename class="directory">/usr/include</filename> 
-    instead of 
-    <filename class="directory">/usr/lib/libffi-&libffi-version;/include.</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libffi.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libffi-lib">
-        <term><filename class="libraryfile">libffi.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libffi</application> API
-            functions.
-          </para>
-          <indexterm zone="libffi libffi-lib">
-            <primary sortas="c-libffi">libffi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libgee.xml
===================================================================
--- archive/libgee.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +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 libgee-download-http "&gnome-download-http;/libgee/0.6/libgee-&libgee-version;.tar.xz">
-  <!ENTITY libgee-download-ftp  "&gnome-download-ftp;/libgee/0.6/libgee-&libgee-version;.tar.xz">
-  <!ENTITY libgee-md5sum        "2688c24f9a12e7616ee808f9092d0afe">
-  <!ENTITY libgee-size          "433 KB">
-  <!ENTITY libgee-buildsize     "21 MB">
-  <!ENTITY libgee-time          "0.2 SBU">
-]>
-
-<sect1 id="libgee" xreflabel="libgee-&libgee-version;">
-  <?dbhtml filename="libgee.html"?>
-
-
-  <title>libgee-&libgee-version;</title>
-
-  <indexterm zone="libgee">
-    <primary sortas="a-libgee">libgee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgee</title>
-
-    <para>
-      The <application>libgee</application> package is a collection library
-      providing GObject based interfaces and classes for commonly used data
-      structures.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgee-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgee-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgee-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgee-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgee-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgee-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgee Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libgee"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgee</title>
-
-    <para>
-      Install <application>libgee</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgee.so
-        </seg>
-        <seg>
-          /usr/include/gee-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgee-lib">
-        <term><filename class="libraryfile">libgee.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgee</application> API functions.
-          </para>
-          <indexterm zone="libgee libgee-lib">
-            <primary sortas="c-libgee">libgee.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libggz.xml
===================================================================
--- archive/libggz.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,126 +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 libggz-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&libggz-version;/libggz-&libggz-version;.tar.gz">
-  <!ENTITY libggz-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&libggz-version;/libggz-&libggz-version;.tar.gz">
-  <!ENTITY libggz-md5sum        "603739504648833779aa13b0327a1c3d">
-  <!ENTITY libggz-size          "466 KB">
-  <!ENTITY libggz-buildsize     "5 MB">
-  <!ENTITY libggz-time          "0.1 SBU">
-]>
-
-<sect1 id="libggz" xreflabel="libggz-&libggz-version;">
-  <?dbhtml filename="libggz.html"?>
-
-
-  <title>libggz-&libggz-version;</title>
-
-  <indexterm zone="libggz">
-    <primary sortas="a-libggz">libggz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libggz</title>
-
-    <para>The <application>libggz</application> package is the GGZ base library,
-    used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other
-    components.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libggz-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libggz-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libggz-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libggz-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libggz-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libggz-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libggz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnutls"/>,
-    <xref linkend="libgcrypt"/>, and
-    <xref linkend="openssl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libggz"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libggz</title>
-
-    <para>Install <application>libggz</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-tls &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-tls</parameter>: This parameter will automatically
-    select the use of either GnuTLS or OpenSSL if available.</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>libggz.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libggz-lib">
-        <term><filename class='libraryfile'>libggz.{so,a}</filename></term>
-        <listitem>
-          <para>contains the libggz API functions.</para>
-          <indexterm zone="libggz libggz-lib">
-            <primary sortas="c-libggz">libggz.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libgnome-keyring.xml
===================================================================
--- archive/libgnome-keyring.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +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 libgnome-keyring-download-http
-           "&gnome-download-http;/libgnome-keyring/&gnome-minor;/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
-  <!ENTITY libgnome-keyring-download-ftp
-           "&gnome-download-ftp;/libgnome-keyring/&gnome-minor;/libgnome-keyring-&libgnome-keyring-version;.tar.xz">
-  <!ENTITY libgnome-keyring-md5sum        "fc798878a5c5a11a2661cdd72bd38fd6">
-  <!ENTITY libgnome-keyring-size          "424 KB">
-  <!ENTITY libgnome-keyring-buildsize     "19 MB">
-  <!ENTITY libgnome-keyring-time          "0.1 SBU">
-]>
-
-<sect1 id="libgnome-keyring" xreflabel="libgnome-keyring-&libgnome-keyring-version;">
-  <?dbhtml filename="libgnome-keyring.html"?>
-
-
-  <title>libgnome-keyring-&libgnome-keyring-version;</title>
-
-  <indexterm zone="libgnome-keyring">
-    <primary sortas="a-libgnome-keyring">libgnome-keyring</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnome-keyring</title>
-
-    <para>
-      The <application>libgnome-keyring</application> is used by
-      applications to integrate with the
-      <application>GNOME Keyring</application> system.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgnome-keyring-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgnome-keyring-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgnome-keyring-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgnome-keyring-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgnome-keyring-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgnome-keyring-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnome-keyring Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/>, and
-      <xref linkend="libgcrypt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libgnome-keyring"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnome-keyring</title>
-
-    <para>
-      Install <application>libgnome-keyring</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgnome-keyring.so
-        </seg>
-        <seg>
-          /usr/include/gnome-keyring-1 and
-          /usr/share/gtk-doc/html/gnome-keyring
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnome-keyring-lib">
-        <term><filename class="libraryfile">libgnome-keyring.so</filename></term>
-        <listitem>
-          <para>
-            is used by applications to integrate with the
-            <application>GNOME Keyring</application> system.
-          </para>
-          <indexterm zone="libgnome-keyring libgnome-keyring-lib">
-            <primary sortas="c-libgnome-keyring">libgnome-keyring.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libgtkhtml.xml
===================================================================
--- archive/libgtkhtml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,124 +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 libgtkhtml-download-http "&gnome-download-http;/libgtkhtml/2.11/libgtkhtml-&libgtkhtml-version;.tar.bz2">
-  <!ENTITY libgtkhtml-download-ftp  "&gnome-download-ftp;/libgtkhtml/2.11/libgtkhtml-&libgtkhtml-version;.tar.bz2">
-  <!ENTITY libgtkhtml-md5sum        "a1d1a197dcff8c4571659deef5495e24">
-  <!ENTITY libgtkhtml-size          "597 KB">
-  <!ENTITY libgtkhtml-buildsize     "36 MB">
-  <!ENTITY libgtkhtml-time          "0.8 SBU">
-]>
-
-<sect1 id="libgtkhtml" xreflabel="libgtkhtml-&libgtkhtml-version;">
-  <?dbhtml filename="libgtkhtml.html"?>
-
-
-  <title>libgtkhtml-&libgtkhtml-version;</title>
-
-  <indexterm zone="libgtkhtml">
-    <primary sortas="a-Libgtkhtml">Libgtkhtml</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgtkhtml</title>
-
-    <para>The <application>libgtkhtml</application> package contains the
-    <filename class="libraryfile">libgtkhtml-2</filename> library. This
-    library provides an API for rendering HTML.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgtkhtml-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgtkhtml-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgtkhtml-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgtkhtml-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgtkhtml-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgtkhtml-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgtkhtml Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/> and
-    <xref linkend="libxml2"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!--<xref linkend="gail"/> and
-      Gail no longer required since libgailutil is now part of GTK+.-->
-    <xref linkend="gnome-vfs"/> (only used in the test suite)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgtkhtml"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgtkhtml</title>
-
-    <para>Install <application>libgtkhtml</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. You can run a test
-    program which includes many test cases; if desired, issue:
-    <command>( cd tests; ./testgtkhtml )</command></para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgtkhtml-2.{so,a}</seg>
-        <seg>/usr/include/gtkhtml-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtkhtml-2">
-        <term><filename class='libraryfile'>libgtkhtml-2.{so,a}</filename></term>
-        <listitem>
-          <para>provides the functions necessary to render and/or
-          edit HTML.</para>
-          <indexterm zone="libgtkhtml libgtkhtml-2">
-            <primary sortas="c-libgtkhtml-2">libgtkhtml-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libhandy.xml
===================================================================
--- archive/libhandy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +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 libhandy-download-http "https://source.puri.sm/Librem5/libhandy/-/archive/v&libhandy-version;/libhandy-v&libhandy-version;.tar.bz2">
-  <!ENTITY libhandy-download-ftp  " ">
-  <!ENTITY libhandy-md5sum        "932ba6e80908c7579fa0392d6e0d0ceb">
-  <!ENTITY libhandy-size          "388 KB">
-  <!ENTITY libhandy-buildsize     "16 MB (with tests)">
-  <!ENTITY libhandy-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libhandy" xreflabel="libhandy-&libhandy-version;">
-  <?dbhtml filename="libhandy.html"?>
-
-
-  <title>Libhandy-&libhandy-version;</title>
-
-  <indexterm zone="libhandy">
-    <primary sortas="a-libhandy">libhandy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libhandy</title>
-
-    <para>
-      The <application>libhandy</application> package provides additional
-      GTK UI widgets for use in developing user interfaces.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libhandy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libhandy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libhandy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libhandy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libhandy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libhandy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libhandy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libhandy"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libhandy</title>
-
-    <para>
-      Install <application>libhandy</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 must be run from a graphical session.
-    </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 option if you have
-      <xref linkend="gtk-doc"/> installed and wish to install the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          handy-demo-0.0
-        </seg>
-        <seg>
-          libhandy-0.0.so
-        </seg>
-        <seg>
-          /usr/include/libhandy-0.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="handy-demo-0.0">
-        <term><command>handy-demo-0.0</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the
-            <application>libhandy</application> library.
-          </para>
-          <indexterm zone="libhandy handy-demo-0.0">
-            <primary sortas="b-handy-demo-0.0">handy-demo-0.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhandy-0.0">
-        <term><filename class="libraryfile">libhandy-0.0.so</filename></term>
-        <listitem>
-          <para>
-            provides additional GTK widgets for use in creating user interfaces.
-          </para>
-          <indexterm zone="libhandy libhandy-0.0">
-            <primary sortas="c-libhandy-0.0">libhandy-0.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/libidl.xml
===================================================================
--- archive/libidl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 libidl-download-http "&gnome-download-http;/libIDL/0.8/libIDL-&libidl-version;.tar.bz2">
-  <!ENTITY libidl-download-ftp  "&gnome-download-ftp;/libIDL/0.8/libIDL-&libidl-version;.tar.bz2">
-  <!ENTITY libidl-md5sum        "bb8e10a218fac793a52d404d14adedcb">
-  <!ENTITY libidl-size          "417 KB">
-  <!ENTITY libidl-buildsize     "5 MB">
-  <!ENTITY libidl-time          "0.1 SBU">
-]>
-
-<sect1 id="libidl" xreflabel="libIDL-&libidl-version;">
-  <?dbhtml filename="libidl.html"?>
-
-
-  <title>LibIDL-&libidl-version;</title>
-
-  <indexterm zone="libidl">
-    <primary sortas="a-LibIDL">LibIDL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LibIDL</title>
-
-    <para>The <application>libIDL</application> package
-    contains libraries for Interface Definition Language files. This is a
-    specification for defining portable interfaces.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libidl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libidl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libidl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libidl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libidl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libidl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LibIDL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="glib2"/></para>
-
-    <bridgehead renderas="sect4">Optional to Build Documentation</bridgehead>
-    <para role="optional">
-    <xref linkend="texlive"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libidl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LibIDL</title>
-
-    <para>Install <application>libIDL</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-
-makeinfo --plaintext -o libIDL2.txt libIDL2.texi</userinput></screen>
-
-    <para>If you have
-    <application>Live TeX</application> installed and wish to
-    build alternate forms of the documentation, issue the following
-    command:</para>
-
-<screen><userinput>make pdf ps</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
-
-install -v -m755 -d /usr/share/doc/libIDL-&libidl-version; &amp;&amp;
-install -v -m644    README libIDL2.{txt,texi} \
-                    /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
-
-    <para>If you built the additional documentation, issue the following
-    command as the <systemitem class="username">root</systemitem> user to
-    install it:</para>
-
-<screen role="root"><userinput>install -v -m644 libIDL2.{pdf,dvi,ps} \
-                 /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>libIDL-config-2</seg>
-        <seg>libIDL-2.{so,a}</seg>
-        <seg>/usr/include/libIDL-2.0/libIDL and
-        /usr/share/doc/libIDL-&libidl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libIDL-config-2">
-        <term><command>libIDL-config-2</command></term>
-        <listitem>
-          <para>determines the compile and linker flags that should be used to
-          compile and link programs that use
-          <filename class="libraryfile">libIDL-2</filename>.</para>
-          <indexterm zone="libidl libIDL-config-2">
-            <primary sortas="b-libIDL-config-2">libIDL-config-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libIDL-2">
-        <term><filename class="libraryfile">libIDL-2.{so,a}</filename></term>
-        <listitem>
-          <para>libraries provide the functions to create and maintain
-          trees of CORBA Interface Definition Language
-          (IDL) files.</para>
-          <indexterm zone="libidl libIDL-2">
-            <primary sortas="c-libIDL-2">libIDL-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libjpeg.xml
===================================================================
--- archive/libjpeg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +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 libjpeg-download-http "http://www.ijg.org/files/jpegsrc.v&libjpeg-version;.tar.gz">
-  <!ENTITY libjpeg-download-ftp " ">
-  <!ENTITY libjpeg-md5sum "52654eb3b2e60c35731ea8fc87f1bd29">
-  <!ENTITY libjpeg-size "972 KB">
-  <!ENTITY libjpeg-buildsize "13 MB">
-  <!ENTITY libjpeg-time "0.3 SBU">
-]>
-
-<sect1 id="libjpeg" xreflabel="libjpeg-&libjpeg-version;">
-  <?dbhtml filename="libjpeg.html"?>
-
-
-  <title>libjpeg-&libjpeg-version;</title>
-
-  <indexterm zone="libjpeg">
-    <primary sortas="a-libjpeg">libjpeg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libjpeg</title>
-
-    <para>The <application>libjpeg</application> package contains libraries
-    that allow compression of image files based on the Joint Photographic Experts
-    Group standard. It is a "lossy" compression algorithm.</para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libjpeg-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libjpeg-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libjpeg-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libjpeg-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libjpeg-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libjpeg-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libjpeg"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libjpeg</title>
-
-    <para>Install <application>libjpeg</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cjpeg, djpeg, jpegtran, rdjpgcom, and wrjpgcom</seg>
-        <seg>libjpeg.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cjpeg">
-        <term><command>cjpeg</command></term>
-        <listitem>
-          <para>compresses image files to produce a JPEG/JFIF file on the
-          standard output. Currently supported input file formats are: PPM
-          (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-          BMP, and Targa.</para>
-          <indexterm zone="libjpeg cjpeg">
-            <primary sortas="b-cjpeg">cjpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="djpeg">
-        <term><command>djpeg</command></term>
-        <listitem>
-          <para>decompresses image files from JPEG/JFIF format to either
-          PPM (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-          BMP, or Targa format.</para>
-          <indexterm zone="libjpeg djpeg">
-            <primary sortas="b-djpeg">djpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpegtran">
-        <term><command>jpegtran</command></term>
-        <listitem>
-          <para>is used for lossless transformation of JPEG files.</para>
-          <indexterm zone="libjpeg jpegtran">
-            <primary sortas="b-jpegtran">jpegtran</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdjpgcom">
-        <term><command>rdjpgcom</command></term>
-        <listitem>
-          <para>displays text comments from within a JPEG file.</para>
-          <indexterm zone="libjpeg rdjpgcom">
-            <primary sortas="b-rdjpgcom">rdjpgcom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wrjpgcom">
-        <term><command>wrjpgcom</command></term>
-        <listitem>
-          <para>inserts text comments into a JPEG file.</para>
-          <indexterm zone="libjpeg wrjpgcom">
-            <primary sortas="b-wrjpgcom">wrjpgcom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjpeg-lib">
-        <term><filename class='libraryfile'>libjpeg.{so,a}</filename></term>
-        <listitem>
-          <para>library is used by many programs for reading and writing
-          JPEG format files.</para>
-          <indexterm zone="libjpeg libjpeg-lib">
-            <primary sortas="c-libjpeg">libjpeg.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libmikmod.xml
===================================================================
--- archive/libmikmod.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY libmikmod-download-http "http://mikmod.raphnet.net/files/libmikmod-&libmikmod-version;.tar.gz">
-  <!ENTITY libmikmod-download-ftp  "&gentoo-ftp-repo;/libmikmod-&libmikmod-version;.tar.gz">
-  <!ENTITY libmikmod-md5sum        "705106da305e8de191549f1e7393185c">
-  <!ENTITY libmikmod-size          "604 KB">
-  <!ENTITY libmikmod-buildsize     "9.9 MB">
-  <!ENTITY libmikmod-time          "0.3 SBU">
-]>
-
-<sect1 id="libmikmod" xreflabel="libmikmod-&libmikmod-version;">
-  <?dbhtml filename="libmikmod.html"?>
-
-
-  <title>Libmikmod-&libmikmod-version;</title>
-
-  <indexterm zone="libmikmod">
-    <primary sortas="a-Libmikmod">Libmikmod</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libmikmod</title>
-
-    <para><application>libmikmod</application> is a sound library capable of
-    playing audio samples as well as tracker modules. Supported module formats
-    include MOD, S3M, XM, IT, MED, MTM and 669.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libmikmod-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libmikmod-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libmikmod-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libmikmod-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libmikmod-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libmikmod-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended Patch: <ulink
-        url="http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libmikmod Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="alsa"/>,
-    <xref linkend="esound"/>,
-    <ulink url="http://www.perex.cz/~perex/ultra/">libGUS</ulink>,
-    <ulink url="http://osalp.sourceforge.net/">AFlib</ulink> and
-    <ulink url="http://www.anime.net/~sam9407/">SAM9407 driver</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libmikmod"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libmikmod</title>
-
-    <para>Install <application>libmikmod</application> by running the
-    following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../libmikmod-3.1.11-a.diff &amp;&amp;
-sed -i -e "s/VERSION=10/VERSION=11/" \
-       -e "s/sys_asoundlib/alsa_asoundlib/" \
-       -e "s/snd_cards/snd_card_load/g" \
-       -e "s|sys/asoundlib.h|alsa/asoundlib.h|g" \
-       -e "s/^LIBOBJS/#LIBOBJS/" \
-    configure.in &amp;&amp;
-autoconf &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chmod 755 /usr/lib/libmikmod.so.2.0.4 &amp;&amp;
-install -v -m644 -D docs/mikmod.html \
-    /usr/share/doc/libmikmod-3.1.11/mikmod.html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e ...</command>: This increments the package micro
-    version and also modifies the <application>ALSA</application> header search
-    routine so that the package properly discovers the
-    <application>ALSA</application> library.  It also fixes a problem
-    which makes <application>autoconf</application> fail.</para>
-
-    <para><command>autoconf</command>: This generates a new
-    <command>configure</command> script, required because of the changes to
-    <filename>configure.in</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>libmikmod-config</seg>
-        <seg>libmikmod.{so,a}</seg>
-        <seg>/usr/share/doc/libmikmod-&libmikmod-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmikmod-config">
-        <term><command>libmikmod-config</command></term>
-        <listitem>
-          <para>provides version information, compiler, and linker flags
-          to programs that utilize <application>libmikmod</application>.</para>
-          <indexterm zone="libmikmod libmikmod-config">
-            <primary sortas="b-libmikmod-config">libmikmod-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmikmod-lib">
-        <term><filename class='libraryfile'>libmikmod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that are required to play various tracker module
-            files.</para>
-          <indexterm zone="libmikmod libmikmod-lib">
-            <primary sortas="c-libmikmod">libmikmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libmpeg3.xml
===================================================================
--- archive/libmpeg3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +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 libmpeg3-download-http "&sourceforge-repo;/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
-  <!ENTITY libmpeg3-download-ftp  " ">
-  <!ENTITY libmpeg3-md5sum        "a9d0d34e8941a4437eb8e7dfe559eca1">
-  <!ENTITY libmpeg3-size          "2.4 MB">
-  <!ENTITY libmpeg3-buildsize     "13 MB">
-  <!ENTITY libmpeg3-time          "0.1 SBU">
-]>
-
-<sect1 id="libmpeg3" xreflabel="libMPEG3-&libmpeg3-version;">
-  <?dbhtml filename="libmpeg3.html"?>
-
-
-  <title>libMPEG3-&libmpeg3-version;</title>
-
-  <indexterm zone="libmpeg3">
-    <primary sortas="a-libMPEG3">libMPEG3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libMPEG3</title>
-
-    <para>
-      <application>libMPEG3</application> supports advanced
-      editing and manipulation of MPEG streams.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmpeg3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmpeg3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmpeg3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmpeg3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmpeg3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmpeg3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libmpeg3-&libmpeg3-version;-makefile_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libMPEG3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liba52"/> and
-      <xref linkend="NASM"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libmpeg3"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libMPEG3</title>
-
-    <para>
-      Install <application>libMPEG3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libmpeg3-&libmpeg3-version;-makefile_fixes-2.patch &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mpeg3cat, mpeg3dump, mpeg3peek and mpeg3toc
-        </seg>
-        <seg>
-           libmpeg3.{so,a}
-        </seg>
-        <seg>
-          /usr/include/audio and
-          /usr/include/video
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mpeg3cat">
-        <term><command>mpeg3cat</command></term>
-        <listitem>
-          <para>
-            concatenates elementary streams or demultiplexes a program
-            stream (separates components of the stream).
-          </para>
-          <indexterm zone="libmpeg3 mpeg3cat">
-            <primary sortas="b-mpeg3cat">mpeg3cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg3dump">
-        <term><command>mpeg3dump</command></term>
-        <listitem>
-          <para>
-            dumps information or extracts audio to a 24 bit PCM file.
-          </para>
-          <indexterm zone="libmpeg3 mpeg3dump">
-            <primary sortas="b-mpeg3dump">mpeg3dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg3peek">
-        <term><command>mpeg3peek</command></term>
-        <listitem>
-          <para>
-            prints the byte offset of a given frame. It only works for
-            video and requires a table of contents.
-          </para>
-          <indexterm zone="libmpeg3 mpeg3peek">
-            <primary sortas="b-mpeg3peek">mpeg3peek</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg3toc">
-        <term><command>mpeg3toc</command></term>
-        <listitem>
-          <para>
-            creates a table of contents for a DVD or MPEG stream.
-          </para>
-          <indexterm zone="libmpeg3 mpeg3toc">
-            <primary sortas="b-mpeg3toc">mpeg3toc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmpeg3-lib">
-        <term><filename class='libraryfile'>libmpeg3.{so,a}</filename></term>
-        <listitem>
-          <para>
-            decodes several MPEG standards into uncompressed data
-            suitable for editing and playback.
-          </para>
-          <indexterm zone="libmpeg3 libmpeg3-lib">
-            <primary sortas="c-libmpeg3">libmpeg3.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libmusicbrainz3.xml
===================================================================
--- archive/libmusicbrainz3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +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 libmusicbrainz3-download-http "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-&libmusicbrainz3-version;.tar.gz">
-  <!ENTITY libmusicbrainz3-download-ftp  " ">
-  <!ENTITY libmusicbrainz3-md5sum        "f4824d0a75bdeeef1e45cc88de7bb58a">
-  <!ENTITY libmusicbrainz3-size          "103 KB">
-  <!ENTITY libmusicbrainz3-buildsize     "9 MB">
-  <!ENTITY libmusicbrainz3-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libmusicbrainz3" xreflabel="libmusicbrainz3-&libmusicbrainz3-version;">
-  <?dbhtml filename="libmusicbrainz3.html"?>
-
-
-  <title>libmusicbrainz-&libmusicbrainz3-version;</title>
-
-  <indexterm zone="libmusicbrainz3">
-    <primary sortas="a-libmusicbrainz3">libmusicbrainz3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmusicbrainz</title>
-
-    <para>
-      The <application>libmusicbrainz</application> package contains a
-      library which allows you to access the data held on the MusicBrainz server.
-      This is useful for adding MusicBrainz lookup capabilities to other
-      applications.
-    </para>
-
-    <para>
-      <application>libmusicbrainz</application> version 3 is not backward
-      compatible with version 2.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmusicbrainz3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmusicbrainz3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmusicbrainz3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmusicbrainz3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmusicbrainz3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmusicbrainz3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmusicbrainz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="libdiscid"/> and
-      <xref linkend="neon"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://sourceforge.net/apps/mediawiki/cppunit/">
-      cppunit</ulink> (Required to run the test suite)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libmusicbrainz3"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmusicbrainz</title>
-
-    <para>
-      Install <application>libmusicbrainz</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=/usr . &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libmusicbrainz3.so
-        </seg>
-        <seg>
-          /usr/include/musicbrainz3
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmusicbrainz3-lib">
-        <term><filename class='libraryfile'>libmusicbrainz3.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions to access the MusicBrainz database, both
-            for looking up data and also for submitting new data.
-          </para>
-          <indexterm zone="libmusicbrainz3 libmusicbrainz3-lib">
-            <primary sortas="c-libmusicbrainz3">libmusicbrainz3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libnfsidmap.xml
===================================================================
--- archive/libnfsidmap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,167 +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"?>
-
-
-  <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: chive/libnftnl.xml
===================================================================
--- archive/libnftnl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 libnftnl-download-http "https://netfilter.org/projects/libnftnl/files/libnftnl-&libnftnl-version;.tar.bz2">
-  <!ENTITY libnftnl-download-ftp  " ">
-  <!ENTITY libnftnl-md5sum        "a72ae260f7da9c223ad5d4fa036a8f84">
-  <!ENTITY libnftnl-size          "368 KB">
-  <!ENTITY libnftnl-buildsize     "8.7 MB">
-  <!ENTITY libnftnl-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libnftnl" xreflabel="libnftnl-&libnftnl-version;">
-  <?dbhtml filename="libnftnl.html"?>
-
-
-  <title>libnftnl-&libnftnl-version;</title>
-
-  <indexterm zone="libnftnl">
-    <primary sortas="a-libnftnl">libnftnl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnftnl</title>
-
-    <para>
-      The <application>libnftnl</application> library provides a low-level
-      netlink programming interface (API) to the in-kernel nf_tables subsystem.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnftnl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnftnl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnftnl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnftnl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnftnl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnftnl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnftnl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libmnl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libnftnl"/>
-    </para>
-  </sect2>
-
-    <sect2 role="kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </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; Netfilter nf_tables support [CONFIG_NF_TABLES]</literal></screen>
-
-    </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnftnl</title>
-
-    <para>
-      Install <application>libnftnl</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                   &amp;&amp;
-mv /usr/lib/libnftnl.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libnftnl.so) /usr/lib/libnftnl.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mv -v /usr/lib/libnftnl.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>
-          libnftnl.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnftnl-lib">
-        <term><filename class="libraryfile">libnftnl.so</filename></term>
-        <listitem>
-          <para>
-            provides a netlink interface to the in-kernel nf_tables subsystem.
-          </para>
-          <indexterm zone="libnftnl libnftnl-lib">
-            <primary sortas="c-libnftnl">libnftnl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libnice.xml
===================================================================
--- archive/libnice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,212 +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 libnice-download-http
-           "http://nice.freedesktop.org/releases/libnice-&libnice-version;.tar.gz">
-  <!ENTITY libnice-download-ftp  " ">
-  <!ENTITY libnice-md5sum        "ed74abea19b3f049baf095f137388f2a">
-  <!ENTITY libnice-size          "808 KB">
-  <!ENTITY libnice-buildsize     "35 MB">
-  <!ENTITY libnice-time          "1.6 SBU">
-]>
-
-<sect1 id="libnice" xreflabel="libnice-&libnice-version;">
-  <?dbhtml filename="libnice.html"?>
-
-
-  <title>libnice-&libnice-version;</title>
-
-  <indexterm zone="libnice">
-    <primary sortas="a-libnice">libnice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnice</title>
-
-    <para>
-      The <application>libnice</application> package is an implementation of
-      the IETF's draft Interactive Connectivity Establishment standard (ICE). It
-      provides <application>GLib</application>-based library,
-      <application>libnice</application> and <application>GStreamer</application>,
-      elements.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk-doc"/>, and
-      <ulink url="https://wiki.gnome.org/action/show/Projects/GUPnP">gupnp-igd</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libnice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnice</title>
-
-    <para>
-      Install <application>libnice</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --without-gstreamer-0.10 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      Note that two tests, test-io-stream-thread and
-      test-io-stream-pollable, may fail due to test harness
-      timing issues.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--without-gstreamer-0.10</option>: This switch disables
-      building of the <application>GStreamer</application> 0.10 plugins
-      which are not necessary for anything in BLFS. Remove it if you
-      have installed <xref linkend="gst-plugins-base"/>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          stunbdc and stund
-        </seg>
-        <seg>
-          libnice.so and libgstnice.so
-          (<application>GStreamer</application> Plugin)
-        </seg>
-        <seg>
-          /usr/include/nice,
-          /usr/include/stun, and
-          /usr/share/gtk-doc/html/libnice
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="stunbdc">
-        <term><command>stunbdc</command></term>
-        <listitem>
-          <para>
-            performs Session Traversal for NAT (STUN) Binding Discovery.
-          </para>
-          <indexterm zone="libnice stunbdc">
-            <primary sortas="b-stunbdc">stunbdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stund">
-        <term><command>stund</command></term>
-        <listitem>
-          <para>
-            is a Session Traversal for NAT (STUN) daemon.
-          </para>
-          <indexterm zone="libnice stund">
-            <primary sortas="b-stund">stund</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnice-lib">
-        <term><filename class="libraryfile">libnice.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libnice</application> API functions.
-          </para>
-          <indexterm zone="libnice libnice-lib">
-            <primary sortas="c-libnice">libnice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/liboil.xml
===================================================================
--- archive/liboil.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +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 liboil-download-http "http://liboil.freedesktop.org/download/liboil-&liboil-version;.tar.gz">
-  <!ENTITY liboil-download-ftp  " ">
-  <!ENTITY liboil-md5sum        "47dc734f82faeb2964d97771cfd2e701">
-  <!ENTITY liboil-size          "912 KB">
-  <!ENTITY liboil-buildsize     "34 MB">
-  <!ENTITY liboil-time          "0.5 SBU">
-]>
-
-<sect1 id="liboil" xreflabel="liboil-&liboil-version;">
-  <?dbhtml filename="liboil.html"?>
-
-
-  <title>liboil-&liboil-version;</title>
-
-  <indexterm zone="liboil">
-    <primary sortas="a-liboil">liboil</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liboil</title>
-
-    <para><application>Liboil</application> is a library of simple
-    functions that are optimized for various CPUs.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&liboil-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&liboil-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &liboil-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &liboil-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &liboil-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &liboil-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liboil Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pkgconfig"/> and
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/liboil"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liboil</title>
-
-    <para>Install <application>liboil</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>oil-bugreport</seg>
-        <seg>liboil-0.3{so,a}</seg>
-        <seg>/usr/include/liboil-0.3 and
-        /usr/share/gtk-doc/html/liboil</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="oil-bugreport">
-        <term><command>oil-bugreport</command></term>
-        <listitem>
-          <para>prints out API function stats.</para>
-          <indexterm zone="liboil oil-bugreport">
-            <primary sortas="b-oil-bugreport">oil-bugreport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liboil-0.3">
-        <term><filename class='libraryfile'>liboil-0.3.{so,a}</filename></term>
-        <listitem>
-          <para>contains the liboil API functions.</para>
-          <indexterm zone="liboil liboil-0.3">
-            <primary sortas="c-liboil-0.3">liboil-0.3.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libosinfo.xml
===================================================================
--- archive/libosinfo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,220 +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 libosinfo-download-http
-           "https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-&libosinfo-version;.tar.gz">
-  <!ENTITY libosinfo-download-ftp  " ">
-  <!ENTITY libosinfo-md5sum        "2af9ba79b3f202032be45d2e6ed7b6e1">
-  <!ENTITY libosinfo-size          "964 KB">
-  <!ENTITY libosinfo-buildsize     "15 MB">
-  <!ENTITY libosinfo-time          "0.2 SBU">
-]>
-
-<sect1 id="libosinfo" xreflabel="libosinfo-&libosinfo-version;">
-  <?dbhtml filename="libosinfo.html"?>
-
-
-  <title>libosinfo-&libosinfo-version;</title>
-
-  <indexterm zone="libosinfo">
-    <primary sortas="a-libosinfo">libosinfo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libosinfo</title>
-
-    <para>
-      The <application>libosinfo</application> package is a GObject
-      based library for managing information about operating systems,
-      hypervisors and the (virtual) hardware devices they can support.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libosinfo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libosinfo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libosinfo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libosinfo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libosinfo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libosinfo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libosinfo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup"/> (built with GNOME components).
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="check"/> (required for the test suite) and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libosinfo"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libosinfo</title>
-
-    <para>
-      Install <application>libosinfo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala</option>: This option 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/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          osinfo-db-validate, osinfo-detect and osinfo-query
-        </seg>
-        <seg>
-          libosinfo-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libosinfo-1.0,
-          /usr/share/gtk-doc/html/Libosinfo and
-          /usr/share/libosinfo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="osinfo-db-validate">
-        <term><command>osinfo-db-validate</command></term>
-        <listitem>
-          <para>
-            is used to check if all XML files comply with
-            the libosinfo schema.
-          </para>
-          <indexterm zone="libosinfo osinfo-db-validate">
-            <primary sortas="b-osinfo-db-validate">osinfo-db-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osinfo-detect">
-        <term><command>osinfo-detect</command></term>
-        <listitem>
-          <para>
-            is used to examine the "PATH" or "URI" to
-            determine what (if any) operating system it
-            is for, and whether it is installable or is
-            a Live image.
-          </para>
-          <indexterm zone="libosinfo osinfo-detect">
-            <primary sortas="b-osinfo-detect">osinfo-detect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osinfo-query">
-        <term><command>osinfo-query</command></term>
-        <listitem>
-          <para>
-            is used to extract information from the database.
-          </para>
-          <indexterm zone="libosinfo osinfo-query">
-            <primary sortas="b-osinfo-query">osinfo-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libosinfo-1.0">
-        <term><filename class="libraryfile">libosinfo-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the libosinfo API functions.
-          </para>
-          <indexterm zone="libosinfo libosinfo-1.0">
-            <primary sortas="c-libosinfo-1.0">libosinfo-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libproxy.xml
===================================================================
--- archive/libproxy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +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 libproxy-download-http "http://libproxy.googlecode.com/files/libproxy-&libproxy-version;.tar.gz">
-  <!ENTITY libproxy-download-ftp  " ">
-  <!ENTITY libproxy-md5sum        "509e03a488a61cd62bfbaf3ab6a2a7a5">
-  <!ENTITY libproxy-size          "89 KB">
-  <!ENTITY libproxy-buildsize     "23 MB">
-  <!ENTITY libproxy-time          "0.2 SBU">
-]>
-
-<sect1 id="libproxy" xreflabel="libproxy-&libproxy-version;">
-  <?dbhtml filename="libproxy.html"?>
-
-
-  <title>libproxy-&libproxy-version;</title>
-
-  <indexterm zone="libproxy">
-    <primary sortas="a-libproxy">libproxy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libproxy</title>
-
-    <para>The <application>libproxy</application> package is a library that
-    provides automatic proxy configuration management. This is useful in
-    standardizing a way of dealing with proxy settings across all
-    scenarios.</para>
-
-    &lfs71_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libproxy-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libproxy-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libproxy-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libproxy-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libproxy-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libproxy-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libproxy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="cmake"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="GConf"/> (Required if building <application>GNOME</application>)</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="x-window-system"/>,
-    <xref linkend="python2"/>,
-      <ulink url="https://developer.mozilla.org/en/XULRunner">xulrunner</ulink>,
-    <xref linkend="webkitgtk"/> (built with <application>gtk+-2</application>) or
-    <ulink url="http://webkit.org/">WebKit</ulink>, and
-    <xref linkend="NetworkManager"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libproxy"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libproxy</title>
-
-    <note><para>Many messages are produced by <command>tar</command> when
-    extracting this package similar to:
-    <code>[ tar: Ignoring unknown extended header keyword `SCHILY.dev' ]</code>.
-    They can be ignored.</para></note>
-
-    <para>Install <application>libproxy</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i 's@cx, 1, \&amp;arg@cx, arg, vp@' \
-    libproxy/modules/pacrunner_mozjs.cpp &amp;&amp;
-cmake -DCMAKE_INSTALL_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>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i...libproxy/modules/pacrunner_mozjs.cpp</command>:
-    This command fixes a build issue with recent xulrunner.</para>
-
-    <para><option>-DWITH_GNOME3=ON</option>: This option builds the GNOME
-    configuration plugin.</para>
-
-    <para><option>-DWITH_KDE4=ON</option>: This option builds the KDE configuration
-    plugin.</para>
-
-    <para><option>-DWITH_WEBKIT=ON</option>: This option builds the WebKit
-    JavaScriptCore PAC runner plugin.</para>
-
-    <para><option>-DWITH_MOZJS=ON</option>: This option builds the Mozilla
-    JavaScript PAC runner plugin.</para>
-
-    <para><option>-DWITH_NM=ON</option>: This option builds the
-    NetworkManager plugin.</para>
-
-    <para><option>-DWITH_PYTHON=ON</option>: This option builds the Python
-    bindings.</para>
-
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>proxy</seg>
-        <seg>libproxy.{so,a}, and various
-        <application>libproxy</application> plugins</seg>
-        <seg>/usr/lib/libproxy/&libproxy-version;/plugins</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="proxy">
-        <term><command>proxy</command></term>
-        <listitem>
-          <para>is a sample interactive program which lists an array of
-          proxies to use based on a url typed.</para>
-          <indexterm zone="libproxy proxy">
-            <primary sortas="b-proxy">proxy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libproxy-lib">
-        <term><filename class='libraryfile'>libproxy.so</filename></term>
-        <listitem>
-          <para>contains the <application>libproxy</application> API functions.</para>
-          <indexterm zone="libproxy libproxy-lib">
-            <primary sortas="c-libproxy">libproxy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/librep.xml
===================================================================
--- archive/librep.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +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 librep-download-http "https://download.tuxfamily.org/librep/librep_&librep-version;.tar.xz">
-  <!ENTITY librep-download-ftp " ">
-  <!ENTITY librep-md5sum "036195b371006848e29ed6f50ddc8475">
-  <!ENTITY librep-size "840 KB">
-  <!ENTITY librep-buildsize "10 MB">
-  <!ENTITY librep-time "0.3 SBU">
-]>
-
-<sect1 id="librep" xreflabel="librep-&librep-version;">
-  <?dbhtml filename="librep.html" ?>
-
-
-  <title>Librep-&librep-version;</title>
-
-  <indexterm zone="librep">
-    <primary sortas="a-Librep">Librep</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Librep</title>
-
-    <para>
-      The <application>librep</application> package contains a Lisp system.
-      This is useful for scripting or for applications that may use the Lisp
-      interpreter as an extension language.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&librep-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&librep-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &librep-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &librep-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &librep-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &librep-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Librep Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libffi"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Librep</title>
-
-    <para>
-      Install <application>librep</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>sed -i '5043,5044 d' libtool &amp;&amp;
-make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rep, <!--rep-config, -->rep-remote, rep-xgettext, and repdoc</seg>
-        <seg>librep.so and numerous modules installed in the /usr/lib/rep
-        hierarchy</seg>
-        <seg>/usr/lib/rep, /usr/share/emacs/site-lisp, and /usr/share/rep</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rep">
-        <term><command>rep</command></term>
-        <listitem>
-          <para>
-            is the Lisp interpreter
-          </para>
-          <indexterm zone="librep rep">
-            <primary sortas="b-rep">rep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librep-lib">
-        <term><filename class="libraryfile">librep.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions necessary for the Lisp interpreter
-          </para>
-          <indexterm zone="librep librep-lib">
-            <primary sortas="c-librep">librep.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libsexy.xml
===================================================================
--- archive/libsexy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +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 libsexy-download-http "http://releases.chipx86.com/libsexy/libsexy/libsexy-&libsexy-version;.tar.bz2">
-  <!ENTITY libsexy-download-ftp  " ">
-  <!ENTITY libsexy-md5sum        "056b5d9d22941cdd881c7823e643d3a8">
-  <!ENTITY libsexy-size          "261 KB">
-  <!ENTITY libsexy-buildsize     "6 MB">
-  <!ENTITY libsexy-time          "0.2 SBU">
-]>
-
-<sect1 id="libsexy" xreflabel="libsexy-&libsexy-version;">
-  <?dbhtml filename="libsexy.html"?>
-
-
-  <title>libsexy-&libsexy-version;</title>
-
-  <indexterm zone="libsexy">
-    <primary sortas="a-libsexy">libsexy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsexy</title>
-
-    <para>The <application>libsexy</application> package is a collection of
-    <application>GTK+</application> widgets that extend the functionality of
-    such standard widgets as GtkEntry and GtkLabel by subclassing them and
-    working around the limitations of the widgets.</para>
-
-    &lfs70_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libsexy-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libsexy-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libsexy-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libsexy-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libsexy-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libsexy-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsexy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="iso-codes"/></para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional"><xref linkend="enchant"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libsexy"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsexy</title>
-
-    <para>Install <application>libsexy</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libsexy.{so,a}</seg>
-        <seg>/usr/{include/libsexy,share/gtk-doc/html/libsexy}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsexy-lib">
-        <term><filename class='libraryfile'>libsexy.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>libsexy</application> API
-          functions.</para>
-          <indexterm zone="libsexy libsexy-lib">
-            <primary sortas="c-libsexy">libsexy.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libsigc3.xml
===================================================================
--- archive/libsigc3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!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-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="libsigc3" xreflabel="libsigc3++-&libsigc3-version;">
-  <?dbhtml filename="libsigc3.html"?>
-
-
-  <title>libsigc++-&libsigc3-version;</title>
-
-  <indexterm zone="libsigc3">
-    <primary sortas="a-libsigc++3">libsigc++3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++3</title>
-
-    <para>
-      The <application>libsigc++3</application> package implements a typesafe
-      callback system for standard C++.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc3++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="doxygen"/>,
-      <ulink url="http://dblatex.sourceforge.net">dblatex</ulink>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libsigc++3"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++3</title>
-
-    <para>
-      Install <application>libsigc++3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &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>-Dbuild_documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </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>
-          libsigc-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-3.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-3.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-3">
-        <term><filename class="libraryfile">libsigc-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libsigc++3</application> API functions
-          </para>
-          <indexterm zone="libsigc3 libsigc-3">
-            <primary sortas="c-libsigc-3">libsigc-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libtheora.xml
===================================================================
--- archive/libtheora.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +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 libtheora-download-http "https://downloads.xiph.org/releases/theora/libtheora-&libtheora-version;.tar.xz">
-  <!ENTITY libtheora-download-ftp  " ">
-  <!ENTITY libtheora-md5sum        "9eeabf1ad65b7f41533854a59f7a716d">
-  <!ENTITY libtheora-size          "1.4 MB">
-  <!ENTITY libtheora-buildsize     "13.4 MB (without static libs or API docs and without installing the examples)">
-  <!ENTITY libtheora-time          "0.2 SBU">
-]>
-
-<sect1 id="libtheora" xreflabel="libtheora-&libtheora-version;">
-  <?dbhtml filename="libtheora.html"?>
-
-
-  <title>libtheora-&libtheora-version;</title>
-
-  <indexterm zone="libtheora">
-    <primary sortas="a-Libtheora">Libtheora</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtheora</title>
-
-    <para>
-      <application>libtheora</application> is a reference implementation of the
-      Theora video compression format being developed by the Xiph.Org
-      Foundation.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtheora-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtheora-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtheora-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtheora-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtheora-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtheora-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libtheora Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libogg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libvorbis"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sdl"/> and
-      <xref linkend="libpng"/> (both to build the example players),
-      <xref linkend="doxygen"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <ulink url="https://bibtexml.sourceforge.net">BibTex</ulink>, and
-      <ulink url="https://mcj.sourceforge.net/">Transfig</ulink>
-      (all four to build the API documentation), and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtheora</title>
-
-    <para>
-      Install <application>libtheora</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you wish to install the examples (so that you can hack on
-      <literal>theora</literal>), install them as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cd examples/.libs &amp;&amp;
-for E in *; do
-  install -v -m755 $E /usr/bin/theora_${E}
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c</command>:
-      This <command>sed</command> fixes build with
-      <application>libpng</application> 1.6.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None, unless you installed the examples</seg>
-        <seg>libtheora.so, libtheoraenc.so, and
-        libtheoradec.so</seg>
-        <seg>/usr/include/theora and /usr/share/doc/libtheora-&libtheora-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtheora-lib">
-        <term><filename class="libraryfile">libtheora*.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions to read and write video files
-          </para>
-          <indexterm zone="libtheora libtheora-lib">
-            <primary sortas="c-libtheora">libtheora*.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libuninameslist.xml
===================================================================
--- archive/libuninameslist.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,145 +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 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        "19ee2fd3ccb1a1868b2799dff7a63bf1">
-  <!ENTITY libuninameslist-size          "1.2 MB">
-  <!ENTITY libuninameslist-buildsize     "14 MB (with tests)">
-  <!ENTITY libuninameslist-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libuninameslist" xreflabel="libuninameslist-&libuninameslist-version;">
-  <?dbhtml filename="libuninameslist.html"?>
-
-
-  <title>libuninameslist-&libuninameslist-version;</title>
-
-  <indexterm zone="libuninameslist">
-    <primary sortas="a-libuninameslist">libuninameslist</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libuninameslist</title>
-
-    <para>
-      <application>Libuninameslist</application> provides a Library of Unicode
-       names and annotation data
-    </para>
-
-    &lfs111_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libuninameslist-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libuninameslist-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libuninameslist-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libuninameslist-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libuninameslist-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libuninameslist-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libuninameslist"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libuninameslist</title>
-
-    <para>
-      Install <application>libuninameslist</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option> --enable-frenchlib</option>: This option adds a library of french
-      translations of the names and attributes, libuninameslist-fr.so.
-    </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>
-          libuninameslist.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libuninameslist-lib">
-        <term><filename class="libraryfile">libuninameslist.so</filename></term>
-        <listitem>
-          <para>
-            provides a library of Unicode names and annotation data
-          </para>
-          <indexterm zone="libuninameslist libuninameslist-lib">
-            <primary sortas="c-libuninameslist">libuninameslist.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/libunique.xml
===================================================================
--- archive/libunique.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +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 libunique-download-http "&gnome-download-http;/libunique/1.1/libunique-&libunique-version;.tar.bz2">
-  <!ENTITY libunique-download-ftp  "&gnome-download-ftp;/libunique/1.1/libunique-&libunique-version;.tar.bz2">
-  <!ENTITY libunique-md5sum        "7955769ef31f1bc4f83446dbb3625e6d">
-  <!ENTITY libunique-size          "328 KB">
-  <!ENTITY libunique-buildsize     "7.0 MB">
-  <!ENTITY libunique-time          "0.2 SBU">
-]>
-
-<sect1 id="libunique" xreflabel="libunique-&libunique-version;">
-  <?dbhtml filename="libunique.html"?>
-
-
-  <title>libunique-&libunique-version;</title>
-
-  <indexterm zone="libunique">
-    <primary sortas="a-libunique">libunique</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunique</title>
-
-    <para>
-      The <application>libunique</application> package contains a
-      library for writing single instance applications.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunique-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunique-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunique-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunique-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunique-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunique-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libunique-&libunique-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunique Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>, also
-      <xref linkend="gtk-doc"/> (for autoreconf)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> <!--and
-      <xref linkend="gtk-doc"/>-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunique</title>
-
-    <para>
-      Install <application>libunique</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libunique-&libunique-version;-upstream_fixes-1.patch &amp;&amp;
-autoreconf -fi &amp;&amp;
-
-./configure --prefix=/usr  \
-            --disable-dbus \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-dbus</parameter>: This switch disables
-      <application>D-Bus</application> backend in favor of
-      the GDBus backend.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libunique-1.0.so
-        </seg>
-        <seg>
-          /usr/include/unique-1.0 and
-          /usr/share/gtk-doc/html/unique
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunique-1">
-        <term><filename class="libraryfile">libunique-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libunique</application> API functions
-            for single instance support
-          </para>
-          <indexterm zone="libunique libunique-1">
-            <primary sortas="c-libunique-1">libunique-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libusb-compat.xml
===================================================================
--- archive/libusb-compat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 libusb-compat-download-http "&sourceforge-dl;/libusb/libusb-compat-&libusb-compat-version;.tar.bz2">
-  <!ENTITY libusb-compat-download-ftp  " ">
-  <!ENTITY libusb-compat-md5sum        "2780b6a758a1e2c2943bdbf7faf740e4">
-  <!ENTITY libusb-compat-size          "276 KB">
-  <!ENTITY libusb-compat-buildsize     "2.4 MB">
-  <!ENTITY libusb-compat-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libusb-compat" xreflabel="libusb-compat-&libusb-compat-version;">
-  <?dbhtml filename="libusb-compat.html"?>
-
-
-  <title>libusb-compat-&libusb-compat-version;</title>
-
-  <indexterm zone="libusb-compat">
-    <primary sortas="a-libusb-compat">libusb-compat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libusb-compat</title>
-
-    <para>
-      The <application>libusb-compat</application> package aims to look,
-      feel and behave exactly like <application>libusb-0.1</application>. It is a
-      compatibility layer needed by packages that have not been upgraded to the
-      <application>libusb-1.0</application> API.
-    </para>
-
-    &lfs83_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libusb-compat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libusb-compat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libusb-compat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libusb-compat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libusb-compat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libusb-compat-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libusb-compat Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libusb"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libusb-compat"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libusb-compat</title>
-
-    <para>
-      Install <application>libusb-compat</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>libusb-config</seg>
-        <seg>libusb.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libusb-config">
-        <term><command>libusb-config</command></term>
-        <listitem>
-          <para>
-           determines the compile and linker flags that should be used to compile
-           and link programs that use <filename class='libraryfile'>libusb</filename>.
-          </para>
-          <indexterm zone="libusb-compat libusb-config">
-            <primary sortas="b-libusb-config">libusb-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libusb-compat-lib">
-        <term><filename class='libraryfile'>libusb.so</filename></term>
-        <listitem>
-          <para>
-            is a library that is compatible with
-            <application>libusb-0.1</application>, but uses
-            <application>libusb-1.0</application> to provide functionality.
-          </para>
-          <indexterm zone="libusb-compat libusb-compat-lib">
-            <primary sortas="c-libusb-compat">libusb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libvirt-glib.xml
===================================================================
--- archive/libvirt-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +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 libvirt-glib-download-http
-           "http://libvirt.org/sources/glib/libvirt-glib-&libvirt-glib-version;.tar.gz">
-  <!ENTITY libvirt-glib-download-ftp  " ">
-  <!ENTITY libvirt-glib-md5sum        "cc0913fdf1011558e81e7de4b00c7d1f">
-  <!ENTITY libvirt-glib-size          "636 KB">
-  <!ENTITY libvirt-glib-buildsize     "16 MB">
-  <!ENTITY libvirt-glib-time          "0.4 SBU">
-]>
-
-<sect1 id="libvirt-glib" xreflabel="libvirt-glib-&libvirt-glib-version;">
-  <?dbhtml filename="libvirt-glib.html"?>
-
-
-  <title>libvirt-glib-&libvirt-glib-version;</title>
-
-  <indexterm zone="libvirt-glib">
-    <primary sortas="a-libvirt-glib">libvirt-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libvirt-glib</title>
-
-    <para>
-      The <application>libvirt-glib</application> package wraps libvirt
-      to provide a high-level object-oriented API better suited for
-      glib-based applications.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvirt-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvirt-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvirt-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvirt-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvirt-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvirt-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libvirt-glib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libvirt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </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;/libvirt-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libvirt-glib</title>
-
-    <para>
-      Install <application>libvirt-glib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala</option>: This option 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/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libvirt-gconfig-1.0.so, libvirt-glib-1.0.so,
-          libvirt-gobject-1.0.so and
-          libvirtglibmod.so (Python Module)
-        </seg>
-        <seg>
-          /usr/include/{libvirt-gconfig-1.0,libvirt-glib-1.0,libvirt-gobject-1.0} and
-          /usr/share/gtk-doc/html/{Libvirt-gconfig,Libvirt-glib,Libvirt-gobject}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvirt-glib-lib">
-        <term><filename class="libraryfile">libvirt-g*.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libvirt-glib</application> API functions.
-          </para>
-          <indexterm zone="libvirt-glib libvirt-glib-lib">
-            <primary sortas="c-libvirt-glib">libvirt-g*.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libvirt.xml
===================================================================
--- archive/libvirt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,276 +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 libvirt-download-http "http://libvirt.org/sources/libvirt-&libvirt-version;.tar.gz">
-  <!ENTITY libvirt-download-ftp  " ">
-  <!ENTITY libvirt-md5sum        "5e842bc55733ceba60c64767580ff3e4">
-  <!ENTITY libvirt-size          "19 MB">
-  <!ENTITY libvirt-buildsize     "240 MB">
-  <!ENTITY libvirt-time          "1.6 SBU">
-]>
-
-<sect1 id="libvirt" xreflabel="libvirt-&libvirt-version;">
-  <?dbhtml filename="libvirt.html"?>
-
-
-  <title>libvirt-&libvirt-version;</title>
-
-  <indexterm zone="libvirt">
-    <primary sortas="a-libvirt">libvirt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libvirt</title>
-
-    <para>
-      The <application>libvirt</application> is a C toolkit
-      used to interact with the virtualization capabilities
-      of recent versions of Linux (and other OSes).
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvirt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvirt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvirt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvirt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvirt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvirt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libvirt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="lvm2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">
-      libcap-ng</ulink>,
-      <xref linkend="libnl"/>,
-      <ulink url="http://oss.sgi.com/projects/libnuma/">
-      libnuma</ulink>,
-      <xref linkend="libpcap"/>,
-      <ulink url="http://www.libssh2.org/">libssh2</ulink>,
-      <ulink url="https://fedorahosted.org/netcf/">NetCF</ulink>,
-      <ulink url="http://www.open-iscsi.org/">Open iSCSI</ulink>,
-      <ulink url="http://www.openswan.org/projects/openswan/">
-      OpenSwan</ulink>,
-      <xref linkend="parted"/>,
-      <xref linkend="qemu-kvm"/>,
-      <ulink url="https://www.virtualbox.org/">VirtualBox</ulink>,
-      <ulink url="http://www.xen.org/">Xen</ulink>,
-      <xref linkend="xorg7-lib"/> and
-      <ulink url="http://lloyd.github.com/yajl/">YAYL</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libvirt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libvirt</title>
-
-    <para>
-      Install <application>libvirt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/libvirt \
-            --with-storage-lvm \
-            --without-macvtap \
-            --disable-static \
-            CPPFLAGS="-I/usr/include/tirpc -I/usr/include/libnl3" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-storage-lvm</option>: This option enables LVM storage backend.
-    </para>
-
-    <para>
-      <option>--without-macvtap</option>: This option disables macvtap device support.
-      Remove if you have installed <xref linkend="libnl"/>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libvirtd, virsh, virt-host-validate,
-          virt-pki-validate and virt-xml-validate
-        </seg>
-        <seg>
-          libvirt.so and libvirt-qemu.so
-        </seg>
-        <seg>
-          /etc/libvirt, /usr/include/libvirt, /usr/lib/libvirt,
-          /usr/share/augeas/lenses,
-          /usr/share/doc/{libvirt-0.9.11,libvirt-python-0.9.11},
-          /usr/share/gtk-doc/html/libvirt,
-          /usr/share/libvirt, /var/cache/libvirt, /var/lib/libvirt and
-          /var/log/libvirt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="libvirtd">
-        <term><command>libvirtd</command></term>
-        <listitem>
-          <para>
-            is the server side daemon component of the libvirt
-            virtualization management system.
-          </para>
-          <indexterm zone="libvirt libvirtd">
-            <primary sortas="b-libvirtd">libvirtd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virsh">
-        <term><command>virsh</command></term>
-        <listitem>
-          <para>
-            is the main interface for managing virsh guest domains.
-          </para>
-          <indexterm zone="libvirt virsh">
-            <primary sortas="b-virsh">virsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virt-host-validate">
-        <term><command>virt-host-validate</command></term>
-        <listitem>
-          <para>
-            This tool validates that the host is configured in
-            a suitable way to run libvirt hypervisor drivers.
-          </para>
-          <indexterm zone="libvirt virt-host-validate">
-            <primary sortas="b-virt-host-validate">virt-host-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virt-pki-validate">
-        <term><command>virt-pki-validate</command></term>
-        <listitem>
-          <para>
-            This tool validates that the necessary PKI files are
-            configured for a secure libvirt server or client
-            using the TLS encryption protocol.
-          </para>
-          <indexterm zone="libvirt virt-pki-validate">
-            <primary sortas="b-virt-pki-validate">virt-pki-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virt-xml-validate">
-        <term><command>virt-xml-validate</command></term>
-        <listitem>
-          <para>
-            is used to validate a libvirt XML for compliance with the
-            published schema.
-          </para>
-          <indexterm zone="libvirt virt-xml-validate">
-            <primary sortas="b-virt-xml-validate">virt-xml-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvirt-lib">
-        <term><filename class="libraryfile">libvirt.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libvirt</application> API functions.
-          </para>
-          <indexterm zone="libvirt libvirt-lib">
-            <primary sortas="c-libvirt">libvirt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libwpe.xml
===================================================================
--- archive/libwpe.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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        "61840e24ba0a0f5828194dff28db92ee">
-  <!ENTITY libwpe-size          "64 KB">
-  <!ENTITY libwpe-buildsize     "1.9 MB">
-  <!ENTITY libwpe-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libwpe" xreflabel="libwpe-&libwpe-version;">
-  <?dbhtml filename="libwpe.html"?>
-
-
-  <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>
-
-    &lfs121_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>
-
-  </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 setup --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: chive/libxfcegui4.xml
===================================================================
--- archive/libxfcegui4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 libxfcegui4-download-http
-           "http://archive.xfce.org/src/xfce/libxfcegui4/&xfce4-version;/libxfcegui4-&libxfcegui4-version;.tar.bz2">
-  <!ENTITY libxfcegui4-download-ftp  " ">
-  <!ENTITY libxfcegui4-md5sum        "4025b9d6811f051c914cdd700d437e61">
-  <!ENTITY libxfcegui4-size          "676 KB">
-  <!ENTITY libxfcegui4-buildsize     "29 MB">
-  <!ENTITY libxfcegui4-time          "0.3 SBU">
-]>
-
-<sect1 id="libxfcegui4" xreflabel="libxfcegui4-&libxfcegui4-version;">
-  <?dbhtml filename="libxfcegui4.html"?>
-
-
-  <title>libxfcegui4-&libxfcegui4-version;</title>
-
-  <indexterm zone="libxfcegui4">
-    <primary sortas="a-libxfcegui4">libxfcegui4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxfcegui4</title>
-
-    <para>
-      The <application>libxfcegui4</application> package provides the
-      basic GUI functions used by <application>Xfce</application>.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxfcegui4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxfcegui4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxfcegui4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxfcegui4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxfcegui4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxfcegui4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxfcegui4 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libglade"/> and
-      <xref linkend="libxfce4util"/>
-    </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;/libxfcegui4"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxfcegui4</title>
-
-    <para>
-      Install <application>libxfcegui4</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libxfcegui4.so and libxfce4.so
-        </seg>
-        <seg>
-          /usr/include/xfce4/libxfcegui4 and
-          /usr/share/gtk-doc/html/libxfcegui4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxfcegui4-lib">
-        <term><filename class="libraryfile">libxfcegui4.so</filename></term>
-        <listitem>
-          <para>
-            contains the basic GUI functions used by
-            <application>Xfce</application>.
-          </para>
-          <indexterm zone="libxfcegui4 libxfcegui4-lib">
-            <primary sortas="c-libxfcegui4">libxfcegui4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libxml2py2.xml
===================================================================
--- archive/libxml2py2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +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;
-
-  <!-- The download, md5sum, size entities need to match those used in libxml2.xml -->
-  <!ENTITY libxml2py2-download-http "https://download.gnome.org/sources/libxml2/2.10/libxml2-&libxml2-version;.tar.xz">
-  <!ENTITY libxml2py2-download-ftp  " ">
-  <!ENTITY libxml2py2-md5sum        "76808c467a58c31e2dbd511e71d5fd13">
-  <!ENTITY libxml2py2-size          "2.5 MB">
-  <!ENTITY libxml2py2-buildsize     "49 MB (2.3 MB installed)">
-  <!ENTITY libxml2py2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin libxml2py2 -->
-  <sect2 id="libxml2py2" xreflabel="libxml2-&libxml2-version; python2 module">
-
-    <title>libxml2-&libxml2-version; (for its Python2 module)</title>
-
-    <indexterm zone="libxml2py2">
-      <primary sortas="a-libxml2py2">libxml2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the libxml2 Python2 module</title>
-
-      <para>
-        These instructions provide the <application>Python2</application>
-        bindings for <application>libxml2</application>: the
-        <application>Python3</application> bindings are built as part of <xref
-        linkend="libxml2"/> and most packages in the book do not use these
-        bindings for the older <application>Python2</application>.
-      </para>
-
-      <para>
-        By building these bindings after <xref linkend="libxml2"/> has
-        been installed, there is no need to rebuild the time-consuming (if all
-        dependencies are used) main part of that package.
-      </para>
-
-      &lfs120_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libxml2py2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libxml2py2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libxml2py2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libxml2py2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libxml2py2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libxml2py2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libxml2 (Python2) Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxml2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libxml2 Python2 module</title>
-
-<!-- Editors note: Use \-\-root= instead of DESTDIR= when updating. -->
-
-      <para>
-        To build the <application>Python 2</application> module, run:
-      </para>
-
-<screen><userinput>./configure PYTHON=python2 &amp;&amp;
-cd python                  &amp;&amp;
-python2 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        as the
-        <systemitem class="username">root</systemitem> user run:
-      </para>
-
-<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Modules</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            drv_libxml2.py, libxml2.py
-          </seg>
-          <seg>
-            libxml2mod.so
-          </seg>
-          <seg>
-            None
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="drv_libxml2.py2">
-        <term><command>drv_libxml2.py</command></term>
-        <listitem>
-          <para>
-            is a SAX <application>Python2</application> driver for libxml2
-          </para>
-          <indexterm zone="libxml2py2 drv_libxml2.py2">
-            <primary sortas="b-drv_libxml2.py2">drv_libxml2.py for Python2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2.py2">
-        <term><command>libxml2.py</command></term>
-        <listitem>
-          <para>
-            is the <application>Python2</application> binding for libxml2
-          </para>
-          <indexterm zone="libxml2py2 libxml2.py2">
-            <primary sortas="b-libxml2.py2">libxml2.py for Python2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2mod2">
-        <term><filename class="libraryfile">libxml2mod.so</filename></term>
-        <listitem>
-          <para>
-            is the interface for <application>Python2</application>
-            to use <filename class="libraryfile">libxml2.so</filename>
-          </para>
-          <indexterm zone="libxml2py2 libxml2mod2">
-            <primary sortas="c-libxml2mod">libxml2mod.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: chive/libzeitgeist-2019.xml
===================================================================
--- archive/libzeitgeist-2019.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 libzeitgeist-download-http
-           "https://launchpad.net/libzeitgeist/0.3/&libzeitgeist-version;/+download/libzeitgeist-&libzeitgeist-version;.tar.gz">
-  <!ENTITY libzeitgeist-download-ftp  " ">
-  <!ENTITY libzeitgeist-md5sum        "d63a37295d01a58086d0d4ae26e604c2">
-  <!ENTITY libzeitgeist-size          "516 KB">
-  <!ENTITY libzeitgeist-buildsize     "7.0 MB">
-  <!ENTITY libzeitgeist-time          "0.1 SBU">
-]>
-
-<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;" revision="systemd">
-  <?dbhtml filename="libzeitgeist.html"?>
-
-
-  <title>libzeitgeist-&libzeitgeist-version;</title>
-
-  <indexterm zone="libzeitgeist">
-    <primary sortas="a-libzeitgeist">libzeitgeist</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libzeitgeist</title>
-
-    <para>
-      The <application>libzeitgeist</application> package contains a client
-      library used to access and manage the Zeitgeist event log from
-      languages such as C and Vala. Zeitgeist is a service which logs
-      the user's activities and events (files opened, websites visited,
-      conversations hold with other people, etc.) and makes the relevant
-      information available to other applications.
-    </para>
-
-    &lfs83_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libzeitgeist-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libzeitgeist-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libzeitgeist-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libzeitgeist-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libzeitgeist-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libzeitgeist-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libzeitgeist Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </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;/libzeitgeist"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libzeitgeist</title>
-
-    <para>
-      Install <application>libzeitgeist</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i  "s|/doc/libzeitgeist|&amp;-&libzeitgeist-version;|" Makefile.in &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... Makefile.in</command>:  PLace the documentation in 
-      a versioned directory.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libzeitgeist-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libzeitgeist-1.0 and
-          /usr/share/doc/libzeitgeist
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libzeitgeist-1">
-        <term><filename class="libraryfile">libzeitgeist-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libzeitgeist</application> API functions.
-          </para>
-          <indexterm zone="libzeitgeist libzeitgeist-1">
-            <primary sortas="c-libzeitgeist-1">libzeitgeist-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/libzeitgeist.xml
===================================================================
--- archive/libzeitgeist.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 libzeitgeist-download-http
-           "https://launchpad.net/libzeitgeist/0.3/&libzeitgeist-version;/+download/libzeitgeist-&libzeitgeist-version;.tar.gz">
-  <!ENTITY libzeitgeist-download-ftp  " ">
-  <!ENTITY libzeitgeist-md5sum        "d63a37295d01a58086d0d4ae26e604c2">
-  <!ENTITY libzeitgeist-size          "516 KB">
-  <!ENTITY libzeitgeist-buildsize     "7.0 MB">
-  <!ENTITY libzeitgeist-time          "0.1 SBU">
-]>
-
-<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;">
-  <?dbhtml filename="libzeitgeist.html"?>
-
-
-  <title>libzeitgeist-&libzeitgeist-version;</title>
-
-  <indexterm zone="libzeitgeist">
-    <primary sortas="a-libzeitgeist">libzeitgeist</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libzeitgeist</title>
-
-    <para>
-      The <application>libzeitgeist</application> package contains a client
-      library used to access and manage the Zeitgeist event log from
-      languages such as C and Vala. Zeitgeist is a service which logs
-      the user's activities and events (files opened, websites visited,
-      conversations hold with other people, etc.) and makes the relevant
-      information available to other applications.
-    </para>
-
-    &lfs77_checked; &gcc5_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libzeitgeist-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libzeitgeist-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libzeitgeist-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libzeitgeist-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libzeitgeist-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libzeitgeist-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libzeitgeist Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </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;/libzeitgeist"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libzeitgeist</title>
-
-    <para>
-      Install <application>libzeitgeist</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i  "s|/doc/libzeitgeist|&amp;-&libzeitgeist-version;|" Makefile.in &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... Makefile.in</command>:  PLace the documentation in
-      a versioned directory.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libzeitgeist-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libzeitgeist-1.0 and
-          /usr/share/doc/libzeitgeist
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libzeitgeist-1">
-        <term><filename class="libraryfile">libzeitgeist-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libzeitgeist</application> API functions.
-          </para>
-          <indexterm zone="libzeitgeist libzeitgeist-1">
-            <primary sortas="c-libzeitgeist-1">libzeitgeist-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/llvm3.xml
===================================================================
--- archive/llvm3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,249 +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;
-
-  <!-- for the moment, this is internally llvm-old but visibly llvm3
-   so that when rust eventually understands a less-old version the
-   visible fields, and the page itself, can be moved to that newer
-   number -->
-  <!ENTITY llvm-old-download-http "http://llvm.org/releases/&llvm-old-version;/llvm-&llvm-old-version;.src.tar.xz">
-  <!ENTITY llvm-old-download-ftp  " ">
-  <!ENTITY llvm-old-md5sum        "3259018a7437e157f3642df80f1983ea">
-  <!ENTITY llvm-old-size          "18 MB">
-  <!ENTITY llvm-old-buildsize     "663 MB (112 MB installed) plus 101 MB for the testsuite">
-  <!ENTITY llvm-old-time          "6.9 SBU (plus 1.8 SBU for the testsuite, both with parallelism=4)">
-]>
-
-<sect1 id="llvm-old" xreflabel="LLVM-&llvm-old-version;">
-  <?dbhtml filename="llvm-old.html"?>
-
-
-  <title>LLVM-&llvm-old-version;</title>
-
-  <indexterm zone="llvm-old">
-    <primary sortas="a-llvm3">LLVM3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to llvm3</title>
-
-    <para>
-      This is an old version of <application>llvm</application>, installed
-      in /opt so that <xref linkend="rust"/> can use it. For normal use you
-      should install <xref linkend="llvm"/>.
-    </para>
-
-    <para>
-      This version of the <application>LLVM</application> package contains old
-      versions of the libraries, using the API which
-      <application>Rust</application> expects. Although <xref linkend="rust"/>
-      ships with a version of LLVM-3.9 and will build and link to it statically,
-      its <application>rustbuild</application> build-system will always compile
-      a large number of cross-compilers for different architectures. Using a
-      separate LLVM avoids that.
-    </para>
-
-    <para>
-      By using a separate <application>LLVM-3.9.1</application> it will be
-      possible to save time when upgrading <application>Rust</application> (the
-      overall time for the first build will be similar both with and without
-      separate <application>LLVM-3.9.1</application>).
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&llvm-old-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&llvm-old-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &llvm-old-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &llvm-old-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &llvm-old-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &llvm-old-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">llvm3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="libffi"/> (if you force this to be
-      used, the build of <xref linkend="rust"/> will need to be altered)
-      <xref linkend="libxml2"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="valgrind"/>,
-      <xref linkend="zip"/>,
-      <ulink url="http://www.ocaml.org/">OCaml</ulink>, and
-      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/llvm3"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of llvm3</title>
-
-    <para>
-      Install <application>llvm3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build                           &amp;&amp;
-cd       build                           &amp;&amp;
-
-CC=gcc CXX=g++                           \
-cmake -DCMAKE_INSTALL_PREFIX=/opt/llvm3  \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DLLVM_BUILD_LLVM_DYLIB=ON         \
-      -DLLVM_LINK_LLVM_DYLIB=ON          \
-      -DLLVM_TARGETS_TO_BUILD="host"     \
-      -DLLVM_INSTALL_UTILS=ON            \
-      -Wno-dev ..                        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check-all</command>. The tests
-      are run using the maximum number of processors/threads available, but the
-      main part of the added time is spent compiling the test programs. This
-      works fine with parallel make.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>echo "/opt/llvm3/lib" >> /etc/ld.so.conf &amp;&amp;
-make install                             &amp;&amp;
-/sbin/ldconfig                           &amp;&amp;
-ln -sfv /opt/llvm3/bin/FileCheck /usr/bin</userinput></screen>
-
-    <para>
-      Building the documentation for <emphasis>current</emphasis> LLVM is
-      covered in <xref linkend="llvm"/>, building docs for this old version
-      would be similar, but almost everyone who needs this old version will
-      also need the current version for <xref linkend="mesa"/> so it is
-      redundant to install the docs here.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DLLVM_INSTALL_UTILS_=ON</parameter>: This switch enables
-      the installation of old utility programs. Of those,
-      <application>rust</application> looks for <command>FileCheck</command>
-      when its configure checks for a system LLVM, the others are not used.
-    </para>
-
-    <para>
-      <parameter>/sbin/ldconfig</parameter>: This ensures the libraries can be
-      found.
-    </para>
-
-    <para>
-      <parameter>ln -sfv /opt/llvm3/bin/FileCheck /usr/bin</parameter>: This
-      ensures that FileCheck can be found by <application>rust</application>
-      even though <filename class="directory">/opt/llvm3/bin</filename> is not
-      on the PATH (having two versions of <application>LLVM</application>
-      generally available has been known to cause pain).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program(s)</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <seglistitem>
-        <seg>
-          bugpoint, count, FileCheck,
-          llc, lli, llvm-ar, llvm-as, llvm-bcanalyzer, llvm-config, llvm-cov,
-          llvm-c-test, llvm-cxxdump, llvm-diff, llvm-dis, llvm-dsymutil,
-          llvm-dwarfdump, llvm-dwp, llvm-extract, llvm-lib (symlink to
-          llvm-ar), llvm-link, llvm-lto, llvm-mc, llvm-mcmarkup, llvm-nm,
-          llvm-objdump, llvm-pdbdump, llvm-profdata, llvm-ranlib (symlink to
-          llvm-ar), llvm-readobj, llvm-rtdyld, llvm-size, llvm-split,
-          llvm-stress, llvm-symbolizer, llvm-tblgen, not, obj2yaml, opt, sancov,
-          sanstats, verify-uselistorder, yaml-bench and yaml2obj
-        </seg>
-        <seg>
-          BugpointPasses.so,  LLVMHello.so, libLLVM.so, libLLVM*.a (50
-          libraries), libLTO.so
-        </seg>
-        <seg>
-          /opt/llvm3
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="FileCheck">
-        <term><command>FileCheck</command></term>
-        <listitem>
-          <para>
-            reads two files (one from standard input,the other specified on the
-            command line) and uses one to verify the other.
-          </para>
-          <indexterm zone="llvm-old FileCheck">
-            <primary sortas="b-FileCheck">FileCheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>
-      For details of the other items in this package, see <xref linkend="llvm"/>.
-    </para>
-
-  </sect2>
-</sect1>
Index: chive/lprng.xml
===================================================================
--- archive/lprng.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,302 +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 LPRng-download-http "http://sourceforge.net/projects/lprng/files/lprng/LPRng-&LPRng-version;/LPRng-&LPRng-version;.tar.gz" >
-  <!ENTITY LPRng-download-ftp  " ">
-  <!ENTITY LPRng-md5sum        "74c384b262c490dee31d7e2fa28ecf1d">
-  <!ENTITY LPRng-size          "848 KB">
-  <!ENTITY LPRng-buildsize     "12 MB">
-  <!ENTITY LPRng-time          "0.1 SBU">
-]>
-
-<sect1 id="LPRng" xreflabel="LPRng-&LPRng-version;">
-  <?dbhtml filename="LPRng.html"?>
-
-
-  <title>LPRng-&LPRng-version;</title>
-
-  <indexterm zone="LPRng">
-    <primary sortas="a-LPRng">LPRng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LPRng</title>
-
-    <para>The <application>LPRng</application> package contains an enhanced,
-    extended and portable implementation of the Berkeley Line PRinter (LPR)
-    print spooler. This is useful for queuing print jobs.</para>
-
-    <para>There may be a more recent release available from the
-    <application>LPRng</application> home page. You can check
-    <ulink url="http://sourceforge.net/projects/lprng"/> and probably use the
-    existing BLFS instructions. Note that versions other than the one shown
-    in the download URLs have not been tested in a BLFS environment.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&LPRng-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&LPRng-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &LPRng-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &LPRng-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &LPRng-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &LPRng-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LPRng Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="mitkrb"/> and
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/lprng"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LPRng</title>
-
-    <para>Install <application>LPRng</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr               \
-            --libexecdir=/usr/lib/lprng \
-            --sysconfdir=/etc           \
-            --enable-shared &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i 's@CLEAR ...'</command>:  This fixes a
-    <application>GCC</application>-4 warning, treated as an error.</para>
-
-  </sect2>
--->
-  <sect2 role="configuration">
-    <title>Configuring LPRng</title>
-
-    <sect3 id="lprng-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/printcap</filename> and
-      <filename>/etc/lpd/*</filename></para>
-
-      <indexterm zone="LPRng lprng-config">
-        <primary sortas="e-etc-printcap">/etc/printcap</primary>
-      </indexterm>
-
-      <indexterm zone="LPRng lprng-config">
-        <primary sortas="e-etc-lpd-star">/etc/lpd/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>There is no generic <filename>printcap</filename> for all printers.
-      A sample printcap is loaded into the <filename
-      class="directory">/etc</filename> directory which can be of some help.
-      Information is also available at <ulink url="http://www.lprng.org"/>
-      and <ulink url="http://www.linuxprinting.org"/>.</para>
-
-    </sect3>
-
-    <sect3  id="lprng-init">
-      <title>Boot Script</title>
-
-      <para>Install the
-      <filename>/etc/rc.d/init.d/lprng</filename> init script included in
-      the <xref linkend="bootscripts"/> package (as the
-      <systemitem class="username">root</systemitem> user):</para>
-
-      <indexterm zone="LPRng lprng-init">
-        <primary sortas="f-lprng">lprng</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-lprng</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-        <seg>cancel, checkpc, lp, lpc, lpd, lpq, lpr, lprm, lprng_certs,
-        lprng_index_certs, and lpstat</seg>
-        <seg>liblpr.{so,a}</seg>
-        <seg>/etc/lpd, /usr/lib/lprng, /usr/share/doc/&LPRng-version;,
-        /var/run/lpd, and /var/spool/lpd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cancel">
-        <term><command>cancel</command></term>
-        <listitem>
-          <para>is a symlink to <command>lprm</command> used to send cancel
-          requests to an <application>LPRng</application> print service.</para>
-          <indexterm zone="LPRng cancel">
-            <primary sortas="b-cancel">cancel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="checkpc">
-        <term><command>checkpc</command></term>
-        <listitem>
-          <para>checks out the printcap database.</para>
-          <indexterm zone="LPRng checkpc">
-            <primary sortas="b-checkpc">checkpc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lp">
-        <term><command>lp</command></term>
-        <listitem>
-          <para>is a symlink to <command>lpr</command> used to send requests
-          to an <application>LPRng</application> print service.</para>
-          <indexterm zone="LPRng lp">
-            <primary sortas="b-lp">lp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpc">
-        <term><command>lpc</command></term>
-        <listitem>
-          <para>is a control program for the <command>lpd</command>
-          daemon.</para>
-          <indexterm zone="LPRng lpc">
-            <primary sortas="b-lpc">lpc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpd">
-        <term><command>lpd</command></term>
-        <listitem>
-          <para>is the print queuing daemon.</para>
-          <indexterm zone="LPRng lpd">
-            <primary sortas="b-lpd">lpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpq">
-        <term><command>lpq</command></term>
-        <listitem>
-          <para>is a status monitoring program.</para>
-          <indexterm zone="LPRng lpq">
-            <primary sortas="b-lpq">lpq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpr">
-        <term><command>lpr</command></term>
-        <listitem>
-          <para>is a print job spooler program.</para>
-          <indexterm zone="LPRng lpr">
-            <primary sortas="b-lpr">lpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lprm">
-        <term><command>lprm</command></term>
-        <listitem>
-          <para>is a print job removal program.</para>
-          <indexterm zone="LPRng lprm">
-            <primary sortas="b-lprm">lprm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lprng_certs">
-        <term><command>lprng_certs</command></term>
-        <listitem>
-          <para>is a program used to manage SSL certificates for the
-          <application>LPRng</application> software.</para>
-          <indexterm zone="LPRng lprng_certs">
-            <primary sortas="b-lprng_certs">lprng_certs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lprng_index_certs">
-        <term><command>lprng_index_certs</command></term>
-        <listitem>
-          <para>creates a set of index files in the
-          <application>LPRng</application> signing certificate directory.</para>
-          <indexterm zone="LPRng lprng_index_certs">
-            <primary sortas="b-lprng_index_certs">lprng_index_certs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpstat">
-        <term><command>lpstat</command></term>
-        <listitem>
-          <para>is a print job status reporting program.</para>
-          <indexterm zone="LPRng lpstat">
-            <primary sortas="b-lpstat">lpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblpr">
-        <term><filename class='libraryfile'>liblpr.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions used by the
-          <application>LPRng</application> programs.</para>
-          <indexterm zone="LPRng liblpr">
-            <primary sortas="c-liblpr">liblpr.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lsb-release.xml
===================================================================
--- archive/lsb-release.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,128 +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">
-
-  <!ENTITY lsb-release-download-http "&sourceforge-dl;/lsb/lsb-release-&lsb-release-version;.tar.gz">
-  <!ENTITY lsb-release-download-ftp  " ">
-  <!ENTITY lsb-release-md5sum        "30537ef5a01e0ca94b7b8eb6a36bb1e4">
-  <!ENTITY lsb-release-size          "12 KB">
-  <!ENTITY lsb-release-buildsize     "80 KB">
-  <!ENTITY lsb-release-time          "less than 0.1 SBU">
-
-  %general-entities;
-]>
-
-<sect1 id="lsb-release" xreflabel="lsb_release-&lsb-release-version;">
-  <?dbhtml filename="lsb-release.html"?>
-
-
-  <title>lsb_release-&lsb-release-version;</title>
-
-  <indexterm zone="lsb-release">
-    <primary sortas="a-lsb-release">lsb_release</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lsb_release</title>
-
-    <para>The <application>lsb_release</application> script gives information
-    about the Linux Standards Base (LSB) status of the distribution.</para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&lsb-release-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&lsb-release-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &lsb-release-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &lsb-release-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &lsb-release-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &lsb-release-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/lsb_release"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lsb_release</title>
-
-    <para>First fix a minor display problem:</para>
-
-<screen><userinput>sed -i "s|n/a|unavailable|" lsb_release</userinput></screen>
-
-    <para>Install <application>lsb_release</application> by running the following
-    commands:</para>
-
-<screen><userinput>./help2man -N --include ./lsb_release.examples \
-              --alt_version_key=program_version ./lsb_release > lsb_release.1</userinput></screen>
-
-     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m 644 lsb_release.1 /usr/share/man/man1 &amp;&amp;
-install -v -m 755 lsb_release   /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-      <title>Configuration Information</title>
-
-      <para>
-        The configuration for this package was done in
-        <ulink url="&lfs-website;/lfs/view/stable/chapter09/theend.html">LFS</ulink>.
-        The file <filename>/etc/lsb-release</filename> should already exist.
-        Be sure that the DISTRIB_CODENAME entry has been set properly.
-      </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-           lsb_release
-        </seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsb_release-prog">
-        <term><command>lsb_release</command></term>
-        <listitem>
-          <para>is a script to give LSB data.</para>
-          <indexterm zone="lsb-release lsb_release-prog">
-            <primary sortas="b-lsb-release">lsb_release</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/apps.xml
===================================================================
--- archive/lxde/lxde/apps/apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="lxde-apps">
-  <?dbhtml filename="lxde-apps.html" ?>
-
-  <title>LXDE Applications</title>
-
-  <para>
-    This is a small collection of optional applications that add extra
-    capabilities to the <application>LXDE</application> desktop.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpicview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxappearance-obconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxinput.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxrandr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxtask.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxterminal.xml"/>
-
-</chapter>
Index: chive/lxde/lxde/apps/gpicview.xml
===================================================================
--- archive/lxde/lxde/apps/gpicview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +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 gpicview-download-http "&sourceforge-dl;/lxde/gpicview-&gpicview-version;.tar.xz">
-  <!ENTITY gpicview-download-ftp  " ">
-  <!ENTITY gpicview-md5sum        "26be9b0c5a234f1afe7d83d02a4a33f4">
-  <!ENTITY gpicview-size          "344 KB">
-  <!ENTITY gpicview-buildsize     "6.5 MB">
-  <!ENTITY gpicview-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gpicview" xreflabel="GPicView-&gpicview-version;">
-  <?dbhtml filename="gpicview.html"?>
-
-
-  <title>GPicView-&gpicview-version;</title>
-
-  <indexterm zone="gpicview">
-    <primary sortas="a-GPicView">GPicView</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GPicView</title>
-
-    <para>
-      The <application>GPicView</application> package contains a lightweight
-      image viewer.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gpicview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gpicview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gpicview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gpicview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gpicview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gpicview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GPicView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GPicView</title>
-
-    <para>
-      Install <application>GPicView</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 &amp;&amp;
-sed -i 's/Utility;//' /usr/share/applications/gpicview.desktop</userinput></screen>
-
-    <para>
-      If you have <xref linkend="xdg-utils"/> installed, as the
-      <systemitem class="username">root</systemitem> user, you should run the
-      <command>xdg-icon-resource forceupdate --theme hicolor</command> command,
-      for the installed icon to be displayed in the menu item.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: Fixes submenu for
-      <application>GPicView</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gpicview
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gpicview
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpicview-prog">
-        <term><command>gpicview</command></term>
-        <listitem>
-          <para>
-            is a lightweight image viewer
-          </para>
-          <indexterm zone="gpicview gpicview-prog">
-            <primary sortas="b-gpicview">gpicview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/lxappearance-obconf.xml
===================================================================
--- archive/lxde/lxde/apps/lxappearance-obconf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,135 +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 lxappearance-obconf-download-http "&sourceforge-dl;/lxde/lxappearance-obconf-&lxappearance-obconf-version;.tar.xz">
-  <!ENTITY lxappearance-obconf-download-ftp  " ">
-  <!ENTITY lxappearance-obconf-md5sum        "ae0076d489aa786f5d573f7ff592a4ab">
-  <!ENTITY lxappearance-obconf-size          "284 KB">
-  <!ENTITY lxappearance-obconf-buildsize     "4.6 MB">
-  <!ENTITY lxappearance-obconf-time          "0.1 SBU">
-]>
-
-<sect1 id="lxappearance-obconf" xreflabel="lxappearance-obconf-&lxappearance-obconf-version;">
-  <?dbhtml filename="lxappearance-obconf.html"?>
-
-
-  <title>lxappearance-obconf-&lxappearance-obconf-version;</title>
-
-  <indexterm zone="lxappearance-obconf">
-    <primary sortas="a-lxappearance-obconf">lxappearance-obconf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXAppearance OBconf</title>
-
-    <para>
-      The <application>LXAppearance OBconf</application> package contains a plugin
-      for <application>LXAppearance</application> to configure
-      <application>OpenBox</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxappearance-obconf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxappearance-obconf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxappearance-obconf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxappearance-obconf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxappearance-obconf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxappearance-obconf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXAppearance OBconf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxappearance"/> and
-      <xref linkend="openbox"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXAppearance OBconf</title>
-
-    <para>
-      Install <application>LXAppearance OBconf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/lxappearance/plugins/obconf.so
-        </seg>
-        <seg>
-          /usr/lib/lxappearance and
-          /usr/share/lxappearance/obconf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/lxinput.xml
===================================================================
--- archive/lxde/lxde/apps/lxinput.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +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 lxinput-download-http "&sourceforge-dl;/lxde/lxinput-&lxinput-version;.tar.xz">
-  <!ENTITY lxinput-download-ftp  " ">
-  <!ENTITY lxinput-md5sum        "69680debaef053d540ae3a5f4b237150">
-  <!ENTITY lxinput-size          "144 KB">
-  <!ENTITY lxinput-buildsize     "2.5 MB">
-  <!ENTITY lxinput-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxinput" xreflabel="LXInput-&lxinput-version;">
-  <?dbhtml filename="lxinput.html"?>
-
-
-  <title>LXInput-&lxinput-version;</title>
-
-  <indexterm zone="lxinput">
-    <primary sortas="a-LXInput">LXInput</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXInput</title>
-
-    <para>
-      The <application>LXInput</application> package contains a small program
-      used to configure keyboard and mouse for <application>LXDE</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxinput-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxinput-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxinput-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxinput-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxinput-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxinput-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXInput Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXInput</title>
-
-    <para>
-      Install <application>LXInput</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxinput
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxinput
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxinput-prog">
-        <term><command>lxinput</command></term>
-        <listitem>
-          <para>
-            is a program used to configure keyboard and mouse
-          </para>
-          <indexterm zone="lxinput lxinput-prog">
-            <primary sortas="b-lxinput">lxinput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/lxrandr.xml
===================================================================
--- archive/lxde/lxde/apps/lxrandr.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 lxrandr-download-http "&sourceforge-dl;/lxde/lxrandr-&lxrandr-version;.tar.xz">
-  <!ENTITY lxrandr-download-ftp  " ">
-  <!ENTITY lxrandr-md5sum        "5101ab29d87fb2b56a5ec5bc8bc3f258">
-  <!ENTITY lxrandr-size          "132 KB">
-  <!ENTITY lxrandr-buildsize     "1.8 MB">
-  <!ENTITY lxrandr-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxrandr" xreflabel="LXRandR-&lxrandr-version;">
-  <?dbhtml filename="lxrandr.html"?>
-
-
-  <title>LXRandR-&lxrandr-version;</title>
-
-  <indexterm zone="lxrandr">
-    <primary sortas="a-LXRandR">LXRandR</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXRandR</title>
-
-    <para>
-      The <application>LXRandR</application> package contains a monitor
-      configuration tool for <application>LXDE</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxrandr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxrandr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxrandr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxrandr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxrandr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxrandr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXRandR Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="xorg7-app"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXRandR</title>
-
-    <para>
-      Install <application>LXRandR</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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-man</option>: Use this switch if you have
-      installed optional dependencies and wish to build the
-      manual pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxrandr
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxrandr-prog">
-        <term><command>lxrandr</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> interface to XRandR
-          </para>
-          <indexterm zone="lxrandr lxrandr-prog">
-            <primary sortas="b-lxrandr">lxrandr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/lxtask.xml
===================================================================
--- archive/lxde/lxde/apps/lxtask.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 lxtask-download-http "&sourceforge-dl;/lxde/lxtask-&lxtask-version;.tar.xz">
-  <!ENTITY lxtask-download-ftp  " ">
-  <!ENTITY lxtask-md5sum        "27b5258847afc237a5b89666e7a8b45b">
-  <!ENTITY lxtask-size          "136 KB">
-  <!ENTITY lxtask-buildsize     "3.5 MB">
-  <!ENTITY lxtask-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxtask" xreflabel="LXTask-&lxtask-version;">
-  <?dbhtml filename="lxtask.html"?>
-
-
-  <title>LXTask-&lxtask-version;</title>
-
-  <indexterm zone="lxtask">
-    <primary sortas="a-LXTask">LXTask</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXTask</title>
-
-    <para>
-      The <application>LXTask</application> package contains a
-      lightweight and desktop-independent task manager.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxtask-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxtask-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxtask-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxtask-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxtask-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxtask-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lxtask-&lxtask-version;-gcc10_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">LXTask Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXTask</title>
-
-<!--
-    <para>
-      First, fix some <quote>multiple definition</quote> issues exposed
-      by GCC-10:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lxtask-&lxtask-version;-gcc10_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>LXTask</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>
-          lxtask
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxtask-prog">
-        <term><command>lxtask</command></term>
-        <listitem>
-          <para>
-            is a lightweight and desktop-independent task manager
-          </para>
-          <indexterm zone="lxtask lxtask-prog">
-            <primary sortas="b-lxtask">lxtask</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/lxterminal.xml
===================================================================
--- archive/lxde/lxde/apps/lxterminal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +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 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-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxterminal" xreflabel="LXTerminal-&lxterminal-version;">
-  <?dbhtml filename="lxterminal.html"?>
-
-
-  <title>LXTerminal-&lxterminal-version;</title>
-
-  <indexterm zone="lxterminal">
-    <primary sortas="a-LXTerminal">LXTerminal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXTerminal</title>
-
-    <para>
-      The <application>LXTerminal</application> package contains a
-      VTE-based terminal emulator for <application>LXDE</application>
-      with support for multiple tabs.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxterminal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxterminal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxterminal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxterminal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxterminal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxterminal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXTerminal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="vte2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXTerminal</title>
-
-    <para>
-      Install <application>LXTerminal</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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-man</option>: Use this switch if you have
-      installed optional dependencies and wish to build the
-      manual pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxterminal
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxterminal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxterminal-prog">
-        <term><command>lxterminal</command></term>
-        <listitem>
-          <para>
-            a lightweight terminal emulator for the
-            <application>LXDE</application> desktop
-          </para>
-          <indexterm zone="lxterminal lxterminal-prog">
-            <primary sortas="b-lxterminal">lxterminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/apps/vte2.xml
===================================================================
--- archive/lxde/lxde/apps/vte2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +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 vte2-download-http "&gnome-download-http;/vte/0.28/vte-&vte2-version;.tar.xz">
-  <!ENTITY vte2-download-ftp  "&gnome-download-ftp;/vte/0.28/vte-&vte2-version;.tar.xz">
-  <!ENTITY vte2-md5sum        "497f26e457308649e6ece32b3bb142ff">
-  <!ENTITY vte2-size          "940 KB">
-  <!ENTITY vte2-buildsize     "33 MB">
-  <!ENTITY vte2-time          "0.5 SBU">
-]>
-
-<sect1 id="vte2" xreflabel="Vte-&vte2-version;">
-  <?dbhtml filename="vte2.html"?>
-
-
-  <title>Vte-&vte2-version;</title>
-
-  <indexterm zone="vte2">
-    <primary sortas="a-Vte">Vte</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vte</title>
-
-    <para>
-      <application>Vte</application> is a library (libvte) implementing a
-      terminal emulator widget for <application>GTK+ 2</application>, and a
-      minimal demonstration application (vte) that uses
-      <application>libvte</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vte2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vte2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vte2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vte2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vte2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vte2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vte Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="pygtk"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vte</title>
-
-    <para>
-      Install <application>Vte</application> by running the following
-      commands:
-    </para>
-
-<!-- both vte2 and vte3 install the same file in libexecdir, so overwrite this one -->
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/vte \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-     <parameter>--libexecdir=/usr/lib/vte</parameter> : both this package and
-     <xref linkend="vte"/> install files of the same name. This switch ensures
-     that they do not overwrite each other if both are installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          vte
-        </seg>
-        <seg>
-          libvte.so
-        </seg>
-        <seg>
-          /usr/include/vte-0.0,
-          /usr/lib/vte,
-          /usr/share/gtk-doc/html/vte-0.0 and
-          /usr/share/vte
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vte2-prog">
-        <term><command>vte</command></term>
-        <listitem>
-          <para>
-            is a simple terminal emulator
-          </para>
-          <indexterm zone="vte2 vte2-prog">
-            <primary sortas="b-vte">vte</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvte2">
-        <term><filename class="libraryfile">libvte.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Vte</application> API functions
-          </para>
-          <indexterm zone="vte2 libvte2">
-            <primary sortas="c-libvte">libvte.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/desktop.xml
===================================================================
--- archive/lxde/lxde/desktop/desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="lxde-desktop">
-  <?dbhtml filename="lxde-desktop.html" ?>
-
-  <title>LXDE Desktop</title>
-
-  <para>
-    LXDE is an extremely fast-performing and energy-saving desktop environment.
-  </para>
-
-  <para>
-    LXDE comes with a beautiful interface, multi-language support, standard keyboard
-    shortcuts and additional features like tabbed file browsing. LXDE uses less CPU and
-    less RAM than other environments. It is especially designed for cloud computers
-    with low hardware specifications, such as netbooks, mobile devices (e.g. MIDs) or
-    older computers.
-  </para>
-
-  <para>
-    Build LXDE core packages in the order presented in the book for the
-    easiest resolution of dependencies.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxmenu-data.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-icon-theme.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-extra.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="menu-cache.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxpanel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxappearance.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxsession.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-common.xml"/>
-
-</chapter>
Index: chive/lxde/lxde/desktop/libfm.xml
===================================================================
--- archive/lxde/lxde/desktop/libfm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +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 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">
-]>
-
-<sect1 id="libfm" xreflabel="libfm-&libfm-version;">
-  <?dbhtml filename="libfm.html"?>
-
-
-  <title>libfm-&libfm-version;</title>
-
-  <indexterm zone="libfm">
-    <primary sortas="a-libfm">libfm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libfm</title>
-
-    <para>
-      The <application>libfm</application> package contains a library used
-      to develop file managers providing some file management utilities.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libfm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libfm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libfm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libfm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libfm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libfm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libfm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/> or <xref role="nodep" linkend="gtk3"/>
-      (GTK+-2 recommended since LXDE GTK+-3 support is still experimental), and
-      <xref linkend="menu-cache"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libexif"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="lxmenu-data"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="dbus-glib"/> and
-       <xref linkend="gvfs"/> or
-       <ulink url="https://hal.freedesktop.org/releases/">udisks</ulink>
-       (for volume management - experimental)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libfm</title>
-
-    <para>
-      Install <application>libfm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-gtk=3</option>: This option selects the
-      version of gtk+ to use.  The default is gtk+-2.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libfm-pref-apps and lxshortcut
-        </seg>
-        <seg>
-          libfm.so, libfm-extra.so and libfm-gtk.so
-        </seg>
-        <seg>
-          /etc/xdg/libfm,
-          /usr/lib/libfm,
-          /usr/share/gtk-doc/html/libfm and
-          /usr/share/libfm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfm-pref-apps">
-        <term><command>libfm-pref-apps</command></term>
-        <listitem>
-          <para>
-            sets preferred applications for programs based
-            on <application>libfm</application>
-          </para>
-          <indexterm zone="libfm libfm-pref-apps">
-            <primary sortas="b-libfm-pref-apps">libfm-pref-apps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxshortcut">
-        <term><command>lxshortcut</command></term>
-        <listitem>
-          <para>
-            is a small program used to edit application shortcuts
-          </para>
-          <indexterm zone="libfm lxshortcut">
-            <primary sortas="a-lxshortcut">lxshortcut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfm-lib">
-        <term><filename class="libraryfile">libfm.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libfm</application> API functions
-          </para>
-          <indexterm zone="libfm libfm-lib">
-            <primary sortas="c-libfm">libfm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/libwnck2.xml
===================================================================
--- archive/lxde/lxde/desktop/libwnck2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +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 libwnck2-download-http
-           "&gnome-download-http;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
-  <!ENTITY libwnck2-download-ftp
-           "&gnome-download-ftp;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
-  <!ENTITY libwnck2-md5sum        "3d20f26105a2fd878899d6ecdbe9a082">
-  <!ENTITY libwnck2-size          "612 KB">
-  <!ENTITY libwnck2-buildsize     "16 MB">
-  <!ENTITY libwnck2-time          "0.2 SBU">
-]>
-
-<sect1 id="libwnck2" xreflabel="libwnck-&libwnck2-version;">
-  <?dbhtml filename="libwnck2.html"?>
-
-
-  <title>libwnck-&libwnck2-version;</title>
-
-  <indexterm zone="libwnck2">
-    <primary sortas="a-libwnck-2">libwnck 2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwnck</title>
-
-    <para>
-      The <application>libwnck</application> package contains a Window Navigator
-      Construction Kit.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwnck2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwnck2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwnck2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwnck2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwnck2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwnck2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwnck Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwnck</title>
-
-    <para>
-      Install <application>libwnck</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static \
-            --program-suffix=-1 &amp;&amp;
-make GETTEXT_PACKAGE=libwnck-1</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 GETTEXT_PACKAGE=libwnck-1 install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--program-suffix=-1</parameter>: This option adds -1 to the
-      end of the names of the installed programs to avoid overwriting the
-      programs installed by <xref linkend="libwnck"/>.
-    </para>
-
-    <para>
-      <parameter>GETTEXT_PACKAGE=libwnck-1</parameter>: This parameter adds -1
-      to the end of the names of the gettext files installed by the package
-      to avoid overwriting the files installed by <xref linkend="libwnck"/>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wnckprop-1 and wnck-urgency-monitor-1
-        </seg>
-        <seg>
-          libwnck-1.so
-        </seg>
-        <seg>
-          /usr/include/libwnck-1.0 and
-          /usr/share/gtk-doc/html/libwnck-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wnckprop-1">
-        <term><command>wnckprop-1</command></term>
-        <listitem>
-          <para>
-            Prints, modifies, or interacts with the properties of a
-            screen/workspace/window
-          </para>
-          <indexterm zone="libwnck2 wnckprop-1">
-            <primary sortas="b-wnckprop-1">wnckprop-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwnck-1">
-        <term><filename class="libraryfile">libwnck-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for writing pagers and task lists
-          </para>
-          <indexterm zone="libwnck2 libwnck-1">
-            <primary sortas="c-libwnck-1">libwnck-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/lxappearance.xml
===================================================================
--- archive/lxde/lxde/desktop/lxappearance.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +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 lxappearance-download-http "&sourceforge-dl;/lxde/lxappearance-&lxappearance-version;.tar.xz">
-  <!ENTITY lxappearance-download-ftp  " ">
-  <!ENTITY lxappearance-md5sum        "f10345313e2c12bad51c1b58bd46b454">
-  <!ENTITY lxappearance-size          "164 KB">
-  <!ENTITY lxappearance-buildsize     "3.2 MB">
-  <!ENTITY lxappearance-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxappearance" xreflabel="LXAppearance-&lxappearance-version;">
-  <?dbhtml filename="lxappearance.html"?>
-
-
-  <title>LXAppearance-&lxappearance-version;</title>
-
-  <indexterm zone="lxappearance">
-    <primary sortas="a-LXAppearance">LXAppearance</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXAppearance</title>
-
-    <para>
-      The <application>LXAppearance</application> package contains a
-      desktop-independent theme switcher for
-      <application>GTK+</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxappearance-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxappearance-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxappearance-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxappearance-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxappearance-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxappearance-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXAppearance Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXAppearance</title>
-
-    <para>
-      Install <application>LXAppearance</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --enable-dbus     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-dbus</parameter>: This switch enables
-      <application>DBus</application> support in
-      <application>LXAppearance</application> which is useful for
-      communicating with <application>LXSession</application>.
-      Remove it if you are not building
-      <application>LXDE</application> or have not installed
-      <xref linkend="dbus-glib"/>.
-    </para>
-
-    <para>
-      <option>--enable-man</option>: Use this switch if you have
-      installed optional dependencies and wish to rebuild the
-      manual pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxappearance
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/lxappearance and
-          /usr/share/lxappearance
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxappearance-prog">
-        <term><command>lxappearance</command></term>
-        <listitem>
-          <para>
-            is a program used to change <application>GTK+</application>
-            themes, icon themes, and fonts used by applications
-          </para>
-          <indexterm zone="lxappearance lxappearance-prog">
-            <primary sortas="b-lxappearance">lxappearance</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/lxde-common.xml
===================================================================
--- archive/lxde/lxde/desktop/lxde-common.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,267 +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 lxde-common-download-http "&sourceforge-dl;/lxde/lxde-common-&lxde-common-version;.tar.xz">
-  <!ENTITY lxde-common-download-ftp  " ">
-  <!ENTITY lxde-common-md5sum        "14a9d19c4576dc15d985453ccb8ca9f6">
-  <!ENTITY lxde-common-size          "869 KB">
-  <!ENTITY lxde-common-buildsize     "2.7 MB">
-  <!ENTITY lxde-common-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxde-common" xreflabel="lxde-common-&lxde-common-version;">
-  <?dbhtml filename="lxde-common.html"?>
-
-
-  <title>lxde-common-&lxde-common-version;</title>
-
-  <indexterm zone="lxde-common">
-    <primary sortas="a-lxde-common">lxde-common</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXDE Common</title>
-
-    <para>
-      The <application>LXDE Common</application> package provides
-      a set of default configuration for LXDE.
-    </para>
-
-    <note>
-      <para>
-        LXDE has no backlight control functionality for laptops. If you need
-        backlight control, you should use an alternative desktop environment,
-        or consider adjusting the backlight on your laptop manually using
-        the instructions from
-        <ulink url="https://wiki.archlinux.org/title/backlight">Arch Linux Wiki - Backlight</ulink>.
-      </para>
-    </note>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxde-common-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxde-common-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxde-common-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxde-common-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxde-common-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxde-common-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXDE Common Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxde-icon-theme"/>,
-      <xref linkend="lxpanel"/>,
-      <xref linkend="lxsession"/>,
-      <xref role="runtime" linkend="openbox"/> (runtime), and
-      <xref linkend="pcmanfm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="hicolor-icon-theme"/>, and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <!-- polkit agent built in lxsession -->
-      A notification daemon such as
-      <xref role="runtime" linkend="notification-daemon"/> or
-      <xref role="runtime" linkend="xfce4-notifyd"/>, and
-      a display manager such as
-      <xref role="runtime" linkend="sddm"/> or
-      <xref role="runtime" linkend="lightdm"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXDE Common</title>
-
-    <para>
-      Install <application>LXDE Common</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
-
-    <para>
-      If you have installed recommended dependencies, run the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>update-mime-database /usr/share/mime &amp;&amp;
-gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
-update-desktop-database -q</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Starting LXDE</title>
-
-    <para>
-      You can start <application>LXDE</application> from runlevel 3, using
-      <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="sddm"/> or <xref linkend="lightdm"/>.
-    </para>
-
-    <para>
-      To start <application>LXDE</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># No need to run dbus-launch, since it is run by startlxde
-startlxde</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      The X session starts on the first unused virtual terminal, normally vt7.
-      You can switch to another vt<emphasis>n</emphasis> simultaneously
-      pressing the keys Ctrl-Alt-F<emphasis>n</emphasis>
-      (<emphasis>n</emphasis>=1, 2, ...).  To switch back to the X session,
-      normally started at vt7, use Ctrl-Alt-F7. The vt where the command
-      <command>startx</command> was executed will display many messages,
-      including X starting messages, applications automatically started with
-      the session, and eventually, some warning and error messages. You may
-      prefer to redirect those messages to a log file, which not only will keep
-      the initial vt uncluttered, but can also be used for debug purposes. This
-      can be done starting X with:
-    </para>
-
-    <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-    <para>
-      When shutting down or rebooting, the shutdown messages appear on the vt
-      where X was running. If you wish to see those messages, simultaneously
-      press keys Alt-F7 (assuming that X was running on vt7).
-    </para>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -svfn profile/LXDE ...</command>: Fixes the wrong path of the
-      default <application>LXPanel</application> profile.
-    </para>
-
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxde-logout, openbox-lxde and startlxde
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/xdg/{lxpanel,lxsession,openbox,pcmanfm}/LXDE and
-          /usr/share/lxde
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxde-logout">
-        <term><command>lxde-logout</command></term>
-        <listitem>
-          <para>
-            is used to quit the desktop session for
-            <application>LXDE</application>
-          </para>
-          <indexterm zone="lxde-common lxde-logout">
-            <primary sortas="b-lxde-logout">lxde-logout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openbox-lxde">
-        <term><command>openbox-lxde</command></term>
-        <listitem>
-          <para>
-            is a wrapper script which runs <application>Openbox</application>
-            with <application>LXDE</application> specific config file
-          </para>
-          <indexterm zone="lxde-common openbox-lxde">
-            <primary sortas="b-openbox-lxde">openbox-lxde</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="startlxde">
-        <term><command>startlxde</command></term>
-        <listitem>
-          <para>
-            is used to start the desktop session for
-            <application>LXDE</application>
-          </para>
-          <indexterm zone="lxde-common startlxde">
-            <primary sortas="b-startlxde">startlxde</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/lxmenu-data.xml
===================================================================
--- archive/lxde/lxde/desktop/lxmenu-data.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,119 +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 lxmenu-data-download-http "&sourceforge-dl;/lxde/lxmenu-data-&lxmenu-data-version;.tar.xz">
-  <!ENTITY lxmenu-data-download-ftp  " ">
-  <!ENTITY lxmenu-data-md5sum        "cc1989444284a65dbc7047348a68d6d4">
-  <!ENTITY lxmenu-data-size          "196 KB">
-  <!ENTITY lxmenu-data-buildsize     "2.1 MB">
-  <!ENTITY lxmenu-data-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxmenu-data" xreflabel="lxmenu-data-&lxmenu-data-version;">
-  <?dbhtml filename="lxmenu-data.html"?>
-
-
-  <title>lxmenu-data-&lxmenu-data-version;</title>
-
-  <indexterm zone="lxmenu-data">
-    <primary sortas="a-lxmenu-data">lxmenu-data</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXMenu Data</title>
-
-    <para>
-      The <application>LXMenu Data</application> package provides files
-      required to build freedesktop.org menu spec-compliant desktop menus
-      for <application>LXDE</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxmenu-data-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxmenu-data-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxmenu-data-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxmenu-data-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxmenu-data-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxmenu-data-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXMenu Data</title>
-
-    <para>
-      Install <application>LXMenu Data</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/xdg/menus and
-          /usr/share/desktop-directories
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/lxpanel.xml
===================================================================
--- archive/lxde/lxde/desktop/lxpanel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 lxpanel-download-http "&sourceforge-dl;/lxde/lxpanel-&lxpanel-version;.tar.xz">
-  <!ENTITY lxpanel-download-ftp  " ">
-  <!ENTITY lxpanel-md5sum        "c922d044789c3d7ae028f0e80dea18b0">
-  <!ENTITY lxpanel-size          "1.5 MB">
-  <!ENTITY lxpanel-buildsize     "30 MB">
-  <!ENTITY lxpanel-time          "0.3 SBU">
-]>
-
-<sect1 id="lxpanel" xreflabel="LXPanel-&lxpanel-version;">
-  <?dbhtml filename="lxpanel.html"?>
-
-
-  <title>LXPanel-&lxpanel-version;</title>
-
-  <indexterm zone="lxpanel">
-    <primary sortas="a-LXPanel">LXPanel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXPanel</title>
-
-    <para>
-      The <application>LXPanel</application> package contains a
-      lightweight X11 desktop panel.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxpanel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxpanel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxpanel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxpanel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxpanel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxpanel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXPanel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf-xlib"/>,
-      <xref linkend="keybinder2"/>,
-      <xref linkend="libwnck2"/>,
-      <xref linkend="lxmenu-data"/> and
-      <xref linkend="menu-cache"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gnome-screenshot"/> (to take screenshots using PrtScr),
-      <xref linkend="libxml2"/> (weather plugin), and
-      <xref linkend="wireless_tools"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://launchpad.net/libindicator/">libindicator</ulink>
-      (indicator plugin)
-<!--      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXPanel</title>
-
-    <para>
-      Install <application>LXPanel</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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-/-enable-man</option>: Use this switch if you have
-      installed optional dependencies and wish to build the
-      manual pages.
-    </para>
-
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxpanel and lxpanelctl
-        </seg>
-        <seg>
-          liblxpanel.so and several under /usr/lib/lxpanel/plugins
-        </seg>
-        <seg>
-          /etc/xdg/lxpanel, /usr/include/lxpanel, /usr/lib/lxpanel, and
-          /usr/share/lxpanel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxpanel-prog">
-        <term><command>lxpanel</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>GTK+</application> based
-            panel for the <application>LXDE</application> Desktop
-          </para>
-          <indexterm zone="lxpanel lxpanel-prog">
-            <primary sortas="b-lxpanel">lxpanel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxpanelctl">
-        <term><command>lxpanelctl</command></term>
-        <listitem>
-          <para>
-            is a program that controls lxpanel
-          </para>
-          <indexterm zone="lxpanel lxpanelctl">
-            <primary sortas="b-lxpanelctl">lxpanelctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/lxsession.xml
===================================================================
--- archive/lxde/lxde/desktop/lxsession.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,322 +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 lxsession-download-http "&sourceforge-dl;/lxde/lxsession-&lxsession-version;.tar.xz">
-  <!ENTITY lxsession-download-ftp  " ">
-  <!ENTITY lxsession-md5sum        "e8380acef215ee7c99c067a2241c2c7b">
-  <!ENTITY lxsession-size          "416 KB">
-  <!ENTITY lxsession-buildsize     "22 MB">
-  <!ENTITY lxsession-time          "0.1 SBU">
-]>
-
-<sect1 id="lxsession" xreflabel="LXSession-&lxsession-version;">
-  <?dbhtml filename="lxsession.html"?>
-
-
-  <title>LXSession-&lxsession-version;</title>
-
-  <indexterm zone="lxsession">
-    <primary sortas="a-LXSession">LXSession</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXSession</title>
-
-    <para>
-      The <application>LXSession</application> package contains the default
-      session manager for <application>LXDE</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxsession-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxsession-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxsession-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxsession-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxsession-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxsession-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXSession Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libunique"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="lsb-tools"/> (may be used at runtime
-      to display the distribution release in the logout dialog),
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXSession</title>
-
-    <para>
-      Install <application>LXSession</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-man &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-man</parameter>: This switch disables building of
-      the manual pages. Remove it if you have installed optional dependencies
-      and wish to build the manual pages.
-    </para>
-
-    <para>
-      <option>--enable-gtk3</option>: Builds against <application>GTK+-3
-      </application> instead of <application>GTK+-2</application>, which
-      is required anyway by <application>libunique</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxclipboard, lxlock, lxpolkit, lxsession, lxsession-db,
-          lxsession-default, lxsession-default-apps,
-          lxsession-default-terminal, lxsession-edit, lxsession-logout,
-          lxsession-xdg-autostart, lxsession-xsettings, and lxsettings-daemon
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxsession
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxclipboard">
-        <term><command>lxclipboard</command></term>
-        <listitem>
-          <para>
-            is a clipboard utility for LXSession and LXDE
-          </para>
-          <indexterm zone="lxsession lxclipboard">
-            <primary sortas="b-lxclipboard">lxclipboard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxlock">
-        <term><command>lxlock</command></term>
-        <listitem>
-          <para>
-            locks the local X display until a password is entered
-          </para>
-          <indexterm zone="lxsession lxlock">
-            <primary sortas="b-lxlock">lxlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxpolkit">
-        <term><command>lxpolkit</command></term>
-        <listitem>
-          <para>
-            is a polkit agent
-          </para>
-          <indexterm zone="lxsession lxpolkit">
-            <primary sortas="b-lxpolkit">lxpolkit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-prog">
-        <term><command>lxsession</command></term>
-        <listitem>
-          <para>
-            is a lightweight X session manager
-          </para>
-          <indexterm zone="lxsession lxsession-prog">
-            <primary sortas="b-lxsession">lxsession</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-db">
-        <term><command>lxsession-db</command></term>
-        <listitem>
-          <para>
-            is used to modify the database for managing
-            sessions in lxsession
-          </para>
-          <indexterm zone="lxsession lxsession-db">
-            <primary sortas="b-lxsession-db">lxsession-db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-default">
-        <term><command>lxsession-default</command></term>
-        <listitem>
-          <para>
-            launch default applications set by LXsession
-          </para>
-          <indexterm zone="lxsession lxsession-default">
-            <primary sortas="b-lxsession-default">lxsession-default</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-default-apps">
-        <term><command>lxsession-default-apps</command></term>
-        <listitem>
-          <para>
-            is an utility to configure lxsession and its default applications
-          </para>
-          <indexterm zone="lxsession lxsession-default-apps">
-            <primary sortas="b-lxsession-default-apps">lxsession-default-apps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-default-terminal">
-        <term><command>lxsession-default-terminal</command></term>
-        <listitem>
-          <para>
-            launch the default terminal set by LXSession
-          </para>
-          <indexterm zone="lxsession lxsession-default-terminal">
-            <primary sortas="b-lxsession-default-terminal">lxsession-default-terminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-edit">
-        <term><command>lxsession-edit</command></term>
-        <listitem>
-          <para>
-            is the standard session edit manager used by LXDE
-          </para>
-          <indexterm zone="lxsession lxsession-edit">
-            <primary sortas="b-lxsession-edit">lxsession-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-logout">
-        <term><command>lxsession-logout</command></term>
-        <listitem>
-          <para>
-            is a program to logout from LXSession
-          </para>
-          <indexterm zone="lxsession lxsession-logout">
-            <primary sortas="b-lxsession-logout">lxsession-logout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-xdg-autostart">
-        <term><command>lxsession-xdg-autostart</command></term>
-        <listitem>
-          <para>
-            handles the autostart spec of freedesktop.org
-          </para>
-          <indexterm zone="lxsession lxsession-xdg-autostart">
-            <primary sortas="b-lxsession-xdg-autostart">lxsession-xdg-autostart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsession-xsettings">
-        <term><command>lxsession-xsettings</command></term>
-        <listitem>
-          <para>
-            is a tool to configure gtk+ themes, keyboard, and mouse for you
-            on session startup
-          </para>
-          <indexterm zone="lxsession lxsession-xsettings">
-            <primary sortas="b-lxsession-xsettings">lxsession-xsettings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsettings-daemon">
-        <term><command>lxsettings-daemon</command></term>
-        <listitem>
-          <para>
-            is the settings daemon for LXsession
-          </para>
-          <indexterm zone="lxsession lxsettings-daemon">
-            <primary sortas="b-lxsettings-daemon">lxsettings-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/desktop/pcmanfm.xml
===================================================================
--- archive/lxde/lxde/desktop/pcmanfm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 pcmanfm-download-http "&sourceforge-dl;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.xz">
-  <!ENTITY pcmanfm-download-ftp  " ">
-  <!ENTITY pcmanfm-md5sum        "ef7c4417d2697ef138d175db7aeae15a">
-  <!ENTITY pcmanfm-size          "416 KB">
-  <!ENTITY pcmanfm-buildsize     "11 MB">
-  <!ENTITY pcmanfm-time          "0.1 SBU">
-]>
-
-<sect1 id="pcmanfm" xreflabel="PCManFM-&pcmanfm-version;">
-  <?dbhtml filename="pcmanfm.html"?>
-
-
-  <title>PCManFM-&pcmanfm-version;</title>
-
-  <indexterm zone="pcmanfm">
-    <primary sortas="a-PCManFM">PCManFM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCManFM</title>
-
-    <para>
-      The <application>PCManFM</application> package contains an extremely fast,
-      lightweight, yet feature-rich file manager with tabbed browsing.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcmanfm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcmanfm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcmanfm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcmanfm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcmanfm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcmanfm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PCManFM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libfm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="adwaita-icon-theme"/> or
-      <xref role="nodep" linkend="oxygen-icons5"/> or
-      <xref linkend="lxde-icon-theme"/>, and
-      <xref linkend="fribidi"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCManFM</title>
-
-    <para>
-      Install <application>PCManFM</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-gtk=3</option>: Selects the version of GTK+ to use.
-      You must use this switch if you have built <xref linkend="libfm"/>
-      with GTK+3 support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcmanfm
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/xdg/pcmanfm, /usr/lib/pcmanfm and /usr/share/pcmanfm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcmanfm-prog">
-        <term><command>pcmanfm</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>GTK+</application> based file
-            manager for X Window System
-          </para>
-          <indexterm zone="pcmanfm pcmanfm-prog">
-            <primary sortas="b-pcmanfm">pcmanfm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxde/lxde/lxde.xml
===================================================================
--- archive/lxde/lxde/lxde.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part 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;
-]>
-
-<part id="lxde" xreflabel="LXDE">
-  <?dbhtml filename="lxde.html" dir="lxde"?>
-
-  <title>LXDE</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop/desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
-
-</part>
Index: chive/lxde/lxpolkit.xml
===================================================================
--- archive/lxde/lxpolkit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +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 lxpolkit-download-http "&sourceforge-repo;/lxde/lxpolkit-&lxpolkit-version;.tar.gz">
-  <!ENTITY lxpolkit-download-ftp  " ">
-  <!ENTITY lxpolkit-md5sum        "2597b00035fe1d695219e0f9bfa8c26f">
-  <!ENTITY lxpolkit-size          "200 KB">
-  <!ENTITY lxpolkit-buildsize     "2.7 MB">
-  <!ENTITY lxpolkit-time          "0.1 SBU">
-]>
-
-<sect1 id="lxpolkit" xreflabel="LXPolkit-&lxpolkit-version;">
-  <?dbhtml filename="lxpolkit.html"?>
-
-
-  <title>LXPolkit-&lxpolkit-version;</title>
-
-  <indexterm zone="lxpolkit">
-    <primary sortas="a-LXPolkit">LXPolkit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXPolkit</title>
-
-    <para>
-      The <application>LXPolkit</application> package contains a
-      simple PolicyKit authentication agent.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxpolkit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxpolkit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxpolkit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxpolkit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxpolkit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxpolkit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXPolkit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/> and
-<!--      <xref linkend="menu-cache"/> and-->
-      <xref linkend="polkit"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxpolkit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXPolkit</title>
-
-    <para>
-      Install <application>LXPolkit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/lxpolkit and
-          /usr/share/lxpolkit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxdm.xml
===================================================================
--- archive/lxdm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,382 +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 lxdm-download-http "&sourceforge-dl;/lxdm/lxdm-&lxdm-version;.tar.xz">
-  <!ENTITY lxdm-download-ftp  " ">
-  <!ENTITY lxdm-md5sum        "061caae432634e6db38bbdc84bc6ffa0">
-  <!ENTITY lxdm-size          "236 KB">
-  <!ENTITY lxdm-buildsize     "5.6 MB">
-  <!ENTITY lxdm-time          "less than 0.1 SBU ">
-]>
-
-<sect1 id="lxdm" xreflabel="lxdm-&lxdm-version;">
-  <?dbhtml filename="lxdm.html"?>
-
-
-  <title>lxdm-&lxdm-version;</title>
-
-  <indexterm zone="lxdm">
-    <primary sortas="a-lxdm">lxdm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXDM</title>
-
-    <para>
-      The <application>LXDM</application> is a lightweight Display Manager for
-      the <application>LXDE</application> desktop. It can also be used as an
-      alternative to other Display Managers such as
-      <application>GNOME's</application> <application>GDM</application> or
-      <application>LightDM</application>.
-    </para>
-
-    &lfs120_checked;
-
-    <note>
-      <para>
-        The <application>lxdm</application> display manager does not support
-        wayland based window managers such as <application>plasma-wayland</application>
-        or <application>gnome-wayland</application>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxdm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxdm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxdm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxdm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxdm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxdm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXDM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>,
-      <xref linkend="iso-codes"/>, and
-      <xref role="runtime" linkend="librsvg"/> (runtime, for default theme
-      background)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-     <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
-     <xref role="nodep" linkend="polkit-gnome"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXDM</title>
-
-    <para>
-      First, some fixes.
-    </para>
-
-<screen><userinput>cat &gt; pam/lxdm &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/lxdm
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-auth     required       pam_succeed_if.so uid >= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-
-password include        system-password
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/lxdm</literal>
-EOF
-
-sed -i 's:sysconfig/i18n:profile.d/i18n.sh:g' data/lxdm.in &amp;&amp;
-sed -i 's:/etc/xprofile:/etc/profile:g' data/Xsession &amp;&amp;
-sed -e 's/^bg/#&amp;/'        \
-    -e '/reset=1/ s/# //' \
-    -e 's/logou$/logout/' \
-    -e "/arg=/a arg=$XORG_PREFIX/bin/X" \
-    -i data/lxdm.conf.in</userinput></screen>
-
-    <para>
-      Install <application>LXDM</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --with-pam        \
-            --with-systemdsystemunitdir=no &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --with-pam        \
-            --with-systemdsystemunitdir=/lib/systemd/system &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>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>cat &gt; pam/lxdm &lt;&lt; "EOF" ...</command>: Replace default
-      <filename>/etc/pam.d/lxdm</filename> by another one appropriate for BLFS.
-    </para>
-
-    <para>
-      <command>sed -i ... data/lxdm.conf.in</command>: Modifications in the
-      default configuration:
-      (1) fix the background to the default one;
-      (2) restart X when session is close;
-      (3) typo; and
-      (4) include <envar>XORG_PREFIX</envar>, which may be different from
-      <filename class="directory">/usr</filename>.
-    </para>
-
-    <para>
-      <command>sed -i ... data/Xsession</command>: Source
-      <filename>/etc/profile</filename>, instead of other file, according to
-      BLFS standard.
-    </para>
-
-    <para>
-      <command>sed -i ... data/lxdm.in</command>: Fix greeter's locale for BLFS
-      specification.
-    </para>
-
-    <para>
-      <parameter>--with-pam</parameter>: This parameter enables use of pam
-      authentication.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-systemdsystemunitdir=no</parameter>: BLFS does not
-      support systemd.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LXDM</title>
-
-   <sect3 id="lxdm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/lxdm/lxdm.conf</filename>
-      </para>
-
-      <indexterm zone="lxdm lxdm-config">
-        <primary sortas="e-etc-lxdm-lxdm.conf">/etc/lxdm/lxdm.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-   <sect3 id="lxdm-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <indexterm zone="lxdm lxdm-init">
-        <primary sortas="f-lxdm">lxdm</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        To start <command>lxdm</command> automatically when the system is
-        switched to runlevel 5, install the
-        <filename>/etc/rc.d/init.d/xdm</filename> script and the
-        <filename>/etc/sysconfig/xdm</filename> configuration file
-        included in the <xref linkend="bootscripts"/> package
-        and adjust <filename>/etc/inittab</filename> by running
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-lxdm</userinput></screen>
-
-      <para revision="systemd">
-        To start <application>LXDM</application> at boot execute the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable lxdm</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The LXDM daemon configuration file
-        (<filename>/etc/lxdm/lxdm.conf</filename>) specifies options that
-        include numlock on/off, background image (bg), session, etc.  You can
-        set a default session by uncommenting the line:
-        session=/usr/bin/startlxde and replacing <command>startlxde</command>
-        with your session of choice. For <application>GNOME</application>
-        session=/usr/bin/gnome-session.  For <application>OPENBOX</application>
-        session=/usr/bin/openbox-session and for
-        <application>XFCE</application> session=/usr/bin/startxfce4.
-      </para>
-
-      <para>
-        It is also possible to set the preferred session on a per-user basis by
-        editing the ~/.dmrc file for each user and adding:
-        <screen><literal>[Desktop]
-        Session=xfce</literal></screen>
-      </para>
-
-      <para>
-        You can replace the default dummy face in the greeting screen by another
-        image representing your user. For that, copy or symlink the desired
-        image to your home directory with the name <filename>.face</filename>.
-      </para>
-
-    </sect3>
-
-    <sect3 revision="sysv">
-      <title>Starting lxdm</title>
-
-      <para>
-        The <command>lxdm</command> greeter can be started from the command
-        line as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>telinit 5</userinput></screen>
-
-      <para>
-        Alternatively the runlevel can be permanently set to 5, starting the
-        <command>lxdm</command> greeter screen automatically, by modifying
-        <filename>/etc/inittab</filename>. As the  <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
-sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
-
-      <note>
-        <para>
-          One important script, executed after login is
-          <filename>/etc/lxdm/Xsession</filename> which we have fixed to fit
-          BLFS specifications.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxdm, lxdm-binary and lxdm-config
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/lxdm and
-          /usr/share/lxdm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxdm-prog">
-        <term><command>lxdm</command></term>
-        <listitem>
-          <para>
-            is a script to execute <command>lxdm-binary</command>
-          </para>
-          <indexterm zone="lxdm lxdm-prog">
-            <primary sortas="b-lxdm">lxdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxdm-binary">
-        <term><command>lxdm-binary</command></term>
-        <listitem>
-          <para>
-             is the actual Display Manager; needs to be executed with option
-             <option>-d</option> to daemonize
-          </para>
-          <indexterm zone="lxdm lxdm-binary">
-            <primary sortas="b-lxdm-binary">lxdm-binary</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxdm-config-prog">
-        <term><command>lxdm-config</command></term>
-        <listitem>
-          <para>
-            is a graphical customizing program
-          </para>
-          <indexterm zone="lxdm lxdm-config">
-            <primary sortas="b-lxdm">lxdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt-old/desktop/liblxqt-mount.xml
===================================================================
--- archive/lxqt-old/desktop/liblxqt-mount.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 liblxqt-mount-download-http "&lxqt-http-repo;/&lxqt-version;/liblxqt-mount-&liblxqt-mount-version;.tar.xz">
-  <!ENTITY liblxqt-mount-download-ftp  " ">
-  <!ENTITY liblxqt-mount-md5sum        "476d91d6680f63b0dd7ab445120b9e20">
-  <!ENTITY liblxqt-mount-size          "20 KB">
-  <!ENTITY liblxqt-mount-buildsize     "1.1 MB">
-  <!ENTITY liblxqt-mount-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liblxqt-mount" xreflabel="liblxqt-mount-&liblxqt-mount-version;">
-  <?dbhtml filename="liblxqt-mount.html"?>
-
-
-  <title>liblxqt-mount-&liblxqt-mount-version;</title>
-
-  <indexterm zone="liblxqt-mount">
-    <primary sortas="a-liblxqt-mount">liblxqt-mount</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liblxqt-mount</title>
-
-    <para>
-      The <application>liblxqt-mount</application> package is used in
-      <application>LXQt</application> for removable devices management.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liblxqt-mount-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liblxqt-mount-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liblxqt-mount-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liblxqt-mount-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liblxqt-mount-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liblxqt-mount-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liblxqt-mount Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/liblxqt-mount"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liblxqt-mount</title>
-
-    <para>
-      Install <application>liblxqt-mount</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_INSTALL_LIBDIR=lib          \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liblxqtmount.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/{include,lib/cmake}/lxqtmount
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblxqt-mount-lib">
-        <term><filename class="libraryfile">liblxqtmount.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt-mount</application> API functions.
-          </para>
-          <indexterm zone="liblxqt-mount liblxqt-mount-lib">
-            <primary sortas="c-liblxqtmount">liblxqtmount.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/apps/apps.xml
===================================================================
--- archive/lxqt/apps/apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="lxqt-apps">
-  <?dbhtml filename="lxqt-apps.html" ?>
-
-  <title>LXQt Applications</title>
-
-  <para>
-    This is a small collection of optional applications that add extra
-    capabilities to the <application>LXQt</application> desktop.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lximage-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obconf-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pavucontrol-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qupzilla.xml"/>-->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxdm.xml"/>-->
-
-</chapter>
Index: chive/lxqt/apps/qterminal.xml
===================================================================
--- archive/lxqt/apps/qterminal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,221 +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 qterminal-download-http "https://github.com/lxde/qterminal/releases/download/&qterminal-version;/qterminal-&qterminal-version;.tar.xz">
-  <!ENTITY qterminal-download-ftp  " ">
-  <!ENTITY qterminal-md5sum        "1ce5911e0959da75e6742f10a36b73e4">
-  <!ENTITY qterminal-size          "102 KB">
-  <!ENTITY qterminal-buildsize     "6.3 MB (add 1.3 MB for the API documentation)">
-  <!ENTITY qterminal-time          "0.3 SBU (with the API documentation)">
-]>
-
-<sect1 id="qterminal" xreflabel="qterminal-&qterminal-version;">
-  <?dbhtml filename="qterminal.html"?>
-
-
-  <title>qterminal-&qterminal-version;</title>
-
-  <indexterm zone="qterminal">
-    <primary sortas="a-qterminal">qterminal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qterminal</title>
-
-    <para>
-      The <application>qterminal</application> package contains a Qt widget
-      based terminal emulator for <application>Qt</application> with support
-      for multiple tabs.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qterminal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qterminal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qterminal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qterminal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qterminal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qterminal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qterminal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-build-tools"/> and
-      <xref linkend="qtermwidget"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      for documentation, and
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qterminal"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qterminal</title>
-
-    <para>
-      Install <application>qterminal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed, and wish to create the
-      API documentation, issue:
-    </para>
-
-<screen><userinput>doxygen ../Doxyfile</userinput></screen>
-
-    <para>
-      The html API documentation has been generated with the previous command.
-      Now, if you also have <xref linkend="texlive"/> (or <xref
-      linkend="tl-installer"/>) installed, and wish to create the pdf API
-      reference manual, issue:
-    </para>
-
-<screen><userinput>make -C docs/latex</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>
-
-    <para>
-      To install the html API documentation, if you opted to generate it, issue,
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/qterminal-&qterminal-version;/{html,pdf} &amp;&amp;
-cp -vr docs/html/* /usr/share/doc/qterminal-&qterminal-version;/html</userinput></screen>
-
-    <para>
-      The pdf API reference manual can be installed with, as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644    docs/latex/refman.pdf \
-                    /usr/share/doc/qterminal-&qterminal-version;/pdf</userinput></screen>
-
-    <para>
-      If you installed in /opt, again as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>if [ "$LXQT_PREFIX" != /usr ]; then
-  ln -svf $LXQT_PREFIX/share/applications/qterminal.desktop \
-          /usr/share/applications
-  ln -svf $LXQT_PREFIX/share/applications/qterminal_drop.desktop \
-          /usr/share/applications
-fi</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qterminal
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/qterminal-&qterminal-version; (if the documentation
-          is installed)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qterminal-prog">
-        <term><command>qterminal</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt</application> based lightweight terminal
-            emulator.
-          </para>
-          <indexterm zone="qterminal qterminal-prog">
-            <primary sortas="b-qterminal">qterminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/apps/qtermwidget.xml
===================================================================
--- archive/lxqt/apps/qtermwidget.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 qtermwidget-download-http "https://github.com/lxde/qtermwidget/releases/download/&qtermwidget-version;/qtermwidget-&qtermwidget-version;.tar.xz">
-  <!ENTITY qtermwidget-download-ftp  " ">
-  <!ENTITY qtermwidget-md5sum        "2593078abdfa3db0e536794807c52d67">
-  <!ENTITY qtermwidget-size          "157 KB">
-  <!ENTITY qtermwidget-buildsize     "7.7 MB">
-  <!ENTITY qtermwidget-time          "0.3 SBU">
-]>
-
-<sect1 id="qtermwidget" xreflabel="qtermwidget-&qtermwidget-version;">
-  <?dbhtml filename="qtermwidget.html"?>
-
-
-  <title>qtermwidget-&qtermwidget-version;</title>
-
-  <indexterm zone="qtermwidget">
-    <primary sortas="a-qtermwidget">qtermwidget</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qtermwidget</title>
-
-    <para>
-      As the name suggests, the <application>qtermwidget</application> is a
-      terminal widget for <application>Qt</application>.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtermwidget-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtermwidget-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtermwidget-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtermwidget-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtermwidget-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtermwidget-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qtermwidget Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-build-tools"/>
-
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qtermwidget"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtermwidget</title>
-
-    <para>
-      Install <application>qtermwidget</application> by running the 
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TEST=true</option>: Builds test application.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libqtermwidget5.so 
-        </seg>
-        <seg>
-          $LXQT_PREFIX/include/qtermwidget5,
-          $LXQT_PREFIX/share/qtermwidget5 , and
-          $LXQT_PREFIX/share/cmake/qtermwidget5 
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqtermwidget5-lib">
-        <term><filename class="libraryfile">libqtermwidget5.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libqtermwidget5</application> API functions.
-          </para>
-          <indexterm zone="qtermwidget libqtermwidget5-lib">
-            <primary sortas="c-libqtermwidget5">libqtermwidget5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/desktop.xml
===================================================================
--- archive/lxqt/desktop/desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="lxqt-desktop">
-  <?dbhtml filename="lxqt-desktop.html" ?>
-
-  <title>LXQt Desktop</title>
-
-  <para>
-    LXQt is an extremely fast-performing and energy-saving desktop environment.
-  </para>
-
-  <para>
-    <application>LXQt</application> is a <application>Qt</application> based
-    Desktop Environment. It comes with a beautiful interface,
-    multi-language support, standard keyboard shortcuts and additional
-    features like tabbed file browsing. <application>LXQt</application> uses
-    less CPU and less RAM than most other environments. It is especially
-    useful for cloud computers with low hardware specifications, such as
-    netbooks, mobile devices (e.g. MIDs) or older computers, but can be used
-    with modern hardware.
-  </para>
-
-  <para>
-    Build LXQt core packages in the order presented in the book for the
-    easiest resolution of dependencies.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqtxdg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-build-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwindowsystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblxqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-l10n.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-themes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-admin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-libkscreen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-globalkeys.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-notificationd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-policykit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-powermanagement.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-session.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kguiaddons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-runner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="post-install.xml"/>
-
-</chapter>
Index: chive/lxqt/desktop/libfm-qt.xml
===================================================================
--- archive/lxqt/desktop/libfm-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY libfm-qt-download-http "http://downloads.lxqt.org/libfm-qt/&libfm-qt-version;/libfm-qt-&libfm-qt-version;.tar.xz">-->
-  <!ENTITY libfm-qt-download-http "https://github.com/lxde/libfm-qt/releases/download/&libfm-qt-version;/libfm-qt-&libfm-qt-version;.tar.xz">
-  <!ENTITY libfm-qt-download-ftp  " ">
-  <!ENTITY libfm-qt-md5sum        "8eb86b0743fe6c6adb73f516295e4281">
-  <!ENTITY libfm-qt-size          "178 KB">
-  <!ENTITY libfm-qt-buildsize     "22 MB">
-  <!ENTITY libfm-qt-time          "0.9 SBU">
-]>
-
-<sect1 id="libfm-qt" xreflabel="libfm-qt-&libfm-qt-version;">
-  <?dbhtml filename="libfm-qt.html"?>
-
-
-  <title>libfm-qt-&libfm-qt-version;</title>
-
-  <indexterm zone="libfm-qt">
-    <primary sortas="a-libfm-qt">libfm-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libfm-qt</title>
-
-    <para>
-      <application>libfm-qt</application> is the Qt port of libfm, a library
-      providing components to build desktop file managers.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libfm-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libfm-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libfm-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libfm-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libfm-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libfm-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libfm-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libfm"/>, and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/>(to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libfm-qt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libfm-qt</title>
-
-    <para>
-      Install <application>libfm-qt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Remove the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </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>
-          libfm-qt.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/include/libfm-qt, $LXQT_PREFIX/share/libfm-qt, and
-          $LXQT_PREFIX/share/cmake/fm-qt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfm-qt-lib">
-        <term><filename class="libraryfile">libfm-qt.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libfm-qt</application> API functions.
-          </para>
-          <indexterm zone="libfm-qt libfm-qt-lib">
-            <primary sortas="c-libfm-qt">libfm-qt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/liblxqt.xml
===================================================================
--- archive/lxqt/desktop/liblxqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY liblxqt-download-http "&lxqt-http-repo;/&lxqt-version;/liblxqt-&liblxqt-version;.tar.xz">-->
-  <!ENTITY liblxqt-download-http "https://github.com/lxde/liblxqt/releases/download/&liblxqt-version;/liblxqt-&liblxqt-version;.tar.xz">
-  <!ENTITY liblxqt-download-ftp  " ">
-  <!ENTITY liblxqt-md5sum        "65abc1f9dd25a4244e12f9126ea22397">
-  <!ENTITY liblxqt-size          "50 KB">
-  <!ENTITY liblxqt-buildsize     "5.0 MB">
-  <!ENTITY liblxqt-time          "0.2 SBU">
-]>
-
-<sect1 id="liblxqt" xreflabel="liblxqt-&liblxqt-version;">
-  <?dbhtml filename="liblxqt.html"?>
-
-
-  <title>liblxqt-&liblxqt-version;</title>
-
-  <indexterm zone="liblxqt">
-    <primary sortas="a-liblxqt">liblxqt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liblxqt</title>
-
-    <para>
-      The <application>liblxqt</application> is the core utility library for all
-      <application>LXQt</application> components.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liblxqt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liblxqt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liblxqt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liblxqt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liblxqt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liblxqt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liblxqt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libqtxdg"/> and
-      (<xref linkend="lxqt-kwindowsystem"/> or
-      <xref role="nodep" linkend="kf5-frameworks"/>)
-<!-- role="nodep" implies jhalfs users won't depend on the whole kf5
-     stack. If they have installed kf5, it is easy to remove the
-     lxqt-kwindowsystem script. -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/liblxqt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liblxqt</title>
-
-    <para>
-      Install <application>liblxqt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </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>
-          liblxqt.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/include/lxqt and $LXQT_PREFIX/share/cmake/lxqt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblxqt-lib">
-        <term><filename class="libraryfile">liblxqt.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt</application> API functions.
-          </para>
-          <indexterm zone="liblxqt liblxqt-lib">
-            <primary sortas="c-liblxqt">liblxqt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/libqtxdg.xml
===================================================================
--- archive/lxqt/desktop/libqtxdg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,191 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY libqtxdg-download-http "http://downloads.lxqt.org/libqtxdg/&libqtxdg-version;/libqtxdg-&libqtxdg-version;.tar.xz">-->
-  <!ENTITY libqtxdg-download-http "https://github.com/lxde/libqtxdg/releases/download/&libqtxdg-version;/libqtxdg-&libqtxdg-version;.tar.xz">
-  <!ENTITY libqtxdg-download-ftp  " ">
-  <!ENTITY libqtxdg-md5sum        "15db87c252dfdf6a6852abb08a749965">
-  <!ENTITY libqtxdg-size          "65 KB">
-  <!ENTITY libqtxdg-buildsize     "5.1 MB">
-  <!ENTITY libqtxdg-time          "0.2 SBU">
-]>
-
-<sect1 id="libqtxdg" xreflabel="libqtxdg-&libqtxdg-version;">
-  <?dbhtml filename="libqtxdg.html"?>
-
-
-  <title>libqtxdg-&libqtxdg-version;</title>
-
-  <indexterm zone="libqtxdg">
-    <primary sortas="a-libqtxdg">libqtxdg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqtxdg</title>
-
-    <para>
-      The <application>libqtxdg</application> is a Qt implementation of
-      freedesktop.org xdg specifications.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqtxdg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqtxdg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqtxdg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqtxdg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqtxdg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqtxdg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqtxdg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="gtk2"/> or
-      <xref role="runtime" linkend="gtk3"/>
-          (for <command>gtk-update-icon-cache</command>)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libqtxdg"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqtxdg</title>
-
-    <para>
-      Install <application>libqtxdg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TESTS=ON</option>: Builds tests.
-    </para>
-
-    <para>
-      <option>-DBUILD_DEV_UTILS=ON</option>: Builds and installs development
-      utilities.
-    </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>
-          libQt5Xdg.so and libQt5XdgIconLoader.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/include/{qt5xdg,qt5xdgiconloader} and
-          $LXQT_PREFIX/share/cmake/{qt5xdg,qt5xdgiconloader}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libQt5Xdg-lib">
-        <term><filename class="libraryfile">libQt5Xdg.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libQt5Xdg</application> API functions.
-          </para>
-          <indexterm zone="libqtxdg libQt5Xdg-lib">
-            <primary sortas="c-libQt5Xdg">libQt5Xdg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQt5XdgIconLoader-lib">
-        <term><filename class="libraryfile">libQt5XdgIconLoader.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libQt5XdgIconLoader</application> API functions.
-          </para>
-          <indexterm zone="libqtxdg libQt5XdgIconLoader-lib">
-            <primary sortas="c-libQt5XdgIconLoader">libQt5XdgIconLoader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/libsysstat.xml
===================================================================
--- archive/lxqt/desktop/libsysstat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,160 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY libsysstat-download-http "http://downloads.lxqt.org/libsysstat/&libsysstat-version;/libsysstat-&libsysstat-version;.tar.xz">-->
-  <!ENTITY libsysstat-download-http "https://github.com/lxde/libsysstat/releases/download/&libsysstat-version;/libsysstat-&libsysstat-version;.tar.xz">
-  <!ENTITY libsysstat-download-ftp  " ">
-  <!ENTITY libsysstat-md5sum        "63fbaf270a259dcdf4a9fefa91f5e88d">
-  <!ENTITY libsysstat-size          "17 KB">
-  <!ENTITY libsysstat-buildsize     "1.6 MB">
-  <!ENTITY libsysstat-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libsysstat" xreflabel="libsysstat-&libsysstat-version;">
-  <?dbhtml filename="libsysstat.html"?>
-
-
-  <title>libsysstat-&libsysstat-version;</title>
-
-  <indexterm zone="libsysstat">
-    <primary sortas="a-libsysstat">libsysstat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsysstat</title>
-
-    <para>
-      The <application>libsysstat</application> package contains a library used
-      to query system info and statistics.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsysstat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsysstat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsysstat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsysstat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsysstat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsysstat-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsysstat Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,  
-      <xref linkend="lxqt-build-tools"/>, and
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libsysstat"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsysstat</title>
-
-    <para>
-      Install <application>libsysstat</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      ..       &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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libsysstat-qt5.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/include/sysstat-qt5 and
-          $LXQT_PREFIX/share/cmake/sysstat-qt5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsysstat-qt5">
-        <term><filename class="libraryfile">libsysstat-qt5.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libsysstat-qt5</application> API
-            functions.
-          </para>
-          <indexterm zone="libsysstat libsysstat-qt5">
-            <primary sortas="c-libsysstat-qt5">libsysstat-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-about.xml
===================================================================
--- archive/lxqt/desktop/lxqt-about.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-about-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-about-&lxqt-about-version;.tar.xz">-->
-  <!ENTITY lxqt-about-download-http "https://github.com/lxde/lxqt-about/releases/download/&lxqt-about-version;/lxqt-about-&lxqt-about-version;.tar.xz">
-  <!ENTITY lxqt-about-download-ftp  " ">
-  <!ENTITY lxqt-about-md5sum        "92df8e8f8394b24cf9823009835afb00">
-  <!ENTITY lxqt-about-size          "22 KB">
-  <!ENTITY lxqt-about-buildsize     "1.8 MB">
-  <!ENTITY lxqt-about-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-about" xreflabel="lxqt-about-&lxqt-about-version;">
-  <?dbhtml filename="lxqt-about.html"?>
-
-
-  <title>lxqt-about-&lxqt-about-version;</title>
-
-  <indexterm zone="lxqt-about">
-    <primary sortas="a-lxqt-about">lxqt-about</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-about</title>
-
-    <para>
-      The <application>lxqt-about</application> package provides the standalone
-      <application>LXQt</application> <quote>About</quote> dialog.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-about-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-about-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-about-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-about-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-about-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-about-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-about Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-about"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-about</title>
-
-    <para>
-      Install <application>lxqt-about</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-about
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-about-prog">
-        <term><command>lxqt-about</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> <quote>About</quote> dialog.
-          </para>
-          <indexterm zone="lxqt-about lxqt-about-prog">
-            <primary sortas="b-lxqt-about">lxqt-about</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-admin.xml
===================================================================
--- archive/lxqt/desktop/lxqt-admin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,188 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-admin-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-admin-&lxqt-admin-version;.tar.xz">-->
-  <!ENTITY lxqt-admin-download-http "https://github.com/lxde/lxqt-admin/releases/download/&lxqt-admin-version;/lxqt-admin-&lxqt-admin-version;.tar.xz">
-  <!ENTITY lxqt-admin-download-ftp  " ">
-  <!ENTITY lxqt-admin-md5sum        "66792de0ff5b7eb41b7f382a46a772a6">
-  <!ENTITY lxqt-admin-size          "113 KB">
-  <!ENTITY lxqt-admin-buildsize     "3.5 MB">
-  <!ENTITY lxqt-admin-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-admin" xreflabel="lxqt-admin-&lxqt-admin-version;">
-  <?dbhtml filename="lxqt-admin.html"?>
-
-
-  <title>lxqt-admin-&lxqt-admin-version;</title>
-
-  <indexterm zone="lxqt-admin">
-    <primary sortas="a-lxqt-admin">lxqt-admin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-admin</title>
-
-    <para>
-      The <application>lxqt-admin</application> package provides two GUI tools
-      to adjust setiings of the operating system
-      <application>LXQt</application> is running on.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-admin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-admin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-admin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-admin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-admin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-admin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-admin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-admin"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-admin</title>
-
-    <para>
-      Install <application>lxqt-admin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-admin-time, lxqt-admin-user, and lxqt-admin-user-helper
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-admin-time">
-        <term><command>lxqt-admin-time</command></term>
-        <listitem>
-          <para>
-            is a GUI to adjust time and date.
-          </para>
-          <indexterm zone="lxqt-admin lxqt-admin-time">
-            <primary sortas="b-lxqt-admin-time">lxqt-admin-time</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-admin-user">
-        <term><command>lxqt-admin-user</command></term>
-        <listitem>
-          <para>
-            is a GUI to manage users and groups.
-          </para>
-          <indexterm zone="lxqt-admin lxqt-admin-user">
-            <primary sortas="b-lxqt-admin-user">lxqt-admin-user</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-build-tools.xml
===================================================================
--- archive/lxqt/desktop/lxqt-build-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-build-tools-download-http "http://downloads.lxqt.org/lxqt-build-tools/&lxqt-build-tools-version;/lxqt-build-tools-&lxqt-build-tools-version;.tar.xz">-->
-  <!ENTITY lxqt-build-tools-download-http "https://github.com/lxde/lxqt-build-tools/releases/download/&lxqt-build-tools-version;/lxqt-build-tools-&lxqt-build-tools-version;.tar.xz">
-  <!ENTITY lxqt-build-tools-download-ftp  " ">
-  <!ENTITY lxqt-build-tools-md5sum        "640fa541a09605ff0ddd31b7ea33f731">
-  <!ENTITY lxqt-build-tools-size          "20 KB">
-  <!ENTITY lxqt-build-tools-buildsize     "780 KB">
-  <!ENTITY lxqt-build-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-build-tools" xreflabel="lxqt-build-tools-&lxqt-build-tools-version;">
-  <?dbhtml filename="lxqt-build-tools.html"?>
-
-
-  <title>lxqt-build-tools-&lxqt-build-tools-version;</title>
-
-  <indexterm zone="lxqt-build-tools">
-    <primary sortas="a-lxqt-build-tools">lxqt-build-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-build-tools</title>
-
-    <para>
-      The <application>lxqt-build-tools</application> package provides several
-      tools needed to build LXQt itself as well as other components maintained
-      by the LXQt project.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-build-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-build-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-build-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-build-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-build-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-build-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-build-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt5"/>  
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-build-tools"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-build-tools</title>
-
-    <para>
-      Install <application>lxqt-build-tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release  \
-      .. &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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-         $LXQT_PREFIX/share/cmake/lxqt-build-tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-config.xml
===================================================================
--- archive/lxqt/desktop/lxqt-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,273 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-config-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-config-&lxqt-config-version;.tar.xz">-->
-  <!ENTITY lxqt-config-download-http "https://github.com/lxde/lxqt-config/releases/download/&lxqt-config-version;/lxqt-config-&lxqt-config-version;.tar.xz">
-  <!ENTITY lxqt-config-download-ftp  " ">
-  <!ENTITY lxqt-config-md5sum        "0cde79c1054370e45ebaf2744b340b8e">
-  <!ENTITY lxqt-config-size          "195 KB">
-  <!ENTITY lxqt-config-buildsize     "16 MB">
-  <!ENTITY lxqt-config-time          "0.7 SBU">
-]>
-
-<sect1 id="lxqt-config" xreflabel="lxqt-config-&lxqt-config-version;">
-  <?dbhtml filename="lxqt-config.html"?>
-
-
-  <title>lxqt-config-&lxqt-config-version;</title>
-
-  <indexterm zone="lxqt-config">
-    <primary sortas="a-lxqt-config">lxqt-config</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-config</title>
-
-    <para>
-      The <application>lxqt-config</application> package provides the
-      <application>LXQt</application> system settings center.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-config-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-config-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-config-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-config-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-config-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-config-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-config Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and 
-      (<xref linkend="lxqt-libkscreen"/> or
-      <xref role="nodep" linkend="plasma5-build"/>)
-<!-- role="nodep" implies that jhalfs users will not depend on the whole
-     kf5/plasma stack. If they have built plasma, it is easy to remove the
-     lxqt-libkscreen script.-->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-config"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-config</title>
-
-    <para>
-      Install <application>lxqt-config</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..                                  &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config, lxqt-config-appearance, lxqt-config-brightness,
-          lxqt-config-file-associations, lxqt-config-input, lxqt-config-locale,
-          and lxqt-config-monitor
-        </seg>
-        <seg>
-          liblxqt-config-cursor.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/lib/lxqt-config
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-prog">
-        <term><command>lxqt-config</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> configuration center.
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-prog">
-            <primary sortas="b-lxqt-config">lxqt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-appearance">
-        <term><command>lxqt-config-appearance</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> program used to change
-            themes, icon themes, and fonts used by applications.
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-appearance">
-            <primary sortas="b-lxqt-config-appearance">lxqt-config-appearance</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-brightness">
-        <term><command>lxqt-config-brightness</command></term>
-        <listitem>
-          <para>
-            configures brightness settings of ouput devices.
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-brightness">
-            <primary sortas="b-lxqt-config-brightness">lxqt-config-brightness</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-file-associations">
-        <term><command>lxqt-config-file-associations</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> program used to associate
-            files with programs.
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-file-associations">
-            <primary sortas="b-lxqt-config-file-associations">lxqt-config-file-associations</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-input">
-        <term><command>lxqt-config-input</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> program used to configure
-            input devices (e.g. mouse speed, cursor, keyboard speed, keyboard
-            layout).
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-input">
-            <primary sortas="b-lxqt-config-input">lxqt-config-input</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-locale">
-        <term><command>lxqt-config-locale</command></term>
-        <listitem>
-          <para>
-            configures the locale used in <application>LXQt</application>
-            sessions.
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-locale">
-            <primary sortas="b-lxqt-config-locale">lxqt-config-locale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-monitor">
-        <term><command>lxqt-config-monitor</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application>
-            <application>xrandr</application> based program used to configure
-            the monitor.
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-monitor">
-            <primary sortas="b-lxqt-config-monitor">lxqt-config-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblxqt-config-cursor-lib">
-        <term><filename class="libraryfile">liblxqt-config-cursor.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt-config-cursor</application> API
-            functions.
-          </para>
-          <indexterm zone="lxqt-config liblxqt-config-cursor-lib">
-            <primary sortas="c-liblxqt-config-cursor">liblxqt-config-cursor.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-globalkeys.xml
===================================================================
--- archive/lxqt/desktop/lxqt-globalkeys.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-globalkeys-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-globalkeys-&lxqt-globalkeys-version;.tar.xz">-->
-  <!ENTITY lxqt-globalkeys-download-http "https://github.com/lxde/lxqt-globalkeys/releases/download/&lxqt-globalkeys-version;/lxqt-globalkeys-&lxqt-globalkeys-version;.tar.xz">
-  <!ENTITY lxqt-globalkeys-download-ftp  " ">
-  <!ENTITY lxqt-globalkeys-md5sum        "a3f49ade3e06e21391980cb13807cb09">
-  <!ENTITY lxqt-globalkeys-size          "51 KB">
-  <!ENTITY lxqt-globalkeys-buildsize     "9.3 MB">
-  <!ENTITY lxqt-globalkeys-time          "0.3 SBU">
-]>
-
-<sect1 id="lxqt-globalkeys" xreflabel="lxqt-globalkeys-&lxqt-globalkeys-version;">
-  <?dbhtml filename="lxqt-globalkeys.html"?>
-
-
-  <title>lxqt-globalkeys-&lxqt-globalkeys-version;</title>
-
-  <indexterm zone="lxqt-globalkeys">
-    <primary sortas="a-lxqt-globalkeys">lxqt-globalkeys</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-globalkeys</title>
-
-    <para>
-      The <application>lxqt-globalkeys</application> package contains a daemon
-      used to register global keyboard shortcuts and a key shortcut GUI editor.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-globalkeys-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-globalkeys-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-globalkeys-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-globalkeys-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-globalkeys-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-globalkeys-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-globalkeys Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-globalkeys"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-globalkeys</title>
-
-    <para>
-      Install <application>lxqt-globalkeys</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-globalkeyshortcuts and lxqt-globalkeysd
-        </seg>
-        <seg>
-          liblxqt-globalkeys.so and liblxqt-globalkeys-ui.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/include/lxqt-globalkeys{,-ui}
-          and $LXQT_PREFIX/share/cmake/lxqt-globalkeys{,-ui}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-globalkeyshortcuts">
-        <term><command>lxqt-config-globalkeyshortcuts</command></term>
-        <listitem>
-          <para>
-            is a key shortcuts GUI editor.
-          </para>
-          <indexterm zone="lxqt-globalkeys lxqt-config-globalkeyshortcuts">
-            <primary sortas="b-lxqt-config-globalkeyshortcuts">lxqt-config-globalkeyshortcuts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-globalkeysd">
-        <term><command>lxqt-globalkeysd</command></term>
-        <listitem>
-          <para>
-            is a global key shortcuts daemon.
-          </para>
-          <indexterm zone="lxqt-globalkeys lxqt-globalkeysd">
-            <primary sortas="b-lxqt-globalkeysd">lxqt-globalkeysd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-globalkeys-lib">
-        <term><filename class="libraryfile">lxqt-globalkeys.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>lxqt-globalkeys</application> API
-            functions.
-          </para>
-          <indexterm zone="lxqt-globalkeys lxqt-globalkeys-lib">
-            <primary sortas="c-lxqt-globalkeys">lxqt-globalkeys.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblxqt-globalkeys-ui-lib">
-        <term><filename class="libraryfile">liblxqt-globalkeys-ui.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt-globalkeys-ui</application> API
-            functions.
-          </para>
-          <indexterm zone="lxqt-globalkeys liblxqt-globalkeys-ui-lib">
-            <primary sortas="c-liblxqt-globalkeys-ui">liblxqt-globalkeys-ui.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-kguiaddons.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kguiaddons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +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 kguiaddons-download-http "&kf5-download-http;/kguiaddons-&kf5-version;.tar.xz">
-  <!ENTITY kguiaddons-download-ftp  " ">
-  <!ENTITY kguiaddons-md5sum        "f031ccc85572a5bbecf7996be60b72a7">
-  <!ENTITY kguiaddons-size          "40 KB">
-  <!ENTITY kguiaddons-buildsize     "2.1 MB">
-  <!ENTITY kguiaddons-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-kguiaddons" xreflabel="kguiaddons-&kf5-version; for lxqt">
-  <?dbhtml filename="lxqt-kguiaddons.html"?>
-
-
-  <title>Kguiaddons-&kf5-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kguiaddons">
-    <primary sortas="a-kguiaddons">kguiaddons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kguiaddons</title>
-
-    <para>
-      The KDE GUI addons provide utilities for graphical user interfaces in the
-      areas of colors, fonts, text, images, and keyboard input.
-    </para>
-
-    &lfs82_checked;
-
-    <note><para>This package is extracted from the KF5 set of packages.  If
-    <xref linkend="kf5-frameworks"/> is built, do NOT also build this package 
-    as presented here.</para></note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kguiaddons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kguiaddons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kguiaddons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kguiaddons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kguiaddons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kguiaddons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kguiaddons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="xorg7-lib"/>, and 
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kguiaddons"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kguiaddons</title>
-
-    <para>
-      Install <application>kguiaddons</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev ..                         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKF5GuiAddons.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/lib/cmake/KF5GuiAddons and  
-          $LXQT_PREFIX/include/KF5/KGuiAddons
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kguiaddons-lib">
-        <term><filename class="libraryfile">libKF5GuiAddons.so</filename></term>
-        <listitem>
-          <para>
-            contains KDE GUI utilities for graphical user interfaces.
-          </para>
-          <indexterm zone="lxqt-kguiaddons-lib">
-            <primary sortas="c-libKF5WindowSystem">libKF5GuiAddons.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-kidletime.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kidletime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,160 +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 kidletime-download-http "&kf5-download-http;/kidletime-&kf5-version;.tar.xz">
-  <!ENTITY kidletime-download-ftp  " ">
-  <!ENTITY kidletime-md5sum        "39e01a23876ff8c3b7d7bf5476f51507">
-  <!ENTITY kidletime-size          "28 KB">
-  <!ENTITY kidletime-buildsize     "2.1 MB">
-  <!ENTITY kidletime-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-kidletime" xreflabel="kidletime-&kf5-version; for lxqt">
-  <?dbhtml filename="lxqt-kidletime.html"?>
-
-
-  <title>Kidletime-&kf5-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kidletime">
-    <primary sortas="a-kidletime">kidletime</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kidletime</title>
-
-    <para>
-      KIdleTime is used to report idle time of user and system. It is useful
-      not only for finding out about the current idle time of the PC, but also
-      for getting notified upon idle time events, such as custom timeouts, or
-      user activity.
-    </para>
-
-    &lfs82_checked;
-
-    <note><para>This package is extracted from the KF5 set of packages.  If
-    <xref linkend="kf5-frameworks"/> is built, do NOT also build this package
-    as presented here.</para></note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kidletime-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kidletime-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kidletime-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kidletime-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kidletime-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kidletime-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kidletime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kidletime"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kidletime</title>
-
-    <para>
-      Install <application>kidletime</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev ..                         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKF5IdleTime.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/lib/plugins/kf5/org.kde.kidletime.platforms,
-          $LXQT_PREFIX/lib/cmake/KF5IdleTime, and
-          $LXQT_PREFIX/include/KF5/KIdleTime
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kidletime-lib">
-        <term><filename class="libraryfile">libKF5GuiAddons.so</filename></term>
-        <listitem>
-          <para>
-            contains the KDE API for idle time reports.
-          </para>
-          <indexterm zone="lxqt-kidletime-lib">
-            <primary sortas="c-libKF5WindowSystem">libKF5GuiAddons.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-kwayland.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kwayland.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 kwayland-download-http "&kf5-download-http;/kwayland-&kf5-version;.tar.xz">
-  <!ENTITY kwayland-download-ftp  " ">
-  <!ENTITY kwayland-md5sum        "1a5dab28ff9e07f13f528200cf3059d6">
-  <!ENTITY kwayland-size          "300 KB">
-  <!ENTITY kwayland-buildsize     "20 MB">
-  <!ENTITY kwayland-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="lxqt-kwayland" xreflabel="kwayland-&kf5-version; for lxqt">
-  <?dbhtml filename="lxqt-kwayland.html"?>
-
-
-  <title>Kwayland-&kf5-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kwayland">
-    <primary sortas="a-kwayland">kwayland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kwayland</title>
-
-    <para>
-      <application>Kwayland</application> is a Qt-style API to interact with
-      the <application>wayland-client</application> and
-      <application>wayland-server</application> API.
-    </para>
-
-    &lfs82_checked;
-
-    <note>
-      <para>
-        This package is extracted from the KF5 set of packages. If
-        <xref linkend="kf5-frameworks"/> is built, do NOT also build this
-        package as presented here.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kwayland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kwayland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kwayland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kwayland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kwayland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kwayland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kwayland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="mesa"/> (built with <xref linkend="wayland"/> support), and
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kwayland"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kwayland</title>
-
-    <para>
-      Install <application>kwayland</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX                          \
-      -DCMAKE_BUILD_TYPE=Release                                   \
-      -DBUILD_TESTING=OFF                                          \
-      -DECM_MKSPECS_INSTALL_DIR=$LXQT_PREFIX/share/mkspecs/modules \
-      -Wno-dev ..                                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKF5WaylandClient.so and libKF5WaylandServer.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/etc,
-          $LXQT_PREFIX/lib/cmake/KF5Wayland,
-          $LXQT_PREFIX/include/KF5/KWayland, and
-          $LXQT_PREFIX/share/mkspecs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kwayland-client">
-        <term><filename class="libraryfile">libKF5WaylandClient.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>wayland-client</application> Qt-style
-            wrapper library.
-          </para>
-          <indexterm zone="lxqt-kwayland-client">
-            <primary sortas="c-libKF5WaylandClient">libKF5WaylandClient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-kwayland-server">
-        <term><filename class="libraryfile">libKF5WaylandServer.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>wayland-server</application> Qt-style
-            wrapper library.
-          </para>
-          <indexterm zone="lxqt-kwayland-server">
-            <primary sortas="c-libKF5WaylandServer">libKF5WaylandServer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-kwindowsystem.xml
===================================================================
--- archive/lxqt/desktop/lxqt-kwindowsystem.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 kwindowsystem-download-http "&kf5-download-http;/kwindowsystem-&kf5-version;.tar.xz">
-  <!ENTITY kwindowsystem-download-ftp  " ">
-  <!ENTITY kwindowsystem-md5sum        "481a95d42da42756b3071310cdca8413">
-  <!ENTITY kwindowsystem-size          "168 KB">
-  <!ENTITY kwindowsystem-buildsize     "8.5 MB">
-  <!ENTITY kwindowsystem-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-kwindowsystem" xreflabel="kwindowsystem-&kf5-version; for lxqt">
-  <?dbhtml filename="lxqt-kwindowsystem.html"?>
-
-
-  <title>Kwindowsystem-&kf5-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kwindowsystem">
-    <primary sortas="a-kwindowsystem">kwindowsystem</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kwindowsystem</title>
-
-    <para>
-      The <application>kwindowsystem</application> provides information about,
-      and allows interaction with, the windowing system. It provides a high
-      level API that is windowing system independent and has platform specific
-      implementations.
-    </para>
-
-    &lfs82_checked;
-
-    <note><para>This package is extracted from the KF5 set of packages.  If
-    <xref linkend="kf5-frameworks"/> is built, do NOT also build this package 
-    as presented here.</para></note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kwindowsystem-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kwindowsystem-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kwindowsystem-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kwindowsystem-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kwindowsystem-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kwindowsystem-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kwindowsystem Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="xorg7-lib"/>, and 
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kwindowsystem"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kwindowsystem</title>
-
-    <para>
-      Install <application>kwindowsystem</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev ..                         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKF5WindowSystem.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/lib/cmake/KF5WindowSystem, 
-          $LXQT_PREFIX/include/KF5, and
-          $LXQT_PREFIX/lib/plugins/kf5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kwindowsystem-lib">
-        <term><filename class="libraryfile">libKF5WindowSystem.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>KF5 Windowing</application> API functions.
-          </para>
-          <indexterm zone="lxqt-kwindowsystem-lib">
-            <primary sortas="c-libKF5WindowSystem">libKF5WindowSystem.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-l10n.xml
===================================================================
--- archive/lxqt/desktop/lxqt-l10n.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-l10n-download-http "https://github.com/lxde/lxqt-l10n/releases/download/&lxqt-l10n-version;/lxqt-l10n-&lxqt-l10n-version;.tar.xz">-->
-  <!ENTITY lxqt-l10n-download-http "https://github.com/lxde/lxqt-l10n/releases/download/&lxqt-l10n-version;/lxqt-l10n-&lxqt-l10n-version;.tar.xz">
-  <!ENTITY lxqt-l10n-download-ftp  " ">
-  <!ENTITY lxqt-l10n-md5sum        "7f562caa4ad504f80f15985f1d48290d">
-  <!ENTITY lxqt-l10n-size          "679 KB">
-  <!ENTITY lxqt-l10n-buildsize     "37 MB for the whole translations set">
-  <!ENTITY lxqt-l10n-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-l10n" xreflabel="lxqt-l10n-&lxqt-l10n-version;">
-  <?dbhtml filename="lxqt-l10n.html"?>
-
-
-  <title>lxqt-l10n-&lxqt-l10n-version;</title>
-
-  <indexterm zone="lxqt-l10n">
-    <primary sortas="a-lxqt-l10n">lxqt-l10n</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-l10n</title>
-
-    <para>
-      The <application>lxqt-l10n</application> package provides translations
-      for all components of the <application>LXQt</application> desktop.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-l10n-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-l10n-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-l10n-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-l10n-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-l10n-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-l10n-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-l10n Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-l10n"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-l10n</title>
-
-    <para>
-      Install <application>lxqt-l10n</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DWITH_&lt;PACKAGE&gt;=no</option>: Do not install
-      translations for PACKAGE, where PACKAGE is COMPTON_CONF, LIBFM_QT,
-      LIBLXQT, LXIMAGE_QT, LXQT_ABOUT, LXQT_ADMIN, LXQT_CONFIG,
-      LXQT_GLOBALKEYS, LXQT_NOTIFICATIOND, LXQT_OPENSSH_ASKPASS, LXQT_PANEL,
-      LXQT_POLICYKIT, LXQT_POWERMANAGEMENT, LXQT_RUNNER, LXQT_SESSION,
-      LXQT_SUDO, OBCONF_QT, PCMANFM_QT, or QTERMINAL.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $LXQT_PREFIX/share/compton-conf/translations,
-          $LXQT_PREFIX/share/libfm-qt/translations,
-          $LXQT_PREFIX/share/lximage-qt/translations,
-          $LXQT_PREFIX/share/lxqt/translations,
-          $LXQT_PREFIX/share/obconf-qt/translations,
-          $LXQT_PREFIX/share/pavucontrol-qt/translations,
-          $LXQT_PREFIX/share/pcmanfm-qt/translations,
-          $LXQT_PREFIX/share/qterminal/translations, and
-          $LXQT_PREFIX/share/qterwidget/translations
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-libkscreen.xml
===================================================================
--- archive/lxqt/desktop/lxqt-libkscreen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 libkscreen-download-http "http://download.kde.org/stable/plasma/&plasma5-version;/libkscreen-&plasma5-version;.tar.xz">
-  <!ENTITY libkscreen-download-ftp  " ">
-  <!ENTITY libkscreen-md5sum        "1e3b3aa0026bf51121fa36f4380db6e5">
-  <!ENTITY libkscreen-size          "96 KB">
-  <!ENTITY libkscreen-buildsize     "9.6 MB">
-  <!ENTITY libkscreen-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="lxqt-libkscreen" xreflabel="libkscreen-&plasma5-version; for lxqt">
-  <?dbhtml filename="lxqt-libkscreen.html"?>
-
-
-  <title>Libkscreen-&plasma5-version; for lxqt</title>
-
-  <indexterm zone="lxqt-libkscreen">
-    <primary sortas="a-libkscreen">libkscreen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkscreen</title>
-
-    <para>
-      The <application>Libkscreen</application> package contains the 
-      KDE Screen Management library. 
-    </para>
-
-    &lfs82_checked;
-
-    <note>
-      <para>
-        This package is extracted from the KDE Plasma set of packages. If
-        <xref linkend="plasma5-build"/> is built, do NOT also build this
-        package as presented here.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libkscreen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libkscreen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libkscreen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libkscreen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libkscreen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libkscreen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libkscreen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-kwayland"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kwayland"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkscreen</title>
-
-    <para>
-      Install <application>libkscreen</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_LIBDIR=lib          \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev ..                         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKF5Screen.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/lib/cmake/KF5ScreenConfig, 
-          $LXQT_PREFIX/lib/libexec/kf5,
-          $LXQT_PREFIX/include/KF5/KScreen, and
-          $LXQT_PREFIX/lib/plugins/kf5/kscreen
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-libkscreen-lib">
-        <term><filename class="libraryfile">libKF5Screen.so</filename></term>
-        <listitem>
-          <para>
-            contains the KDE Screen Management library 
-          </para>
-          <indexterm zone="lxqt-libkscreen-lib">
-            <primary sortas="c-libKF5Screen">libKF5Screen.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-notificationd.xml
===================================================================
--- archive/lxqt/desktop/lxqt-notificationd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-notificationd-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-notificationd-&lxqt-notificationd-version;.tar.xz">-->
-  <!ENTITY lxqt-notificationd-download-http "https://github.com/lxde/lxqt-notificationd/releases/download/&lxqt-notificationd-version;/lxqt-notificationd-&lxqt-notificationd-version;.tar.xz">
-  <!ENTITY lxqt-notificationd-download-ftp  " ">
-  <!ENTITY lxqt-notificationd-md5sum        "1cf3e6aaeb2cc4b3973d493ad7fd3503">
-  <!ENTITY lxqt-notificationd-size          "31 KB">
-  <!ENTITY lxqt-notificationd-buildsize     "3.7 MB">
-  <!ENTITY lxqt-notificationd-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-notificationd" xreflabel="lxqt-notificationd-&lxqt-notificationd-version;">
-  <?dbhtml filename="lxqt-notificationd.html"?>
-
-
-  <title>lxqt-notificationd-&lxqt-notificationd-version;</title>
-
-  <indexterm zone="lxqt-notificationd">
-    <primary sortas="a-lxqt-notificationd">lxqt-notificationd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-notificationd</title>
-
-    <para>
-      The <application>lxqt-notificationd</application> package is the
-      <application>LXQt</application> notification daemon.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-notificationd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-notificationd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-notificationd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-notificationd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-notificationd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-notificationd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-notificationd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-notificationd"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-notificationd</title>
-
-    <para>
-      Install <application>lxqt-notificationd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-notificationd and lxqt-notificationd
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-notificationd">
-        <term><command>lxqt-config-notificationd</command></term>
-        <listitem>
-          <para>
-            is the <command>lxqt-notificationd</command> GUI configuration tool.
-          </para>
-          <indexterm zone="lxqt-notificationd lxqt-config-notificationd">
-            <primary sortas="b-lxqt-config-notificationd">lxqt-config-notificationd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-notificationd-prog">
-        <term><command>lxqt-notificationd</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> notification daemon.
-          </para>
-          <indexterm zone="lxqt-notificationd lxqt-notificationd-prog">
-            <primary sortas="b-lxqt-notificationd">lxqt-notificationd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-panel.xml
===================================================================
--- archive/lxqt/desktop/lxqt-panel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,220 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-panel-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-panel-&lxqt-panel-version;.tar.xz">-->
-  <!ENTITY lxqt-panel-download-http "https://github.com/lxde/lxqt-panel/releases/download/&lxqt-panel-version;/lxqt-panel-&lxqt-panel-version;.tar.xz">
-  <!ENTITY lxqt-panel-download-ftp  " ">
-  <!ENTITY lxqt-panel-md5sum        "58bf215ddfb9727d8c494618c58064e5">
-  <!ENTITY lxqt-panel-size          "265 KB">
-  <!ENTITY lxqt-panel-buildsize     "24 MB">
-  <!ENTITY lxqt-panel-time          "1.3 SBU">
-]>
-
-<sect1 id="lxqt-panel" xreflabel="lxqt-panel-&lxqt-panel-version;">
-  <?dbhtml filename="lxqt-panel.html"?>
-
-
-  <title>lxqt-panel-&lxqt-panel-version;</title>
-
-  <indexterm zone="lxqt-panel">
-    <primary sortas="a-lxqt-panel">lxqt-panel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-panel</title>
-
-    <para>
-      The <application>lxqt-panel</application> package contains a
-      lightweight X11 desktop panel.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-panel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-panel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-panel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-panel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-panel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-panel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-panel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref role="nodep" linkend="kf5-frameworks"/> or 
-<!-- role="nodep" implies that jhalfs users will not depend on the whole
-     kf5 stack. If they have built kf5, it is easy to remove the
-     lxqt-kguiaddons and lxqt-solid scripts.-->
-      (<xref linkend="lxqt-kguiaddons"/> and 
-       <xref linkend="lxqt-solid"/>) (keyboard indicator plugin),     
-      <xref linkend="lxqt-globalkeys"/>,
-      <xref linkend="libdbusmenu-qt"/>,
-      <xref linkend="liblxqt"/>,
-      <xref linkend="lxmenu-data"/>, and
-      <xref linkend="menu-cache"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/> or
-      <xref linkend="pulseaudio"/> (volume plugin; see Command Explanations below
-         if not present),
-      <xref linkend="libstatgrab"/> (network monitor and CPU load plugins),
-      <xref linkend="libsysstat"/> (CPU and network monitor plugins),
-      <xref linkend="libxkbcommon"/> (keyboard indicator plugin), and
-      <xref linkend="lm_sensors"/> (sensors plugin)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-panel"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-panel</title>
-
-    <para>
-      Install <application>lxqt-panel</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e 's:&lt;KF5/KWindowSystem/:&lt;:'               \
-    -i plugin-taskbar/lxqttaskgroup.{h,cpp}     &amp;&amp;
-
-mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... plugin-taskbar/lxqttaskgroup.{h,cpp}</command>: 
-      Removes a hard coded directory from an include file and allows
-      the system to find it when the KDE Framework dependencies are not
-      installed in <envar>$LXQT_PREFIX</envar>.
-    </para>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-    <para>
-      <option>-D&lt;plugin&gt;_PLUGIN=no</option>: Disable &lt;plugin&gt;,
-      where &lt;plugin&gt; may be CLOCK, COLORPICKER, CPULOAD, DIRECTORYMENU,
-      DESKTOPSWITCH, KBINDICATOR, MAINMENU, MOUNT, QUICKLAUNCH, SENSORS,
-      SHOWDESKTOP, NETWORKMONITOR, SYSSTAT, TASKBAR, STATUSNOTIFIER, TRAY,
-      VOLUME, WORLDCLOCK, or SPACER,
-    </para>
-
-    <para>
-      <option>-DVOLUME_USE_&lt;backend&gt;=no</option>: Disable support
-      for &lt;backend&gt; in volume plugin, where backend is ALSA or PULSEAUDIO.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-panel
-        </seg>
-        <seg>
-          several plugins under $LXQT_PREFIX/lib/lxqt-panel
-        </seg>
-        <seg>
-          /etc/xdg/lxqt,
-          $LXQT_PREFIX/share/lxqt/lxqt-panel and
-          $LXQT_PREFIX/lib/lxqt-panel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-panel-prog">
-        <term><command>lxqt-panel</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>Qt5</application> based
-            panel for the <application>LXQt</application> Desktop.
-          </para>
-          <indexterm zone="lxqt-panel lxqt-panel-prog">
-            <primary sortas="b-lxqt-panel">lxqt-panel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-policykit.xml
===================================================================
--- archive/lxqt/desktop/lxqt-policykit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-policykit-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-policykit-&lxqt-policykit-version;.tar.xz">-->
-  <!ENTITY lxqt-policykit-download-http "https://github.com/lxde/lxqt-policykit/releases/download/&lxqt-policykit-version;/lxqt-policykit-&lxqt-policykit-version;.tar.xz">
-  <!ENTITY lxqt-policykit-download-ftp  " ">
-  <!ENTITY lxqt-policykit-md5sum        "8d0380fd7d629e5416bad60caed16980">
-  <!ENTITY lxqt-policykit-size          "32 KB">
-  <!ENTITY lxqt-policykit-buildsize     "1.5 MB">
-  <!ENTITY lxqt-policykit-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-policykit" xreflabel="lxqt-policykit-&lxqt-policykit-version;">
-  <?dbhtml filename="lxqt-policykit.html"?>
-
-
-  <title>lxqt-policykit-&lxqt-policykit-version;</title>
-
-  <indexterm zone="lxqt-policykit">
-    <primary sortas="a-lxqt-policykit">lxqt-policykit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-policykit</title>
-
-    <para>
-      The <application>lxqt-policykit</application> package is the
-      <application>LXQt</application> PolicyKit agent.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-policykit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-policykit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-policykit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-policykit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-policykit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-policykit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-policykit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      <xref linkend="polkit-qt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-policykit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-policykit</title>
-
-    <para>
-      Install <application>lxqt-policykit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..                                  &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-policykit-agent
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-policykit-agent-prog">
-        <term><command>lxqt-policykit-agent</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> PolicyKit agent.
-          </para>
-          <indexterm zone="lxqt-policykit lxqt-policykit-agent-prog">
-            <primary sortas="b-lxqt-policykit-agent">lxqt-policykit-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-powermanagement.xml
===================================================================
--- archive/lxqt/desktop/lxqt-powermanagement.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-powermanagement-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-powermanagement-&lxqt-powermanagement-version;.tar.xz">-->
-  <!ENTITY lxqt-powermanagement-download-http "https://github.com/lxde/lxqt-powermanagement/releases/download/&lxqt-powermanagement-version;/lxqt-powermanagement-&lxqt-powermanagement-version;.tar.xz">
-  <!ENTITY lxqt-powermanagement-download-ftp  " ">
-  <!ENTITY lxqt-powermanagement-md5sum        "c780b96805347d18a9ac5e23fd46ad3b">
-  <!ENTITY lxqt-powermanagement-size          "30 KB">
-  <!ENTITY lxqt-powermanagement-buildsize     "4.5 MB">
-  <!ENTITY lxqt-powermanagement-time          "0.3 SBU">
-]>
-
-<sect1 id="lxqt-powermanagement" xreflabel="lxqt-powermanagement-&lxqt-powermanagement-version;">
-  <?dbhtml filename="lxqt-powermanagement.html"?>
-
-
-  <title>lxqt-powermanagement-&lxqt-powermanagement-version;</title>
-
-  <indexterm zone="lxqt-powermanagement">
-    <primary sortas="a-lxqt-powermanagement">lxqt-powermanagement</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-powermanagement</title>
-
-    <para>
-      The <application>lxqt-powermanagement</application> package provides the
-      power management module for <application>LXQt</application>.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-powermanagement-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-powermanagement-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-powermanagement-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-powermanagement-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-powermanagement-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-powermanagement-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-powermanagement Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      (<xref linkend="lxqt-kidletime"/> and
-       <xref linkend="lxqt-solid"/>) or
-      <xref role="nodep" linkend="kf5-frameworks"/>, and
-<!-- role="nodep" implies that jhalfs users will not depend on the whole
-     kf5 stack. If they have built kf5, it is easy to remove the
-     lxqt-kidletime and lxqt-solid scripts.-->
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-powermanagement"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-powermanagement</title>
-
-    <para>
-      Install <application>lxqt-powermanagement</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Remove the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-powermanagement and lxqt-powermanagement
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-powermanagement">
-        <term><command>lxqt-config-powermanagement</command></term>
-        <listitem>
-          <para>
-            is the <command>lxqt-powermanagement</command> GUI configuration
-            tool.
-          </para>
-          <indexterm zone="lxqt-powermanagement lxqt-config-powermanagement">
-            <primary sortas="b-lxqt-config-powermanagement">lxqt-config-powermanagement</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-powermanagement-prog">
-        <term><command>lxqt-powermanagement</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> power management module.
-          </para>
-          <indexterm zone="lxqt-powermanagement lxqt-powermanagement-prog">
-            <primary sortas="b-lxqt-powermanagement">lxqt-powermanagement</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-qtplugin.xml
===================================================================
--- archive/lxqt/desktop/lxqt-qtplugin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +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 lxqt-qtplugin-download-http "https://github.com/lxde/lxqt-qtplugin/releases/download/&lxqt-qtplugin-version;/lxqt-qtplugin-&lxqt-qtplugin-version;.tar.xz">
-  <!ENTITY lxqt-qtplugin-download-ftp  " ">
-  <!ENTITY lxqt-qtplugin-md5sum        "9d5d1b427af93333d24b96ec197355b3">
-  <!ENTITY lxqt-qtplugin-size          "23 KB">
-  <!ENTITY lxqt-qtplugin-buildsize     "2.6 MB">
-  <!ENTITY lxqt-qtplugin-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-qtplugin" xreflabel="lxqt-qtplugin-&lxqt-qtplugin-version;">
-  <?dbhtml filename="lxqt-qtplugin.html"?>
-
-
-  <title>lxqt-qtplugin-&lxqt-qtplugin-version;</title>
-
-  <indexterm zone="lxqt-qtplugin">
-    <primary sortas="a-lxqt-qtplugin">lxqt-qtplugin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-qtplugin</title>
-
-    <para>
-      The <application>lxqt-qtplugin</application> package provides an
-      <application>LXQt</application> <application>Qt</application> platform
-      integration plugin.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-qtplugin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-qtplugin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-qtplugin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-qtplugin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-qtplugin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-qtplugin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-qtplugin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and
-      <xref linkend="libdbusmenu-qt"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-qtplugin"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-qtplugin</title>
-
-    <para>
-      Install <application>lxqt-qtplugin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      ..       &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="configuration">
-    <title>Configuring lxqt-qtplugin</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        To use the plugin in Qt 5, the environment variable
-        <envar>QT_QPA_PLATFORMTHEME</envar> must be set to <quote>lxqt</quote>.
-        One way to do that is to issue as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/lxqt.sh &lt;&lt; "EOF"
-<literal># Begin lxqt-qtplugin configuration
-
-export QT_QPA_PLATFORMTHEME=lxqt
-
-# End lxqt-qtplugin configuration</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libqtlxqt.so (in $QT5DIR/plugins/platformthemes)
-        </seg>
-        <seg>
-          $QT5DIR/plugins/platformthemes (if a minimal Qt5 has been built
-          as explained in <xref linkend="lxqt-pre-install"/>
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-
-      <varlistentry id="libqtlxqt-lib">
-        <term><filename class="libraryfile">libqtlxqt.so</filename></term>
-        <listitem>
-          <para>
-            contains the LXQt QT plugin.
-          </para>
-          <indexterm zone="lxqt-qtplugin libqtlxqt-lib">
-            <primary sortas="c-libqtlxqt">libqtlxqt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-runner.xml
===================================================================
--- archive/lxqt/desktop/lxqt-runner.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-runner-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-runner-&lxqt-runner-version;.tar.xz">-->
-  <!ENTITY lxqt-runner-download-http "https://github.com/lxde/lxqt-runner/releases/download/&lxqt-runner-version;/lxqt-runner-&lxqt-runner-version;.tar.xz">
-  <!ENTITY lxqt-runner-download-ftp  " ">
-  <!ENTITY lxqt-runner-md5sum        "b15f2d698bbe89a4e391a56bb55e892d">
-  <!ENTITY lxqt-runner-size          "207 KB">
-  <!ENTITY lxqt-runner-buildsize     "3.6 MB">
-  <!ENTITY lxqt-runner-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-runner" xreflabel="lxqt-runner-&lxqt-runner-version;">
-  <?dbhtml filename="lxqt-runner.html"?>
-
-
-  <title>lxqt-runner-&lxqt-runner-version;</title>
-
-  <indexterm zone="lxqt-runner">
-    <primary sortas="a-lxqt-runner">lxqt-runner</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-runner</title>
-
-    <para>
-      The <application>lxqt-runner</application> package provides a tool used
-      to launch programs quickly by typing their names.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-runner-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-runner-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-runner-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-runner-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-runner-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-runner-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-runner Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-globalkeys"/> and
-      <xref linkend="menu-cache"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files), and
-      <ulink url="http://muparser.beltoforion.de">muparser</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-runner"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-runner</title>
-
-    <para>
-      Install <application>lxqt-runner</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DRUNNER_MATH=OFF                   \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DRUNNER_MATH=OFF</parameter>: Removes the dependency on
-      <application>muparser</application>. If you want Math expression support,
-      in <application>lxqt-runner</application>, install
-      <application>muparser</application> and remove this switch.
-    </para>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="use">
-    <title>Using lxqt-runner</title>
-
-    <para>
-      To use <application>lxqt-runner</application>, simultaneously press the
-      Alt-F2 keys.  A dialogue window appears in the top center of the screen.
-      When you start typing the command, a list of possible matches appears and
-      changes as you keep typing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-runner
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-runner-prog">
-        <term><command>lxqt-runner</command></term>
-        <listitem>
-          <para>
-            launches a graphical dialog box for quickly running a program.
-          </para>
-          <indexterm zone="lxqt-runner lxqt-runner-prog">
-            <primary sortas="b-lxqt-runner">lxqt-runner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-session.xml
===================================================================
--- archive/lxqt/desktop/lxqt-session.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,259 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-session-download-http "&lxqt-http-repo;/&lxqt-version;/lxqt-session-&lxqt-session-version;.tar.xz">-->
-  <!ENTITY lxqt-session-download-http "https://github.com/lxde/lxqt-session/releases/download/&lxqt-session-version;/lxqt-session-&lxqt-session-version;.tar.xz">
-  <!ENTITY lxqt-session-download-ftp  " ">
-  <!ENTITY lxqt-session-md5sum        "b5d10deb6ccc964b14f93c3a6451b069">
-  <!ENTITY lxqt-session-size          "131 KB">
-  <!ENTITY lxqt-session-buildsize     "7.7 MB">
-  <!ENTITY lxqt-session-time          "0.3 SBU">
-]>
-
-<sect1 id="lxqt-session" xreflabel="lxqt-session-&lxqt-session-version;">
-  <?dbhtml filename="lxqt-session.html"?>
-
-
-  <title>lxqt-session-&lxqt-session-version;</title>
-
-  <indexterm zone="lxqt-session">
-    <primary sortas="a-lxqt-session">lxqt-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-session</title>
-
-    <para>
-      The <application>lxqt-session</application> package contains the default
-      session manager for <application>LXQt</application>.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      (<xref linkend="lxqt-kwindowsystem"/> or
-       <xref role="nodep" linkend="kf5-frameworks"/>), and
-<!-- role="nodep" implies that jhalfs users will not depend on the whole
-     kf5 stack. If they have built kf5, it is easy to remove the
-     lxqt-kwindowsystem script.-->
-      <xref linkend="xdg-user-dirs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-session"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-session</title>
-
-    <para>
-      Install <application>lxqt-session</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e '/TryExec/s@=@='$LXQT_PREFIX'/bin/@' \
-    -i xsession/lxqt.desktop.in &amp;&amp;
-
-mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e '/TryExec/s@=@='$LXQT_PREFIX'/bin/@' -i xsessions/lxqt.desktop.in</command>:
-      If using a display manager, the full path of the <quote>TryExec</quote>
-      directive has to be given so that the <application>LXQt</application>
-      desktop appear in the sessions list.
-    </para>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring lxqt-session</title>
-
-    <para>
-      Window Managers other than <xref linkend="openbox"/> may be used, e.g.
-      <xref linkend="xfwm4"/>. Notice that <xref linkend="icewm"/> is not a
-      valid replacement. <application>Fluxbox</application> does work, although
-      in this context (with <xref linkend="lxqt-config"/>) <xref
-      linkend="openbox"/> is better.  The configuration file
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename> comes with several
-      examples of Window Managers and the ones which are installed will appear
-      in a drop down list of <command>lxqt-config-session</command>. For the
-      ones not included in
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>, you can use the
-      <command>lxqt-config-session</command> "search" button, e.g. for <xref
-      linkend="fluxbox"/>, navigating through the file system until you can
-      choose <command>fluxbox</command>. Alternatively, if you wish the Window
-      Manager of your choice to appear in the drop down list, include it in
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>. For <xref
-      linkend="fluxbox"/>, include the line
-    </para>
-
-<screen role="nodump"><userinput><literal>fluxbox/Name=Fluxbox</literal></userinput></screen>
-
-    <para>
-      and it will appear as an option in the drop down list. To change the WM,
-      after selecting it, you need to restart the session.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-session, lxqt-leave, lxqt-session, and startlxqt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-session-prog">
-        <term><command>lxqt-config-session</command></term>
-        <listitem>
-          <para>
-            is a GUI configuration tool for <command>lxqt-session</command>
-            settings.
-          </para>
-          <indexterm zone="lxqt-session lxqt-config-session-prog">
-            <primary sortas="b-lxqt-config-session">lxqt-config-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-leave-prog">
-        <term><command>lxqt-leave</command></term>
-        <listitem>
-          <para>
-            is a graphical dialog to terminate the session.
-          </para>
-          <indexterm zone="lxqt-session lxqt-leave-prog">
-            <primary sortas="b-lxqt-leave">lxqt-leave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-session-prog">
-        <term><command>lxqt-session</command></term>
-        <listitem>
-          <para>
-            is a lightweight X session manager.
-          </para>
-          <indexterm zone="lxqt-session lxqt-session-prog">
-            <primary sortas="b-lxqt-session">lxqt-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="startlxqt">
-        <term><command>startlxqt</command></term>
-        <listitem>
-          <para>
-            is used to start the desktop session for
-            <application>LXQt</application>.
-          </para>
-          <indexterm zone="lxqt-session startlxqt">
-            <primary sortas="b-startlxqt">startlxqt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-solid.xml
===================================================================
--- archive/lxqt/desktop/lxqt-solid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY solid-download-http "&kf5-download-http;/solid-&kf5-version;.tar.xz">
-  <!ENTITY solid-download-ftp  " ">
-  <!ENTITY solid-md5sum        "a961e64883eb99d7ddd374d8e64f77ab">
-  <!ENTITY solid-size          "252 KB">
-  <!ENTITY solid-buildsize     "28 MB">
-  <!ENTITY solid-time          "1.8 SBU">
-]>
-
-<sect1 id="lxqt-solid" xreflabel="solid-&kf5-version; for lxqt">
-  <?dbhtml filename="lxqt-solid.html"?>
-
-
-  <title>Solid-&kf5-version; for lxqt</title>
-
-  <indexterm zone="lxqt-solid">
-    <primary sortas="a-solid">solid</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to solid</title>
-
-    <para>
-      <application>Solid</application> is a device integration framework.  It
-      provides a way of querying and interacting with hardware independently of
-      the underlying operating system.
-    </para>
-
-    &lfs82_checked;
-
-    <note><para>This package is extracted from the KF5 set of packages.  If
-    <xref linkend="kf5-frameworks"/> is built, do NOT also build this package 
-    as presented here.</para></note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&solid-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&solid-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &solid-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &solid-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &solid-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &solid-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Solid Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="udisks2"/>,
-      <xref role="runtime" linkend="upower"/>, and
-      <ulink role="runtime"
-             url="http://www.freedesktop.org/wiki/Software/media-player-info">
-      media-player-info</ulink> 
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/solid"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of solid</title>
-
-    <para>
-      Install <application>solid</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev ..                         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          solid-hardware5
-        </seg>
-        <seg>
-          libKF5Solid.so and libsolidextensionplugin.so
-        </seg>
-        <seg>
-          $LXQT_PREFIX/lib/cmake/KF5Solid, 
-          $LXQT_PREFIX/include/KF5/Solid, and
-          $LXQT_PREFIX/lib/qml/org/kde/solid
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-solid-lib">
-        <term><filename class="libraryfile">libKF5Solid.so</filename></term>
-        <listitem>
-          <para>
-            provides a way of querying and interacting with hardware
-            independently of the underlying operating system.
-          </para>
-          <indexterm zone="lxqt-solid-lib">
-            <primary sortas="c-libKF5Solid">libKF5solid.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/lxqt-themes.xml
===================================================================
--- archive/lxqt/desktop/lxqt-themes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY lxqt-common-download-http "https://github.com/lxde/lxqt-common/releases/download/&lxqt-common-version;/lxqt-common-&lxqt-common-version;.tar.xz">-->
-  <!ENTITY lxqt-themes-download-http "https://github.com/lxde/lxqt-themes/releases/download/&lxqt-themes-version;/lxqt-themes-&lxqt-themes-version;.tar.xz">
-  <!ENTITY lxqt-themes-download-ftp  " ">
-  <!ENTITY lxqt-themes-md5sum        "e468462aa42b6d8e6e7d24403e100226">
-  <!ENTITY lxqt-themes-size          "3.1 MB">
-  <!ENTITY lxqt-themes-buildsize     "8.2 MB">
-  <!ENTITY lxqt-themes-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-themes" xreflabel="lxqt-themes-&lxqt-themes-version;">
-  <?dbhtml filename="lxqt-themes.html"?>
-
-
-  <title>lxqt-themes-&lxqt-themes-version;</title>
-
-  <indexterm zone="lxqt-themes">
-    <primary sortas="a-lxqt-themes">lxqt-themes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-themes</title>
-
-    <para>
-      The <application>lxqt-themes</application> package provides a number of
-      graphic files and themes for ithe <application>LXQt</application>
-      desktop.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-themes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-themes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-themes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-themes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-themes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-themes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-themes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-build-tools"/>,
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-themes"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-themes</title>
-
-    <para>
-      Install <application>lxqt-themes</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      ..       &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>mkdir -pv $LXQT_PREFIX/share/lxqt/graphics &amp;&amp;
-make install</userinput></screen>
-
-  </sect2>
-
-<!--  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $LXQT_PREFIX/share/lxqt/{graphics,themes}}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/pcmanfm-qt.xml
===================================================================
--- archive/lxqt/desktop/pcmanfm-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +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;
-
-<!-- As of August 2017, downloads.lxqt.org is down. Use github archives
-     instead, but keep the old link in case the host become available again.
-     According to lxqt devs, they are working on it...
-  <!ENTITY pcmanfm-qt-download-http "http://downloads.lxqt.org/pcmanfm-qt/&pcmanfm-qt-version;/pcmanfm-qt-&pcmanfm-qt-version;.tar.xz">-->
-  <!ENTITY pcmanfm-qt-download-http "https://github.com/lxde/pcmanfm-qt/releases/download/&pcmanfm-qt-version;/pcmanfm-qt-&pcmanfm-qt-version;.tar.xz">
-  <!ENTITY pcmanfm-qt-download-ftp  " ">
-  <!ENTITY pcmanfm-qt-md5sum        "eb83bc0d37381cc9e6fb27f1be9a07ef">
-  <!ENTITY pcmanfm-qt-size          "98 KB">
-  <!ENTITY pcmanfm-qt-buildsize     "8.7 MB">
-  <!ENTITY pcmanfm-qt-time          "0.3 SBU">
-]>
-
-<sect1 id="pcmanfm-qt" xreflabel="pcmanfm-qt-&pcmanfm-qt-version;">
-  <?dbhtml filename="pcmanfm-qt.html"?>
-
-
-  <title>pcmanfm-qt-&pcmanfm-qt-version;</title>
-
-  <indexterm zone="pcmanfm-qt">
-    <primary sortas="a-pcmanfm-qt">pcmanfm-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pcmanfm-qt</title>
-
-    <para>
-      The <application>pcmanfm-qt</application> is a file manager and desktop
-      icon manager (<application>Qt</application> port of
-      <application>pcmanfm</application> and <application>libfm</application>).
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcmanfm-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcmanfm-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcmanfm-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcmanfm-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcmanfm-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcmanfm-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pcmanfm-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      <xref linkend="libfm-qt"/>, and
-      <xref linkend="lxmenu-data"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="oxygen-icons5"/> or another icon theme (depending on your
-      choice, some icons will be missing in several places)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download translation files) or
-      <xref linkend="lxqt-l10n"/> (to add localization files)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/pcmanfm-qt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pcmanfm-qt</title>
-
-    <para>
-      Install <application>pcmanfm-qt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release          \
-      -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DPULL_TRANSLATIONS=no              \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcmanfm-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/xdg/pcmanfm-qt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcmanfm-qt-prog">
-        <term><command>pcmanfm-qt</command></term>
-        <listitem>
-          <para>
-            is a file manager.
-          </para>
-          <indexterm zone="pcmanfm-qt pcmanfm-qt-prog">
-            <primary sortas="b-pcmanfm-qt">pcmanfm-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/post-install.xml
===================================================================
--- archive/lxqt/desktop/post-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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="lxqt-post-install" xreflabel="LXQt-Post-Install">
-  <?dbhtml filename="post-install.html"?>
-
-
-  <title>LXQt Desktop Final Instructions</title>
-
-  <indexterm zone="lxqt-post-install">
-    <primary sortas="g-lxqt-post-install">LXQt-post-install</primary>
-  </indexterm>
-
-  <sect2 role="package">
-  <title>Post-Install Instructions</title>
-
-    <para>
-      Final steps, before starting <application>LXQt</application>.
-    </para>
-
-    <bridgehead renderas="sect3">Dependencies to Start LXQt</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openbox"/>, or another window manager, such as
-      <xref role="nodep" linkend="xfwm4"/>, or
-      kwin from <xref role="nodep" linkend="plasma5-build"/>.
-      Note that <xref role="nodep" linkend="icewm"/> is not suitable for LXQt
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv">
-        <xref linkend="consolekit"/> with
-        <xref linkend="pm-utils"/>,
-      </phrase>
-      <xref linkend="lightdm"/> or another Display Manager, e.g.
-      <xref role="nodep" linkend="lxdm"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="shared-mime-info"/>,
-      <xref linkend="xdg-utils"/>, and
-      <xref linkend="xscreensaver"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/post-install"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Final Configuration</title>
-
-    <para>
-      If <application>LXQt</application> is installed in <filename
-      class="directory">/usr</filename>, jump directly to <xref
-      linkend="lxqt-final-updates"/>, otherwise run the commands in the
-      next section.
-    </para>
-
-    <sect3>
-      <title>Configuration needed only if installing into /opt</title>
-      <para>
-        If <application>LXQt</application> is installed into <filename
-        class="directory">/opt</filename>, some files have to be copied to
-        <filename class="directory">/usr/share</filename>, so that the system
-        can find them. Run the following commands, as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -svfn $LXQT_PREFIX/share/lxqt /usr/share/lxqt &amp;&amp;
-
-cp -v {$LXQT_PREFIX,/usr}/share/xsessions/lxqt.desktop &amp;&amp;
-
-for i in $LXQT_PREFIX/share/applications/*
-do
-  ln -svf $i /usr/share/applications/
-done
-
-for i in $LXQT_PREFIX/share/desktop-directories/*
-do
-  ln -svf $i /usr/share/desktop-directories/
-done
-
-unset i
-
-ldconfig</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="lxqt-final-updates" xreflabel="LXQt Final Updates">
-      <title>LXQt Final Updates</title>
-
-      <para>
-        The desktop databases have to be created or updated at this point.
-        Run the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>update-mime-database /usr/share/mime          &amp;&amp;
-xdg-icon-resource forceupdate --theme hicolor &amp;&amp;
-update-desktop-database -q</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="starting">
-    <title>Starting LXQt</title>
-
-    <para revision="sysv">
-      You can start <application>LXQt</application> from runlevel 3, using
-      <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="lightdm"/>.
-    </para>
-
-    <para revision="systemd">
-      You can start <application>LXQt</application> from a TTY, using
-      <xref linkend="xinit"/>, or by using a graphical display manager such
-      as <xref linkend="lightdm"/>.
-    </para>
-
-    <para>
-      To start <application>LXQt</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>ck-launch-session dbus-launch --exit-with-session startlxqt</literal>
-EOF
-
-startx</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>dbus-launch --exit-with-session startlxqt</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      The X session starts on the first unused virtual terminal, normally vt7.
-      You can switch to another vt<emphasis>n</emphasis> simultaneously
-      pressing the keys Ctrl-Alt-F<emphasis>n</emphasis>
-      (<emphasis>n</emphasis>=1, 2, ...).  To switch back to the X session,
-      normally started at vt7, use Ctrl-Alt-F7. The vt where the command
-      <command>startx</command> was executed will display many messages,
-      including X starting messages, applications automatically started with
-      the session, and eventually, some warning and error messages. You may
-      prefer to redirect those messages to a log file, which not only will keep
-      the initial vt uncluttered, but can also be used for debug purposes. This
-      can be done starting X with:
-    </para>
-
-    <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-    <note revision="sysv">
-      <para>
-        You may wish to drop consolekit and/or dbus-launch, e.g., just using
-        startlxqt in ~/.xinitrc. However some capabilities such as mounting or
-        umounting file systems from a file manager will not be possible, or the
-        reboot option will be absent or inoperative, among other problems.
-      </para>
-    </note>
-
-    <para>
-      When shutting down or rebooting, the shutdown messages appear on the vt
-      where X was running. If you wish to see those messages, simultaneously
-      press keys Alt-F7 (assuming that X was running on vt7).
-    </para>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/desktop/pre-install.xml
===================================================================
--- archive/lxqt/desktop/pre-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,266 +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="lxqt-pre-install" xreflabel="LXQt Pre-Install">
-  <?dbhtml filename="pre-install.html"?>
-
-
-  <title>LXQt Desktop Pre-Install Instructions</title>
-
-  <indexterm zone="lxqt-pre-install">
-    <primary sortas="g-lxqt-pre-install">LXQt Pre-Install</primary>
-  </indexterm>
-
-  <caution>
-    <para>
-      Due to recent changes in <command>grep</command> it is essential that
-      the installing system be set to a UTF-8 locale. An example
-      is <command>export LANG=en_US.UTF-8</command>, but any UTF-8 locale is
-      sufficient. Failure to do this will result in a faulty installation.
-    </para>
-  </caution>
-
-    <para>
-      LXQt can be installed in /usr or /opt/lxqt.
-    </para>
-
-  <sect2>
-    <title>Installing in /usr</title>
-
-    <para>
-      Installing in <filename class="directory">/usr</filename> creates
-      a simpler setup.  Run:
-    </para>
-
-<screen><userinput>export LXQT_PREFIX=/usr</userinput></screen>
-
-    <para>
-      Either add that to your own <filename>.bash_profile</filename>
-      so that it will still be set if you build the packages over a
-      period of time, or else add it to the system profile as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/lxqt.sh &lt;&lt; "EOF"
-<literal># Begin LXQt profile
-
-export LXQT_PREFIX=/usr
-
-# End LXQt profile</literal>
-EOF</userinput></screen>
-
-    <para>
-      There is no other configuration needed to install LXQt in 
-      <filename class="directory">/usr</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Installing in /opt/lxqt</title>
-
-    <para>
-      Installing in <filename class="directory">/opt/lxqt</filename> may
-      simplify upgrading to a later version of LXQt.
-    </para>
-
-    <para>
-      Some variables need to be defined in your system profile, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /opt/lxqt/{bin,lib,share/man}
-
-cat &gt; /etc/profile.d/lxqt.sh &lt;&lt; "EOF"
-<literal># Begin LXQt profile
-
-export LXQT_PREFIX=/opt/lxqt
-
-pathappend /opt/lxqt/bin           PATH
-pathappend /opt/lxqt/share/man/    MANPATH
-pathappend /opt/lxqt/lib/pkgconfig PKG_CONFIG_PATH
-pathappend /opt/lxqt/lib/plugins   QT_PLUGIN_PATH
-
-# End LXQt profile</literal>
-EOF
-
-cat &gt;&gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal>
-# Begin Qt5 changes for LXQt
-
-pathappend $QT5DIR/plugins         QT_PLUGIN_PATH
-
-# End Qt5 changes for LXQt</literal>
-EOF</userinput></screen>
-
-    <para>
-      Expand your <filename>/etc/ld.so.conf</filename> file:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal>
-# Begin LXQt addition
-
-/opt/lxqt/lib
-
-# End LXQt addition
-</literal>
-EOF</userinput></screen>
-
-    <para>
-      Before starting to install the packages in the following pages, remember
-      to execute:
-    </para>
-
-<screen><userinput>source /etc/profile</userinput></screen>
-
-    <para>
-      Some packages from the KDE Frameworks 5 bundle install files into D-Bus
-      directories. In order to have D-Bus find those files, the easiest
-      way is to create a symlink. Some packages may also install icons from
-      the <quote>hicolor</quote> icon set. Since that icon set is used by many
-      packages, it is a good idea to create a symlink to the one in <filename
-      class="directory">/usr/share</filename> to avoid having multiple
-      installations of <xref linkend="hicolor-icon-theme"/>. Run the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>source /etc/profile                                       &amp;&amp;
-install -v -dm755                $LXQT_PREFIX/share/icons &amp;&amp;
-ln -sfv /usr/share/icons/hicolor $LXQT_PREFIX/share/icons &amp;&amp;
-ln -sfv /usr/share/dbus-1        $LXQT_PREFIX/share </userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/lxqt</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/lxqt-&lxqt-version;</filename>. After installing
-        <application>LXQt Desktop</application>, you may rename the directory
-        and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mv /opt/lxqt{,-&lxqt-version;}
-ln -sfv lxqt-&lxqt-version; /opt/lxqt</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of <application>LXQt
-        Desktop</application>. To do that, just remove the symlink and use
-        <filename class="directory">/opt/lxqt</filename> as the prefix again.
-        Which version of <application>LXQt Desktop</application> you use
-        depends only on where the symlink points. No other reconfiguration will
-        be needed.
-      </para>
-    </tip>
-
-  </sect2>
-
-  <sect2>
-    <title>Notes about building LXQt dependencies</title>
-
-    <para>
-      <application>LXQt</application> obviously needs <xref linkend="qt5"/>,
-      but not all Qt5 modules and dependencies are necessary. Since the aim
-      of <application>LXQt</application> is to be light weight, it may be
-      interesting to cut down the Qt5 overhead, and to build only parts of it.
-      To build Qt and LXQT dependencies, the proposed order is the following:
-    </para>
-
-    <procedure>
-      <step>
-        <para>
-          Build <xref linkend="linux-pam"/>, <xref linkend="shadow"/>,
-          and <xref linkend="sudo"/>, with their dependencies
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Build the whole <xref linkend="x-window-system"/> chapter, with
-          Wayland support, and replacing twm vith <xref linkend="openbox"/>
-          (and its required dependencies). Some Xorg applications and fonts
-          may be omitted, but with a negligible impact on build time and size
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Build <xref linkend="gtk2"/> and its required and recommended
-          dependencies. GTK+2 is needed for <xref linkend="libfm"/>, and
-          brings the <command>gtk-update-icon-cache</command> executable,
-          which is needed by libqtxdg
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Build required Qt dependencies, and some of the recommended or
-          optional dependencies, namely:
-          <xref linkend="openssl10"/>,
-          <xref linkend="dbus"/>,
-          <xref linkend="alsa-lib"/>,
-          <xref linkend="pulseaudio"/>, and
-          <xref linkend="libxkbcommon"/>
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Build the required parts of <xref linkend="qt5"/>. To skip all
-          modules but the four needed for LXQt, do:
-        </para>
-<screen role="nodump"><userinput>ls -Fd qt* | grep / | sed 's/^/-skip /;s/qt//;s@/@@' > tempconf
-sed -i '/base/d;/tools/d;/x11extras/d;/svg/d' tempconf
-# if you plan to build SDDM, add:
-sed -i '/declarative/d' tempconf
-./configure &lt;book flags&gt; $(cat tempconf)</userinput></screen>
-        <para>
-          The time needed to complete the Qt installation is thus reduced to
-          around 6 SBU
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Build miscellaneous dependencies (with their required ones):
-          <xref linkend="libexif"/>,
-          <xref linkend="libstatgrab"/>,
-          <xref linkend="polkit"/>,
-          <phrase revision="sysv">
-            <xref linkend="consolekit"/> (after polkit),
-            <xref linkend="pm-utils"/>,
-          </phrase>
-          <xref linkend="lm_sensors"/>,
-          <xref linkend="upower"/>, and
-          <xref linkend="libfm"/>. If <xref linkend="cmake"/> has not been
-          built during the preceding steps, build it now
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Build KDE frameworks dependencies:
-          <xref linkend="extra-cmake-modules"/>,
-          <xref linkend="libdbusmenu-qt"/>, and
-          <xref linkend="polkit-qt"/>
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Finally, build some desktop utilities:
-          <xref linkend="xdg-utils"/> (needs only xmlto),
-          <xref linkend="xdg-user-dirs"/>,
-          <xref linkend="oxygen-icons5"/> or other sets of icons
-        </para>
-      </step>
-    </procedure>
-
-  </sect2>
-
-</sect1>
Index: chive/lxqt/lxqt.xml
===================================================================
--- archive/lxqt/lxqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part 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;
-]>
-
-<part id="lxqt" xreflabel="LXQt">
-  <?dbhtml filename="lxqt.html" dir="lxqt"?>
-
-  <title>LXQt</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop/desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
-
-</part>
Index: chive/lxshortcut.xml
===================================================================
--- archive/lxshortcut.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +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 lxshortcut-download-http "&sourceforge-repo;/lxde/lxshortcut-&lxshortcut-version;.tar.gz">
-  <!ENTITY lxshortcut-download-ftp  " ">
-  <!ENTITY lxshortcut-md5sum        "72f0dfafa8098be853beae6e33b5e13b">
-  <!ENTITY lxshortcut-size          "220 KB">
-  <!ENTITY lxshortcut-buildsize     "2.6 MB">
-  <!ENTITY lxshortcut-time          "0.1 SBU">
-]>
-
-<sect1 id="lxshortcut" xreflabel="LXShortcut-&lxshortcut-version;">
-  <?dbhtml filename="lxshortcut.html"?>
-
-
-  <title>LXShortcut-&lxshortcut-version;</title>
-
-  <indexterm zone="lxshortcut">
-    <primary sortas="a-LXShortcut">LXShortcut</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXShortcut</title>
-
-    <para>
-      The <application>LXShortcut</application> package contains a small
-      program used to edit application shortcuts created with
-      freedesktop.org Desktop Entry spec.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxshortcut-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxshortcut-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxshortcut-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxshortcut-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxshortcut-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxshortcut-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXShortcut Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxshortcut"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXShortcut</title>
-
-    <para>
-      Install <application>LXShortcut</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxshortcut
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxshortcut
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxshortcut-prog">
-        <term><command>lxshortcut</command></term>
-        <listitem>
-          <para>
-            is a small program used to edit application shortcuts.
-          </para>
-          <indexterm zone="lxshortcut lxshortcut-prog">
-            <primary sortas="b-lxshortcut">lxshortcut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/makedepend.xml
===================================================================
--- archive/makedepend.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +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 makedepend-download-http "&xorg-download-http;/util/makedepend-&makedepend-version;.tar.bz2">
-  <!ENTITY makedepend-download-ftp  "&xorg-download-ftp;/util/makedepend-&makedepend-version;.tar.bz2">
-  <!ENTITY makedepend-md5sum        "0475638eb40a3920d0d3f14482c924a4">
-  <!ENTITY makedepend-size          "144 KB">
-  <!ENTITY makedepend-buildsize     "1.5 MB">
-  <!ENTITY makedepend-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="makedepend" xreflabel="makedepend-&makedepend-version;">
-  <?dbhtml filename="makedepend.html"?>
-
-
-  <title>makedepend-&makedepend-version;</title>
-
-  <indexterm zone="makedepend">
-    <primary sortas="a-makedepend">makedepend</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to makedepend</title>
-
-    <para>The <application>makedepend</application> package contains a
-    C-preprocessor like utility to determine build-time dependencies.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&makedepend-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&makedepend-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &makedepend-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &makedepend-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &makedepend-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &makedepend-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">makedepend Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-proto"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/makedepend"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of makedepend</title>
-
-    <para>Install <application>makedepend</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>makedepend</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="makedepend-x7">
-        <term><command>makedepend</command></term>
-        <listitem>
-          <para>creates dependencies in makefiles.</para>
-          <indexterm zone="makedepend makedepend-x7">
-            <primary sortas="b-makedepend">makedepend</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/mako.xml
===================================================================
--- archive/mako.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +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 mako-download-http
-           "https://pypi.python.org/packages/source/M/Mako/Mako-&mako-version;.tar.gz">
-  <!ENTITY mako-download-ftp  " ">
-  <!ENTITY mako-md5sum        "9f0aafd177b039ef67b90ea350497a54">
-  <!ENTITY mako-size          "462 KB">
-  <!ENTITY mako-buildsize     "4.9 MB">
-  <!ENTITY mako-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Mako -->
-  <sect2 id="mako" xreflabel="Mako-&mako-version;">
-
-    <title>Mako-&mako-version;</title>
-
-    <indexterm zone="mako">
-      <primary sortas="a-Mako">Mako</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Mako Module</title>
-
-      <para>
-        Mako is a template library written in <application>Python
-        </application>. It provides a familiar, non-XML syntax which compiles
-        into Python modules for maximum performance.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&mako-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&mako-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &mako-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &mako-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &mako-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &mako-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Mako Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools"/> and
-        <xref linkend="python2"/> or <xref linkend="python3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="http://www.voidspace.org.uk/python/mock">mock</ulink>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/mako"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Mako</title>
-
-      <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 install <application>Mako</application> for <application>Python
-        2</application>, run the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install <application>Mako</application> for <application>Python
-        3</application>, run the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        The test suite requires the optional <application>mock</application>
-        python module. If it is not installed and you have internet access, it
-        will be automatically downloaded before the tests. Run the tests by
-        issuing <command>python setup.py test</command> and/or <command>python3
-        setup.py test</command>.
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -i "s:mako-render:&amp;3:g" setup.py</command>: This sed
-        prevents <command>setup.py</command> from overwriting an already
-        installed script by the <application>Python 2</application> module.
-        Remove it if you are building this module only for
-        <application>Python 3</application>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg and/or
-            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;-py&python3-majorver;.egg
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-  </sect2>
-  <!-- End Mako -->
Index: chive/markupsafe.xml
===================================================================
--- archive/markupsafe.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +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 MarkupSafe-download-http "&pymodules-dl;/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
-  <!ENTITY MarkupSafe-download-ftp  " ">
-  <!ENTITY MarkupSafe-md5sum        "&MarkupSafe-md5sum;">
-  <!ENTITY MarkupSafe-size          "20 KB">
-  <!ENTITY MarkupSafe-buildsize     "368 KB (add 108 KB for tests)">
-  <!ENTITY MarkupSafe-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <!-- Begin MarkupSafe -->
-  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;" revision="sysv">
-
-    <title>MarkupSafe-&MarkupSafe-version;</title>
-
-    <indexterm zone="MarkupSafe">
-      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MarkupSafe Module</title>
-
-      <para>
-        <application>MarkupSafe</application> is a <application>Python</application>
-        module that implements a XML/HTML/XHTML Markup safe string.
-      </para>
-
-      <note revision="systemd">
-        <para>
-          <application>MarkupSafe</application> was installed in LFS.
-          The instruction is only kept here for SysV revision.
-        </para>
-      </note>
-
-      &lfs113_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &MarkupSafe-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &MarkupSafe-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &MarkupSafe-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &MarkupSafe-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">MarkupSafe Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MarkupSafe</title>
-
-      <para>
-        Install <application>MarkupSafe</application> with the following
-        commands:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        Then, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user markupsafe</userinput></screen>
-
-      <para>
-        To test the installation, issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/markupSafe and
-            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: chive/maven.xml
===================================================================
--- archive/maven.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,298 +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 maven-download-http "https://archive.apache.org/dist/maven/maven-3/&maven-version;/source/apache-maven-&maven-version;-src.tar.gz">
-  <!ENTITY maven-download-ftp  " ">
-  <!ENTITY maven-md5sum        "a4346b6cb557266677dc9541526e2548">
-  <!ENTITY maven-size          "2.6 MB">
-  <!ENTITY maven-buildsize     "92 MB">
-  <!ENTITY maven-time          "0.4 SBU">
-
-  <!ENTITY maven-binary-http "https://archive.apache.org/dist/maven/maven-3/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
-]>
-
-<sect1 id="maven" xreflabel="Apache-Maven-&maven-version;">
-  <?dbhtml filename="maven.html"?>
-
-
-  <title>Apache-Maven-&maven-version;</title>
-
-  <indexterm zone="maven">
-    <primary sortas="a-apache-maven">Apache-Maven</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apache-Maven</title>
-
-    <para>
-      <application>Apache-Maven</application> is a tool that can be used for
-      building and managing any Java-based project. Based on the concept of a
-      project object model (POM), <application>Apache-Maven</application> can
-      manage a project's build, reporting and documentation from a central
-      piece of information.
-    </para>
-
-    &lfs83_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&maven-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&maven-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &maven-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &maven-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &maven-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &maven-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <application>Appache-Maven</application> needs to be built with
-          itself, so a binary is needed:
-          <ulink url="&maven-binary-http;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Apache-Maven Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      A JDK (<xref linkend="java-bin"/> or <xref linkend="openjdk"/>)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ApacheMaven"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apache-Maven</title>
-
-    <para>
-      First fix two issues which prevent building with Java 10:
-    </para>
-
-<screen><userinput>sed -e '/-surefire-/a&lt;version&gt;2.21.0&lt;/version&gt;' \
-    -e '/&lt;commonsLang/s/3\.5/3.7/'              \
-    -i pom.xml</userinput></screen>
-
-    <para>
-      Install <application>Apache-Maven</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>install -vdm 755 ../apache-maven-bin     &amp;&amp;
-tar -xf ../apache-maven-&maven-version;-bin.tar.gz \
-    --strip-components=1                 \
-    --directory ../apache-maven-bin      &amp;&amp;
-
-SAVEPATH=$PATH   &amp;&amp;
-PATH=../apache-maven-bin/bin:$PATH &amp;&amp;
-
-mvn -DdistributionTargetDir=build \
-    package</userinput></screen>
-
-    <para>
-      The test are run as part of the compilation above.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm 755            /opt/maven-&maven-version; &amp;&amp;
-cp -Rv apache-maven/build/* /opt/maven-&maven-version; &amp;&amp;
-ln -sfvn maven-&maven-version; /opt/maven</userinput></screen>
-
-    <para>
-      You can know reset the <envar>PATH</envar> variable and clean
-      the source directory:
-    </para>
-
-<screen><userinput>PATH=$SAVEPATH &amp;&amp;
-rm -rf ../apache-maven-bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>tar ../apache-maven-&maven-version;-bin.tar.gz ...
-               PATH=.../bin:$PATH</command>: Extracts the
-      <application>Apache-Maven</application> binary and let the system know
-      about the binary location.
-    </para>
-
-    <para>
-      <command>mvn ... package</command>: Compiles and tests the package, and
-      packages it to its final format.
-    </para>
-
-    <para>
-      <parameter>-DdistributionTargetDir=build</parameter>: Specifies
-      the location where the built binary should be packaged. The content of
-      this directory is ready to be copied to its final location.
-    </para>
-
-    <para>
-      <command>ln -sfvn maven-&maven-version; /opt/maven</command>: Creates
-      a convenience symlink.
-    </para>
-
-    <para>
-      <option>-Dmaven.repo.local=...</option>: Specifies a maven local
-      repository for this build, instead of the default <filename
-      class="directory">~/.m2/repository</filename>. You may want to use this
-      if several users are to use <application>Apache-Maven</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Apache-Maven</title>
-
-    <sect3 id="maven-config">
-      <title>Config Files</title>
-      <para>
-        The user settings file <filename>~/.m2/settings.xml</filename> and
-        the global settings file
-        <filename>/opt/maven/conf/settings.xml</filename>
-      </para>
-
-      <indexterm zone="maven maven-config">
-        <primary sortas="e-AA.m2-settings.xml">~/.m2-settings.xml</primary>
-      </indexterm>
-
-      <indexterm zone="maven maven-config">
-        <primary
-        sortas="e-opt-maven-conf-settings.xml">/opt/maven/conf/settings.xml</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The default configuration file shipped with
-        <application>Apache-Maven</application> should be sufficent for
-        common tasks. You may want to copy the global settings file to
-        your user one and modify it to suit your needs.
-      </para>
-
-      <para>
-        You should add the <command>mvn</command> command to
-        <envar>PATH</envar>. For example:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/maven.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/maven.sh
-
-pathappend /opt/maven/bin
-
-# End /etc/profile.d/maven.sh</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          mvn, mvnDebug, and mvnyjp
-        </seg>
-        <seg>
-          libjansi.so in <filename
-          class="directory">/opt/maven/lib/jansi-native</filename>
-        </seg>
-        <seg>
-          /opt/maven-&maven-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mvn">
-        <term><command>mvn</command></term>
-        <listitem>
-          <para>
-            is the <application>Apache-Maven</application> Java-based project
-            builder and manager
-          </para>
-          <indexterm zone="maven mvn">
-            <primary sortas="b-mvn">mvn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mvnDebug">
-        <term><command>mvnDebug</command></term>
-        <listitem>
-          <para>
-            turns on <command>mvn</command> debug mode
-          </para>
-          <indexterm zone="maven mvnDebug">
-            <primary sortas="b-mvnDebug">mvnDebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mvnyjp">
-        <term><command>mvnyjp</command></term>
-        <listitem>
-          <para>
-            runs <command>mvn</command>under the supervision of the
-            <ulink url="https://www.yourkit.com/java/profiler/">YourKit Java
-            Profiler</ulink>
-          </para>
-          <indexterm zone="maven mvnyjp">
-            <primary sortas="b-mvnyjp">mvnyjp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/midori.xml
===================================================================
--- archive/midori.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,226 +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 midori-download-http
-           "http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
-  <!ENTITY midori-download-ftp  " ">
-  <!ENTITY midori-md5sum        "fcc03ef759fce4fe9f2446d9da4a065e">
-  <!ENTITY midori-size          "1.4 MB">
-  <!ENTITY midori-buildsize     "91 MB">
-  <!ENTITY midori-time          "0.8 SBU">
-]>
-
-<sect1 id="midori" xreflabel="Midori-&midori-version;">
-  <?dbhtml filename="midori.html"?>
-
-
-  <title>Midori-&midori-version;</title>
-
-  <indexterm zone="midori">
-    <primary sortas="a-Midori">Midori</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Midori</title>
-
-    <para>
-      <application>Midori</application> is a lightweight web browser that uses
-      <application>WebKitGTK+</application>.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&midori-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&midori-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &midori-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &midori-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &midori-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &midori-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Midori Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <!--<xref linkend="webkitgtk2"/>, and -->
-      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.11</ulink> , and 
-      <phrase revision="sysv"><ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink></phrase>
-      <phrase revision="systemd"><xref linkend="libzeitgeist"/></phrase>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/midori"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Midori</title>
-
-    <para>
-      Install <application>Midori</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e 's/protected Tally/public Tally/g'  \
-    -i midori/midori-notebook.vala         &amp;&amp;
-sed -e 's/%d other files/%u other files/g' \
-    -i extensions/transfers.vala           &amp;&amp;
-
-for f in transfers adblock/widgets apps history-list notes; do
-    sed -e 's/.remove (iter/.remove (ref iter/g' \
-        -i "extensions/$f.vala"
-done        &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DUSE_ZEITGEIST=OFF         \
-      -DHALF_BRO_INCOM_WEBKIT2=ON \
-      -DUSE_GTK3=1                \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: The recent release of vala generates errors
-      for some constructs that were accepted before. The <command>sed</command>
-      commands fix those errors.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
-      Zeitgeist is installed.
-    </para>
-
-    <para>
-      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
-      linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly
-      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
-      be linked to WebKitGTK+-2.4.x. The former used to be considered <quote>
-      experimental</quote> by upstream, but now is considered stable. However
-      the syntax has not yet been updated.
-    </para>
-
-    <para>
-      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
-      WebkitGTK+ built against <application>GTK+ 3</application>.
-    </para>
-
-    <para>
-      <option>-DUSE_APIDOCS=1</option>: Use this switch if
-      <application>GTK-Doc</application> is installed and you
-      wish to build and install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          midori
-        </seg>
-        <seg>
-          libmidori-core.so
-        </seg>
-        <seg>
-          /{etc/xdg,/usr/{lib,share}}/midori and
-          /usr/share/doc/midori-&midori-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="midori-prog">
-        <term><command>midori</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>WebKitGTK+</application> browser.
-          </para>
-          <indexterm zone="midori midori-prog">
-            <primary sortas="b-midori">midori</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/mod_dnssd.xml
===================================================================
--- archive/mod_dnssd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +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 mod_dnssd-download-http "http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz">
-  <!ENTITY mod_dnssd-download-ftp  " ">
-  <!ENTITY mod_dnssd-md5sum        "bed3d95a98168bf0515922d1c05020c5">
-  <!ENTITY mod_dnssd-size          "84 KB">
-  <!ENTITY mod_dnssd-buildsize     "1 MB">
-  <!ENTITY mod_dnssd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mod_dnssd" xreflabel="mod_dnssd-&mod_dnssd-version;" revision="systemd">
-  <?dbhtml filename="mod_dnssd.html"?>
-
-
-  <title>mod_dnssd-&mod_dnssd-version;</title>
-
-  <indexterm zone="mod_dnssd">
-    <primary sortas="a-mod_dnssd">mod_dnssd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mod_dnssd</title>
-
-    <para>
-      The <application>mod_dnssd</application> package is an
-      <application>Apache</application> HTTPD module which adds Zeroconf support
-      via DNS-SD using <application>Avahi</application>. This allows
-      <application>Apache</application> to advertise itself and the websites
-      available to clients compatible with the protocol.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mod_dnssd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mod_dnssd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mod_dnssd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mod_dnssd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mod_dnssd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mod_dnssd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">mod_dnssd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apache"/> and
-      <xref linkend="avahi"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lynx"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/mod_dnssd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mod_dnssd</title>
-
-    <para>
-      Install <application>mod_dnssd</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/unixd_setup_child/ap_&amp;/' src/mod_dnssd.c &amp;&amp;
-
-./configure --prefix=/usr \
-            --disable-lynx &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
-sed -i 's| usr| /usr|' /etc/httpd/httpd.conf</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... src/mod_dnssd.c</command>: Fix an external function
-      call that has been updated since this package was released.
-    </para>
-
-    <para>
-      <parameter>--disable-lynx</parameter>: This parameter turns off
-      <application>Lynx</application> usage for documentation generation.
-      Remove it if you have <application>Lynx</application> installed.
-    </para>
-
-    <para>
-      <command>sed ... /etc/httpd/httpd.conf</command>: Fix a directory
-      path that the intallation procedure incorrectly puts in the
-      httpd configuration file.
-    </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>mod_dnssd.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mod_dnssd-lib">
-        <term><filename class='libraryfile'>mod_dnssd.so</filename></term>
-        <listitem>
-          <para>is the <application>Apache</application> HTTPD module.</para>
-          <indexterm zone="mod_dnssd mod_dnssd-lib">
-            <primary sortas="c-mod_dnssd">mod_dnssd.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/mx.xml
===================================================================
--- archive/mx.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 mx-download-http "http://source.clutter-project.org/sources/mx/1.4/mx-&mx-version;.tar.xz">
-  <!ENTITY mx-download-ftp  " ">
-  <!ENTITY mx-md5sum        "92ec1bb29cc878932857de737b111827">
-  <!ENTITY mx-size          "932 KB">
-  <!ENTITY mx-buildsize     "30 MB">
-  <!ENTITY mx-time          "0.8 SBU">
-]>
-
-<sect1 id="mx" xreflabel="Mx-&mx-version;">
-  <?dbhtml filename="mx.html"?>
-
-
-  <title>Mx-&mx-version;</title>
-
-  <indexterm zone="mx">
-    <primary sortas="a-Mx">Mx</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mx</title>
-
-    <para>
-      <application>Mx</application> is a traditional GUI toolkit built upon
-      <application>Clutter</application> technology. It enables smooth
-      animations and special effects through hardware accelerated graphics
-      (OpenGL).
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mx-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mx-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mx-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mx-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mx-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mx-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mx Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/mx"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mx</title>
-
-    <para>
-      Install <application>Mx</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mx-create-image-cache
-        </seg>
-        <seg>
-          libmx-1.0.so and libmx-gtk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/mx-1.0,
-          /usr/share/gtk-doc/html/mx,
-          /usr/share/gtk-doc/html/mx-gtk and
-          /usr/share/mx
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmx-1">
-        <term><filename class="libraryfile">libmx-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mx</application> API functions.
-          </para>
-          <indexterm zone="mx libmx-1">
-            <primary sortas="c-libmx-1">libmx-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmx-gtk-1">
-        <term><filename class="libraryfile">libmx-gtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mx</application>
-            <application>GTK+</application> bindings.
-          </para>
-          <indexterm zone="mx libmx-gtk-1">
-            <primary sortas="c-libmx-gtk-1">libmx-gtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/mysql.xml
===================================================================
--- archive/mysql.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,474 +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 mysql-download-http "http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-&mysql-version;.tar.gz">
-  <!ENTITY mysql-download-ftp  " ">
-  <!ENTITY mysql-md5sum        "1d3d91e8459c719bbef7c97bb499634d">
-  <!ENTITY mysql-size          "32 MB">
-  <!ENTITY mysql-buildsize     "572 MB (additional 359 MB installed)">
-  <!ENTITY mysql-time          "6.3 SBU">
-]>
-
-<sect1 id="mysql" xreflabel="MySQL-&mysql-version;">
-  <?dbhtml filename="mysql.html"?>
-
-
-  <title>MySQL-&mysql-version;</title>
-
-  <indexterm zone="mysql">
-    <primary sortas="a-MySQL">MySQL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MySQL</title>
-
-    <para>
-      <application>MySQL</application> is a widely used and fast SQL database
-      server. It is a client/server implementation that consists of a
-      server daemon and many different client programs and libraries.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mysql-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mysql-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mysql-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mysql-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mysql-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mysql-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (recommended if building for Amarok):
-          <ulink url="&patch-root;/mysql-&mysql-version;-embedded_library_shared-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Documentation (see tip below):
-          <ulink url="http://dev.mysql.com/doc/"/>
-        </para>
-       </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MySQL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libevent"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink> and
-      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mysql"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MySQL</title>
-
-    <para>
-      For security reasons, running the server as an unprivileged user
-      and group is strongly encouraged. Issue the following (as
-      <systemitem class="username">root</systemitem>) to create the
-      user and group:
-    </para>
-
-<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>
-      If the MySQL server is not needed, it is possible to build only the
-      client libraries of MySQL. To do this you need to add
-      <parameter>-DWITHOUT_SERVER=ON</parameter> to the <command>cmake</command>
-      command below.
-    </para>
-
-    <para>
-      MySQL contains an embedded server library. By default, it is built as a
-      statically linked library, <filename>libmysqld.a</filename>, but by
-      applying the optional patch, a shared version of this library can be built.
-      The library is needed by certain applications, such as
-      <application>Amarok</application> and it is recommend to use the shared
-      libraries whenever it is possible.
-    </para>
-
-    <para>
-      There are numerous options available to
-      <command>cmake</command>. Check the output of the `<command>cmake .
-      -LH</command>` for additional customization options. See the <ulink
-      url="http://dev.mysql.com/doc/refman/5.6/en/source-configuration-options.html">
-      MySQL Documentation</ulink> for a full listing of all options.
-    </para>
-
-    <para>
-      If you want to build shared version of the embedded server library, apply
-      the following patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../mysql-&mysql-version;-embedded_library_shared-1.patch</userinput></screen>
-
-    <para>
-      Install <application>MySQL</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i "/ADD_SUBDIRECTORY(sql\/share)/d" CMakeLists.txt &amp;&amp;
-sed -i "s/ADD_SUBDIRECTORY(libmysql)/&amp;\\nADD_SUBDIRECTORY(sql\/share)/" CMakeLists.txt &amp;&amp;
-sed -i "s@data/test@\${INSTALL_MYSQLSHAREDIR}@g" sql/CMakeLists.txt &amp;&amp;
-sed -i "s@data/mysql@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
-
-sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &amp;&amp;
-
-mkdir build &amp;&amp;
-cd build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release                    \
-      -DCMAKE_INSTALL_PREFIX=/usr                   \
-      -DINSTALL_DOCDIR=share/doc/mysql              \
-      -DINSTALL_DOCREADMEDIR=share/doc/mysql        \
-      -DINSTALL_INCLUDEDIR=include/mysql            \
-      -DINSTALL_INFODIR=share/info                  \
-      -DINSTALL_MANDIR=share/man                    \
-      -DINSTALL_MYSQLDATADIR=/srv/mysql             \
-      -DINSTALL_MYSQLSHAREDIR=share/mysql           \
-      -DINSTALL_MYSQLTESTDIR=share/mysql/test       \
-      -DINSTALL_PLUGINDIR=lib/mysql/plugin          \
-      -DINSTALL_SBINDIR=sbin                        \
-      -DINSTALL_SCRIPTDIR=bin                       \
-      -DINSTALL_SQLBENCHDIR=share/mysql/bench       \
-      -DINSTALL_SUPPORTFILESDIR=share/mysql         \
-      -DMYSQL_DATADIR=/srv/mysql                    \
-      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock     \
-      -DSYSCONFDIR=/etc/mysql                       \
-      -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF          \
-      -DWITH_EXTRA_CHARSETS=complex                 \
-      -DWITH_LIBEVENT=system                        \
-      -DWITH_SSL=system                             \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <tip>
-      <para>
-        The only documentation shipped in the source tarball are
-        <filename>mysql.info</filename> and man pages. You can download
-        various formats of the <application>MySQL</application>
-        Reference Manual from <ulink url="http://dev.mysql.com/doc/"/>.
-      </para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: First two seds fix client-only builds.
-        Following two seds set correct installation directories for some
-        components. Last one fixes a bug in the code.
-    </para>
-
-    <para>
-      <parameter>-DWITHOUT_SERVER=ON</parameter>: Use this switch if you don't
-      want the server and would like to build the client only.
-    </para>
-
-    <para>
-      <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
-      support for the complex character sets.
-    </para>
-
-    <para>
-      <parameter>-DWITH_LIBEVENT=system</parameter>: This switch is used to
-      tell the build system to use installed <application>libevent</application>.
-      Remove it if you didn't install <application>libevent</application>.
-    </para>
-
-    <para>
-      <parameter>-DWITH_SSL=system</parameter>: This switch is used to tell the
-      build system to use installed <application>OpenSSL</application>. Remove
-      it if you didn't install <application>OpenSSL</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MySQL</title>
-
-    <sect3 id="mysql-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mysql/my.cnf</filename> and
-        <filename>~/.my.cnf</filename>
-      </para>
-
-      <indexterm zone="mysql mysql-config">
-        <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
-      </indexterm>
-
-      <indexterm zone="mysql mysql-config">
-        <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <note>
-        <para>
-          If you are upgrading from previous major version of
-          <application>MySQL</application>, be sure to consult
-          the <ulink
-          url="https://dev.mysql.com/doc/refman/5.6/en/upgrading-from-previous-series.html">
-          MySQL Reference Manual</ulink> for notes on
-          upgrading the software.
-        </para>
-      </note>
-
-      <para>
-        Create basic <filename>/etc/mysql/my.cnf</filename>
-        using the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -dm 755 /etc/mysql &amp;&amp;
-cat &gt; /etc/mysql/my.cnf &lt;&lt; "EOF"
-<literal># Begin /etc/mysql/my.cnf
-
-# The following options will be passed to all MySQL clients
-[client]
-#password       = your_password
-port            = 3306
-socket          = /run/mysqld/mysqld.sock
-
-# The MySQL server
-[mysqld]
-port            = 3306
-socket          = /run/mysqld/mysqld.sock
-datadir         = /srv/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-sort_buffer_size = 512K
-net_buffer_length = 16K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all.
-skip-networking
-
-# required unique id between 1 and 2^32 - 1
-server-id       = 1
-
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 4M
-#bdb_max_lock = 10000
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /srv/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /srv/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-# End /etc/mysql/my.cnf</literal>
-EOF</userinput></screen>
-
-      <para>
-        You can now install a database and change the ownership to the
-        unprivileged user and group (perform as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &amp;&amp;
-chown -R mysql:mysql /srv/mysql</userinput></screen>
-
-      <para>
-        Further configuration requires that the
-        <application>MySQL</application> server is running. Start
-        the server using the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /run/mysqld &amp;&amp;
-mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</userinput></screen>
-
-      <para>
-        A default installation does not set up a password for the
-        administrator, so use the following command as the <systemitem
-        class="username">root</systemitem> user to set one. Replace
-        <replaceable>&lt;new-password&gt;</replaceable> with your own.
-      </para>
-
-<screen role="root"><userinput>mysqladmin -u root password <replaceable>&lt;new-password&gt;</replaceable></userinput></screen>
-
-      <para>
-        Configuration of the server is now finished. Shut the server
-        down using the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="mysql-init">
-      <title>Boot Script</title>
-
-      <para>
-        Install the <filename>/etc/rc.d/init.d/mysql</filename> init script
-        included in the <xref linkend="bootscripts"/> package as
-        the <systemitem class="username">root</systemitem> user to start the
-        <application>MySQL</application> server during system boot-up.
-      </para>
-
-      <indexterm zone="mysql mysql-init">
-        <primary sortas="f-mysql">mysql</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-mysql</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>
-          innochecksum, msql2mysql, myisamchk, myisam_ftdump, myisamlog,
-          myisampack, my_print_defaults, mysql, mysqlaccess, mysqlaccess.conf,
-          mysqladmin, mysqlbinlog, mysqlbug, mysqlcheck, mysql_client_test,
-          mysql_client_test_embedded, mysql_config, mysql_config_editor,
-          mysql_convert_table_format, mysqld, mysqld_multi, mysqld_safe, mysqldump,
-          mysqldumpslow, mysql_embedded, mysql_find_rows, mysql_fix_extensions,
-          mysqlhotcopy, mysqlimport, mysql_install_db, mysql_plugin,
-          mysql_secure_installation, mysql_setpermission, mysqlshow, mysqlslap,
-          mysqltest, mysqltest_embedded, mysql_tzinfo_to_sql, mysql_upgrade,
-          mysql_waitpid, mysql_zap, perror, replace, resolveip and
-          resolve_stack_dump
-        </seg>
-        <seg>
-          libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmysqld.{so,a},
-          libmysqlservices.a and several under /usr/lib/mysql/plugin/
-        </seg>
-        <seg>
-          /etc/mysql,
-          /srv/mysql,
-          /usr/include/mysql,
-          /usr/lib/mysql,
-          /usr/share/doc/mysql and
-          /usr/share/mysql
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-
-    <para>
-      Descriptions of all the programs and libraries would be several
-      pages long. Instead, consult the <filename>mysql.info</filename>
-      documentation or the on-line reference manual at <ulink
-      url="http://dev.mysql.com/doc/refman/5.6/en/index.html"/>.
-    </para>
-
-    <para>
-      The <application>Perl</application> DBI modules must be installed
-      for some of the <application>MySQL</application> support programs to
-      function properly.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: chive/nas.xml
===================================================================
--- archive/nas.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,283 +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 nas-download-http "http://nas.codebrilliance.com/nas/nas-&nas-version;.src.tar.gz">
-  <!ENTITY nas-download-ftp  "&gentoo-ftp-repo;/nas-&nas-version;.src.tar.gz"> -->
-  <!ENTITY nas-download-http "&sourceforge-repo;/nas/nas-&nas-version;.src.tar.gz">
-  <!ENTITY nas-download-ftp  "&sources-anduin-ftp;/n/nas-&nas-version;.src.tar.gz">
-  <!ENTITY nas-md5sum        "d975efefba50b985446bb2c2cb4ee91f">
-  <!ENTITY nas-size          "1.4 MB">
-  <!ENTITY nas-buildsize     "17 MB">
-  <!ENTITY nas-time          "0.3 SBU">
-]>
-
-<sect1 id="nas" xreflabel="NAS-&nas-version;">
-  <?dbhtml filename="nas.html"?>
-
-
-  <title>NAS-&nas-version;</title>
-
-  <indexterm zone="nas">
-    <primary sortas="a-NAS">NAS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NAS</title>
-
-    <para>The Network Audio System is a network transparent, client/server
-    audio transport system used to read , write and play audio files in many
-    formats including <filename>.au</filename>, <filename>.snd</filename>,
-    <filename>.voc</filename>, <filename>.wav</filename>,
-    <filename>.aiff</filename>, <filename>.aif</filename> and
-    <filename>.iff</filename>. It can be described as the audio equivalent
-    of an <application>X</application> server.</para>
-
-    <para><application>NAS</application> is an older sound server included
-    in BLFS primarily because it is an optional dependency for several
-    packages.  Unless you know you need <application>NAS</application>, it
-    is probably not needed at all.</para>
-
-    <para>There may be a more recent release available from the
-    <application>NAS</application> home page. You can check
-    <ulink url="http://nas.codebrilliance.com/"/> and probably use the
-    existing BLFS instructions. Note that versions other than the one shown
-    in the download URLs have not been tested in a BLFS environment.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nas-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nas-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nas-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nas-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nas-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nas-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/nas-&nas-version;-gcc4-1.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
-
-    <bridgehead renderas="sect3">NAS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
-
-    <!-- <xref linkend="rman"/> (if using <application>Xorg7</application>) -->
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/nas"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NAS</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/X11R6_symlink.xml"/>
-
-    <para>Install <application>NAS</application> by running the
-    following commands:</para>
-
-<screen><userinput>xmkmf &amp;&amp;
-make World</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 XPLIB= install install.man &amp;&amp;
-install -v -m755 -d /usr/share/doc/nas-&nas-version;/{html,pdf} &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/nas-&nas-version;/html &amp;&amp;
-install -v -m644 doc/pdf/* /usr/share/doc/nas-&nas-version;/pdf &amp;&amp;
-install -v -m644 doc/{README,actions,*.{ps,txt}} \
-    /usr/share/doc/nas-&nas-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>xmkmf</command>: <command>make World</command>:
-    These commands use the standard for compiling <application>Imake</application>
-    based applications.</para>
-
-    <para><option>XPLIB=</option>: This option is necessary to prevent the
-    build system from trying to link to an unused and deprecated library.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NAS</title>
-
-    <sect3 id="nas-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/nas/nasd.conf</filename></para>
-
-      <indexterm zone="nas nas-config">
-        <primary sortas="e-etc-nas-nasd.conf">/etc/nas/nasd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Create the <application>NAS</application> configuration file
-      using the following command:</para>
-
-<screen role="root"><userinput>install -v -m644 /etc/nas/nasd.conf.eg /etc/nas/nasd.conf</userinput></screen>
-
-      <para>Edit the new configuration file to suit your network and system
-      needs.</para>
-
-    </sect3>
-
-    <sect3 id="nas-init">
-      <title>Boot Script</title>
-
-      <note>
-        <para>The <application>NAS</application> server cannot run
-        simultaneously with other sound servers, such as <ulink
-        url="http://www.mediaapplicationserver.net/">MAS</ulink> or <ulink
-        url="http://jackit.sourceforge.net/">JACK</ulink>.</para>
-      </note>
-
-      <para>Install the <filename>/etc/rc.d/init.d/nas</filename> init script
-      included in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="nas nas-init">
-        <primary sortas="f-nas">nas</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-nas</userinput></screen>
-
-      <para>The init script uses a default parameter to allow access to all
-      hosts on the network. Review the <command>nasd</command> man page for
-      other available parameters if you need to modify the script.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>auconvert, auctl, audemo, audial, auedit, auinfo, aupanel,
-        auphone, auplay, aurecord, auscope, autool, auwave, checkmail,
-        issndfile, nasd, playbucket, and soundtoh</seg>
-        <seg>libaudio.{so,a}</seg>
-        <seg>/etc/nas, /usr/X11R6/include/audio and
-        /usr/share/doc/nas-&nas-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="au-utilities">
-        <term><command>au{utilities}</command></term>
-        <listitem>
-          <para>are a collection of tools to convert, play, edit, record,
-          and manipulate sound files. See the respective man page for each
-          utility for a full description of each one.</para>
-          <indexterm zone="nas au-utilities">
-            <primary sortas="b-au-utilities">au{utilities}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="checkmail">
-        <term><command>checkmail</command></term>
-        <listitem>
-          <para>plays a sound file when the user receives mail.</para>
-          <indexterm zone="nas checkmail">
-            <primary sortas="b-checkmail">checkmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="issndfile">
-        <term><command>issndfile</command></term>
-        <listitem>
-          <para>checks if a file is in a recognized audio file format.</para>
-          <indexterm zone="nas issndfile">
-            <primary sortas="b-issndfile">issndfile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nasd">
-        <term><command>nasd</command></term>
-        <listitem>
-          <para>is the Network Audio System server daemon.</para>
-          <indexterm zone="nas nasd">
-            <primary sortas="b-nasd">nasd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="playbucket">
-        <term><command>playbucket</command></term>
-        <listitem>
-          <para>plays, or creates, the bucket corresponding to the
-          specified file.</para>
-          <indexterm zone="nas playbucket">
-            <primary sortas="b-playbucket">playbucket</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="soundtoh">
-        <term><command>soundtoh</command></term>
-        <listitem>
-          <para>converts a sound file to a C language header file.</para>
-          <indexterm zone="nas soundtoh">
-            <primary sortas="b-soundtoh">soundtoh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaudio">
-        <term><filename class='libraryfile'>libaudio.{so,a}</filename></term>
-        <listitem>
-          <para>contains API functions to read and write audio files.</para>
-          <indexterm zone="nas libaudio">
-            <primary sortas="c-libaudio">libaudio.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/ncpfs.xml
===================================================================
--- archive/ncpfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,231 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY ncpfs-download-http "http://platan.vc.cvut.cz/ftp/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
-  <!ENTITY ncpfs-download-ftp  "ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
-  <!ENTITY ncpfs-md5sum        "5fd2ec0680ba7e66df142637e17a5ac9">
-  <!ENTITY ncpfs-size          "1.6 MB">
-  <!ENTITY ncpfs-buildsize     "30 MB">
-  <!ENTITY ncpfs-time          "0.52 SBU">
-]>
-
-<sect1 id="ncpfs" xreflabel="NCPFS-&ncpfs-version;">
-  <?dbhtml filename="ncpfs.html"?>
-
-
-  <title>NCPFS-&ncpfs-version;</title>
-
-  <indexterm zone="ncpfs">
-    <primary sortas="a-NCPFS">NCPFS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NCPFS</title>
-
-    <para>The <application>NCPFS</application> package
-    contains client and administration tools for use with Novell
-    networks.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ncpfs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ncpfs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ncpfs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ncpfs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ncpfs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ncpfs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NCPFS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="linux-pam"/> and <xref linkend="php"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ncpfs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NCPFS</title>
-
-    <para>Install <application>NCPFS</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix="" --includedir=/usr/include \
-    --mandir=/usr/share/man --datadir=/usr/share &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-make install-dev</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--prefix=""</parameter>:
-    Installs binaries on the root partition so that they are available at
-    boot time.  This may not be ideal for all systems.  If
-    <filename class="directory">/usr</filename> is mounted locally,
-    <parameter>--prefix=/usr</parameter> may be a better option.</para>
-
-    <para><parameter>--includedir=/usr/include</parameter>: Tells
-    <command>configure</command> to look in
-    <filename class="directory">/usr/include</filename> for header
-    files. It also tells <command>make</command> to install
-    <application>NCPFS</application>'s headers here.</para>
-
-    <para><parameter>--mandir=/usr/share/man</parameter>: Installs the man
-    pages in the correct location.</para>
-
-    <para><parameter>--datadir=/usr/share</parameter>: Correctly installs the
-    locale files to <filename class="directory">/usr/share</filename>.</para>
-
-    <note>
-      <para>If you do not need to use the IPX protocol, or you use a different
-      IPX package, you can optionally pass <option>--disable-ipx</option> and/or
-      <option>--disable-ipx-tools</option> to the <command>configure</command>
-      script to disable these options.</para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NCPFS</title>
-
-    <sect3 id="ncpfs-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.nwclient</filename></para>
-
-      <indexterm zone="ncpfs ncpfs-config">
-        <primary sortas="e-AA.nwclient">~/.nwclient</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>A config file <filename>~/.nwclient</filename> should be placed in the
-      home directory of each user that intends to use
-      <application>NCPFS</application>. The permissions on this file should be set
-      to 600, for obvious security reasons.  The configuration file should contain
-      a single line per server that the user will use.  Each line should contain
-      the server name, the user name, and optionally the password.  Below is a
-      sample <filename>.nwclient</filename> file.</para>
-
-<screen><literal># Begin example ~/.nwclient config file
-
-Server1/User1 Password
-Server2/User1
-Server2/Guest1 -
-
-# End example .nwclient config file</literal></screen>
-
-      <para>The syntax for the <filename>.nwclient</filename> file is simple,
-      <literal>server_name/user_name password</literal>.  Be extremely
-      careful when creating or editing this file as the client utilities are
-      very picky about syntax.  There should always be a space immediately
-      after the username.  If this space is substituted by a tab or multiple
-      spaces, you will not get the expected results when attempting to use
-      the <application>NCPFS</application> tools.  If no password is supplied,
-      the client utilities will ask for a password when it is needed.  If no
-      password is needed, for instance when using a guest account, a single '-'
-      should be put in place of a password.</para>
-
-      <para>It should be noted that <command>ncpmount</command>
-      is not intended to mount individual volumes because each mount point
-      creates a separate client connection to the Novell server.  Mounting
-      each individual volume separately would be unwise, as mounting all
-      volumes on a server under one mount point uses only one client
-      connection.</para>
-
-    </sect3>
-
-    <sect3  id="ncpfs-init">
-      <title>Boot Script</title>
-
-      <para>If you need to set up the IPX protocol at boot, you can install the
-      <filename>/etc/sysconfig/network-devices/services/ipx</filename>
-      network service script included with the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="ncpfs ncpfs-init">
-        <primary sortas="f-ncpfs">ncpfs (IPX service script)</primary>
-      </indexterm>
-
-<screen><userinput>make install-service-ipx</userinput></screen>
-
-      <para>Next install the
-      <filename>/etc/sysconfig/network-devices/ifconfig.eth0/ipx</filename>
-      configuration file with the following commands:</para>
-
-<screen role="root"><userinput>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0 &amp;&amp;
-cat &gt; /etc/sysconfig/network-devices/ifconfig.eth0/ipx &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-SERVICE="ipx"
-FRAME="<replaceable>&lt;802.2&gt;</replaceable>"</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Client Utilities</segtitle>
-      <segtitle>Server Admin Utilities</segtitle>
-      <segtitle>IPX Interface Utilities</segtitle>
-      <segtitle>Other Utilities</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ncpmount, ncpumountt, nprintt, nsendt, nwpasswdt,
-        nwsfindt, pqlistt, pqrmt, pqstatt, and slist</seg>
-        <seg>ncopyt, nwbocreatet, nwbolst, nwbopropst, nwbormt,
-        nwbpaddt, nwbpcreatet, nwbprmt, nwbpsett, nwbpvaluest,
-        nwdirt, nwdpvaluest, nwfsctrlt, nwfsinfot, nwfstimet, nwgrantt,
-        nwpurget, nwrevoket, nwrightst, nwtrusteet, nwtrustee2t,
-        nwuserlistt,  and nwvolinfo</seg>
-        <seg>ipx_cmdt, ipx_configuret, ipx_interfacet, ipx_internal_nett,
-        and ipx_route</seg>
-        <seg>ncpmap and nwauth</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/nepomuk-core.xml
===================================================================
--- archive/nepomuk-core.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,132 +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 nepomuk-core-download-http "&kde-download-http;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-core-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-core-md5sum        "b73d88658f0405d5f705c469d2697a9a">
-  <!ENTITY nepomuk-core-size          "374 KB">
-  <!ENTITY nepomuk-core-buildsize     "41 MB">
-  <!ENTITY nepomuk-core-time          "1.9 SBU">
-]>
-
-<sect1 id="nepomuk-core" xreflabel="nepomuk-core-&kde-version;">
-  <?dbhtml filename="nepomuk-core.html"?>
-
-
-  <title>Nepomuk-core-&kde-version;</title>
-
-  <indexterm zone="nepomuk-core">
-    <primary sortas="a-nepomuk-core">nepomuk-core</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nepomuk-core</title>
-
-    <para>Nepomuk-core contains the Semantik Desktop core libraries. This
-    includes central services like file indexing, file system monitoring,
-    query, and of course storage, as well as the corresponding client
-    libraries.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nepomuk-core-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nepomuk-core-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nepomuk-core-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nepomuk-core-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nepomuk-core-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nepomuk-core-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nepomuk-core Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kfilemetadata"/>,
-    <xref linkend="baloo"/>,
-    <xref linkend="poppler"/>,
-    <xref linkend="taglib"/>,
-    <xref linkend="exiv2"/> and
-    <xref linkend="ffmpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink> and
-    <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/nepomuk-core"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nepomuk-core</title>
-
-    <para>Install <application>nepomuk-core</application> by running the following
-    commands:</para>
-
-<!-- Nothing is installed in sysconfdir ... -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a working test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>nepomuk-simplesource-rcgen, nepomuk2-rcgen, nepomukbackup,
-        nepomukcleaner, nepomukindexer, nepomukserver and
-        nepomukservicestub</seg>
-        <seg>libkdeinit4_nepomukserver.so, libnepomukcommon.so,
-        libnepomukcore.so and several in
-        &kde-dir;/lib/kde4</seg>
-        <seg>&kde-dir;/include/nepomuk2, &kde-dir;/include/Nepomuk2,
-        &kde-dir;/lib/cmake/NepomukCore and several in
-        &kde-dir;/share/apps</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/nepomuk-widgets.xml
===================================================================
--- archive/nepomuk-widgets.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,119 +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 nepomuk-widgets-download-http "&kde-download-http;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-widgets-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-widgets-md5sum        "21f54a8a36dd7396239513190e31d4ef">
-  <!ENTITY nepomuk-widgets-size          "48 KB">
-  <!ENTITY nepomuk-widgets-buildsize     "3.8 MB">
-  <!ENTITY nepomuk-widgets-time          "0.2 SBU">
-]>
-
-<sect1 id="nepomuk-widgets" xreflabel="nepomuk-widgets-&kde-version;">
-  <?dbhtml filename="nepomuk-widgets.html"?>
-
-
-  <title>Nepomuk-widgets-&kde-version;</title>
-
-  <indexterm zone="nepomuk-widgets">
-    <primary sortas="a-nepomuk-widgets">nepomuk-widgets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to nepomuk-widgets</title>
-
-    <para>Nepomuk-widgets contains the widget library for the Nepomuk Semantik
-    Desktop.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nepomuk-widgets-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nepomuk-widgets-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nepomuk-widgets-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nepomuk-widgets-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nepomuk-widgets-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nepomuk-widgets-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/nepomuk-widgets-&kde-version;-rpc_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
- -->
-
-    <bridgehead renderas="sect3">Nepomuk-widgets Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="nepomuk-core"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/nepomuk-widgets"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of nepomuk-widgets</title>
-
-    <para>Install <application>nepomuk-widgets</application> by running the following
-    commands:</para>
-
-<!-- Nothing is installed in sysconfdir ... -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>libnepomukwidgets.so</seg>
-        <seg>&kde-dir;/include/nepomuk2 and
-        &kde-dir;/lib/cmake/NepomukWidgets</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/nfs-utils-client.xml
===================================================================
--- archive/nfs-utils-client.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,23 +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="basicnet-netprogs-nfsutils">
-  <?dbhtml filename="nfsutils.html"?>
-
-
-  <title>NFS Utilities-&nfs-utils-version; Client</title>
-
-  <para>The NFS Utilities package provides NFS server functionality as well
-  as client software such as <command>mount.nfs</command> or <command>umount.nfs</command>.
-  If you want to install it, the instructions can be
-  found in Chapter 19 &ndash; <xref linkend="nfs-utils"/>.  Note that if you only
-  want to use the client, you do <emphasis>not</emphasis> need to run the server
-  and so do not need the startup script and links.  In accordance with good
-  practice, only run the server if you actually need it (and if you don't know
-  whether you need it or not, it's likely that you don't!).</para>
-
-</sect1>
Index: chive/nftables.xml
===================================================================
--- archive/nftables.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,430 +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"?>
-
-
-  <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: chive/ninja.xml
===================================================================
--- archive/ninja.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +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 ninja-download-http "https://github.com/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
-  <!ENTITY ninja-download-ftp  " ">
-  <!ENTITY ninja-md5sum        "f340be768a76724b83e6daab69009902">
-  <!ENTITY ninja-size          "186 KB">
-  <!ENTITY ninja-buildsize     "65 MB">
-  <!ENTITY ninja-time          "0.2 SBU">
-]>
-
-<sect1 id="ninja" xreflabel="Ninja-&ninja-version;">
-  <?dbhtml filename="ninja.html"?>
-
-
-  <title>Ninja-&ninja-version;</title>
-
-  <indexterm zone="ninja">
-    <primary sortas="a-Ninja">Ninja</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ninja</title>
-
-    <para>
-      <application>Ninja</application> is a small build system with a focus on
-      speed.
-    </para>
-
-    <note>
-      <para>This package was installed as a part of the base LFS 
-      system.  The only reason to reinstall is to use the optional
-      dependencies for additional support files or documentation.
-      </para>
-    </note>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ninja-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ninja-download-ftp;"/>
-        </para>
-      </listitem> 
-      <listitem>
-        <para>
-          Download MD5 sum: &ninja-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ninja-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ninja-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ninja-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ninja Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/> (to build the manual), 
-      <xref linkend="emacs"/> (to generate lisp files), 
-      <xref linkend="doxygen"/> (to build API documentation), and 
-      <ulink url="http://re2c.sourceforge.net/">re2c</ulink>
-          (only needed to modify the build)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/ninja"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ninja</title>
-
-    <para>
-      Install <application>Ninja</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>python3 configure.py --bootstrap</userinput></screen>
-
-    <para>If Emacs is installed and you wish to build lisp files:</para>
-
-<screen><userinput>emacs -Q --batch -f batch-byte-compile misc/ninja-mode.el</userinput></screen>
-
-    <para>
-      To test the results, issue the following commands:
-    </para>
-
-<screen><userinput>python3 configure.py &amp;&amp;
-./ninja ninja_test   &amp;&amp;
-./ninja_test --gtest_filter=-SubprocessTest.SetWithLots</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vm755 ninja /usr/bin/ &amp;&amp;
-install -vDm644 misc/ninja.vim \
-                /usr/share/vim/vim&vim-majmin;/syntax/ninja.vim &amp;&amp;
-install -vDm644 misc/bash-completion \
-                /usr/share/bash-completion/completions/ninja &amp;&amp;
-install -vDm644 misc/zsh-completion \
-                /usr/share/zsh/site-functions/_ninja</userinput></screen>
-
-    <para>
-      If Emacs is installed, while still the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vDm644 misc/ninja-mode.el \
-                /usr/share/emacs/site-lisp/ninja-mode.el
-install -vDm644 misc/ninja-mode.elc \
-                /usr/share/emacs/site-lisp/ninja-mode.elc</userinput></screen>
-
-    <para>
-      If you have <xref linkend="asciidoc"/> installed and wish to build the
-      HTML manual, execute the following commands (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>ninja manual &amp;&amp;
-install -vDm644 doc/manual.html /usr/share/doc/ninja-&ninja-version;/manual.html</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and wish to build the
-      API documentation, execute the following commands (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>ninja doxygen &amp;&amp;
-install -vDm644 -t /usr/share/doc/ninja-&ninja-version;/ doc/doxygen/html/*</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>emacs -Q --batch -f batch-byte-compile
-      misc/ninja-mode.el</command>: regenerates the emacs lisp files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ninja
-        </seg>
-        <seg>
-          none
-        </seg>
-        <seg>
-          /usr/share/doc/ninja-&ninja-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ninja-prog">
-        <term><command>ninja</command></term>
-        <listitem>
-          <para>
-            is the Ninja build system.
-          </para>
-          <indexterm zone="ninja ninja-prog">
-            <primary sortas="b-ninja">ninja</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/notify-python.xml
===================================================================
--- archive/notify-python.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,137 +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 notify-python-download-http
-           "http://www.galago-project.org/files/releases/source/notify-python/notify-python-&notify-python-version;.tar.bz2">
-  <!ENTITY notify-python-download-ftp  " ">
-  <!ENTITY notify-python-md5sum        "d247cf79b46cef7495deb0a76334f81d">
-  <!ENTITY notify-python-size          "212 KB">
-  <!ENTITY notify-python-buildsize     "2.3 MB">
-  <!ENTITY notify-python-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Notify Python -->
-  <sect2 id="notify-python" xreflabel="Notify Python-&notify-python-version;">
-
-    <title>Notify Python-&notify-python-version;</title>
-
-    <indexterm zone="notify-python">
-      <primary sortas="a-notify-python">notify-python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Notify Python Module</title>
-
-      <para>
-        Notify Python provides <application>Python 2</application>
-        bindings to the <application>libnotify</application>.
-      </para>
-
-      &lfs74_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&notify-python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&notify-python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &notify-python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &notify-python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &notify-python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &notify-python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/notify-python-&notify-python-version;-libnotify-0.7-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-      <bridgehead renderas="sect4">Notify Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libnotify"/> and
-        <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support).
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/notify-python"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Notify Python</title>
-
-      <para>
-        Install <application>Notify Python</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../notify-python-&notify-python-version;-libnotify-0.7-1.patch &amp;&amp;
-./configure --prefix=/usr &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</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/pynotify
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-  </sect2>
-  <!-- End Notify Python -->
Index: chive/noto-fonts.xml
===================================================================
--- archive/noto-fonts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +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 noto-fonts-download-http "https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip">
-  <!ENTITY noto-fonts-download-ftp  " ">
-  <!ENTITY noto-fonts-md5sum        "92e5af616ba8f5b420141a37c13b4d1c">
-  <!ENTITY noto-fonts-size          "471 MB">
-  <!ENTITY noto-fonts-buildsize     "582 MB">
-  <!ENTITY noto-fonts-time          "less than 0.1 SBU">
-  <!ENTITY noto-alternate           "https://github.com/googlei18n/noto-fonts/archive/v2015-09-29-license-adobe.tar.gz">
-]>
-
-<sect1 id="noto-fonts" xreflabel="noto-fonts">
-  <?dbhtml filename="noto-fonts.html"?>
-
-
-  <title>Noto Fonts</title>
-
-  <indexterm zone="noto-fonts">
-    <primary sortas="a-noto-fonts">noto-fonts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Noto Fonts</title>
-
-    <para>
-      The <application>noto-fonts</application> package ('No Tofu' i.e. avoiding
-      boxes with dots [ hex digits ] when a glyph cannot be found) is a set of
-      fonts which aim to cover <emphasis>every glyph in unicode, no matter how
-      obscure</emphasis>. These fonts, or at least the Sans Serif fonts, are
-      used by KF5 (initially only for gtk applications).
-    </para>
-
-    <para>
-      Some of these fonts began life as the libre Source Sans Pro fonts from
-      adobe.
-    </para>
-
-    <note><para>As well as the full set, there is a slightly smaller and
-    older set of fonts, with some extra fonts, at
-    <ulink url="&noto-alternate;">&noto-alternate;</ulink> (19 MB). The
-    installation procedures for those are listed separately. Unfortunately,
-    the tarball does not provide the CJK fonts.</para></note>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&noto-fonts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&noto-fonts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &noto-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &noto-fonts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &noto-fonts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &noto-fonts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note><para>Almost nobody will ever encounter text for which some of these
-    fonts can be used. Consult the user notes below to see which fonts you 
-    might wish to delete.</para></note>
-
-    <bridgehead renderas="sect3">Noto Fonts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="unzip"/> (for Noto-hinted.zip)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/noto-fonts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Noto Fonts</title>
-
-    <note><para>Unlike most other packages there is no need to unpack the
-    compressed Noto-hinted.zip package before installation.</para></note>
-
-    <para>
-      To install <application>Noto Fonts</application> from the full Noto-hinted
-      zip file, run the following commands as the
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen><userinput>install -d -m755         /usr/share/fonts/noto   &amp;&amp;
-unzip Noto-hinted.zip -d /usr/share/fonts/noto   &amp;&amp;
-chmod 0644               /usr/share/fonts/noto/* &amp;&amp;
-fc-cache</userinput></screen>
-
-    <para>
-      Alternatively, to install a smaller set from the tarball, untar it
-      as normal.  You will note that there are both
-      <filename class="directory">hinted/</filename> and
-      <filename class="directory">unhinted/</filename> directories, and
-      the documentation suggests that linux users should install the
-      hinted files.
-    </para>
-
-    <para>
-      In fact, there are many other fonts in the <filename
-      class="directory">unhinted</filename> directory, but all except one are
-      historic. The exception is the Noto Sans Symbols font - if Noto Sans is
-      your main font, you will probably want this because of the currency
-      symbols it provides.
-    </para>
-
-    <para>
-      In the <filename class="directory">hinted/</filename> directory there are
-      also some duplicate TTC (TrueType Collection) files for NotoSans which do
-      not provide anything useful and similarly some UI variants which were
-      again a dead end.
-    </para>
-
-    <para>
-      To install from the tarball, run the following commands as the
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen><userinput>install -d -m755         /usr/share/fonts/noto                                 &amp;&amp;
-cp -v LICENSE hinted/*.ttf unhinted/NotoSansSymbols*.ttf /usr/share/fonts/noto &amp;&amp;
-rm -v /usr/share/fonts/noto/Noto*UI*                                           &amp;&amp;
-chmod 0644               /usr/share/fonts/noto/*                               &amp;&amp;
-fc-cache</userinput></screen>
-
-    <para>
-      If you remove any of the fonts, remember to run 'fc-cache' (as root) to
-      update fontconfig.
-    </para>
-
-    <para>
-      This package does not come with a test suite.
-    </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>
-          None
-        </seg>
-        <seg>
-          /usr/share/fonts/noto
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/npapi-sdk.xml
===================================================================
--- archive/npapi-sdk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,122 +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 npapi-sdk-download-http
-  "https://bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-&npapi-sdk-version;.tar.bz2">
-  <!ENTITY npapi-sdk-download-ftp  " ">
-  <!ENTITY npapi-sdk-md5sum        "e81db61e206cd615cf56c4a9f301e636">
-  <!ENTITY npapi-sdk-size          "65 KB">
-  <!ENTITY npapi-sdk-buildsize     "520 KB">
-  <!ENTITY npapi-sdk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="npapi-sdk" xreflabel="NPAPI-SDK-&npapi-sdk-version;">
-  <?dbhtml filename="npapi-sdk.html"?>
-
-
-  <title>NPAPI-SDK-&npapi-sdk-version;</title>
-
-  <indexterm zone="npapi-sdk">
-    <primary sortas="a-NPAPI-SDK">NPAPI-SDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NPAPI-SDK</title>
-
-    <para>
-      <application>NPAPI-SDK</application> is a bundle of Netscape Plugin
-      Application Programming Interface headers by Mozilla. This package
-      provides a clear way to install those headers and depend on them.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&npapi-sdk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&npapi-sdk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &npapi-sdk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &npapi-sdk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &npapi-sdk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &npapi-sdk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url='&blfs-wiki;/NPAPI-SDK'/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NPAPI-SDK</title>
-
-    <para>
-      Install <application>NPAPI-SDK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/npapi-sdk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/obex-data-server.xml
===================================================================
--- archive/obex-data-server.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 obex-data-server-download-http "http://tadas.dailyda.com/software/obex-data-server-&obex-data-server-version;.tar.gz">
-  <!ENTITY obex-data-server-download-ftp  " ">
-  <!ENTITY obex-data-server-md5sum        "961ca5db6fe9c97024e133cc6203cc4d">
-  <!ENTITY obex-data-server-size          "196 KB">
-  <!ENTITY obex-data-server-buildsize     "2.2 MB">
-  <!ENTITY obex-data-server-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="obex-data-server" xreflabel="obex-data-server-&obex-data-server-version;">
-  <?dbhtml filename="obex-data-server.html"?>
-
-
-  <title>obex-data-server-&obex-data-server-version;</title>
-
-  <indexterm zone="obex-data-server">
-    <primary sortas="a-obex-data-server">obex-data-server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OBEX Data Server</title>
-
-    <para>
-      <application>OBEX Data Server</application> package contains D-Bus service
-      providing high-level OBEX client and server side functionality.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&obex-data-server-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&obex-data-server-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &obex-data-server-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &obex-data-server-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &obex-data-server-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &obex-data-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/obex-data-server-&obex-data-server-version;-build-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OBEX Data Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="bluez"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="imagemagick"/> or
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libusb-compat"/>, and
-      <xref linkend="openobex"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/obex-data-server"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OBEX Data Server</title>
-
-    <para>
-      Install <application>OBEX Data Server</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../obex-data-server-&obex-data-server-version;-build-fixes-1.patch &amp;&amp;
-
-./configure --prefix=/usr --sysconfdir=/etc &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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          obex-data-server
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/obex-data-server
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="obex-data-server-prog">
-        <term><command>obex-data-server</command></term>
-        <listitem>
-          <para>
-            is a D-Bus service providing OBEX functionality.
-          </para>
-          <indexterm zone="obex-data-server obex-data-server-prog">
-            <primary sortas="b-obex-data-server">obex-data-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/obexd.xml
===================================================================
--- archive/obexd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +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 obexd-download-http "http://www.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
-  <!ENTITY obexd-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
-  <!ENTITY obexd-md5sum        "dfb9bdd490a975616afa3a0c2bf53c88">
-  <!ENTITY obexd-size          "344 KB">
-  <!ENTITY obexd-buildsize     "6.5 MB">
-  <!ENTITY obexd-time          "0.2 SBU">
-]>
-
-<sect1 id="obexd" xreflabel="Obexd-&obexd-version;">
-  <?dbhtml filename="obexd.html"?>
-
-
-  <title>Obexd-&obexd-version;</title>
-
-  <indexterm zone="obexd">
-    <primary sortas="a-Obexd">Obexd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Obexd</title>
-
-    <para>
-      The <application>Obexd</application> package contains D-Bus services providing
-      OBEX client and server functionality. OBEX is a communications protocol that
-      facilitates the exchange of binary objects between devices.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&obexd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&obexd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &obexd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &obexd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &obexd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &obexd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Obexd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="bluez"/> and
-      <xref linkend="libical"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/obexd"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Obexd</title>
-
-    <para>
-      Install <application>Obexd</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/#include &lt;string.h&gt;/&amp;\n#include &lt;stdio.h&gt;/' plugins/mas.c &amp;&amp;
-./configure --prefix=/usr --libexecdir=/usr/lib/obex &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/#include ...</command>: This sed fixes building against
-      the <application>Glibc</application> 2.17.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          obex-client and obexd
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/obex
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/opal.xml
===================================================================
--- archive/opal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +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 opal-download-http "&gnome-download-http;/opal/3.10/opal-&opal-version;.tar.xz">
-  <!ENTITY opal-download-ftp  "&gnome-download-ftp;/opal/3.10/opal-&opal-version;.tar.xz">
-  <!ENTITY opal-md5sum        "6efa1b4c5e0ad6460019b4c6df0898d7">
-  <!ENTITY opal-size          "5.7 MB">
-  <!ENTITY opal-buildsize     "305 MB">
-  <!ENTITY opal-time          "2.0 SBU">
-]>
-
-<sect1 id="opal" xreflabel="Opal-&opal-version;">
-  <?dbhtml filename="opal.html"?>
-
-
-  <title>Opal-&opal-version;</title>
-
-  <indexterm zone="opal">
-    <primary sortas="a-Opal">Opal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Opal</title>
-
-    <para>
-      The <application>Opal</application> package contains a C++ class library for
-      normalising the numerous telephony protocols into a single integrated call
-      model.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg2-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Opal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ptlib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.celt-codec.org/">Celt</ulink>,
-      <xref linkend="ffmpeg"/>,
-      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
-      <ulink url="http://www.isdn4linux.de/">ISDN4Linux</ulink>,
-      <xref linkend="libtheora"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="ruby"/>,
-      <ulink url="http://www.soft-switch.org/">Spandsp</ulink>,
-      <xref linkend="speex"/>, and
-      <xref linkend="x264"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/opal"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Opal</title>
-
-    <para>Fix a build issue with <application>GCC-7.1</application>:</para>
-
-<screen><userinput>sed -i 's| abs(| std::fabs(|g' plugins/video/common/mpi.cxx</userinput></screen>
-
-    <para>Install <application>Opal</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
-
-sed -e 's/CODEC_ID/AV_&amp;/' \
-    -e 's/PIX_FMT_/AV_&amp;/' \
-    -i plugins/video/H.263-1998/h263-1998.cxx \
-       plugins/video/common/dyna.cxx          \
-       plugins/video/H.264/h264-x264.cxx      \
-       plugins/video/MPEG4-ffmpeg/mpeg4.cxx   &amp;&amp;
-
-sed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
-    -i src/im/msrp.cxx  &amp;&amp;
-
-sed -e '/abs(/s/MPI.*)/(int)(&amp;)/' \
-    -i ./plugins/video/common/mpi.cxx &amp;&amp;
-
-
-./configure --prefix=/usr &amp;&amp;
-CXXFLAGS=-Wno-deprecated-declarations 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;
-chmod -v 644 /usr/lib/libopal_s.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: The first sed fixes several files 
-      to work properly with <xref linkend='ffmpeg'/>.  The second and 
-      third fixes build issues with <xref linkend='gcc'/>.
-    </para>
-
-    <para>
-      <envar>CXXFLAGS=-Wno-deprecated-declarations</envar>: This parameter
-      reduces a lot of warnings generated by <xref linkend='gcc'/>.
-    </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>
-          libopal.so and libopal_s.a
-        </seg>
-        <seg>
-          /usr/include/opal and
-          /usr/lib/opal-&opal-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libopal">
-        <term><filename class="libraryfile">libopal.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Opal</application> API functions.
-          </para>
-          <indexterm zone="opal libopal">
-            <primary sortas="c-libopal">libopal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/openjpeg.xml
===================================================================
--- archive/openjpeg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +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 openjpeg-download-http "&sourceforge-dl;/openjpeg.mirror/openjpeg-&openjpeg-version;.tar.gz">
-  <!ENTITY openjpeg-download-ftp  " ">
-  <!ENTITY openjpeg-md5sum        "c41772c30fb1c272358b3707233134a1">
-  <!ENTITY openjpeg-size          "1.4 MB">
-  <!ENTITY openjpeg-buildsize     "16 MB">
-  <!ENTITY openjpeg-time          "0.2 SBU">
-]>
-
-<sect1 id="openjpeg" xreflabel="OpenJPEG-&openjpeg-version;">
-  <?dbhtml filename="openjpeg.html"?>
-
-
-  <title>OpenJPEG-&openjpeg-version;</title>
-
-  <indexterm zone="openjpeg">
-    <primary sortas="a-openjpeg">OpenJPEG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJPEG</title>
-
-    <para><application>OpenJPEG</application> is an open-source implementation
-    of the JPEG-2000 standard. OpenJPEG fully respects the JPEG-2000 specifications
-    and can compress/decompress lossless 16-bit images.</para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&openjpeg-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&openjpeg-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &openjpeg-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &openjpeg-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &openjpeg-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &openjpeg-time;</para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/openjpeg-&openjpeg-version;-security_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="lcms2"/>,
-    <xref linkend="libpng"/>,
-    <xref linkend="libtiff"/> and
-    <xref linkend="doxygen"/> (to build the API documentation)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/openjpeg"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJPEG</title>
-
-    <para>
-      Install <application>OpenJPEG</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>autoreconf -f -i &amp;&amp;
-./configure --prefix=/usr --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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <!--
-  <sect2 role="configuration">
-    <title>Configuring OpenJPEG</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-    </sect3>
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>image_to_j2k, j2k_dump and j2k_to_image</seg>
-        <seg>libopenjpeg.so</seg>
-        <seg>/usr/include/openjpeg-1.5 and /usr/share/doc/openjpeg-1.5</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="image_to_j2k">
-        <term><command>image_to_j2k</command></term>
-        <listitem>
-          <para>converts various image formats to the jpeg2000 format.</para>
-          <indexterm zone="openjpeg image_to_j2k">
-            <primary sortas="b-image_to_j2k">image_to_j2k</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="j2k_dump">
-        <term><command>j2k_dump</command></term>
-        <listitem>
-          <para>reads in a jpeg2000 image and dumps the contents to stdout.</para>
-          <indexterm zone="openjpeg j2k_dump">
-            <primary sortas="b-j2k_dump">j2k_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="j2k_to_image">
-        <term><command>j2k_to_image</command></term>
-        <listitem>
-          <para>converts jpeg2000 images to other image types.</para>
-          <indexterm zone="openjpeg j2k_to_image">
-            <primary sortas="b-j2k_to_image">j2k_to_image</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/openobex.xml
===================================================================
--- archive/openobex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 openobex-download-http "&sourceforge-dl;/openobex/openobex-&openobex-version;-Source.tar.gz">
-  <!ENTITY openobex-download-ftp  " ">
-  <!ENTITY openobex-md5sum        "f6e0b6cb7dcfd731460a7e9a91429a3a">
-  <!ENTITY openobex-size          "128 KB">
-  <!ENTITY openobex-buildsize     "3.1 MB">
-  <!ENTITY openobex-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="openobex" xreflabel="OpenOBEX-&openobex-version;">
-  <?dbhtml filename="openobex.html"?>
-
-
-  <title>OpenOBEX-&openobex-version;</title>
-
-  <indexterm zone="openobex">
-    <primary sortas="a-OpenOBEX">OpenOBEX</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenOBEX</title>
-
-    <para>
-      The <application>OpenOBEX</application> package contains a
-      library that implements Object Exchange Protocol used for
-      binary file transfers between devices.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openobex-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openobex-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openobex-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openobex-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openobex-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openobex-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenOBEX Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bluez"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openjdk"/>, and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/openobex"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenOBEX</title>
-
-    <para><application>OpenOBEX</application> installs a udev rule that
-    requires a group named plugdev.  Create that group as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 90 plugdev</userinput></screen>
-
-    <para>
-      Install <application>OpenOBEX</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr      \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib  \
-      -DCMAKE_BUILD_TYPE=Release       \
-      -Wno-dev                         \
-      .. &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>
-
-    <!-- /usr/share/doc/openobex is not created if doxygen is not found -->
-<screen role="root"><userinput>make install &amp;&amp;
-if [ -d /usr/share/doc/openobex ]; then
-  mv -fv /usr/share/doc/{openobex,openobex-&openobex-version;}
-fi</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-Wno-dev</parameter>: This switch is used to suppress warnings
-      that are meant for the author of the CMakeLists.txt files.
-    </para>
-
-    <para>
-      <command>mv -fv ...</command>: Moves the documentation to a versioned
-      directory, if it has been created.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          obex-check-device
-        </seg>
-        <seg>
-          libopenobex.so
-        </seg>
-        <seg>
-          /usr/include/openobex,
-          /usr/lib/cmake/OpenObex-1.7.1, and
-          /usr/share/doc/openobex-1.7.1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="obex-check-device">
-        <term><command>obex-check-device</command></term>
-        <listitem>
-          <para>
-            is a tool that helps <application>udev</application> find connectable OBEX USB devices.
-          </para>
-          <indexterm zone="openobex obex-check-device">
-            <primary sortas="b-obex-check-device">obex-check-device</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopenobex">
-        <term><filename class="libraryfile">libopenobex.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>OpenOBEX</application> API functions.
-          </para>
-          <indexterm zone="openobex libopenobex">
-            <primary sortas="c-libopenobex">libopenobex.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/openquicktime.xml
===================================================================
--- archive/openquicktime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +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 openquicktime-download-http "&sourceforge-repo;/openquicktime/openquicktime-&openquicktime-version;-src.tgz">
-  <!ENTITY openquicktime-download-ftp  " ">
-  <!ENTITY openquicktime-md5sum        "f90bc78b8632c6c254cddf70b4726644">
-  <!ENTITY openquicktime-size          "313 KB">
-  <!ENTITY openquicktime-buildsize     "8.6 MB">
-  <!ENTITY openquicktime-time          "0.11 SBU">
-]>
-
-<sect1 id="openquicktime" xreflabel="OpenQuicktime-&openquicktime-version;">
-  <?dbhtml filename="openquicktime.html"?>
-
-
-  <title>OpenQuicktime-&openquicktime-version;</title>
-
-  <indexterm zone="openquicktime">
-    <primary sortas="a-OpenQuicktime">OpenQuicktime</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenQuicktime</title>
-
-    <para><application>OpenQuicktime</application> is a small library that handles
-    the Quicktime file format on most varieties of Unix. Audio and video decoding
-    and encoding is provided using a plug-in mechanism.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&openquicktime-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&openquicktime-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &openquicktime-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &openquicktime-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &openquicktime-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &openquicktime-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/openquicktime-&openquicktime-version;-gcc34-1.patch"></ulink></para>
-      </listitem>
-      <listitem>
-        <para>Optional CODEC: <ulink
-        url="http://www.openquicktime.org/codecs.php"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenQuicktime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GLib"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/openquicktime"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenQuicktime</title>
-
-    <para>Install <application>OpenQuicktime</application> by running the
-    following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../openquicktime-&openquicktime-version;-gcc34-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dechunk, make_streamable, qtdump, qtinfo, and recover</seg>
-        <seg>libopenquicktime.so, quicktime_codec_ms.so,
-        quicktime_codec_jpeg.so and quicktime_codec_.mp3.so </seg>
-        <seg>/usr/include/openquicktime</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dechunk">
-        <term><command>dechunk</command></term>
-        <listitem>
-          <para>extracts RGB frames from a movie and writes them as
-          PPM images.</para>
-          <indexterm zone="openquicktime dechunk">
-            <primary sortas="b-dechunk">dechunk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="make_streamable">
-        <term><command>make_streamable</command></term>
-        <listitem>
-          <para>this program makes the Quicktime file streamable.</para>
-          <indexterm zone="openquicktime make_streamable">
-            <primary sortas="b-make_streamable">make_streamable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdump">
-        <term><command>qtdump</command></term>
-        <listitem>
-          <para>dumps all tables in a movie.</para>
-          <indexterm zone="openquicktime qtdump">
-            <primary sortas="b-qtdump">qtdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtinfo">
-        <term><command>qtinfo</command></term>
-        <listitem>
-          <para>reads all the information about the file.</para>
-          <indexterm zone="openquicktime qtinfo">
-            <primary sortas="b-qtinfo">qtinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="recover">
-        <term><command>recover</command></term>
-        <listitem>
-          <para>this program recovers JPEG and PCM audio from a
-          corrupted movie.</para>
-          <indexterm zone="openquicktime recover">
-            <primary sortas="b-recover">recover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopenquicktime">
-        <term><filename class='libraryfile'>libopenquicktime.{so,a}</filename></term>
-        <listitem>
-          <para>this is the core library.</para>
-          <indexterm zone="openquicktime libopenquicktime">
-            <primary sortas="c-libopenquicktime">libopenquicktime.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/openssl.xml
===================================================================
--- archive/openssl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,280 +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 openssl-download-http
-           "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-download-ftp
-           "ftp://openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "ba5f1b8b835b88cadbce9b35ed9531a6">
-  <!ENTITY openssl-size          "5.2 MB">
-  <!ENTITY openssl-buildsize     "73 MB (with tests)">
-  <!ENTITY openssl-time          "1.5 SBU (with tests)">
-]>
-
-<sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
-  <?dbhtml filename="openssl.html"?>
-
-
-  <title>OpenSSL-&openssl-version;</title>
-
-  <indexterm zone="openssl">
-    <primary sortas="a-OpenSSL">OpenSSL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenSSL</title>
-
-    <para>
-      The <application>OpenSSL</application> package contains management tools
-      and libraries relating to cryptography.  These are useful for providing
-      cryptographic functions to other packages, such as
-      <application>OpenSSH</application>, email applications and web browsers
-      (for accessing HTTPS sites).
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openssl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openssl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openssl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openssl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openssl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openssl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url='&blfs-wiki;/OpenSSL'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenSSL</title>
-
-    <para>
-      Install <application>OpenSSL</application> with the following commands:
-    </para>
-
-
-<screen><userinput>./config --prefix=/usr         \
-         --openssldir=/etc/ssl \
-         --libdir=lib          \
-         shared                \
-         zlib-dynamic &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      If you want to disable installing the static libraries, use this sed:
-    </para>
-
-<screen><userinput>sed -i 's# libcrypto.a##;s# libssl.a##;/INSTALL_LIBS/s#libcrypto.a##' Makefile</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make INSTALL_PREFIX=<DESTDIR> MANDIR=/usr/share/man MANSUFFIX=ssl install -->
-
-<screen role="root"><userinput>make MANSUFFIX=ssl install           &amp;&amp;
-mv -v /usr/share/doc/openssl{,-&openssl-version;} &amp;&amp;
-cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>shared</parameter>: This parameter forces the creation of
-      shared libraries along with the static libraries.
-    </para>
-
-    <para>
-      <parameter>zlib-dynamic</parameter>: This parameter adds
-      compression/decompression functionality using the
-      <filename class="libraryfile">libz</filename> library.
-    </para>
-
-    <para>
-      <option>no-rc5 no-idea</option>: When added to the
-      <command>./config</command> command, this will eliminate the building
-      of those encryption methods. Patent licenses may be needed for you to
-      utilize either of those methods in your projects.
-    </para>
-
-    <para>
-      <command>make MANSUFFIX=ssl install</command>:
-      This command appends an "ssl" suffix to the manual page names to avoid
-      conflicts with manual pages installed by other packages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenSSL</title>
-
-    <sect3 id="openssl-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/ssl/openssl.cnf</filename>
-      </para>
-
-      <indexterm zone="openssl openssl-config">
-        <primary sortas="e-etc-ssl-openssl.cnf">/etc/ssl/openssl.cnf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Most users will want to install Certificate Authority Certificates
-        for validation of downloaded certificates. For example, these
-        certificates can be used by <xref linkend='git'/>,
-        <xref linkend='curl'/> or <xref linkend='wget'/> when accessing secure
-        (https protocol) sites. To do this, follow the instructions from the
-        <xref linkend='cacerts'/> page.
-      </para>
-
-      <para>
-        Users who just want to use <application>OpenSSL</application> for
-        providing functions to other programs such as
-        <application>OpenSSH</application> and web browsers do not need to worry
-        about additional configuration. This is an advanced topic and those
-        who do need it would normally be expected to either know how to properly
-        update <filename>/etc/ssl/openssl.cnf</filename> or be able to find out
-        how to do it.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          c_rehash and openssl
-        </seg>
-        <seg>
-          libcrypto.{so,a} and libssl.{so,a}
-        </seg>
-        <seg>
-          /etc/ssl,
-          /usr/include/openssl,
-          /usr/lib/engines and
-          /usr/share/doc/openssl-&openssl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="c_rehash">
-        <term><command>c_rehash</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that scans all files in
-            a directory and adds symbolic links to their hash values.
-          </para>
-          <indexterm zone="openssl c_rehash">
-            <primary sortas="b-c_rehash">c_rehash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openssl-prog">
-        <term><command>openssl</command></term>
-        <listitem>
-          <para>
-            is a command-line tool for using the various cryptography functions
-            of <application>OpenSSL</application>'s crypto library from the
-            shell. It can be used for various functions which are documented in
-            <command>man 1 openssl</command>.
-          </para>
-          <indexterm zone="openssl openssl-prog">
-            <primary sortas="b-openssl">openssl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcrypto">
-        <term><filename class="libraryfile">libcrypto.{so,a}</filename></term>
-        <listitem>
-          <para>
-            implements a wide range of cryptographic algorithms used in various
-            Internet standards. The services provided by  this library are used
-            by the <application>OpenSSL</application> implementations of SSL,
-            TLS and S/MIME, and they have also been used to implement
-            <application>OpenSSH</application>,
-            <application>OpenPGP</application>, and other cryptographic
-            standards.
-          </para>
-          <indexterm zone="openssl libcrypto">
-            <primary sortas="c-libcrypto">libcrypto.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libssl">
-        <term><filename class="libraryfile">libssl.{so,a}</filename></term>
-        <listitem>
-          <para>
-            implements the Transport Layer Security (TLS v1) protocol.
-            It provides a rich API, documentation
-            on which can be found by running <command>man 3 ssl</command>.
-          </para>
-          <indexterm zone="openssl libssl">
-            <primary sortas="c-libssl">libssl.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/openssl10.xml
===================================================================
--- archive/openssl10.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,231 +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 openssl10-download-http
-           "https://openssl.org/source/openssl-&openssl10-version;.tar.gz">
-  <!ENTITY openssl10-download-ftp
-           "ftp://openssl.org/source/openssl-&openssl10-version;.tar.gz">
-  <!ENTITY openssl10-md5sum        "7563e1ce046cb21948eeb6ba1a0eb71c">
-  <!ENTITY openssl10-size          "5.1 MB">
-  <!ENTITY openssl10-buildsize     "74 MB (with tests)">
-  <!ENTITY openssl10-time          "1.2 SBU (with tests)">
-]>
-
-<sect1 id="openssl10" xreflabel="OpenSSL-&openssl10-version; Libraries">
-  <?dbhtml filename="openssl10.html"?>
-
-
-  <title>OpenSSL-&openssl10-version;</title>
-
-  <indexterm zone="openssl10">
-    <primary sortas="a-OpenSSL10">OpenSSL-&openssl10-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenSSL-&openssl10-version; Libraries</title>
-
-    <para>
-      The <application>OpenSSL-&openssl10-version;</application> package
-      contains libraries relating to cryptography.  These are useful for
-      providing cryptographic functions to other packages, such as
-      email applications and web browsers (for accessing HTTPS sites). This
-      package provides only the libraries and headers for packages that have
-      not yet been ported to openssl-1.1.x or later.
-    </para>
-
-    &lfs83_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openssl10-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openssl10-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openssl10-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openssl10-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openssl10-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openssl10-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink url="&patch-root;/openssl-&openssl10-version;-compat_versioned_symbols-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenSSL-&openssl10-version; Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url='&blfs-wiki;/OpenSSL'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenSSL-&openssl10-version; Libraries</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
- 
-    <para>
-      Install <application>OpenSSL-&openssl10-version; Libraries</application>
-      with the following commands:
-    </para>
-
-
-<screen><userinput> patch -Np1 -i ../openssl-&openssl10-version;-compat_versioned_symbols-1.patch &amp;&amp;
-
-./config --prefix=/usr            \
-         --openssldir=/etc/ssl    \
-         --libdir=lib/openssl-1.0 \
-         shared                   \
-         zlib-dynamic             &amp;&amp;
-
-make depend                       &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 test</command>.  The
-      test suite does not support parallel jobs.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make INSTALL_PREFIX=$PWD/Dest install_sw                      &amp;&amp;
-
-rm -rf /usr/lib/openssl-1.0                                   &amp;&amp;
-install -vdm755                   /usr/lib/openssl-1.0        &amp;&amp;
-cp -Rv Dest/usr/lib/openssl-1.0/* /usr/lib/openssl-1.0        &amp;&amp;
-
-mv -v  /usr/lib/openssl-1.0/lib{crypto,ssl}.so.1.0.0 /usr/lib &amp;&amp;
-ln -sv ../libssl.so.1.0.0         /usr/lib/openssl-1.0        &amp;&amp;
-ln -sv ../libcrypto.so.1.0.0      /usr/lib/openssl-1.0        &amp;&amp;
-
-install -vdm755                   /usr/include/openssl-1.0    &amp;&amp;
-cp -Rv Dest/usr/include/openssl   /usr/include/openssl-1.0    &amp;&amp;
-
-sed 's@/include$@/include/openssl-1.0@' -i /usr/lib/openssl-1.0/pkgconfig/*.pc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>shared</parameter>: This parameter forces the creation of
-      shared libraries along with the static libraries.
-    </para>
-
-    <para>
-      <parameter>zlib-dynamic</parameter>: This parameter adds
-      compression/decompression functionality using the
-      <filename class="libraryfile">libz</filename> library.
-    </para>
-
-    <para>
-      <parameter>rm -rf /usr/lib/openssl-1.0</parameter>: This will do
-      nothing on a first install, but enables a later update. During the
-      install the libraries are moved and replaced by symlinks. If you later
-      upgrade to a future release of <application>openssl-1.0.2</application>
-      to fix newly discovered vulnerabilities, without this command the move
-      would fail because the symlinks mean the source and destination files
-      are identical.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libcrypto.so.1.0.0 and libssl.so.1.0.0
-        </seg>
-        <seg>
-          /usr/lib/openssl-1.0 and /usr/include/openssl-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcrypto10">
-        <term><filename class="libraryfile">libcrypto.so.1.0.0</filename></term>
-        <listitem>
-          <para>
-            implements a wide range of cryptographic algorithms used in various
-            Internet standards. The services provided by  this library are used
-            by the <application>OpenSSL</application> implementations of SSL,
-            TLS and S/MIME, and they have also been used to implement
-            <application>OpenSSH</application>,
-            <application>OpenPGP</application>, and other cryptographic
-            standards.
-          </para>
-          <indexterm zone="openssl10 libcrypto10">
-            <primary sortas="c-libcrypto10">libcrypto.so.1.0.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libssl10">
-        <term><filename class="libraryfile">libssl.so.1.0.0</filename></term>
-        <listitem>
-          <para>
-            implements the Transport Layer Security (TLS v1) protocol.
-            It provides a rich API, documentation
-            on which can be found by running <command>man 3 ssl</command>.
-          </para>
-          <indexterm zone="openssl10 libssl10">
-            <primary sortas="c-libssl10">libssl.so.1.0.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/other-tools.xml
===================================================================
--- archive/other-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2592 +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="other-tools" xreflabel="Other Programming Tools">
-  <?dbhtml filename="other-tools.html"?>
-
-
-  <title>Other Programming Tools</title>
-
-  <indexterm zone="other-tools">
-    <primary sortas="a-Other-Programming-Tools">Other Programming Tools</primary>
-  </indexterm>
-
-  <sect2 role="introduction">
-    <title>Introduction</title>
-
-    <para>
-      This section is provided to show you some additional programming
-      tools for which instructions have not yet been created in the book or for
-      those that are not appropriate for the book. Note that these packages may
-      not have been tested by the BLFS team, but their mention here is meant to
-      be a convenient source of additional information.
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/OtherProgrammingTools"/></para>
-
-  </sect2>
-
-  <sect2>
-    <title>Programming Frameworks, Languages and Compilers</title>
-
-    <!-- This is a template for additions to this page. Cut 22 lines and
-         paste them in alphabetical order for the new package. '22yy' and
-         move down to the alpha order and 'p' works great (using vi).
-
-    <sect3 role="package">
-      <title></title>
-
-      <para>
-        <application></application> This is the description.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url=""/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url=""/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    -->
-
-    <sect3 role="package">
-      <title>A+</title>
-
-      <para>
-        <application>A+</application> is a powerful and efficient
-        programming language. It is freely available under the GNU General
-        Public License. It embodies a rich set of functions and operators, a
-        modern graphical user interface with many widgets and automatic
-        synchronization of widgets and variables, asynchronous execution of
-        functions associated with variables and events, dynamic loading of user
-        compiled subroutines, and many other features. Execution is by a rather
-        efficient interpreter. <application>A+</application> was created at
-        Morgan Stanley. Primarily used in a computationally-intensive business
-        environment, many critical applications written in
-        <application>A+</application> have withstood the demands of real world
-        developers over many years. Written in an interpreted language,
-        <application>A+</application> applications tend to be portable.
-    </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.aplusdev.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.aplusdev.org/Download/index.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>ABC</title>
-
-      <para>
-        <application>ABC</application> is an interactive programming language
-        and environment for personal computing, originally intended as a
-        good replacement for BASIC. It was designed by first doing a task
-        analysis of the programming task. <application>ABC</application> is easy
-        to learn (an hour or so for someone who has already programmed), and yet
-        easy to use. Originally intended as a language for beginners, it has
-        evolved into a powerful tool for beginners and experts alike. Some
-        features of the language include: a powerful collection of only five
-        data types that easily combines strong typing, yet without declarations,
-        no limitations (such as max int), apart from sheer exhaustion of memory
-        refinements to support top-down programming, nesting by indentation and
-        programs typically are one fourth or one fifth the size of the
-        equivalent Pascal or C program.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://homepages.cwi.nl/~steven/abc/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://homepages.cwi.nl/~steven/abc/implementations.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>ALF</title>
-
-      <para>
-        <application>ALF</application> is a language which combines
-        functional and logic programming techniques. The foundation of
-        <application>ALF</application> is Horn clause logic with equality which
-        consists of predicates and Horn clauses for logic programming, and
-        functions and equations for functional programming. The
-        <application>ALF</application> system is an efficient implementation of
-        the combination of resolution, narrowing, rewriting and rejection.
-        Similarly to Prolog, <application>ALF</application> uses a backtracking
-        strategy corresponding to a depth-first search in the derivation tree.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.informatik.uni-kiel.de/~mh/systems/ALF.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.informatik.uni-kiel.de/~mh/systems/ALF/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>ASM</title>
-
-      <para>
-        <application>ASM</application> is a Java bytecode manipulation
-        framework. It can be used to dynamically generate stub classes or other
-        proxy classes, directly in binary form, or to dynamically modify
-        classes at load time, i.e., just before they are loaded into the Java
-        Virtual Machine. <application>ASM</application> offers similar
-        functionalities as BCEL or SERP, but is much smaller (33KB instead of
-        350KB for BCEL and 150KB for SERP) and faster than these tools (the
-        overhead of a load time class transformation is of the order of 60% with
-        <application>ASM</application>, 700% or more with BCEL, and 1100% or
-        more with SERP). Indeed <application>ASM</application> was designed to
-        be used in a dynamic way (though it works statically as well) and was
-        therefore designed and implemented to be as small and as fast as
-        possible.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://asm.objectweb.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://forge.objectweb.org/projects/asm/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>BCPL</title>
-
-      <para>
-        <application>BCPL</application> is a simple typeless language that
-        was designed in 1966 by Martin Richards and implemented for the first
-        time at MIT in the Spring of 1967.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.cl.cam.ac.uk/users/mr/BCPL.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.cl.cam.ac.uk/users/mr/BCPL/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>BETA</title>
-
-      <para>
-        <application>BETA</application> is developed within the
-        Scandinavian School of object-orientation, where the first
-        object-oriented language, Simula, was developed.
-        <application>BETA</application> is a modern language in the Simula
-        tradition. The resulting language is smaller than Simula in spite of
-        being considerably more expressive. <application>BETA</application> is
-        a strongly typed language like Simula, Eiffel and C++, with most type
-        checking being carried out at compile-time. It is well known that it is
-        not possible to obtain all type checking at compile time without
-        sacrificing the expressiveness of the language.
-        <application>BETA</application> has optimum balance between
-        compile-time type checking and run-time type checking.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.daimi.au.dk/~beta/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="ftp://ftp.daimi.au.dk/pub/beta/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>&lt;bigwig&gt;</title>
-
-      <para>
-        <application>&lt;bigwig&gt;</application> is a high-level programming
-        language for developing interactive Web services. Programs are compiled
-        into a conglomerate of lower-level technologies such as C code, HTTP,
-        HTML, JavaScript, and SSL, all running on top of a runtime system based
-        on an Apache Web server module. It is a descendant of the Mawl project
-        but is a completely new design and implementation with vastly expanded
-        ambitions. The <application>&lt;bigwig&gt;</application> language is
-        really a collection of tiny domain-specific languages focusing on
-        different aspects of interactive Web services. These contributing
-        languages are held together by a C-like skeleton language.  Thus,
-        <application>&lt;bigwig&gt;</application> has the look and feel of
-        C-programs but with special data and control structures.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.brics.dk/bigwig/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.brics.dk/bigwig/download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Bigloo</title>
-
-      <para>
-        <application>Bigloo</application> is a Scheme implementation devoted
-        to one goal: enabling Scheme based programming style where C(++) is
-        usually required. <application>Bigloo</application> attempts to make
-        Scheme practical by offering features usually presented by traditional
-        programming languages but not offered by Scheme and functional
-        programming. Bigloo compiles Scheme modules and delivers small and
-        fast stand-alone binary executables. It enables full connections
-        between Scheme and C programs, between Scheme and Java programs, and
-        between Scheme and C# programs.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>C--</title>
-
-      <para>
-        <application>C--</application> is a portable assembly language that
-        can be generated by a front end and implemented by any of several code
-        generators. It serves as an interface between high-level compilers and
-        retargetable, optimizing code generators. Authors of front ends and
-        code generators can cooperate easily.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.cminusminus.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.cminusminus.org/code.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Caml</title>
-
-      <para>
-        <application>Caml</application> is a general-purpose programming
-        language, designed with program safety and reliability in mind. It is
-        very expressive, yet easy to learn and use.
-        <application>Caml</application> supports functional, imperative, and
-        object-oriented programming styles. It has been developed and
-        distributed by INRIA, France's national research institute for
-        computer science, since 1985. The Objective Caml system is the main
-        implementation of the <application>Caml</application> language. It
-        features a powerful module system and a full-fledged object-oriented
-        layer. It comes with a native-code compiler that supports numerous
-        architectures, for high performance; a bytecode compiler, for increased
-        portability; and an interactive loop, for experimentation and rapid
-        development.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://caml.inria.fr/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://caml.inria.fr/pub/distrib/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Ch</title>
-
-      <para>
-        <application>Ch</application> is an embeddable C/C++ interpreter
-        for cross-platform scripting, shell programming, 2D/3D plotting,
-        numerical computing, and embedded scripting.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.softintegration.com/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.softintegration.com/products/chstandard/download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Clean</title>
-
-      <para>
-        <application>Clean</application> is a general purpose,
-        state-of-the-art, pure and lazy functional programming language
-        designed for making real-world applications.
-        <application>Clean</application> is the only functional language in
-        the world which offers uniqueness typing.  This type system makes it
-        possible in a pure functional language to incorporate destructive
-        updates of arbitrary data structures (including arrays) and to make
-        direct interfaces to the outside imperative world.  The type system
-        makes it possible to develop efficient applications.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://wiki.clean.cs.ru.nl/Clean"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://wiki.clean.cs.ru.nl/Download_Clean"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Cyclone</title>
-
-      <para>
-        <application>Cyclone</application> is a programming language based on
-        C that is safe, meaning that it rules out programs that have buffer
-        overflows, dangling pointers, format string attacks, and so on.
-        High-level, type-safe languages, such as Java, Scheme, or ML also
-        provide safety, but they don't give the same control over data
-        representations and memory management that C does (witness the fact
-        that the run-time systems for these languages are usually written in
-        C.) Furthermore, porting legacy C code to these languages or
-        interfacing with legacy C libraries is a difficult and error-prone
-        process. The goal of <application>Cyclone</application> is to give
-        programmers the same low-level control and performance of C without
-        sacrificing safety, and to make it easy to port or interface with
-        legacy C code.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://cyclone.thelanguage.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://cyclone.thelanguage.org/wiki/Download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-    <!-- Now comes with gcc
-    <sect3 role="package">
-      <title>D</title>
-
-      <para>
-        <application>D</application> is a general purpose systems and
-        applications programming language. It is a higher level language than
-        C++, but retains the ability to write high performance code and
-        interface directly with the operating system APIs and with hardware.
-        <application>D</application> is well suited to writing medium to large
-        scale million line programs with teams of developers. It is easy to
-        learn, provides many capabilities to aid the programmer, and is well
-        suited to aggressive compiler optimization technology.
-        <application>D</application> is not a scripting language, nor an
-        interpreted language. It doesn't come with a VM, a religion, or an
-        overriding philosophy. It's a practical language for practical
-        programmers who need to get the job done quickly, reliably, and leave
-        behind maintainable, easy to understand code.
-        <application>D</application> is the culmination of decades of
-        experience implementing compilers for many diverse languages, and
-        attempting to construct large projects using those languages. It draws
-        inspiration from those other languages (most especially C++) and
-        tempers it with experience and real world practicality.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.digitalmars.com/d/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="ftp://ftp.digitalmars.com/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-    -->
-    <sect3 role="package">
-      <title>DMDScript</title>
-
-      <para>
-        <application>DMDScript</application> is Digital Mars'
-        implementation of the ECMA 262 scripting language. Netscape's
-        implementation is called JavaScript, Microsoft's implementation is
-        called JScript. <application>DMDScript</application> is much faster
-        than other implementations, which you can verify with the included
-        benchmark.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.digitalmars.com/dscript/index.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="ftp://ftp.digitalmars.com/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>DotGNU Portable.NET</title>
-
-      <para>
-        <application>DotGNU Portable.NET</application> goal is to build a
-        suite of free software tools to build and execute .NET applications,
-        including a C# compiler, assembler, disassembler, and runtime engine.
-        While the initial target platform was GNU/Linux, it is also known to
-        run under Windows, Solaris, NetBSD, FreeBSD, and MacOS X. The runtime
-        engine has been tested on the x86, PowerPC, ARM, Sparc, PARISC, s390,
-        Alpha, and IA-64 processors.
-        <application>DotGNU Portable.NET</application> is part of the DotGNU
-        project, built in accordance with the requirements of the GNU Project.
-        DotGNU Portable.NET is focused on compatibility with the ECMA
-        specifications for CLI. There are other projects under the DotGNU
-        meta-project to build other necessary pieces of infrastructure, and to
-        explore non-CLI approaches to virtual machine implementation.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.gnu.org/software/dotgnu/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.gnu.org/software/dotgnu/pnet-packages.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Dylan</title>
-
-      <para>
-        <application>Dylan</application> is an advanced, object-oriented,
-        dynamic language which supports rapid program development. When needed,
-        programs can be optimized for more efficient execution by supplying
-        more type information to the compiler. Nearly all entities in
-        <application>Dylan</application> (including functions, classes, and
-        basic data types such as integers) are first class objects.
-        Additionally, <application>Dylan</application> supports multiple
-        inheritance, polymorphism, multiple dispatch, keyword arguments,
-        object introspection, macros, and many other advanced features...
-        --Peter Hinely.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.opendylan.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://opendylan.org/download/index.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>E</title>
-
-      <para>
-        <application>E</application> is a secure distributed Java-based
-        pure-object platform and p2p scripting language. It has two parts: ELib
-        and the <application>E</application> Language. Elib provides the stuff
-        that goes on between objects. As a pure-Java library, ELib provides for
-        inter-process capability-secure distributed programming. Its
-        cryptographic capability protocol enables mutually suspicious Java
-        processes to cooperate safely, and its event-loop concurrency and
-        promise pipelining enable high performance deadlock free distributed
-        pure-object computing. The <application>E</application> Language can
-        be used to express what happens within an object. It provides a
-        convenient and familiar notation for the ELib computational model, so
-        you can program in one model rather than two. Under the covers, this
-        notation expands into Kernel-E, a minimalist lambda-language much like
-        Scheme or Smalltalk. Objects written in the
-        <application>E</application> language are only able to interact with
-        other objects according to ELib's semantics, enabling object
-        granularity intra-process security, including the ability to safely
-        run untrusted mobile code (such as caplets).
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.erights.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.erights.org/download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>elastiC</title>
-
-      <para>
-        <application>elastiC</application> is a portable high-level
-        object-oriented interpreted language with a C like syntax. Its main
-        characteristics are: open source, interpreted, has portable bytecode
-        compilation, dynamic typing, automatic real very fast garbage
-        collection, object oriented with meta-programming support (a la
-        Smalltalk), functional programming support (Scheme-like closures with
-        lexical scoping, and eval-like functionality), hierarchical namespaces,
-        a rich set of useful built-in types (dynamic arrays, dictionaries,
-        symbols, ...), extensible with C (you can add functions, types,
-        classes, methods, packages, ...), embeddable in C.
-        <application>elastiC</application> has been strongly influenced by C,
-        Smalltalk, Scheme and Python and tries to merge the best
-        characteristics of all these languages, while still coherently
-        maintaining its unique personality.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.elasticworld.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.elasticworld.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Erlang/OTP</title>
-
-      <para>
-        <application>Erlang/OTP</application> is a development environment
-        based on Erlang. Erlang is a programming language which has many
-        features more commonly associated with an operating system than with a
-        programming language: concurrent processes, scheduling, memory
-        management, distribution, networking, etc. The initial open-source
-        Erlang release contains the implementation of Erlang, as well as a
-        large part of Ericsson's middleware for building distributed
-        high-availability systems.  Erlang is characterized by the following
-        features: robustness, soft real-time, hot code upgrades and
-        incremental code loading.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.erlang.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.erlang.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Euphoria</title>
-
-      <para>
-        <application>Euphoria</application> is a simple, flexible, and
-        easy-to-learn programming language. It lets you quickly and easily
-        develop programs for Windows, DOS, Linux and FreeBSD. Euphoria was
-        first released in 1993. Since then Rapid Deployment Software has been
-        steadily improving it with the help of a growing number of
-        enthusiastic users.  Although <application>Euphoria</application>
-        provides subscript checking, uninitialized variable checking and
-        numerous other run-time checks, it is extremely fast. People have used
-        it to develop high-speed DOS games, Windows GUI programs, and X Window
-        System programs. It is also very useful for CGI (Web-based)
-        programming.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.rapideuphoria.com/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.rapideuphoria.com/v20.htm"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Felix</title>
-
-      <para>
-        <application>Felix</application> is an advanced Algol like
-        procedural programming language with a strong functional subsystem. It
-        features ML style static typing, first class functions, pattern
-        matching, garbage collection, polymorphism, and has built in support
-        for high performance microthreading, regular expressions and context
-        free parsing.  The system provides a scripting harness so the language
-        can be used like other scripting languages such as Python and Perl,
-        but underneath it generates native code to obtain high performance. A
-        key feature of the system is that it uses the C/C++ object model, and
-        provides an advanced binding sublanguage to support integration with
-        C/C++ at both the source and object levels, both for embedding C/C++
-        data types and functions into <application>Felix</application>, and
-        for embedding <application>Felix</application> into existing C++
-        architectures. The <application>Felix</application> compiler is
-        written in Objective Caml, and generates ISO C++ which should compile
-        on any platform.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://felix.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://felix-lang.org/$/usr/local/lib/felix/tarballs"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>ferite</title>
-
-      <para>
-        <application>ferite</application> is a scripting language and engine
-        all in one manageable chunk. It is designed to be easily extended in
-        terms of API, and to be used within other applications making them
-        more configurable and useful to the end user. It has a syntax similar
-        to a number of other languages but remains clean and its own language.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.ferite.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.ferite.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Forth</title>
-
-      <para>
-        <application>Forth</application> is a stack-based, extensible
-        language without type-checking. It is probably best known for its
-        "reverse Polish" (postfix) arithmetic notation, familiar to users of
-        Hewlett-Packard calculators. <application>Forth</application> is a
-        real-time programming language originally developed to control
-        telescopes. <application>Forth</application> has many unique features
-        and applications: it can compile itself into a new compiler,
-        reverse-polish coding, edit time error checking and compiling (similar
-        to BASIC), extremely efficient thread based language, can be used to
-        debug itself, extensible; thus can become what ever you need it to be.
-        The links below lead to the website of the Forth Interest Group (FIG),
-        a world-wide, non-profit organization for education in and the
-        promotion of the <application>Forth</application> computer language.
-        Another worthwhile website dedicated to the
-        <application>Forth</application> community is <ulink
-        url="http://wiki.forthfreak.net/"/>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.forth.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.forth.org/compilers.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>GNU Smalltalk</title>
-
-      <para>
-        <application>GNU Smalltalk</application> is a free implementation
-        of the Smalltalk-80 language which runs on most versions on Unix and,
-        in general, everywhere you can find a POSIX-compliance library. An
-        uncommon feature of it is that it is well-versed to scripting tasks
-        and headless processing. See <ulink url="
-        http://www.gnu.org/software/smalltalk/manual/html_node/Overview.html
-        "/> for a more detailed explanation of
-        <application>GNU Smalltalk</application>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-          url="http://smalltalk.gnu.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-          url="&gnu-http;/smalltalk/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Haskell</title>
-
-      <para>
-        Haskell is a computer programming language. In particular, it is a
-        polymorphicly typed, lazy, purely functional language, quite different
-        from most other programming languages. The language is named for Haskell
-        Brooks Curry, whose work in mathematical logic serves as a foundation
-        for functional languages. Haskell is based on lambda calculus. There
-        are many implementations of Haskell, among them:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            GHC: <ulink
-            url="http://www.haskell.org/ghc/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Helium: <ulink
-            url="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Hugs: <ulink
-            url="http://www.haskell.org/hugs/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            nhc98: <ulink
-            url="http://www.haskell.org/nhc98/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>HLA (High Level Assembly)</title>
-
-      <para>
-        The <application>HLA</application> language was developed as a tool
-        to help teach assembly language programming and machine organization to
-        University students at the University of California, Riverside. The
-        basic idea was to teach students assembly language programming by
-        leveraging their knowledge of high level languages like C/C++ and
-        Pascal/Delphi. At the same time, <application>HLA</application> was
-        designed to allow advanced assembly language programmers write more
-        readable and more powerful assembly language code.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.plantation-productions.com/Webster/HighLevelAsm/index.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.plantation-productions.com/Webster/HighLevelAsm/dnld.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Icon</title>
-
-      <para>
-        <application>Icon</application> is a high-level, general-purpose
-        programming language with a large repertoire of features for processing
-        data structures and character strings. It is an imperative, procedural
-        language with a syntax reminiscent of C and Pascal, but with semantics
-        at a much higher level.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.cs.arizona.edu/icon/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="ftp://ftp.cs.arizona.edu/icon/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Io</title>
-
-      <para>
-        <application>Io</application> is a small, prototype-based
-        programming language. The ideas in <application>Io</application> are
-        mostly inspired by <application>Smalltalk</application> (all values are
-        objects), <application>Self</application> (prototype-based),
-        <application>NewtonScript</application> (differential inheritance),
-        <application>Act1</application> (actors and futures for concurrency),
-        <application>LISP</application> (code is a runtime
-        inspectable/modifiable tree) and <application>Lua</application>
-        (small, embeddable).
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://iolanguage.org"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://iobin.suspended-chord.info/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>J</title>
-
-      <para>
-        <application>J</application> is a modern, high-level,
-        general-purpose, high-performance programming language. It is portable
-        and runs on Windows, Unix, Mac, and PocketPC handhelds, both as a GUI
-        and in a console. True 64-bit <application>J</application> systems are
-        available for XP64 or Linux64, on AMD64 or Intel EM64T platforms.
-        <application>J</application> systems can be installed and distributed
-        for free.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.jsoftware.com/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.jsoftware.com/stable.htm"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Jamaica</title>
-
-      <para>
-        <application>Jamaica</application>, the JVM Macro Assembler, is an
-        easy-to-learn and easy-to-use assembly language for JVM bytecode
-        programming. It uses Java syntax to define a JVM class except for the
-        method body that takes bytecode instructions, including
-        <application>Jamaica</application>'s built-in macros. In
-        <application>Jamaica</application>, bytecode instructions use mnemonics
-        and symbolic names for all variables, parameters, data fields,
-        constants, and labels.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://judoscript.org/jamaica.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://judoscript.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Joy</title>
-
-      <para>
-        <application>Joy</application> is a purely functional programming
-        language. Whereas all other functional programming languages are based
-        on the application of functions to arguments,
-        <application>Joy</application> is based on the composition of
-        functions. All such functions take a stack as an argument and produce
-        a stack as a value. Consequently much of <application>Joy</application>
-        looks like ordinary postfix notation.  However, in
-        <application>Joy</application> a function can consume any number of
-        parameters from the stack and leave any number of results on the stack.
-        The concatenation of appropriate programs denotes the composition of
-        the functions which the programs denote.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.latrobe.edu.au/humanities/research/research-projects/past-projects/joy-programming-language"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Judo</title>
-
-      <para>
-        <application>Judo</application> is a practical, functional scripting
-        language. It is designed to cover the use cases of not only
-        algorithmic/object-oriented/multi-threaded programming and Java
-        scripting but also a number of major application domain tasks, such
-        as scripting for JDBC, WSDL, ActiveX, OS, multiple file/data formats,
-        etc. Despite its rich functionality, the base language is extremely
-        simple, and domain support syntax is totally intuitive to domain
-        experts, so that even though you have never programmed in
-        <application>Judo</application>, you would have little trouble
-        figuring out what the code does.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://judoscript.org/judo.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://judoscript.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>JWIG</title>
-
-      <para>
-        <application>JWIG</application> is a Java-based high-level
-        programming language for development of interactive Web services. It
-        contains an advanced session model, a flexible mechanism for dynamic
-        construction of XML documents, in particular XHTML, and a powerful API
-        for simplifying use of the HTTP protocol and many other aspects of Web
-        service programming. To support program development,
-        <application>JWIG</application> provides a unique suite of highly
-        specialized program analysers that at compile time verify for a given
-        program that no runtime errors can occur while building documents or
-        receiving form input, and that all documents being shown are valid
-        according to the document type definition for XHTML 1.0. The main goal
-        of the <application>JWIG</application> project is to simplify
-        development of complex Web services, compared to alternatives, such
-        as, Servlets, JSP, ASP, and PHP. <application>JWIG</application> is a
-        descendant of the <application>&lt;bigwig&gt;</application> research
-        language.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.brics.dk/JWIG/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.brics.dk/JWIG/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Lava</title>
-
-      <para>
-        <application>Lava</application> is a name unfortunately chosen for
-        several unrelated software development languages/projects. So it
-        doesn't appear as though BLFS has a preference for one over another,
-        the project web sites are listed below, without descriptions of the
-        capabilities or features for any of them.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://lavape.sourceforge.net/index.htm"/>
-          </para>
-        </listitem>
-        <!-- URL broken
-          <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://javalab.cs.uni-bonn.de/research/darwin/#The%20Lava%20Language"/>
-          </para>
-        </listitem>
-        -->
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://mathias.tripod.com/IavaHomepage.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Mercury</title>
-
-      <para>
-        <application>Mercury</application> is a new logic/functional
-        programming language, which combines the clarity and expressiveness of
-        declarative programming with advanced static analysis and error
-        detection features. Its highly optimized execution algorithm delivers
-        efficiency far in excess of existing logic programming systems, and
-        close to conventional programming systems.
-        <application>Mercury</application> addresses the problems of
-        large-scale program development, allowing modularity, separate
-        compilation, and numerous optimization/time trade-offs.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://mercurylang.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://mercurylang.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Mono</title>
-
-      <para>
-        <application>Mono</application> provides the necessary software to
-        develop and run .NET client and server applications on Linux, Solaris,
-        Mac OS X, Windows, and Unix. Sponsored by Novell, the
-        <application>Mono</application> open source project has an active and
-        enthusiastic contributing community and is positioned to become the
-        leading choice for development of Linux applications.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.mono-project.com/Main_Page"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://ftp.novell.com/pub/mono/archive/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>MPD</title>
-
-      <para>
-        <application>MPD</application> is a variant of the
-        <application>SR</application> programming language.
-        <application>SR</application> has a Pascal-like syntax and uses guarded
-        commands for control statements. <application>MPD</application> has a
-        C-like syntax and C-like control statements. However, the main
-        components of the two languages are the same: resources, globals,
-        operations, procs, procedures, processes, and virtual machines.
-        Moreover, <application>MPD</application> supports the same variety of
-        concurrent programming mechanisms as <application>SR</application>:
-        co statements, semaphores, call/send/forward invocations, and receive
-        and input statements.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.cs.arizona.edu/mpd/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.cs.arizona.edu/mpd/download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Nemerle</title>
-
-      <para>
-        <application>Nemerle</application> is a high-level statically-typed
-        programming language for the .NET platform. It offers functional,
-        object-oriented and imperative features. It has a simple C#-like syntax
-        and a powerful meta-programming system. Features that come from the
-        functional land are variants, pattern matching, type inference and
-        parameter polymorphism (aka generics). The meta-programming system
-        allows great compiler extensibility, embedding domain specific
-        languages, partial evaluation and aspect-oriented programming.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://nemerle.org/About"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://nemerle.org/Downloads"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Octave</title>
-
-      <para>
-        GNU <application>Octave</application> is a high-level language,
-        primarily intended for numerical computations. It provides a convenient
-        command line interface for solving linear and nonlinear problems
-        numerically, and for performing other numerical experiments using a
-        language that is mostly compatible with Matlab. It may also be used as
-        a batch-oriented language. <application>Octave</application> has
-        extensive tools for solving common numerical linear algebra problems,
-        finding the roots of nonlinear equations, integrating ordinary
-        functions, manipulating polynomials, and integrating ordinary
-        differential and differential-algebraic equations. It is easily
-        extensible and customizable via user-defined functions written in
-        <application>Octave</application>'s own language, or using dynamically
-        loaded modules written in C++, C, Fortran, or other languages.
-     </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-          url="http://www.gnu.org/software/octave/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-          url="http://www.gnu.org/software/octave/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>OO2C (Optimizing Oberon-2 Compiler)</title>
-
-      <para>
-        <application>OO2C</application> is an Oberon-2 development platform.
-        It consists of an optimizing compiler, a number of related tools, a
-        set of standard library modules and a reference manual.  Oberon-2 is
-        a general-purpose programming language in the tradition of Pascal and
-        Modula-2. Its most important features are block structure, modularity,
-        separate compilation, static typing with strong type checking (also
-        across module boundaries) and type extension with type-bound
-        procedures. Type extension makes Oberon-2 an object-oriented language.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://sourceforge.net/projects/ooc/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/ooc/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Ordered Graph Data Language (OGDL)</title>
-
-      <para>
-        <application>OGDL</application> is a structured textual format that
-        represents information in the form of graphs, where the nodes are
-        strings and the arcs or edges are spaces or indentation.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://ogdl.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/ogdl/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Pike</title>
-
-      <para>
-        <application>Pike</application> is a dynamic programming language
-        with a syntax similar to Java and C. It is simple to learn, does not
-        require long compilation passes and has powerful built-in data types
-        allowing simple and really fast data manipulation. Pike is released
-        under the GNU GPL, GNU LGPL and MPL.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://pike.ida.liu.se/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://pike.ida.liu.se/download/pub/pike"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Pyrex</title>
-
-      <para>
-        <application>Pyrex</application> is a language specially designed
-      for writing Python extension modules. It's designed to bridge the gap
-      between the nice, high-level, easy-to-use world of
-      <application>Python</application> and the messy, low-level world of C.
-      <application>Pyrex</application> lets you write code that mixes
-      <application>Python</application> and C data types any way you want, and
-      compiles it into a C extension for
-      <application>Python</application>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-          url="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Q</title>
-
-      <para>
-        <application>Q</application> is a functional programming language
-        based on term rewriting. Thus, a <application>Q</application> program or
-        <quote>script</quote> is simply a collection of equations which are used
-        to evaluate expressions in a symbolic fashion. The equations establish
-        algebraic identities and are interpreted as rewriting rules in order to
-        reduce expressions to <quote>normal forms</quote>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://q-lang.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/q-lang/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>R</title>
-
-      <para>
-        <application>R</application> is a language and environment for
-        statistical computing and graphics. It is a GNU project similar to the
-        <application>S</application> language and environment which was
-        developed at Bell Laboratories (formerly AT&amp;T, now Lucent
-        Technologies) by John Chambers and colleagues.
-        <application>R</application> can be considered as a different
-        implementation of <application>S</application>.  There are some
-        important differences, but much code written for
-        <application>S</application> runs unaltered under
-        <application>R</application>. <application>R</application> provides a
-        wide variety of statistical (linear and nonlinear modelling, classical
-        statistical tests, time-series analysis, classification, clustering,
-        ...) and graphical techniques, and is highly extensible. The
-        <application>S</application> language is often the vehicle of choice
-        for research in statistical methodology, and
-        <application>R</application> provides an Open Source route to
-        participation in that activity.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.r-project.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://cran.r-project.org/mirrors.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Regina Rexx</title>
-
-      <para>
-        <application>Regina</application> is a Rexx interpreter that has been
-        ported to most Unix platforms (Linux, FreeBSD, Solaris, AIX, HP-UX,
-        etc.) and also to OS/2, eCS, DOS, Win9x/Me/NT/2k/XP, Amiga, AROS,
-        QNX4.x, QNX6.x BeOS, MacOS X, EPOC32, AtheOS, OpenVMS, SkyOS and
-        OpenEdition.  Rexx is a programming language that was designed to be
-        easy to use for inexperienced programmers yet powerful enough for
-        experienced users. It is also a language ideally suited as a macro
-        language for other applications.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://regina-rexx.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/regina-rexx"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Small Device C Compiler (SDCC)</title>
-
-      <para>
-        <application>SDCC</application> is a Freeware, retargetable,
-        optimizing ANSI-C compiler that targets the Intel 8051, Maxim 80DS390
-        and the Zilog Z80 based MCUs. Work is in progress on supporting the
-        Motorola 68HC08 as well as Microchip PIC16 and PIC18 series. The entire
-        source code for the compiler is distributed under GPL.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://sdcc.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://sdcc.sourceforge.net/snap.php#Source"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>SmartEiffel (The GNU Eiffel Compiler)</title>
-
-      <para>
-        <application>SmartEiffel</application> claims to be <quote>the fastest
-        and the slimmest multi-platform Eiffel compiler on Earth</quote>.
-        Eiffel is an object-oriented programming language which emphasizes the
-        production of robust software. Its syntax is keyword-oriented in the
-        ALGOL and Pascal tradition. Eiffel is strongly statically typed, with
-        automatic memory management (typically implemented by garbage
-        collection). Distinguishing characteristics of Eiffel include Design
-        by contract (DbC), liberal use of inheritance including multiple
-        inheritance, a type system handling both value and reference semantics,
-        and generic classes. Eiffel has a unified type system&mdash;all types
-        in Eiffel are classes, so it is possible to create subclasses of the
-        basic classes such as INTEGER. Eiffel has operator overloading,
-        including the ability to define new operators, but does not have
-        method overloading.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://smarteiffel.loria.fr/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="https://gforge.inria.fr/frs/?group_id=184"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Squeak</title>
-
-      <para>
-        <application>Squeak</application> is an open, highly-portable
-        Smalltalk implementation whose virtual machine is written entirely in
-        Smalltalk, making it easy to debug, analyze, and change. To achieve
-        practical performance, a translator produces an equivalent C program
-        whose performance is comparable to commercial Smalltalks. Other
-        noteworthy aspects of <application>Squeak</application> include:
-        real-time sound and music synthesis written entirely in Smalltalk,
-        extensions of BitBlt to handle color of any depth and anti-aliased
-        image rotation and scaling, network access support that allows simple
-        construction of servers and other useful facilities, it runs
-        bit-identical on many platforms (Windows, Mac, Unix, and others), a
-        compact object format that typically requires only a single word of
-        overhead per object and a simple yet efficient incremental garbage
-        collector for 32-bit direct pointers efficient bulk-mutation of
-        objects.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.squeak.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.squeak.org/Download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>SR (Synchronizing Resources)</title>
-
-      <para>
-        <application>SR</application> is a language for writing concurrent
-        programs. The main language constructs are resources and operations.
-        Resources encapsulate processes and variables they share; operations
-        provide the primary mechanism for process interaction.
-        <application>SR</application> provides a novel integration of the
-        mechanisms for invoking and servicing operations. Consequently, all of
-        local and remote procedure call, rendezvous, message passing, dynamic
-        process creation, multicast, and semaphores are supported.
-        <application>SR</application> also supports shared global variables and
-        operations.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.cs.arizona.edu/sr/index.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="ftp://ftp.cs.arizona.edu/sr/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Standard ML</title>
-
-      <para>
-        Standard ML is a safe, modular, strict, functional, polymorphic
-        programming language with compile-time type checking and type
-        inference, garbage collection, exception handling, immutable data
-        types and updatable references, abstract data types, and parametric
-        modules. It has efficient implementations and a formal definition with
-        a proof of soundness. There are many implementations of Standard ML,
-        among them:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            ML Kit: <ulink
-            url="http://www.it-c.dk/research/mlkit/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            MLton: <ulink
-            url="http://mlton.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Poly/ML: <ulink
-            url="http://www.polyml.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Standard ML of New Jersey: <ulink
-            url="http://www.smlnj.org/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Steel Bank Common Lisp (SBCL)</title>
-
-      <para>
-        <application>SBCL</application> is an open source (free software)
-        compiler and runtime system for ANSI Common Lisp. It provides an
-        interactive environment including an integrated native compiler, a
-        debugger, and many extensions. <application>SBCL</application> runs
-        on a number of platforms.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.sbcl.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/sbcl/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Tiny C Compiler (TCC)</title>
-
-      <para>
-        <application>Tiny C Compiler</application> is a small C compiler
-        that can be used to compile and execute C code everywhere, for example
-        on rescue disks (about 100KB for x86 TCC executable, including C
-        preprocessor, C compiler, assembler and linker).
-        <application>TCC</application> is fast. It generates optimized x86
-        code, has no byte code overhead and compiles, assembles and links
-        several times faster than <application>GCC</application>.
-        <application>TCC</application> is versatile, any C dynamic library can
-        be used directly. It is heading toward full ISOC99 compliance and can
-        compile itself. The compiler is safe as it includes an optional memory
-        and bound checker. Bound checked code can be mixed freely with
-        standard code. <application>TCC</application> compiles and executes
-        C source directly. No linking or assembly necessary. A full C
-        preprocessor and GNU-like assembler is included. It is C script
-        supported; just add <quote>#!/usr/local/bin/tcc -run</quote> on the
-        first line of your C source, and execute it directly from the command
-        line. With libtcc, you can use <application>TCC</application> as a
-        backend for dynamic code generation.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://bellard.org/tcc/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://download.savannah.gnu.org/releases-noredirect/tinycc/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>TinyCOBOL</title>
-
-      <para>
-        <application>TinyCOBOL</application> is a COBOL compiler being
-        developed by members of the free software community. The mission is to
-        produce a COBOL compiler based on the COBOL 85 standards.
-        <application>TinyCOBOL</application> is available for the Intel
-        architecture (IA32) and compatible processors on the following
-        platforms: BeOS, FreeBSD, Linux and MinGW on Windows.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://sourceforge.net/projects/tiny-cobol/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/tiny-cobol/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Yorick</title>
-
-      <para>
-        <application>Yorick</application> is an interpreted programming
-        language, designed for postprocessing or steering large scientific
-        simulation codes. Smaller scientific simulations or calculations, such
-        as the flow past an airfoil or the motion of a drumhead, can be
-        written as standalone yorick programs. The language features a compact
-        syntax for many common array operations, so it processes large arrays
-        of numbers very efficiently. Unlike most interpreters, which are
-        several hundred times slower than compiled code for number crunching,
-        <application>Yorick</application> can approach to within a factor of
-        four or five of compiled speed for many common tasks. Superficially,
-        <application>Yorick</application> code resembles C code, but
-        <application>Yorick</application> variables are never explicitly
-        declared and have a dynamic scoping similar to many Lisp dialects. The
-        <quote>unofficial</quote> home page for
-        <application>Yorick</application> can be found at <ulink
-        url="http://www.maumae.net/yorick"/>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://yorick.sourceforge.net/index.php"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://sourceforge.net/projects/yorick/files/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>ZPL</title>
-
-      <para>
-        <application>ZPL</application> is an array programming language
-        designed from first principles for fast execution on both sequential
-        and parallel computers. It provides a convenient high-level programming
-        medium for supercomputers and large-scale clusters with efficiency
-        comparable to hand-coded message passing. It is the perfect alternative
-        to using a sequential language like C or Fortran and a message passing
-        library like MPI.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.cs.washington.edu/research/zpl/home/index.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.cs.washington.edu/research/zpl/download/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Programming Libraries and Bindings</title>
-
-    <sect3 role="package">
-      <title>Byte Code Engineering Library (BCEL)</title>
-
-      <para>
-        <application>BECL</application> is intended to give users a
-        convenient possibility to analyze, create, and manipulate (binary) Java
-        class files (those ending with
-        <filename class='extension'>.class</filename>). Classes are represented
-        by objects which contain all the symbolic information of the given
-        class: methods, fields and byte code instructions, in particular. Such
-        objects can be read from an existing file, be transformed by a program
-        (e.g., a class loader at run-time) and dumped to a file again. An even
-        more interesting application is the creation of classes from scratch
-        at run-time. The Byte Code Engineering Library may be also useful if
-        you want to learn about the Java Virtual Machine (JVM) and the format
-        of Java <filename class='extension'>.class</filename> files.
-        <application>BCEL</application> is already being used successfully in
-        several projects such as compilers, optimizers, obfuscators, code
-        generators and analysis tools.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://jakarta.apache.org/bcel/index.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://archive.apache.org/dist/jakarta/bcel/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Choco</title>
-
-      <para>
-        <application>Choco</application> is a Java library for constraint
-        satisfaction problems (CSP), constraint programming (CP) and
-        explanation-based constraint solving (e-CP). It is built on a
-        event-based propagation mechanism with backtrackable structures.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://sourceforge.net/projects/choco/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://choco.sourceforge.net/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>GOB (GObject Builder)</title>
-
-      <para>
-        <application>GOB</application> (<application>GOB2</application>
-        anyway) is a preprocessor for making GObjects with inline C code so
-        that generated files are not edited. Syntax is inspired by
-        <application>Java</application> and <application>Yacc</application> or
-        <application>Lex</application>. The implementation is intentionally
-        kept simple, and no C actual code parsing is done.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.5z.com/jirka/gob.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://ftp.5z.com/pub/gob/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>GTK+/GNOME Language Bindings (wrappers)</title>
-
-      <para>
-        <application>GTK+</application>/<application>GNOME</application>
-        language bindings allow <application>GTK+</application> to be used from
-        other programming languages, in the style of those languages.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.gtk.org/language-bindings.php"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <sect4 role="package">
-        <title>Java-GNOME</title>
-
-        <para>
-          <application>Java-GNOME</application> is a set of Java bindings
-          for the <application>GNOME</application> and
-          <application>GTK+</application> libraries that allow
-          <application>GNOME</application> and <application>GTK+</application>
-          applications to be written in Java. The
-          <application>Java-GNOME</application> API has been carefully designed
-          to be easy to use, maintaining a good OO paradigm, yet still wrapping
-          the entire functionality of the underlying libraries.
-          <application>Java-GNOME</application> can be used with the
-          <application>Eclipse</application> development environment and Glade
-          user interface designer to create applications with ease.
-      </para>
-
-        <itemizedlist spacing="compact">
-          <listitem>
-            <para>
-              Project Home Page: <ulink
-              url="http://java-gnome.sourceforge.net/4.0/"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Download Location: <ulink
-              url="http://java-gnome.sourceforge.net/4.0/get/"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-
-      </sect4>
-
-      <sect4 role="package">
-        <title>gtk2-perl</title>
-
-        <para>
-          <application>gtk2-perl</application> is the collective name for
-          a set of Perl bindings for <application>GTK+</application> 2.x and
-          various related libraries. These modules make it easy to write
-          <application>GTK</application> and <application>GNOME</application>
-          applications using a natural, Perlish, object-oriented syntax.
-      </para>
-
-        <itemizedlist spacing="compact">
-          <listitem>
-            <para>
-              Project Home Page: <ulink
-              url="http://gtk2-perl.sourceforge.net/"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Download Location: <ulink
-              url="&sourceforge-dl;/gtk2-perl"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-
-      </sect4>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>KDE Language Bindings</title>
-
-      <para>
-        <application>KDE</application> and most
-        <application>KDE</application> applications are implemented using the
-        C++ programming language, however there are number of bindings to other
-        languages are available. These include scripting languages like
-        <application>Perl</application>, <application>Python</application> and
-        <application>Ruby</application>, and systems programming languages such
-        as Java and C#.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://techbase.kde.org/Development/Languages"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Numerical Python (Numpy)</title>
-
-      <para>
-        <application>Numerical Python</application> adds a fast array
-        facility to the <application>Python</application> language.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://numeric.scipy.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/numpy/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Perl Scripts and Additional Modules</title>
-
-      <para>
-        There are many <application>Perl</application> scripts and
-        additional modules located on the Comprehensive Perl Archive Network
-        (CPAN) web site. Here you will find <quote>All Things Perl</quote>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://cpan.org/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Integrated Development Environments</title>
-
-    <sect3 role="package">
-      <title>A-A-P</title>
-
-      <para>
-        <application>A-A-P</application> makes it easy to locate, download,
-        build and install software. It also supports browsing source code,
-        developing programs, managing different versions and distribution of
-        software and documentation. This means that
-        <application>A-A-P</application> is useful both for users and for
-        developers.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.a-a-p.org/index.html"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.a-a-p.org/download.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Anjuta</title>
-
-      <para>
-        <application>Anujuta</application> is a versatile Integrated
-        Development Environment (IDE) for C and C++ on GNU/Linux. It has been
-        written for <application>GTK</application>/GNOME and features a number
-        of advanced programming facilities. These include project management,
-        application wizards, an on-board interactive debugger, and a powerful
-        source editor with source browsing and syntax highlighting.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://projects.gnome.org/anjuta/index.shtml"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://projects.gnome.org/anjuta/downloads.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Eclipse</title>
-
-      <para>
-        <application>Eclipse</application> is an open source community
-        whose projects are focused on providing an extensible development
-        platform and application frameworks for building software.
-        <application>Eclipse</application> contains many projects, including an
-        Integrated Development Environment (IDE) for Java.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.eclipse.org/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://www.eclipse.org/downloads/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Mozart</title>
-
-      <para>
-        The <application>Mozart</application> Programming System is an advanced
-        development platform for intelligent, distributed applications.
-        <application>Mozart</application> is based on the Oz language, which
-        supports declarative programming, object-oriented programming,
-        constraint programming, and concurrency as part of a coherent whole.
-        For distribution, <application>Mozart</application> provides a true
-        network transparent implementation with support for network awareness,
-        openness, and fault tolerance. Security is upcoming. It is an ideal
-        platform for both general-purpose distributed applications as well as
-        for hard problems requiring sophisticated optimization and inferencing
-        abilities.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://mozart.github.io/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="https://github.com/mozart/mozart2#downloads"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Other Development Tools</title>
-
-    <sect3 role="package">
-      <title>cachecc1</title>
-
-      <para>
-        <application>cachecc1</application> is a
-        <application>GCC</application> cache. It can be compared with the well
-        known <application>ccache</application> package. It has some unique
-        features including the use of an LD_PRELOADed shared object to catch
-        invocations to <command>cc1</command>, <command>cc1plus</command> and
-        <command>as</command>, it transparently supports all build methods, it
-        can cache <application>GCC</application> bootstraps and it can be
-        combined with <application>distcc</application> to transparently
-        distribute compilations.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://cachecc1.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/cachecc1"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>ccache</title>
-
-      <para>
-        <application>ccache</application> is a compiler cache. It acts as
-        a caching pre-processor to C/C++ compilers, using the
-        <option>-E</option> compiler switch and a hash to detect when a
-        compilation can be satisfied from cache. This often results in 5 to
-        10 times faster speeds in common compilations.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="https://ccache.dev"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="https://github.com/ccache/ccache/releases/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>DDD (GNU Data Display Debugger)</title>
-
-      <para>
-        <application>GNU DDD</application> is a graphical front-end for
-        command-line debuggers such as <application>GDB</application>,
-        <application>DBX</application>, <application>WDB</application>,
-        <application>Ladebug</application>, <application>JDB</application>,
-        <application>XDB</application>, the <application>Perl</application>
-        debugger, the <application>Bash</application> debugger, or the
-        <application>Python</application> debugger. Besides
-        <quote>usual</quote> front-end features such as viewing source texts,
-        <application>DDD</application> has an interactive graphical data
-        display, where data structures are displayed as graphs.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://www.gnu.org/software/ddd/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&gnu-http;/ddd/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>distcc</title>
-
-      <para>
-        <application>distcc</application> is a program to distribute builds
-        of C, C++, Objective C or Objective C++ code across several machines
-        on a network. <application>distcc</application> should always generate
-        the same results as a local build, is simple to install and use, and
-        is usually much faster than a local compile.
-        <application>distcc</application> does not require all machines to
-        share a filesystem, have synchronized clocks, or to have the same
-        libraries or header files installed. They can even have different
-        processors or operating systems, if cross-compilers are installed.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="https://distcc.github.io/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="https://github.com/distcc/distcc/releases"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>Exuberant Ctags</title>
-
-      <para>
-        <application>Exuberant Ctags</application> generates an index (or
-        tag) file of language objects found in source files that allows these
-        items to be quickly and easily located by a text editor or other
-        utility. A tag signifies a language object for which an index entry
-        is available (or, alternatively, the index entry created for that
-        object). Tag generation is supported for the following languages:
-        Assembler, AWK, ASP, BETA, Bourne/Korn/Zsh Shell, C, C++, COBOL,
-        Eiffel, Fortran, Java, Lisp, Lua, Make, Pascal, Perl, PHP, Python,
-        REXX, Ruby, S-Lang, Scheme, Tcl, Vim, and YACC. A list of editors and
-        tools utilizing tag files may be found at <ulink
-        url="http://ctags.sourceforge.net/tools.html"/>.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://ctags.sourceforge.net/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/ctags/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-<!-- Untouched since 2008. There is a variable with a similar name that can be
-     used when compiling Go projects. So this porject can be considered dead.
-    <sect3 role="package">
-      <title>gocache (GNU Object Cache)</title>
-
-      <para>
-        <application>goache</application> is a clone of
-        <application>ccache</application>, with the goal of supporting
-        compilers other than <application>GCC</application> and adding
-        additional features. Embedded compilers will especially be in focus.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://sourceforge.net/projects/gocache/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="&sourceforge-dl;/gocache/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
--->
-    <sect3 role="package">
-      <title>OProfile</title>
-
-      <para>
-        <application>OProfile</application> is a system-wide profiler for
-        Linux systems, capable of profiling all running code at low overhead.
-        <application>OProfile</application> is released under the GNU GPL. It
-        consists of a kernel driver and a daemon for collecting sample data,
-        and several post-profiling tools for turning data into information.
-        <application>OProfile</application> leverages the hardware performance
-        counters of the CPU to enable profiling of a wide variety of
-        interesting statistics, which can also be used for basic time-spent
-        profiling. All code is profiled: hardware and software interrupt
-        handlers, kernel modules, the kernel, shared libraries, and
-        applications.  <application>OProfile</application> is currently in
-        alpha status; however it has proven stable over a large number of
-        differing configurations. It is being used on machines ranging from
-        laptops to 16-way NUMA-Q boxes.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="http://oprofile.sourceforge.net/news/"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="http://oprofile.sourceforge.net/download/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
-      <title>strace</title>
-
-      <para>
-        <application>strace</application> is a system call tracer, i.e., a
-        debugging tool which prints out a trace of all the system calls made by
-        another process or program.
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Project Home Page: <ulink
-            url="https://strace.io"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download Location: <ulink
-            url="https://strace.io/files/"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: chive/other-wms.xml
===================================================================
--- archive/other-wms.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,21 +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="other-wms" xreflabel="Other Window Managers">
-  <?dbhtml filename="other-wms.html" ?>
-
-
-  <title>Other Window Manager</title>
-
-  <para>
-    <command>mwm</command> is the Motif Window Manager. It has been
-    released under a LGPL license in 2012, together with the Motif
-    library, and is available at
-    <ulink url="https://sourceforge.net/projects/motif/"/>.
-  </para>
-
-</sect1>
Index: chive/other.xml
===================================================================
--- archive/other.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +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="pst-postscript-other">
-  <?dbhtml filename="otherps.html"?>
-
-
-  <title>Other PostScript Programs</title>
-
-  <para><command>kghostview</command> is a <application>Qt</application>
-  based PostScript/PDF viewer from <xref linkend="kdegraphics"/>.</para>
-
-</sect1>
Index: chive/othernetprogs.xml
===================================================================
--- archive/othernetprogs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,22 +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="basicnet-netprogs-other">
-  <?dbhtml filename="othernetprogs.html"?>
-
-
-  <title>Other Networking Programs</title>
-
-  <para condition="html" role="usernotes">User Notes:
-  <ulink url="&blfs-wiki;/othernetprogs"/></para>
-
-  <para>
-    <application>NCPFS</application> contains client and administration
-    tools for use with Novell networks.  See the User Notes for details.
-  </para>
-
-</sect1>
Index: chive/others.xml
===================================================================
--- archive/others.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,45 +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="others-editors">
-  <?dbhtml filename="others.html"?>
-
-
-  <title>Other Editors</title>
-
-  <itemizedlist>
-    <listitem>
-      <para>
-        <ulink url="http://www.geany.org/">Geany</ulink> is a text editor using
-        the <application>GTK+2</application> toolkit with basic features of an
-        integrated development environment. It was developed to provide a small
-        and fast IDE, which has only a few dependencies from other packages. It
-        supports many filetypes and has some nice features.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <ulink url="http://tarot.freeshell.org/leafpad/">Leafpad</ulink> is a
-        very simple text editor using the <application>GTK+2</application>
-        toolkit.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <command>mcedit</command> is a text editor installed as part of <xref
-        linkend="mc"/>.
-      </para>
-    </listitem>
-<!--    <listitem>
-      <para>
-        <command>pico</command> is a text editor installed as a part of <xref
-        linkend="alpine"/>.
-      </para>
-    </listitem>-->
-  </itemizedlist>
-
-</sect1>
Index: chive/oxygen-fonts.xml
===================================================================
--- archive/oxygen-fonts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 oxygen-fonts-download-http "http://download.kde.org/stable/plasma/&oxygen-fonts-version;/oxygen-fonts-&oxygen-fonts-version;.tar.xz">
-  <!ENTITY oxygen-fonts-download-ftp  " ">
-  <!ENTITY oxygen-fonts-md5sum        "8d8ab61a65642a18a40de9f3945ce584">
-  <!ENTITY oxygen-fonts-size          "160 KB">
-  <!ENTITY oxygen-fonts-buildsize     "1.3 MB">
-  <!ENTITY oxygen-fonts-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="oxygen-fonts" xreflabel="oxygen-fonts-&oxygen-fonts-version;">
-  <?dbhtml filename="oxygen-fonts.html"?>
-
-
-  <title>Oxygen-fonts-&oxygen-fonts-version;</title>
-
-  <indexterm zone="oxygen-fonts">
-    <primary sortas="a-oxygen-fonts">oxygen-fonts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Oxygen Fonts</title>
-
-    <para>
-      The <application>oxygen-fonts</application> package is a set of fonts
-      used by KF5.
-    </para>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&oxygen-fonts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&oxygen-fonts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &oxygen-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &oxygen-fonts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &oxygen-fonts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &oxygen-fonts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Oxygen Fonts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>, and <xref linkend="fontforge"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/oxygen-fonts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Oxygen Fonts</title>
-
-    <para>
-      Install the <application>Oxygen Fonts</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=lib ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/fonts/truetype/oxygen 
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/oxygen-icons.xml
===================================================================
--- archive/oxygen-icons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,117 +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 oxygen-icons-download-http "&kde-download-attic;/&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
-  <!ENTITY oxygen-icons-download-ftp  " ">
-  <!ENTITY oxygen-icons-md5sum        "4f24f975fb90d8daab833fc719ce39a3">
-  <!ENTITY oxygen-icons-size          "219 MB">
-  <!ENTITY oxygen-icons-buildsize     "474 MB">
-  <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&oxygen-icons-version;">
-  <?dbhtml filename="oxygen-icons.html"?>
-
-
-  <title>oxygen-icons-&oxygen-icons-version;</title>
-
-  <indexterm zone="oxygen-icons">
-    <primary sortas="a-oxygen-icons">oxygen-icons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to oxygen-icons</title>
-
-    <para>The oxygen theme is a photo-realistic icon style, with a
-    high standard of graphics quality.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&oxygen-icons-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&oxygen-icons-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &oxygen-icons-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &oxygen-icons-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &oxygen-icons-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &oxygen-icons-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">oxygen-icons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/oxygen-icons"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of oxygen-icons</title>
-
-    <para>Install <application>oxygen-icons</application> by running
-    the following commands:</para>
-
-<screen><userinput>sed -i "s/x256/&amp; scalable/" CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: This command ensures that the scalable
-      versions of the icons are also installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>/usr/share/icons/oxygen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/pan.xml
===================================================================
--- archive/pan.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +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 pan-download-http "http://pan.rebelbase.com/download/releases/&pan-version;/source/pan-&pan-version;.tar.bz2">
-  <!ENTITY pan-download-ftp  " ">
-  <!ENTITY pan-md5sum        "ca165da8557605d89d327cff78891b89">
-  <!ENTITY pan-size          "1.4 MB">
-  <!ENTITY pan-buildsize     "178 MB">
-  <!ENTITY pan-time          "2.3 SBU">
-]>
-
-<sect1 id="pan" xreflabel="Pan-&pan-version;">
-  <?dbhtml filename="pan.html" ?>
-
-
-  <title>Pan-&pan-version;</title>
-
-  <indexterm zone="pan">
-    <primary sortas="a-Pan">Pan</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pan</title>
-
-    <para>The <application>Pan</application> package contains a graphical
-    newsreader. This is useful for reading and writing news, threading
-    articles and replying via email.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pan-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pan-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pan-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pan-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pan-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pan-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/pan-&pan-version;-gmime_gcc-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pan Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/>,
-    <xref linkend="gmime"/>,
-    <xref linkend="pcre"/>, and
-    <xref linkend="intltool"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://sf.net/projects/gtkspell">GtkSpell</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pan"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pan</title>
-
-    <para>Install <application>Pan</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../pan-&pan-version;-gmime_gcc-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>pan</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pan-prog">
-        <term><command>pan</command></term>
-        <listitem>
-          <para>is a graphical newsreader.</para>
-          <indexterm zone="pan pan-prog">
-            <primary sortas="b-pan">pan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/pcre.xml
===================================================================
--- archive/pcre.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pcre-download-http "https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-&pcre-version;.tar.bz2">
-  <!ENTITY pcre-download-ftp  " ">
-  <!ENTITY pcre-md5sum        "4452288e6a0eefb2ab11d36010a1eebb">
-  <!ENTITY pcre-size          "1.5 MB">
-  <!ENTITY pcre-buildsize     "23 MB (with tests)">
-  <!ENTITY pcre-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="pcre" xreflabel="PCRE-&pcre-version;">
-  <?dbhtml filename="pcre.html"?>
-
-
-  <title>PCRE-&pcre-version;</title>
-
-  <indexterm zone="pcre">
-    <primary sortas="a-PCRE">PCRE</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCRE</title>
-
-    <para>
-      The <application>PCRE</application> package contains
-      <application>Perl</application> Compatible Regular Expression
-      libraries. These are useful for implementing regular expression
-      pattern matching using the same syntax and semantics as
-      <application>Perl</application> 5.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcre-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcre-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcre-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcre-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcre-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcre-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PCRE Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCRE</title>
-
-    <para>
-      Install <application>PCRE</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                     \
-            --docdir=/usr/share/doc/pcre-&pcre-version; \
-            --enable-unicode-properties       \
-            --enable-pcre16                   \
-            --enable-pcre32                   \
-            --enable-pcregrep-libz            \
-            --enable-pcregrep-libbz2          \
-            --enable-pcretest-libreadline     \
-            --disable-static                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-unicode-properties</parameter>: This switch enables
-      Unicode properties support and includes the code for handling UTF-8/16/32
-      character strings in the library. You need this switch if you are going to
-      build <xref linkend="glib2"/>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre16</parameter>: This switch enables 16 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre32</parameter>: This switch enables 32 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcregrep-libz</parameter>: This switch adds
-      support to <command>pcregrep</command> to read
-      <filename class="extension">.gz</filename> compressed files.
-    </para>
-
-    <para>
-      <parameter>--enable-pcregrep-libbz2</parameter>: This switch adds
-      support to <command>pcregrep</command> to read
-      <filename class="extension">.bz2</filename> compressed files.
-    </para>
-
-    <para>
-      <parameter>--enable-pcretest-libreadline</parameter>: This switch adds line
-      editing and history features to <command>pcretest</command> program.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <!-- FIXME: Removed due to merged-/usr setup
-    <para>
-      <command>mv -v /usr/lib/libpcre.so.* /lib</command>: Moves the
-      <application>PCRE</application> library on the root filesystem
-      so that it is available in case <command>grep</command>
-      gets reinstalled with <application>PCRE</application> support.
-    </para>
-    -->
-
-    <para>
-      <option>--enable-jit</option>: this option enables Just-in-time
-      compiling, which can greatly speed up pattern matching.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcregrep, pcretest, and pcre-config
-        </seg>
-        <seg>
-          libpcre.so, libpcre16.so, libpcre32.so,
-          libpcrecpp.so and libpcreposix.so
-        </seg>
-        <seg>
-          /usr/share/doc/pcre-&pcre-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcregrep">
-        <term><command>pcregrep</command></term>
-        <listitem>
-          <para>
-            is a <command>grep</command> that understands
-            <application>Perl</application> compatible regular expressions
-          </para>
-          <indexterm zone="pcre pcregrep">
-            <primary sortas="b-pcregrep">pcregrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcretest">
-        <term><command>pcretest</command></term>
-        <listitem>
-          <para>
-            can test a <application>Perl</application> compatible
-            regular expression
-          </para>
-          <indexterm zone="pcre pcretest">
-            <primary sortas="b-pcretest">pcretest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre-config">
-        <term><command>pcre-config</command></term>
-        <listitem>
-          <para>
-            is used during the compile process of programs linking to
-            the <application>PCRE</application> libraries
-          </para>
-          <indexterm zone="pcre pcre-config">
-            <primary sortas="b-pcre-config">pcre-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/pdl.xml
===================================================================
--- archive/pdl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,644 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY pdl-download-http "&sourceforge-repo;/pdl/PDL-&pdl-version;.tar.gz">
-  <!ENTITY pdl-download-ftp  "&gentoo-ftp-repo;/PDL-&pdl-version;.tar.gz">
-  <!ENTITY pdl-md5sum        "edd056a006eae8b46e8ef804b9774a93">
-  <!ENTITY pdl-size          "2.1 MB">
-  <!ENTITY pdl-buildsize     "74 MB">
-  <!ENTITY pdl-time          "2.56 SBU">
-]>
-
-<sect1 id="pdl" xreflabel="PDL-&pdl-version;">
-  <?dbhtml filename="pdl.html" ?>
-
-
-  <title>PDL-&pdl-version;</title>
-
-  <indexterm zone="pdl">
-    <primary sortas="a-PDL">PDL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PDL</title>
-
-    <para><application>PDL</application> (Perl Data Language) gives
-    standard <application>Perl</application> the ability to compactly store
-    and quickly manipulate the large N-dimensional data arrays common to
-    scientific computing. <application>PDL</application> turns
-    <application>Perl</application> into an array-oriented, numerical language
-    similar to such commercial packages as <application>IDL</application>
-    and <application>MatLab</application>. One can write simple
-    <application>Perl</application> expressions to manipulate entire numerical
-    arrays all at once.</para>
-
-    <para><application>PDL</application> provides extensive numerical and
-    semi-numerical functionality with support for two- and three-dimensional
-    visualisation as well as a variety of I/O formats. The goal is to allow
-    <application>PDL</application> to interact with a variety of external
-    numerical packages, graphics and visualisation systems. Easy interfacing
-    to such systems is one of the core design features of
-    <application>PDL</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pdl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pdl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pdl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pdl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pdl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pdl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PDL Dependencies</bridgehead>
-
-    <para><application>PDL</application> is a collection of over 90
-    <application>Perl</application> modules. Some of these modules require
-    additional libraries, packages and/or <application>Perl</application>
-    modules for full functionality. Listed below are the modules which require
-    additional software or configuration. If you don't need a particular
-    module's functionality, you don't need to install its dependencies. The
-    dependency tree for each module is listed downward, meaning you'll need to
-    start at the bottom of a module's tree and work up. The dependencies are
-    listed in the same order as they are in the
-    <filename>DEPENDENCIES</filename> file, found in the package source
-    tree.</para>
-
-    <para>This package (and many of the dependency packages) requires a Fortran
-    compiler for full functionality of all the different modules. The
-    <command>gfortran</command> compiler installed with the current BLFS
-    version of <application>GCC</application> (&gcc-version;) will not work. If
-    you want to compile the parts of this package that require a Fortran
-    compiler, you'll need to install a
-    <application>GCC</application>-3.x.x version of Fortran. The
-    <application>GCC</application> developers recommend using Fortran from
-    <application>GCC</application>-3.4.6. You can find specific instructions
-    to install a <application>GCC</application>-3.4.6 compiler on the
-    <ulink url="&blfs-wiki;/gcc3">BLFS
-    Wiki</ulink>. <!-- Alternatively, if you have a need to install
-    <xref linkend="gcc3"/>, you can add the Fortran compiler to the list of
-    compilers installed in those instructions. Don't forget to put the
-    directory containing the <command>{g,f}77</command> commands at the
-    beginning of your <envar>PATH</envar> environment variable before
-    beginning the compilation.--> </para>
-
-    <bridgehead renderas="sect4">PDL::NiceSlice</bridgehead>
-
-    <para>The <application>PDL</application>::NiceSlice module is used to
-    enhance <application>PDL</application>'s slice syntax.
-    <quote>Slicing</quote> is a term used in the process of creating a
-    cross-section, or slice, of a <application>PDL</application> object
-    (piddle).</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/P/PM/PMQS/Filter-&Filter-version;.tar.gz">
-        Filter-&Filter-version;</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Inline::Pdlpp</bridgehead>
-
-    <para>The Inline::Pdlpp module allows you to define fast PP
-    code inline in your scripts.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/I/IN/INGY/Inline-&Inline-version;.tar.gz">
-        Inline-&Inline-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="http://www.cpan.org/authors/id/D/DC/DCONWAY/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">
-            Parse-RecDescent-&Parse-RecDescent-version;</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Perldl</bridgehead>
-
-    <para><command>perldl</command> is a simple shell (written in
-    <application>Perl</application>) which allows interactive
-    use of <application>PDL</application>.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-&Term-ReadLine-Gnu-version;.tar.gz">
-        Term-ReadLine-Gnu-&Term-ReadLine-Gnu-version;</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::TriD</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::TriD module implements
-    a generic 3D plotting interface for <application>PDL</application>. Points,
-    lines and surfaces (among other objects) are supported.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>OpenGL (<xref linkend="x-window-system"/>)</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::PGPLOT</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::PGPLOT module is a
-    convenience interface to the <application>PGPLOT</application> commands,
-    implemented using the object oriented <application>PGPLOT</application>
-    plotting package in the PDL::Graphics::PGPLOT::Window module.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/K/KG/KGB/PGPLOT-&PGPLOT-perl-version;.tar.gz">
-        PGPLOT-&PGPLOT-perl-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-&ExtUtils-F77-version;.tar.gz">
-            ExtUtils-F77-&ExtUtils-F77-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="&blfs-wiki;/gcc3">a Fortran
-                compiler</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><ulink
-            url="http://astro.caltech.edu/~tjp/pgplot/">PGPLOT</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><xref linkend="x-window-system"/>,
-                <!-- <xref linkend="lesstif"/>, -->
-                <ulink url="http://sourceforge.net/projects/lesstif/">LessTif</ulink>,
-                <xref linkend="tk"/>, and <ulink
-                url="&blfs-wiki;/gcc3">a Fortran
-                compiler</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::PLPLOT</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::PLPLOT module is a
-    simple interface to the <application>PLplot</application> plotting library.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink url="http://plplot.sourceforge.net/">PLplot</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><!-- <xref linkend="pkgconfig"/>, -->
-            <xref linkend="x-window-system"/>,
-            <xref linkend="freetype2"/>,
-            <ulink url="http://www.boutell.com/gd/">GD</ulink>,
-            <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
-            <!-- <xref linkend="gnome-libs"/>, -->
-            <ulink url="&gnome-download-http;/gnome-libs/1.4/">GNOME
-            Libraries-1.4</ulink>,
-            <xref linkend="openjdk"/>, <!-- or <xref linkend="jdk"/>, -->
-            <xref linkend="tk"/>,
-            <xref linkend="python2"/> (with
-            <ulink url="http://www.numpy.org/">Numeric Python</ulink>),
-            <ulink url="&blfs-wiki;/gcc3">a
-            Fortran compiler</ulink>,
-            <ulink url="http://www.swig.org/">SWIG</ulink>, and
-            <ulink url="http://sourceforge.net/projects/incrtcl/">iTcl</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::IIS</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::IIS
-    module provides an interface to any image display <quote>device</quote>
-    which supports the <quote>IIS protocol</quote>.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://tdc-www.harvard.edu/software/saoimage.html">SAOimage</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="x-window-system"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="http://iraf.noao.edu/iraf/web/projects/x11iraf/x11iraf.html">X11
-        IRAF</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="x-window-system"/> and
-            <xref linkend="tk"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::Karma</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::Karma
-    module is an interface to <application>Karma</application> visualisation
-    applications.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.atnf.csiro.au/computing/software/karma/">Karma</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="x-window-system"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <para><emphasis>Note:</emphasis> You may need to modify the
-    <option>WHERE_KARMA =&gt; undef</option> line in the source tree
-    <filename>perldl.conf</filename> file to point to your installation
-    of <application>Karma</application></para>
-
-    <bridgehead renderas="sect4">PDL::IO::Pic</bridgehead>
-
-    <para> The <application>PDL</application>::IO::Pic module implements I/O
-    for a number of popular image formats by exploiting the
-    <command>xxxtopnm</command> and <command>pnmtoxxx</command>
-    converters from the <application>Netpbm</application> package and the
-    <command>cjpeg</command> and <command>djpeg</command> converters.
-    It also  contains the routine wmpeg to write MPEG movies from piddles
-    representing image stacks.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-        <xref linkend="libjpeg"/> and
-        <ulink url="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/">
-        mpeg_encode</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Slatec</bridgehead>
-
-    <para> The <application>PDL</application>::Slatec module serves the dual
-    purpose of providing an interface to parts of the slatec library and showing
-    how to interface <application>PDL</application> to an external library.
-    The module provides routines to manipulate matrices, calculate FFTs, fit
-    data using polynomials, and interpolate/integrate data using piecewise
-    cubic Hermite interpolation.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-&ExtUtils-F77-version;.tar.gz">
-        ExtUtils-F77-&ExtUtils-F77-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="&blfs-wiki;/gcc3">a Fortran
-            compiler</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::GSL</bridgehead>
-
-    <para> The <application>PDL</application>::<application>GSL</application>
-    module is an interface to the functions provided by the Gnu Scientific Library.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><xref linkend="gsl"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::FFTW</bridgehead>
-
-    <para> The <application>PDL</application>::<application>FFTW</application>
-    module is a means to interface <application>PDL</application> with the
-    <application>FFTW</application> library. It's similar to the standard FFT
-    routine but it's usually faster and has support for real transforms. It works
-    well for the types of piddles for which the library was compiled (otherwise it
-    must do conversions).</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink url="http://www.fftw.org/">FFTW-2.x</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::IO::Browser</bridgehead>
-
-    <para>The <application>PDL</application>::IO::Browser module
-    is a 2D cursor terminal data browser for piddles.</para>
-
-    <para>There is no additional software required to use the module. However,
-    the default is to not install the module because some platforms don't provide
-    a curses compatible library. To enable the module, issue the following
-    command:</para>
-
-<screen><userinput>sed -i -e "s/WITH_IO_BROWSER =&gt; 0/WITH_IO_BROWSER =&gt; 1/" \
-    perldl.conf</userinput></screen>
-
-    <bridgehead renderas="sect4">PDL::IO::NDF</bridgehead>
-
-    <para>The <application>PDL</application>::IO::NDF module adds the ability to
-    read and write Starlink N-dimensional data files as N-dimensional piddles.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/A/AA/AALLAN/Astro-FITS-Header-&Astro-FITS-Header-version;.tar.gz">
-        Astro-FITS-Header-&Astro-FITS-Header-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="http://www.cpan.org/authors/id/P/PR/PRATZLAFF/Astro-FITS-CFITSIO-&Astro-FITS-CFITSIO-version;.tar.gz">
-            Astro-FITS-CFITSIO-&Astro-FITS-CFITSIO-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/">CFITSIO</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><ulink
-            url="&files-anduin;/sources/NDF-&NDF-version;.tar.gz">
-            NDF-&NDF-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
-                Starlink-Config-&Starlink-Config-version;</ulink></para>
-                <itemizedlist>
-                  <listitem>
-                    <para><ulink
-                    url="&files-anduin;/sources/Starlink_IMG.tar.gz">
-                    Starlink IMG</ulink></para>
-                    <itemizedlist>
-                      <listitem>
-                        <para><ulink
-                        url="&files-anduin;/sources/Starlink_NDF.tar.gz">
-                        Starlink NDF</ulink> (requires the following Starlink
-                        modules installed in this order, some will already be
-                        installed if you installed Starlink GSD):
-                        <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
-                        HTX</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
-                        SAE</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_HLP.tar.gz">
-                        HLP</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
-                        CNF</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_SLA.tar.gz">
-                        SLA</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
-                        CHR</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
-                        EMS</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PSX.tar.gz">
-                        PSX</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_HDS.tar.gz">
-                        HDS</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PCS.tar.gz">
-                        PCS</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_MER.tar.gz">
-                        MER</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
-                        PRM</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PAR.tar.gz">
-                        PAR</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_ARY.tar.gz">
-                        ARY</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_AST.tar.gz">
-                        AST</ulink>)</para>
-                        <itemizedlist>
-                          <listitem>
-                            <para><ulink
-                            url="&blfs-wiki;/gcc3">a
-                            Fortran compiler</ulink></para>
-                          </listitem>
-                        </itemizedlist>
-                      </listitem>
-                    </itemizedlist>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><ulink
-            url="&files-anduin;/sources/GSD-&GSD-version;.tar.gz">
-            GSD-&GSD-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
-                Starlink-Config-&Starlink-Config-version;</ulink></para>
-                <itemizedlist>
-                  <listitem>
-                    <para><ulink
-                    url="&files-anduin;/sources/Starlink_GSD.tar.gz">
-                    Starlink GSD</ulink> (requires the following Starlink
-                    modules installed in this order:
-                    <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
-                    HTX</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
-                    SAE</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
-                    CNF</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
-                    CHR</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
-                    EMS</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
-                    PRM</ulink>)</para>
-                    <itemizedlist>
-                      <listitem>
-                        <para><ulink
-                        url="&blfs-wiki;/gcc3">a
-                        Fortran compiler</ulink></para>
-                      </listitem>
-                    </itemizedlist>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pdl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PDL</title>
-
-    <para>Install <application>PDL</application> (and all the dependency
-    <application>Perl</application> modules) by running the following commands:</para>
-
-<screen><userinput>sed -i 's/\(dirname);\)/\1\nuse blib;/' Demos/BAD*demo.pm.PL &amp;&amp;
-perl Makefile.PL &amp;&amp;
-make &amp;&amp;
-make test</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><command>sed -i '...' Demos/BAD*demo.pm.PL</command>: This is
-    necessary to fix a build issue caused by changes in
-    ExtUtils::MakeMaker-6.30 which was introduction in
-    <application>Perl</application>-5.8.8.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PDL</title>
-
-    <sect3 id="pdl-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.perldlrc</filename> and
-      <filename>local.perldlrc</filename> in the current directory</para>
-
-      <indexterm zone="pdl pdl-config">
-        <primary sortas="e-AA.perldlrc">~/.perldlrc</primary>
-      </indexterm>
-
-      <indexterm zone="pdl pdl-config">
-        <primary sortas="e-local.perldlrc">local.perldlrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>See <ulink
-      url="http://pdl.sourceforge.net/PDLdocs/perldl.html#the startup file ~/.perldlrc"/>
-      for information about configuring <command>perldl</command> to suit your
-      needs.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Modules</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>pdl, pdldoc, perldl, and pptemplate</seg>
-        <seg>90+ individual <application>Perl</application> modules</seg>
-        <seg>/usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/{,auto/}PDL</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pdl-prog">
-        <term><command>pdl</command></term>
-        <listitem>
-          <para>is a binary program called from
-          <application>PDL</application> scripts which is used to
-          interface <command>perldl</command>.</para>
-          <indexterm zone="pdl pdl-prog">
-            <primary sortas="b-pdl">pdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdldoc">
-        <term><command>pdldoc</command></term>
-        <listitem>
-          <para>is a shell interface to
-          <application>PDL</application> documentation.</para>
-          <indexterm zone="pdl pdldoc">
-            <primary sortas="b-pdldoc">pdldoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perldl">
-        <term><command>perldl</command></term>
-        <listitem>
-          <para>is a simple shell (written in <application>Perl</application>)
-          for interactive use of <application>PDL</application>.</para>
-          <indexterm zone="pdl perldl">
-            <primary sortas="b-perldl">perldl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pptemplate">
-        <term><command>pptemplate</command></term>
-        <listitem>
-          <para>is a script to generate <filename>Makefile.PL</filename>
-          and PP file skeletons.</para>
-          <indexterm zone="pdl pptemplate">
-            <primary sortas="b-pptemplate">pptemplate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/perl-class-factory-util.xml
===================================================================
--- archive/perl-class-factory-util.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,66 +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;/D/DR/DROLSKY/Class-Factory-Util-&Class-Factory-Util-version;.tar.gz">
-  <!ENTITY my-md5sum "aebd79da361b676a7ecd3245fc3d1b3f">
-
-]>
-
-  <!-- Begin Class::Factory::Util -->
-  <sect2 id="perl-class-factory-util" xreflabel="Class-Factory-Util-&Class-Factory-Util-version;">
-
-    <title>Class::Factory::Util-&Class-Factory-Util-version;</title>
-
-    <indexterm zone="perl-class-factory-util">
-      <primary sortas="a-Class-Factory-Util">Class::Factory::Util</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Factory::Util</title>
-
-      <para>
-        Class::Factory::Util exports a method that is useful for factory
-        classes.
-      </para>
-
-      &lfs90_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>
-
-      <bridgehead renderas="sect4">Class::Factory::Util Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-build"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Class::Factory::Util</title>
-
-      <!-- Although this package can be installed using perl Makefile.PL,
-           that actually invokes perl Build.PL so it seems clearer to
-           specifically use that. -->
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-error.xml
===================================================================
--- archive/perl-error.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,57 +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 "&perl_authors;/id/S/SH/SHLOMIF/Error-&Error-version;.tar.gz">
-  <!ENTITY my-md5sum "0dcd94640f617df02b6d6c1e4e92018c">
-
-]>
-
-  <!-- Begin Error -->
-  <sect2 id="perl-error" xreflabel="Error-&Error-version;">
-
-    <title>Error-&Error-version;</title>
-
-    <indexterm zone="perl-error">
-      <primary sortas="a-Error">Error</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Error</title>
-
-      <para>
-        The Error module provides Error/exception handling in an
-        object-oriented way.
-      </para>
-
-      &lfs83_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 Error</title>
-
-<!-- Any specific action for the module (patches, etc) should come first -->
-<!-- If the module uses standard installation instructions: -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-importer.xml
===================================================================
--- archive/perl-importer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/EX/EXODIST/Importer-&Importer-version;.tar.gz">
-  <!ENTITY my-md5sum "3f09930b82cadfe26d0ce2fb1338aa1b">
-
-]>
-
-  <!-- Begin Importer -->
-  <sect2 id="perl-importer" xreflabel="Importer-&Importer-version;">
-
-    <title>Importer-&Importer-version;</title>
-
-    <indexterm zone="perl-importer">
-      <primary sortas="a-Importer">Importer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Importer</title>
-
-      <para>
-        Importer provides an alternative but compatible interface to modules
-        that export symbols.
-      </para>
-
-      &lfs121_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 Importer</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-json.xml
===================================================================
--- archive/perl-json.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/I/IS/ISHIGAKI/JSON-&JSON-version;.tar.gz">
-  <!ENTITY my-md5sum "a709b32e194d0eb38f788cb49f422c4e">
-]>
-
-  <!-- Begin JSON -->
-  <sect2 id="perl-json" xreflabel="JSON-&JSON-version;">
-
-    <title>JSON-&JSON-version;</title>
-
-    <indexterm zone="perl-json">
-      <primary sortas="a-JSON">JSON</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to JSON</title>
-
-      <para>
-        JSON provides a simple wrapper for JSON::XS-compatible modules with
-        some additional features.
-      </para>
-
-      &lfs121_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 JSON</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-module-pluggable.xml
===================================================================
--- archive/perl-module-pluggable.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/S/SI/SIMONW/Module-Pluggable-&Module-Pluggable-version;.tar.gz">
-  <!ENTITY my-md5sum "87ce2971662efd0b69a81bb4dc9ea76c">
-
-]>
-
-  <!-- Begin Module::Pluggable -->
-  <sect2 id="perl-module-pluggable" xreflabel="Module-Pluggable-&Module-Pluggable-version;">
-
-    <title>Module::Pluggable-&Module-Pluggable-version;</title>
-
-    <indexterm zone="perl-module-pluggable">
-      <primary sortas="a-Module-Pluggable">Module::Pluggable</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Module::Pluggable</title>
-
-      <para>
-        Module::Pluggable provides a way of having 'plugins' for your module.
-      </para>
-
-      &lfs121_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 Module::Pluggable</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-modules.xml
===================================================================
--- archive/perl-modules.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3054 +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">
-<!-- Lasciate ogne speranza, voi ch'intrate
-  (Abandon all hope, ye who enter here). -->
-  %general-entities;
-
-<!-- moved to general.ent
-  <!ENTITY perl_authors "https://www.cpan.org/authors">-->
-
-  <!ENTITY Archive-Zip-download-http "&perl_authors;/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
-  <!ENTITY Archive-Zip-md5sum "0576016be1e676cacebc447e2463dc44">
-
-  <!ENTITY autovivification-download-http "&perl_authors;/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">
-  <!ENTITY autovivification-md5sum "8dec994e1e7d368e055f21a5777385a0">
-
-  <!ENTITY Business-ISBN-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
-  <!ENTITY Business-ISBN-md5sum "60b36c0a92cf51e9027ec3d9f38e7224">
-
-  <!ENTITY Business-ISMN-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">
-  <!ENTITY Business-ISMN-md5sum "9d824f770a48ad2bf9cafb2eb2d3bde2">
-
-  <!ENTITY Business-ISSN-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz">
-  <!ENTITY Business-ISSN-md5sum "6720f5ff3a8e7cb4d84aa35c78d8536c">
-
-  <!ENTITY Class-Accessor-download-http "&perl_authors;/id/K/KA/KASEI/Class-Accessor-&Class-Accessor-version;.tar.gz">
-  <!ENTITY Class-Accessor-md5sum "1f1e5990f87cad7659b292fed7dc0407">
-
-  <!ENTITY Data-Compare-download-http "&perl_authors;/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz">
-  <!ENTITY Data-Compare-md5sum "6a397ab5833237f3ca05ed7277b19a7a">
-
-  <!ENTITY Data-Dump-download-http "&perl_authors;/id/G/GA/GAAS/Data-Dump-&Data-Dump-version;.tar.gz">
-  <!ENTITY Data-Dump-md5sum "762c111e525c82ff23d62c90821b26e9">
-
-  <!ENTITY Data-Uniqid-download-http "&perl_authors;/id/M/MW/MWX/Data-Uniqid-&Data-Uniqid-version;.tar.gz">
-  <!ENTITY Data-Uniqid-md5sum "6bab3b5da09fedfdf60ce2629a7367db">
-
-  <!ENTITY DateTime-Calendar-Julian-download-http "&perl_authors;/id/P/PI/PIJLL/DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;.tar.gz">
-  <!ENTITY DateTime-Calendar-Julian-md5sum "de688324eb33a27449ac2a5bfe1453a0">
-
-  <!ENTITY DateTime-Format-Builder-download-http "&perl_authors;/id/D/DR/DROLSKY/DateTime-Format-Builder-&DateTime-Format-Builder-version;.tar.gz">
-  <!ENTITY DateTime-Format-Builder-md5sum "21d950a9425c0173d6191697bf9dc4dc">
-
-  <!ENTITY Encode-EUCJPASCII-download-http "&perl_authors;/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz">
-  <!ENTITY Encode-EUCJPASCII-md5sum "5daa65f55b7c2050bb0713d9e95f239d">
-
-  <!ENTITY Encode-HanExtra-download-http "&perl_authors;/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
-  <!ENTITY Encode-HanExtra-md5sum "e1d3bc32c1c8ee304235a06fbcd5d5a4">
-
-  <!ENTITY Encode-JIS2K-download-http "&perl_authors;/id/D/DA/DANKOGAI/Encode-JIS2K-&Encode-JIS2K-version;.tar.gz">
-  <!ENTITY Encode-JIS2K-md5sum "60539471aa408a2b793cd45a6ce651db">
-
-  <!ENTITY Error-download-http "&perl_authors;/id/S/SH/SHLOMIF/Error-&Error-version;.tar.gz">
-  <!ENTITY Error-md5sum "0dcd94640f617df02b6d6c1e4e92018c">
-
-<!-- <!ENTITY File-BaseDir-download-http "&perl_authors;/id/K/KI/KIMRYAN/File-BaseDir-&File-BaseDir-version;.tar.gz">
-  <!ENTITY File-BaseDir-md5sum "667a7faa144c0c9a22b4421ed395fe89"> -->
-
-  <!ENTITY File-Slurper-download-http "&perl_authors;/id/L/LE/LEONT/File-Slurper-&File-Slurper-version;.tar.gz">
-  <!ENTITY File-Slurper-md5sum "5742c63096392dfee50b8db314bcca18">
-
-  <!ENTITY File-Which-download-http "&perl_authors;/id/P/PL/PLICEASE/File-Which-&File-Which-version;.tar.gz">
-  <!ENTITY File-Which-md5sum "face60fafd220dc83fa581ef6f96d480">
-
-  <!ENTITY HTML-Parser-download-http "&perl_authors;/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
-  <!ENTITY HTML-Parser-md5sum "eb7505e5f626913350df9dd4a03d54a8">
-
-  <!ENTITY HTTP-Daemon-download-http "&perl_authors;/id/G/GA/GAAS/HTTP-Daemon-&HTTP-Daemon-version;.tar.gz">
-  <!ENTITY HTTP-Daemon-md5sum "ed0ae02d25d7f1e89456d4d69732adc2">
-
-  <!ENTITY IO-Socket-SSL-download-http "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
-  <!ENTITY IO-Socket-SSL-md5sum "97fa6cd64f15db60f810cd8ab02d57fc">
-
-  <!ENTITY IPC-Run3-download-http "&perl_authors;/id/R/RJ/RJBS/IPC-Run3-&IPC-Run3-version;.tar.gz">
-  <!ENTITY IPC-Run3-md5sum "5a8cec571c51a118b265cf6e24e55761">
-
-  <!ENTITY libwww-perl-download-http "&perl_authors;/id/E/ET/ETHER/libwww-perl-&LWP-version;.tar.gz">
-  <!ENTITY libwww-perl-md5sum "19cd0f55f61359c973caa9301ec405bd">
-
-  <!ENTITY Lingua-Translit-download-http "&perl_authors;/id/A/AL/ALINKE/Lingua-Translit-&Lingua-Translit-version;.tar.gz">
-  <!ENTITY Lingua-Translit-md5sum "090cecd52ff9c1f9d4b370ba653b9da1">
-
-  <!ENTITY List-AllUtils-download-http "&perl_authors;/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
-  <!ENTITY List-AllUtils-md5sum "5d7f33d6b21aa461c12b002e20a2cbb6">
-
-  <!ENTITY List-MoreUtils-download-http "&perl_authors;/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
-  <!ENTITY List-MoreUtils-md5sum "493032a211cdff1fcf45f59ebd680407">
-
-  <!ENTITY Log-Log4perl-download-http "&perl_authors;/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz">
-  <!ENTITY Log-Log4perl-md5sum "8e96fb5e236c92445947eceb903326ba">
-
-  <!ENTITY LWP-Protocol-https-download-http "&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
-  <!ENTITY LWP-Protocol-https-md5sum "b8943dfb7d187af63c36fc18ab15947d">
-
-  <!ENTITY Module-Build-download-http "&perl_authors;/id/L/LE/LEONT/Module-Build-&Module-Build-version;.tar.gz">
-  <!ENTITY Module-Build-md5sum "b74c2f6e84b60aad3a3defd30b6f0f4d">
-
-  <!ENTITY Net-DNS-download-http "&perl_authors;/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
-  <!ENTITY Net-DNS-md5sum "28fcbcbf4483a9f23f75be4b9e3e45c8">
-
-  <!ENTITY Parse-Yapp-download-http "&perl_authors;/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
-  <!ENTITY Parse-Yapp-md5sum "69584d5b0f0304bb2a23cffcd982c5de">
-
-  <!ENTITY PerlIO-utf8_strict-download-http "&perl_authors;/id/L/LE/LEONT/PerlIO-utf8_strict-&PerlIO-utf8_strict-version;.tar.gz">
-  <!ENTITY PerlIO-utf8_strict-md5sum "9e8fba7f15c612c4f2ed2f961bf1141b">
-
-  <!ENTITY Regexp-Common-download-http "&perl_authors;/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz">
-  <!ENTITY Regexp-Common-md5sum "b1bb40759b84154990f36a160160fb94">
-
-  <!ENTITY SGMLSpm-download-http "&perl_authors;/id/R/RA/RAAB/SGMLSpm-&SGMLSpm-version;.tar.gz">
-  <!ENTITY SGMLSpm-md5sum "746c74ae969992cedb1a2879b4168090">
-
-  <!ENTITY Sort-Key-download-http "&perl_authors;/id/S/SA/SALVA/Sort-Key-&Sort-Key-version;.tar.gz">
-  <!ENTITY Sort-Key-md5sum "a37ab0da0cfdc26e57b4c79e39f6d98f">
-
-  <!ENTITY Test-Command-download-http "&perl_authors;/id/D/DA/DANBOO/Test-Command-&Test-Command-version;.tar.gz">
-  <!ENTITY Test-Command-md5sum "9ab83c4695961dbe92cd86efe08f0634">
-
-  <!ENTITY Test-Differences-download-http "&perl_authors;/id/D/DC/DCANTRELL/Test-Differences-&Test-Differences-version;.tar.gz">
-  <!ENTITY Test-Differences-md5sum "ecfda620fe133e36a6e392d94ab8424d">
-
-  <!ENTITY Text-BibTeX-download-http "&perl_authors;/id/A/AM/AMBS/Text-BibTeX-&Text-BibTeX-version;.tar.gz">
-  <!ENTITY Text-BibTeX-md5sum "eff0352d6de29a8d4d61efcc7774186c">
-
-  <!ENTITY Text-CSV-download-http "&perl_authors;/id/I/IS/ISHIGAKI/Text-CSV-&Text-CSV-version;.tar.gz">
-  <!ENTITY Text-CSV-md5sum "06e9ff3c867fa5ba7f8793ae06ea73ac">
-
-  <!ENTITY Text-Roman-download-http "&perl_authors;/id/S/SY/SYP/Text-Roman-&Text-Roman-version;.tar.gz">
-  <!ENTITY Text-Roman-md5sum "1f6b09c0cc1f4425b565ff787a39fd83">
-
-   <!-- NB biber is updated frequently and tends to need the latest Unicode-Collate,
-   whereas stable perl releases lag behind.  So, next time the shipped version is
-   adequate, just comment it, it will soon get reinstated as a dependency -->
-  <!ENTITY Unicode-Collate-download-http "&perl_authors;/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">
-  <!ENTITY Unicode-Collate-md5sum "b077a891392c02fcc26d3c9f7dfc1734">
-
-  <!ENTITY Unicode-LineBreak-download-http "&perl_authors;/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz">
-  <!ENTITY Unicode-LineBreak-md5sum "736dcb04f6a250bd28e4279f2b8592af">
-
-  <!ENTITY URI-download-http "&perl_authors;/id/E/ET/ETHER/URI-&URI-version;.tar.gz">
-  <!ENTITY URI-md5sum "892f7183b178af40f205ba37128225db">
-
-  <!ENTITY XML-LibXML-Simple-download-http "&perl_authors;/id/M/MA/MARKOV/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">
-  <!ENTITY XML-LibXML-Simple-md5sum "15b7cbe0887e292057fbcfcb3d87ef2e">
-
-  <!ENTITY XML-LibXSLT-download-http "&perl_authors;/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">
-  <!ENTITY XML-LibXSLT-md5sum "700d493b72f99788d428cc9756bef165">
-
-  <!ENTITY XML-Simple-download-http "&perl_authors;/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz">
-  <!ENTITY XML-Simple-md5sum "bb841dce889a26c89a1c2739970e9fbc">
-
-  <!ENTITY XML-Writer-download-http "&perl_authors;/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">
-  <!ENTITY XML-Writer-md5sum "b9c2420c243c6a36ce45a008740fcede">
-
-]>
-
-<!-- FIXME (I only used that so that this gets highlighted by vim ;-)
- If you have the misfortune to have to add a new module which puts a program
- into /usr/bin/, please document it at the end of the page.  'perldoc' is
- sometimes a good place to start, then for scripts look at any comments in the
- script, and if you get a package like Text::BibTeX with compiled progs and
- library, look at the comments in the code
-
- Also, for external modules where we do not show a version in the module name,
- prefer to go to https://metacpan.org/, find the module and link to it.
-
- Where a dependency is used by multiple other modules on this page, but not by
- packages elsewhere in the book, promote it to a top-level entry so that it can
- be linked - but do not give it a version.  See Capture::Tiny for an example.
-
- If you have to add a new module, working out which dependencies are part of the
- core perl distribution can be error-prone : for an incomplete list see
-
-  general/prog/perl-core-modules.txt
-
- and please update that it you find new deps which are part of the core.
-
- -->
-
-<sect1 id="perl-modules" xreflabel="Perl modules">
-  <?dbhtml filename="perl-modules.html" ?>
-
-
-  <title>Perl Modules</title>
-
-  <indexterm zone="perl-modules">
-    <primary sortas="a-Perl-modules">Perl modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Perl Modules</title>
-
-    <para>The <application>Perl</application> module packages add useful
-    objects to the <application>Perl</application> language. Modules utilized
-    by packages throughout BLFS are listed here, along with their dependencies.
-    Installation of the modules shown on this page should be accomplished by
-    installing the dependencies in the order listed. The Perl Module standard
-    build and installation instructions are shown at the bottom of this page.
-    </para>
-
-    <para>If a module is used by more than one other module on this page, but
-    not by other packages in the book, it is listed by name (without a version)
-    here at the top level to slightly reduce the complexity of the XML
-    source for this page.</para>
-
-    <para>Where a module is shown as '(for the test suite)' it is required if
-    you wish to run the test for the module which uses it.</para>
-
-    <para> In all cases, only
-    the required or recommended dependencies are listed - there might be other
-    modules which allow more tests to be run, but omitting them will still allow
-    the tests to <literal>PASS</literal>.</para>
-
-    <note>
-      <para>For unversioned modules on this page, if you are building without
-      using the CPAN automated install then the links on this page (to metacpan.org)
-      should go to "known good" versions, for which the dependencies are correct. If
-      you wish to use a later version, please check the Changes file at
-      https://metacpan.org - sometimes added dependencies are listed, other
-      times not. The BLFS editors only monitor such modules, and their
-      dependencies, irregularly.  Some of these modules have very frequent
-      updates, often bringing different dependencies. The linked metacpan.org
-      versions below are known to build and work with BLFS-8.3</para>
-
-      <para>However, if you notice that the Changes file for a newer version
-      than is in the current development book reports a fix for a security issue,
-      please report this to either the blfs-dev or the blfs-support list.</para>
-
-      <para>Similarly, if you discover that an updated versioned module needs
-      an extra dependency, please report this.</para>
-    </note>
-
-    <!-- Archive::Zip -->
-    <bridgehead renderas="sect3" id="perl-archive-zip"
-    xreflabel="Archive::Zip-&Archive-Zip-version;">
-    Archive::Zip-&Archive-Zip-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-archive-zip">
-      <primary sortas="a-Archive-Zip">Archive::Zip</primary>
-    </indexterm>
-
-    <para>The Archive::Zip module allows a <application>Perl</application>
-    program to create, manipulate, read, and write Zip archive files. This
-    module uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Archive-Zip -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Archive-Zip-download-http;">Archive::Zip-&Archive-Zip-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Archive-Zip-download-http;
-MD5 sum: &Archive-Zip-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz">Test::MockModule</ulink> - This uses the <xref linkend="perl-build-install"/>
-(https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz) (for the test suite)</literallayout>
-            <itemizedlist>
-              <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz">SUPER</ulink>
-(https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz) (for the test suite)</literallayout>
-                <itemizedlist>
-                  <listitem>
-                    <para>
-                      <xref linkend="perl-sub-identify"/>
-                    </para>
-                  </listitem>
-                </itemizedlist> <!-- end of deps for SUPER -->
-              </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="perl-test-warnings"/>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- autovivification -->
-    <bridgehead renderas="sect3" id="perl-autovivification"
-    xreflabel="autovivification-&autovivification-version;">
-    autovivification-&autovivification-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-autovivification">
-      <primary sortas="a-autovivification">autovivification</primary>
-    </indexterm>
-
-    <para>The autovivification module allows you to lexically disable
-    autovivification. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- autovivification -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&autovivification-download-http;">autovivification-&autovivification-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&autovivification-download-http;
-MD5 sum: &autovivification-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Business::ISBN -->
-    <bridgehead renderas="sect3" id="perl-business-isbn"
-    xreflabel="Business::ISBN-&Business-ISBN-version;">
-    Business::ISBN-&Business-ISBN-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-business-isbn">
-      <primary sortas="a-Business-ISBN">Business::ISBN</primary>
-    </indexterm>
-
-    <para>The Business::ISBN module is for work with International Standard Book
-    Numbers.  This module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Business-ISBN -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Business-ISBN-download-http;">Business::ISBN-&Business-ISBN-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Business-ISBN-download-http;
-MD5 sum: &Business-ISBN-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Business-ISBN-Data-20140910.003.tar.gz">Business::ISBN::Data</ulink>
-(https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Business-ISBN-Data-20140910.003.tar.gz)</literallayout>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Business::ISMN -->
-    <bridgehead renderas="sect3" id="perl-business-ismn"
-    xreflabel="Business::ISMN-&Business-ISMN-version;">
-    Business::ISMN-&Business-ISMN-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-business-ismn">
-      <primary sortas="a-Business-ISMN">Business::ISMN</primary>
-    </indexterm>
-
-    <para>The Business::ISMN module is for work with International Standard
-    Music Numbers.  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Business-ISMN -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Business-ISMN-download-http;">Business::ISMN-&Business-ISMN-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Business-ISMN-download-http;
-MD5 sum: &Business-ISMN-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz">Tie::Cycle</ulink>
-(https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz)</literallayout>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Business::ISSN -->
-    <bridgehead renderas="sect3" id="perl-business-issn"
-    xreflabel="Business::ISSN-&Business-ISSN-version;">
-    Business::ISSN-&Business-ISSN-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-business-issn">
-      <primary sortas="a-Business-ISSN">Business::ISSN</primary>
-    </indexterm>
-
-    <para>The Business::ISSN module is for work with International Standard
-    Serial Numbers.  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Business-ISSN -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Business-ISSN-download-http;">Business::ISSN-&Business-ISSN-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Business-ISSN-download-http;
-MD5 sum: &Business-ISSN-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Capture::Tiny is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-capture-tiny"
-    xreflabel="Capture::Tiny">
-    Capture::Tiny</bridgehead>
-
-    <indexterm zone="perl-modules perl-capture-tiny">
-      <primary sortas="a-Capture-Tiny">Capture::Tiny</primary>
-    </indexterm>
-
-    <para>The Capture::Tiny module captures STDOUT and STDERR from Perl, XS
-    (eXternal Subroutine, i.e. written in C or C++) or external programs. This
-    module uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Capture-Tiny -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz">Capture::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Class::Accessor -->
-    <bridgehead renderas="sect3" id="perl-class-accessor"
-    xreflabel="Class::Accessor-&Class-Accessor-version;">
-    Class::Accessor-&Class-Accessor-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-class-accessor">
-      <primary sortas="a-Class-Accessor">Class::Accessor</primary>
-    </indexterm>
-
-    <para>This module generators accessors/mutators for your class. It uses
-    the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!--Class-Accessor -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Class-Accessor-download-http;">Class::Accessor-&Class-Accessor-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Class-Accessor-download-http;
-MD5 sum: &Class-Accessor-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Data::Compare -->
-    <bridgehead renderas="sect3" id="perl-data-compare"
-    xreflabel="Data::Compare-&Data-Compare-version;">
-    Data::Compare-&Data-Compare-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-data-compare">
-      <primary sortas="a-Data-Compare">Data::Compare</primary>
-    </indexterm>
-
-    <para>The Data::Compare module compares two <application>perl</application>
-    data structures. This module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Data-Compare -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Data-Compare-download-http;">Data::Compare-&Data-Compare-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Data-Compare-download-http;
-MD5 sum: &Data-Compare-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/File-Find-Rule-0.04.tar.gz">File::Find::Rule</ulink>
-(https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/File-Find-Rule-0.04.tar.gz)</literallayout>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <xref linkend="perl-number-compare"/>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="perl-text-glob"/>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Data::Dump -->
-    <bridgehead renderas="sect3" id="perl-data-dump"
-    xreflabel="Data::Dump-&Data-Dump-version;">
-    Data::Dump-&Data-Dump-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-data-dump">
-      <primary sortas="a-Data-Dump">Data::Dump</primary>
-    </indexterm>
-
-    <para>This module provides pretty printing of data structures. It uses
-    the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Data-Dump -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Data-Dump-download-http;">Data::Dump-&Data-Dump-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Data-Dump-download-http;
-MD5 sum: &Data-Dump-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Data::Uniqid -->
-    <bridgehead renderas="sect3" id="perl-data-uniqid"
-    xreflabel="Data::Uniqid-&Data-Uniqid-version;">
-    Data::Uniqid-&Data-Uniqid-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-data-uniqid">
-      <primary sortas="a-Data-Uniqid">Data::Uniqid</primary>
-    </indexterm>
-
-    <para>This module provides three simple routines for generating unique IDs.
-    It uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <para>Although the final test fails and reports an Error, the test suite
-    returns a status of 0. This error can safely be ignored.</para>
-
-    <!-- Data-Uniqid -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Data-Uniqid-download-http;">Data::Uniqid-&Data-Uniqid-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Data-Uniqid-download-http;
-MD5 sum: &Data-Uniqid-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- DateTime is a dependency of DateTime-Calendar-Julian and DateTime-Format-Builder
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-datetime"
-    xreflabel="DateTime">
-    DateTime</bridgehead>
-
-    <indexterm zone="perl-modules perl-datetime">
-      <primary sortas="a-DateTime">DateTime</primary>
-    </indexterm>
-
-    <para>DateTime provides a date and time object for perl.
-    It and its dependencies use the standard
-    <xref linkend="perl-standard-install"/> except that Test::utf8
-    uses the 'unsafe' variant, and those which need
-    <xref linkend="perl-module-build"/> use
-    <xref linkend="perl-build-install"/>.</para>
-
-    <!-- DateTime -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-1.50.tar.gz">DateTime</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-1.50.tar.gz)</literallayout>
-        <itemizedlist>
-          <!-- Both DateTime::Locale and DateTime::TimeZone now need
-          namespace::autoclean, Specio and Params::ValidationCompiler.
-          The latter needs Specio but only for its test suite -->
-
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz">CPAN::Meta::Check</ulink>
-(https://cpan.metacpan.org/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz)</literallayout>
-            <itemizedlist> <!-- dep for CPAN-Meta-Check -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz">Test::Deep</ulink>
-(https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz)</literallayout>
-              </listitem>
-            </itemizedlist> <!-- end of dep for CPAN-Meta-Check -->
-          </listitem>
-
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz">namespace::autoclean</ulink>
-(https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz)</literallayout>
-            <itemizedlist><!-- deps for namespace::autoclean -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz">B::Hooks::EndOfScope</ulink>
-(https://cpan.metacpan.org/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz)</literallayout>
-                <itemizedlist><!-- deps for B::Hooks::EndOfScope -->
-                  <listitem>
-                    <para><xref linkend="perl-module-implementation"/></para>
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz">Sub::Exporter::Progressive</ulink>
-(https://cpan.metacpan.org/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz">Variable::Magic</ulink>
-(https://cpan.metacpan.org/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz)</literallayout>
-                  </listitem>
-                </itemizedlist><!-- end of deps for B::Hooks::EndOfScope -->
-              </listitem>
-              <listitem>
-                <para><xref linkend="perl-sub-identify"/></para>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz">namespace::clean</ulink>
-(https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz)</literallayout>
-                <itemizedlist> <!-- deps of namespace-clean -->
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz">Package::Stash</ulink>
-(https://cpan.metacpan.org/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz)</literallayout>
-                    <itemizedlist><!-- deps of Package-Stash -->
-                      <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz">Dist::CheckConflicts</ulink>
-(https://cpan.metacpan.org/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz)</literallayout>
-                        <!-- Module-Runtime, Test-Fatal pulled in by Module-Implementation -->
-                      </listitem>
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DO/DOY//Package-Stash-XS-0.28.tar.gz">Package::Stash::XS</ulink>
-(https://cpan.metacpan.org/authors/id/D/DO/DOY//Package-Stash-XS-0.28.tar.gz)</literallayout>
-                      <!-- Test-Fatal is pulled in by Module-Implementation for B-Hooks... above -->
-                        <itemizedlist> <!-- deps of Package-Stash-XS -->
-                           <listitem>
-                             <para>
-                               <xref linkend="perl-test-requires"/>
-                               (for the test suite)
-                             </para>
-                           </listitem>
-                        </itemizedlist> <!-- end of deps for Package-Stash-XS -->
-                      </listitem>
-                    </itemizedlist> <!-- end of deps for Package-Stash -->
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist> <!-- end of deps for namespace::autoclean -->
-           </listitem>
-
-          <!-- Specio::Library::Builtins and Specio::Library::String both come from Specio -->
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz">Specio</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz)</literallayout>
-            <itemizedlist><!--- deps for Specio -->
-              <listitem><literallayout><ulink url="http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz">Devel::StackTrace</ulink>
-(http://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz)</literallayout>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz">Eval::Closure</ulink>
-(https://cpan.metacpan.org/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz)</literallayout>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz">MRO::Compat</ulink>
-(https://cpan.metacpan.org/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz)</literallayout>
-              </listitem>
-              <!-- Role::Tiny::Compat is part of Role::Tiny -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz">Role::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz)</literallayout>
-              </listitem>
-              <!-- Test::Fatal is pulled in to test Dist::CheckConflicts -->
-              <listitem>
-                <para>
-                  <xref linkend="perl-test-needs"/>
-                </para>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.005001.tar.gz">Sub::Quote</ulink>
-(https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.005001.tar.gz) (for the test suite)</literallayout>
-                <itemizedlist>
-                  <listitem>
-                    <para>
-                      <xref linkend="perl-test-fatal"/> (for the test suite)
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist> <!-- end of Specio deps -->
-          </listitem>
-
-          <!-- Params::ValidationCompiler needs Specio for its test suite -->
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz">Params::ValidationCompiler</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz)</literallayout>
-            <itemizedlist><!--- deps for Params::ValidationCompiler -->
-              <!-- Eval::Closure was built for Specio -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz">Exception::Class</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz)</literallayout>
-                <itemizedlist><!-- deps for Exception::Class - DevelStackTrace was built for Specio -->
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz">Class::Data::Inheritable</ulink>
-(https://cpan.metacpan.org/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz)</literallayout>
-                  </listitem>
-                </itemizedlist> <!-- end of deps for Exception::Class -->
-              </listitem>
-
-              <!-- Test2::Plugin::NoWarnings -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz">Test2::Plugin::NoWarnings</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz) (for the test suite)</literallayout>
-                <itemizedlist>
-                  <!-- Test2::Bundle::Extended and Test2::Require::Module are from Test2-Suite -->
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-0.000115.tar.gz">Test2::Suite</ulink>
-(https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-0.000115.tar.gz)</literallayout>
-                    <itemizedlist> <!-- deps for Test2::Suite -->
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz">Importer</ulink>
-(https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz)</literallayout>
-                      </listitem>
-                      <!-- Test2 is part of Test::Simple -->
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Simple-1.302138.tar.gz">Test::Simple</ulink>
-(https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Simple-1.302138.tar.gz)</literallayout>
-                      </listitem>
-                      <!-- Sub::Info --> <!-- needs Test2 and Importer -->
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz">Sub::Info</ulink>
-(https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz)</literallayout>
-                      </listitem>
-                      <!-- Term::Table --> <!-- needs Test2 and Importer -->
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Term-Table-0.012.tar.gz">Term::Table</ulink>
-(https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Term-Table-0.012.tar.gz)</literallayout>
-                      </listitem>
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz">Module::Pluggable</ulink>
-(https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz) (for the test suite)</literallayout>
-                      </listitem>
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz">Scope::Guard</ulink>
-(https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz) (for the test suite)</literallayout>
-                      </listitem>
-                    </itemizedlist> <!-- end of deps for Test2::Suite -->
-                  </listitem>
-                </itemizedlist> <!-- end of deps for Test2::Plugin::NoWarnings -->
-              </listitem>
-              <!-- Test::Without::Module -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz">Test::Without::Module</ulink>
-(https://cpan.metacpan.org/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz)</literallayout>
-              </listitem>
-            </itemizedlist> <!-- end of Params::ValidationCompiler deps -->
-          </listitem>
-
-          <!-- DateTime::Locale -->
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-1.22.tar.gz">DateTime::Locale</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-1.22.tar.gz)</literallayout>
-            <itemizedlist>
-              <!-- deps for DateTime::Locale mostly pulled in for DateTime above -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz">File::ShareDir::Install</ulink>
-(https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz)</literallayout>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz">File::ShareDir</ulink>
-(https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz) (for the test suite)</literallayout>
-                <itemizedlist><!-- File-ShareDir deps apart from File::ShareDir:Install (above) -->
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz">Class::Inspector</ulink>
-(https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz)</literallayout>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz">Test::File::ShareDir</ulink>
-(https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz) (for the test suite)</literallayout>
-                <itemizedlist><!-- Test-File-ShareDir deps  -->
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz">Class::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.44.tar.gz">File::Copy::Recursive</ulink>
-(https://cpan.metacpan.org/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.44.tar.gz)</literallayout>
-                    <itemizedlist><!-- deps for File-Copy-Recursive -->
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz">Path::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz) (for the test suite)</literallayout>
-                      </listitem>
-                      <listitem>
-                        <para>
-                          <xref linkend="perl-test-exception"/> (for the test suite)
-                        </para>
-                      </listitem>
-                      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz">Test::File</ulink>
-(https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz) (for the test suite)</literallayout>
-                        <itemizedlist><!-- deps for Test-File -->
-                          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz">Test::utf8</ulink>
-(https://cpan.metacpan.org/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz)</literallayout>
-                          </listitem>
-                        </itemizedlist> <!-- end of deps for Test-File -->
-                      </listitem>
-                      <listitem>
-                        <para>
-                          <xref linkend="perl-test-warnings"/> (for the test suite)
-                        </para>
-                      </listitem>
-                    </itemizedlist> <!-- end of deps for File-Copy-Recursive -->
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz">Scope::Guard</ulink>
-(https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem>
-                    <para>
-                      <xref linkend="perl-test-fatal"/>
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-              <!-- Test-Warnings for test suite now pulled in for File-Copy-Recursive -->
-            </itemizedlist> <!-- end of deps for DateTime::Locale -->
-          </listitem>
-
-          <!-- DateTime::TimeZone -->
-          <listitem>
-              <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.19.tar.gz">DateTime::TimeZone</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.19.tar.gz)</literallayout>
-            <itemizedlist> <!-- deps for DateTime::timeZone -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz">Class::Singleton</ulink>
-(https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz)</literallayout>
-              </listitem>
-              <!-- Module::Runtime is pulled in by Dist::CheckConflicts -->
-
-              <listitem>
-                <para><xref linkend="perl-try-tiny"/></para>
-              </listitem>
-            </itemizedlist> <!-- end of deps for DateTime::TimeZone -->
-          </listitem>
-          <!--  Test::Fatal pulled in for Dist-CheckConflicts -->
-          <!--  Test::Warnings pulled in for DateTime::Locale -->
-        </itemizedlist> <!-- end of deps for DateTime -->
-      </listitem>
-    </itemizedlist>
-
-    <!-- DateTime::Calendar::Julian -->
-    <bridgehead renderas="sect3" id="perl-datetime-calendar-julian"
-    xreflabel="DateTime::Calendar::Julian-&DateTime-Calendar-Julian-version;">
-    DateTime::Calendar::Julian-&DateTime-Calendar-Julian-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-datetime-calendar-julian">
-      <primary sortas="a-DateTime-Calendar-Julian">DateTime::Calendar::Julian</primary>
-    </indexterm>
-
-    <para>DateTime::Calendar::Julian implements the Julian Calendar. This
-    module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/> except for those needing
-    <xref linkend="perl-module-build"/>, which use
-    <xref linkend="perl-build-install"/>.</para>
-
-    <!-- DateTime-Calendar-Julian -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&DateTime-Calendar-Julian-download-http;">DateTime::Calendar::Julian-&DateTime-Calendar-Julian-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&DateTime-Calendar-Julian-download-http;
-MD5 sum: &DateTime-Calendar-Julian-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="perl-datetime"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- DateTime::Format::Builder -->
-    <bridgehead renderas="sect3" id="perl-datetime-format-builder"
-    xreflabel="DateTime::Format::Builder-&DateTime-Format-Builder-version;">
-    DateTime::Format::Builder-&DateTime-Format-Builder-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-datetime-format-builder">
-      <primary sortas="a-DateTime-Format-Builder">DateTime::Format::Builder</primary>
-    </indexterm>
-
-    <para>DateTime::Format::Builder creates DateTime parser classes and objects.
-    This module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/> except for those needing
-    <xref linkend="perl-module-build"/>, which use
-    <xref linkend="perl-build-install"/>.</para>
-
-    <!-- DateTime-Format-Builder -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&DateTime-Format-Builder-download-http;">DateTime::Format::Builder-&DateTime-Format-Builder-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&DateTime-Format-Builder-download-http;
-MD5 sum: &DateTime-Format-Builder-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz">Class::Factory::Util</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz)</literallayout>
-            <itemizedlist>
-              <listitem>
-                <para><xref linkend="perl-module-build"/></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><xref linkend="perl-datetime"/></para>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.75.tar.gz">DateTime::Format::Strptime</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.75.tar.gz)</literallayout>
-            <itemizedlist> <!-- deps of DateTime-Format-Strptime -->
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz">Package::DeprecationManager</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz)</literallayout>
-                <itemizedlist> <!-- deps of Package-DeprecationManager -->
-                  <!-- Package::Stash is p ulled in by DateTime -->
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz">Params::Util</ulink>
-(https://cpan.metacpan.org/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz">Sub::Install</ulink>
-(https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz">Sub::Name</ulink>
-(https://cpan.metacpan.org/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz)</literallayout>
-                  </listitem>
-                </itemizedlist> <!-- end of deps for Package-DeprecationManager -->
-              </listitem>
-              <!-- Module::Implementation and Test::Fatal are pulled in by DateTime -->
-            </itemizedlist> <!-- end of deps for DateTime-Format-Strptime -->
-          </listitem>
-          <!-- Test-Fatal and Test-Warnings pulled in by DateTime -->
-          <!-- Params-Validate -->
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz">Params::Validate</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz) - uses <xref linkend="perl-build-install"/></literallayout>
-          <!-- deps for Params::Validate:
-          Module::Build is a dep of Module::Implementation via Module::Runtime,
-          pulled in by Package::Stash in namespace::clean for
-          namespace::autoclean in DateTime, and for test suites Test::Fatal is
-          pulled in for Dist::CheckConflicts for Package::Stash, and
-          Test::Requires by Package::Stash::XS for Package::Stash -->
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Encode::EUCJPASCII -->
-    <bridgehead renderas="sect3" id="perl-encode-eucjpascii"
-    xreflabel="Encode::EUCJPASCII-&Encode-EUCJPASCII-version;">
-    Encode::EUCJPASCII-&Encode-EUCJPASCII-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-encode-eucjpascii">
-      <primary sortas="a-Encode-EUCJPASCII">Encode::EUCJPASCII</primary>
-    </indexterm>
-
-    <para>Encode::EUCJPASCII provides an eucJP-open (Extended Unix Code,
-    Japanese) mapping. This module uses the
-    standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Encode-EUCJPASCII -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Encode-EUCJPASCII-download-http;">Encode::EUCJPASCII-&Encode-EUCJPASCII-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Encode-EUCJPASCII-download-http;
-MD5 sum: &Encode-EUCJPASCII-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Encode::HanExtra -->
-    <bridgehead renderas="sect3" id="perl-encode-hanextra"
-    xreflabel="Encode::HanExtra-&Encode-HanExtra-version;">
-    Encode::HanExtra-&Encode-HanExtra-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-encode-hanextra">
-      <primary sortas="a-Encode-HanExtra">Encode::HanExtra</primary>
-    </indexterm>
-
-    <para>The Encode::HanExtra module provides extra sets of Chinese Encodings.
-    This module uses the 'unsafe' variant of the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Encode-HanExtra -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Encode-HanExtra-download-http;">Encode::HanExtra-&Encode-HanExtra-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Encode-HanExtra-download-http;
-MD5 sum: &Encode-HanExtra-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Encode::JIS2K -->
-    <bridgehead renderas="sect3" id="perl-encode-jis2k"
-    xreflabel="Encode::JIS2K-&Encode-JIS2K-version;">
-    Encode::JIS2K-&Encode-JIS2K-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-encode-jis2k">
-      <primary sortas="a-Encode-JIS2K">Encode::JIS2K</primary>
-    </indexterm>
-
-    <para>The Encode::JIS2K module provides JIS X 0212 (aka JIS 2000)
-    Encodings. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Encode-JIS2K -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Encode-JIS2K-download-http;">Encode::JIS2K-&Encode-JIS2K-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Encode-JIS2K-download-http;
-MD5 sum: &Encode-JIS2K-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Error -->
-    <bridgehead renderas="sect3" id="perl-error"
-    xreflabel="Error-&Error-version;">
-    Error-&Error-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-error">
-      <primary sortas="a-Error">Error</primary>
-    </indexterm>
-
-    <para>The Error module provides Error/exception handling in an
-    object-oriented way. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Error -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Error-download-http;">Error-&Error-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Error-download-http;
-MD5 sum: &Error-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-   <!-- File::BaseDir -->
-<!--<bridgehead renderas="sect3" id="perl-file-basedir"
-    xreflabel="File::BaseDir-&File-BaseDir-version;">
-    File::BaseDir-&File-BaseDir-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-file-basedir">
-      <primary sortas="a-File-BaseDir">File::BaseDir</primary>
-    </indexterm>
-
-    <para>The File::BaseDir module compares two <application>perl</application>
-    data structures. This module uses the <xref linkend="perl-build-install"/>.
-    Its dependencies use the standard <xref linkend="perl-standard-install"/>.
-    One set of tests (03_userdirs.t) may fail if
-    <xref linkend="xdg-user-dirs"/> is installed and
-    <envar>XDG_CONFIG_HOME</envar> is set.</para>-->
-
-    <!-- File-BaseDir -->
-<!--&lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&File-BaseDir-download-http;">File::BaseDir-&File-BaseDir-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&File-BaseDir-download-http;
-MD5 sum: &File-BaseDir-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="perl-module-build"/></para>
-          </listitem>
-          <listitem>
-            <para><xref linkend="perl-file-which"/></para>
-          </listitem>
-          <listitem>
-             <para>
-               <xref linkend="perl-ipc-system-simple"/> (for the test suite)
-             </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>-->
-
-    <!-- File::Slurper -->
-    <bridgehead renderas="sect3" id="perl-file-slurper"
-    xreflabel="File::Slurper-&File-Slurper-version;">
-    File::Slurper-&File-Slurper-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-file-slurper">
-      <primary sortas="a-File-Slurper">File::Slurper</primary>
-    </indexterm>
-
-    <para>File::Slurper is a simple, sane and efficient module to
-    slurp a file.  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- File-Slurper -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&File-Slurper-download-http;">File::Slurper-&File-Slurper-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&File-Slurper-download-http;
-MD5 sum: &File-Slurper-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-warnings"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- File::Which -->
-    <bridgehead renderas="sect3" id="perl-file-which"
-    xreflabel="File::Which-&File-Which-version;">
-    File::Which-&File-Which-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-file-which">
-      <primary sortas="a-File-Which">File::Which</primary>
-    </indexterm>
-
-    <para>File::Which provides a portable implementation of the
-    &apos;which&apos; utility. This module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- File-Which -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&File-Which-download-http;">
-          File::Which-&File-Which-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&File-Which-download-http;
-MD5 sum: &File-Which-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- HTML::Parser -->
-    <bridgehead renderas="sect3" id="perl-html-parser"
-    xreflabel="HTML::Parser-&HTML-Parser-version;">
-    HTML::Parser-&HTML-Parser-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-html-parser">
-      <primary sortas="a-HTML-Parser">HTML::Parser</primary>
-    </indexterm>
-
-    <para>The HTML::Parser distribution is a collection of modules that parse
-    and extract information from HTML documents. This module and the dependency
-    modules use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- HTML-Parser -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&HTML-Parser-download-http;">HTML::Parser-&HTML-Parser-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&HTML-Parser-download-http;
-MD5 sum: &HTML-Parser-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz">HTML::Tagset</ulink>
-(https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz)</literallayout>
-          </listitem>
-          <listitem>
-            <para>
-              <xref role="runtime" linkend="perl-lwp"/> (circular; howevever, it can
-              be installed after HTML::Parser as it is only a run-time
-              requirement for the included HTML::HeadParser module)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- HTTP-Daemon -->
-    <bridgehead renderas="sect3" id="perl-http-daemon"
-    xreflabel="HTTP::Daemon-&HTTP-Daemon-version;">
-    HTTP::Daemon-&HTTP-Daemon-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-http-daemon">
-      <primary sortas="a-HTTP-Daemon">HTTP-Daemon</primary>
-    </indexterm>
-
-    <para>Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on a
-    socket for incoming requests. The HTTP::Daemon is a subclass of IO::Socket::INET,
-    so you can perform socket operations directly on it too. This module uses the
-    standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- HTTP-Daemon -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&HTTP-Daemon-download-http;">HTTP::Daemon-&HTTP-Daemon-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&HTTP-Daemon-download-http;
-MD5 sum: &HTTP-Daemon-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- IO::Socket::SSL -->
-    <bridgehead renderas="sect3" id="perl-io-socket-ssl"
-    xreflabel="IO::Socket::SSL-&IO-Socket-SSL-version;">
-    IO::Socket::SSL-&IO-Socket-SSL-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-io-socket-ssl">
-      <primary sortas="a-IO-Socket-SSL">IO::Socket::SSL</primary>
-    </indexterm>
-
-    <para>IO::Socket::SSL makes using SSL/TLS much easier by wrapping the necessary
-    functionality into the familiar IO::Socket interface and providing secure
-    defaults whenever possible. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <para>If scripting, use 'yes | Makefile.PL' because it will ask if external
-    tests should be run.</para>
-
-    <note>
-      <para>
-        The tests for IO::Socket::SSL are broken with openssl-1.1.1 and the
-        tests for Net::SSLeay hang with that version.
-      </para>
-    </note>
-
-    <!-- IO-Socket-SSL -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&IO-Socket-SSL-download-http;">IO::Socket::SSL-&IO-Socket-SSL-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&IO-Socket-SSL-download-http;
-MD5 sum: &IO-Socket-SSL-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-1.85.tar.gz">Net::SSLeay</ulink>
-(https://cpan.metacpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-1.85.tar.gz)
-When scripting, pipe the <command>perl Makefile.PL</command> command through <command>yes "" |</command>, since some user input is sought</literallayout>
-          <!-- The test suite for NET::SSLeay has issues with OpenSSL-1.1.1 -->
-          </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="make-ca"/>
-                </para>
-              </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- IPC::Run3 -->
-    <bridgehead renderas="sect3" id="perl-ipc-run3"
-    xreflabel="IPC::Run3-&IPC-Run3-version;">
-    IPC::Run3-&IPC-Run3-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-ipc-run3">
-      <primary sortas="a-IPC-Run3">IPC::Run3</primary>
-    </indexterm>
-
-    <para>The IPC::Run3 module is used to run a subprocess with input/ouput
-    redirection.  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- IPC-Run3 -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&IPC-Run3-download-http;">IPC::Run3-&IPC-Run3-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&IPC-Run3-download-http;
-MD5 sum: &IPC-Run3-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- IPC::System::Simple is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-ipc-system-simple"
-    xreflabel="IPC::System::Simple">
-    IPC::System::Simple</bridgehead>
-
-    <indexterm zone="perl-modules perl-ipc-system-simple">
-      <primary sortas="a-IPC-System-Simple">IPC::System::Simple</primary>
-    </indexterm>
-
-    <para>IPC::System::Simple allows you to run commands simply, with detailed
-    diagnostics. It uses the standard <xref
-    linkend="perl-standard-install"/>.</para>
-
-    <!-- IPC-System-Simple -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz">IPC::System::Simple</ulink>
-(https://cpan.metacpan.org/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- LWP (but listed as libwww-perl) -->
-    <bridgehead renderas="sect3" id="perl-lwp"
-    xreflabel="libwww-perl-&LWP-version;">
-    libwww-perl-&LWP-version; (a.k.a. Bundle::LWP)</bridgehead>
-
-    <indexterm zone="perl-modules perl-lwp">
-      <primary sortas="a-libwww-perl">libwww-perl</primary>
-    </indexterm>
-
-    <para>The libwww-perl (Bundle::LWP) collection is a set of
-    <application>Perl</application> modules which provide a simple and
-    consistent application programming interface to the World-Wide Web. The
-    main focus of the library is to provide classes and functions that allow
-    you to write WWW clients. The library also contains modules that are of
-    more general use and even classes that help you implement simple HTTP
-    servers. The LWP collection and all its dependency modules use the standard
-    <xref linkend="perl-standard-install"/>. The dependencies should be
-    installed in the order listed below. Ensure you install the dependency
-    chain for each module before installing the modules.</para>
-
-    <!-- libwww-perl aka Bundle-LWP -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&libwww-perl-download-http;">libwww-perl-&LWP-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&libwww-perl-download-http;
-MD5 sum: &libwww-perl-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz">Encode::Locale</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz) </literallayout>
-          </listitem>
-          <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz">HTML::Form</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz) </literallayout>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <xref linkend="perl-uri"/>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="perl-html-parser"/>
-                </para>
-              </listitem>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/O/OA/OALDERS//HTTP-Message-6.18.tar.gz">HTTP::Message</ulink>
-(https://cpan.metacpan.org/authors/id/O/OA/OALDERS//HTTP-Message-6.18.tar.gz)</literallayout>
-                <itemizedlist><listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz">HTTP::Date</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem><literallayout> <ulink url="https://cpan.metacpan.org/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz">IO::HTML</ulink>
-(https://cpan.metacpan.org/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz">LWP::MediaTypes</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz)</literallayout>
-                  </listitem>
-                  <listitem>
-                    <para>
-                      <xref linkend="perl-try-tiny"/> (for the test suite)
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz">HTTP::Cookies</ulink>
-(https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz)</literallayout>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz">HTTP::Negotiate</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz)</literallayout>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/Net-HTTP-6.18.tar.gz">Net::HTTP</ulink>
-("https://cpan.metacpan.org/authors/id/O/OA/OALDERS/Net-HTTP-6.18.tar.gz)</literallayout>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz">WWW::RobotRules</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz)</literallayout>
-          </listitem>
-          <listitem>
-            <para><xref linkend="perl-http-daemon"/></para>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz">File::Listing</ulink>
-(https://cpan.metacpan.org/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz)</literallayout>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz">Test::RequiresInternet</ulink> (for the test suite)
-(https://cpan.metacpan.org/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz)</literallayout>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-fatal"/> (for the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <para>After the LWP installation, if you want HTTPS protocol support,
-    install <xref linkend="perl-lwp-protocol-https"/></para>
-
-    <!-- Lingua-Translit -->
-    <bridgehead renderas="sect3" id="perl-lingua-translit"
-    xreflabel="Lingua::Translit-&Lingua-Translit-version;">
-    Lingua::Translit-&Lingua-Translit-version; (Lingua::Translit)</bridgehead>
-
-    <indexterm zone="perl-modules perl-lingua-translit">
-      <primary sortas="a-Lingua-Translit">Lingua::Translit</primary>
-    </indexterm>
-
-    <para>
-      Lingua::Translit and its <command>translit</command> program transliterate
-      text between writing systems. This module uses the standard
-      <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <!-- Lingua-Translit -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Lingua-Translit-download-http;">Lingua::Translit-&Lingua-Translit-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Lingua-Translit-download-http;
-MD5 sum: &Lingua-Translit-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- List::AllUtils -->
-    <bridgehead renderas="sect3" id="perl-list-allutils"
-    xreflabel="List::AllUtils-&List-AllUtils-version;">
-    List::AllUtils-&List-AllUtils-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-list-allutils">
-      <primary sortas="a-List-AllUtils">List::AllUtils</primary>
-    </indexterm>
-
-    <para>The List::Allutils module combines List::Util and List::MoreUtils in
-    one bite-sized package. This module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- List-AllUtils -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&List-AllUtils-download-http;">List::AllUtils-&List-AllUtils-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&List-AllUtils-download-http;
-MD5 sum: &List-AllUtils-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz">List::SomeUtils</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz) (for the test suite)</literallayout>
-            <itemizedlist>
-              <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.58.tar.gz">List::SomeUtils::XS</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.58.tar.gz)</literallayout>
-                <itemizedlist>
-                  <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-0.18.tar.gz">Test::LeakTrace</ulink>
-(https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-0.18.tar.gz) (for the test suite)</literallayout>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-              <listitem>
-                <para>
-                  <xref linkend="perl-module-implementation"/>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz">List::UtilsBy</ulink>
-(https://cpan.metacpan.org/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz)</literallayout>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-warnings"/> (for the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- List::MoreUtils -->
-    <bridgehead renderas="sect3" id="perl-list-moreutils"
-    xreflabel="List::MoreUtils-&List-MoreUtils-version;">
-    List::MoreUtils-&List-MoreUtils-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-list-moreutils">
-      <primary sortas="a-List-MoreUtils">List::MoreUtils</primary>
-    </indexterm>
-
-    <para>List::MoreUtils provides the stuff missing in List::Util. This
-    module uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- List-MoreUtils -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&List-MoreUtils-download-http;">List::MoreUtils-&List-MoreUtils-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&List-MoreUtils-download-http;
-MD5 sum: &List-MoreUtils-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz">List::MoreUtils::XS</ulink>
-(https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz)</literallayout>
-          </listitem>
-          <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz">Exporter::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz) (for the test suite)</literallayout>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-
-    <!-- Log::Log4perl -->
-    <bridgehead renderas="sect3" id="perl-log-log4perl"
-    xreflabel="Log::Log4perl-&Log-Log4perl-version;">
-    Log::Log4perl-&Log-Log4perl-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-log-log4perl">
-      <primary sortas="a-Log-Log4perl">Log::Log4perl</primary>
-    </indexterm>
-
-    <para>Log::Log4perl provides a Log4j implementation for
-    <application>perl</application>. This module uses the
-    standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Log-Log4perl -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Log-Log4perl-download-http;">Log::Log4perl-&Log-Log4perl-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Log-Log4perl-download-http;
-MD5 sum: &Log-Log4perl-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- LWP::Protocol::https -->
-    <bridgehead renderas="sect3" id="perl-lwp-protocol-https"
-    xreflabel="LWP::Protocol::https-&LWP-Protocol-https-version;">
-    LWP::Protocol::https-&LWP-Protocol-https-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-lwp-protocol-https">
-      <primary sortas="a-LWP-Protocol-https">LWP::Protocol::https</primary>
-    </indexterm>
-
-    <para>LWP::Protocol::https provides https support for
-    LWP::UserAgent (i.e. for LWP). This module uses the
-    standard <xref linkend="perl-standard-install"/> but requires
-    a patch to use the system certificates (using the CPAN automated
-    install will instead use <application>Mozilla::CA</application>).
-    </para>
-
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/LWP-Protocol-https-&LWP-Protocol-https-version;-system_certs-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    <!-- LWP-Protocol-https -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&LWP-Protocol-https-download-http;">LWP::Protocol::https-&LWP-Protocol-https-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&LWP-Protocol-https-download-http;
-MD5 sum: &LWP-Protocol-https-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="perl-lwp"/></para>
-          </listitem>
-          <listitem>
-            <para><xref linkend="perl-io-socket-ssl"/></para>
-          </listitem>
-          <listitem>
-            <para><xref linkend="make-ca"/> with the
-              <literal>/etc/pki/tls/certs/ca-bundle.crt</literal> symlink
-            </para>
-          </listitem>
-
-<!--      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz">Mozilla::CA</ulink>
-(https://cpan.metacpan.org/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz)</literallayout>
-           </listitem>-->
-
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Module::Build -->
-    <bridgehead renderas="sect3" id="perl-module-build"
-    xreflabel="Module::Build-&Module-Build-version;">
-    Module::Build-&Module-Build-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-module-build">
-      <primary sortas="a-Module-Build">Module-Build</primary>
-    </indexterm>
-
-    <para>
-      Module::Build allows perl modules to be built without a
-      <command>make</command> command being present. This module uses the
-      standard <xref linkend="perl-standard-install"/>.
-   </para>
-
-    <note>
-      <para>
-        When creating the Makefile, this module will report
-<literallayout>inc_bundling_support....disabled
-  requires:
-    ! inc::latest is not installed</literallayout>
-        but inc::latest is experimental and not needed.
-      </para>
-    </note>
-
-    <!-- Module-Build -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Module-Build-download-http;">Module::Build-&Module-Build-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Module-Build-download-http;
-MD5 sum: &Module-Build-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Module::Implementation is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-module-implementation"
-    xreflabel="Module::Implementation">
-    Module::Implementation</bridgehead>
-
-    <indexterm zone="perl-modules perl-module-implementation">
-      <primary sortas="a-Module-Implementation">Module::Implementation</primary>
-    </indexterm>
-
-    <para>Module::Implementation loads one of several alternate underlying
-    implementations of a module (e.g. eXternal Subroutine or pure Perl, or an
-    implementation for a given OS). This module and its dependencies use the
-    standard
-    <xref linkend="perl-standard-install"/> except for those needing
-    <xref linkend="perl-module-build"/>, which use
-    <xref linkend="perl-build-install"/>.</para>
-
-    <!-- Module-Implementation -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz">Module::Implementation</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz)</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-module-runtime"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-try-tiny"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-fatal"/> (for the test suite)
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-requires"/> (for the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Module::Runtime is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-module-runtime"
-    xreflabel="Module::Runtime">
-    Module::Runtime</bridgehead>
-
-    <indexterm zone="perl-modules perl-module-runtime">
-      <primary sortas="a-Module-Runtime">Module::Runtime</primary>
-    </indexterm>
-
-    <para>Module::Runtime provides functions to deal with runtime
-     handling of Perl modules. This module itself uses the
-    <xref linkend="perl-build-install"/>.</para>
-
-    <!-- Module-Runtime -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz">Module::Runtime</ulink>
-(https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz)</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-module-build"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Net::DNS -->
-    <bridgehead renderas="sect3" id="perl-net-dns"
-    xreflabel="Net::DNS-&Net-DNS-version;">
-    Net::DNS-&Net-DNS-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-net-dns">
-      <primary sortas="a-Net-DNS">Net::DNS</primary>
-    </indexterm>
-
-    <para>Net::DNS is a DNS resolver implemented in
-    <application>Perl</application>. It can be used to perform nearly any type
-    of DNS query from a <application>Perl</application> script. The Net::DNS
-    module and all its dependencies are installed using the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Net-DNS -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Net-DNS-download-http;">Net::DNS-&Net-DNS-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Net-DNS-download-http;
-MD5 sum: &Net-DNS-md5sum;</literallayout>
-<!-- Dubious, without a working IPv6 connection, this does not alter the test results,
-  and it is not explicitly referenced in the Net::DNS tarball -->
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz">IO::Socket::INET6</ulink>
-(https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz) (required for IPv6 support)</literallayout>
-            <itemizedlist>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/Socket6-0.28.tar.gz">Socket6</ulink>
-(https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/Socket6-0.28.tar.gz)</literallayout>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Number::Compare is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-number-compare"
-    xreflabel="Number::Compare">
-    Number::Compare</bridgehead>
-
-    <indexterm zone="perl-modules perl-number-compare">
-      <primary sortas="a-Number-Compare">Number::Compare</primary>
-    </indexterm>
-
-    <para>Number::Compare compiles a simple comparison to an anonymous subroutine,
-    which you can call with a value to be tested against. It understands IEC
-    standard magnitudes (k, ki, m, mi, g, gi).  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Number-Compare -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz">Number::Compare</ulink>
-(https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz)</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Parse::Yapp -->
-    <bridgehead renderas="sect3" id="perl-parse-yapp"
-    xreflabel="Parse::Yapp-&Parse-Yapp-version;">
-    Parse::Yapp-&Parse-Yapp-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-parse-yapp">
-      <primary sortas="a-Parse-Yapp">Parse::Yapp</primary>
-    </indexterm>
-
-    <para>Parse::Yapp is a Perl extension for generating and using LALR
-    parsers.. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Parse-Yapp -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Parse-Yapp-download-http;">Parse::Yapp-&Parse-Yapp-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Parse-Yapp-download-http;
-MD5 sum: &Parse-Yapp-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- PerlIO-utf8_strict -->
-    <bridgehead renderas="sect3" id="perl-perlio-utf8_strict"
-    xreflabel="PerlIO::utf8_strict-&PerlIO-utf8_strict-version;">
-    PerlIO::utf8_strict-&PerlIO-utf8_strict-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-perlio-utf8_strict">
-      <primary sortas="a-PerlIO-utf8_strict">PerlIO-utf8_strict</primary>
-    </indexterm>
-
-    <para>PerlIO::utf8_strict provides a fast and correct UTF-8 IO layer,
-    including checking the input for correctness. This module and its dependency
-    modules use the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- PerlIO-utf8_strict -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&PerlIO-utf8_strict-download-http;">PerlIO-utf8_strict-&PerlIO-utf8_strict-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&PerlIO-utf8_strict-download-http;
-MD5 sum: &PerlIO-utf8_strict-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-exception"/> (for the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Regexp::Common -->
-    <bridgehead renderas="sect3" id="perl-regexp-common"
-    xreflabel="Regexp::Common-&Regexp-Common-version;">
-    Regexp::Common-&Regexp-Common-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-regexp-common">
-      <primary sortas="a-Regexp-Common">Regexp::Common</primary>
-    </indexterm>
-
-    <para>Regexp::Common provides commonly requested regular expressions. This
-    module uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Regexp-Common -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Regexp-Common-download-http;">Regexp::Common-&Regexp-Common-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Regexp-Common-download-http;
-MD5 sum: &Regexp-Common-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- SGMLSpm -->
-    <bridgehead renderas="sect3" id="perl-sgmlspm"
-    xreflabel="SGMLSpm-&SGMLSpm-version;">
-    SGMLSpm-&SGMLSpm-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-sgmlspm">
-      <primary sortas="a-SGMLSpm">SGMLSpm</primary>
-    </indexterm>
-
-    <para>The SGMLSpm module is a <application>Perl</application> library
-      used for parsing the output from James Clark's SGMLS and NSGMLS
-      parsers. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- SGMLSpm -->
-    &lfs83_checked;
-
-    <para> Before beginning the build, issue
-      the following command to prevent an error:</para>
-
-<screen><userinput>chmod -v 644 MYMETA.yml</userinput></screen>
-
-    <para>
-      After the package has been installed, run the following command
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput></screen>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&SGMLSpm-download-http;">SGMLSpm-&SGMLSpm-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&SGMLSpm-download-http;
-MD5 sum: &SGMLSpm-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Sort::Key -->
-    <bridgehead renderas="sect3" id="perl-sort-key"
-    xreflabel="Sort::Key-&Sort-Key-version;">
-    Sort::Key-&Sort-Key-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-sort-key">
-      <primary sortas="a-Sort-Key">Sort::Key</primary>
-    </indexterm>
-
-    <para>Sort::Key provides a set of functions to sort lists of values by some
-    calculated key value. This module uses the standard <xref
-    linkend="perl-standard-install"/>.</para>
-
-    <!-- Sort-Key -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Sort-Key-download-http;">Sort::Key-&Sort-Key-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Sort-Key-download-http;
-MD5 sum: &Sort-Key-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Sub::Identify is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-sub-identify"
-    xreflabel="Sub::Identify">
-    Sub::Identify</bridgehead>
-
-    <indexterm zone="perl-modules perl-sub-identify">
-      <primary sortas="a-Sub-Identify">Sub::Identify</primary>
-    </indexterm>
-
-    <para>Sub::Identify allows you to retrieve the real names of code
-    references. It uses the standard <xref
-    linkend="perl-standard-install"/>.</para>
-
-    <!-- Sub-Identify -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz">Sub::Identify</ulink>
-(https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test-Command -->
-    <bridgehead renderas="sect3" id="perl-test-command"
-    xreflabel="Test::Command-&Test-Command-version;">
-    Test::Command-&Test-Command-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-command">
-      <primary sortas="a-Test-Command">Test::Command</primary>
-    </indexterm>
-
-    <para>
-      This module tests the exit status, STDOUT, or STDERR, of an external
-      command. This module uses the standard
-      <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <!-- Test-Command -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Test-Command-download-http;">Test::Command-&Test-Command-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Test-Command-download-http;
-MD5 sum: &Test-Command-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test::Differences -->
-    <bridgehead renderas="sect3" id="perl-test-differences"
-    xreflabel="Test::Differences-&Test-Differences-version;">
-    Test::Differences-&Test-Differences-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-differences">
-      <primary sortas="a-Test-Differences">Test::Differences</primary>
-    </indexterm>
-
-    <para>Test::Differences - Test strings and data structures and show
-    differences if not ok. This module and its dependency modules use the
-    standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Test-Differences -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Test-Differences-download-http;">Test::Differences-&Test-Differences-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Test-Differences-download-http;
-MD5 sum: &Test-Differences-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz">Text::Diff (for the test suite)</ulink>
-(https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz)</literallayout>
-            <itemizedlist>
-              <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz">Algorithm::Diff</ulink>
-(https://cpan.metacpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz)</literallayout>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><xref linkend="perl-capture-tiny"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test::Exception is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-test-exception"
-    xreflabel="Test::Exception">
-    Test::Exception</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-exception">
-      <primary sortas="a-Test-Exception">Test::Exception</primary>
-    </indexterm>
-
-    <para>Test::Exception is used to test exception-based code.
-    This module itself uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Test-Exception -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz">Test::Exception</ulink>
-(https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz)</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz">Sub::Uplevel</ulink>
-(ttps://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz)</literallayout>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test::Fatal is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-test-fatal"
-    xreflabel="Test::Fatal">
-    Test::Fatal</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-fatal">
-      <primary sortas="a-Test-Fatal">Test::Fatal</primary>
-    </indexterm>
-
-    <para>The Test::Fatal module provides simple helpers for testing
-    code which throws exceptions. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Test-Fatal -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz">Test::Fatal</ulink>
-(https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz)</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-try-tiny"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test::Needs is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-test-needs"
-    xreflabel="Test::Needs">
-    Test::Needs</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-needs">
-      <primary sortas="a-Test-Needs">Test::Needs</primary>
-    </indexterm>
-
-    <para>The Test::Needs module skips tests when a module is not available.</para>
-
-    <!-- Test-Needs -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Test-Needs-0.002005.tar.gz">Test::Needs</ulink>
-(https://cpan.metacpan.org/authors/id/H/HA/HAARG/Test-Needs-0.002005.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test::Requires is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-test-requires"
-    xreflabel="Test::Requires">
-    Test::Requires</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-requires">
-      <primary sortas="a-Test-Requires">Test::Requires</primary>
-    </indexterm>
-
-    <para>The Test::Requires module checks if another (optional) module
-    can be loaded, and if not it skips all the current tests. This
-    module uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Test-Requires -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz">Test::Requires</ulink>
-(https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Test::Warnings is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-test-warnings"
-    xreflabel="Test::Warnings">
-    Test::Warnings</bridgehead>
-
-    <indexterm zone="perl-modules perl-test-warnings">
-      <primary sortas="a-Test-Warnings">Test::Warnings</primary>
-    </indexterm>
-
-    <para>The Test::Warnings module tests for warnings
-    and the lack of them. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Test-Warnings -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-0.026.tar.gz">Test::Warnings</ulink>
-(https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-0.026.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Text::BibTeX -->
-    <bridgehead renderas="sect3" id="perl-text-bibtex"
-    xreflabel="Text::BibTeX-&Text-BibTeX-version;">
-    Text::BibTeX-&Text-BibTeX-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-text-bibtex">
-      <primary sortas="a-Text-BibTeX">Text::BibTex</primary>
-    </indexterm>
-
-    <para>Text::BibTeX provides an interface to read and parse
-    <application>BibTeX</application> files. This module uses the
-    <xref linkend="perl-build-install"/>, but except where noted,
-    its dependencies are installed using the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Text-BibTeX -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Text-BibTeX-download-http;">Text::BibTeX-&Text-BibTeX-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Text-BibTeX-download-http;
-MD5 sum: &Text-BibTeX-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/Config-AutoConf-0.317.tar.gz">Config::AutoConf</ulink>
-(https://cpan.metacpan.org/authors/id/R/RE/REHSACK/Config-AutoConf-0.317.tar.gz)</literallayout>
-            <itemizedlist>
-              <listitem>
-                <para><xref linkend="perl-capture-tiny"/></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz">ExtUtils-LibBuilder</ulink>
-(https://cpan.metacpan.org/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz)
-this uses the <xref linkend="perl-build-install"/></literallayout>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <xref linkend="perl-module-build"/>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Text::CSV -->
-    <bridgehead renderas="sect3" id="perl-text-csv"
-    xreflabel="Text::CSV-&Text-CSV-version;">
-    Text::CSV-&Text-CSV-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-text-csv">
-      <primary sortas="a-Text-CSV">Text::CSV</primary>
-    </indexterm>
-
-    <para>Text::CSV is a comma-separated values manipulator, using XS
-    (eXternal Subroutine - for subroutines written in C or C++) or
-    pure perl.  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Text-CSV -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Text-CSV-download-http;">Text::CSV-&Text-CSV-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Text-CSV-download-http;
-MD5 sum: &Text-CSV-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.36.tgz">Text::CSV_XS</ulink>
-(https://cpan.metacpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.36.tgz)</literallayout>
-            <para>
-              This is <emphasis>Recommended</emphasis> by Text-CSV but
-              <emphasis>Required</emphasis> for <xref role="nodep" linkend="biber"/>.
-            </para>
-     <!--   <note> (this was valid up to 1.31, 1.33 extracts fine as .tgz, keep this
-                commented until there has been as series of ok .tag releases)
-              <para>
-                GNU tar dislikes <filename>Text-CSV_XS-1.26.tar.gz</filename>
-                and reports it does not look like a tar file : decompress it
-                with <command>gunzip</command> before extracting it.
-              </para>
-            </note> -->
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Text::Glob is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-text-glob"
-    xreflabel="Text::Glob">
-    Text::Glob</bridgehead>
-
-    <indexterm zone="perl-modules perl-text-glob">
-      <primary sortas="a-Text-Glob">Text::Glob</primary>
-    </indexterm>
-
-    <para>Text::Glob implements glob(3) style matching that can be used to match
-    against text, rather than fetching names from a filesystem. It uses the
-    standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Text-Glob -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz">Text::Glob</ulink>
-(https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Text::Roman -->
-    <bridgehead renderas="sect3" id="perl-text-roman"
-    xreflabel="Text::Roman-&Text-Roman-version;">
-    Text::Roman-&Text-Roman-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-text-roman">
-      <primary sortas="a-Text-Roman">Text::Roman</primary>
-    </indexterm>
-
-    <para>
-      Text::Roman allows conversion between Roman and Arabic algorisms (number
-      systems, e.g. MCMXLV and 1945). This module uses the standard
-      <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <!-- Text-Roman -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Text-Roman-download-http;">Text::Roman-&Text-Roman-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Text-Roman-download-http;
-MD5 sum: &Text-Roman-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Try::Tiny is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-try-tiny"
-    xreflabel="Try::Tiny">
-    Try::Tiny</bridgehead>
-
-    <indexterm zone="perl-modules perl-try-tiny">
-      <primary sortas="a-Try-Tiny">Try::Tiny</primary>
-    </indexterm>
-
-    <para>The Try::Tiny module provides minimal try/catch with
-    proper preservation of $0.  This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Try-Tiny -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz">Try::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz)</literallayout>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Unicode::Collate -->
-    <bridgehead renderas="sect3" id="perl-unicode-collate"
-    xreflabel="Unicode::Collate-&Unicode-Collate-version;">
-    Unicode::Collate-&Unicode-Collate-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-unicode-collate">
-      <primary sortas="a-Unicode-Collate">Unicode::Collate</primary>
-    </indexterm>
-
-    <para>
-      Unicode::Collate provides a Unicode collation algorithm.
-      This module uses the standard <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <!-- Unicode-Collate -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Unicode-Collate-download-http;">Unicode::Collate-&Unicode-Collate-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Unicode-Collate-download-http;
-MD5 sum: &Unicode-Collate-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Unicode::LineBreak -->
-    <bridgehead renderas="sect3" id="perl-unicode-linebreak"
-    xreflabel="Unicode::LineBreak-&Unicode-LineBreak-version;">
-    Unicode::LineBreak-&Unicode-LineBreak-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-unicode-linebreak">
-      <primary sortas="a-Unicode-LineBreak">Unicode::LineBreak</primary>
-    </indexterm>
-
-    <para>Unicode::LineBreak provides a UAX #14 Unicode Line Breaking Algorithm.
-    This module and its dependencies use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- Unicode-LineBreak -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&Unicode-LineBreak-download-http;">Unicode::LineBreak-&Unicode-LineBreak-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&Unicode-LineBreak-download-http;
-MD5 sum: &Unicode-LineBreak-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz">MIME::Charset</ulink>
-(https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz)
-When scripting, pipe the <command>perl Makefile.PL</command> command through <command>yes "" |</command>, since some user input is sought</literallayout>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="wget"/> (to download two files from unicode.org
-              in the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- URI -->
-    <bridgehead renderas="sect3" id="perl-uri"
-    xreflabel="URI-&URI-version;">
-    URI-&URI-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-uri">
-      <primary sortas="a-URI">URI</primary>
-    </indexterm>
-
-    <para>
-      This module implements the URI class. Objects of this class represent
-      "Uniform Resource Identifier references" as specified in RFC 2396 (and
-      updated by RFC 2732). A Uniform Resource Identifier is a compact string of
-      characters that identifies an abstract or physical resource. A Uniform
-      Resource Identifier can be further classified as either a Uniform Resource
-      Locator (URL) or a Uniform Resource Name (URN). The distinction between
-      URL and URN does not matter to the URI class interface. A "URI-reference"
-      is a URI that may have additional information attached in the form of a
-      fragment identifier. This module uses the standard
-      <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <!-- URI -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&URI-download-http;">URI-&URI-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&URI-download-http;
-MD5 sum: &URI-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-test-needs"/> (for the test suite)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- XML::LibXML is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-xml-libxml"
-    xreflabel="XML::LibXML">
-    XML::LibXML</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-libxml">
-      <primary sortas="a-XML-LibXML">XML::LibXML</primary>
-    </indexterm>
-
-    <para>The XML::LibXML is a perl binding for <xref linkend="libxml2"/>.
-    This module uses the standard <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <para>Upstream blacklists the current version of <xref linkend="libxml2"/>
-    on the grounds of "schema regression" and the build will warn that the
-    version of libxml2 is incompatible, but it appears to work.</para>
-
-    <!-- XML-LibXML -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz">XML::LibXML</ulink>
-(https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz">XML::LibXML)</literallayout>
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="perl-xml-sax"/></para>
-          </listitem>
-          <listitem>
-            <para><xref linkend="libxml2"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- XML::LibXML::Simple -->
-    <bridgehead renderas="sect3" id="perl-xml-libxml-simple"
-    xreflabel="XML::LibXML::Simple-&XML-LibXML-Simple-version;">
-    XML::LibXML::Simple-&XML-LibXML-Simple-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-libxml-simple">
-      <primary sortas="a-XML-LibXML-Simple">XML::LibXML::Simple</primary>
-    </indexterm>
-
-    <para>The XML::LibXML::Simple module is a rewrite of XML::Simple to use the
-    XML::LibXML parser for XML structures,instead of the plain
-    <application>Perl</application> or SAX parsers.
-    This module and all dependency modules use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- XML-LibXML-Simple -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&XML-LibXML-Simple-download-http;">XML::LibXML::Simple-&XML-LibXML-Simple-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&XML-LibXML-Simple-download-http;
-MD5 sum: &XML-LibXML-Simple-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-xml-libxml"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- XML::LibXSLT -->
-    <bridgehead renderas="sect3" id="perl-xml-libxslt"
-    xreflabel="XML::LibXSLT-&XML-LibXSLT-version;">
-    XML::LibXSLT-&XML-LibXSLT-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-libxslt">
-      <primary sortas="a-XML-LibXSLT">XML::LibXSLT</primary>
-    </indexterm>
-
-    <para>The XML::LibXSLT module provides an interface to
-    <application>libxslt</application>. This module uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- XML-LibXSLT -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&XML-LibXSLT-download-http;">XML::LibXSLT-&XML-LibXSLT-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&XML-LibXSLT-download-http;
-MD5 sum: &XML-LibXSLT-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-xml-libxml"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="libxslt"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- XML::SAX is a dependency of multiple modules on this page
-         but it is not linked from other pages, so only give minimal details -->
-
-    <bridgehead renderas="sect3" id="perl-xml-sax"
-    xreflabel="XML::SAX">
-    XML::SAX</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-sax">
-      <primary sortas="a-XML-SAX">XML::SAX</primary>
-    </indexterm>
-
-    <para>XML::SAX provides a simple API for XML.
-    This module uses the standard <xref linkend="perl-standard-install"/>.
-    </para>
-
-    <para>Note: this module does not support parallel builds.</para>
-
-    <!-- XML-SAX -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz">XML::SAX</ulink>
-(https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz)</literallayout>
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="libxml2"/></para>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz">XML::NamespaceSupport</ulink>
-(https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz)</literallayout>
-          </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz">XML::SAX::Base</ulink>
-(https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz)</literallayout>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- XML::Simple -->
-    <bridgehead renderas="sect3" id="perl-xml-simple"
-    xreflabel="XML::Simple-&XML-Simple-version;">
-    XML::Simple-&XML-Simple-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-simple">
-      <primary sortas="a-XML-Simple">XML::Simple</primary>
-    </indexterm>
-
-    <para>The XML::Simple module is a <application>Perl</application> extension
-    that provides an easy API to read and write XML (especially config files).
-    This module and all dependency modules use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- XML-Simple -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&XML-Simple-download-http;">XML::Simple-&XML-Simple-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&XML-Simple-download-http;
-MD5 sum: &XML-Simple-md5sum;</literallayout>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="perl-xml-sax"/> (optional)</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <!-- XML::Writer -->
-    <bridgehead renderas="sect3" id="perl-xml-writer"
-    xreflabel="XML::Writer-&XML-Writer-version;">
-    XML::Writer-&XML-Writer-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-xml-writer">
-      <primary sortas="a-XML-Writer">XML::Writer</primary>
-    </indexterm>
-
-    <para>XML::Writer provides a <application>Perl</application>
-    extension for writing XML documents. This
-    module uses the standard <xref linkend="perl-standard-install"/>.</para>
-
-    <!-- XML-Writer -->
-    &lfs83_checked;
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="&XML-Writer-download-http;">XML::Writer-&XML-Writer-version;</ulink>
-        </para>
-      </listitem>
-      <listitem>
-<literallayout>&XML-Writer-download-http;
-MD5 sum: &XML-Writer-md5sum;</literallayout>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation" id="perl-standard-install"
-  xreflabel="build and installation instructions">
-    <title>Standard Installation of Perl Modules</title>
-
-    <para>Install <application>Perl</application> modules by running the
-    following commands:</para>
-
-    <para>For <xref linkend="perl-lwp-protocol-https"/>, first apply the required
-    patch with:</para>
-
-<screen><userinput>patch -Np1 -i ../LWP-Protocol-https-&LWP-Protocol-https-version;-system_certs-1.patch</userinput></screen>
-
-    <para>Then, or for all other modules using the standard installation, proceed
-    with:</para>
-
-<screen><userinput>perl Makefile.PL &amp;&amp;
-make &amp;&amp;
-make test</userinput></screen>
-
-    <note>
-      <para>If the module is described as using the <emphasis>unsafe</emphasis>
-      variant of the Standard Installation, and you are using
-      <application>perl-5.26.0</application> or later, (the use of the current
-      directory in <literal>@INC</literal> was removed for security reasons)
-      you should change the perl invocation to:</para>
-
-<screen><userinput>PERL_USE_UNSAFE_INC=1 &amp;&amp;</userinput></screen>
-
-      <para>If, however, you are using the Auto Installation described below,
-      that environment variable will be set whenever the <command>cpan</command>
-      shell <command>install</command> is used.</para>
-    </note>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note>
-      <para>When reinstalling a <application>Perl</application> module,
-      sometimes older versions of the module being reinstalled are in other
-      directories specified in <parameter>@INC</parameter>.  To delete all
-      other versions of the module being reinstalled (not simply older ones)
-      set the <varname>UNINST</varname> variable:</para>
-
-<screen><userinput>make install UNINST=1</userinput></screen>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation" id="perl-build-install"
-  xreflabel="instructions for packages using Build.PL">
-    <title>Installation of Perl Modules which use Build.PL</title>
-
-    <para>Install <application>Perl</application> modules which use
-    Build.PL by running the following commands:</para>
-
-<screen><userinput>perl Build.PL &amp;&amp;
-./Build &amp;&amp;
-./Build test</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>./Build install</userinput></screen>
-
-<!-- following not tested
-    <note>
-      <para>When reinstalling a <application>Perl</application> module,
-      sometimes older versions of the module being reinstalled are in other
-      directories specified in <parameter>@INC</parameter>.  To delete all
-      other versions of the module being reinstalled (not simply older ones)
-      set the <varname>UNINST</varname> variable:</para>
-
-<screen><userinput>./Build install UNINST=1</userinput></screen>
-    </note> -->
-
-  </sect2>
-
-  <sect2 role="installation" id="perl-auto-install"
-  xreflabel="alternate auto installation instructions">
-    <title>(Alternate) Auto Installation of Perl Modules.</title>
-
-    <para>There is an alternate way of installing the modules using the
-    <command>cpan</command> shell <command>install</command> command. The
-    command automatically downloads the source from the CPAN archive, extracts
-    it, runs the compilation, testing and installation commands mentioned
-    above, and removes the build source tree. You may still need to install
-    dependent library packages before running the automated installation
-    method.</para>
-
-    <para>The first time you run <command>cpan</command>, you'll be prompted
-    to enter some information regarding download locations and methods. This
-    information is retained in files located in
-    <filename class='directory'>~/.cpan</filename>. Start the
-    <command>cpan</command> shell by issuing '<command>cpan</command>' as the
-    <systemitem class="username">root</systemitem> user. Any module may now be
-    installed from the
-    <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
-    prompt with the command:</para>
-
-<screen role="root"><userinput>install <replaceable>&lt;Module::Name&gt;</replaceable></userinput></screen>
-
-    <para>For additional commands and help, issue '<command>help</command>'
-    from the
-    <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
-    prompt.</para>
-
-    <para>Alternatively, for scripted or non-interactive installations, use the
-    following syntax as the
-    <systemitem class="username">root</systemitem> user to install one or more
-    modules:</para>
-
-<screen role="root"><userinput>cpan -i <replaceable>&lt;Module1::Name&gt; &lt;Module2::Name&gt;</replaceable></userinput></screen>
-
-    <para>Review the <filename>cpan.1</filename> man page for additional
-    parameters you can pass to <command>cpan</command> on the command
-    line.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>
-      Most of these modules only install into the perl directories, but a
-      few will also install programs (mostly, perl scripts), or even a library,
-      into <filename class="directory">/usr</filename>
-    </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-
-      <seglistitem>
-        <seg> <!-- Use emphasis to highlight the relevant module name.
-                   Our setup actually uses italic to do this. -->
-          <emphasis>Archive::Zip:</emphasis> crc32
-          <emphasis>File::Find::Rule:</emphasis> findrule
-          <emphasis>libwww-perl:</emphasis> lwp-download, lwp-dump, lwp-mirror, lwp-request
-          <emphasis>Lingua::Translit:</emphasis> translit
-          <emphasis>Log::Log4perl:</emphasis> l4p-tmpl
-          <emphasis>Module::Build</emphasis> config_data
-          <emphasis>Parse::Yapp</emphasis> yapp
-      <!--<emphasis>Test::Pod::Coverage:</emphasis> pod_cover-->
-          <emphasis>Text::BibTeX:</emphasis> biblex, bibparse, dumpnames
-        </seg>
-        <seg>
-          <emphasis>Text::BibTeX:</emphasis> libbtparse.so
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="crc32">
-        <term><command>crc32</command></term>
-        <listitem>
-          <para>computes and prints to stdout the CRC-32 values of the
-          given files.</para>
-          <indexterm zone="perl-modules crc32">
-            <primary sortas="b-crc32">crc32</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="findrule">
-        <term><command>findrule</command></term>
-        <listitem>
-          <para>is a command line wrapper to File:Find:Rule.</para>
-          <indexterm zone="perl-modules findrule">
-            <primary sortas="b-findrule">findrule</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lwp-download">
-        <term><command>lwp-download</command></term>
-        <listitem>
-          <para>is a script to fetch a large file from the web.</para>
-          <indexterm zone="perl-modules lwp-download">
-            <primary sortas="b-lwp-download">lwp-download</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lwp-dump">
-        <term><command>lwp-dump</command></term>
-        <listitem>
-          <para>is used to see what headers and content is returned for a URL.</para>
-          <indexterm zone="perl-modules lwp-dump">
-            <primary sortas="b-lwp-dump">lwp-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lwp-mirror">
-        <term><command>lwp-mirror</command></term>
-        <listitem>
-          <para>is a simple mirror utility.</para>
-          <indexterm zone="perl-modules lwp-mirror">
-            <primary sortas="b-lwp-mirror">lwp-mirror</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lwp-request">
-        <term><command>lwp-request</command></term>
-        <listitem>
-          <para>is a simple command line user agent.</para>
-          <indexterm zone="perl-modules lwp-request">
-            <primary sortas="b-lwp-request">lwp-request</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="translit">
-        <term><command>translit</command></term>
-        <listitem>
-          <para>transliterates text between writing systems using
-          various standards.</para>
-          <indexterm zone="perl-modules translit">
-            <primary sortas="b-translit">translit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="l4p-templ">
-        <term><command>l4p-templ</command></term>
-        <listitem>
-          <para>prints out the text of a template Log4perl configuration for
-          starting a new Log4perl configuration file.</para>
-          <indexterm zone="perl-modules l4p-templ">
-            <primary sortas="b-l4p-templ">l4p-templ</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config_data">
-        <term><command>config_data</command></term>
-        <listitem>
-          <para>is used to query or change the configuration of perl modules.
-          </para>
-          <indexterm zone="perl-modules config_data">
-            <primary sortas="b-config_data">config_data</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yapp">
-        <term><command>yapp</command></term>
-        <listitem>
-          <para>is a frontend to the Parse::Yapp module, which lets you create
-          a Perl OO parser from an input grammar file.</para>
-          <indexterm zone="perl-modules yapp">
-            <primary sortas="b-yapp">yapp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-  <!--<varlistentry id="pod_cover">
-        <term><command>pod_cover</command></term>
-        <listitem>
-          <para>is used to get a coverage analysis of the embedded documentation
-          in a perl module.</para>
-          <indexterm zone="perl-modules pod_cover">
-            <primary sortas="b-pod_cover">pod_cover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="biblex">
-        <term><command>biblex</command></term>
-        <listitem>
-          <para>performs lexical analysis on a BibTeX file.</para>
-          <indexterm zone="perl-modules biblex">
-            <primary sortas="b-biblex">biblex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bibparse">
-        <term><command>bibparse</command></term>
-        <listitem>
-          <para>parses a series of BibTeX files with command line options to
-          control the string post-processing behaviour.</para>
-          <indexterm zone="perl-modules bibparse">
-            <primary sortas="b-bibparse">bibparse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpnames">
-        <term><command>dumpnames</command></term>
-        <listitem>
-          <para>parses a BibTeX file, splitting 'author' and 'editor' fields
-          into lists of names, and then dumps everything to stdout.</para>
-          <indexterm zone="perl-modules dumpnames">
-            <primary sortas="b-dumpnames">dumpnames</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbtparse">
-        <term><filename class='libraryfile'>libbtparse.so</filename></term>
-        <listitem>
-          <para>is a library for parsing and processing BibTeX data files.</para>
-          <indexterm zone="perl-modules libbtparse">
-            <primary sortas="c-libbtparse">libbtparse.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/perl-package-deprecationmanager.xml
===================================================================
--- archive/perl-package-deprecationmanager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,71 +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;/D/DR/DROLSKY/Package-DeprecationManager-&Package-DeprecationManager-version;.tar.gz">
-  <!ENTITY my-md5sum "7b46e92aaae3047ede3c67c1714ab88e">
-
-]>
-
-  <!-- Begin Package::DeprecationManager -->
-  <sect2 id="perl-package-deprecationmanager" xreflabel="Package-DeprecationManager-&Package-DeprecationManager-version;">
-
-    <title>Package::DeprecationManager-&Package-DeprecationManager-version;</title>
-
-    <indexterm zone="perl-package-deprecationmanager">
-      <primary sortas="a-Package-DeprecationManager">Package::DeprecationManager</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Package::DeprecationManager</title>
-
-      <para>
-        Package::DeprecationManager allows you to manage a set of deprecations
-        for one or more modules.
-      </para>
-
-      &lfs84_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>
-
-      <bridgehead renderas="sect4">Package::DeprecationManager Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-package-stash"/>,
-        <xref linkend="perl-params-util"/>,
-        <xref linkend="perl-sub-install"/> and
-        <xref linkend="perl-sub-name"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Package::DeprecationManager</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-params-util.xml
===================================================================
--- archive/perl-params-util.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +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;/A/AD/ADAMK/Params-Util-&Params-Util-version;.tar.gz">
-  <!ENTITY my-md5sum "02db120c0eef87aae1830cc62bdec37b">
-
-]>
-
-  <!-- Begin Params::Util -->
-  <sect2 id="perl-params-util" xreflabel="Params-Util-&Params-Util-version;">
-
-    <title>Params::Util-&Params-Util-version;</title>
-
-    <indexterm zone="perl-params-util">
-      <primary sortas="a-Params-Util">Params::Util</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Params::Util</title>
-
-      <para>
-        Params::Util provides simple, compact and correct parameter-checking
-        functions.
-      </para>
-
-      &lfs84_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 Params::Util</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-scalar-list-utils.xml
===================================================================
--- archive/perl-scalar-list-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 "2e9e72dab0a3171be207117b70bb9e58">
-
-]>
-
-  <!-- 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>
-
-      &lfs111_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: chive/perl-sub-info.xml
===================================================================
--- archive/perl-sub-info.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/EX/EXODIST/Sub-Info-&Sub-Info-version;.tar.gz">
-  <!ENTITY my-md5sum "335345b534fc0539c894050f7814cbda">
-
-]>
-
-  <!-- Begin Sub::Info -->
-  <sect2 id="perl-sub-info" xreflabel="Sub-Info-&Sub-Info-version;">
-
-    <title>Sub::Info-&Sub-Info-version;</title>
-
-    <indexterm zone="perl-sub-info">
-      <primary sortas="a-Sub-Info">Sub::Info</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Info</title>
-
-      <para>
-        Sub::Info is a tool for inspecting subroutines.
-      </para>
-
-      &lfs121_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 Sub::Info</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-sub-install.xml
===================================================================
--- archive/perl-sub-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +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;/R/RJ/RJBS/Sub-Install-&Sub-Install-version;.tar.gz">
-  <!ENTITY my-md5sum "e1ce4f9cb6b2f6b8778b036c31afa5ab">
-
-]>
-
-  <!-- Begin Sub::Install -->
-  <sect2 id="perl-sub-install" xreflabel="Sub-Install-&Sub-Install-version;">
-
-    <title>Sub::Install-&Sub-Install-version;</title>
-
-    <indexterm zone="perl-sub-install">
-      <primary sortas="a-Sub-Install">Sub::Install</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Install</title>
-
-      <para>
-        Sub::Install makes it easy to install subroutines into packages.
-      </para>
-
-      &lfs84_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 Sub::Install</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-sub-name.xml
===================================================================
--- archive/perl-sub-name.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +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;/E/ET/ETHER/Sub-Name-&Sub-Name-version;.tar.gz">
-  <!ENTITY my-md5sum "7e7a181e30b3249d0b81585f55e36621">
-
-]>
-
-  <!-- Begin Sub::Name -->
-  <sect2 id="perl-sub-name" xreflabel="Sub-Name-&Sub-Name-version;">
-
-    <title>Sub::Name-&Sub-Name-version;</title>
-
-    <indexterm zone="perl-sub-name">
-      <primary sortas="a-Sub-Name">Sub::Name</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Name</title>
-
-      <para>
-        Sub::Name assigns a new name to a referenced subroutine.
-      </para>
-
-      &lfs84_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 Sub::Name</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-super.xml
===================================================================
--- archive/perl-super.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +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;/C/CH/CHROMATIC/SUPER-&SUPER-version;.tar.gz">
-  <!ENTITY my-md5sum "defb371225f8ef1581d8c8fcc6077b46">
-
-]>
-
-  <!-- Begin SUPER -->
-  <sect2 id="perl-super" xreflabel="SUPER-&SUPER-version;">
-
-    <title>SUPER-&SUPER-version;</title>
-
-    <indexterm zone="perl-super">
-      <primary sortas="a-SUPER">SUPER</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to SUPER</title>
-
-      <para>
-        SUPER provides easier methods to dispatch control to the superclass
-        (when subclassing a class).
-      </para>
-
-      &lfs113_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>
-
-      <bridgehead renderas="sect4">SUPER Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-sub-identify"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of SUPER</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-test-mockmodule.xml
===================================================================
--- archive/perl-test-mockmodule.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,68 +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;/G/GF/GFRANKS/Test-MockModule-&Test-MockModule-version;.tar.gz">
-  <!ENTITY my-md5sum "f36bd9aee0349430c434dc1d06b03589">
-
-]>
-
-  <!-- Begin Test::MockModule -->
-  <sect2 id="perl-test-mockmodule" xreflabel="Test-MockModule-&Test-MockModule-version;">
-
-    <title>Test::MockModule-&Test-MockModule-version;</title>
-
-    <indexterm zone="perl-test-mockmodule">
-      <primary sortas="a-Test-MockModule">Test::MockModule</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::MockModule</title>
-
-      <para>
-        Test::MockModule lets you temporarily redefine subroutines in other
-        packages for the purposes of unit testing.
-      </para>
-
-      &lfs113_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>
-
-      <bridgehead renderas="sect4">Test::MockModule Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-build"/> and
-        <xref linkend="perl-super"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::MockModule</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-test-simple.xml
===================================================================
--- archive/perl-test-simple.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,60 +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;
-
- <!-- despite the Test:: name, this provides Test2:: modules such as Test2::API
-      as well as Test:: modules  -->
-  <!ENTITY my-download-http "&metacpan_authors;/E/EX/EXODIST/Test-Simple-&Test-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "8a14b307496794039ca46e56d75b3a12">
-
-]>
-
-  <!-- Begin Test::Simple -->
-  <sect2 id="perl-test-simple" xreflabel="Test-Simple-&Test-Simple-version;">
-
-    <title>Test::Simple-&Test-Simple-version;</title>
-
-    <indexterm zone="perl-test-simple">
-      <primary sortas="a-Test-Simple">Test::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Simple</title>
-
-      <para>
-        Test::Simple provides basic utilities for writing tests.
-      </para>
-
-      &lfs90_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 Test::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        Unusually, this distribution installs both Test:: and Test2:: modules.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: chive/perl-xml-sax-expat.xml
===================================================================
--- archive/perl-xml-sax-expat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +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;/B/BJ/BJOERN/XML-SAX-Expat-&XML-SAX-Expat-version;.tar.gz">
-  <!ENTITY my-md5sum "74c540095d84e3f054d1f8703a73ef76">
-
-]>
-
-  <!-- Begin XML::SAX::Expat -->
-  <sect2 id="perl-xml-sax-expat" xreflabel="XML-SAX-Expat-&XML-SAX-Expat-version;">
-
-    <title>XML::SAX::Expat-&XML-SAX-Expat-version;</title>
-
-    <indexterm zone="perl-xml-sax-expat">
-      <primary sortas="a-XML-SAX-Expat">XML::SAX::Expat</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::SAX::Expat</title>
-
-      <para>
-        XML::SAX::Expat is an implementation of a SAX2 driver sitting on top of
-        Expat (XML::Parser).
-      </para>
-
-      &lfs91_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>
-
-      <bridgehead renderas="sect4">XML::SAX::Expat Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-xml-sax"/>
-        <!-- perl-xml-sax pulls in perl-xml-namespacesupport and
-             perl-xml-sax-base -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::SAX::Expat</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: chive/phonon-backend-gstreamer.xml
===================================================================
--- archive/phonon-backend-gstreamer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +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 phonon-backend-gstreamer-download-http "&kde-download-http;phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
-  <!ENTITY phonon-backend-gstreamer-download-ftp  " ">
-  <!ENTITY phonon-backend-gstreamer-md5sum        "60abf634e961160cd1772d486f4a7097">
-  <!ENTITY phonon-backend-gstreamer-size          "100 KB">
-  <!ENTITY phonon-backend-gstreamer-buildsize     "7.2 MB">
-  <!ENTITY phonon-backend-gstreamer-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="phonon-backend-gstreamer" xreflabel="phonon-backend-gstreamer-&phonon-backend-gstreamer-version;">
-  <?dbhtml filename="phonon-backend-gstreamer.html"?>
-
-
-  <title>Phonon-backend-gstreamer-&phonon-backend-gstreamer-version;</title>
-
-  <indexterm zone="phonon-backend-gstreamer">
-    <primary sortas="a-phonon-backend-gstreamer">phonon-backend-gstreamer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Phonon-backend-gstreamer</title>
-
-    <para>
-      This package provides a <application>Phonon</application> backend
-      which utilizes the <application>GStreamer</application> media framework.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&phonon-backend-gstreamer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&phonon-backend-gstreamer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &phonon-backend-gstreamer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &phonon-backend-gstreamer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &phonon-backend-gstreamer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &phonon-backend-gstreamer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Phonon-backend-gstreamer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="gstreamer10"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="phonon"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="gst10-plugins-base"/> (needed for output to ALSA),
-    <xref linkend="gst10-plugins-good"/> (needed for output to PulseAudio),
-    <xref linkend="gst10-plugins-bad"/>  (needed for AAC/M4A support), and
-    <xref linkend="gst10-plugins-ugly"/> (needed for MP3 support)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Phonon-backend-gstreamer</title>
-
-    <para>
-      Install <application>Phonon-backend-gstreamer</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     \
-      .. &amp;&amp;
-make</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>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply higher level of compiler optimizations.
-    </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>phonon_gstreamer.so</seg>
-        <seg>/usr/lib/plugins/phonon4qt5_backend</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-phonon">
-        <term><command>phonon</command></term>
-        <listitem>
-          <para>
-            is placeholder.
-          </para>
-          <indexterm zone="a-phonon phonon">
-            <primary sortas="b-phonon">phonon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: chive/pilot-link.xml
===================================================================
--- archive/pilot-link.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 pilot-link-download-http "http://downloads.pilot-link.org/pilot-link-&pilot-link-version;.tar.bz2">
-  <!ENTITY pilot-link-download-ftp  "&gentoo-ftp-repo;/pilot-link-&pilot-link-version;.tar.bz2">
-  <!ENTITY pilot-link-md5sum        "c1f4db8f32a2ee916fedb9a2dac8aa26">
-  <!ENTITY pilot-link-size          "964 KB">
-  <!ENTITY pilot-link-buildsize     "20 MB">
-  <!ENTITY pilot-link-time          "0.4 SBU">
-]>
-
-<sect1 id="pilot-link" xreflabel="pilot-link-&pilot-link-version;">
-  <?dbhtml filename="pilot-link.html"?>
-
-
-  <title>pilot-link-&pilot-link-version;</title>
-
-  <indexterm zone="pilot-link">
-    <primary sortas="a-Pilot-link">Pilot-link</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pilot-link</title>
-
-    <para>The <application>pilot-link</application> package provides a suite of
-    tools containing a series of conduits, libraries, and language bindings for
-    moving information to and from your Palm device and your desktop or
-    server/workstation system, as well as across a network.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pilot-link-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pilot-link-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pilot-link-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pilot-link-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pilot-link-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pilot-link-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/pilot-link-&pilot-link-version;-bindings_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pilot-link Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpng"/>,
-    <xref linkend="popt"/>,
-    <xref linkend="libusb-compat"/>,
-    <xref linkend="openjdk"/>, <!-- or <xref linkend="jdk"/>, -->
-    <xref linkend="tcl"/>,
-    <xref linkend="python2"/>,
-    <ulink url="http://www.bluez.org/">BlueZ</ulink>, and
-    <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pilot-link"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="pilot-link-kernel">
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="pilot-link pilot-link-kernel">
-      <primary sortas="d-USB-Palm-devices">USB Palm devices</primary>
-    </indexterm>
-
-    <para>You may need to configure the <quote>USB_SERIAL_VISOR</quote> device
-    into the kernel before your system can communicate with your Palm device.
-    Add this device by enabling the following kernel parameter setting and
-    rebuilding the kernel (and modules, if applicable):</para>
-
-<screen><literal>Device Drivers:
-  USB support:
-    USB Serial Converter support:
-      USB Handspring Visor / Palm m50x / Sony Client Driver</literal></screen>
-
-    <para>For additional information about connecting your USB Palm device,
-    see: <ulink url="http://www.pilot-link.org/README.usb"/>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pilot-link</title>
-
-    <para>Install <application>pilot-link</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../pilot-link-&pilot-link-version;-bindings_fix-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --enable-threads \
-            --enable-conduits \
-            --with-perl &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/pilot-link-&pilot-link-version; &amp;&amp;
-install -v -m644 README doc/{README.*,TODO,CodingGuidelines} \
-                    /usr/share/doc/pilot-link-&pilot-link-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--enable-threads</parameter>: This parameter is required
-    to link the threading library into the build.</para>
-
-    <para><parameter>--enable-conduits</parameter>: This parameter is required
-    to build the userspace programs. Omit it if you only need the
-    <application>pilot-link</application> libraries.</para>
-
-    <para><parameter>--with-perl</parameter>: This parameter is required to
-    build the <application>Perl</application> bindings.</para>
-
-    <para><option>--with-java --with-tcl=/usr/lib
-    --with-python</option>: Use any or all of these options to enable the
-    respective language bindings desired.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Bindings</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-    <seglistitem>
-      <seg>pilot-650foto, pilot-addresses, pilot-clip, pilot-csd,
-      pilot-debugsh, pilot-dedupe, pilot-dlpsh, pilot-file, pilot-foto,
-      pilot-getram, pilot-getrom, pilot-getromtoken, pilot-hinotes,
-      pilot-ietf2datebook, pilot-install-datebook, pilot-install-expenses,
-      pilot-install-hinote, pilot-install-memo, pilot-install-netsync,
-      pilot-install-todo, pilot-install-todos, pilot-install-user,
-      pilot-memos, pilot-nredir, pilot-read-expenses, pilot-read-ical,
-      pilot-read-notepad, pilot-read-palmpix, pilot-read-screenshot,
-      pilot-read-todos, pilot-read-veo, pilot-reminders, pilot-schlep,
-      pilot-sync-plan, pilot-treofoto, pilot-undelete, pilot-wav,
-      pilot-xfer and optionally, pitclsh</seg>
-      <seg>libjpisock.so JDK library,
-      libpitcl.{so,a} <application>Tcl</application> library,
-      _pisock.so <application>Python</application> module and
-      Pilot.so <application>Perl</application> module</seg>
-      <seg>/usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/auto/PDA,
-      /usr/share/doc/pilot-link-0.12.2 and/usr/share/pilot-link</seg>
-    </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pilot-link-programs">
-        <term><command>pilot-link programs and utilities</command></term>
-        <listitem>
-          <para>Describing the functionality of each
-          <application>pilot-link</application> program and utility would take several
-          pages. Instead, after you've installed the package, review the
-          <application>pilot-link</application> man page
-          (<command>man pilot-link</command>). If you wish to review before installing
-          the package, unpack the tarball and issue
-          <command>man doc/man/pilot-link.7.in</command>.</para>
-          <indexterm zone="pilot-link pilot-link-programs">
-            <primary sortas="b-pilot-link-programs">pilot-link programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/pine.xml
===================================================================
--- archive/pine.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,277 +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 pine-download-http "http://mirror.sit.wisc.edu/pub/net/mail/pine/pine&pine-version;.tar.bz2">
-  <!ENTITY pine-download-ftp  "ftp://ftp.cac.washington.edu/pine/pine&pine-version;.tar.bz2">
-  <!ENTITY pine-md5sum        "39ca07b3d305b4cd0d6aaf4585123275">
-  <!ENTITY pine-size          "3.0 MB">
-  <!ENTITY pine-buildsize     "64 MB">
-  <!ENTITY pine-time          "0.6 SBU">
-]>
-
-<sect1 id="pine" xreflabel="Pine-&pine-version;">
-  <?dbhtml filename="pine.html"?>
-
-
-  <title>Pine-&pine-version;</title>
-
-  <indexterm zone="pine">
-    <primary sortas="a-Pine">Pine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pine</title>
-
-    <para>The <application>Pine</application> package contains the
-    <application>Pine</application> Mail User Agent and several
-    server daemons for various mail protocols, in addition to some nice
-    file and directory editing/browsing programs.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pine-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pine-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pine-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pine-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pine-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pine-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended Patch: <ulink
-        url="&patch-root;/pine-&pine-version;-utf8-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/> and <xref linkend="mitkrb"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pine"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pine</title>
-
-    <para>Install <application>Pine</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../pine-&pine-version;-utf8-1.patch &amp;&amp;
-sed -i "s@/usr/local/lib/pine@/etc/pine@g" \
-    $(grep -lr /usr/local/lib/pine *) &amp;&amp;
-./build DEBUG=-O MAILSPOOL=/var/mail \
-    SSLDIR=/usr SSLCERTS=/etc/ssl/certs slx</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>install -v -m644 doc/*.1 /usr/share/man/man1 &amp;&amp;
-install -v -p -m644 doc/tech-notes/*.html /usr/share/doc/pine&pine-version; &amp;&amp;
-install -v -m755 \
-bin/{pine,imapd,ipop2d,ipop3d,mailutil,mtest,pico,pilot,rpdump,rpload} \
-    /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>patch -Np1 -i ../pine-&pine-version;-utf8-1.patch</command>:
-    This patch enables Pine UTF-8 and charset conversion.</para>
-
-    <para><command>sed -i "s@/usr/ ... /lib/pine *)</command>: This
-    <command>sed</command> will make <application>Pine</application> use <filename
-    class="directory">/etc</filename> for configuration files. It also alters
-    the documentation to reflect that.</para>
-
-    <para>The build procedure for <application>Pine</application> is somewhat
-    unusual, in that options usually passed as <command>./configure</command>
-    options or housed in $<envar>CFLAGS</envar> must all be passed on the command
-    line to the <command>./build</command> script.</para>
-
-    <para><command>./build slx</command>: <application>Pine</application> offers
-    quite a few target platforms, slx specifies Linux using
-    <option>-lcrypt</option> to get the crypt function.  See the
-    <filename>doc/pine-ports</filename> file for more information and
-    other authentication options.</para>
-
-    <para><command>DEBUG=-O</command>: This flag compiles an optimized
-    version of <command>pine</command> and <command>pico</command> that
-    produces no debug files.</para>
-
-    <para><command>MAILSPOOL=/var/mail</command>: Location of mail spool
-    files, <filename class="directory">/var/mail</filename>.</para>
-
-    <para><command>SSLDIR=/usr SSLCERTS=/etc/ssl/certs</command>: Location
-    of <application>OpenSSL</application> files.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Pine</title>
-
-    <sect3 id="pine-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.pinerc</filename></para>
-
-      <indexterm zone="pine pine-config">
-        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The <command>pine</command> executable needs no global configuration to
-      use.  Users set <application>Pine</application> options in
-      <filename>~/.pinerc</filename> using an internal configuration menu.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>imapd, ipop2d, ipop3d, mtest, pico, pilot, pine, rpdump, and rpload</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/pine&pine-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="imapd-pine">
-        <term><command>imapd</command></term>
-        <listitem>
-          <para>is the IMAP server daemon.</para>
-          <indexterm zone="pine imapd-pine">
-            <primary sortas="b-pine">pine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipop2d">
-        <term><command>ipop2d</command></term>
-        <listitem>
-          <para>is an IMAP to POP2 conversion server.</para>
-          <indexterm zone="pine ipop2d">
-            <primary sortas="b-ipop2d">ipop2d</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipop3d">
-        <term><command>ipop3d</command></term>
-        <listitem>
-          <para>is an IMAP to POP3 conversion server.</para>
-          <indexterm zone="pine ipop3d">
-            <primary sortas="b-ipop3d">ipop3d</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mtest">
-        <term><command>metest</command></term>
-        <listitem>
-          <para>is a minimal IMAP mail user agent, used for debugging.</para>
-          <indexterm zone="pine mtest">
-            <primary sortas="b-mtest">mtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pico-pine">
-        <term><command>pico</command></term>
-        <listitem>
-          <para>is a stand-alone editor, similar to the
-          <application>Pine</application> internal message composer.</para>
-          <indexterm zone="pine pico-pine">
-            <primary sortas="b-pico">pico</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pilot">
-        <term><command>pilot</command></term>
-        <listitem>
-          <para>is a file and directory navigator and browser.</para>
-          <indexterm zone="pine pilot">
-            <primary sortas="b-pilot">pilot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pine-prog">
-        <term><command>pine</command></term>
-        <listitem>
-          <para>is the <application>Pine</application> mail user agent.</para>
-          <indexterm zone="pine pine-prog">
-            <primary sortas="b-pine">pine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpdump">
-        <term><command>rpdump</command></term>
-        <listitem>
-          <para>is used to copy data from remote <application>Pine</application>
-          configuration files or address books into a local file.</para>
-          <indexterm zone="pine rpdump">
-            <primary sortas="b-rpdump">rpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpload">
-        <term><command>rpload</command></term>
-        <listitem>
-          <para>is the <application>Pine</application> remote data utility, used to
-          convert local <application>Pine</application> configuration files or address
-          books into remote configurations or address books.</para>
-          <indexterm zone="pine rpload">
-            <primary sortas="b-rpload">rpload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/pkgconfig.xml
===================================================================
--- archive/pkgconfig.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +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 pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-  <!ENTITY pkgconfig-download-ftp  "">
-  <!ENTITY pkgconfig-md5sum        "aa3c86e67551adc3ac865160e34a2a0d">
-  <!ENTITY pkgconfig-size          "1.9 MB">
-  <!ENTITY pkgconfig-buildsize     "30 MB">
-  <!ENTITY pkgconfig-time          "0.3 SBU">
-]>
-
-<sect1 id="pkgconfig" xreflabel="pkg-config-&pkgconfig-version;">
-  <?dbhtml filename="pkgconfig.html"?>
-
-
-  <title>pkg-config-&pkgconfig-version;</title>
-
-  <indexterm zone="pkgconfig">
-    <primary sortas="a-pkg-config">pkg-config</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pkg-config</title>
-
-    <para>
-      The <application>pkg-config</application> package contains a tool for
-      passing the include path and/or library paths to build tools during the
-      <command>configure</command> and <command>make</command> file execution.
-    </para>
-
-    &lfs74_checked;
-
-    <note>
-      <para>
-        Pkg-config is part of LFS, but was omitted from  the 7.0 and 7.1
-        releases. If you are using a system which includes it, there is
-        nothing more to do. If not, you should follow these instructions.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pkgconfig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pkgconfig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pkgconfig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pkgconfig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pkgconfig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pkgconfig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pkgconfig"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pkg-config</title>
-
-    <para>
-      Install <application>pkg-config</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --with-internal-glib \
-            --disable-host-tool  \
-            --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-internal-glib</option>: This switch causes
-      the package to use the shipped version of GLib2.
-    </para>
-
-    <para>
-      <option>--disable-host-tool</option>: This switch disables
-      creation of the unnecessary symlink.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring pkg-config</title>
-
-    <para>
-      The default setting for <envar>PKG_CONFIG_PATH</envar> is <filename
-      class="directory">/usr/lib/pkgconfig:/usr/share/pkgconfig</filename>
-      because of the prefix used to install
-      <application>pkg-config</application>. You may add to
-      <envar>PKG_CONFIG_PATH</envar> by exporting additional paths on your system
-      where <filename class="extension">.pc</filename> files are installed. Note
-      that <envar>PKG_CONFIG_PATH</envar> is only needed when compiling packages,
-      not during run-time.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pkg-config
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkg-config">
-        <term><command>pkg-config</command></term>
-        <listitem>
-          <para>
-            returns meta information for the specified library or
-            package.
-          </para>
-          <indexterm zone="pkgconfig pkg-config">
-            <primary sortas="b-pkg-config">pkg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/poppler-014.xml
===================================================================
--- archive/poppler-014.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,227 +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 poppler-014-download-http  "http://poppler.freedesktop.org/poppler-&poppler-014-version;.tar.gz">
-  <!ENTITY poppler-014-download-ftp   " ">
-  <!ENTITY poppler-014-md5sum         "a40fe96e1115f648ce4689e667743530">
-  <!ENTITY poppler-014-size           "1.7 MB">
-  <!-- these figures were for 6.7 with "most dependencies except Qt - that probably meant
-   without qt4, so leaving as best estimate -->
-  <!ENTITY poppler-014-buildsize      "137 MB">
-  <!ENTITY poppler-014-time           "1.3 SBU">
-]>
-
-<sect1 id="poppler-014" xreflabel="Poppler-&poppler-014-version;">
-  <?dbhtml filename="poppler-014.html"?>
-
-
-  <title>Poppler-&poppler-014-version;</title>
-
-  <indexterm zone="poppler-014">
-    <primary sortas="a-Poppler-014">Poppler</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Poppler</title>
-
-    <para>The <application>Poppler</application> package contains a PDF
-    rendering library and command line tools used to manipulate PDF files.
-    This is useful for providing PDF rendering functionality as a shared
-    library.</para>
-
-    <para>This old version is usable by <xref linkend="kdegraphics"/>.  If you are not
-    building that package, please use <xref linkend="poppler"/>. The two versions of
-    <application>poppler</application> install similar programs, libraries, and
-    pkgconfig files.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&poppler-014-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&poppler-014-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &poppler-014-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &poppler-014-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &poppler-014-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &poppler-014-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="fontconfig"/>,
-    <xref linkend="pkgconfig"/>, and
-    <xref linkend="qt"/> (so that the
-    <filename class='libraryfile'>libpoppler-qt</filename> library is built)</para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>, <xref linkend="cairo"/>,
-     and <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk2"/>,
-    <xref linkend="qt4"/>,
-    <xref linkend="curl"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="lcms"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/poppler-014"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Poppler</title>
-
-    <caution>
-      <para><application>Poppler</application> will overwrite command-line
-      utilities and man pages previously installed by the
-      <application>Xpdf</application> package. If you prefer to keep the
-      <application>Xpdf</application> versions of these files, pass the
-      <option>--disable-utils</option> parameter to the
-      <command>configure</command> command below.</para>
-    </caution>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &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;
-install -v -m755 -d      /usr/share/doc/poppler-&poppler-014-version; &amp;&amp;
-install -v -m644 README* /usr/share/doc/poppler-&poppler-014-version;</userinput></screen>
-
-    <para>If you wish to download and install the optional encoding files to
-    render CJK and Cyrillic properly, please follow the instructions for the Additional
-    Encoding Data on the <xref linkend="poppler"/> page - this version of
-    <application>poppler</application> will automatically read them if they are
-    present when it runs.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- This is discouraged by the authors. There is built-in decompression
-         and zlib is not needed
-    <para><parameter>-enable-zlib</parameter>: This parameter forces the build
-    to link with the system-installed
-    <filename class='libraryfile'>libz</filename> library to enable compressed
-    PDF functionality.</para> -->
-
-    <para><parameter>--disable-cairo-output</parameter>: This parameter
-    disables building the <application>cairo</application> graphics backend.</para>
-
-    <para><parameter>--disable-poppler-glib</parameter> and
-    <parameter>--disable-gtk-test</parameter>: These parameters disable
-    building the <application>GLib</application> wrapper and
-    <application>GTK+</application> test program.</para>
-
-    <para><parameter>--disable-static</parameter>: Prevent static libraries
-    being built and installed.</para>
-
-    <para><parameter>--enable-xpdf-headers</parameter>: Install old
-    <application>Xpdf</application> headers required by certain programs. These
-    are unsupported by <application>Poppler</application>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg><xref linkend="xpdf-content"/> for the pdf* programs</seg>
-        <seg>libpoppler.{so,a}, libpoppler-cpp.{so,a}, libpoppler-glib.{so,a}, libpoppler-qt.{so,a}
-        and libpoppler-qt4.{so,a}</seg>
-        <seg>/usr/include/poppler, /usr/share/doc/poppler-&poppler-version;,
-        /usr/share/gtk-doc/html/poppler and /usr/share/poppler</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpoppler-014">
-        <term><filename class='libraryfile'>libpoppler.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions to render PDF files.</para>
-          <indexterm zone="poppler-014 libpoppler-014">
-            <primary sortas="c-libpoppler">libpoppler.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-cpp">
-        <term><filename class='libraryfile'>libpoppler-cpp.{so,a}</filename></term>
-        <listitem>
-          <para>is a C++ backend for rendering PDF files.</para>
-          <indexterm zone="poppler-014 libpoppler-014-cpp">
-            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-glib">
-        <term><filename class='libraryfile'>libpoppler-glib.{so,a}</filename></term>
-        <listitem>
-          <para>is a wrapper library used to interface the PDF rendering
-          functions with <application>GTK+</application>.</para>
-          <indexterm zone="poppler-014 libpoppler-014-glib">
-            <primary sortas="c-libpoppler-glib">libpoppler-glib.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-qt">
-        <term><filename class='libraryfile'>libpoppler-qt.{so,a}</filename></term>
-        <listitem>
-          <para>is a wrapper library used to interface the PDF rendering
-          functions with <application>Qt</application>.</para>
-          <indexterm zone="poppler-014 libpoppler-014-qt">
-            <primary sortas="c-libpoppler-qt">libpoppler-qt.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-qt4">
-        <term><filename class='libraryfile'>libpoppler-qt4.{so,a}</filename></term>
-        <listitem>
-          <para>is a wrapper library used to interface the PDF rendering
-          functions with <application>Qt</application>-4.</para>
-          <indexterm zone="poppler-014 libpoppler-014-qt4">
-            <primary sortas="c-libpoppler-qt4">libpoppler-qt4.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/portmap.xml
===================================================================
--- archive/portmap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY portmap-download-http "http://neil.brown.name/portmap/portmap-&portmap-version;.tgz">
-  <!ENTITY portmap-download-ftp  " ">
-  <!ENTITY portmap-md5sum        "ac108ab68bf0f34477f8317791aaf1ff">
-  <!ENTITY portmap-size          "21 KB">
-  <!ENTITY portmap-buildsize     "268 KB">
-  <!ENTITY portmap-time          "0.01 SBU">
-]>
-
-<sect1 id="portmap" xreflabel="portmap-&portmap-version;">
-  <?dbhtml filename="portmap.html"?>
-
-
-  <title>Portmap-&portmap-version;</title>
-
-  <indexterm zone="portmap">
-    <primary sortas="a-Portmap">Portmap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Portmap</title>
-
-    <para>The <application>portmap</application> package is a more secure
-    replacement for the original SUN <application>portmap</application> package.
-    <application>Portmap</application> is used to forward RPC requests to RPC
-    daemons such as NFS and NIS.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&portmap-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&portmap-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &portmap-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &portmap-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &portmap-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &portmap-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Portmap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="tcpwrappers"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/portmap"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Portmap</title>
-
-    <para>Portmap runs as a daemon with a uid of 1.  This uid is only
-    configurable at compile time and is used as default. To set up a
-    user to match this uid, as the <systemitem class="username">root</systemitem>
-    user, issue:</para>
-
-<screen><userinput>useradd -u 1 -g 1 -d /dev/null -s /bin/false bin</userinput></screen>
-
-    <para>Install <application>portmap</application> with the following
-    commands:</para>
-
-<screen><userinput>LDLIBS=-ltirpc make</userinput></screen>
-
-    <para>Note that the LDLIBS environment variable must be before the
-    <command>make</command> command.</para>
-
-    <para>If you want the portmap daemon to use a uid/gid other than the
-    defaults, pass DAEMON_UID=x and DAEMON_GID=y as shown below:</para>
-
-    <para><command>LDLIBS=-ltirpc make DAEMON_UID=x DAEMON_GID=y</command></para>
-
-    <para>If you want to build the portmap daemon without
-    <application>tcpwrappers</application>, add
-    <userinput>NO_TCP_WRAPPER=true</userinput> to the make line as shown below:</para>
-
-    <para><command>LDLIBS=-ltirpc make NO_TCP_WRAPPER=true</command></para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-    <note>
-      <para>The above installation places executable <command>portmap</command>
-      in <filename class="directory">/sbin</filename>. You may choose to move the
-      file to <filename class="directory">/usr/sbin</filename>. If you do,
-      remember to modify the bootscript also.</para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Portmap</title>
-
-    <sect3  id="portmap-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/rc.d/init.d/portmap</filename> init script
-      included in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="portmap portmap-init">
-        <primary sortas="f-portmap">portmap</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-portmap</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>pmap_dump, pmap_set, and portmap</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pmap_dump">
-         <!-- Don't remove the extra space, it prevent a FOP warning. -->
-        <term><command>pmap_dump</command> </term>
-        <listitem>
-          <para>saves the port mapping table to an ASCII file.</para>
-          <indexterm zone="portmap pmap_dump">
-            <primary sortas="b-pmap_dump">pmap_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pmap_set">
-        <term><command>pmap_set</command></term>
-        <listitem>
-          <para>restores the port mapping table from an ASCII file.</para>
-          <indexterm zone="portmap pmap_set">
-            <primary sortas="b-pmap_set">pmap_set</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="portmap-prog">
-        <term><command>portmap</command></term>
-        <listitem>
-          <para>is an RPC port mapper.</para>
-          <indexterm zone="portmap portmap-prog">
-            <primary sortas="b-portmap">portmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
-
Index: chive/ppp.xml
===================================================================
--- archive/ppp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,552 +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 ppp-download-http "http://samba.org/ftp/ppp/ppp-&ppp-version;.tar.gz">
-  <!ENTITY ppp-download-ftp  "&gentoo-ftp-repo;/ppp-&ppp-version;.tar.gz">
-  <!ENTITY ppp-md5sum        "4621bc56167b6953ec4071043fe0ec57">
-  <!ENTITY ppp-size          "920 KB">
-  <!ENTITY ppp-buildsize     "6.4 MB">
-  <!ENTITY ppp-time          "0.1 SBU">
-]>
-
-<sect1 id="ppp" xreflabel="PPP-&ppp-version;">
-  <?dbhtml filename="ppp.html"?>
-
-
-  <title>PPP-&ppp-version;</title>
-
-  <indexterm zone="ppp">
-    <primary sortas="a-PPP">PPP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PPP</title>
-
-    <para>The <application>PPP</application> package contains the
-    <command>pppd</command> daemon and the <command>chat</command>
-    program. This is used for connecting to other machines; often for connecting to
-    the Internet via a dial-up or PPPoE connection to an ISP.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ppp-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ppp-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ppp-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ppp-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ppp-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ppp-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PPP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpcap"/> (needed to do PPP filtering)
-    and <xref linkend="linux-pam"/> (to authenticate incoming calls using PAM -
-    only needed by ISPs).
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/PPP"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PPP</title>
-
-    <note id="ppp-kernel">
-      <para><application>PPP</application> support (CONFIG_PPP),
-      the asynchronous line discipline (CONFIG_PPP_ASYNC), the
-      driver for your serial port device and/or the PPP over Ethernet
-      (PPPoE) protocol driver (CONGIG_PPPOE) must be compiled into the
-      kernel or loaded as kernel modules.
-      Udev doesn't load the ppp_generic and pppoe modules automatically. If you
-      compiled them as modules they can be loaded by the modules bootscript if
-      they are mentioned in <filename>/etc/sysconfig/modules</filename>
-      file.</para>
-    </note>
-
-    <indexterm zone="ppp ppp-kernel">
-      <primary sortas="d-PPP-support">PPP support</primary>
-    </indexterm>
-
-    <para>Create (as <systemitem class="username">root</systemitem>)
-    the group for users who may run <application>PPP</application>:</para>
-
-<screen role="root"><userinput>groupadd -g 52 pppusers</userinput></screen>
-
-    <para>Compile <application>PPP</application> by running the
-    following commands:</para>
-
-<screen><userinput>rm include/linux/if_pppol2tp.h &amp;&amp;
-./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 &amp;&amp;
-install -d /etc/ppp/peers</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>rm include/linux/if_pppol2tp.h</command>:
-    <application>PPP-&ppp-version;</application> contains an out of date copy
-    of the kernel header <filename>linux/if_pppol2tp.h</filename>. This needs to
-    be removed to <emphasis>force</emphasis> it to use the one installed in
-    <filename class="directory">/usr</filename>. If you don't remove this file
-    the build will still succeed (thanks to a poorly written
-    <filename>Makefile</filename>) but it will fail to compile the
-    <filename class="libraryfile">openl2tp.so</filename>,
-    <filename class="libraryfile">pppol2tp.so</filename>,
-    and <filename class="libraryfile">rp-pppoe.so</filename> plugins:</para>
-
-    <para><command>install -d /etc/ppp/peers</command>: This command creates
-    a directory for PPP peer configuration files.</para>
-
-<!-- FIXME: the three options below are taken from pppd/Makefile.linux file.
-     They have not been tested. There are other options, such as USE_SRP=y,
-     that cannot work (in this case, because libsrp is not available from
-     anywhere) - Alexander E. Patrakov -->
-
-    <para><parameter>USE_PAM=y</parameter>: Add this argument to the
-    <command>make</command> command to compile in support for PAM, usually
-    needed for authenticating inbound calls against a central database.</para>
-
-    <para><parameter>HAVE_INET6=y</parameter>: Add this argument to the
-    <command>make</command> command to compile in support for IPv6.</para>
-
-    <para><parameter>CBCP=y</parameter>: Add this argument to the
-    <command>make</command> command to compile in support for the
-    Microsoft proprietary Callback Control Protocol.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PPP</title>
-
-    <sect3 id="ppp-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/ppp/*</filename></para>
-
-      <indexterm zone="ppp ppp-config">
-        <primary sortas="e-etc-ppp-star">/etc/ppp/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Add the users who may run <application>PPP</application> to the
-      <systemitem class="groupname">pppusers</systemitem> group:</para>
-
-<screen role="root"><userinput>usermod -a -G pppusers <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <para>Most internet service providers that use ppp give you a username
-      and password for you to use to authenticate yourself when you connect to
-      their servers. These secrets are kept in the files
-      <filename>/etc/ppp/pap-secrets</filename> or
-      <filename>/etc/ppp/chap-secrets</filename>. If you don't know whether
-      your ISP uses CHAP or PAP then create both files and put the same content
-      in both files.</para>
-
-      <para>If you have more than one ISP account the second column
-      (remotename) is used to identify between the different
-      usernames/passwords needed for the different ISPs. If you only have one
-      ISP account an asterisk will work fine in the second column.</para>
-
-      <para>In this example the username given by the ISP is
-      <quote>jdoe</quote>, the password is <quote>guessit</quote>, the ISP uses
-      PAP and the user wants to give this account the remotename
-      <quote>dialup</quote> in order to distinguish it from other PPP
-      accounts:</para>
-
-<screen role="root"><userinput>cat &gt;&gt;/etc/ppp/pap-secrets &lt;&lt;"EOF"</userinput>
-<literal># username      remotename    password
-jdoe            dialup        guessit</literal>
-<userinput>EOF
-chmod 600 /etc/ppp/pap-secrets</userinput></screen>
-
-    <sect4>
-      <title>DNS Server Configuration</title>
-
-      <para>If you don't run your own caching DNS server (like
-      <xref linkend="bind"/>) <command>pppd</command> can ask your ISP for its
-      domain name servers and put them in <filename>/etc/ppp/resolv.conf</filename>.
-      If you want to use their domain name servers:</para>
-
-<screen role="root"><userinput>mv /etc/resolv.conf{,.orig}
-ln -s ppp/resolv.conf /etc</userinput></screen>
-
-    </sect4>
-
-    <sect4>
-      <title>PPPoE connections</title>
-
-      <para>In order to configure a PPPoE connection, create a peer file that
-      contains the connection details:</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/peers/<replaceable>peername</replaceable> &lt;&lt;"EOF"</userinput>
-<literal>plugin rp-pppoe.so <replaceable>eth0</replaceable>
-
-# Your username at the ISP. This is the same as the first
-# column in /etc/ppp/*-secrets:
-user "<replaceable>jdoe</replaceable>"
-
-# remotename is not needed if you only have one ISP account and
-# hence an asterisk in the second column in pap or chap-secrets:
-# remotename "<replaceable>adsl</replaceable>"
-
-# If it's not working and you want pppd to be
-# more verbose in /var/log/sys.log, add debug:
-# debug
-
-# If you have a static IP address (eg, 12.34.56.78) you
-# can specify it by following it with a colon:
-# 12.34.56.78:
-
-# Otherwise accept whatever IP address the ISP gives you:
-noipdefault
-
-# The settings below usually don't need to be changed
-noauth
-hide-password
-updetach
-defaultroute
-# create /etc/ppp/resolv.conf:
-usepeerdns
-
-### For more details (and more options)
-### read man pppd</literal>
-<userinput>EOF
-chmod 600 /etc/ppp/peers/<replaceable>peername</replaceable></userinput></screen>
-    </sect4>
-
-    <sect4>
-      <title>PPPoATM connections</title>
-
-      <para>PPPoA connections are very similar to PPPoE, the main differences
-      are that you use the pppoatm.so plugin instead of rp-pppoe.so, you don't
-      specify the ethernet interface (it uses ppp0) and you need to VP/VC
-      numbers that are used by your ISP (there is a list of VP/VC numbers
-      <ulink url="http://www.linux-usb.org/SpeedTouch/faq/index.html#q12">here
-      </ulink>)</para>
-
-<screen role="root"><userinput>cat &gt;/etc/ppp/peers/<replaceable>peername</replaceable> &lt;&lt;"EOF"</userinput>
-<literal>plugin pppoatm.so
-
-# Your VP/VC numbers. eg, in Britain it is 0.38, in
-# France they use 8.35. Google is your friend :)
-0.38
-
-# Your username at the ISP. This is the same as the
-# first column in /etc/ppp/*-secrets:
-user "<replaceable>jdoe</replaceable>"
-
-# remotename is not needed if you only have one ISP account and
-# hence an asterisk in the second column in pap or chap-secrets:
-# remotename "<replaceable>adsl</replaceable>"
-
-# If it's not working and you want pppd to be
-# more verbose in /var/log/sys.log, add debug:
-# debug
-
-# If you have a static IP address (eg, 12.34.56.78) you
-# can specify it by following it with a colon:
-# 12.34.56.78:
-
-# Otherwise accept whatever IP address the ISP gives you:
-noipdefault
-
-# The settings below usually don't need to be changed
-noauth
-hide-password
-updetach
-defaultroute
-# create /etc/ppp/resolv.conf:
-usepeerdns
-
-### For more details (and more options)
-### read man pppd</literal>
-<userinput>EOF
-chmod 600 /etc/ppp/peers/<replaceable>peername</replaceable></userinput></screen>
-
-    </sect4>
-
-    <sect4>
-      <title>Dialup Modem Connection</title>
-
-<!-- This section has been tested with various ISPs in Yekaterinburg,
-     Russia using Lucent WinModem. I cannot test it anymore, because
-     there is no free PCI slot for the modem in my new computer. However,
-     it is similar enough to GPRS for me to be sure that it still works,
-     and nobody complained about non-working dialup on the LFS LiveCD.
-     - Alexander E. Patrakov -->
-
-      <para>Dialup connections are established with the help of a modem
-      connected to a computer and the telephone line. The modem dials a
-      telephone number of the ISP's modem, and they exchange data using
-      the signal frequencies 300-4000 Hz. Typical data transfer
-      rate is 40-50 kilobits per second, and the gateway ping time
-      (latency) is up to 300-400 ms. In order to configure the
-      dialup connection, it is required to know the telephone number of
-      the ISP's modem pool, the username and the password.</para>
-
-      <para>In order to configure a dialup connection, two files have to
-      be created: a chat script that automates the connection procedure
-      (common for all dialup accounts), and a peer file that provides
-      configuration information about a specific connection to
-      <command>pppd</command>:</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/dialup.chat &lt;&lt;"EOF"</userinput>
-<literal>ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'
-ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT DELAYED
-ABORT ERROR ABORT BLACKLISTED
-
-TIMEOUT 5
-'' AT
-# \T is the phone number, passed from /etc/ppp/peers/<replaceable>dialup</replaceable>
-OK-+++\dATH0-OK ATD\T
-TIMEOUT 75
-CONNECT \d\c</literal>
-<userinput>EOF
-
-cat &gt;/etc/ppp/peers/<replaceable>dialup</replaceable> &lt;&lt;"EOF"</userinput>
-<literal># Your username at the ISP
-user "<replaceable>jdoe</replaceable>"
-# What should be in the second column in /etc/ppp/*-secrets
-remotename "<replaceable>dialup</replaceable>"
-# Replace <replaceable>TTTTTTT</replaceable> with the ISP phone number
-connect "/usr/sbin/chat -T <replaceable>TTTTTTT</replaceable> -f /etc/ppp/dialup.chat"
-
-# Specify your modem serial port and speed below
-<replaceable>/dev/ttyS0</replaceable>
-<replaceable>115200</replaceable>
-
-# The settings below usually don't need to be changed
-updetach
-noauth
-hide-password
-debug
-lock
-defaultroute
-noipdefault
-usepeerdns</literal>
-<userinput>EOF</userinput></screen>
-
-      <para>The first three lines of the
-      <filename>/etc/ppp/dialup.chat</filename> file abort the script when
-      it receives an indication of an error from the modem. Then the timeout
-      is set to 5 seconds and the script checks that the modem responds to
-      the dummy AT command. If not, measures are taken to dewedge it
-      (by interrupting the data transfer and going on hook). Then the
-      telephone number is dialed, and the script waits for the answer for
-      75 seconds. The serial connection is considered established when the
-      modem sends the string CONNECT.</para>
-
-    </sect4>
-
-    <sect4>
-      <title>GPRS and EDGE Connections</title>
-
-<!-- This section has been tested with GPRS service from MOTIV in
-     Yekaterinburg, Russia. According to forum messages, the procedure
-     also works with EDGE, but my cellular phone (Motorola C350) does not
-     support EDGE. - Alexander E. Patrakov -->
-
-      <para>GPRS and EDGE connections are established with the help of a
-      cellular phone connected to a computer via serial, USB, or Bluetooth.
-      The phone exchanges data packets with the nearest base station,
-      which can be up to 35 kilometers away.
-
-      <!-- FIXME: watch for new standards! SkyLink is already offering
-           3.1 megabits per second with CDMA mobile phones, and
-           the configuration below doesn't work. It is reported that
-           a regular dialup setup with the telephone number "#777",
-           username "mobile" and password "internet" works with SkyLink. -->
-
-      The maximum possible data transfer rate is 170 kilobits per second
-      for GPRS and 474 kilobits per second for EDGE, but many cellular
-      operators impose lower limits, such as 64 kilobits per second. The
-      gateway ping time is 900 ms for GPRS, which makes playing many online
-      games impossible and causes connection to ICQ to be unreliable.
-      In order to configure a GPRS or EDGE connection,
-      it is required to know the access point name (APN) and, rarely, the
-      username and the password.
-      In most cases, billing is based on the telephone number, and the
-      username/password pair is not needed, as assumed in the example
-      below.</para>
-
-      <para>In order to configure a GPRS connection, two files have to
-      be created: a chat script that automates the connection procedure
-      (common for all GPRS accounts), and a peer file that provides
-      configuration information about a specific connection to
-      <command>pppd</command>:</para>
-<screen role="root"><userinput>cat &gt;/etc/ppp/gprs.chat &lt;&lt;"EOF"</userinput>
-<literal>ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'
-ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT DELAYED
-ABORT ERROR ABORT BLACKLISTED
-
-TIMEOUT 5
-'' AT
-OK-+++\dATH0-OK ATZ
-# \T is the APN, passed from /etc/ppp/peers/<replaceable>gprs</replaceable>
-# This example stores the APN as profile #1 in the phone.
-# The "telephone number", *99***&lt;profile_number&gt;#, is always the same.
-# If you want to store this as profile #2, change 1 to 2 in the
-# following two lines.
-OK AT+CGDCONT=<replaceable>1</replaceable>,"IP","\T"
-OK "ATD*99***<replaceable>1</replaceable>#"
-CONNECT \d\c</literal>
-<userinput>EOF
-
-cat &gt;/etc/ppp/peers/<replaceable>gprs</replaceable> &lt;&lt;"EOF"</userinput>
-<literal># Replace <replaceable>inet.example.com</replaceable> with the proper APN for your provider
-connect "/usr/sbin/chat -T <replaceable>inet.example.com</replaceable> -f /etc/ppp/gprs.chat"
-
-# Specify your cellphone serial port and speed below
-# Note: you must manually send some vendor-specific AT commands
-# to certain old cellular phones (such as Sony-Ericsson T200)
-# in order to achieve connection speed more than 9600 bits per second.
-<replaceable>/dev/ttyS1</replaceable>
-<replaceable>115200</replaceable>
-
-# The settings below usually don't need to be changed
-noccp
-noauth
-updetach
-debug
-lock
-defaultroute
-noipdefault
-usepeerdns</literal>
-<userinput>EOF</userinput></screen>
-    </sect4>
-
-    <sect4>
-      <title>Establishing the connection manually</title>
-
-      <para>In order to establish a PPP connection described by the
-      <filename>/etc/ppp/peers/<replaceable>peername</replaceable></filename>
-      file run (as <systemitem class="username">root</systemitem> or as a member
-      of the <systemitem class="groupname">pppusers</systemitem> group):</para>
-<screen><userinput>pppd call <replaceable>peername</replaceable></userinput></screen>
-
-      <para>In order to stop the connection, run:</para>
-<screen><userinput>killall pppd</userinput></screen>
-
-      <!--  There are an infinite number of ways that computers can be
-      connected together. Trying to write a bootscript that can cope with every
-      possible network configuration is the road to madness. Andrew Benton -->
-
-      <para>Writing a bootscript that brings up the connection during the boot
-      process is left as an exercise for the reader ;)</para>
-
-    </sect4>
-
-    </sect3>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>chat, pppd, pppdump, pppoe-discovery and pppstats</seg>
-        <seg>Several plugin modules installed in
-        <filename class='directory'>/usr/lib/pppd/&ppp-version;</filename></seg>
-        <seg>/etc/ppp, /usr/include/pppd and /usr/lib/pppd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chat">
-        <term><command>chat</command></term>
-        <listitem>
-          <para>defines a conversational exchange between the computer and the
-          modem. Its primary purpose is to establish the connection between the
-          Point-to-Point Protocol Daemon (PPPD) and the remote
-          <command>pppd</command> process.</para>
-          <indexterm zone="ppp chat">
-            <primary sortas="b-chat">chat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppd">
-        <term><command>pppd</command></term>
-        <listitem>
-          <para>is the Point to Point Protocol daemon.</para>
-          <indexterm zone="ppp pppd">
-            <primary sortas="b-pppd">pppd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppdump">
-        <term><command>pppdump</command></term>
-        <listitem>
-          <para>is used to convert
-          <application>PPP</application> record files to a readable
-          format.</para>
-          <indexterm zone="ppp pppdump">
-            <primary sortas="b-pppdump">pppdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppoe-discovery">
-        <term><command>pppoe-discovery</command></term>
-        <listitem>
-          <para>performs the same discovery process as the pppoe plugin, but
-          does not initiate a <application>PPP</application> session.</para>
-          <indexterm zone="ppp pppoe-discovery">
-            <primary sortas="b-pppoe-discovery">pppoe-discovery</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pppstats">
-        <term><command>pppstats</command></term>
-        <listitem>
-          <para>is used to print
-          <application>PPP</application> statistics.</para>
-          <indexterm zone="ppp pppstats">
-            <primary sortas="b-pppstats">pppstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/pre-install-config.xml
===================================================================
--- archive/pre-install-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,87 +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="gnome-pre-install-config">
-  <?dbhtml filename="pre-install-config.html"?>
-
-
-  <title>Pre-installation Configuration</title>
-
-  <para>Set an environment variable to resolve the prefix destination.</para>
-
-  <para>If <application>GNOME</application> is your desktop of choice:</para>
-
-<screen><userinput>cat &gt; /etc/profile.d/gnome.sh &lt;&lt; "EOF" &amp;&amp;
-<literal>export GNOME_PREFIX=/usr
-export GNOME_SYSCONFDIR=&gnome-etc-dir;
-export XDG_CONFIG_DIRS=${GNOME_SYSCONFDIR}/xdg
-export XDG_DATA_DIRS=/usr/share:/usr/local/share</literal>
-EOF
-. /etc/profile.d/gnome.sh</userinput></screen>
-
-
-  <para>If you want to try-out <application>GNOME</application>, or install
-  it in an easy-to-remove location:</para>
-
-  <note>
-    <para>You may wish to create a symbolic link to the actual versioned
-    directory using a non-versioned name. This has the advantage of an easier
-    path to type in all the changes below and also makes it easy to point
-    to a different/newer version of GNOME without changing all the edits
-    below. If you wish to use a non-versioned name in the changes below,
-    issue the following commands as the
-    <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role='root'><userinput>install -v -m755 -d /opt/gnome-&gnome-version;&gnome-minor-version; &amp;&amp;
-ln -v -s gnome-&gnome-version;&gnome-minor-version; /opt/gnome</userinput></screen>
-  </note>
-
-  <para>If you created the symbolic link, change all instances of <filename
-  class='directory'>/opt/gnome-&gnome-version;&gnome-minor-version;</filename>
-  to <filename class='directory'>/opt/gnome</filename> in the instructions
-  below.</para>
-
-<screen><userinput>export GNOME_PREFIX=/opt/gnome-&gnome-version;&gnome-minor-version;</userinput></screen>
-
-  <para>The try-out group will also need to make all the following
-  configuration changes:</para>
-
-  <para>Add to your system or personal profile:</para>
-
-<screen><literal>export PATH=${PATH}:/opt/gnome-&gnome-version;&gnome-minor-version;/bin
-export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
-export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
-export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib
-export PYTHONPATH=${PYTHONPATH}:/usr/lib/python&python2-majorver;/site-packages:/opt/gnome-&gnome-version;/lib/python&python2-majorver;/site-packages</literal></screen>
-
-  <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
-
-<screen role='root'><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin gnome addition to /etc/ld.so.conf
-
-/opt/gnome-&gnome-version;&gnome-minor-version;/lib
-
-# End gnome addition</literal>
-EOF</userinput></screen>
-
-  <para>Add to your <filename>/etc/man_db.conf</filename>:</para>
-
-<screen role='root'><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
-<literal># Begin gnome addition to man_db.conf
-
-MANDATORY_MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/share/man
-
-# End gnome addition to man_db.conf</literal>
-EOF</userinput></screen>
-
-  <tip>
-    <para>Remember to execute <command>ldconfig</command> as the
-    <systemitem class='username'>root</systemitem> user after installation of
-    libraries to update the linker's library cache.</para>
-  </tip>
-
-</sect1>
Index: chive/printproto.xml
===================================================================
--- archive/printproto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,95 +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 printproto-download-http "http://xorg.freedesktop.org/releases/individual/proto/printproto-&printproto-version;.tar.bz2">
-  <!ENTITY printproto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/printproto-&printproto-version;.tar.bz2">
-  <!ENTITY printproto-md5sum        "99d0e25feea2fead7d8325b7000b41c3">
-  <!ENTITY printproto-size          "224 KB">
-  <!ENTITY printproto-buildsize     "2.6 MB">
-  <!ENTITY printproto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="printproto" xreflabel="printproto-&printproto-version;">
-  <?dbhtml filename="printproto.html"?>
-
-
-  <title>printproto-&printproto-version;</title>
-
-  <indexterm zone="printproto">
-    <primary sortas="a-printproto">printproto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to printproto</title>
-
-    <para>The <application>printproto</application> package provides the
-    protocol headers for the <xref linkend="libXp"/> package.</para>
-
-    &not-katamari;
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&printproto-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&printproto-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &printproto-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &printproto-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &printproto-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &printproto-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/printproto"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of printproto</title>
-
-    <para>Install <application>printproto</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/psutils.xml
===================================================================
--- archive/psutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,292 +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 psutils-download-http "http://pkgs.fedoraproject.org/repo/pkgs/psutils/psutils-p17.tar.gz/&psutils-md5sum;/psutils-&psutils-version;.tar.gz">
-  <!ENTITY psutils-download-ftp  " ">
-<!--  <!ENTITY psutils-download-ftp  "ftp://ftp.knackered.org/pub/psutils/psutils-&psutils-version;.tar.gz">-->
-  <!ENTITY psutils-md5sum        "b161522f3bd1507655326afa7db4a0ad">
-  <!ENTITY psutils-size          "68 KB">
-  <!ENTITY psutils-buildsize     "740 KB">
-  <!ENTITY psutils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="psutils" xreflabel="PSUtils-&psutils-version;">
-  <?dbhtml filename="psutils.html"?>
-
-
-  <title>PSUtils-&psutils-version;</title>
-
-  <indexterm zone="psutils">
-    <primary sortas="a-PSUtils">PSUtils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PSUtils</title>
-
-    <para>
-      <application>PSUtils</application> is a set of utilities to manipulate
-      PostScript files.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&psutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&psutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &psutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &psutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &psutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &psutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/psutils"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PSUtils</title>
-
-    <para>
-      Install <application>PSUtils</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed 's@/usr/local@/usr@g' Makefile.unix &gt; Makefile &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed 's@/usr/local@/usr@g' Makefile.unix &gt; Makefile</command>:
-      This command creates a <filename>Makefile</filename> that installs the
-      program to the <filename class="directory">/usr</filename> prefix instead
-      of the <filename class="directory">/usr/local</filename> prefix.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>epsffit, extractres, fixdlsrps, fixfmps, fixmacps, fixpsditps,
-        fixpspps, fixscribeps, fixtpps, fixwfwps, fixwpps, fixwwps, getafm,
-        includeres, psbook, psmerge, psnup, psresize, psselect, pstops,
-        and showchar</seg>
-        <seg>None</seg>
-        <seg>/usr/share/psutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <para>
-      Sometimes <command>psnup</command> and other utilities from this
-      package produce PostScript files that don't conform to Adobe's DSC
-      standard. <application>CUPS</application> may print them incorrectly.
-      On the other hand, <application>CUPS</application> has builtin
-      replacements for most commands from this package. For example, to print
-      a document 2-up, you can issue this command:
-    </para>
-
-<screen><userinput>lp -o number-up=2 <replaceable>&lt;filename&gt;</replaceable></userinput></screen>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="epsffit">
-        <term><command>epsffit</command></term>
-        <listitem>
-          <para>
-            fits an EPSF file to a given bounding box.
-          </para>
-          <indexterm zone="psutils epsffit">
-            <primary sortas="b-epsffit">epsffit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extractres">
-        <term><command>extractres</command></term>
-        <listitem>
-          <para>
-            is a filter to extract resources from a PostScript document.
-          </para>
-          <indexterm zone="psutils extractres">
-            <primary sortas="b-extractres">extractres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fixprogs">
-        <term><command>fix*</command></term>
-        <listitem>
-          <para>
-            are filters of different kinds of documents to work with PSUtils.
-          </para>
-          <indexterm zone="psutils fixprogs">
-            <primary sortas="b-fixprogs">fix*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getafm">
-        <term><command>getafm</command></term>
-        <listitem>
-          <para>
-            create an AFM file for a PostScript font.
-          </para>
-          <indexterm zone="psutils getafm">
-            <primary sortas="b-getafm">getafm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="includeres">
-        <term><command>includeres</command></term>
-        <listitem>
-          <para>
-            is a filter to include resources in a PostScript document.
-          </para>
-          <indexterm zone="psutils includeres">
-            <primary sortas="b-includeres">includeres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psbook">
-        <term><command>psbook</command></term>
-        <listitem>
-          <para>
-            rearranges pages into signatures.
-          </para>
-          <indexterm zone="psutils psbook">
-            <primary sortas="b-psbook">psbook</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psmerge">
-        <term><command>psmerge</command></term>
-        <listitem>
-          <para>
-            is a filter to merge several PostScript files into one.
-          </para>
-          <indexterm zone="psutils psmerge">
-            <primary sortas="b-psmerge">psmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psnup">
-        <term><command>psnup</command></term>
-        <listitem>
-          <para>
-            puts multiple pages per physical sheet of paper.
-          </para>
-          <indexterm zone="psutils psnup">
-            <primary sortas="b-psnup">psnup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psresize">
-        <term><command>psresize</command></term>
-        <listitem>
-          <para>
-            alters the document paper size.
-          </para>
-          <indexterm zone="psutils psresize">
-            <primary sortas="b-psresize">psresize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psselect">
-        <term><command>psselect</command></term>
-        <listitem>
-          <para>
-            selects pages and page ranges.
-          </para>
-          <indexterm zone="psutils psselect">
-            <primary sortas="b-psselect">psselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstops">
-        <term><command>pstops</command></term>
-        <listitem>
-          <para>
-            performs general page rearrangements and selection.
-          </para>
-          <indexterm zone="psutils pstops">
-            <primary sortas="b-pstops">pstops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showchar">
-        <term><command>showchar</command></term>
-        <listitem>
-          <para>
-            outputs PostScript to draw a character with metric info.
-          </para>
-          <indexterm zone="psutils showchar">
-            <primary sortas="b-showchar">showchar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/pth.xml
===================================================================
--- archive/pth.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pth-download-http "&gnu-http;/pth/pth-&pth-version;.tar.gz">
-  <!ENTITY pth-download-ftp  " ">
-  <!ENTITY pth-md5sum        "9cb4a25331a4c4db866a31cbe507c793">
-  <!ENTITY pth-size          "652 KB">
-  <!ENTITY pth-buildsize     "5 MB">
-  <!ENTITY pth-time          "0.2 SBU">
-]>
-
-<sect1 id="pth" xreflabel="Pth-&pth-version;">
-  <?dbhtml filename="pth.html"?>
-
-
-  <title>Pth-&pth-version;</title>
-
-  <indexterm zone="pth">
-    <primary sortas="a-Pth">Pth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pth</title>
-
-    <para>
-      The <application>Pth</application> package contains a very portable
-      POSIX/ANSI-C based library for Unix platforms which provides
-      non-preemptive priority-based scheduling for multiple threads of
-      execution (multithreading) inside event-driven applications. All
-      threads run in the same address space of the server application, but
-      each thread has its own individual program-counter, run-time stack,
-      signal mask and errno variable.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pth-time;
-        </para>
-      </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>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pth</title>
-
-    <caution>
-      <para>
-        Don't add the <option>--enable-pthread</option> parameter to the
-        <command>configure</command> command below else you will overwrite the
-        pthread library and interface header installed by the
-        <application>Glibc</application> package in LFS.
-      </para>
-    </caution>
-
-    <para>
-      Install <application>Pth</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's#$(LOBJS): Makefile#$(LOBJS): pth_p.h Makefile#' Makefile.in &amp;&amp;
-./configure --prefix=/usr           \
-            --disable-static        \
-            --mandir=/usr/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/pth-&pth-version; &amp;&amp;
-install -v -m644    README PORTING SUPPORT TESTS \
-                    /usr/share/doc/pth-&pth-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#$(LOBJS) ...</command>: This <command>sed</command>
-      fixes a race condition in the <filename>Makefile</filename>. It allows
-      running <command>make</command> with multiple jobs (e.g., <command>make
-      -j4</command>).
-      <!-- how ironic that a package for using multiple threads has this bug in
-      its Makefile -->
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--mandir=/usr/share/man</parameter>: This switch puts the
-      man pages in <filename class="directory">/usr/share/man</filename> instead
-      of <filename class="directory">/usr/man</filename>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>pth-config</seg>
-        <seg>libpth.so</seg>
-        <seg>/usr/share/doc/pth-&pth-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pth-config">
-        <term><command>pth-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            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
-          </para>
-          <indexterm zone="pth pth-config">
-            <primary sortas="b-pth-config">pth-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpth">
-        <term><filename class="libraryfile">libpth.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the GNU Portable Threads
-            Library
-          </para>
-          <indexterm zone="pth libpth">
-            <primary sortas="c-libpth">libpth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/ptlib.xml
===================================================================
--- archive/ptlib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,227 +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 ptlib-download-http "&gnome-download-http;/ptlib/2.10/ptlib-&ptlib-version;.tar.xz">
-  <!ENTITY ptlib-download-ftp  "&gnome-download-ftp;/ptlib/2.10/ptlib-&ptlib-version;.tar.xz">
-  <!ENTITY ptlib-md5sum        "3ffdf89170dbfa6d29a015ef8741a4e4">
-  <!ENTITY ptlib-size          "2.4 MB">
-  <!ENTITY ptlib-buildsize     "81 MB">
-  <!ENTITY ptlib-time          "0.9 SBU">
-]>
-
-<sect1 id="ptlib" xreflabel="Ptlib-&ptlib-version;">
-  <?dbhtml filename="ptlib.html"?>
-
-
-  <title>Ptlib-&ptlib-version;</title>
-
-  <indexterm zone="ptlib">
-    <primary sortas="a-Ptlib">Ptlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ptlib</title>
-
-    <para>
-      The <application>Ptlib</application> (Portable Tools Library) package
-      contains a class library that has its genesis many years ago as PWLib
-      (portable Windows Library), a method to produce applications to run on
-      various platforms.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ptlib-download-http;"/>
-         </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ptlib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ptlib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ptlib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ptlib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ptlib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-2.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ptlib-&ptlib-version;-openssl-1.1.0-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ptlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/> 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="unixodbc"/> (currently broken, see <emphasis>Command
-        Explanations</emphasis> below),
-      <xref linkend="v4l-utils"/>,
-      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>, and
-      <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/ptlib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ptlib</title>
-
-    <para>
-      Fix a build issue with gcc-7.1.0 and later:
-    </para>
-
-<screen><userinput>sed -i "s/sbin\.Right(1) == '\\\\0')/strlen(sbin\.Right(1)) == 0)/" \
-    src/ptclib/podbc.cxx &amp;&amp;
-    
-sed -i '/\/ioctl.h/a#include &lt;sys/uio.h&gt;' src/ptlib/unix/channel.cxx</userinput></screen>
-
-    <para>
-      Fix an issue with make-4.3 and later (breaks the build with previous
-      versions of make):
-    </para>
-
-<screen><userinput>sed 's/\\#/#/' -i make/common.mak</userinput></screen>
-
-    <para>
-      Install <application>Ptlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-openssl-1.1.0-1.patch &amp;&amp;
-patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
-
-./configure --prefix=/usr  \
-            --disable-odbc &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;
-chmod -v 755 /usr/lib/libpt.so.&ptlib-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-odbc</parameter>: This parameter prevents the use
-      of <xref linkend="unixodbc"/>, whose libraries conflict with
-      <application>ptlib</application>. It is not needed if
-      <xref linkend="unixodbc"/> is not installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ptlib-config
-        </seg>
-        <seg>
-          libpt.so and libpt_s.a
-        </seg>
-        <seg>
-          /usr/include/ptclib,
-          /usr/include/ptlib,
-          /usr/lib/ptlib-&ptlib-version;, and
-          /usr/share/ptlib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ptlib-config">
-        <term><command>ptlib-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use <filename class="libraryfile">libpt</filename>.
-          </para>
-          <indexterm zone="ptlib ptlib-config">
-            <primary sortas="b-ptlib-config">ptlib-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpt">
-        <term><filename class="libraryfile">libpt.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Ptlib</application> API functions.
-          </para>
-          <indexterm zone="ptlib libpt">
-            <primary sortas="c-libpt">libpt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/py2cairo.xml
===================================================================
--- archive/py2cairo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +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 py2cairo-download-http
-           "http://cairographics.org/releases/py2cairo-&py2cairo-version;.tar.bz2">
-  <!ENTITY py2cairo-download-ftp  " ">
-  <!ENTITY py2cairo-md5sum        "20337132c4ab06c1146ad384d55372c5">
-  <!ENTITY py2cairo-size          "400 KB">
-  <!ENTITY py2cairo-buildsize     "3.6 MB">
-  <!ENTITY py2cairo-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Py2cairo -->
-  <sect2 id="py2cairo" xreflabel="Py2cairo-&py2cairo-version;">
-
-    <title>Py2cairo-&py2cairo-version;</title>
-
-    <indexterm zone="py2cairo">
-      <primary sortas="a-Py2cairo">Py2cairo</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Py2cairo Module</title>
-
-      <para>
-        Py2cairo provides <application>Python 2</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs80_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&py2cairo-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&py2cairo-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &py2cairo-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &py2cairo-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &py2cairo-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &py2cairo-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Py2cairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> and
-        <xref linkend="cairo"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <!--TODO built for python2? -->
-        <ulink url="http://pytest.org">pytest</ulink>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/py2cairo"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Py2cairo</title>
-
-      <para>
-        Install <application>Py2cairo</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./waf configure --prefix=/usr &amp;&amp;
-./waf build</userinput></screen>
-
-      <para>
-        The test suite must be run after the package is installed.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>./waf install</userinput></screen>
-
-      <para>
-        The test suite requires the optional <application>pytest</application>
-        package. If installed, it is run by changing to the
-        <filename class='directory'>test</filename> directory and running
-        <command>py.test</command> as an unprivileged user.
-      </para>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            _cairo.so
-          </seg>
-          <seg>
-            /usr/include/pycairo and
-            /usr/lib/python&python2-majorver;/site-packages/cairo
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-  </sect2>
-  <!-- End Py2cairo -->
Index: chive/pyatspi2.xml
===================================================================
--- archive/pyatspi2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +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 pyatspi2-download-http
-           "&gnome-download-http;/pyatspi/2.10/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-download-ftp
-           "&gnome-download-ftp;/pyatspi/2.10/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-md5sum        "188ac6479e824ae2c36dd224a08e036b">
-  <!ENTITY pyatspi2-size          "288 KB">
-  <!ENTITY pyatspi2-buildsize     "4.2 MB">
-  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
-]>
-
-   <!-- Begin PyAtSpi2 -->
-  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
-
-    <title>PyAtSpi2-&pyatspi2-version;</title>
-
-    <indexterm zone="pyatspi2">
-      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyAtSpi2</title>
-
-      <para>
-        The <application>PyAtSpi2</application> package contains
-        <application>Python</application> bindings for the core
-        components of the <application>GNOME</application>
-        Accessibility.
-      </para>
-
-      &lfs75_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyatspi2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyatspi2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyatspi2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyatspi2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyAtSpi2</title>
-
-      <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>PyAtSpi2</application> as the
-        <application>Python 2</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>mkdir python2 &amp;&amp;
-pushd python2 &amp;&amp;
-../configure --prefix=/usr --with-python=/usr/bin/python &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-      <para>
-        To build <application>PyAtSpi2</application> as the
-        <application>Python 3</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>mkdir python3 &amp;&amp;
-pushd python3 &amp;&amp;
-../configure --prefix=/usr --with-python=/usr/bin/python3 &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-      <para>
-        This package does not come with a testsuite.
-      </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>make -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>make -C python3 install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/pyatspi and/or
-            /usr/lib/python&python3-majorver;/site-packages/pyatspi
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End PyAtSpi2 -->
Index: chive/pycrypto.xml
===================================================================
--- archive/pycrypto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,138 +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 pycrypto-download-http "&pymodules-dl;/p/pycrypto/pycrypto-&pycrypto-version;.tar.gz">
-  <!ENTITY pycrypto-download-ftp  " ">
-  <!ENTITY pycrypto-md5sum        "55a61a054aa66812daf5161a0d5d7eda">
-  <!ENTITY pycrypto-size          "440 KB">
-  <!ENTITY pycrypto-buildsize     "14 MB">
-  <!ENTITY pycrypto-time          "0.1 SBU">
-]>
-
-  <!-- Begin pycrypto -->
-  <sect2 id="pycrypto" xreflabel="PyCrypto-&pycrypto-version;">
-
-    <title>PyCrypto-&pycrypto-version;</title>
-
-    <indexterm zone="pycrypto">
-      <primary sortas="a-pycrypto">pycrypto</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the PyCrypto Module</title>
-
-      <para>
-        <application>PyCrypto</application> is a collection of both secure hash
-        functions (such as SHA256 and RIPEMD160), and various encryption
-        algorithms (AES, DES, RSA, ElGamal, etc.).
-      </para>
-
-      &lfs90_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycrypto-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycrypto-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycrypto-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycrypto-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycrypto-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycrypto-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCrypto Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/> 
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pycrypto"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCrypto</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>
-        To build the <application>Python 2</application> and
-        <application>Python 3</application> modules, run the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
-
-      <para>
-        To install both modules, run the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            pycrypto-&pycrypto-version;-py&python2-majorver;.egg-info and/or
-            pycrypto-&pycrypto-version;-py&python3-majorver;.egg-info
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/Crypto and/or
-            /usr/lib/python&python3-majorver;/site-packages/Crypto
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End pycrypto -->
Index: chive/pycryptodome.xml
===================================================================
--- archive/pycryptodome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,117 +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 pycryptodome-download-http "https://github.com/Legrandin/pycryptodome/archive/v&pycryptodome-version;/pycryptodome-&pycryptodome-version;.tar.gz">
-  <!ENTITY pycryptodome-download-ftp  " ">
-  <!ENTITY pycryptodome-md5sum        "37301ba099375e05db0dfb4d1800d6fe">
-  <!ENTITY pycryptodome-size          "16 MB">
-  <!ENTITY pycryptodome-buildsize     "54 MB">
-  <!ENTITY pycryptodome-time          "0.1 SBU">
-]>
-
-  <!-- Begin pycryptodome -->
-  <sect2 id="pycryptodome" xreflabel="PyCryptodome-&pycryptodome-version;">
-
-    <title>PyCryptodome-&pycryptodome-version;</title>
-
-    <indexterm zone="pycryptodome">
-      <primary sortas="a-pycryptodome">pycryptodome</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the PyCryptodome Module</title>
-
-      <para>
-        <application>PyCryptodome</application> is a collection of both secure
-        hash functions (such as SHA256 and RIPEMD160), and various encryption
-        algorithms (AES, DES, RSA, ElGamal, etc.), and is a drop-in replacement
-        for PyCrypto.
-      </para>
-
-      &lfs120_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycryptodome-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycryptodome-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycryptodome-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycryptodome-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycryptodome-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycryptodome-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCryptodome</title>
-
-      <para>
-        To build <application>PyCryptodome</application> as a Python 3
-        module, run the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, run the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pycryptodome</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/Crypto
-            /usr/lib/python&python3-majorver;/site-packages/pycryptodome-&pycryptodome-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: chive/pyhosted-inc.xsl
===================================================================
--- archive/pyhosted-inc.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-  <xsl:variable name="part1"><![CDATA[<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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 pythonhosted-download-http "See Below">
-  <!ENTITY pythonhosted-download-ftp  " ">
-  <!ENTITY pythonhosted-md5sum        "See Below">
-  <!ENTITY pythonhosted-size          "14 MB">
-  <!ENTITY pythonhosted-buildsize     "2.2 MB">
-  <!ENTITY pythonhosted-time          "TBD SBU)">
-]>
-
-<sect2 id="pythonhosted" xreflabel="pythonhosted files">
-   <!--<?dbhtml filename="pythonhosted.html"?>-->
-
-  <title>Building pythonhosted.org Files</title>
-
-  <indexterm zone="pythonhosted">
-     <primary sortas="a-pythonhosted">pythonhosted</primary>
-  </indexterm>
-
-  <sect3 role="package">
-   <title>Introduction to pythonhosted.org Files</title>
-
-  <para>
-     This section is for user convenience and is optional.
-     It can be used to fetch and install all the pythonhosted.org module
-     packages below in two convenient scripts.
-  </para>
-
-  &lfs112_checked;
-
-  <bridgehead renderas="sect4">Package Information</bridgehead>
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para>
-        Download (HTTP): &pythonhosted-download-http;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download (FTP): <ulink url="&pythonhosted-download-ftp;"/>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download MD5 sum: &pythonhosted-md5sum;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download size: &pythonhosted-size;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated disk space required: &pythonhosted-buildsize;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated build time: &pythonhosted-time;
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <bridgehead renderas="sect4">Pythonhosted.org Dependencies</bridgehead>
-
-  <bridgehead renderas="sect5">Required</bridgehead>
-  <para role="required">
-    TBD
-    <!--<xref linkend="fontforge"/>,-->
-    <!-- does not seem to be needed as of 5.22.4 <xref linkend="GConf"/>, -->
-  </para>
-
-  <bridgehead renderas="sect5">Recommended</bridgehead>
-  <para role="recommended">
-     TBD
-     <!--<xref linkend="fftw"/>,-->
-  </para>
-
-  <bridgehead renderas="sect5">Optional</bridgehead>
-  <para role="optional">
-     TBD
-     <!--
-    <xref linkend="glu"/>,
-    <ulink url="http://www.dest-unreach.org/socat/">socat</ulink> (for pam_kwallet)-->
-  </para>
-  <!--
-  <para condition="html" role="usernotes">User Notes:
-  <ulink url="&blfs-wiki;/pythonhosted"/></para>
-  -->
-  </sect3>
-
-   <sect3>
-    <title>Downloading All Pythonhosted Module Files</title>
-
-    <para>
-      The easiest way to install the modules from the files.pythonhosted.org site
-      is to run a script to install them all at once.
-    </para>
-
-    <para>
-      The order of building files is important due to internal dependencies.
-      First, create the list of files in the proper order as follows:
-    </para>
-
-<screen><userinput>cat &gt; pythonhosted-files.md5 &lt;&lt; "EOF"
-<literal>]]></xsl:variable>
-  <xsl:variable name="part2"><![CDATA[</literal>
-EOF</userinput></screen>
-
-    <para>
-      Next, create a script to fetch the files:
-    </para>
-
-    <screen><userinput>cat &gt; get-pythonhosted-files.sh &lt;&lt; "EOF"
-<literal>#! /bin/bash
-
-PYTHONHOSTED=https://files.pythonhosted.org/packages/source
-
-mkdir -p pythonhosted
-cd pythonhosted
-
-for package in $(grep -v '^#' ../pythonhosted-files.md5 | awk '{print $2}')
-do
-  # Don't try to get a package that is already present
-  [ -e $package ] &amp;&amp; continue
-  basename=$(echo $package|sed 's/-[[:digit:]].*$//')
-  basechar=$(echo $basename|cut -c 1)
-  url=$PYTHONHOSTED/$basechar/$basename/$package
-  wget $url
-done
-EOF</literal></userinput></screen>
-
-    <para>
-      Run the script and check the files:
-    </para>
-
-   <screen><userinput>bash get-pythonhosted-files.sh &amp;&amp;
-   md5sum -c ../pythonhosted-files.md5</userinput></screen>
-
-   </sect3>
-
-  <sect3 role="installation">
-    <title>Installation of Pythonhosted Modules</title>
-
-    <para>
-      Set up a script to install all of the packages:
-    </para>
-
-    <screen><userinput>cat &gt; install-pythonhosted-files.sh &lt;&lt; "EOF"
-<literal>#! /bin/bash
-
-cd pythonhosted
-
-for package in $(grep -v '^#' ../pythonhosted-files.md5 | awk '{print $2}')
-do
-  name=$(echo $package|sed 's/-[[:digit:]].*$//')
-
-  # Don't try to install the package if it already installed
-  installed=$(pip3 show $name 2&gt; /dev/null | grep Version:)
-
-  unset version
-  if [ -n $installed ]; then
-    version=$(echo $installed | awk '{print $2}')
-  fi
-
-  if [ -n "$version" ]; then
-    if [ ! $(echo $package | grep -q $version) ]; then
-      echo $package is already installed
-      continue
-    fi
-  fi
-
-  # Now install the package
-  packagedir=${package%.tar.?z*}
-  rm -rf $packagedir
-  tar -xf $package
-  pushd $packagedir
-    pip3 wheel -w dist --no-build-isolation --no-deps $PWD
-    sudo pip3 install --no-index --find-links dist --no-cache-dir \
-                      --no-user --upgrade $name
-  popd
-done</literal></userinput></screen>
-
-    <para>
-       Now run the script to install the files.  If the script is run
-       multiple times, it will not try to reinstall the modules unless
-       the version in the .md5 file has been changed.
-    </para>
-
-   <screen><userinput>bash install-pythonhosted-files.sh</userinput></screen>
-
-   <para>Some of the packages have test procedures. See the individual
-   package sections below to run any desired tests.</para>
-
-  </sect3>
-
-  <sect3 role="content">
-    <title>Contents</title>
-
-    <para>
-       See the contents of the individual package sections below.
-    </para>
-
-  </sect3>
-
-</sect2>]]></xsl:variable>
-
-</xsl:stylesheet>
Index: chive/pyrex.xml
===================================================================
--- archive/pyrex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,117 +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 pyrex-download-http
-           "http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-&pyrex-version;.tar.gz">
-  <!ENTITY pyrex-download-ftp  " ">
-  <!ENTITY pyrex-md5sum        "515dee67d15d4393841e2d60e8341947">
-  <!ENTITY pyrex-size          "252 KB">
-  <!ENTITY pyrex-buildsize     "4.0 MB">
-  <!ENTITY pyrex-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Pyrex -->
-  <sect2 id="pyrex" xreflabel="Pyrex-&pyrex-version;">
-
-    <title>Pyrex-&pyrex-version;</title>
-
-    <indexterm zone="pyrex">
-      <primary sortas="a-Pyrex">Pyrex</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pyrex Module</title>
-
-      <para>
-        <application>Pyrex</application> is language used for writing
-        <application>Python</application> extension modules.
-      </para>
-
-      &lfs74_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-          Download (HTTP): <ulink url="&pyrex-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyrex-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyrex-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyrex-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyrex-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyrex-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pyrex Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pyrex"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pyrex</title>
-
-      <para>
-        Install <application>pyrex</application> by running the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            pyrexc
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/Pyrex
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Pyrex -->
Index: chive/python-slip.xml
===================================================================
--- archive/python-slip.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +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 python-slip-download-http "https://github.com/nphilipp/python-slip/releases/download/python-slip-&python-slip-version;/python-slip-&python-slip-version;.tar.bz2">
-  <!ENTITY python-slip-download-ftp  " ">
-  <!ENTITY python-slip-md5sum        "28ae5f93853466c44ec96706ba2a1eb4">
-  <!ENTITY python-slip-size          "28 KB">
-  <!ENTITY python-slip-buildsize     "612 KB">
-  <!ENTITY python-slip-time          "0.1 SBU">
-]>
-
-  <!-- Begin python-slip -->
-  <sect2 id="python-slip" xreflabel="python-slip-&python-slip-version;">
-    <title>python-slip-&python-slip-version;</title>
-
-    <indexterm zone="python-slip">
-      <primary sortas="a-python-slip">python-slip</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to python-slip Module</title>
-
-      <para>
-        <application>python-slip</application> provides convenience, extension
-         and workaround code for Python and some Python modules.
-      </para>
-
-      &lfs110a_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&python-slip-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&python-slip-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &python-slip-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &python-slip-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &python-slip-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &python-slip-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">python-slip Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus-python"/>,
-        <xref linkend="decorator"/>, and
-        <xref linkend="six"/>
-      </para>
-
-      <para condition="html" role="usernotes">User Notes:
-        <ulink url="&blfs-wiki;/python-slip"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of python-slip</title>
-
-      <para>
-        To build the <application>python-slip</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>sed 's/@VERSION@/0.6.5/' setup.py.in > setup.py &amp;&amp;
-python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>python-slip</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            usr/lib/python&python3-majorver;/site-packages/python-slip-&python-slip-version;-py&python3-majorver;.egg-info
-            and
-            usr/lib/python&python3-majorver;/site-packages/python-slip.dbus-&python-slip-version;-py&python3-majorver;.egg-info
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/python-slip
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: chive/pythonhosted.xml
===================================================================
--- archive/pythonhosted.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,245 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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 pythonhosted-download-http "See Below">
-  <!ENTITY pythonhosted-download-ftp  " ">
-  <!ENTITY pythonhosted-md5sum        "See Below">
-  <!ENTITY pythonhosted-size          "14 MB">
-  <!ENTITY pythonhosted-buildsize     "2.2 MB">
-  <!ENTITY pythonhosted-time          "TBD SBU)">
-]>
-
-<sect2 id="pythonhosted" xreflabel="pythonhosted files">
-   <!--<?dbhtml filename="pythonhosted.html"?>-->
-
-  <title>Building pythonhosted.org Files</title>
-
-  <indexterm zone="pythonhosted">
-     <primary sortas="a-pythonhosted">pythonhosted</primary>
-  </indexterm>
-
-  <sect3 role="package">
-   <title>Introduction to pythonhosted.org Files</title>
-
-  <para>
-     This section is for user convenience and is optional.
-     It can be used to fetch and install most of the pythonhosted.org module
-     packages in two convenient scripts.  These scripts do not run
-     any tests.  To run the tests for an individual module see the 
-     appropriate detailed sections below or in the Python Dependencies page.
-  </para>
-
-  &lfs112_checked;
-
-  <bridgehead renderas="sect4">Package Information</bridgehead>
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para>
-        Download (HTTP): &pythonhosted-download-http;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download (FTP): <ulink url="&pythonhosted-download-ftp;"/>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download MD5 sum: &pythonhosted-md5sum;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download size: &pythonhosted-size;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated disk space required: &pythonhosted-buildsize;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated build time: &pythonhosted-time;
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <note>
-    <para>
-      The dependencies shown here do not include those external to BLFS
-      or those only needed for tests.
-      See the individual sections below for a full list of dependencies.
-    </para>
-  </note>
-
-  <bridgehead renderas="sect4">Pythonhosted.org Dependencies</bridgehead>
-
-  <bridgehead renderas="sect5">Required</bridgehead>
-  <para role="required">
-    <!--<xref linkend="fontforge"/>,-->
-    <!-- does not seem to be needed as of 5.22.4 <xref linkend="GConf"/>, -->
-  </para>
-
-  <bridgehead renderas="sect5">Recommended</bridgehead>
-  <para role="recommended">
-     <!--<xref linkend="fftw"/>,-->
-  </para>
-
-  <bridgehead renderas="sect5">Optional</bridgehead>
-  <para role="optional">
-     <!--
-    <xref linkend="glu"/>,
-    <ulink url="http://www.dest-unreach.org/socat/">socat</ulink> (for pam_kwallet)-->
-  </para>
-
-  </sect3>
-
-   <sect3>
-    <title>Downloading All Pythonhosted Module Files</title>
-
-    <para>
-      The easiest way to install the modules from the files.pythonhosted.org site
-      is to run a script to install them all at once.
-    </para>
-
-    <para>
-      The order of building files is important due to internal dependencies.
-      First, create the list of files in the proper order as follows:
-    </para>
-
-<screen><userinput>cat &gt; pythonhosted-files.md5 &lt;&lt; "EOF"
-<literal>a70f9fc85b6b8265c982eca6fe51381f  charset-normalizer-2.1.1.tar.gz
-4a4791e97f3a8c9a1645064a35636ee6  flit_core-3.7.1.tar.gz
-13ea24e076212b6baae1135a116d1e0e  idna-3.4.tar.gz
-ba308b52b9092184cf4905bc59a88fc0  urllib3-1.26.12.tar.gz
-3591827fde96d1dd23970fb05410ed04  alabaster-0.7.12.tar.gz
-b1d2ed6592bbdf6002ef52b4ab8e2efe  pytz-2022.4.tar.gz
-809ed21b4f643167d0f6f5e936bbfbdc  Babel-2.10.3.tar.gz
-5a40586a25c07e1a8f16f6267252c321  imagesize-1.4.1.tar.gz
-#fadc2f3bf5872bf6310576a86c3566e0  pyparsing-3.0.9.tar.gz
-#e713c1939f294fd729af4a7be40dd141  packaging-21.3.tar.gz
-#447be4afb076c8325a7dc659aff5b931  Pygments-2.14.0.tar.gz
-4332ddc7bbee0f344a03915b2ad59a54  snowballstemmer-2.2.0.tar.gz
-3f2de7681e12dde031acee0497c3cc2b  sphinxcontrib-applehelp-1.0.2.tar.gz
-94069c5cdb5079c445f5477fa6107016  sphinxcontrib-devhelp-1.0.2.tar.gz
-70765b55395a3c20233631802902c840  sphinxcontrib-htmlhelp-2.0.0.tar.gz
-e45179f0a3608b6766862e0f34c23b62  sphinxcontrib-jsmath-1.0.1.tar.gz
-93216721f3e154cce12d1e9c3307b415  sphinxcontrib-qthelp-1.0.3.tar.gz
-d99d2edc7b26988dc5fa92163857bfbf  sphinxcontrib-serializinghtml-1.1.5.tar.gz
-#fdfc7d2e102cb96eca0f6155dde7403e  sphinx_rtd_theme-1.0.0.tar.gz
-0487081b7ead8753fc46cf7c6d1e28e3  attrs-22.1.0.tar.gz
-d4341621d423a7ca6822e23d6d52bb9a  tomli-2.0.1.tar.gz
-5cfcb56ea6fc4972c3600c0030f4d136  typing_extensions-4.4.0.tar.gz
-0df4e7fd923e4983cd65786efaa0e0d0  setuptools_scm-7.0.5.tar.gz
-0b7f3be87481211c183eae095bcea6f1  iniconfig-1.1.1.tar.gz
-daa6fddfb6cd364f3c82e52098911e4b  pluggy-1.0.0.tar.gz
-bde7dcc1cb452a1e10206ef2f811ba88  py-1.11.0.tar.gz
-#c4de3e192e5bb4b39deada36cc2f393a  pytest-7.1.3.tar.gz
-597656cf4feadf1998b0511201620202  Markdown-3.4.1.tar.gz
-59bce5d8d67e858735ec3f399ec90253  toml-0.10.2.tar.gz
-27957540f4718e892039b2ed208c78f3  smartypants-2.0.1.tar.gz
-63f38f80531996f187d2894cc497ba08  typogrify-2.0.7.tar.gz
-#e1b86477bd77254a9e4070371887950c  gi-docgen-2022.1.tar.gz</literal>
-EOF</userinput></screen>
-
-    <para>
-      Next, create a script to fetch the files:
-    </para>
-
-    <screen><userinput>cat &gt; get-pythonhosted-files.sh &lt;&lt; "EOF"
-<literal>#! /bin/bash
-
-PYTHONHOSTED=https://files.pythonhosted.org/packages/source
-
-mkdir -p pythonhosted
-cd pythonhosted
-
-for package in $(grep -v '^#' ../pythonhosted-files.md5 | awk '{print $2}')
-do
-  # Don't try to get a package that is already present
-  [ -e $package ] &amp;&amp; continue
-  basename=$(echo $package|sed 's/-[[:digit:]].*$//')
-  basechar=$(echo $basename|cut -c 1)
-  url=$PYTHONHOSTED/$basechar/$basename/$package
-  wget $url
-done
-EOF</literal></userinput></screen>
-
-    <para>
-      Run the script and check the files:
-    </para>
-
-   <screen><userinput>bash get-pythonhosted-files.sh &amp;&amp;
-   md5sum -c ../pythonhosted-files.md5</userinput></screen>
-
-   </sect3>
-
-  <sect3 role="installation">
-    <title>Installation of Pythonhosted Modules</title>
-
-    <para>
-      Set up a script to install all of the packages:
-    </para>
-
-    <screen><userinput>cat &gt; install-pythonhosted-files.sh &lt;&lt; "EOF"
-<literal>#! /bin/bash
-
-cd pythonhosted
-
-for package in $(grep -v '^#' ../pythonhosted-files.md5 | awk '{print $2}')
-do
-  name=$(echo $package|sed 's/-[[:digit:]].*$//')
-
-  # Don't try to install the package if it already installed
-  installed=$(pip3 show $name 2&gt; /dev/null | grep Version:)
-
-  unset version
-  if [ -n $installed ]; then
-    version=$(echo $installed | awk '{print $2}')
-  fi
-
-  if [ -n "$version" ]; then
-    if [ ! $(echo $package | grep -q $version) ]; then
-      echo $package is already installed
-      continue
-    fi
-  fi
-
-  # Now install the package
-  packagedir=${package%.tar.?z*}
-  rm -rf $packagedir
-  tar -xf $package
-  pushd $packagedir
-    pip3 wheel -w dist --no-build-isolation --no-deps $PWD
-    sudo pip3 install --no-index --find-links dist --no-cache-dir \
-                      --no-user --upgrade $name
-  popd
-done</literal></userinput></screen>
-
-    <para>
-       Now run the script to install the files.  If the script is run
-       multiple times, it will not try to reinstall the modules unless
-       the version in the .md5 file has been changed.
-    </para>
-
-   <screen><userinput>bash install-pythonhosted-files.sh</userinput></screen>
-
-   <para>Some of the packages have test procedures. See the individual
-   package sections below to run any desired tests.</para>
-
-  </sect3>
-
-  <sect3 role="content">
-    <title>Contents</title>
-
-    <para>
-       See the contents of the individual package sections below.
-    </para>
-
-  </sect3>
-
-</sect2>
Index: chive/pythonhosted.xsl
===================================================================
--- archive/pythonhosted.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-
-  <xsl:output method="text"/>
-
-  <!-- The pyhosted-inc.xsl file contains two variables, one containing
-       the text of
-       pythonhosted.xml before the creation of pythonhosted-files.md5,
-       the other containing the text after that.-->
-  <xsl:include href="pyhosted-inc.xsl"/>
-  <!-- list of python modules whose dependencies should be listed -->
-  <xsl:param name="packages">requests sphinx_rtd_theme pytest</xsl:param>
-  <!-- Name of the .xml where to find all python dependencies -->
-  <xsl:variable name="python-deps">python-dependencies.xml</xsl:variable>
-  <!-- This variable is a scan of the dependency graph in depth first order.
-       it is a suitable order for building, except it contains many
-       duplicates.-->
-  <xsl:variable name="raw-dep-list">
-    <xsl:call-template name="gen-deps">
-      <xsl:with-param name="list" select="$packages"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <!-- This variable is a copy of raw-dep-list, but with duplicates removed -->
-  <xsl:variable name="dep-list">
-    <xsl:call-template name="make-unique">
-      <xsl:with-param name="list" select="$raw-dep-list"/>
-      <xsl:with-param name="temp" select="' '"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- scan the list of modules and generates dependencies for each -->
-  <xsl:template name="gen-deps">
-    <xsl:param name="list" select="$packages"/>
-    <xsl:choose>
-      <xsl:when test="contains($list,' ')">
-        <xsl:call-template name="gen-deps">
-          <xsl:with-param name="list" select="substring-before($list,' ')"/>
-        </xsl:call-template>
-        <xsl:call-template name="gen-deps">
-          <xsl:with-param name="list" select="substring-after($list,' ')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="id($list)" mode="gen-dep"/>
-        <xsl:value-of select="$list"/>
-        <xsl:text> </xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- This template is applied recursively for each dependency. -->
-  <xsl:template match="*" mode="gen-dep">
-    <!-- for debugging
-    <xsl:message>
-      <xsl:text>generating deps for </xsl:text>
-      <xsl:value-of select="@id"/>
-      <xsl:text>
-</xsl:text>
-    </xsl:message>
--->
-    <xsl:apply-templates
-      select="descendant::para[@role='required' or
-                               @role='recommended']"
-      mode="dep-list"/>
-  </xsl:template>
-
-  <!-- this template calls the preceding one for each dependency found,
-       printing the name of the dependency afterwards. This generates the
-       depth-first order -->
-  <xsl:template match="para" mode="dep-list">
-    <xsl:for-each select="xref">
-      <!-- The linkend may point either to the current document, or
-           if not found to the python-dependencies.xml document. Note
-           that the current document may be already python-dependencies.xml.-->
-      <xsl:choose>
-        <xsl:when test="//*[@id=current()/@linkend]">
-          <xsl:apply-templates select="//*[@id=current()/@linkend]" mode="gen-dep"/>
-          <xsl:value-of select="@linkend"/>
-          <xsl:text> </xsl:text>
-        </xsl:when>
-        <xsl:when test="document($python-deps,/)//*[@id=current()/@linkend]">
-          <xsl:apply-templates select="document($python-deps,/)//*[@id=current()/@linkend]" mode="gen-dep"/>
-          <xsl:value-of select="@linkend"/>
-          <xsl:text> </xsl:text>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Template to remove duplicates. Each time it is called, the param
-       "list" contains the list remaining to be processed, and the
-       param "temp" contains the already processed list with no duplicates -->
-  <xsl:template name="make-unique">
-    <xsl:param name="list" select="$raw-dep-list"/>
-    <xsl:param name="temp" select="' '"/>
-    <xsl:choose>
-      <xsl:when test="contains($list,' ')">
-        <xsl:variable name="package" select="substring-before($list,' ')"/>
-        <xsl:variable name="temp1">
-          <xsl:choose>
-       <!-- the concat is needed to prevent problems with a package
-            containing the name of another package -->
-            <xsl:when test="contains($temp,concat(' ',$package,' '))">
-              <xsl:copy-of select="$temp"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:copy-of select="$temp"/>
-              <xsl:text> </xsl:text>
-              <xsl:copy-of select="$package"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:call-template name="make-unique">
-          <xsl:with-param name="list" select="substring-after($list,' ')"/>
-          <xsl:with-param name="temp" select="$temp1"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="contains($temp,concat(' ',$list,' '))">
-            <xsl:copy-of select="$temp"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$temp"/>
-            <xsl:text> </xsl:text>
-            <xsl:copy-of select="$list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- with the variable dep-list, we can apply templates for generating
-       the content of the .md5 file. We just have to copy the variables set
-       in pyhosted-inc before and after that file -->
-  <xsl:template match="/">
-    <!-- debug
-    <xsl:message>
-      <xsl:text>Generating new pythonhosted.xml with list:
-</xsl:text>
-      <xsl:value-of select="normalize-space($dep-list)"/>
-      <xsl:text>
-</xsl:text>
-    </xsl:message>
--->
-    <xsl:value-of select="$part1"/>
-    <xsl:call-template name="make-md5">
-      <xsl:with-param name="list" select="normalize-space($dep-list)"/>
-    </xsl:call-template>
-    <xsl:value-of select="$part2"/>
-  </xsl:template>
-
-  <xsl:template name="make-md5">
-    <xsl:param name="list" select="normalize-space($dep-list)"/>
-    <xsl:choose>
-      <xsl:when test="contains($list,' ')">
-        <xsl:variable name="dep" select="substring-before($list,' ')"/>
-        <xsl:choose>
-      <!-- requests, docutils, and sphinx are not taken from pythonhosted:
-           don't have them in the .md5 file, even commented out -->
-          <xsl:when test="$dep='requests' or $dep='docutils' or $dep='sphinx'"/>
-          <xsl:otherwise>
-            <xsl:call-template name="make-md5">
-              <xsl:with-param name="list" select="$dep"/>
-            </xsl:call-template>
-            <xsl:text>
-</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:call-template name="make-md5">
-          <xsl:with-param name="list" select="substring-after($list,' ')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-       <!-- first try to find the dependency in python-modules. If so, precede
-            it with a `#' -->
-        <xsl:apply-templates
-          select="id($list)"
-          mode="md5-line">
-          <xsl:with-param name="first-char" select="'#'"/>
-        </xsl:apply-templates>
-        <!-- then try in python-dependencies -->
-        <xsl:apply-templates
-          select="document($python-deps,/)//sect2[@id=$list]"
-          mode="md5-line"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="sect2" mode="md5-line">
-    <xsl:param name="first-char" select="''"/>
-    <!-- debug
-    <xsl:message>
-      <xsl:text>Generating md5 for </xsl:text>
-      <xsl:value-of select="@id"/>
-      <xsl:text>
-</xsl:text>
-    </xsl:message>
--->
-    <xsl:copy-of select="$first-char"/>
-    <xsl:apply-templates select=".//para[contains(text(),'MD5')]" mode="md5"/>
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select=".//para[contains(text(),'HTTP')]" mode="http"/>
-  </xsl:template>
-
-    <xsl:template match="para" mode="md5">
-    <xsl:choose>
-      <xsl:when test="contains(substring-after(string(),'sum: '),'&#xA;')">
-        <xsl:value-of select="substring-before(substring-after(string(),'sum: '),'&#xA;')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-after(string(),'sum: ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="para" mode="http">
-    <xsl:call-template name="base">
-      <xsl:with-param name="path" select="ulink/@url"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="base">
-    <xsl:param name="path" select="''"/>
-    <xsl:choose>
-      <xsl:when test="contains($path,'/')">
-        <xsl:call-template name="base">
-          <xsl:with-param name="path" select="substring-after($path,'/')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$path"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
Index: chive/qjson.xml
===================================================================
--- archive/qjson.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,160 +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 qjson-download-http "http://downloads.sourceforge.net/qjson/qjson-&qjson-version;.tar.bz2">
-  <!ENTITY qjson-download-ftp  " ">
-  <!ENTITY qjson-md5sum        "323fbac54a5a20c0b8fe45c1ced03e2d">
-  <!ENTITY qjson-size          "64 KB">
-  <!ENTITY qjson-buildsize     "1.4 MB">
-  <!ENTITY qjson-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="qjson" xreflabel="QJson-&qjson-version;">
-  <?dbhtml filename="qjson.html"?>
-
-
-  <title>QJson-&qjson-version;</title>
-
-  <indexterm zone="qjson">
-    <primary sortas="a-QJson">QJson</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QJson</title>
-
-    <para>
-      <application>QJson</application> is a Qt-based library that maps JSON
-      data to QVariant objects and vice versa.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qjson-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qjson-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qjson-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qjson-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qjson-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qjson-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QJson Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt4"/> and
-      <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qjson"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QJson</title>
-
-    <para>
-      Install <application>QJson</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  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not contain a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
-    build without debugging symbols and apply a higher level of compiler
-    optimizations.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          none
-        </seg>
-        <seg>
-          libqjson.so
-        </seg>
-        <seg>
-          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqjson">
-        <term><filename class="libraryfile">libqjson.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>QJson</application> API functions.
-          </para>
-          <indexterm zone="qjson libqjson">
-            <primary sortas="c-libqjson">libqjson.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/qpopper.xml
===================================================================
--- archive/qpopper.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 qpopper-download-http " ">
-  <!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper&qpopper-version;.tar.gz">
-  <!ENTITY qpopper-md5sum "3b62b70fbcd16bb17795e1762dd33765">
-  <!ENTITY qpopper-size "1.2 MB">
-  <!ENTITY qpopper-buildsize "7.2 MB">
-  <!ENTITY qpopper-time "0.1 SBU">
-]>
-
-<sect1 id="qpopper" xreflabel="Qpopper-&qpopper-version;">
-  <?dbhtml filename="qpopper.html"?>
-
-
-  <title>Qpopper-&qpopper-version;</title>
-
-  <indexterm zone="qpopper">
-    <primary sortas="a-Qpopper">Qpopper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qpopper</title>
-
-    <para>The <application>Qpopper</application> package contains a
-    POP3 mail server.</para>
-
-    &lfs74_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qpopper-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qpopper-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qpopper-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qpopper-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qpopper-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qpopper-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qpopper Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">An <xref linkend="server-mail"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openssl"/>,
-      <xref linkend="linux-pam"/>, and
-      <xref linkend="mitkrb"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qpopper"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qpopper</title>
-
-    <para>Install <application>Qpopper</application> with the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --enable-standalone &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;
-install -D -m644 GUIDE.pdf /usr/share/doc/qpopper-&qpopper-version;/GUIDE.pdf</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--enable-standalone</option>: This option gives the
-    flexibility to run <application>Qpopper</application> in
-    standalone mode.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qpopper</title>
-
-    <sect3 id="qpopper-config">
-      <title>Configuration Information</title>
-
-      <para>Update the <application>Syslog</application> configuration file and
-      force the <command>syslogd</command> daemon to reread the new file so that
-      <application>Qpopper</application> events are logged:</para>
-
-      <indexterm zone="qpopper qpopper-config">
-        <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
-      </indexterm>
-
-<screen role="root"><userinput>echo "local0.notice;local0.debug /var/log/POP.log" &gt;&gt; /etc/syslog.conf &amp;&amp;
-killall -HUP syslogd</userinput></screen>
-
-      <para id="qpopper-init">If you want <application>Qpopper</application> to
-      start automatically when the system is booted, install the
-      <filename>/etc/rc.d/init.d/qpopper</filename> init script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="qpopper qpopper-init">
-        <primary sortas="f-qpopper">popper</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-qpopper</userinput></screen>
-
-      <para>This startup procedure uses a configuration file.  The details of
-      the configuration file can be found in the documentation file
-      <filename>GUIDE.pdf</filename>.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/mail/qpopper.conf &lt;&lt; "EOF"
-<literal># Qpopper configuration file
-
-set debug = false
-
-set spool-dir = /var/spool/mail/
-set temp-dir  = /var/spool/mail/
-
-set downcase-user = true
-set trim-domain = true
-
-set statistics = true
-
-# End /etc/shells</literal>
-EOF</userinput></screen>
-
-      <para>If you use <command>inetd</command>, the following command will
-      add the <application>Qpopper</application> entry to
-      <filename>/etc/inetd.conf</filename>:</para>
-
-      <indexterm zone="qpopper qpopper-config">
-        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-      </indexterm>
-
-<screen role="root"><userinput>echo "pop3 stream tcp nowait root /usr/sbin/popper popper" &gt;&gt; /etc/inetd.conf &amp;&amp;
-killall inetd || inetd</userinput></screen>
-
-      <para>Issue a <command>killall -HUP inetd</command> to reread the
-      changed <filename>inetd.conf</filename> file.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>popper</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="popper-qpopper">
-        <term><command>popper</command></term>
-        <listitem>
-          <para>is the POP3 server daemon.</para>
-          <indexterm zone="qpopper popper-qpopper">
-            <primary sortas="b-popper">popper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/qscintilla.xml
===================================================================
--- archive/qscintilla.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +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 qscintilla-download-http "&sourceforge-dl;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
-  <!ENTITY qscintilla-download-ftp  " ">
-  <!ENTITY qscintilla-md5sum        "48ef316ff1e2a4d45a65d42be146ca39">
-  <!ENTITY qscintilla-size          "2.6 MB">
-  <!ENTITY qscintilla-buildsize     "28 MB (with documentation)">
-  <!ENTITY qscintilla-time          "0.4 SBU (using parallelism=4; with documentation)">
-]>
-
-<sect1 id="qscintilla" xreflabel="qscintilla-&qscintilla-version;">
-  <?dbhtml filename="qscintilla.html"?>
-
-
-  <title>QScintilla-gpl-&qscintilla-version;</title>
-
-  <indexterm zone="qscintilla">
-    <primary sortas="a-qscintilla">qscintilla</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QScintilla</title>
-
-    <para>
-      <application>QScintilla</application> is a port to
-      <application>Qt</application> of <ulink
-      url="http://www.scintilla.org/">Scintilla</ulink>. As well as features
-      found in standard text editing components, it includes features
-      especially useful when editing and debugging source code: language
-      syntax styling, error indicators, code completion, call tips, code
-      folding, margins can contain markers like those used in debuggers to
-      indicate breakpoints and the current line, recordable macros, multiple
-      views and, of course, printing.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qscintilla-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qscintilla-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qscintilla-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qscintilla-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qscintilla-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qscintilla-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QScintilla Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="chrpath"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink
-      url="http://riverbankcomputing.co.uk/software/pyqt/intro">PyQt</ulink>
-      (for <application>Python</application> <application>Qt</application>
-      bindings)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qscintilla"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QScintilla</title>
-
-    <note>
-      <para>
-        The instructions in this page are just for the
-        <application>QScintilla</application> application. Code is included in
-        the tarball for  <application>QScintilla Qt Designer</application>
-        plugin and <application>Python</application> bindings.
-      </para>
-    </note>
-
-    <para>
-      Install <application>QScintilla</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd Qt4Qt5             &amp;&amp;
-qmake qscintilla.pro  &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>
-
-<!-- For "DESTDIR" install, use: make INSTALL_ROOT=<destination> install -->
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sfv $(readlink $QT5DIR/lib/libqscintilla2_qt5.so) $QT5DIR/lib/libqt5scintilla2.so</userinput></screen>
-
-    <para>
-      If you wish to install the documentation, issue, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html &amp;&amp;
-install -v -m644    ../doc/html-Qt4Qt5/* \
-                    $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
-
-  </sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -sfv ...</command>: This command creates a compatibility 
-      symlink needed by some programs.
-    </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>
-          $QT5DIR/lib/libqt5scintilla2.so (link to libqscintilla2_qt5.so) and
-          $QT5DIR/lib/libqscintilla2_qt5.so
-        </seg>
-        <seg>
-          $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqscintilla2_qt5">
-        <term><filename class="libraryfile">libqscintilla2_qt5.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>QScintilla</application>
-            <application>Qt5</application> API functions.
-          </para>
-          <indexterm zone="qscintilla libqscintilla2_qt5">
-            <primary sortas="c-libqscintilla2_qt5.so">libqscintilla2_qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/qt-alternatives.xml
===================================================================
--- archive/qt-alternatives.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,60 +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" [
-   <!ENTITY % general-entities SYSTEM "../general.ent">
-   %general-entities;
-]>
-
-<sect2>
-    <title>Qt Installation Alternatives</title>
-
-    <para>The installation of <application>Qt</application> presents
-    several challenges and choices. Complicating the Qt installation is the fact
-    that there are two versions,  <application>Qt4</application> and
-    <application>Qt5</application>, that have executable programs with
-    identical names.  If both packages are installed on one system,
-    the only methods to manage which set of programs is used is to
-    either control the users' <envar>PATH</envar> or to rename files
-    either directly or via symbolic links.  Both packages cannot
-    be installed in the same directory.
-    </para>
-
-    <para>If you are only going to install one of the Qt versions,
-    the choice of installation methods is easier.  You can either
-    install the components in the several directories of the <filename
-    class='directory'>/usr</filename> hierarchy or install the
-    entire package in a separate directory of your choice. <!-- We
-    refer to these options below as "Method 1: Installing in /usr"
-    and "Method 2: Installing in /opt". --></para>
-
-    <para>If both versions of Qt are to be installed, one or both versions need
-    to be installed in a separate directory.  For the purposes here we use the
-    <filename class='directory'>/opt</filename> directory.  The selection of
-    which version is being used by individual users on a system is controlled
-    by the <envar>PATH</envar> variable.  Other systems can be designed, but
-    the BLFS editors find the <envar>PATH</envar> method easiest.</para>
-
-    <para> The advantage of installing in <filename
-    class='directory'>/usr</filename> is that no updates to the
-    <filename>/etc/ld.so.conf</filename> or
-    <filename>/etc/man_db.conf</filename> files are required. The package files
-    are distributed within several subdirectories of the <filename
-    class='directory'>/usr</filename> hierarchy.  This is the method that most
-    commercial distributions use.  The disadvantage for BLFS users is that this
-    Qt instance cannot be upgraded while it is in use.  For instance, it cannot
-    be upgraded from a running KDE environment.  It also precludes having
-    multiple versions of Qt on your system and does not allow reverting to
-    an existing, known working instance of Qt.</para>
-
-    <para> The advantage of installing <application>Qt</application> in a
-    custom directory such as <filename
-    class='directory'>/opt/qt-&qt4-version;</filename> or <filename
-    class='directory'>/opt/qt-&qt5-version;</filename> is that it keeps all
-    the package files consolidated in a dedicated directory hierarchy. By using
-    this method, an update can be made without overwriting a previous
-    installation and users can easily revert to a previous version by changing
-    one symbolic link or merely changing the PATH variable.  It also allows a
-    developer to maintain multiple versions of <application>Qt4</application>
-    or <application>Qt5</application> for testing.  </para>
-
-</sect2>
Index: chive/qt4.8.xml
===================================================================
--- archive/qt4.8.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,986 +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 qt4-major  "4.8">
-  <!ENTITY wk-major   "2.3">
-  <!ENTITY wk-version "2.3.4">
-  <!ENTITY qt4-url    "http://download.qt-project.org/official_releases/qt/&qt4-major;">
-  <!ENTITY webkit-url "http://download.kde.org/stable/qtwebkit-&wk-major;">
-
-  <!ENTITY qt4-download-http "&qt4-url;/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-download-ftp  " ">
-  <!ENTITY qt4-md5sum        "d990ee66bf7ab0c785589776f35ba6ad">
-  <!ENTITY qt4-size          "230 MB">
-  <!ENTITY qt4-buildsize     "2.3 GB">
-  <!ENTITY qt4-time          "12 SBU, using parallelism=4">
-<!--
-  <!ENTITY qtwebkit-download "&webkit-url;/&wk-version;/src/qtwebkit-&wk-version;.tar.gz">
-  <!ENTITY qtwebkit-md5sum   "42ef76d0cf7d0c611ef83418e9f297ff">
-  <!ENTITY qtwebkit-size     "50 MB">-->
-]>
-
-<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
-  <?dbhtml filename="qt4.html" ?>
-
-
-  <title>Qt-&qt4-version;</title>
-
-  <indexterm zone="qt4">
-    <primary sortas="a-Qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt4</title>
-
-    <para>
-      <application>Qt4</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases Qt4 is classified as a widget
-      toolkit), and also used for developing non-GUI programs such as
-      command-line tools and consoles for servers. One of the major users of
-      <application>Qt</application> is <application>KDE4</application>.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended package: <ulink url="&qtwebkit-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtwebkit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtwebkit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/qtwebkit-&wk-version;-gcc5-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="cacerts"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst10-plugins-base"/> (For QtWebKit HTML5 Video),
-      <xref linkend="icu"/> (unicode support),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="openssl"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="gtk2"/> (GTK+ 2 theme support),
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/qt4"/>
-    </para>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-              href="../../xincludes/qt-alternatives.xml"/>
-
-  <sect2 role="qt4-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt4</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>Qt4</application> in a
-      directory other than <filename class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt4</filename>.  To do this, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT4PREFIX=/opt/qt4</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt4</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt4-version;</filename>. To create a
-        versioned  <application>Qt4</application> directory, you may rename
-        the directory and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt4-version;
-ln -sfnv qt-&qt4-version; /opt/qt4</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt4</application>. To do that, just remove the symlink
-        and use <filename class="directory">/opt/qt4</filename> as the
-        prefix again. Which version of <application>Qt4</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt4</title>
-
-    <warning>
-      <para>
-        If <application>Qt4</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-Qt4 based
-        window manager. It overwrites <application>Qt4</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt4</application> is quite long. The instructions below do
-        not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> lines will create a complete build.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing <application>Qt4</application>
-        into the /usr hierarchy because it becomes difficult to find
-        components and to update to a new version.  If you do want to install
-        <application>Qt4</application> in /usr, the directories need to
-        be specified explicitly.  In this case, set QT4PREFIX=/usr and add
-        the following to the configure arguments below:
-      </para>
-
-<screen role="nodump"><userinput>-bindir         /usr/bin/qt4                \
--plugindir      /usr/lib/qt4/plugins        \
--importdir      /usr/lib/qt4/imports        \
--headerdir      /usr/include/qt4            \
--datadir        /usr/share/qt4              \
--docdir         /usr/share/doc/qt4          \
--translationdir /usr/share/qt4/translations \
--demosdir       /usr/share/doc/qt4/demos    \
--examplesdir    /usr/share/doc/qt4/examples \</userinput></screen>
-    </note>
-
-    <para>
-      Install <application>Qt4</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure -prefix           $QT4PREFIX \
-            -sysconfdir       /etc/xdg   \
-            -confirm-license             \
-            -opensource                  \
-            -release                     \
-            -dbus-linked                 \
-            -openssl-linked              \
-            -system-sqlite               \
-            -no-phonon                   \
-            -no-phonon-backend           \
-            -no-webkit                   \
-            -no-openvg                   \
-            -nomake demos                \
-            -nomake examples             \
-            -optimized-qmake             &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;
-rm -rf $QT4PREFIX/tests</userinput></screen>
-
-    <para>
-      Remove references to the build directory from the installed
-      <filename class="extension">.pc</filename> files by running
-      the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT4PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Remove references to the build directory in the installed library
-      dependency (prl) files by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for file in $QT4PREFIX/lib/libQt*.prl; do
-     sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
-            -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
-            -i $file
-done</userinput></screen>
-<!--
-    <bridgehead renderas="sect3">Building Qtwebkit</bridgehead>
-
-    <para>
-      The bundled version of qtwebkit in the main package requires an
-      obsolete version of the <application>gstreamer</application> package.
-      To overcome this, we use a more recent version available separately.
-    </para>
-
-    <para>To start, the upstream package is unusual in that it does not come
-    in a directory, so we have to create one before unpacking the tarball.
-    After that, we need to make the package compatible with the latest version
-    of gcc and use an included script to actually complete the build.  To do
-    this, run the following instructions:</para>
-
-<screen><userinput>mkdir qtwebkit-&wk-version; &amp;&amp;
-pushd qtwebkit-&wk-version; &amp;&amp;
-
-tar -xf ../../qtwebkit-&wk-version;.tar.gz             &amp;&amp;
-patch -Np1 -i ../../qtwebkit-&wk-version;-gcc5-1.patch &amp;&amp;
-
-QTDIR=$QT4PREFIX PATH=$PATH:$QT4PREFIX/bin \
-Tools/Scripts/build-webkit -i -qt            \
-                           - -no-webkit2    \
-                           - -prefix=$QT4PREFIX</userinput></screen>
-
-   <para>If desired, the build process can use parallel processors by
-   adding the option <option>- -makeargs=-j&lt;number&gt;</option> to
-   the <command>build-webkit</command> instruction above.</para>
-
-    <para>
-      To install the package, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C WebKitBuild/Release install</userinput></screen>
--->
-    <bridgehead renderas="sect3">Installing Auxillary Files</bridgehead>
-
-    <para>
-      The following instructions assume that your working directory is the top
-      of the <application>Qt4</application> source tree:
-    </para>
-
-<screen><userinput>popd</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      The <envar>QT4BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT4BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT4BINDIR</envar> variable is defined in root's
-      environment and as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>QT4BINDIR=$QT4PREFIX/bin
-
-install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-                  /usr/share/pixmaps/qt4logo.png       &amp;&amp;
-
-install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
-
-install -v -Dm644 tools/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
-
-install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
-
-install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt4.png &amp;&amp;
-
-install -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Assistant
-Comment=Shows Qt4 documentation and examples
-Exec=$QT4BINDIR/assistant
-Icon=assistant-qt4.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Designer
-Comment=Design GUIs for Qt4 applications
-Exec=$QT4BINDIR/designer
-Icon=designer-qt4.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Linguist
-Comment=Add translations to Qt4 applications
-Exec=$QT4BINDIR/linguist
-Icon=linguist-qt4.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT4BINDIR/qdbusviewer
-Icon=qdbusviewer-qt4.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Config
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=$QT4BINDIR/qtconfig
-Icon=qt4logo.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt4 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfrvn $QT4BINDIR/$file /usr/bin/$file-qt4
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-release</parameter>: This switch disables
-      building with debugging symbols.
-    </para>
-
-    <para>
-      <parameter>-nomake examples -nomake demos</parameter>:
-      These switches disable building programs that are only of
-      interest to a developer using <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-no-nis</parameter>: This switch disables support
-      for Network Information Service (NIS) which has been
-      deprecated in recent versions of <application>Glibc</application>.
-    </para>
-
-    <para>
-      <parameter>-no-phonon -no-phonon-backend</parameter>: These
-      switches disable building of the bundled
-      <application>Phonon</application> library. Better version
-      is provided by <xref linkend="phonon"/> package.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked -openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para>
-      <parameter>-no-openvg</parameter>: This switch disables
-      <application>OpenVG</application> support in
-      <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-optimized-qmake</parameter>: This switch enables
-      building of the optimized <command>qmake</command> program.
-    </para>
-
-    <para>
-      <option>-no-dbus</option>: Use this switch if you don't have
-      <application>D-Bus</application> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt</title>
-
-    <sect3 id="qt4-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If you installed <application>Qt</application> in /usr,
-        create an environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt4.sh
-
-QT4DIR=/usr
-QTDIR=$QT4DIR
-export QT4DIR QTDIR
-
-pathappend $$QT4DIR/qt/bin
-
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-   <para>
-      If you installed <application>Qt4</application> in a location other
-      than /usr, you need to update the following configuration files so
-      that <application>Qt</application> is correctly found by other packages
-      and system processes.</para>
-
-      <para>As the <systemitem class="username">root</systemitem> user, update
-      the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-      run-time cache file:
-   </para>
-
-   <note><para>If you installed <application>Qt4</application> in 
-   /usr with the commands specified above, the PATH entries 
-   in the scripts below need to be adjusted accordingly.</para></note>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt4/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-   <indexterm zone="qt4 qt4-config">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-   </indexterm>
-
-   <para>
-      As the <systemitem class="username">root</systemitem> user, create
-      the <filename>/etc/profile.d/qt4.sh</filename> file:
-   </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt4.sh
-
-QT4DIR=/opt/qt4
-QTDIR=$QT4DIR
-
-pathappend $QT4DIR/bin           PATH
-pathappend $QT4DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT4DIR QTDIR
-
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                href="../../xincludes/setqt.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          assistant, designer, lconvert, linguist,
-          lrelease, lupdate, moc, pixeltool,
-          qcollectiongenerator, qdbuscpp2xml, qdbus,
-          qdbusviewer, qdbusxml2cpp, qdoc3, qhelpconverter,
-          qhelpgenerator, qmake, qmlplugindump, qmlviewer,
-          qt3to4, qtconfig, qttracereplay, rcc, uic3,
-          uic, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libQtUiTools.a, libQt3Support.so, libQtCLucene.so, libQtCore.so,
-          libQtDBus.so, libQtDeclarative.so, libQtDesignerComponents.so,
-          libQtDesigner.so, libQtGui.so, libQtHelp.so, libQtMultimedia.so,
-          libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtScriptTools.so,
-          libQtSql.so, libQtSvg.so, libQtTest.so, libQtWebKit.so,
-          libQtXmlPatterns.so, and libQtXml.so, and several plugins under
-          /opt/qt4/imports and /opt/qt4/plugins
-        </seg>
-        <seg>
-          /usr/include/qt4,
-          /usr/lib/qt4,
-          /usr/share/doc/qt4, and
-          /usr/share/qt4
-          OR
-          /opt/qt4 and
-          /opt/qt-&qt4-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt4">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation.
-          </para>
-          <indexterm zone="qt4 assistant-qt4">
-            <primary sortas="b-assistant-qt4">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt4">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor.
-          </para>
-          <indexterm zone="qt4 designer-qt4">
-            <primary sortas="b-designer-qt4">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt4">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt4's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files.
-          </para>
-          <indexterm zone="qt4 lconvert-qt4">
-            <primary sortas="b-lconvert-qt4">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt4">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages.
-          </para>
-          <indexterm zone="qt4 linguist-qt4">
-            <primary sortas="b-linguist-qt4">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt4">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads a Qt project
-            file and produces message files used by the application.
-          </para>
-          <indexterm zone="qt4 lrelease-qt4">
-            <primary sortas="b-lrelease-qt4">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt4">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and produces or updates the translation
-            files listed in the project file.
-          </para>
-          <indexterm zone="qt4 lupdate-qt4">
-            <primary sortas="b-lupdate-qt4">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc-qt4">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>
-            generates Qt meta object support code.
-          </para>
-          <indexterm zone="qt4 moc-qt4">
-            <primary sortas="b-moc-qt4">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt4">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window.
-          </para>
-          <indexterm zone="qt4 pixeltool-qt4">
-            <primary sortas="b-pixeltool-qt4">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qcollectiongenerator-qt4">
-        <term><command>qcollectiongenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to create a Qt Help Collection.
-          </para>
-          <indexterm zone="qt4 qcollectiongenerator-qt4">
-            <primary sortas="b-qcollectiongenerator-qt4">qcollectiongenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qdbuscpp2xml-qt4">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface.
-          </para>
-          <indexterm zone="qt4 qdbuscpp2xml-qt4">
-            <primary sortas="b-qdbuscpp2xml-qt4">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt4">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus.
-          </para>
-          <indexterm zone="qt4 qdbus-qt4">
-            <primary sortas="b-qdbus-qt4">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt4">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser.
-          </para>
-          <indexterm zone="qt4 qdbusviewer-qt4">
-            <primary sortas="b-qdbusviewer-qt4">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt4">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt4 qdbusxml2cpp-qt4">
-            <primary sortas="b-qdbusxml2cpp-qt4">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdoc3-qt4">
-        <term><command>qdoc3</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects.
-          </para>
-          <indexterm zone="qt4 qdoc3-qt4">
-            <primary sortas="b-qdoc3-qt4">qdoc3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpconverter-qt4">
-        <term><command>qhelpconverter</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert files to <application>Qt</application>
-            help format.
-          </para>
-          <indexterm zone="qt4 qhelpconverter-qt4">
-            <primary sortas="b-qhelpconverter-qt4">qhelpconverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpgenerator-qt4">
-        <term><command>qhelpgenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate a <application>Qt</application>
-            compressed help file.
-          </para>
-          <indexterm zone="qt4 qhelpgenerator-qt4">
-            <primary sortas="b-qhelpgenerator-qt4">qhelpgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt4">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates.
-          </para>
-          <indexterm zone="qt4 qmake-qt4">
-            <primary sortas="b-qmake-qt4">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt4">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file.
-          </para>
-          <indexterm zone="qt4 qmlplugindump-qt4">
-            <primary sortas="b-qmlplugindump-qt4">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlviewer-qt4">
-        <term><command>qmlviewer</command></term>
-        <listitem>
-          <para>
-            is a tool for loading QML documents that makes it easy to quickly
-            develop and debug QML applications.
-          </para>
-          <indexterm zone="qt4 qmlviewer-qt4">
-            <primary sortas="b-qmlviewer-qt4">qmlviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt3to4-qt4">
-        <term><command>qt3to4</command></term>
-        <listitem>
-          <para>
-            qt3to4 is a tool to help update Qt3 code to Qt4.
-          </para>
-          <indexterm zone="qt4 qt3to4-qt4">
-            <primary sortas="b-qt3to4-qt4">qt3to4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtconfig-qt4">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>
-            is used to customize the appearance of Qt applications.
-          </para>
-          <indexterm zone="qt4 qtconfig-qt4">
-            <primary sortas="b-qtconfig-qt4">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qttracereplay">
-        <term><command>qttracereplay</command></term>
-        <listitem>
-          <para>
-            is a tool to replay all drawing operations recording with
-            <command>-graphicssystem trace</command> into a trace buffer.
-          </para>
-          <indexterm zone="qt4 qttracereplay">
-            <primary sortas="b-qttracereplay">qttracereplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcc-qt4">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>
-            is a resource compiler used in conjunction with designer.
-          </para>
-          <indexterm zone="qt4 rcc-qt4">
-            <primary sortas="b-rcc-qt4">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic-qt4">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>
-            is a Qt user interface compiler.
-          </para>
-          <indexterm zone="qt4 uic-qt4">
-            <primary sortas="b-uic-qt4">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic3-qt4">
-        <term><command>uic3</command></term>
-        <listitem>
-          <para>
-            is a tool to generate Qt4 code out of
-            user interface files generated by the Qt3
-            version of designer.
-          </para>
-          <indexterm zone="qt4 uic3-qt4">
-            <primary sortas="b-uic3-qt4">uic3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatterns-qt4">
-        <term><command>xmlpatterns</command></term>
-        <listitem>
-          <para>
-            provides support for XPath, XQuery, XSLT, and XML Schema
-            validation.
-          </para>
-          <indexterm zone="qt4 xmlpatterns-qt4">
-            <primary sortas="b-xmlpatterns-qt4">xmlpatterns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatternsvalidator-qt4">
-        <term><command>xmlpatternsvalidator</command></term>
-        <listitem>
-          <para>
-            is a tool used to validate XML documents.
-          </para>
-          <indexterm zone="qt4 xmlpatternsvalidator-qt4">
-            <primary sortas="b-xmlpatternsvalidator-qt4">xmlpatternsvalidator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/qt4.xml
===================================================================
--- archive/qt4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,559 +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 qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz">
-  <!ENTITY qt-download-ftp  "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz ">
-  <!ENTITY qt-md5sum        "78dc675e84aed595375449818cbb589a">
-  <!ENTITY qt-size          "16.8 MB">
-  <!ENTITY qt-buildsize     "801 MB">
-  <!ENTITY qt-time          "8.6 SBU">
-]>
-
-<sect1 id="qt" xreflabel="Qt-&qt-version;">
-  <?dbhtml filename="qt.html" ?>
-
-
-  <title>Qt-&qt-version;</title>
-
-  <indexterm zone="qt">
-    <primary sortas="a-qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt</title>
-
-    <para>The <application>Qt</application> package contains a
-    <application>C++</application> GUI library. This is useful for creating
-    graphical applications or executing graphical applications that are
-    dynamically linked to the <application>Qt</application> library. Two of
-    the major users of <application>Qt</application> are
-    <application>KDE</application> and its follow on project,
-    <application>Trinity</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qt-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qt-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qt-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qt-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qt-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-          url="&patch-root;/qt-3.3.8.d-libpng15-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libmng"/>
-    </para>
-
-    <para>Note: if for whatever reason you do not have the recommended
-    libraries installed on your system, you must remove the corresponding
-    <parameter>-system-<replaceable>&lt;library&gt;</replaceable></parameter> and
-    <parameter>-plugin-imgfmt-<replaceable>&lt;library&gt;</replaceable></parameter>
-    parameters from the <command>configure</command> commands shown in the
-    instructions below.</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="mysql"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="sqlite"/>, and
-      <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qt"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/X11R6_symlink.xml"/>
-
-    <para>There are several ways to install a complicated package such as
-    <application>Qt</application>. The files are not completely position
-    independent. Installation procedures execute the program
-    <command>pkg-config</command> to determine the location of package
-    executables, libraries, headers, and other files. For
-    <application>Qt</application>, <command>pkg-config</command> will look
-    for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be
-    modified if relocating the package. This file is set up correctly by
-    the build process.</para>
-
-    <para>The default installation places the files in
-    <filename class='directory'>/usr/local/qt/</filename>. Many commercial
-    distributions place the files in the system's
-    <filename class='directory'>/usr</filename> hierarchy. The package can
-    also be installed in an arbitrary directory.</para>
-
-    <para>This section will demonstrate two different methods.</para>
-
-    <warning>
-      <para>Building <application>Qt</application> in a
-      <command>chroot</command> environment may fail.</para>
-    </warning>
-
-    <note>
-      <para>The build time for <application>Qt</application> is quite long. If
-      you want to save some time and don't want the tutorials and examples,
-      change the first <command>make</command> command to:</para>
-
-<screen><userinput>make sub-tools</userinput></screen>
-
-    </note>
-
-    <sect3>
-      <title>Method 1 - Installing in the '/usr' Hierarchy</title>
-
-      <para>The advantage of this method is that no updates to the
-      <filename>/etc/ld.so.conf</filename> or
-      <filename>/etc/man_db.conf</filename> files are required. The package
-      files are distributed within several subdirectories of the
-      <filename class='directory'>/usr</filename> hierarchy.
-      This is the method that most commercial distributions use.</para>
-
-      <note>
-        <para>If <application>Qt</application> is being reinstalled, run the
-        following commands from a console or non-Qt based window manager.
-        It overwrites <application>Qt</application> libraries that should not
-        be in use during the install process.</para>
-      </note>
-
-<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf &amp;&amp;
-
-bash
-export PATH=$PWD/bin:$PATH                       &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-
-patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
-
-./configure -prefix     /usr                \
-            -docdir     /usr/share/doc/qt   \
-            -headerdir  /usr/include/qt     \
-            -plugindir  /usr/lib/qt/plugins \
-            -datadir    /usr/share/qt       \
-            -sysconfdir /etc/qt             \
-            -translationdir /usr/share/qt/translations \
-            -qt-gif                         \
-            -system-zlib                    \
-            -system-libpng                  \
-            -system-libjpeg                 \
-            -system-libmng                  \
-            -plugin-imgfmt-png              \
-            -plugin-imgfmt-jpeg             \
-            -plugin-imgfmt-mng              \
-            -no-exceptions                  \
-            -thread                         \
-            -tablet &amp;&amp;
-
-make &amp;&amp;
-exit</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;
-ln -v -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
-ln -v -snf ../../bin /usr/share/qt/bin &amp;&amp;
-ln -v -snf ../../include/qt /usr/share/qt/include &amp;&amp;
-ln -v -snf ../../lib /usr/share/qt/lib &amp;&amp;
-cp -v -r doc/man /usr/share &amp;&amp;
-cp -v -r examples /usr/share/doc/qt</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Method 2 - Installing in '/opt'</title>
-
-      <para>This is the method recommended by the <application>Qt</application>
-      developers. It has the advantage of keeping all the package files
-      consolidated in a dedicated directory hierarchy. By using this method,
-      an update can be made without overwriting a previous installation and
-      users can easily revert to a previous version by changing one symbolic
-      link.</para>
-
-      <para>The <application>Qt</application> developers use a default location
-      of <filename class='directory'>/usr/local/qt/</filename>, however this
-      procedure puts the files in <filename
-      class='directory'>/opt/qt-&qt-version;/</filename>
-      and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
-
-<screen><userinput>bash
-export QTDIR=$PWD                                &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-export PATH=$PWD/bin:$PATH                       &amp;&amp;
-
-patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
-
-./configure -prefix /opt/qt-&qt-version; \
-            -sysconfdir /etc/qt   \
-            -qt-gif               \
-            -system-zlib          \
-            -system-libpng        \
-            -system-libjpeg       \
-            -system-libmng        \
-            -plugin-imgfmt-png    \
-            -plugin-imgfmt-jpeg   \
-            -plugin-imgfmt-mng    \
-            -no-exceptions        \
-            -thread               \
-            -tablet &amp;&amp;
-
-make &amp;&amp;
-exit</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;
-ln -v -sfn qt-&qt-version; /opt/qt &amp;&amp;
-ln -v -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
-cp -v -r doc/man examples /opt/qt/doc</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>:
-    In Method 1, <application>Qt</application> is being installed into
-    the standard system directories. The runtime library search path does not
-    need to be set in this case.</para>
-
-    <para><command>bash</command>: This command enters a sub-shell to isolate
-    environment changes.</para>
-
-    <para><command>export QTDIR=$PWD</command>: This command defines where
-    the root of the <application>Qt</application> directory is located.</para>
-
-    <para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>:
-    This command allows the not yet installed <application>Qt</application>
-    libraries to be used by the not yet installed <application>Qt</application>
-    programs.</para>
-
-    <para><command>export PATH=$PWD/bin:$PATH</command>: This command
-    allows the build process to find supporting executables.</para>
-
-    <para><parameter>-qt-gif</parameter>: This switch adds support for
-    <filename>gif</filename> files to the libraries.</para>
-
-    <para><parameter>-system-zlib -system-libpng -system-libjpeg
-    -system-mng</parameter>: These switches force the build instructions to use
-    the shared libraries that are on your system instead of creating a custom
-    set of support libraries for these functions.</para>
-
-    <para><parameter>-plugin-imgfmt-png -plugin-imgfmt-jpeg
-    -plugin-imgfmt-mng</parameter>: These switches enable run-time linking of
-    the referenced libraries.</para>
-
-    <para>If you pass the
-    <option>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></option> or
-    <option>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></option> switch
-    to the <command>configure</command> command, you must also pass
-    <option>-I<replaceable>&lt;/path/to/sql/headers&gt;</replaceable></option>
-    so <command>make</command> can find the appropriate header files.  For
-    instance, building in <application>MySQL</application> support (as opposed
-    to building the plugin) will need to use <option>-I/usr/include/mysql
-    -qt-sql-mysql</option>.</para>
-
-    <note>
-      <para>To check if <application>mysql</application> is autotetected
-      properly, examine the output of <command>./configure -I/usr/include/mysql
-      -help</command>. Other database support will require similar
-      <command>configure</command> parameters.</para>
-    </note>
-
-    <para><parameter>-no-exceptions</parameter>: This switch disables
-    the exceptions coding generated by the <application>C++</application>
-    compiler.</para>
-
-    <para><parameter>-thread</parameter>: This switch adds
-    support for multi-threading.</para>
-
-    <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This
-    command allows <command>configure</command> scripts to find a working
-    <application>Qt</application> installation.</para>
-
-    <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This
-    command and the following two allow the
-    <filename class="directory">/usr</filename> style installation to mimic
-    the <filename class="directory">/opt</filename> style installation by
-    making all binaries, headers and libraries available from a single
-    directory, <filename class="directory">/usr/share/qt</filename>.</para>
-
-    <para><command>cp -v -r doc/man examples /usr/share (or
-    /opt/qt/doc)</command>:
-    This command installs the man pages and examples which are missed by
-    <command>make install</command>.</para>
-
-    <para><command>exit</command>: This command returns to the parent shell
-    and eliminates the environment variables set earlier.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt</title>
-
-    <sect3 id='qt-config'>
-      <title>Configuration Information</title>
-
-      <para>The <envar>QTDIR</envar> environment variable needs to be set when
-      building packages that depend on <application>Qt</application>. Add the
-      following to the <filename>.bash_profile</filename> initialization script
-      for each user that builds packages using the <application>Qt</application>
-      libraries. Alternatively, the variable can be set in the system wide
-      <filename>/etc/profile</filename> file.</para>
-
-      <para>For Method 1 (This is optional, only set this if an application is
-      unable to find the installed libraries or headers):</para>
-
-<screen><literal>export QTDIR=/usr/share/qt</literal></screen>
-
-      <para>or for Method 2:</para>
-
-<screen><literal>export QTDIR=/opt/qt</literal></screen>
-
-      <para>If you installed <application>Qt</application> using Method 2,
-      you also need to update the following configuration files so that
-      <application>Qt</application> is correctly found by other packages
-      and system processes.</para>
-
-      <para>Update the <filename>/etc/ld.so.conf</filename> and
-      <filename>/etc/man_db.conf</filename> files:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin qt addition to /etc/ld.so.conf
-
-/opt/qt/lib
-
-# End qt addition</literal>
-EOF
-ldconfig &amp;&amp;
-cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
-<literal># Begin qt addition to man_db.conf
-
-MANDATORY_MANPATH /opt/qt/doc/man
-MANPATH_MAP       /opt/qt/bin         /opt/qt/doc/man
-MANDB_MAP         /opt/qt/doc/man     /var/cache/man/qt
-
-# End qt addition to man_db.conf</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-profile">/etc/profile</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
-      </indexterm>
-
-      <para>Update the <envar>PKG_CONFIG_PATH</envar> environment variable
-      in your <filename>~/.bash_profile</filename> or
-      <filename>/etc/profile</filename> with the following:</para>
-
-<screen><literal>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</literal></screen>
-
-      <para>If you want the <application>Qt</application> executables in your
-      shell search path, update the <envar>PATH</envar> environment variable
-      in your <filename>~/.bash_profile</filename> or
-      <filename>/etc/profile</filename> to include
-      <filename class='directory'>/opt/qt/bin</filename>.</para>
-
-      <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in
-      the extrapaths.sh (or other script) in the /etc/profile.d directory
-      if you set up the startup files as recommended in
-      <xref linkend='postlfs-config-profile'/>.</para></tip>
-
-      <para>As with most libraries, there is no explicit configuration to do.
-      After updating <filename>/etc/ld.so.conf</filename> as explained above,
-      run <command>/sbin/ldconfig</command> so that <command>ldd</command>
-      can find the shared libraries.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>assistant, designer, linguist, lrelease, lupdate, moc,
-        qm2ts, qmake, qtconfig, and uic</seg>
-        <seg>libqt-mt.so, libqt.so libqui.so, libdesignercore.a,
-        libeditor.a, and libqassistantclient.a</seg>
-        <seg>/opt/qt-&qt-version; or /usr/lib/qt, /usr/share/qt,
-        /usr/share/doc/qt, /usr/include/qt, and /etc/qt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>is a tool for presenting on-line documentation.</para>
-          <indexterm zone="qt assistant">
-            <primary sortas="b-assistant">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>is a full-fledged GUI builder. It includes
-          powerful features such as preview mode, automatic widget
-          layout, support for custom widgets, and an advanced
-          property editor.</para>
-          <indexterm zone="qt designer">
-            <primary sortas="b-designer">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>provides support for translating applications into
-          local languages. </para>
-          <indexterm zone="qt linguist">
-            <primary sortas="b-linguist">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>is a simple command line tool. It reads a Qt project
-          file and produces message files used by the application.</para>
-          <indexterm zone="qt lrelease">
-            <primary sortas="b-lrelease">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>reads a Qt project file, finds the translatable
-          strings in the specified source, header and Qt Designer
-          interface files, and produces or updates the translation
-          files listed in the project file.</para>
-          <indexterm zone="qt lupdate">
-            <primary sortas="b-lupdate">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>generates Qt meta object support code.</para>
-          <indexterm zone="qt moc">
-            <primary sortas="b-moc">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qm2ts">
-        <term><command>qm2ts</command></term>
-        <listitem>
-          <para>is a tool for converting Qt message file formats.</para>
-          <indexterm zone="qt qm2ts">
-            <primary sortas="b-qm2ts">qm2ts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>qmake uses information stored in project files to
-          determine what should go in the makefiles it generates.</para>
-          <indexterm zone="qt qmake">
-            <primary sortas="b-qmake">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtconfig">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>is used to customize the appearance of Qt applications.</para>
-          <indexterm zone="qt qtconfig">
-            <primary sortas="b-qtconfig">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>is a Qt user interface compiler.</para>
-          <indexterm zone="qt uic">
-            <primary sortas="b-uic">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/qtchooser.xml
===================================================================
--- archive/qtchooser.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +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 qtchooser-git-revision "g4717841">
-
-  <!ENTITY qtchooser-download-http "http://macieira.org/qtchooser/qtchooser-&qtchooser-version;-&qtchooser-git-revision;.tar.gz">
-  <!ENTITY qtchooser-download-ftp  " ">
-  <!ENTITY qtchooser-md5sum        "fcf1b5e8373147e48ce72b9c1ffe3d10">
-  <!ENTITY qtchooser-size          "32 KB">
-  <!ENTITY qtchooser-buildsize     "1.6 MB">
-  <!ENTITY qtchooser-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="qtchooser" xreflabel="qtchooser-&qtchooser-version;">
-  <?dbhtml filename="qtchooser.html"?>
-
-
-  <title>qtchooser-&qtchooser-version;</title>
-
-  <indexterm zone="qtchooser">
-    <primary sortas="a-qtchooser">qtchooser</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qtchooser</title>
-
-    <para>
-      The <application>qtchooser</application> package contains a wrapper used to select
-      between <application>Qt</application> binary versions.  It is only needed if
-      both Qt4 and Qt5 are installed for access via the /usr/bin directory.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtchooser-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtchooser-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtchooser-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtchooser-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtchooser-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtchooser-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qtchooser Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qt4"/> (for the testsuite)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qtchooser"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtchooser</title>
-
-    <warning>
-      <para>
-         If both <application>Qt4</application> and
-         <application>Qt5</application> are installed on the system,
-         then <application>Qt4</application> should be set as
-         default unless stated otherwise.
-      </para>
-    </warning>
-
-    <para>
-      Install <application>qtchooser</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -m644 doc/qtchooser.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring qtchooser</title>
-
-    <sect3 id="qtchooser-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/xdg/qtchooser/default.conf</filename>
-      </para>
-
-      <indexterm zone="qtchooser qtchooser-config">
-        <primary
-        sortas="e-etc-xdg-qtchooser-default.conf">/etc/xdg/qtchooser/default.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <filename>/etc/xdg/qtchooser/default.conf</filename>
-        configuration file contains paths to the
-        <application>Qt</application> binaries and libraries which will
-        be used when the wrapper is run. It is ussually a symlink to a
-        package specific file, such as <filename>4.conf</filename> or
-        <filename>5.conf</filename>. In first case, when invoking the wrappers,
-        <application>Qt4</application> equivalents will be invoked. In second
-        case, <application>Qt5</application> equivalents will be invoked.
-      </para>
-
-      <para>
-        Create the configuration files by running the following commands as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
-cat &gt; /etc/xdg/qtchooser/4.conf &lt;&lt; "EOF"
-<literal>/usr/lib/qt4/bin
-/usr/lib</literal>
-EOF
-cat &gt; /etc/xdg/qtchooser/5.conf &lt;&lt; "EOF"
-<literal>/usr/lib/qt5/bin
-/usr/lib</literal>
-EOF</userinput></screen>
-
-      <para>
-        To set <application>Qt4</application> as the default, run the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -sfv 4.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
-
-      <para>
-        To set <application>Qt5</application> as the default, run the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -sfv 5.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
-
-      <para>
-        You can also select default <application>Qt</application> using an environment
-        variable.
-      </para>
-
-      <para>
-        To set <application>Qt4</application> as the default, run the following command:
-      </para>
-
-<screen><userinput>export QT_SELECT=4</userinput></screen>
-
-      <para>
-        To set <application>Qt5</application> as the default, run the following command:
-      </para>
-
-<screen><userinput>export QT_SELECT=5</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>
-          assistant, designer, lconvert, linguist, lrelease, lupdate, moc,
-          pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml, qdbusviewer,
-          qdbusxml2cpp, qdoc, qdoc3, qglinfo, qhelpconverter, qhelpgenerator,
-          qmake, qml, qml1plugindump, qmlbundle, qmlmin, qmlplugindump,
-          qmlprofiler, qmlscene, qmltestrunner, qmlviewer, qtchooser,
-          qtconfig, rcc, uic, uic3, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qtchooser-prog">
-        <term><command>qtchooser</command></term>
-        <listitem>
-          <para>
-            is a wrapper used to select between <application>Qt</application>
-            binary versions.
-          </para>
-          <indexterm zone="qtchooser qtchooser-prog">
-            <primary sortas="b-qtchooser">qtchooser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/qtwebkit5.xml
===================================================================
--- archive/qtwebkit5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +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 qtwebkit-major "5.9">
-  <!ENTITY qtwebkit-url   "https://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;-final">
-
-  <!ENTITY qtwebkit-download-http "&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
-  <!ENTITY qtwebkit-download-ftp  " ">
-  <!ENTITY qtwebkit-md5sum        "1fc0ed873cc9326b823a8a83126714f5">
-  <!ENTITY qtwebkit-size          "34 MB">
-  <!ENTITY qtwebkit-buildsize     "668 MB (38 MB installed)">
-  <!ENTITY qtwebkit-time          "11 SBU (using parallelism=4)">
-]>
-
-<sect1 id="qtwebkit5" xreflabel="QtWebkit-&qtwebkit-version;">
-  <?dbhtml filename="qtwebkit5.html" ?>
-
-
-  <title>QtWebkit-&qtwebkit-version;</title>
-
-  <indexterm zone="qtwebkit5">
-    <primary sortas="a-QtWebkit">QtWebkit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QtWebkit</title>
-
-    <para>
-      <application>Qtwebkit</application> is a Qt based web browser engine.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtwebkit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtwebkit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtwebkit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtwebkit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtwebkit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtwebkit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/qtwebkit-&qtwebkit-version;-icu_59-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qtwebkit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="icu"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="qt5"/>,
-      <xref linkend="ruby"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-base"/> (HTML5 Video Support)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/qtwebkit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qtwebkit</title>
-
-    <para>
-      First, fix a build issue with <application>ICU</application> &gt;= 59:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qtwebkit-&qtwebkit-version;-icu_59-1.patch</userinput></screen>
-
-    <para>If desired, adjust the build settings to avoid literally thousands
-    of unneeded warning messages:</para>
-
-<screen><userinput>sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
-    -i Tools/qmake/mkspecs/features/unix/default_pre.prf</userinput></screen>
-
-    <para>
-      Install <application>Qtwebkit</application> by running the following commands:
-    </para>
-
-<screen><userinput>mkdir -p build        &amp;&amp;
-cd       build        &amp;&amp;
-
-qmake ../WebKit.pro   &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>
-
-    <note><para>The installation is automatically made to the
-    $QT5DIR directory tree.</para></note>
-
-    <para>
-      Remove references to the build directory from installed 
-      profile include (pri) files by running the following
-      command 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>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>qmake</command>: is a Qt tool that automates the generation of 
-      Makefiles.
-    </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>
-          libQt5WebKit.so and
-          libQt5WebKitWidgets.so
-        </seg>
-        
-        <seg>
-          $QT5PREFIX/qml/QtWebKit,
-          $QT5PREFIX/lib/cmake/Qt5WebKit{,Widgets},
-          $QT5PREFIX/include/QtWebKit{,Widgets), and
-          $QT5PREFIX/plugins/webkit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/qupzilla.xml
===================================================================
--- archive/qupzilla.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,223 +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;
-
-  <!-- https://github.com/QupZilla/qupzilla/tags 
-       https://github.com/QupZilla/qupzilla/releases/download/v2.0.0/QupZilla-2.0.0.tar.xz
-  -->
-  <!ENTITY qupzilla-download-http "https://github.com/QupZilla/qupzilla/releases/download/v&qupzilla-version;/QupZilla-&qupzilla-version;.tar.xz">
-  <!ENTITY qupzilla-download-ftp  " ">
-  <!ENTITY qupzilla-md5sum        "869448eadaef62f1b2e31bf038f33f52">
-  <!ENTITY qupzilla-size          "2.4 MB">
-  <!ENTITY qupzilla-buildsize     "81 MB">
-  <!ENTITY qupzilla-time          "5.4 SBU">
-]>
-
-<sect1 id="qupzilla" xreflabel="QupZilla-&qupzilla-version;">
-  <?dbhtml filename="qupzilla.html"?>
-
-
-  <title>QupZilla-&qupzilla-version;</title>
-
-  <indexterm zone="qupzilla">
-    <primary sortas="a-QupZilla">QupZilla</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QupZilla</title>
-
-    <para>
-      <application>QupZilla</application> is a fast, feature-rich and
-      lightweight <application>QtWebEngine</application> based browser,
-      originally intended only for educational purposes.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qupzilla-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qupzilla-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qupzilla-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qupzilla-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qupzilla-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qupzilla-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QupZilla Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qtwebengine"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/>,
-<!--      <xref linkend="kdelibs"/> (KWallet plugin), -->
-      <!-- hunspell is only referenced in a few translations, and in a file
-      that seems to be used for app packaging, with a link to chromium
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>, and -->
-      <ulink url="&gnome-download-ftp;/libgnome-keyring/">libgnome-keyring</ulink> (Gnome-Keyring plugin)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qupzilla"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QupZilla</title>
-
-    <para>
-      Install <application>QupZilla</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export QUPZILLA_PREFIX=/usr &amp;&amp;
-qmake                       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The <command>export</command> command is used for configuring the build.
-      Alternatively, you can add the environment variable to
-      <filename>src/defines.pri</filename>. 
-    </para>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: for "DESTDIR" install use "make INSTALL_ROOT=<dest> install" -->
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If <xref linkend="desktop-file-utils"/> and <xref linkend="xdg-utils"/>
-      are installed, run as, the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>xdg-icon-resource forceupdate --theme hicolor &amp;&amp;
-update-desktop-database -q</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <note>
-      <para>
-        If you wish to use any of the following variables, they need to be
-        exported.  You can add them to the <command>export</command> block in
-        the main instructions.  Alternatively, instead of exporting, they can
-        be added, one at a line, to <filename>src/defines.pri</filename>.
-      </para>
-    </note>
-
-    <para>
-      <envar>CONFIG += debug</envar>: Use if you want to build QupZilla with
-      debugging symbols.
-    </para>
-
-    <para>
-      <envar>GNOME_INTEGRATION=true</envar>: Enables Gnome integration, this
-      meaning the build of Gnome-Keyring Password plugin, which provides
-      support for storing passwords in Gnome-Keyring.
-    </para>
-
-    <!-- kwallet seems to be part of kde4 only
-    <para>
-      <envar>KDE_INTEGRATION=true</envar>: Enables KDE integration, this
-      meaning the build of KWallet Password plugin, which provides support for
-      storing passwords in KWallet.
-    </para> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          qupzilla
-        </seg>
-        <seg>
-          libQupZilla.so and plugins under /usr/lib/qupzilla/
-        </seg>
-        <seg>
-          /usr/{lib,share}/qupzilla
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qupzilla-prog">
-        <term><command>qupzilla</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>QtWebEngine</application> web browser.
-          </para>
-          <indexterm zone="qupzilla qupzilla-prog">
-            <primary sortas="b-qupzilla">qupzilla</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQupZilla">
-        <term><filename class="libraryfile">libQupZilla.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libQupZilla</application> API functions.
-          </para>
-          <indexterm zone="qupzilla libQupZilla">
-            <primary sortas="c-libQupZilla">libQupZilla.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/rarian.xml
===================================================================
--- archive/rarian.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,334 +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 rarian-download-http "&gnome-download-http;/rarian/0.8/rarian-0.8.1.tar.bz2">
-  <!ENTITY rarian-download-ftp  "&gnome-download-ftp;/rarian/0.8/rarian-0.8.1.tar.bz2">
-  <!ENTITY rarian-md5sum        "75091185e13da67a0ff4279de1757b94">
-  <!ENTITY rarian-size          "317 KB">
-  <!ENTITY rarian-buildsize     "6 MB">
-  <!ENTITY rarian-time          "0.2 SBU">
-]>
-
-<sect1 id="rarian" xreflabel="Rarian-&rarian-version;">
-  <?dbhtml filename="rarian.html"?>
-
-
-  <title>Rarian-&rarian-version;</title>
-
-  <indexterm zone="rarian">
-    <primary sortas="a-Rarian">Rarian</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rarian</title>
-
-    <para>
-      The <application>Rarian</application> package is a documentation
-      metadata library based on the proposed Freedesktop.org spec. <application>
-      Rarian</application> is designed to be a replacement for <application>
-      ScrollKeeper</application>.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rarian-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rarian-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rarian-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rarian-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rarian-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rarian-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Rarian Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxslt"/> (<command>rarian-sk-extract</command> will not
-      be built without this) and
-      <xref linkend="DocBook"/> (without this, <application>Rarian
-      </application> scripts source DTDs from the net)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/rarian"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rarian</title>
-
-    <para>
-      Install <application>Rarian</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --disable-static     \
-            --localstatedir=/var &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rarian-example, rarian-sk-config, rarian-sk-extract,
-        rarian-sk-gen-uuid, rarian-sk-get-cl, rarian-sk-get-content-list,
-        rarian-sk-get-extended-content-list, rarian-sk-get-scripts,
-        rarian-sk-install, rarian-sk-migrate, rarian-sk-preinstall,
-        rarian-sk-rebuild, and rarian-sk-update</seg>
-        <seg>librarian.so</seg>
-        <seg>/usr/include/rarian, /usr/share/help, /usr/share/librarian/manual,
-        /usr/share/librarian/Templates/C, and /var/lib/rarian</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rarian-example">
-        <term><command>rarian-example</command></term>
-        <listitem>
-          <para>
-            prints a nice list of all available documents found by the
-            library
-          </para>
-          <indexterm zone="rarian rarian-example">
-            <primary sortas="b-rarian-example">rarian-example</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-config">
-        <term><command>rarian-sk-config</command></term>
-        <listitem>
-          <para>
-            emulates <command>scrollkeeper-config</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-config">
-            <primary sortas="b-rarian-sk-config">rarian-sk-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-extract">
-        <term><command>rarian-sk-extract</command></term>
-        <listitem>
-          <para>
-            is a wrapper around xsltproc to mimic <command>
-            scrollkeeper-extract</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-extract">
-            <primary sortas="b-rarian-sk-extract">rarian-sk-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-gen-uuid">
-        <term><command>rarian-sk-gen-uuid</command></term>
-        <listitem>
-          <para>
-            generates a unique (random) uuid
-          </para>
-          <indexterm zone="rarian rarian-sk-gen-uuid">
-            <primary sortas="b-rarian-sk-gen-uuid">rarian-sk-gen-uuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-cl">
-        <term><command>rarian-sk-get-cl</command></term>
-        <listitem>
-          <para>
-            gets a content list (category tree)
-          </para>
-          <indexterm zone="rarian rarian-sk-get-cl">
-            <primary sortas="b-rarian-sk-get-cl">rarian-sk-get-cl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-content-list">
-        <term><command>rarian-sk-get-content-list</command></term>
-        <listitem>
-          <para>
-            is a simple wrapper to make calling <command>scrollkeeper-get-cl
-            </command> easier
-          </para>
-          <indexterm zone="rarian rarian-sk-get-content-list">
-            <primary sortas="b-rarian-sk-get-content-list">
-            rarian-sk-get-content-list</primary>
-
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-extended-content-list">
-        <term><command>rarian-sk-get-extended-content-list</command></term>
-        <listitem>
-          <para>
-            is a simple wrapper to make calling <command>scrollkeeper-get-cl
-            </command> (extended) easier
-          </para>
-          <indexterm zone="rarian rarian-sk-get-extended-content-list">
-            <primary sortas="b-rarian-sk-get-extended-content-list">
-            rarian-sk-get-extended-content-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-get-scripts">
-        <term><command>rarian-sk-get-scripts</command></term>
-        <listitem>
-          <para>
-            emulates <command>
-            scrollkeeper-get-index-from-index-from-docpath</command>, <command>
-            scrollkeeper-get-toc-from-docpath</command>, and <command>
-            scrollkeeper-get-toc-from-id</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-get-scripts">
-            <primary sortas="b-rarian-sk-get-scripts">rarian-sk-get-scripts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-install">
-        <term><command>rarian-sk-install</command></term>
-        <listitem>
-          <para>
-            emulates <command>scrollkeeper-install</command> and
-            <command>scrollkeeper-uninstall</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-install">
-            <primary sortas="b-rarian-sk-install">rarian-sk-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-migrate">
-        <term><command>rarian-sk-migrate</command></term>
-        <listitem>
-          <para>
-            takes in a directory full of omf's, reads and parses them and
-            spews out an equivalent scroll file
-          </para>
-          <indexterm zone="rarian rarian-sk-migrate">
-            <primary sortas="b-rarian-sk-migrate">rarian-sk-migrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-preinstall">
-        <term><command>rarian-sk-preinstall</command></term>
-        <listitem>
-          <para>
-            creates the omf file by reading an existing omf file and
-            replacing the url for a resource with the url
-          </para>
-          <indexterm zone="rarian rarian-sk-preinstall">
-            <primary sortas="b-rarian-sk-preinstall">rarian-sk-preinstall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-rebuild">
-        <term><command>rarian-sk-rebuild</command></term>
-        <listitem>
-          <para>
-            is a simple wrapper script to emulate <command>
-            scrollkeeper-rebuilddb</command>
-          </para>
-          <indexterm zone="rarian rarian-sk-rebuild">
-            <primary sortas="b-rarian-sk-rebuild">rarian-sk-rebuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarian-sk-update">
-        <term><command>rarian-sk-update</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="rarian rarian-sk-update">
-            <primary sortas="b-rarian-sk-update">rarian-sk-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="librarian">
-        <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
-          </para>
-          <indexterm zone="rarian librarian">
-            <primary sortas="c-librarian">librarian.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/re-alpine.xml
===================================================================
--- archive/re-alpine.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +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 re-alpine-download-http "&sourceforge-repo2;/projects/re-alpine/files/re-alpine-&re-alpine-version;.tar.bz2">
-  <!ENTITY re-alpine-download-ftp  " ">
-  <!ENTITY re-alpine-md5sum        "566d269d4bd43aba68f377110a6295d5">
-  <!ENTITY re-alpine-size          "5.1 MB">
-  <!ENTITY re-alpine-buildsize     "122 MB">
-  <!ENTITY re-alpine-time          "1.0 SBU">
-]>
-
-<sect1 id="re-alpine" xreflabel="Re-alpine-&re-alpine-version;">
-  <?dbhtml filename="re-alpine.html"?>
-
-
-  <title>Re-alpine-&re-alpine-version;</title>
-
-  <indexterm zone="re-alpine">
-    <primary sortas="a-re-alpine">re-alpine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Re-alpine</title>
-
-    <para><application>Re-alpine</application> is the continuation of Alpine;
-    a text-based email client developed by the University of Washington.</para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&re-alpine-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&re-alpine-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &re-alpine-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &re-alpine-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &re-alpine-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &re-alpine-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Re-alpine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="openldap"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="tcl"/>, and
-    <xref linkend="linux-pam"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/re-alpine"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Re-alpine</title>
-
-    <para>Install <application>Re-alpine</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr       \
-            --sysconfdir=/etc   \
-            --without-ldap      \
-            --without-krb5      \
-            --with-ssl-dir=/usr \
-            --with-passfile=.pine-passfile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
-
-    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
-
-    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
-    OpenSSL libraries and include files.</para>
-
-    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
-    password cache file.</para>
-
-    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Re-alpine</title>
-
-    <sect3 id="re-alpine-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.pinerc</filename></para>
-
-      <indexterm zone="re-alpine re-alpine-config">
-        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>It is not required to manually edit any configuration files to use
-      the <application>Alpine</application> email client. Users can configure
-      <application>Alpine</application> using the graphical configuration menu,
-      which stores the changes in <filename>~/.pinerc</filename>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
-        <seg>none</seg>
-        <seg>none</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="alpine">
-        <term><command>alpine</command></term>
-        <listitem>
-          <para>is the Alpine mailer.</para>
-          <indexterm zone="re-alpine alpine">
-            <primary sortas="b-alpine">alpine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pico">
-        <term><command>pico</command></term>
-        <listitem>
-          <para>is a standalone text editor similar to the Alpine message composer.</para>
-          <indexterm zone="re-alpine pico">
-            <primary sortas="b-pico">pico</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pilot">
-        <term><command>pilot</command></term>
-        <listitem>
-          <para>is a standalone file system navigator.</para>
-          <indexterm zone="re-alpine pilot">
-            <primary sortas="b-pilot">pilot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpdump">
-        <term><command>rpdump</command></term>
-        <listitem>
-          <para>is a utility for downloading a pinerc or address book to the
-          local machine.</para>
-          <indexterm zone="re-alpine rpdump">
-            <primary sortas="b-rpdump">rpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpload">
-        <term><command>rpload</command></term>
-        <listitem>
-          <para> is a utility for uploading a local pinerc or address book to
-          an IMAP server.</para>
-          <indexterm zone="re-alpine rpload">
-            <primary sortas="b-rpload">rpload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/recode.xml
===================================================================
--- archive/recode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +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 recode-download-http "http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6.orig.tar.gz">
-  <!-- <!ENTITY recode-download-ftp  "ftp://ftp.gnu.org/gnu/recode/recode-&recode-version;.tar.gz"> -->
-  <!ENTITY recode-download-ftp  " ">
-  <!ENTITY recode-md5sum        "be3f40ad2e93dae5cd5f628264bf1877">
-  <!ENTITY recode-size          "1.7 MB">
-  <!ENTITY recode-buildsize     "24 MB">
-  <!ENTITY recode-time          "0.1 SBU">
-]>
-
-<sect1 id="recode" xreflabel="Recode-&recode-version;">
-  <?dbhtml filename="recode.html"?>
-
-
-  <title>Recode-&recode-version;</title>
-
-  <indexterm zone="recode">
-    <primary sortas="a-Recode">Recode</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to Recode</title>
-
-    <para>The <application>Recode</application> package contains a program for
-    converting text between character sets, and a library that exposes
-    this functionality to other applications. Note that the same functionality
-    (but with different API) is provided by <command>iconv</command>, which is
-    installed in LFS as a part of <application>Glibc</application>.</para>
-
-    <!-- This is not the case any longer. Apparently a new group has taken
-         interest in Recode and is planning future releases. See:
-         http://recode.progiciels-bpi.ca/
-    <note>
-      <para>The <application>Recode</application> package is no longer
-      maintained upstream. Wishlist bugs such as
-      <ulink url="http://bugs.debian.org/94966"/> will never be fixed.</para>
-    </note>
-    -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&recode-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&recode-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &recode-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &recode-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &recode-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &recode-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/recode-&recode-version;-fixes-2.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Recode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python2"/>
-    (for the <quote>bigauto</quote> test) and
-    <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/recode"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Recode</title>
-
-    <para>Install <application>Recode</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../recode-&recode-version;-fixes-2.patch &amp;&amp;
-./configure --prefix=/usr --without-included-gettext &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. The
-    testsuite will warn about the <quote>bigauto</quote> test being
-    skipped. The editors did not attempt to run this test to the end, because
-    it uses obsolete Python constructions.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--without-included-gettext</parameter>: This parameter
-    forces the use of <function>gettext</function> implementation provided
-    by <application>Glibc</application> instead of the very old internal copy.
-    The internal copy produces incorrect output in UTF-8 locales.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>recode</seg>
-        <seg>librecode.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="recode-prog">
-        <term><command>recode</command></term>
-        <listitem>
-          <para>converts text between character sets.</para>
-          <indexterm zone="recode recode-prog">
-            <primary sortas="b-recode">recode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librecode">
-        <term><filename class='libraryfile'>librecode.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions for character set conversion.</para>
-          <indexterm zone="recode librecode">
-            <primary sortas="c-librecode">librecode.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/reiser-kernel.xml
===================================================================
--- archive/reiser-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +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">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>R</emphasis>eiserfs support (deprecated)                              [REISERFS_FS]</screen>
Index: chive/reiser.xml
===================================================================
--- archive/reiser.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,225 +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 reiser-download-http "&kernel-dl;/linux/kernel/people/jeffm/reiserfsprogs/v&reiser-version;/reiserfsprogs-&reiser-version;.tar.xz">
-  <!ENTITY reiser-download-ftp  " ">
-  <!ENTITY reiser-md5sum        "90c139542725efc6da3a6b1709695395">
-  <!ENTITY reiser-size          "439 KB">
-  <!ENTITY reiser-buildsize     "13 MB">
-  <!ENTITY reiser-time          "0.2 SBU">
-]>
-
-<sect1 id="reiserfs" xreflabel="reiserfsprogs-&reiser-version;">
-  <?dbhtml filename="reiserfs.html"?>
-
-
-  <title>reiserfsprogs-&reiser-version;</title>
-
-  <indexterm zone="reiserfs">
-    <primary sortas="a-reiserfs">reiserfsprogs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to reiserfsprogs</title>
-
-    <para>
-      The <application>reiserfsprogs</application> package contains various
-      utilities for use with the Reiser file system.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&reiser-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&reiser-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &reiser-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &reiser-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &reiser-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &reiser-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="kernel" id='reiserfs-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following option in the kernel configuration
-      and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="reiser-kernel.xml"/>
-
-    <indexterm zone="reiserfs reiserfs-kernel">
-      <primary sortas="d-reiseerfs">Reiserfs Programs</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of reiserfsprogs</title>
-
-    <para>
-      Install <application>reiserfsprogs</application> by running the following
-      commands:
-    </para>
-
-<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;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: Ensure a variable is defined for use
-      with recent include files.
-    </para>
-
-    <!-- FIXME: Not needed with merged-/usr setup anymore.
-    <para>
-      <parameter>- -sbindir=/sbin</parameter>: This switch ensures that the
-      <application>reiserfsprogs</application> utilities are installed in
-      <filename class="directory">/sbin</filename>.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>debugreiserfs, mkreiserfs, reiserfsck, reiserfstune, and
-        resize_reiserfs</seg>
-        <seg>libreiserfscore.so</seg>
-        <seg>/usr/include/reiserfs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="debugreiserfs">
-        <term><command>debugreiserfs</command></term>
-        <listitem>
-          <para>
-            can sometimes help to solve problems with
-            <application>ReiserFS</application> file systems. If it is called
-            without options, it prints the super block of any
-            <application>ReiserFS</application> file
-            system found on the device
-          </para>
-          <indexterm zone="reiserfs debugreiserfs">
-            <primary sortas="b-debugreiserfs">debugreiserfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkreiserfs">
-        <term><command>mkreiserfs</command></term>
-        <listitem>
-          <para>
-            creates a <application>ReiserFS</application> file system
-          </para>
-          <indexterm zone="reiserfs mkreiserfs">
-            <primary sortas="b-mkreiserfs">mkreiserfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reiserfsck">
-        <term><command>reiserfsck</command></term>
-        <listitem>
-          <para>
-            is used to check or repair a
-            <application>ReiserFS</application> file system
-          </para>
-          <indexterm zone="reiserfs reiserfsck">
-            <primary sortas="b-reiserfsck">reiserfsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reiserfstune">
-        <term><command>reiserfstune</command></term>
-        <listitem>
-          <para>
-            is used for tuning the <application>ReiserFS</application>
-            journal. <emphasis>WARNING</emphasis>: Don't use this utility
-            without first reading the man page thoroughly
-          </para>
-          <indexterm zone="reiserfs reiserfstune">
-            <primary sortas="b-reiserfstune">reiserfstune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resize_reiserfs">
-        <term><command>resize_reiserfs</command></term>
-        <listitem>
-          <para>
-            is used to resize an unmounted
-            <application>ReiserFS</application> file system
-          </para>
-          <indexterm zone="reiserfs resize_reiserfs">
-            <primary sortas="b-resize_reiserfs">resize_reiserfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/rep-gtk.xml
===================================================================
--- archive/rep-gtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 rep-gtk-download-http "https://download.tuxfamily.org/librep/rep-gtk/rep-gtk_&rep-gtk-version;.tar.xz">
-  <!ENTITY rep-gtk-download-ftp  " ">
-  <!ENTITY rep-gtk-md5sum        "b20f72cf00d316d35fa7f84a6e7532af">
-  <!ENTITY rep-gtk-size          "120 KB">
-  <!ENTITY rep-gtk-buildsize     "13 MB">
-  <!ENTITY rep-gtk-time          "0.1 SBU">
-]>
-
-<sect1 id="rep-gtk" xreflabel="rep-gtk-&rep-gtk-version;">
-  <?dbhtml filename="rep-gtk.html"?>
-
-
-  <title>Rep-gtk-&rep-gtk-version;</title>
-
-  <indexterm zone="rep-gtk">
-    <primary sortas="a-Rep-gtk">Rep-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rep-gtk</title>
-
-    <para>
-      The <application>rep-gtk</application> package contains a
-      <application>Lisp</application> and <application>GTK</application>
-      binding.  This is useful for extending <application>GTK-2</application>
-      and <application>GDK</application> libraries with
-      <application>Lisp</application>.  Starting at
-      <application>rep-gtk</application>-0.15, the package contains the
-      bindings to <application>GTK</application> and uses the same
-      instructions.  Both can be installed, if needed.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rep-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rep-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rep-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rep-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rep-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rep-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Rep-gtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="librep"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rep-gtk</title>
-
-    <para>
-      Install <application>rep-gtk</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./autogen.sh --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Lisp bindings</seg>
-        <seg>/usr/include/rep-gtk and /usr/lib/rep/gui</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lisp-bindings">
-        <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
-          </para>
-          <indexterm zone="rep-gtk lisp-bindings">
-            <primary sortas="c-Lisp-bindings">Lisp bindings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/rman.xml
===================================================================
--- archive/rman.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,113 +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 rman-download-http "&sourceforge-repo;/polyglotman/rman-3.2.tar.gz?download">
-  <!ENTITY rman-download-ftp  " ">
-  <!ENTITY rman-md5sum        "6d1d67641c6d042595a96a62340d3cc6">
-  <!ENTITY rman-size          "80 KB">
-  <!ENTITY rman-buildsize     "629 KB">
-  <!ENTITY rman-time          "0.1 SBU">
-]>
-
-<sect1 id="rman" xreflabel="rman-&rman-version;">
-  <?dbhtml filename="rman.html"?>
-
-
-  <title>rman-&rman-version;</title>
-
-  <indexterm zone="rman">
-    <primary sortas="a-rman">rman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rman</title>
-
-    <para><application>rman</application> is a utility to convert manual
-    pages into other formats.  It can currently supports HTML, ASCII, LaTeX,
-    LaTeX2e, RTF, POD, and partial DocBook XML output.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&rman-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rman-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rman-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rman-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rman-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rman-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/rman'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rman</title>
-
-    <para>rman is no longer part of the <application>Xorg</application>
-    distribution, however, packages that use it may expect it to be in the
-    same location as your <application>Xorg</application> programs.  Adjust
-    the makefile to account for this:</para>
-
-<screen><userinput>sed -i -e "s@/opt/local@$XORG_PREFIX@" \
-    -e "s@/usr/local@$XORG_PREFIX@" Makefile</userinput></screen>
-
-    <para>Build <application>rman</application> by running the
-    following command:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>rman</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rman-bin">
-        <term><filename>rman</filename></term>
-        <listitem>
-          <para>is a manpage converter.</para>
-          <indexterm zone="rman rman">
-            <primary sortas="b-rman">rman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/rsync-client.xml
===================================================================
--- archive/rsync-client.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,22 +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="basicnet-netprogs-rsync">
-  <?dbhtml filename="rsync.html"?>
-
-
-  <title>Rsync-&rsync-version; Client</title>
-
-  <para><command>rsync</command> is a utility for fast incremental file
-  transfers. If you want to install it, the instructions can be found in Chapter
-  22 &ndash; <xref linkend="rsync"/>.  Note that if you only want to use the
-  client, you do <emphasis>not</emphasis> need to run the server and so do not
-  need the startup script and links.  In accordance with good practice, only run
-  the server if you actually need it (and if you don't know whether you need it
-  or not, it's likely that you don't!).</para>
-
-</sect1>
Index: chive/samba3-client.xml
===================================================================
--- archive/samba3-client.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,29 +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="samba3-client">
-  <?dbhtml filename="samba3-client.html"?>
-
-
-  <title>Samba-&samba3-version; Client</title>
-
-  <para>The <application>Samba</application> client utilities are used to
-  transfer files to and from, mount SMB shares located on or use printers
-  attached to Windows and other SMB servers. If you want to install these
-  utilities, the instructions can be found in Chapter 19 &ndash;
-  <xref linkend="samba3"/>. After performing the basic installation,
-  configure the utilities using the configuration section titled
-  <quote>Scenario 1: Minimal Standalone Client-Only Installation</quote>.</para>
-
-  <para>Note that if you only want to use these client utilities, you do
-  <emphasis>not</emphasis> need to run the server daemons and so do not need
-  the startup script and links. In accordance with good practice, only run the
-  server daemons if you actually need them. You'll find an explanation of the
-  services provided by the server daemons in the <xref linkend="samba3"/>
-  instructions.</para>
-
-</sect1>
Index: chive/sawfish.xml
===================================================================
--- archive/sawfish.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,350 +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 sawfish-download-http "https://download.tuxfamily.org/sawfish/sawfish_&sawfish-version;.tar.xz">
-  <!ENTITY sawfish-download-ftp  " ">
-  <!ENTITY sawfish-md5sum        "fd6ca5be0acbee8ea150945d3fb3ec60">
-  <!ENTITY sawfish-size          "2.7 MB">
-  <!ENTITY sawfish-buildsize     "52 MB">
-  <!ENTITY sawfish-time          "0.3 SBU">
-]>
-
-<sect1 id="sawfish" xreflabel="sawfish-&sawfish-version;">
-  <?dbhtml filename="sawfish.html" ?>
-
-
-  <title>sawfish-&sawfish-version;</title>
-
-  <indexterm zone="sawfish">
-    <primary sortas="a-Sawfish">Sawfish</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sawfish</title>
-
-    <para>
-      The <application>sawfish</application> package contains a window
-      manager. This is useful for organizing and displaying windows where all
-      window decorations are configurable and all user-interface policy is
-      controlled through the extension language.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sawfish-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sawfish-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sawfish-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sawfish-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sawfish-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sawfish-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/sawfish-&sawfish-version;-gcc10_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">sawfish Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-       <xref linkend="gdk-pixbuf-xlib"/>,
-       <xref linkend="rep-gtk"/>, and
-       <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sawfish</title>
-
-<!--
-    <para>
-      First, adapt <application>sawfish</application> to build with GCC-10:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../sawfish-&sawfish-version;-gcc10_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>sawfish</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --with-pango  &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>
-
-    <para>
-      This package creates six <filename>.desktop</filename> files in the
-      <filename class="directory">/usr/share/xsessions/</filename> directory.
-      All but one are needed in a BLFS system, so prevent the extra files
-      showing up as options in a display manager.  As the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -v /usr/share/xsessions/sawfish-*.desktop</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>- -disable-themer</parameter>: This
-      option prevents building the <application>sawfish</application> themer.
-      This program was not migrated to <application>GTK-2</application>.
-    </para>
-
-    <para>
-      <option>- -with-audiofile</option>: This command directs
-      <application>sawfish</application> to use
-      <filename class="libraryfile">libaudiofile</filename>
-      for sound manipulation.
-    </para>
-
-    <para>
-      <option>- -with-esd</option>: This command directs
-      <application>sawfish</application> to use the Enlightened Sound
-      Daemon.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="configuration">
-    <title>Configuring sawfish</title>
-
-    <sect3 id="sawfish-config">
-      <title>Configuration Information</title>
-
-      <indexterm zone="sawfish sawfish-config">
-        <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-      </indexterm>
-
-      <para>
-        Be sure to backup your current <filename>.xinitrc</filename>
-        before proceeding.
-      </para>
-
-<screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>exec sawfish</literal>
-EOF</userinput></screen>
-
-      <para>
-        Optionally, you can use a Display Manager, such as <xref
-        linkend="sddm"/>.
-      </para>
-
-      <para>
-        From the developers:  <quote>The default menu binding is somewhat
-        obscure; you must middle-click on the background to bring up the menus.
-        (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
-        FAQ</ulink>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          sawfish, sawfish-about, sawfish-client, sawfish-config,
-          sawfish-kde4-session, sawfish-kde5-session, sawfish-lumina-session,
-          sawfish-mate-session, and sawfish-xfce-session
-        </seg>
-        <seg>
-          Several internal modules under /usr/lib/sawfish tree
-        </seg>
-        <seg>
-          /usr/include/sawfish,
-          /usr/lib/sawfish,
-          /usr/lib/rep/sawfish, and
-          /usr/share/sawfish
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sawfish-prog">
-        <term><command>sawfish</command></term>
-        <listitem>
-          <para>
-            is the extensible window manager using a
-            <application>Lisp</application>-based scripting language
-          </para>
-          <indexterm zone="sawfish sawfish-prog">
-            <primary sortas="b-sawfish">sawfish</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sawfish-about">
-        <term><command>sawfish-about</command></term>
-        <listitem>
-          <para>
-            is the <application>sawfish</application> about window
-          </para>
-          <indexterm zone="sawfish sawfish-about">
-            <primary sortas="b-sawfish-about">sawfish-about</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sawfish-client">
-        <term><command>sawfish-client</command></term>
-        <listitem>
-          <para>
-            allows you to connect to a window manager process and
-            evaluate arbitrary <application>Lisp</application> forms
-          </para>
-          <indexterm zone="sawfish sawfish-client">
-            <primary sortas="b-sawfish-client">sawfish-client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sawfish-config-prog">
-        <term><command>sawfish-config</command></term>
-        <listitem>
-          <para>
-            is the <application>sawfish</application> configuration manager
-          </para>
-          <indexterm zone="sawfish sawfish-config-prog">
-            <primary sortas="b-sawfish-config-prog">sawfish-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sawfish-kde4-session">
-        <term><command>sawfish-kde4-session</command></term>
-        <listitem>
-          <para>
-             is a script to run <application>KDE4</application> using
-             <application>sawfish</application>
-          </para>
-          <indexterm zone="sawfish sawfish-kde4-session">
-            <primary sortas="b-sawfish-kde4-session">sawfish-kde4-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sawfish-kde5-session">
-        <term><command>sawfish-kde5-session</command></term>
-        <listitem>
-          <para>
-            is a script to run <application>Plasma 5</application> using
-            <application>sawfish</application>
-          </para>
-          <indexterm zone="sawfish sawfish-kde5-session">
-            <primary sortas="b-sawfish-kde5-session">sawfish-kde5-session</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="sawfish-mate-session">
-        <term><command>sawfish-mate-session</command></term>
-        <listitem>
-          <para>
-             is a script to run <application>mate</application> using
-             <application>sawfish</application>
-          </para>
-          <indexterm zone="sawfish sawfish-mate-session">
-            <primary sortas="b-sawfish-mate-session">sawfish-mate-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sawfish-lumina-session">
-        <term><command>sawfish-lumina-session</command></term>
-        <listitem>
-          <para>
-             is a script to run <application>Lumina</application> using
-             <application>sawfish</application>
-          </para>
-          <indexterm zone="sawfish sawfish-lumina-session">
-            <primary sortas="b-sawfish-lumina-session">sawfish-lumina-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sawfish-xfce-session">
-        <term><command>sawfish-xfce-session</command></term>
-        <listitem>
-          <para>
-             is a script to run <application>xfce</application> using
-             <application>sawfish</application>
-          </para>
-          <indexterm zone="sawfish sawfish-xfce-session">
-            <primary sortas="b-sawfish-xfce-session">sawfish-xfce-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/scrollkeeper.xml
===================================================================
--- archive/scrollkeeper.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 scrollkeeper-download-http "&gnome-download-http;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-download-ftp  "&gnome-download-ftp;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-md5sum        "b175e582a6cec3e50a9de73a5bb7455a">
-  <!ENTITY scrollkeeper-size          "546 KB">
-  <!ENTITY scrollkeeper-buildsize     "12 MB">
-  <!ENTITY scrollkeeper-time          "0.1 SBU">
-]>
-
-<sect1 id="scrollkeeper" xreflabel="ScrollKeeper-&scrollkeeper-version;">
-  <?dbhtml filename="scrollkeeper.html"?>
-
-
-  <title>ScrollKeeper-&scrollkeeper-version;</title>
-
-  <indexterm zone="scrollkeeper">
-    <primary sortas="a-ScrollKeeper">ScrollKeeper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ScrollKeeper</title>
-
-    <para>The <application>ScrollKeeper</application> package contains a
-    cataloging system for documentation. This is useful for managing
-    documentation metadata and providing an API to help browsers find, sort
-    and search the document catalog.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&scrollkeeper-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&scrollkeeper-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &scrollkeeper-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &scrollkeeper-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &scrollkeeper-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &scrollkeeper-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ScrollKeeper Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxslt"/>,
-    <xref linkend="DocBook"/>, and
-    <xref linkend="perl-xml-parser"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/scrollkeeper"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ScrollKeeper</title>
-
-    <para>Install <application>ScrollKeeper</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --with-omfdirs=/usr/share/omf:\
-/opt/kde-&kde-version;/share/omf:\
-/opt/gnome-&gnome-version;&gnome-minor-version;/share/omf &amp;&amp;
-
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This switch puts the
-    configuration files in <filename class="directory">/etc</filename>
-    instead of <filename class='directory'>/usr/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This switch puts
-    <application>ScrollKeeper</application>'s database directory in
-    <filename class="directory">/var/lib/scrollkeeper</filename>.</para>
-
-    <para><parameter>--disable-static</parameter>: This switch prevents
-    the static library from being built.</para>
-
-    <para><parameter>--with-omfdirs=...</parameter>: This switch defines the
-    locations of <filename>OMF</filename> files for
-    <application>ScrollKeeper</application>. Change the locations if you have
-    <application>KDE</application> and/or <application>GNOME</application>-2
-    installed in a prefix other than the ones shown. This information is stored
-    in <filename>/etc/scrollkeeper.conf</filename> and can be updated manually,
-    if necessary.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ScrollKeeper</title>
-
-    <sect3 id="scrollkeeper-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/scrollkeeper.conf</filename></para>
-
-      <indexterm zone="scrollkeeper scrollkeeper-config">
-        <primary sortas="e-etc-scrollkeeper.conf">/etc/scrollkeeper.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The configuration file sets the <envar>OMF_DIR</envar> variable
-      to the location of all of the <filename class="directory">omf</filename>
-      directories in the system. This was set in the
-      <command>configure</command> command so no further action is needed until
-      another <filename>OMF</filename> directory is created.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>scrollkeeper-config, scrollkeeper-extract, scrollkeeper-gen-seriesid,
-        scrollkeeper-get-cl, scrollkeeper-get-content-list,
-        scrollkeeper-get-extended-content-list, scrollkeeper-get-index-from-docpath,
-        scrollkeeper-get-toc-from-docpath, scrollkeeper-get-toc-from-id,
-        scrollkeeper-install, scrollkeeper-preinstall, scrollkeeper-rebuilddb,
-        scrollkeeper-uninstall, and scrollkeeper-update</seg>
-        <seg>libscrollkeeper.so</seg>
-        <seg>/usr/share/doc/scrollkeeper-&scrollkeeper-version;,
-        /usr/share/{omf, {,xml/}scrollkeeper}, and
-        /var/lib/scrollkeeper</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term><command>ScrollKeeper utility programs</command></term>
-        <listitem>
-          <para>The <application>ScrollKeeper</application> utility programs
-          and scripts listed above are for performing installation, building,
-          getting and updating table of contents files.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libscrollkeeper">
-        <term><filename class='libraryfile'>libscrollkeeper.so</filename></term>
-        <listitem>
-          <para>provides the API necessary for help
-          browsers to interact with documentation written to utilize
-          <application>ScrollKeeper</application>.</para>
-          <indexterm zone="scrollkeeper libscrollkeeper">
-            <primary sortas="c-libscrollkeeper">libscrollkeeper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/sddm.xml
===================================================================
--- archive/sddm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,606 +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 sddm-download-http "https://github.com/sddm/sddm/releases/download/v&sddm-version;/sddm-&sddm-version;.tar.xz">
-  <!ENTITY sddm-download-ftp  " ">
-  <!ENTITY sddm-md5sum        "b41182cc9d53d75485c112ab82dc95d0">
-  <!ENTITY sddm-size          "3.2 MB">
-  <!ENTITY sddm-buildsize     "20 MB">
-  <!ENTITY sddm-time          "0.6 SBU ">
-]>
-
-<sect1 id="sddm" xreflabel="sddm-&sddm-version;">
-  <?dbhtml filename="sddm.html"?>
-
-
-  <title>sddm-&sddm-version;</title>
-
-  <indexterm zone="sddm">
-    <primary sortas="a-SDDM">SDDM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SDDM</title>
-
-    <para>
-      The <application>SDDM</application> package contains a lightweight
-      display manager based upon <application>Qt</application> and QML.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sddm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sddm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sddm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sddm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sddm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sddm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SDDM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="linux-pam"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (for the man pages)
-    </para>
-
-    <bridgehead renderas="sect4" revision="sysv">Runtime Dependency</bridgehead>
-    <para role="required" revision="sysv">
-      <xref role="runtime" linkend="consolekit"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/sddm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SDDM</title>
-
-    <para>
-      First, create a dedicated user and group to take
-      control of the <command>sddm</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 64 sddm &amp;&amp;
-useradd  -c "SDDM Daemon" \
-         -d /var/lib/sddm \
-         -u 64 -g sddm    \
-         -s /bin/false sddm</userinput></screen>
-
-    <para revision="sysv">
-      Next, fix the application to start <command>upowerd</command>,
-      if necessary, and after login, start the session with
-      <command>ck-launch-session</command>:
-    </para>
-
-<screen revision="sysv"><userinput>sed -e '/UPOWER_SERVICE)/ s:^://:' \
-    -i src/daemon/PowerManager.cpp &amp;&amp;
-
-sed -e '/\$@$/s/exec/&amp; ck-launch-session/' \
-    -i data/scripts/Xsession</userinput></screen>
-
-    <para revision="sysv">
-      For sddm-0.16.0, ConsoleKit support has been added, but is broken. Remove
-      it with:
-    </para>
-<!-- This removes also logind support. Hopefully should be fixed for next
-     version -->
-<screen revision="sysv"><userinput>sed -e '/available.*true/s/true/false/' \
-    -i src/daemon/LogindDBusTypes.cpp</userinput></screen>
-
-    <para>
-      Install <application>SDDM</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DENABLE_JOURNALD=OFF       \
-      -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev .. &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;
-install -v -dm755 -o sddm -g sddm /var/lib/sddm</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      apply additional compiler optimizations.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-DENABLE_JOURNALD=OFF</parameter>: This switch is used because
-      this version of BLFS does not support <application>systemd</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf</parameter>:
-      This switch prevents the file <filename>
-      /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf</filename> from
-      being overwritten, as it may be used by other DM's.
-    </para>
-
-    <para>
-      <option>-DBUILD_MAN_PAGES=ON</option>: This switch may be used if you want
-      the man pages to be installed. Notice that you need
-      <xref linkend="docutils"/> to build them.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SDDM</title>
-
-    <sect3 id="sddm-config">
-      <title>Config Files</title>
-
-      <para>
-        /usr/lib/sddm/sddm.conf.d/*, /etc/sddm.conf.d/*, and /etc/sddm.conf
-      </para>
-
-      <indexterm zone="sddm sddm-config">
-        <primary sortas="e-usr-lib-sddm.conf.d">/usr/lib/sddm/sddm.conf.d</primary>
-      </indexterm>
-
-      <indexterm zone="sddm sddm-config">
-        <primary sortas="e-sddm.conf.d">/etc/sddm.conf.d</primary>
-      </indexterm>
-
-      <indexterm zone="sddm sddm-config">
-        <primary sortas="e-sddm.conf">/etc/sddm.conf</primary>
-      </indexterm>
-
-      <para>
-        Only <filename>/etc/sddm.conf</filename> is installed, but the
-        configuration files are read in the following order: all files in
-        <filename class="directory">/usr/lib/sddm/sddm.conf.d</filename> in
-        alphabetical order, then all files in <filename class="directory">
-        /etc/sddm.conf.d</filename> in alphabetical order, and finally
-        <filename>/etc/sddm.conf</filename>.
-      </para>
-
-      <para>
-        Normally, you want to edit this file. For example, if Xorg is installed
-        in /opt, use your preferred editor as the <systemitem
-        class="username">root</systemitem> user to replace the default
-        <emphasis>XauthPath</emphasis> value by
-        <emphasis>/opt/xorg/bin/xauth</emphasis>. Or, as the <systemitem
-        class="username">root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>sed -e '/ServerPath/ s|usr|opt/xorg|' \
-    -i.orig /etc/sddm.conf</userinput></screen>
-
-      <para>
-        This command will do the substitution and create a copy of the original
-        file with name <filename>/etc/sddm.conf.orig</filename>.
-      </para>
-
-      <para>
-        From now on, we will describe how to modify configurations using sed.
-        Of course, you may instead use your preferred editor as the <systemitem
-        class="username">root</systemitem> user.
-      </para>
-
-      <para>
-        For security reasons, you normally want the default
-        <emphasis>ServerArguments=-nolisten tcp</emphasis>, unless a remote
-        machine needs access to the local X server. In that case, as the
-        <systemitem class="username">root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>sed -e 's/-nolisten tcp//'\
-    -i /etc/sddm.conf</userinput></screen>
-
-      <para>
-        Desktop (Notebook) users, normally wish the Num Lock key on (off).  For
-        that, as the <systemitem
-        class="username">root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>sed -e 's/\"none\"/\"on\"/' \
-    -i /etc/sddm.conf</userinput></screen>
-
-      <para>
-        for Desktop users. For Notebook users, replace \"on\" by \"off\",
-        in the command above.
-      </para>
-
-   </sect3>
-
-    <sect3 id="sddm-bootscript">
-      <title>Boot Script</title>
-
-      <para>
-        Install the <filename revision="sysv">/etc/rc.d/init.d/sddm</filename>
-        init script from the <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
-      </para>
-
-      <indexterm zone="sddm sddm-bootscript">
-        <primary sortas="f-sddm">sddm</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-sddm</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable sddm</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If you have built <application>SDDM</application>
-        with <application>Linux PAM</application> support,
-        create the necessary configuration files by running
-        the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-autologin &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm-autologin
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-
-password required       pam_deny.so
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm-autologin</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-greeter &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm-greeter
-
-auth     required       pam_env.so
-auth     required       pam_permit.so
-
-account  required       pam_permit.so
-password required       pam_deny.so
-session  required       pam_unix.so
--session optional       pam_systemd.so
-
-# End /etc/pam.d/sddm-greeter</literal>
-EOF</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/sddm
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-autologin &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/sddm-autologin
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-
-password required       pam_deny.so
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm-autologin</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-greeter &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm-greeter
-
-auth     required       pam_env.so
-auth     required       pam_permit.so
-
-account  required       pam_permit.so
-password required       pam_deny.so
-session  required       pam_unix.so
--session optional       pam_systemd.so
-
-# End /etc/pam.d/sddm-greeter</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="sddm-init" revision="sysv">
-      <title>Starting sddm</title>
-
-      <para>
-        If the sddm bootscript has been installed, start sddm by running, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>/etc/rc.d/init.d/sddm start</userinput></screen>
-
-      <para>
-        By convention, X should be executed at runlevel 5, consequently, the
-        same is true for <application>sddm</application>. However, LFS default
-        runlevel is 3. Changing to runlevel 5, from a console terminal, as
-        <systemitem class="username">root</systemitem> user, starts the
-        <command>sddm</command> bootscript, bringing up the greeter screen:
-      </para>
-
-<screen role="root"><userinput>init 5</userinput></screen>
-
-      <para>
-        In order to permanently set the default to 5, starting the
-        <command>sddm</command> greeter screen automatically, modify
-        <filename>/etc/inittab</filename>.  As the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
-sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="sddm-sessions">
-      <title>Available Sessions</title>
-
-      <para>
-        The greeter offers a list of available sessions,
-        depending on the Window Managers and Desktop Environments installed. The
-        list includes sessions which have a corresponding
-        <filename>.desktop</filename> file installed under
-        <filename class="directory">/usr/share/xsessions</filename>. Most of the
-        Window Managers and Desktop Environments automatically provide those
-        files, but if necessary, you may include a custom one.
-      </para>
-
-    </sect3>
-
-    <sect3 id="sddm-themes">
-      <title>Themes</title>
-
-      <para>
-        Three themes are installed at <filename class="directory">
-        /usr/share/sddm/themes</filename>:
-        elarun,
-        maldives, and
-        maya.
-        There is also a default theme, which is not present in that directory.
-        You can install other themes in that directory. In order to change the
-        theme, you need to edit <filename>/etc/sddm.conf</filename>,
-        to change the default (empty) theme, replacing <quote>Current=</quote>
-        with <quote>Current=&lt;new theme&gt;</quote>, e.g.
-        <quote>Current=maldives</quote>.
-      </para>
-
-      <para>
-        In order to see the theme without leaving the session, issue:
-      </para>
-
-<screen><userinput>sddm-greeter --test-mode --theme <replaceable>&lt;theme path&gt;</replaceable></userinput></screen>
-
-    </sect3>
-
-    <sect3 id="sddm-Issues">
-      <title>Known Issues</title>
-
-      <para>
-        This application works well, but there are issues. You find the
-        mainstream known issues at
-        <ulink url="https://github.com/sddm/sddm/issues">Issues</ulink>.
-        The BLFS development team have found some issues.
-      </para>
-
-      <note>
-        <para>
-          In the next couple of paragraphs, due to a problem with sddm-greeter,
-          we mention how to define the keyboard used there. Notice that this is
-          also the keyboard that will be used in the X session, unless there is
-          a configuration in the Desktop Environment or in the Window Manager
-          overriding it, afterwards.
-        </para>
-      </note>
-
-      <para>
-        Keyboard selection: the greeter shows a double question mark or the
-        wrong keyboard. When you start to type the password or user name
-        (depending on the theme, only password), the right keyboard selection
-        magically appears. Optionally, a workaround is to include the keyboard
-        list in <command>/usr/share/sddm/scripts/Xsetup</command> script, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo 'setxkbmap <replaceable>"&lt;your keyboard comma separated list&gt;"</replaceable>' &gt;&gt; \
-     /usr/share/sddm/scripts/Xsetup</userinput></screen>
-
-      <para>
-        E.g. <command>echo 'setxkbmap "fr,gb,br,us"' &gt;&gt;
-        /usr/share/sddm/scripts/Xsetup</command>. A very accurate definition
-        of the keyboard(s) is possible, for example: <command>echo 'setxkbmap
-        -model pc105 -layout br,us -variant abnt2,dvorak -keycodes evdev'
-        &gt;&gt; /usr/share/sddm/scripts/Xsetup</command>. See man setxkbmap.
-      </para>
-
-      <para>
-        Dircolors: the <filename>/etc/dircolors</filename> file is not
-        honoured. Particularly, the compressed files are not displayed in red
-        colour. If this happens, a workaround is to issue, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo "source /etc/profile.d/dircolors.sh" &gt;&gt; /etc/bashrc</userinput></screen>
-
-      <para>
-        It has been reported that problems may happen with this package, if
-        Xorg is installed with a prefix other than <filename
-        class="directory">/usr</filename>. So far, BLFS development team has
-        not hit any problem, in this case.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sddm and sddm-greeter
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $QT5DIR/qml/SddmComponents,
-          /usr/share/sddm, and
-          /var/lib/sddm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sddm-prog">
-        <term><command>sddm</command></term>
-        <listitem>
-          <para>
-            is a display and login manager based on
-            <application>Qt</application> libraries.
-          </para>
-          <indexterm zone="sddm sddm-prog">
-            <primary sortas="b-sddm">sddm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sddm-greeter">
-        <term><command>sddm-greeter</command></term>
-        <listitem>
-          <para>
-            is an auxiliary process that displays the greeter,
-            a graphical user interface that performs user
-            authentication and initiates the selected window manager
-            or display environment.
-          </para>
-          <indexterm zone="sddm sddm-greeter">
-            <primary sortas="b-sddm-greeter">sddm-greeter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/setqt.xml
===================================================================
--- archive/setqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,34 +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" [
-   <!ENTITY % general-entities SYSTEM "../general.ent">
-   %general-entities;
-]>
-
-<sect3>
-    <title>Choosing Qt Program Versions</title>
-
-    <para>If you install both Qt4 and Qt5, you can use some simple
-    scripts to select the currently active set of Qt programs.  As the
-    <systemitem class="username">root</systemitem> user, create
-    the following scripts:</para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/setqt4 &lt;&lt; 'EOF'
-<literal>if [ "x$QT5DIR" != "x/usr" ] &amp;&amp; [ "x$QT5DIR" != "x" ]; then pathremove  $QT5DIR/bin; fi
-if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
-echo $PATH</literal>
-EOF</userinput></screen>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/setqt5 &lt;&lt; 'EOF'
-<literal>if [ "x$QT4DIR" != "x/usr" ] &amp;&amp; [ "x$QT4DIR" != "x" ]; then pathremove  $QT4DIR/bin; fi
-if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
-echo $PATH</literal>
-EOF</userinput></screen>
-
-    <para>You should now be able to use the appropriate Qt version by running
-    <command>source setqt4</command> or <command>source setqt5</command> as
-    desired. (Setting the PATH wont work in a subshell.) Another technique that
-    can be used is to create appropriate alias additions to your ~/.bashrc like
-    <command>alias setqt4='source setqt4'</command>.</para>
-
-</sect3>
Index: chive/setuptools-again.xml
===================================================================
--- archive/setuptools-again.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +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;
-
-<!-- I don't like the way this URL is structured. -renodr -->
-<!--  wget https://pypi.python.org/pypi/setuptools to find path for latest version -->
-  <!ENTITY setuptools-download-http
-           "https://pypi.python.org/packages/f1/92/12c7251039b274c30106c3e0babdcb040cbd13c3ad4b3f0ef9a7c217e36a/setuptools-&setuptools-version;.tar.gz">
-  <!ENTITY setuptools-download-ftp  " ">
-  <!ENTITY setuptools-md5sum        "7f2ba59682bc8c6ae6f1f927aca1a351">
-  <!ENTITY setuptools-size          "636 KB">
-  <!ENTITY setuptools-buildsize     "12 MB">
-  <!ENTITY setuptools-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Setuptools -->
-  <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;" revision="systemd">
-
-    <title>Setuptools-&setuptools-version;</title>
-
-    <indexterm zone="setuptools">
-      <primary sortas="a-Setuptools">Setuptools</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Setuptools Module</title>
-
-      <para>
-        <application>Setuptools</application> is a <application>Python</application>
-        module that makes it easier to download, build, install, upgrade, and
-        uninstall <application>Python</application> packages.
-      </para>
-
-      &lfs7a_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&setuptools-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&setuptools-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &setuptools-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &setuptools-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &setuptools-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &setuptools-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Setuptools Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> and/or
-        <xref linkend="python3"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/setuptools"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Setuptools</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>
-        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>python setup.py install --optimize=1</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>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            easy_install, easy_install-&python2-majorver;, and easy_install-&python3-majorver;
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/setuptools,
-            /usr/lib/python&python2-majorver;/site-packages/setuptools-&setuptools-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/setuptools,
-            /usr/lib/python&python3-majorver;/site-packages/setuptools-&setuptools-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Setuptools -->
Index: chive/setuptools.xml
===================================================================
--- archive/setuptools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 setuptools-download-http
-           "https://pypi.python.org/packages/source/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-  <!ENTITY setuptools-download-ftp  " ">
-  <!ENTITY setuptools-md5sum        "10407f6737d8dc37e5310e68c1f1f6ec">
-  <!ENTITY setuptools-size          "616 KB">
-  <!ENTITY setuptools-buildsize     "8.6 MB (additional 4.4 MB for tests)">
-  <!ENTITY setuptools-time          "less than 0.1 SBU (additional 2.1 SBU for tests)">
-]>
-
-  <!-- Begin Setuptools -->
-  <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;">
-
-    <title>Setuptools-&setuptools-version;</title>
-
-    <indexterm zone="setuptools">
-      <primary sortas="a-Setuptools">Setuptools</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Setuptools Module</title>
-
-      <para>
-        <application>Setuptools</application> is a fully-featured,
-        actively-maintained, and stable library designed to facilitate
-        packaging <application>Python</application> projects.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&setuptools-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&setuptools-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &setuptools-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &setuptools-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &setuptools-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &setuptools-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Setuptools Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> or <xref linkend="python3"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/setuptools"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Setuptools</title>
-
-      <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 install <application>Setuptools</application> for <application>Python
-        2</application>, run the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install <application>Setuptools</application> for <application>Python
-        3</application>, run the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i "s:easy_install:&amp;3:" setup.py &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        Run the tests by issuing <command>python setup.py test</command> and/or
-        <command>python3 setup.py test</command>. The tests need an active
-        internet connection. Optional python modules mock, pytest and py will be
-        downloaded and installed during the tests.
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -i "s:easy_install:&amp;3:g" setup.py</command>: This sed
-        prevents <command>setup.py</command> from overwriting an already
-        installed script by the <application>Python 2</application> module.
-        Remove it if you are building this module only for
-        <application>Python 3</application>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            easy_install, easy_install-&python2-majorver;, and/or
-            easy_install3, easy_install3-&python3-majorver;
-          </seg>
-          <seg>
-            setuptools-&setuptools-version;-py&python2-majorver;.egg and/or
-            setuptools-&setuptools-version;-py&python3-majorver;.egg
-          </seg>
-          <seg>
-            None
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-  </sect2>
-  <!-- End Setuptools -->
Index: chive/shrdesktopontologies.xml
===================================================================
--- archive/shrdesktopontologies.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,108 +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 shared-desktop-ontologies-download-http
-           "&sourceforge-repo;/oscaf/shared-desktop-ontologies-&shared-desktop-ontologies-version;.tar.bz2">
-  <!ENTITY shared-desktop-ontologies-download-ftp  " ">
-  <!ENTITY shared-desktop-ontologies-md5sum        "db75d155ac9b60e3d187e23544744acc">
-  <!ENTITY shared-desktop-ontologies-size          "3.8 MB">
-  <!ENTITY shared-desktop-ontologies-buildsize     "6.7 MB">
-  <!ENTITY shared-desktop-ontologies-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="shared-desktop-ontologies" xreflabel="shared-desktop-ontologies-&shared-desktop-ontologies-version;">
-  <?dbhtml filename="shared-desktop-ontologies.html"?>
-
-
-  <title>Shared-desktop-ontologies-&shared-desktop-ontologies-version;</title>
-
-  <indexterm zone="shared-desktop-ontologies">
-    <primary sortas="a-shared-desktop-ontologies">shared-desktop-ontologies</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Shared-Desktop-Ontologies</title>
-
-    <para>The Shared desktop ontologies provide RDF vocabularies for the
-    Semantic Desktop. This includes basic ontologies like RDF and RDFS and all
-    the Nepomuk ontologies like NRL, NIE, and NFO, which are also maintained
-    and developed in this open-source project.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&shared-desktop-ontologies-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&shared-desktop-ontologies-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &shared-desktop-ontologies-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &shared-desktop-ontologies-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &shared-desktop-ontologies-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &shared-desktop-ontologies-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Shared-desktop-ontologies Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/shared-desktop-ontologies"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shared-desktop-ontologies</title>
-
-    <para>Install <application>Shared-desktop-ontologies</application> by
-    running the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>&kde-dir;/share/ontology and
-        &kde-dir;/share/cmake/SharedDesktopOntologies</seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: chive/simpleburn.xml
===================================================================
--- archive/simpleburn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,255 +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 simpleburn-download-http "http://simpleburn.tuxfamily.org/IMG/gz/simpleburn-&simpleburn-version;.tar.gz">
-  <!ENTITY simpleburn-download-ftp  " ">
-  <!ENTITY simpleburn-md5sum        "11cf5b9a69fda6c72b1ae1277fafa386">
-  <!ENTITY simpleburn-size          "52 KB">
-  <!ENTITY simpleburn-buildsize     "1.6 MB">
-  <!ENTITY simpleburn-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="simpleburn" xreflabel="SimpleBurn-&simpleburn-version;">
-  <?dbhtml filename="simpleburn.html"?>
-
-
-  <title>SimpleBurn-&simpleburn-version;</title>
-
-  <indexterm zone="simpleburn">
-    <primary sortas="a-SimpleBurn">SimpleBurn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SimpleBurn</title>
-
-    <para>
-      <application>SimpleBurn</application> is a minimalistic application for
-      burning and extracting CDs and DVDs.
-    </para>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&simpleburn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&simpleburn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &simpleburn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &simpleburn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &simpleburn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &simpleburn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SimpleBurn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcddb"/> and
-      <xref linkend="cmake"/> and
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libisoburn"/>,
-      <xref linkend="cdparanoia"/>, and
-      <xref linkend="cdrdao"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcdio"/> (to identify and play CDs),
-      <xref linkend="flac"/>,
-      <xref linkend="mpg123"/>,
-      <xref linkend="vorbistools"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="mplayer"/>,
-      <ulink url="http://mpg321.sourceforge.net/">mpg321</ulink>,
-      <ulink url="http://normalize.nongnu.org/">normalize</ulink>,
-      <ulink url="http://sourceforge.net/projects/cdrtools/files/alpha/">cdrtools</ulink>, and
-      <ulink url="http://www.cdrkit.org/">cdrkit</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/simpleburn"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SimpleBurn</title>
-
-    <para>
-      Install <application>SimpleBurn</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i -e 's|DESTINATION doc|DESTINATION share/doc|' CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBURNING=LIBBURNIA .. &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>
-
-    <para>
-      All optical devices are not accessible for any user except <systemitem
-      class="username">root</systemitem> and members of the <systemitem
-      class="groupname">cdrom</systemitem> group. Add any users that might use
-      the optical devices to that group:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G cdrom <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: Ensure the documentation is installed
-      in /usr/share/doc.
-    </para>
-
-    <para>
-      <parameter>-DBURNING=LIBBURNIA</parameter>: This switch changes the
-      burning suite from the default cdrtools.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          simpleburn,
-          simpleburn.sh
-          simpleburn-detect.sh,
-          simpleburn-gauges, and 
-          simpleburn-gauges.sh
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/simpleburn-&simpleburn-version; and
-          /usr/share/simpleburn
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="simpleburn-prog">
-        <term><command>simpleburn</command></term>
-        <listitem>
-          <para>
-            is the graphical program.
-          </para>
-          <indexterm zone="simpleburn simpleburn-prog">
-            <primary sortas="b-simpleburn">simpleburn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleburn-gauges">
-        <term><command>simpleburn-gauges</command></term>
-        <listitem>
-          <para>
-            is a program used to display a gauge.
-          </para>
-          <indexterm zone="simpleburn simpleburn-gauges">
-            <primary sortas="b-simpleburn-gauges">simpleburn-gauges</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleburn-detect.sh">
-        <term><command>simpleburn-detect.sh</command></term>
-        <listitem>
-          <para>
-            is a script that detects a cdrom and optional outputs details
-            about the media.
-          </para>
-          <indexterm zone="simpleburn simpleburn-detect.sh">
-            <primary sortas="b-simpleburn-detect.sh">simpleburn-detect.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleburn-gauges.sh">
-        <term><command>simpleburn-gauges.sh</command></term>
-        <listitem>
-          <para>
-            is a suport script for other simpleburn scripts
-          </para>
-          <indexterm zone="simpleburn simpleburn-gauges.sh">
-            <primary sortas="b-simpleburn-gauges.sh">simpleburn-gauges.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleburn.sh">
-        <term><command>simpleburn.sh</command></term>
-        <listitem>
-          <para>
-            is a script for command line based cdrom operations
-          </para>
-          <indexterm zone="simpleburn simpleburn.sh">
-            <primary sortas="b-simpleburn.sh">simpleburn.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/slib.xml
===================================================================
--- archive/slib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +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 slib-download-http
-  "http://groups.csail.mit.edu/mac/ftpdir/scm/slib-&slib-version;.tar.gz">
-  <!ENTITY slib-download-ftp  " ">
-  <!ENTITY slib-md5sum        "dcada65c4df4209c8f71211095bcef8e">
-  <!ENTITY slib-size          "956 KB">
-  <!ENTITY slib-buildsize     "10 MB (includes building and installing docs)">
-  <!ENTITY slib-time          "0.5 SBU">
-]>
-
-<sect1 id="slib" xreflabel="SLIB-&slib-version;">
-  <?dbhtml filename="slib.html"?>
-
-
-  <title>SLIB-&slib-version;</title>
-
-  <indexterm zone="slib">
-    <primary sortas="a-SLIB">SLIB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SLIB</title>
-
-    <para>The <application>SLIB</application> package is a portable library for
-    the <application>Scheme</application> programming language. It provides a
-    platform independent framework for using <quote>packages</quote> of
-    <application>Scheme</application> procedures and syntax.
-    Its catalog can be transparently extended to accommodate packages specific
-    to a site, implementation, user or directory. SLIB provides compatibility
-    and utility functions for all standard Scheme implementations including
-    Bigloo, Chez, ELK 3.0, GAMBIT 3.0, Guile, JScheme, MacScheme, MITScheme,
-    PLT Scheme (DrScheme and MzScheme), Pocket Scheme, RScheme, scheme->C,
-    Scheme48, SCM, SCM Mac, scsh, Stk, T3.1, umb-scheme, and VSCM.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&slib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&slib-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &slib-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &slib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &slib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &slib-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SLIB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="guile"/>.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/slib"/></para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SLIB</title>
-
-    <para>Install <application>SLIB</application> by issuing the following
-    commands:</para>
-
-<screen><userinput>sed -i 's|usr/lib|usr/share|' RScheme.init                      &amp;&amp;
-./configure --prefix=/usr --libdir=/usr/share                   &amp;&amp;
-
-sed -i -e 's# scm$# guile#;s#ginstall-info#install-info#' \
-       -e 's/no-split -o/no-split --force -o/' Makefile         &amp;&amp;
-
-makeinfo -o slib.txt --plaintext --force slib.texi              &amp;&amp;
-makeinfo -o slib.html --html --no-split --force slib.texi</userinput></screen>
-
-<!-- Thee are errors in slib.texi
-    <para>If you have <xref linkend="texlive"/> installed and wish to build PDF
-    or Postscript documentation, issue any or all of the following
-    commands:</para>
-
-<screen><userinput>texi2pdf slib.texi &amp;&amp;
-texi2dvi slib.texi &amp;&amp;
-dvips -o slib.ps slib.dvi</userinput></screen>
--->
-    <para>This package does not come with a functional test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install                                            &amp;&amp;
-ln -v -sf ../slib /usr/share/guile                      &amp;&amp;
-mkdir -pv /usr/share/guile/site/2.0                     &amp;&amp;
-guile -c "(use-modules (ice-9 slib)) (require 'printf)" &amp;&amp;
-install -v -m755 -d /usr/share/doc/slib-&slib-version;             &amp;&amp;
-install -v -m644 ANNOUNCE FAQ README slib.{txt,html} /usr/share/doc/slib-&slib-version;</userinput></screen>
-
-<!--
-    <para>If you built any of the optional documentation, install it using the
-    following command as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>install -v -m644 slib.{pdf,dvi,ps} /usr/share/doc/slib-&slib-version;</userinput></screen>
- -->
- </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i 's|usr/lib|usr/share|' RScheme.init</command>:
-    This command is used to change the <envar>libdir</envar> variable embedded
-    in the script to match the installation.</para>
-
-    <para><option>--libdir=/usr/share</option>: This option puts the installed
-    in files <filename class="directory">/usr/share/slib</filename> instead of
-    <filename class="directory">/usr/lib/slib</filename>.</para>
-
-    <para><command>makeinfo ... --force ... </command>: This command creates
-    needed documentation, but needs the <option>--force</option> option to
-    overcome warnings that are flagged as errors in recent versions of
-    <command>makeinfo</command>.</para>
-
-    <para><command>ln -v -sf ../slib /usr/share/guile</command>: This command
-    puts a symbolic link to the <application>slib</application> files in
-    <application>Guile</application>'s default <quote>Implementation
-    Vicinity</quote>.</para>
-
-    <para><command>guile -c "(use-modules (ice-9 slib)) (require
-    'printf)"</command>: This command creates a guile catalog of the
-    <application>slib</application> files.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>slib</seg>
-        <seg>a <application>Scheme</application> library system</seg>
-        <seg>/usr/share/slib,
-             /usr/share/guile/site/2.0, and
-             /usr/share/doc/slib-&slib-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="slib-prog">
-        <term><command>slib</command></term>
-        <listitem>
-          <para>is a shell script used to initialize
-          <application>SLIB</application> in a named
-          <application>Scheme</application> implementation. It can also be
-          used to initialize an <application>SLIB</application> session using
-          a given executable.</para>
-          <indexterm zone="slib slib-prog">
-            <primary sortas="b-slib">slib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/slrn.xml
===================================================================
--- archive/slrn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +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 slrn-download-http "&sourceforge-repo;/slrn/slrn-&slrn-version;.tar.bz2">
-  <!ENTITY slrn-download-ftp  "ftp://ftp.fh-heilbronn.de/pub/mirrors/slrn/slrn-&slrn-version;.tar.bz2">
-  <!ENTITY slrn-md5sum        "9b613007df537444a5f8a4a2994fadb7">
-  <!ENTITY slrn-size          "1011 KB">
-  <!ENTITY slrn-buildsize     "9.3 MB">
-  <!ENTITY slrn-time          "0.19 SBU">
-]>
-
-<sect1 id="slrn" xreflabel="slrn-&slrn-version;">
-  <?dbhtml filename="slrn.html"?>
-
-
-  <title>Slrn-&slrn-version;</title>
-
-  <indexterm zone="slrn">
-    <primary sortas="a-Slrn">Slrn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Slrn</title>
-
-    <para><application>slrn</application> is a slang-based news reader, capable of
-    reading local news spools as well as groups from an NNTP server. Small local news
-    spools can also be created with the use of the <command>slrnpull</command>
-    program included in the <application>slrn</application> distribution.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&slrn-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&slrn-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &slrn-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &slrn-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &slrn-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &slrn-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Slrn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="slang"/> and
-    an <xref linkend="server-mail"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
-    <ulink url="http://www.fpx.de/fp/Software/UUDeview/">UUDeview</ulink>,
-    <ulink url="http://www.isc.org/index.pl?/sw/inn/">INN</ulink> and
-    <ulink url="http://homepage.mac.com/imeowbot/iblog/C1355421991/">libcanlock</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/slrn"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Slrn</title>
-
-    <para>Install <application>slrn</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --with-slrnpull --enable-spool &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-slrnpull --enable-spool</parameter>: These
-    switches enable building the <command>slrnpull</command>
-    executable.</para>
-
-    <para><option>--with-ssl</option>: This switch adds
-    <application>OpenSSL</application> support to
-    <application>slrn</application>.</para>
-
-    <para><option>--with-uudeview</option>: This switch adds
-    <application>UUDeview</application> support to
-    <application>slrn</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Slrn</title>
-
-    <sect3 id="slrn-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/slrn.rc</filename>,
-      <filename>~/.slrnrc</filename></para>
-
-      <indexterm zone="slrn slrn-config">
-        <primary sortas="e-etc-slrn.rc">/etc/slrn.rc</primary>
-      </indexterm>
-
-      <indexterm zone="slrn slrn-config">
-        <primary sortas="e-AA.slrnrc">~/.slrnrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The first time <command>slrn</command> is run, the
-      <filename>~/.jnewsrc</filename> file must be created. For this configuration
-      to work, you must have an environmental variable, <envar>NNTPSERVER</envar>,
-      set. In normal operation it would be exported into the environment by a startup file,
-      like <filename>/etc/profile</filename> or <filename>~/.bashrc</filename>. Here it
-      is just put it into the environment of the configuration step. For now, the LFS news
-      server is used in this example, but you should use whatever server you prefer.</para>
-
-      <para>Create the <filename>~/.jnewsrc</filename> file with the following
-      command:</para>
-
-<screen><userinput>NNTPSERVER=<replaceable>&lt;news.&lfs-domainname;&gt;</replaceable> \
-    slrn -f ~/.jnewsrc --create</userinput></screen>
-
-      <indexterm zone="slrn slrn-config">
-        <primary sortas="e-AA.jnewsrc">~/.jnewsrc</primary>
-      </indexterm>
-
-      <para>You will also have to edit one of the configuration files. There is a sample
-      startup <filename>/usr/share/doc/slrn/slrn.rc</filename> file that comes with
-      <application>slrn</application>. It is extensively documented but if you need more
-      information, look at <ulink url="http://slrn.sourceforge.net/docs/">the
-      <application>slrn</application> website</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>slrn and slrnpull</seg>
-        <seg>None</seg>
-        <seg>/usr/share/slrn and usr/share/doc/slrn</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="slrn-prog">
-        <term><command>slrn</command></term>
-        <listitem>
-          <para>is the slang-based news reader.</para>
-          <indexterm zone="slrn slrn-prog">
-            <primary sortas="b-slrn">slrn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slrnpull">
-        <term><command>slrnpull</command></term>
-        <listitem>
-          <para>is used to pull a small news feed from an NNTP server for offline
-          reading.</para>
-          <indexterm zone="slrn slrnpull">
-            <primary sortas="b-slrnpull">slrnpull</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/soprano.xml
===================================================================
--- archive/soprano.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,231 +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 soprano-download-http "&sourceforge-repo;/soprano/soprano-&soprano-version;.tar.bz2">
-  <!ENTITY soprano-download-ftp  " ">
-  <!ENTITY soprano-md5sum        "91413e5783efeee0beb747ea4c5c9ef0">
-  <!ENTITY soprano-size          "1.9 MB">
-  <!ENTITY soprano-buildsize     "22 MB">
-  <!ENTITY soprano-time          "0.6 SBU">
-]>
-
-<sect1 id="soprano" xreflabel="Soprano-&soprano-version;">
-  <?dbhtml filename="soprano.html"?>
-
-
-  <title>Soprano-&soprano-version;</title>
-
-  <indexterm zone="soprano">
-    <primary sortas="a-Soprano">Soprano</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Soprano</title>
-
-    <para>
-      <application>Soprano</application> (formally known as QRDF) is a
-      library which provides a nice Qt interface to RDF storage solutions.
-      It has a modular structure which allows to replace the actual RDF
-      storage  implementation used.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&soprano-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&soprano-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &soprano-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &soprano-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &soprano-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &soprano-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/soprano-&soprano-version;-dbus-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Soprano Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="qt4"/>, and
-      <xref linkend="redland"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="clucene"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="libiodbc"/> (required for the Virtuoso backend. Additionally,
-      <xref linkend="virtuoso"/> is required as a runtime dependency for this
-      backend.)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to build the documentation) and
-      <ulink url="http://www.openrdf.org/">Sesame2</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/soprano"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Soprano</title>
-
-    <para>Install <application>soprano</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../soprano-&soprano-version;-dbus-1.patch &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a working test suite.</para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-</sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <option>-DSOPRANO_DISABLE_CLUCENE_INDEX=ON</option>: This switch disables
-      compilation of Clucene-based full-text index.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuration of Soprano</title>
-
-    <para>
-      Create a directory where <application>Soprano</application> places some
-      runtime data as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -m755 -d /srv/soprano</userinput></screen>
-
-    <para>
-      The <command>sopranod</command> accepts some parameters. To configure
-      how the bootscript starts <command>sopranod</command>,
-      create a configuration file again as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/soprano &lt;&lt;EOF
-# Begin /etc/sysconfig/soprano
-
-SOPRANO_STORAGE="/srv/soprano"
-SOPRANO_BACKEND="virtuoso"                       # virtuoso, sesame2, redland
-#SOPRANO_OPTIONS="$SOPRANO_OPTIONS --port 4711"  # Default port is 5000
-
-# End /etc/sysconfig/soprano
-EOF</userinput></screen>
-
-<sect3 id="soprano-init">
-      <title>Boot Script</title>
-
-      <note>
-        <para>
-          It is not required to start the <application>Soprano</application>
-          server at boottime for <application>KDE</application>.
-          <application>KDE</application> will start
-          <application>Soprano</application> as needed.
-        </para>
-      </note>
-
-      <para>
-        In order to get <application>Soprano</application> started
-        automatically when the system is booted, install the
-        <filename>/etc/rc.d/init.d/soprano</filename> init script included
-        in the <xref linkend="bootscripts"/> package as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="soprano soprano-init">
-        <primary sortas="f-soprano">soprano</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-soprano</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>
-          onto2vocabularyclass, sopranocmd, and sopranod
-        </seg>
-        <seg>
-          libsopranoclient.so, libsopranoindex.so, libsopranoserver.so, and libsoprano.so
-        </seg>
-        <seg>
-          /usr/include/soprano,
-          /usr/include/Soprano,
-          /usr/lib/soprano, and
-          /usr/share/soprano
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/sound-theme-freedesktop.xml
===================================================================
--- archive/sound-theme-freedesktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,100 +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 sound-theme-freedesktop-download-http "http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-&sound-theme-freedesktop-version;.tar.bz2">
-  <!ENTITY sound-theme-freedesktop-download-ftp  " ">
-  <!ENTITY sound-theme-freedesktop-md5sum        "7bcad4fa54570f80c612012bce66f60f">
-  <!ENTITY sound-theme-freedesktop-size          "472 KB">
-  <!ENTITY sound-theme-freedesktop-buildsize     "2 MB">
-  <!ENTITY sound-theme-freedesktop-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sound-theme-freedesktop" xreflabel="sound-theme-freedesktop-&sound-theme-freedesktop-version;">
-  <?dbhtml filename="sound-theme-freedesktop.html"?>
-
-
-  <title>sound-theme-freedesktop-&sound-theme-freedesktop-version;</title>
-
-  <indexterm zone="sound-theme-freedesktop">
-    <primary sortas="a-sound-theme-freedesktop">sound-theme-freedesktop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sound-theme-freedesktop</title>
-
-    <para>The <application>sound-theme-freedesktop</application> package
-    contains sound themes for the desktop.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&sound-theme-freedesktop-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sound-theme-freedesktop-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sound-theme-freedesktop-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sound-theme-freedesktop-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sound-theme-freedesktop-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sound-theme-freedesktop-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">sound-theme-freedesktop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/sound-theme-freedesktop"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sound-theme-freedesktop</title>
-
-    <para>Install <application>sound-theme-freedesktop</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>/usr/share/sounds/freedesktop/stereo</seg>
-      </seglistitem>
-    </segmentedlist>
-
-
-  </sect2>
-
-</sect1>
Index: chive/spice-gtk.xml
===================================================================
--- archive/spice-gtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,240 +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 spice-gtk-download-http "http://spice-space.org/download/gtk/spice-gtk-&spice-gtk-version;.tar.bz2">
-  <!ENTITY spice-gtk-download-ftp  " ">
-  <!ENTITY spice-gtk-md5sum        "c8f2c274ab81e0ac273be5c6490b8603">
-  <!ENTITY spice-gtk-size          "852 KB">
-  <!ENTITY spice-gtk-buildsize     "25 MB">
-  <!ENTITY spice-gtk-time          "0.8 SBU">
-]>
-
-<sect1 id="spice-gtk" xreflabel="spice-gtk-&spice-gtk-version;">
-  <?dbhtml filename="spice-gtk.html"?>
-
-
-  <title>spice-gtk-&spice-gtk-version;</title>
-
-  <indexterm zone="spice-gtk">
-    <primary sortas="a-spice-gtk">spice-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to spice-gtk</title>
-
-    <para>
-      The <application>spice-gtk</application> package contains
-      a Gtk client and libraries for SPICE remote desktop servers.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spice-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spice-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spice-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spice-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spice-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spice-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">spice-gtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="celt051"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="polkit"/> and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://spice-space.org/download/libcacard/">libcacard</ulink> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/spice-gtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of spice-gtk</title>
-
-    <para>
-      Install <application>spice-gtk</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala \
-            --disable-static \
-            --disable-smartcard &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala</option>: This option enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para>
-      <option>--disable-smartcard</option>: This option disables use of
-      libcacard. Remove if you have libcacard installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          snappy, spicy and spicy-stats
-        </seg>
-        <seg>
-          libspice-client-glib-2.0.so, libspice-client-gtk-3.0.so
-          and libspice-controller.so
-        </seg>
-        <seg>
-          /usr/include/{spice-client-glib-2.0,spice-client-gtk-3.0,spice-controller} and
-          /usr/share/gtk-doc/spice-gtk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="snappy">
-        <term><command>snappy</command></term>
-        <listitem>
-          <para>
-            is program which connects to Spice server
-            and takes a screenshot.
-          </para>
-          <indexterm zone="spice-gtk snappy">
-            <primary sortas="b-snappy">snappy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spicy">
-        <term><command>spicy</command></term>
-        <listitem>
-          <para>
-            is Gtk based Spice client application.
-          </para>
-          <indexterm zone="spice-gtk spicy">
-            <primary sortas="b-spicy">spicy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spicy-stats">
-        <term><command>spicy-stats</command></term>
-        <listitem>
-          <para>
-            is program which connects to Spice server
-            and writes out a summary of connection details,
-            amount of bytes transferred, etc.
-          </para>
-          <indexterm zone="spice-gtk spicy-stats">
-            <primary sortas="b-spicy-stats">spicy-stats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libspice-client-glib-2.0">
-        <term><filename class="libraryfile">libspice-client-glib-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides GLib objects for Spice protocol decoding and surface rendering.
-          </para>
-          <indexterm zone="spice-gtk libspice-client-glib-2.0">
-            <primary sortas="c-libspice-client-glib-2.0">libspice-client-glib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libspice-client-gtk-3.0">
-        <term><filename class="libraryfile">libspice-client-gtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            provides Gtk widget to show Spice display and accept user input.
-          </para>
-          <indexterm zone="spice-gtk libspice-client-gtk-3.0">
-            <primary sortas="c-libspice-client-gtk-3.0">libspice-client-gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/strigi.xml
===================================================================
--- archive/strigi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,250 +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 strigi-download-http "http://www.vandenoever.info/software/strigi/strigi-&strigi-version;.tar.bz2">
-  <!ENTITY strigi-download-ftp  " ">
-  <!ENTITY strigi-md5sum        "d69443234f4286d71997db9de543331a">
-  <!ENTITY strigi-size          "811 KB">
-  <!ENTITY strigi-buildsize     "52 MB">
-  <!ENTITY strigi-time          "1.2 SBU">
-]>
-
-<sect1 id="strigi" xreflabel="strigi-&strigi-version;">
-  <?dbhtml filename="strigi.html"?>
-
-
-  <title>Strigi-&strigi-version;</title>
-
-  <indexterm zone="strigi">
-    <primary sortas="a-strigi">strigi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Strigi</title>
-
-    <para><application>Strigi</application> is a program for fast indexing and
-    searching of personal data. It can gather and index information from
-    files in the filesystem even if they are hidden in emails or
-    archives.</para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&strigi-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&strigi-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &strigi-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &strigi-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &strigi-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &strigi-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Strigi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus"/> and
-      <xref linkend="qt4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="exiv2"/>,
-      <xref linkend="libxml2"/>,
-      <ulink url="http://sourceforge.net/projects/clucene/files/clucene-core-stable/">
-         CLucene version 0.9x</ulink> , and
-      <ulink url="http://logging.apache.org/log4cxx/">log4cxx</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/strigi"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Strigi</title>
-
-    <para>Install <application>strigi</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i "s/BufferedStream :/STREAMS_EXPORT &amp;/" libstreams/include/strigi/bufferedstream.h &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=lib  \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DENABLE_CLUCENE=OFF        \
-      -DENABLE_CLUCENE_NG=OFF     \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "..."</command>: This command fixes the build with recent
-      <application>GCC</application> versions.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_INSTALL_LIBDIR=lib</parameter>: This switch is used so
-      the package doesn't write over the lib64 symlink on 64 bit systems.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <option>-DENABLE_DBUS=OFF</option>: Use this <command>cmake</command>
-      variable if you don't have <application>D-Bus</application> installed.
-    </para>
-
-    <para>
-      <option>-DENABLE_QT4=OFF</option>: Use this <command>cmake</command>
-      variable if you don't have <application>Qt4</application> installed or if
-      you compiled <application>Qt4</application> without
-      <application>D-Bus</application> support.
-    </para>
-
-    <para>
-      <option>-DENABLE_CLUCENE*=OFF</option>: These statements disable the
-      package from trying to use <xref linkend="clucene"/> (current stable
-      version).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>deepfind, deepgrep, rdfindexer, strigiclient, strigicmd,
-        strigidaemon, and xmlindexer</seg>
-        <seg>libsearchclient.so, libstreamanalyzer.so, libstreams.so,
-        libstrigihtmlgui.so, libstrigiqtdbusclient.so, and several in
-        /usr/lib/strigi</seg>
-        <seg>/usr/include/strigi, /usr/lib/strigi, and /usr/share/strigi</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="deepfind">
-        <term><command>deepfind</command></term>
-        <listitem>
-          <para>is a utility for searching for filenames in compressed
-          archives like tar, cpio, and zip</para>
-          <indexterm zone="strigi deepfind">
-            <primary sortas="b-deepfind">deepfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="deepgrep">
-        <term><command>deepgrep</command></term>
-        <listitem>
-          <para>is a utility for searching compressed archives like
-                    tar, cpio, and zip</para>
-          <indexterm zone="strigi deepgrep">
-            <primary sortas="b-deepgrep">deepgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdfindexer">
-        <term><command>rdfindexer</command></term>
-        <listitem>
-          <para>manages and performs indexing of the RDF data for entities
-          present on your site</para>
-          <indexterm zone="strigi rdfindexer">
-            <primary sortas="b-rdfindexer">rdfindexer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strigiclient">
-        <term><command>strigiclient</command></term>
-        <listitem>
-          <para>is a Qt4 client (GUI) for the Strigi Desktop Search software</para>
-          <indexterm zone="strigi strigiclient">
-            <primary sortas="b-strigiclient">strigiclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strigicmd">
-        <term><command>strigicmd</command></term>
-        <listitem>
-          <para>is a program for creating and querying indices</para>
-          <indexterm zone="strigi strigicmd">
-            <primary sortas="b-strigicmd">strigicmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strigidaemon">
-        <term><command>strigidaemon</command></term>
-        <listitem>
-          <para>is a daemon program for maintaining indices</para>
-          <indexterm zone="strigi strigidaemon">
-            <primary sortas="b-strigidaemon">strigidaemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlindexer">
-        <term><command>xmlindexer</command></term>
-        <listitem>
-          <para>indexes XML documents</para>
-          <indexterm zone="strigi xmlindexer">
-            <primary sortas="b-xmlindexer">xmlindexer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/suites/koffice.xml
===================================================================
--- archive/suites/koffice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,255 +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 koffice-download-http "http://mirrors.isc.org/pub/kde/stable/koffice-&koffice-version;/src/koffice-&koffice-version;.tar.bz2">
-  <!ENTITY koffice-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/koffice-&koffice-version;/src/koffice-&koffice-version;.tar.bz2">
-  <!ENTITY koffice-md5sum        "386d388094734f9759977c3267098e30">
-  <!ENTITY koffice-size          "55.0 MB">
-  <!ENTITY koffice-buildsize     "489 MB (additional 592 MB for API docs)">
-  <!ENTITY koffice-time          "44 SBU (additional 4.4 SBU for API docs)">
-]>
-
-<sect1 id="koffice" xreflabel="KOffice-&koffice-version;">
-  <?dbhtml filename="koffice.html" ?>
-
-
-  <title>KOffice-&koffice-version;</title>
-
-  <indexterm zone="koffice">
-    <primary sortas="a-KOffice">KOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to KOffice</title>
-
-    <para><application>KOffice</application> is the integrated office suite
-    for <application>KDE</application>.  It provides native OASIS OpenDocument
-    format support.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&koffice-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&koffice-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &koffice-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &koffice-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &koffice-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &koffice-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <para><application>KOffice</application> has many localization
-    packages in the form of:
-    <filename>koffice-l10n-<replaceable>&lt;xx&gt;</replaceable>-&koffice-version;.tar.bz2</filename>.
-    The <replaceable>&lt;xx&gt;</replaceable> is a two to seven character code for the
-    country covered. The sizes of these files range from about 0.2 MB to 15 MB. </para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><application>KOffice</application> l10n package listing: <ulink
-        url="http://download.kde.org/stable/koffice-&koffice-version;/src/koffice-l10n/"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sums: <ulink
-        url="http://mirrors.isc.org/pub/kde/stable/koffice-&koffice-version;/src/MD5SUMS"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">KOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libart_lgpl"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="libxslt"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="aspell"/>,
-    <xref linkend="python2"/>,
-    <xref linkend="ruby"/>,
-    <ulink url="http://pqxx.org">libpqxx</ulink> (for kexi, requires <xref linkend="postgresql"/>),
-    <xref linkend="mysql"/> (plugin),
-    <xref linkend="lcms"/> and
-    <xref linkend="imagemagick"/> (required for krita),
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink> (for enhanced image
-    processing),
-    <ulink url="http://sourceforge.net/projects/wvware/">libwv2</ulink> (for MS
-    Word filter),
-    <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink> (for Wordperfect filter),
-    <ulink
-    url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
-    <xref linkend="graphviz"/>, and
-    <xref linkend="doxygen"/> (the last two to build API documentation)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/koffice"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of KOffice</title>
-
-    <para>Install <application>KOffice</application> with the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(kde-config --prefix) --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/kde-apidocs.xml"/>
-
-   <para>This package does not come with a test suite.</para>
-
-   <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>karbon, kchart, kexi, kformula, kivio, koconverter,
-        koshell, kplato, kprconverter.pl, kpresenter, krita,
-        krossrunner, kspread, ksqlite, ksqlite2, ksqlite2to3,
-        kthesaurus, kudesigner, kugar, and kword</seg>
-        <seg>Numerous libraries (about 50) in $KDE_PREFIX/lib</seg>
-        <seg>Numerous directories in $KDE_PREFIX/share</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kchart">
-        <term><command>kchart</command></term>
-        <listitem>
-          <para>is a chart drawing application.</para>
-          <indexterm zone="koffice kchart">
-            <primary sortas="b-kchart">kchart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kexi">
-        <term><command>kexi</command></term>
-        <listitem>
-          <para>is an integrated data management application.</para>
-          <indexterm zone="koffice kexi">
-            <primary sortas="b-kexi">kexi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kformula">
-        <term><command>kformula</command></term>
-        <listitem>
-          <para>is a formula editor.</para>
-          <indexterm zone="koffice kformula">
-            <primary sortas="b-kformula">kformula</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kivio">
-        <term><command>kivio</command></term>
-        <listitem>
-          <para>is a flowchart program.</para>
-          <indexterm zone="koffice kivio">
-            <primary sortas="b-kivio">kivio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kplato">
-        <term><command>kplato</command></term>
-        <listitem>
-          <para>is a project management application.</para>
-          <indexterm zone="koffice kplato">
-            <primary sortas="b-klato">kplato</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpresenter">
-        <term><command>kpresenter</command></term>
-        <listitem>
-          <para>is a presentation builder/display program.</para>
-          <indexterm zone="koffice kpresenter">
-            <primary sortas="b-kpresenter">kpresenter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krita">
-        <term><command>krita</command></term>
-        <listitem>
-          <para>is a painting and image editing application for KOffice..</para>
-          <indexterm zone="koffice krita">
-            <primary sortas="b-krita">krita</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kspread">
-        <term><command>kspread</command></term>
-        <listitem>
-          <para>is a scriptable spreadsheet program.</para>
-          <indexterm zone="koffice kspread">
-            <primary sortas="b-kspread">kspread</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kugar">
-        <term><command>kugar</command></term>
-        <listitem>
-          <para>is a tool for creating reports.</para>
-          <indexterm zone="koffice kugar">
-            <primary sortas="b-kugar">kugar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kword">
-        <term><command>kword</command></term>
-        <listitem>
-          <para>is a framemaker-like word processing and desktop
-          publishing program.</para>
-          <indexterm zone="koffice kword">
-            <primary sortas="b-kword">kword</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/suites/openoffice.xml
===================================================================
--- archive/suites/openoffice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,519 +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 openoffice-download-http "http://download.openoffice.org/&openoffice-version;/source.html"> -->
-  <!-- <!ENTITY openoffice-download-ftp  "ftp://ftp.ussg.iu.edu/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src.tar.gz"> -->
-  <!ENTITY openoffice-core-download-http   "http://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_core.tar.bz2">
-  <!ENTITY openoffice-core-download-ftp    "ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_core.tar.bz2">
-  <!ENTITY openoffice-core-md5sum          "4fa713fb796bc57e5eb9dfb0758adda0">
-  <!ENTITY openoffice-core-size            "205 MB">
-  <!ENTITY openoffice-system-download-http "http://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_system.tar.bz2">
-  <!ENTITY openoffice-system-download-ftp  "ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_system.tar.bz2">
-  <!ENTITY openoffice-system-md5sum        "e6405c8108bdcf4cc2bf066d88aa5ae1">
-  <!ENTITY openoffice-system-size          "59 MB">
-  <!ENTITY openoffice-buildsize            "4.9-7.3 GB (depending on configured options)">
-  <!ENTITY openoffice-time                 "96-109 SBU (depending on configured options)">
-]>
-
-<sect1 id="openoffice" xreflabel="OpenOffice-&openoffice-version;">
-  <?dbhtml filename="openoffice.html" ?>
-
-
-  <title>OpenOffice-&openoffice-version;</title>
-
-  <indexterm zone="openoffice">
-    <primary sortas="a-OpenOffice">OpenOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenOffice</title>
-
-    <para><application>OpenOffice</application> is an office suite, the
-    open source sibling of <application>StarOffice</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>OpenOffice Core Download (HTTP): <ulink url="&openoffice-core-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice Core Download (FTP): <ulink url="&openoffice-core-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice Core Download MD5 sum: &openoffice-core-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice Core Download size: &openoffice-core-size;</para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice System Download (HTTP): <ulink url="&openoffice-system-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice System Download (FTP): <ulink url="&openoffice-system-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice System Download MD5 sum: &openoffice-system-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice System Download size: &openoffice-system-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &openoffice-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &openoffice-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch:
-        <ulink url="&patch-root;/OOo_&openoffice-version;-build_with_db5-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Required download:
-        <ulink url="ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14/seamonkey-1.1.14.source.tar.bz2"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional download if you would like to localize the
-        installation:
-        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_l10n.tar.bz2"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional download if you need to support the old
-        <application>StarOffice-5.2</application> file formats:
-        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_binfilter.tar.bz2"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional download if you want to build additional extensions
-        for <application>OpenOffice</application>:
-        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_extensions.tar.bz2"/></para>
-      </listitem>
-      <listitem>
-        <para>Optional download if you want to build the office development kit
-        (cross platform requirement is not optional):
-        <ulink url="http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll"/></para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">OpenOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="apache-ant"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="libidl"/>,
-    <application>Perl Modules</application>
-    <xref linkend="perl-xml-parser"/> and
-    <xref linkend="perl-archive-zip"/>,
-    <xref linkend="unzip"/>,
-    <xref linkend="which"/>, and
-    <xref linkend="zip"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink
-    url="http://packages.debian.org/testing/libdevel/libaltlinuxhyph-dev">ALTLinuxhyph</ulink>,
-    <xref linkend="boost"/>,
-    <xref linkend="cups"/>,
-    <xref linkend="curl"/>,
-    <xref linkend="db"/> (built with Java support),
-    <xref linkend="desktop-file-utils"/>,
-    <ulink url="http://www.easysw.com/epm/">EPM</ulink>,
-    <xref linkend="evolution"/>,
-    <!--<xref linkend="gnome-vfs"/> (should use \-\-enable-gio instead),-->
-    <!-- <xref linkend="kde"/>, -->
-    <xref linkend="libjpeg"/>,
-    <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>,
-    <xref linkend="libtiff"/>,
-    <ulink url="http://freshmeat.net/projects/libwpd/">libwpd</ulink>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="linux-pam"/>,
-    <ulink url="http://lingucomponent.openoffice.org/MySpell-3.zip">MySpell</ulink>,
-    <ulink url="http://lingucomponent.openoffice.org/thesaurus.html">MyThes</ulink>,
-    <xref linkend="neon"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="python2"/>,
-    <xref linkend="sane"/>,
-    <xref linkend="startup-notification"/>, and
-    <xref linkend="unixodbc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/openoffice"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenOffice</title>
-
-    <para>The <application>OpenOffice</application> source code is
-    distributed in several tarballs.  You should extract each from the
-    same top-level directory before entering the build directory.  At
-    a minimum, you will need to extract the <quote>core</quote> and
-    <quote>system</quote> tarballs. Note that the source directory name
-    is not consistent with the tarball name and will be named
-    <filename class='directory'>OOO320_m19</filename>.</para>
-
-    <para>It is possible to build with a system-installed
-    <application>Mozilla</application>, however, it requires a very intrusive
-    patch, and is version specific.  Additionally, you'll need to build against
-    <xref linkend="seamonkey"/> or <xref linkend="thunderbird"/> for full
-    LDAP and address book functionality.  Instead, use the in-tree
-    <application>Seamonkey</application> build.  Copy the tarball into
-    the source tree with the following command:</para>
-
-<screen><userinput>cp ../seamonkey-1.1.14-source.tar.bz2 moz/download/</userinput></screen>
-
-    <para>If you want to optimize the build, edit the appropriate makefile in
-    <filename>solenv/inc/</filename> and add the desired optimization
-    flags to the <envar>CFLAGSOPT</envar> variable. The makefiles are arch
-    specific, for instance edit <filename>unxlngi6.mk</filename> for i686, or
-    <filename>unxlngx6.mk</filename> for x86_64.  Some users have reported
-    problems with <option>-fomit-frame-pointer</option>. The best option is to
-    not use any custom optimizations.</para>
-
-    <note>
-      <para>Because of the complexity of the
-      <application>OpenOffice</application> build system, it is not possible to
-      provide generic build instructions for all systems.  You should review
-      the output of <command>configure --help</command> and take advantage of
-      any system installed programs and libraries available using the
-      <parameter>--enable-*</parameter>, <parameter>--disable-*</parameter>,
-      and <parameter>--with-system-*</parameter> parameters, and provide any
-      additional environment variables needed.</para>
-    </note>
-
-    <para><application>OpenOffice</application> fails to compile if
-    <command>umask</command> is set to something exotic. The build can also
-    fail if the <envar>LANG</envar> or <envar>LC_ALL</envar> environment
-    variables are set. Use the following commands to change your
-    environment accordingly:</para>
-
-<screen><userinput>umask 0022 &amp;&amp;
-unset LANG LC_ALL</userinput></screen>
-
-    <para>Install <application>OpenOffice</application> by running the
-    following commands:</para>
-
-<!-- uudecode didn't fuss...but left in for reference
-sed -i 's@..$/dist$/configure@uudecode="no" &amp;@' \
-    berkeleydb/makefile.mk &amp;&amp;
--->
-
-<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-with-system-db5-1.patch &amp;&amp;
-autoreconf &amp;&amp;
-PKG_CONFIG=/usr/bin/pkg-config ./configure \
-            --disable-binfilter            \
-            --disable-fontooo              \
-            --disable-gnome-vfs            \
-            --disable-odk                  \
-            --disable-qadevooo             \
-            --enable-cairo                 \
-            --without-afms                 \
-            --without-fonts                \
-            --without-ppds                 \
-            --without-pam                  \
-            --with-system-stdlibs          \
-            --with-system-cairo            \
-            --with-system-expat            \
-            --with-system-zlib             \
-            --with-package-format=native   \
-            --with-vendor="BLFS"           \
-            --with-use-shell=bash &amp;&amp;
-source LinuxX86Env.Set.sh &amp;&amp;
-./bootstrap &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>pushd instsetoo_native/unxlng?6.pro/OpenOffice/\
-native/install/en-US/linux-2.6-*/buildroot/opt &amp;&amp;
-cp -r -v openoffice.org3 /opt/openoffice-&openoffice-version; &amp;&amp;
-cp -r -v openoffice.org/* /opt/openoffice-&openoffice-version; &amp;&amp;
-ln -sf basis3.2 /opt/openoffice-&openoffice-version;/basis-link &amp;&amp;
-popd &amp;&amp;
-
-for appl in sbase scalc sdraw simpress smath soffice spadmin swriter
-do
-    ln -v -sf /opt/openoffice-&openoffice-version;/program/$appl /usr/bin
-done &amp;&amp;
-
-pushd sysui/desktop/icons &amp;&amp;
-install -v -m755 -d /usr/share/icons/{hicolor,locolor} &amp;&amp;
-cp -r -v hicolor/* /usr/share/icons/hicolor &amp;&amp;
-cp -r -v locolor/* /usr/share/icons/locolor &amp;&amp;
-popd</userinput></screen>
-
-    <para>If you have installed <xref linkend="desktop-file-utils"/>, you
-    should copy the <filename class='extension'>*.desktop</filename> files to
-    <filename class='directory'>/usr/share/applications</filename> using the
-    following commands as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/applications &amp;&amp;
-pushd /opt/openoffice-&openoffice-version;/share/xdg/ &amp;&amp;
-for appl in *.desktop
-do
-    sed -i '/Exec/d' $appl &amp;&amp;
-    echo "Exec=/usr/bin/s`echo $appl | sed 's/.desktop//'`" >> $appl &amp;&amp;
-    sed -i '/Icon/d' $appl &amp;&amp;
-    echo "Icon=`echo "ooo-${appl}3.2" | sed 's/\.desktop//'`" >> $appl
-done &amp;&amp;
-sed -i 's@bin/sprinteradmin@bin/spadmin@' printeradmin.desktop &amp;&amp;
-cp -v *.desktop /usr/share/applications &amp;&amp;
-update-desktop-database &amp;&amp;
-popd</userinput></screen>
-
-    <para>If you've chosen to build any additional dictionaries or any of the
-    extensions, you'll need to copy them to the installation directory.  Run
-    the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-    <note><para>The following two command blocks will not exit with a zero
-    value, and the second will require you to press 'y' before installation.
-    Keep this in mind if scripting the build.</para></note>
-
-<screen role="root"><userinput>cp -v dictionaries/unxlngi6.pro/bin/dict-*.oxt \
-    sdext/unxlngi6.pro/bin/*.oxt \
-    reportbuilder/unxlngi6.pro/bin/report-builder.oxt \
-    swext/unxlngi6.pro/bin/wiki-publisher.oxt \
-    /opt/openoffice-3.2.1/share/extension/install</userinput></screen>
-
-    <para>Now, while still the <systemitem class="username">root</systemitem>
-    user, add everything into the shared installation:</para>
-
-<screen role="root"><userinput>for ext in /opt/openoffice-3.2.1/share/extension/install/*.oxt
-do
-    /opt/openoffice-3.2.1/program/unopkg add --shared --verbose $ext
-done</userinput></screen>
-
-    <note><para><application>OpenOffice</application> default language tools
-    will not work out of the box.  You will have to explicitly select the
-    proper language settings from within one of the installed  programs by
-    going into the Tools menu and selecting Options.  Under Language Settings,
-    Languages, select the desired language for all settings.  Do not leave
-    "Default" in any drop down menu here.</para></note>
-
-    <para>Finally, if you'd like to edit <application>OpenOffice</application>
-    documents directly from <xref linkend="seamonkey"/> or
-    <xref linkend="firefox"/>, create a symbolic link in your
-    plugins directory to <filename
-    class='libraryfile'>/opt/openoffice-&openoffice-version;/program/libnpsoplugin.so</filename>.
-    Additionally, you must enable the plugin from the
-    <parameter>Internet Options</parameter> within any
-    <application>OpenOffice</application> application.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><envar>PKG_CONFIG=/usr/bin/pkg-config</envar>:
-    This variable must be set as the version check in
-    <filename>configure</filename> is broken.</para>
-
-    <para><parameter>--disable-binfilter</parameter>: This switch disables
-    the build of legacy <application>StarOffice-5</application> import
-    filters.  Omit this switch if you've downloaded the
-    <application>binfilter</application> package
-    above.  Warning: Installation of the legacy import filters increases the
-    build time considerably.  Only install them if you have these old
-    file types, and need to edit them in
-    <application>OpenOffice</application>.</para>
-
-    <para><parameter>--disable-fontooo</parameter>: Use
-    <application>Fontconfig</application> instead of the FontOOo.</para>
-
-    <para><parameter>--disable-gnome-vfs</parameter>: Disable the use of
-    <application>Gnome Virtual File System</application> libraries.  Omit
-    this switch only if gio is not available.</para>
-
-    <para><parameter>--disable-odk</parameter>: This switch disables the build
-    of the <application>OpenOffice</application> SDK.  Omit this switch if
-    you've downloaded the SDK package (and additional requirements)
-    above.</para>
-
-    <para><parameter>--disable-qadevooo</parameter>: This switch skips
-    the building of the quality assurance tools used by the
-    <application>OpenOffice</application> development teams.</para>
-
-    <para><parameter>--enable-cairo</parameter>: This switch listed in the
-    example <command>configure</command> command above forces the use of the
-    system installed cairo.</para>
-
-    <para><parameter>--without-afms</parameter>: Do not install afm font types
-    as system installed TrueType fonts are already available.</para>
-
-    <para><parameter>--without-fonts</parameter>: Do not install Bitstream
-    Vera fonts since they are already included in the
-    <application>X</application> Window System Environment.</para>
-
-    <para><parameter>--without-ppds</parameter>: Do not install printer
-    description files as these should be handled by your print system.</para>
-
-    <para><parameter>--without-pam</parameter>: Disable the use of
-    <application>Linux-PAM</application> functions.  Omit this switch if
-    <application>Linux-PAM</application> is installed.</para>
-
-    <para><parameter>--with{,out}-system-*</parameter>: Determines
-    whether to use the system libraries and programs or to build
-    the source packages included in the build tree.</para>
-
-    <para><parameter>--with-build-version="3.2.1-1"</parameter>: Changes the
-    build version to append "-1" to the default version string.</para>
-
-    <para><parameter>--with-vendor="BLFS"</parameter>: Changed the vendor
-    string to "BLFS" in the help->about dialog.</para>
-
-    <para><parameter>--with-use-shell=bash</parameter>: Tells the
-    <application>OpenOffice</application> build system to use
-    <command>bash</command> instead of <command>tcsh</command>.</para>
-
-    <para><command>./bootstrap</command>: Build the
-    <command>dmake</command> utility required to complete the
-    build.</para>
-
-    <para>
-    <parameter>--with-lang=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
-    Allows the use of additional languages in
-    <application>OpenOffice</application>. US English (ENUS) is the
-    default.</para>
-
-    <para>
-    <parameter>--with-dict=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
-    Allows the use of alternate dictionaries in
-    <application>OpenOffice</application>. US English (ENUS) is the
-    default.</para>
-
-    <para><parameter>--with-use-shell=bash</parameter>: Tells the
-    <application>OpenOffice</application> build system to use
-    <command>bash</command> instead of <command>tcsh</command>.</para>
-
-    <para><command>./bootstrap</command>: Build the
-    <command>dmake</command> utility required to complete the
-    build.</para>
-
-    <para><command>for appl in sbase scalc...</command>: Creates symlinks
-    for the applications in
-    <filename class="directory">/usr/bin</filename>.</para>
-
-    <para><command>for appl in *.desktop...</command>: Edit the
-    <filename>*.desktop</filename> files for use with a standard BLFS
-    system.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>sbase, scalc, sdraw, simpress, smath, soffice, spadmin,
-        and swriter</seg>
-        <seg><application>OpenOffice</application> libraries</seg>
-        <seg>/opt/openoffice-&openoffice-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sbase">
-        <term><command>sbase</command></term>
-        <listitem>
-          <para>is a database application.</para>
-          <indexterm zone="openoffice sbase">
-            <primary sortas="b-sbase">sbase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scalc">
-        <term><command>scalc</command></term>
-        <listitem>
-          <para>is a spreadsheet application.</para>
-          <indexterm zone="openoffice scalc">
-            <primary sortas="b-scalc">scalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sdraw">
-        <term><command>sdraw</command></term>
-        <listitem>
-          <para>is a drawing application.</para>
-          <indexterm zone="openoffice sdraw">
-            <primary sortas="b-sdraw">sdraw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpress">
-        <term><command>simpress</command></term>
-        <listitem>
-          <para>is a presentation application.</para>
-          <indexterm zone="openoffice simpress">
-            <primary sortas="b-simpress">simpress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smath">
-        <term><command>smath</command></term>
-        <listitem>
-          <para>is a mathematical formula editor.</para>
-          <indexterm zone="openoffice smath">
-            <primary sortas="b-smath">smath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="soffice">
-        <term><command>soffice</command></term>
-        <listitem>
-          <para>opens a base window with access to all
-          <application>OpenOffice</application> applications.</para>
-          <indexterm zone="openoffice soffice">
-            <primary sortas="b-soffice">soffice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spadmin">
-        <term><command>spadmin</command></term>
-        <listitem>
-          <para>is the <application>OpenOffice</application> printer
-          configuration utility.</para>
-          <indexterm zone="openoffice spadmin">
-            <primary sortas="b-spadmin">spadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swriter">
-        <term><command>swriter</command></term>
-        <listitem>
-          <para>is a word processing application.</para>
-          <indexterm zone="openoffice swriter">
-            <primary sortas="b-swriter">swriter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/suites/suites.xml
===================================================================
--- archive/suites/suites.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="xsoft-suites">
-  <?dbhtml filename="suites.html" ?>
-
-  <title>Office Suites</title>
-
-  <para>This chapter contains applications that bundle all the essential
-  needs of everyday office workers into one neat 'little' package. The
-  benefits are a consistent user interface and cooperation between
-  applications.</para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="koffice.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openoffice.xml"/>
-
-</chapter>
Index: chive/sysprof.xml
===================================================================
--- archive/sysprof.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,274 +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 sysprof-download-http "&gnome-download-http;/sysprof/&sysprof-minor;/sysprof-&sysprof-version;.tar.xz">
-  <!ENTITY sysprof-download-ftp  "&gnome-download-ftp;/sysprof/&sysprof-minor;/sysprof-&sysprof-version;.tar.xz">
-  <!ENTITY sysprof-md5sum        "ee1556063c7b8d9abd414f451b04c33a">
-  <!ENTITY sysprof-size          "524 KB">
-  <!ENTITY sysprof-buildsize     "27 MB">
-  <!ENTITY sysprof-time          "0.1 SBU (using parallelism=4)">
-
-]>
-
-<sect1 id="sysprof" xreflabel="sysprof-&sysprof-version;">
-  <?dbhtml filename="sysprof.html"?>
-
-
-  <title>Sysprof-&sysprof-version;</title>
-
-  <indexterm zone="sysprof">
-    <primary sortas="a-sysprof">sysprof</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sysprof</title>
-
-    <para>
-      The <application>sysprof</application> package contains a statistical and
-      system-wide profiler for Linux.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sysprof-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sysprof-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sysprof-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sysprof-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sysprof-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sysprof-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sysprof Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libdazzle"/>,
-      <xref linkend="libunwind"/>, <phrase revision="systemd">and</phrase>
-      <xref linkend="polkit"/> <phrase revision="sysv">, and</phrase>
-      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysprof</title>
-
-    <para>
-      Install <application>Sysprof</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr         \
-            --buildtype=release   \
-            -Dsystemdunitdir=/tmp \
-            ..                    &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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" revision="sysv"><userinput>ninja install &amp;&amp;
-rm -v /tmp/*.service</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands" revision="sysv">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>rm -v /tmp/*.service</command>: This command removes
-      systemd units which have no use on SysV systems.
-    </para>
-
-    <para>
-      <parameter>-Dsystemdunitdir=/tmp</parameter>: This parameter puts systemd
-      units in /tmp on SysV systems so that they can be removed. It also bypasses
-      a check for systemd <!-- for sd-bus --> in the meson.build file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sysprof,
-          sysprof-agent, and
-          sysprof-cli
-        </seg>
-        <seg>
-          libsysprof-4.so,
-          libsysprof-capture-4.a, <!-- is required -->
-          libsysprof-memory-4.so,
-          libsysprof-speedtrack-4.so, and
-          libsysprof-ui-5.so
-        </seg>
-        <seg>
-          /usr/include/sysprof-4,
-          /usr/include/sysprof-ui-5, and
-          /usr/share/help/*/sysprof
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sysprof-prog">
-        <term><command>sysprof</command></term>
-        <listitem>
-          <para>
-            is a graphical interface to sysprof
-          </para>
-          <indexterm zone="sysprof sysprof-prog">
-            <primary sortas="b-sysprof">sysprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sysprof-agent">
-        <term><command>sysprof-agent</command></term>
-        <listitem>
-          <para>
-            is used to profile applications in containers
-          </para>
-          <indexterm zone="sysprof sysprof-agent">
-            <primary sortas="b-sysprof-agent">sysprof-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sysprof-cli">
-        <term><command>sysprof-cli</command></term>
-        <listitem>
-          <para>
-            is a command line interface to sysprof
-          </para>
-          <indexterm zone="sysprof sysprof-cli">
-            <primary sortas="b-sysprof-cli">sysprof-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsysprof-4">
-        <term><filename class="libraryfile">libsysprof-4.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for profiling processes running on a system
-          </para>
-          <indexterm zone="sysprof libsysprof-4">
-            <primary sortas="c-libsysprof">libsysprof-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- static library is required for capture stats from a process -->
-      <varlistentry id="libsysprof-capture-4">
-        <term><filename class="libraryfile">libsysprof-capture-4.a</filename></term>
-        <listitem>
-          <para>
-            provides a hook used to capture statistics from a process
-          </para>
-          <indexterm zone="sysprof libsysprof-capture-4">
-            <primary sortas="c-libsysprof-capture">libsysprof-capture-4.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsysprof-memory-4">
-        <term><filename class="libraryfile">libsysprof-memory-4.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for capturing memory statistics
-          </para>
-          <indexterm zone="sysprof libsysprof-memory-4">
-            <primary sortas="c-libsysprof-memory">libsysprof-memory-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsysprof-speedtrack-4">
-        <term><filename class="libraryfile">libsysprof-speedtrack-4.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for tracking the speed of a running process
-          </para>
-          <indexterm zone="sysprof libsysprof-speedtrack-4">
-            <primary sortas="c-libsysprof-speedtrack">libsysprof-speedtrack-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsysprof-ui-4">
-        <term><filename class="libraryfile">libsysprof-ui-4.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for the sysprof GUI
-          </para>
-          <indexterm zone="sysprof libsysprof-ui-4">
-            <primary sortas="c-libsysprof-ui">libsysprof-ui-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: chive/tcl.xml
===================================================================
--- archive/tcl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,305 +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 tcl-download-http "&sourceforge-dl;/tcl/tcl&tcl-version;-src.tar.gz">
-  <!ENTITY tcl-download-ftp  " ">
-  <!ENTITY tcl-md5sum        "97c55573f8520bcab74e21bfd8d0aadc">
-  <!ENTITY tcl-size          "9.7 MB">
-  <!ENTITY tcl-buildsize     "67 MB (including html documentation)">
-  <!ENTITY tcl-time          "0.7 SBU (add 2.7 SBU for tests)">
-
-  <!ENTITY tcl-doc-download  "&sourceforge-dl;/tcl/tcl&tcl-version;-html.tar.gz">
-  <!ENTITY tcl-doc-md5sum    "a012711241ba3a5bd4a04e833001d489">
-  <!ENTITY tcl-doc-size      "1.2 MB">
-
-  <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
-  <!ENTITY tcl-ver           "8.6">
-  <!ENTITY tdbc-ver          "1.1.1">
-  <!ENTITY itcl-ver          "4.2.0">
-  <!ENTITY thread-ver        "2.8.5">
-  <!ENTITY sqlite3-ver       "3.30.1.2">
-]>
-
-<sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
-  <?dbhtml filename="tcl.html"?>
-
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tcl</title>
-
-    <para>
-      The <application>Tcl</application> package contains the Tool Command
-      Language, a robust general-purpose scripting language.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tcl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tcl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tcl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tcl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tcl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tcl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Optional Documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tcl-doc-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tcl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tcl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/tcl"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <para>
-      This package is also installed in LFS during the bootstrap phase.
-      As it is not installed during Chapter 6 of LFS, installation instructions
-      are included here in BLFS.
-    </para>
-
-    <para>
-      If you downloaded the optional documentation, unpack the tarball
-      by issuing the following command:
-    </para>
-
-<screen><userinput>tar -xf ../tcl&tcl-version;-html.tar.gz --strip-components=1</userinput></screen>
-
-    <para>
-      Install <application>Tcl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export SRCDIR=`pwd` &amp;&amp;
-
-cd unix &amp;&amp;
-
-./configure --prefix=/usr           \
-            --mandir=/usr/share/man \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-make &amp;&amp;
-
-sed -e "s#$SRCDIR/unix#/usr/lib#" \
-    -e "s#$SRCDIR#/usr/include#"  \
-    -i tclConfig.sh               &amp;&amp;
-
-sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc&tdbc-ver;#" \
-    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/generic#/usr/include#"    \
-    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/library#/usr/lib/tcl8.6#" \
-    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;#/usr/include#"            \
-    -i pkgs/tdbc&tdbc-ver;/tdbcConfig.sh                        &amp;&amp;
-
-sed -e "s#$SRCDIR/unix/pkgs/itcl&itcl-ver;#/usr/lib/itcl&itcl-ver;#" \
-    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;/generic#/usr/include#"    \
-    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;#/usr/include#"            \
-    -i pkgs/itcl&itcl-ver;/itclConfig.sh                        &amp;&amp;
-
-unset SRCDIR</userinput></screen>
-
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <!-- Tests known to fail: cmdAH.test and tdbcodbc.test. 8.6.9: No
-      failures -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-private-headers &amp;&amp;
-ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh &amp;&amp;
-chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation, install it by issuing
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -v -p /usr/share/doc/tcl-&tcl-version; &amp;&amp;
-cp -v -r  ../html/* /usr/share/doc/tcl-&tcl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
-      --enable-64bit)</parameter>: This switch is used to enable 64 bit
-      support in <application>Tcl</application> on 64 bit operating
-      systems.
-    </para>
-
-    <para>
-      <command>make install-private-headers</command>: This command is
-      used to install the <application>Tcl</application> library interface
-      headers used by other packages if they link to the
-      <application>Tcl</application> library.
-    </para>
-
-    <para>
-      <command>ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</command>: This
-      command is used to create a compatibility symbolic link to the
-      <command>tclsh&tcl-ver;</command> file as many packages expect a file
-      named <command>tclsh</command>.
-    </para>
-
-    <para>
-      <command>sed -e ...</command>: The <application>Tcl</application> package
-      expects that its source tree is preserved so that packages depending on
-      it for their compilation can utilize it. These <command>sed</command>
-      remove the references to the build directory and replace them with saner
-      system-wide locations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sqlite3_analyzer, tclsh, and tclsh&tcl-ver;
-        </seg>
-        <seg>
-          libtcl&tcl-ver;.so and libtclstub&tcl-ver;.a
-        </seg>
-        <seg>
-          /usr/lib/itcl&itcl-ver;,
-          /usr/lib/sqlite&sqlite3-ver;
-          /usr/lib/tcl8,
-          /usr/lib/tcl&tcl-ver;,
-          /usr/lib/tdbc&tdbc-ver;,
-          /usr/lib/tdbcmysql&tdbc-ver;,
-          /usr/lib/tdbcodbc&tdbc-ver;,
-          /usr/lib/tdbcpostgres&tdbc-ver;,
-          /usr/lib/thread&thread-ver;,
-          /usr/share/doc/tcl-&tcl-version;, and
-          /usr/share/man/mann
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sqlite3_analyzer">
-        <term><command>sqlite3_analyzer</command></term>
-        <listitem>
-          <para>
-            is a program to analyze sqlite3 database files and output a report
-            that gives information on size and storage efficiency for the
-            database and it's tables and indexes.
-          </para>
-          <indexterm zone="tcl sqlite3_analyzer">
-            <primary sortas="b-sqlite3_analyzer">sqlite3_analyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>
-            is a symlink to the <command>tclsh&tcl-ver;</command> program.
-          </para>
-          <indexterm zone="tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh-eight">
-        <term><command>tclsh&tcl-ver;</command></term>
-        <listitem>
-          <para>
-            is a simple shell containing the
-            <application>Tcl</application> interpreter.
-          </para>
-          <indexterm zone="tcl tclsh-eight">
-            <primary sortas="b-tclsh&tcl-ver;">tclsh&tcl-ver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl">
-        <term><filename class="libraryfile">libtcl&tcl-ver;.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by
-            <application>Tcl</application>.
-          </para>
-          <indexterm zone="tcl libtcl">
-            <primary sortas="c-libtcl">libtcl&tcl-ver;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/tcpwrappers.xml
===================================================================
--- archive/tcpwrappers.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +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 tcpwrappers-download-http " ">
-  <!ENTITY tcpwrappers-download-ftp  "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_&tcpwrappers-version;.tar.gz">
-  <!ENTITY tcpwrappers-md5sum        "e6fa25f71226d090f34de3f6b122fb5a">
-  <!ENTITY tcpwrappers-size          "97 KB">
-  <!ENTITY tcpwrappers-buildsize     "1.09 MB">
-  <!ENTITY tcpwrappers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="tcpwrappers" xreflabel="TCP Wrappers-&tcpwrappers-version;">
-  <?dbhtml filename="tcpwrappers.html"?>
-
-
-  <title>TCP Wrappers-&tcpwrappers-version;</title>
-
-  <indexterm zone="tcpwrappers">
-   <primary sortas="a-TCP Wrapper">TCP Wrapper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TCP Wrappers</title>
-
-      <para>The <application>TCP Wrapper</application> package provides daemon
-      wrapper programs that report the name of the client requesting network
-      services and the requested service.  This capability is obsolete in
-      a modern environment, but several applications still use the library
-      and associated configuration files.</para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tcpwrappers-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tcpwrappers-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tcpwrappers-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tcpwrappers-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tcpwrappers-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tcpwrappers-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch (Fixes some build issues and adds building a
-        shared library): <ulink
-        url="&patch-root;/tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tcpwrappers"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TCP Wrappers</title>
-
-    <para>Install <application>TCP Wrapper</application> with the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch &amp;&amp;
-sed -i -e "s,^extern char \*malloc();,/* &amp; */," scaffold.c &amp;&amp;
-make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e ... scaffold.c</command>: This command removes an
-    obsolete C declaration which causes the build to fail if using
-    <application>GCC &gt;= 3.4.x</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring TCP Wrappers</title>
-
-    <sect3 id="tcpwrappers-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/hosts.allow</filename> and
-      <filename>/etc/hosts.deny</filename></para>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-hosts.allow">/etc/hosts.allow</primary>
-      </indexterm>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-hosts.deny">/etc/hosts.deny</primary>
-      </indexterm>
-<!--
-      <para>File protections: the wrapper, all files used by the wrapper,
-      and all directories in the path leading to those files, should be
-      accessible but not writable for unprivileged users (mode 755 or mode
-      555). Do not install the wrapper set-uid.</para>
-
-      <para>As the <systemitem class="username">root</systemitem> user,
-      perform the following edits on the
-      <filename>/etc/inetd.conf</filename> configuration file:</para>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-      </indexterm>
-
-<screen><literal>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</literal></screen>
-
-      <para>becomes:</para>
-
-<screen><literal>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</literal></screen>
-
-      <note>
-        <para>The <command>finger</command> server is used as an example here.</para>
-      </note>
-
-      <para>Similar changes must be made if <application>xinetd</application> is
-      used, with the emphasis being on calling <command>/usr/sbin/tcpd</command>
-      instead of calling the service daemon directly, and passing the name of the
-      service daemon to <command>tcpd</command>.</para>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-      </indexterm>
--->
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>tcpd, tcpdchk, tcpdmatch, try-from, and safe_finger</seg>
-        <seg>libwrap.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tcpd">
-        <term><command>tcpd</command></term>
-        <listitem>
-          <para>is the main access control daemon for all Internet services,
-          which <command>inetd</command> or <command>xinetd</command>
-          will run instead of running the requested service daemon.</para>
-          <indexterm zone="tcpwrappers tcpd">
-            <primary sortas="b-tcpd">tcpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcpdchk">
-        <term><command>tcpdchk</command></term>
-        <listitem>
-          <para>is a tool to examine a <command>tcpd</command> wrapper
-          configuration and report problems with it.</para>
-          <indexterm zone="tcpwrappers tcpdchk">
-            <primary sortas="b-tcpdchk">tcpdchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcpdmatch">
-        <term><command>tcpdmatch</command></term>
-        <listitem>
-          <para>is used to predict how the TCP wrapper
-          would handle a specific request for a service.</para>
-          <indexterm zone="tcpwrappers tcpdmatch">
-            <primary sortas="b-tcpdmatch">tcpdmatch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="try-from">
-        <term><command>try-from</command></term>
-        <listitem>
-          <para>can be called via a remote shell command to find out if the
-          host name and address are properly recognized.</para>
-          <indexterm zone="tcpwrappers try-from">
-            <primary sortas="b-try-from">try-from</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="safe_finger">
-        <term><command>safe_finger</command></term>
-        <listitem>
-          <para>is a wrapper for the <command>finger</command> utility, to
-          provide automatic reverse name lookups.</para>
-          <indexterm zone="tcpwrappers safe_finger">
-            <primary sortas="b-safe_finger">safe_finger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwrap">
-        <term><filename class='libraryfile'>libwrap.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions required by
-          the <application>TCP Wrapper</application> programs as well as other programs
-          to become <quote><application>TCP Wrapper</application>-aware</quote>.</para>
-          <indexterm zone="tcpwrappers libwrap">
-            <primary sortas="c-libwrap">libwrap.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/telepathy-logger.xml
===================================================================
--- archive/telepathy-logger.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,193 +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 telepathy-logger-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
-  <!ENTITY telepathy-logger-download-ftp  " ">
-  <!ENTITY telepathy-logger-md5sum        "c2f6a31c76cbdf8790500cf4f872ba71">
-  <!ENTITY telepathy-logger-size          "552 KB">
-  <!ENTITY telepathy-logger-buildsize     "17 MB">
-  <!ENTITY telepathy-logger-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-logger" xreflabel="telepathy-logger-&telepathy-logger-version;">
-  <?dbhtml filename="telepathy-logger.html"?>
-
-
-  <title>telepathy-logger-&telepathy-logger-version;</title>
-
-  <indexterm zone="telepathy-logger">
-    <primary sortas="a-telepathy-logger">telepathy-logger</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Logger</title>
-
-    <para>
-      The <application>Telepathy Logger</application> package is a headless
-      observer client that logs information received by the
-      <application>Telepathy</application> framework. It features pluggable
-      backends to log different sorts of messages in different formats.
-    </para>
-
-    &lfs112_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-logger-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-logger-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-logger-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-logger-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-logger-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-logger-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Logger Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/> (only during build),
-      <xref linkend="sqlite"/>, and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </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;/telepathy-logger"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Logger</title>
-
-    <para>
-      Fix a deprecated schema entry:
-    </para>
-
-<screen><userinput>sed 's@/apps/@/org/freedesktop/@' \
-    -i data/org.freedesktop.Telepathy.Logger.gschema.xml.in</userinput></screen>
-
-    <para>
-      Install <application>Telepathy Logger</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild-problem.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          telepathy-logger
-        </seg>
-        <seg>
-          libtelepathy-logger.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-logger-0.2,
-          /usr/share/gtk-doc/html/telepathy-logger and
-          /usr/share/telepathy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="telepathy-logger-prog">
-        <term><command>telepathy-logger</command></term>
-        <listitem>
-          <para>
-            is the <application>Telepathy Logger</application> D-Bus service
-          </para>
-          <indexterm zone="telepathy-logger telepathy-logger-prog">
-            <primary sortas="b-telepathy-logger">telepathy-logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtelepathy-logger">
-        <term><filename class="libraryfile">libtelepathy-logger.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy Logger</application> API functions
-          </para>
-          <indexterm zone="telepathy-logger libtelepathy-logger">
-            <primary sortas="c-libtelepathy-logger">libtelepathy-logger.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/tetex.xml
===================================================================
--- archive/tetex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,342 +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 tetex-download-http "http://www.tug.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-src-&tetex-version;.tar.gz" > -->
-  <!-- <!ENTITY tetex-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-src-&tetex-version;.tar.gz"> -->
-  <!ENTITY tetex-download-http "&sources-anduin-http;/t/tetex-src-&tetex-version;.tar.gz" >
-  <!ENTITY tetex-download-ftp  "&sources-anduin-ftp;/t/tetex-src-&tetex-version;.tar.gz">
-  <!ENTITY tetex-md5sum        "944a4641e79e61043fdaf8f38ecbb4b3">
-  <!ENTITY tetex-size          "12.7 MB">
-  <!ENTITY tetex-buildsize     "423 MB (549 MB with optional tarball, additional 231 MB for CM-Super fonts)">
-  <!ENTITY tetex-time          "2.1 SBU">
-
-  <!-- <!ENTITY texmf-download-http "http://www.tug.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmf-&tetex-version;.tar.gz" > -->
-  <!-- <!ENTITY texmf-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmf-&tetex-version;.tar.gz"> -->
-  <!ENTITY texmf-download-http "&sources-anduin-http;/t/tetex-texmf-&tetex-version;.tar.gz" >
-  <!ENTITY texmf-download-ftp  "&sources-anduin-ftp;/t/tetex-texmf-&tetex-version;.tar.gz">
-  <!ENTITY texmf-md5sum        "ed9d30d9162d16ac8d5065cde6e0f6fa">
-  <!ENTITY texmf-size          "87.1 MB">
-
-  <!-- <!ENTITY texmfsrc-download-http "http://www.tug.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmfsrc-&tetex-version;.tar.gz" > -->
-  <!-- <!ENTITY texmfsrc-download-ftp  "ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/&tetex-version;/distrib/tetex-texmfsrc-&tetex-version;.tar.gz"> -->
-  <!ENTITY texmfsrc-download-http "&sources-anduin-http;/t/tetex-texmfsrc-&tetex-version;.tar.gz" >
-  <!ENTITY texmfsrc-download-ftp  "&sources-anduin-ftp;/t/tetex-texmfsrc-&tetex-version;.tar.gz">
-  <!ENTITY texmfsrc-md5sum        "66c32a11964a49982ba2a32d3bbfe7f5">
-  <!ENTITY texmfsrc-size          "57.7 MB">
-
-  <!ENTITY cmsupersrc-download-http "&sources-anduin-http;/t/tetex-cm-super.tar.bz2" >
-  <!ENTITY cmsupersrc-download-ftp  "&sources-anduin-ftp;/t/tetex-cm-super.tar.bz2">
-  <!ENTITY cmsupersrc-md5sum        "d7c89fcb35f625b02853a0881a4ec760">
-  <!ENTITY cmsupersrc-size          "63.8 MB">
-]>
-
-<sect1 id="tetex" xreflabel="teTeX-&tetex-version;">
-  <?dbhtml filename="tetex.html"?>
-
-
-  <title>teTeX-&tetex-version;</title>
-
-  <indexterm zone="tetex">
-    <primary sortas="a-teTeX">teTeX</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to teTeX</title>
-
-    <para><application>teTeX</application> is an implementation of Donald
-    Knuth's TeX typesetting program. This package is able to create documents
-    in a variety of formats. The optional <filename>texmfsrc</filename> (TeX
-    METAFONT) tarball contains source code for programs to create and
-    manipulate TeX fonts.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tetex-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tetex-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tetex-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tetex-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tetex-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tetex-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing='compact'>
-      <title>Required Patches</title>
-      <listitem>
-        <para><ulink url="&patch-root;/tetex-&tetex-version;-gcc_4.4-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink url="&patch-root;/tetex-&tetex-version;-glibc-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Required Macros and Fonts</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texmf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texmf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texmf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texmf-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Optional 'texmf' Sources:</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texmfsrc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texmfsrc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texmfsrc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texmfsrc-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Optional 'cm-super' Sources:</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&cmsupersrc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cmsupersrc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cmsupersrc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cmsupersrc-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">teTeX Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="ed"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpng"/>,
-    <xref linkend="x-window-system"/>,
-    <xref linkend="tk-perl"/>,
-    <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>, and
-    <ulink url="http://www.boutell.com/gd/">GD</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tetex"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of teTeX</title>
-
-    <para>Before building <application>teTeX</application>, the macros and
-    fonts package (<filename>texmf</filename> tarball) must be installed.
-    Install the macros and fonts using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/texmf &amp;&amp;
-gzip -dc ../tetex-texmf-&tetex-version;.tar.gz \
-    | (umask 0; cd /usr/share/texmf; tar -xvf -)</userinput></screen>
-
-    <para>If the optional <filename>texmfsrc</filename> source code TAR ball
-    was downloaded, unpack it now as the <systemitem
-    class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>gzip -dc ../tetex-texmfsrc-&tetex-version;.tar.gz \
-    | (umask 0; cd /usr/share/texmf; tar -xvf -)</userinput></screen>
-
-    <para>Install <application>teTeX</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../tetex-&tetex-version;-gcc_4.4-1.patch &amp;&amp;
-patch -Np1 -i ../tetex-&tetex-version;-glibc-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --exec-prefix=/usr \
-            --bindir=/usr/bin \
-            --without-texinfo \
-            --with-x=no \
-            --with-system-ncurses \
-            --with-system-zlib &amp;&amp;
-make all</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. The tests
-    should complete without errors (there may be some errors which are
-    ignored).</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-texconfig-sys dvips paper letter &amp;&amp;
-texconfig-sys font rw</userinput></screen>
-
-    <note>
-      <para>The paper size may be changed to a4, as is used in most
-      countries.</para>
-    </note>
-
-    <para>To install the optional cm-super fonts, perform the following
-    instructions as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput>tar -xf ../tetex-cm-super.tar.bz2 &amp;&amp;
-FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN') &amp;&amp;
-mkdir -v -p $FONTDIR/fonts/afm/public/cm-super   \
-            $FONTDIR/fonts/type1/public/cm-super \
-            $FONTDIR/fonts/enc/dvips/cm-super    \
-            $FONTDIR/fonts/map/dvips/cm-super   &amp;&amp;
-
-cp -v cm-super/pfb/*.pfb $FONTDIR/fonts/type1/public/cm-super/ &amp;&amp;
-
-gunzip cm-super/afm/* &amp;&amp;
-cp -v cm-super/afm/*.afm $FONTDIR/fonts/afm/public/cm-super/ &amp;&amp;
-
-cp -v cm-super/dvips/*.enc $FONTDIR/fonts/enc/dvips/cm-super/ &amp;&amp;
-cp -v cm-super/dvips/*.map $FONTDIR/fonts/map/dvips/cm-super/ &amp;&amp;
-
-cat &gt;&gt; $FONTDIR/web2c/updmap.cfg &lt;&lt; "EOF" &amp;&amp;
-MixedMap cm-super-t1.map
-MixedMap cm-super-t2a.map
-MixedMap cm-super-t2b.map
-MixedMap cm-super-t2c.map
-MixedMap cm-super-ts1.map
-MixedMap cm-super-x2.map
-EOF
-
-install -v -m644 -D cm-super/type1ec.sty \
-       $FONTDIR/tex/latex/cm-super/type1ec.sty &amp;&amp;
-
-mktexlsr &amp;&amp;
-updmap-sys &amp;&amp;
-
-unset FONTDIR</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-x=no</parameter>: This switch will avoid any
-    <application>X</application> dependencies. <application>teTeX</application>
-    can be compiled with <application>X</application> support, notably for
-    <command>xdvi</command>. If this is desired, remove this parameter.</para>
-
-    <para><parameter>--exec-prefix=/usr --bindir=/usr/bin</parameter>: These
-    switches ensure that <application>teTeX</application> binaries are installed
-    in <filename class="directory">/usr/bin</filename>.</para>
-
-    <para><parameter>--without-texinfo</parameter>: A default LFS installation
-    already has the <application>Texinfo</application> package installed. This
-    switch will avoid overwriting it with the included
-    <application>Texinfo</application> package.</para>
-
-    <para><parameter>--with-system-ncurses</parameter>: This switch specifies
-    using the already installed <filename
-    class="libraryfile">libncurses</filename> library.</para>
-
-    <para><parameter>--with-system-zlib</parameter>: A default LFS installation
-    already has the <application>Zlib</application> library installed. This
-    switch will avoid replacing it with the included
-    <application>Zlib</application> library.</para>
-
-    <para><option>--disable-a4</option>: Use this option to set the default
-    paper size to letter and the default unit to inch.</para>
-
-    <para><command>texconfig-sys dvips paper letter</command>: This command
-    sets the default paper size for <application>teTeX</application>.</para>
-
-    <para><command>texconfig-sys font rw</command>: This command specifies
-    creating and using a directory for globally writeable fonts.</para>
-
-    <para><command>mktexlsr</command>: This command recreates the
-    <application>teTeX</application> <filename>ls-R</filename> databases after
-    installing the CM-Super fonts.</para>
-
-    <para><command>updmap-sys</command>: This command updates the system-wide
-    font configuration to include the CM-Super fonts.</para>
-
-    <tip>
-      <para>Run <command>./configure --help</command> for information about
-      using other switches which will enable the build to use other installed
-      packages you may have on your system.</para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>100 separate binaries and scripts along with 30 symlinks to these
-        programs.</seg>
-        <seg>libkpathsea.a</seg>
-        <seg>/usr/include/kpathsea, /var/tmp/texfonts and the following
-        subdirectories of /usr/share/: texi2html, texinfo/html, texmf,
-        texmf-config and texmf-var</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tetex-programs">
-        <term><command>teTeX programs</command></term>
-        <listitem>
-          <para>included in the <application>teTeX</application> package are too
-          numerous to individually list. Please refer to the individual program
-          man pages and <ulink url="file:///usr/share/texmf/doc/index.html"/>
-          for details, as well as a tour of the expansive
-          <application>teTeX</application> documentation.</para>
-          <indexterm zone="tetex tetex-programs">
-            <primary sortas="b-teTeX-programs">teTeX programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class='libraryfile'>libkpathsea.a</filename></term>
-        <listitem>
-          <para>contains functions used by <application>teTeX</application>
-          for searching and cataloging path names.</para>
-          <indexterm zone="tetex libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/texlive-source-full.xml
===================================================================
--- archive/texlive-source-full.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,285 +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 texlive-source-download-http " ">
-  <!ENTITY texlive-source-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-source-md5sum        "09ee265ff51637827559affc7304078c">
-  <!ENTITY texlive-source-size          "40 MB">
-
-  <!ENTITY texlive-buildsize            "923 MB (if starting from pass 1)">
-  <!ENTITY texlive-time                 "9.0 SBU">
-]>
-
-<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
-  <?dbhtml filename="texlive.html"?>
-
-
-  <title>texlive-&texlive-version;-source</title>
-
-  <indexterm zone="texlive">
-    <primary sortas="a-texlive">texlive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live from source</title>
-
-    <para>After installing a partial TeX build (or alternatively installing the
-    binary version), here we will build all of TeX Live from source (except
-    <application>biber</application> which is not supplied in the source tarball
-    and will be dealt with separately).</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&texlive-source-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texlive-source-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texlive-source-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texlive-source-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &texlive-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &texlive-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TeX Live Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      Either <xref linkend="texpass1"/> or <xref linkend="tl-installer"/>
-      , and
-      <xref linkend="clisp"/> (to build <command>xindy</command> which is an
-      index processor for multi-lingual index creation)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gs"/> (for dvisvgm - used by asymptote which provides a
-      mathematical coordinate-based framework for technical drawing),
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <!-- text for recommended libraries, shared with pass 1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texrecommendlibs.xml"/>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- text for optional deps, shared with pass 1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texoptional.xml"/>
-
-
-    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
-    <!-- text for runtime deps, shared with tl-installer and pass 1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/texlive"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TeX Live</title>
-
-    <para>If you started with the binary installer, these instructions will
-    overwrite the programs it installed.</para>
-
-<!-- the first part of this is the same as in texlive pass 1 -->
-<screen role="root"><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=/usr/include                       \
-    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --libdir=/usr/lib                               \
-    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --disable-native-texlive-build                  \
-    --disable-static --enable-shared                \
-    --with-system-cairo                             \
-    --with-system-fontconfig                        \
-    --with-system-freetype2                         \
-    --with-system-graphite2                         \
-    --with-system-harfbuzz                          \
-    --with-system-icu                               \
-    --with-system-libgs                             \
-    --with-system-libpng                            \
-    --with-system-pixman                            \
-    --with-system-poppler                           \
-    --with-system-xpdf                              \
-    --with-system-zlib                              \
-    --with-banner-add=" - BLFS"                     \
-    --enable-xindy                                  \
-    --enable-xindy-rules                            \
-    --enable-xindy-doc                              \
-    --with-clisp-runtime=system</userinput></screen>
-
-    <para>Asymptote has to be separately configured.  It ships with its own copy
-    of the gc source tarball, and will only use the system version if that local
-    source is removed.
-    </para>
-
-<screen><userinput>pushd ../utils/asymptote &amp;&amp;
-rm -v gc-7.4.0.tar.gz &amp;&amp;
-
-echo "ac_cv_lib_m_sqrt=yes"     >config.cache &amp;&amp;
-echo "ac_cv_lib_z_deflate=yes" >>config.cache &amp;&amp;
-
-./configure LIBS="-ltirpc "                         \
-    --prefix=/opt/texlive/&texlive-year;/                     \
-    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH     \
-    --enable-texlive-build                          \
-    --datarootdir=/opt/texlive/&texlive-year;/texmf-dist      \
-    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --cache-file=config.cache &amp;&amp; &amp;&amp;
-popd &amp;&amp;
-unset TEXARCH &amp;&amp;
-
-make &amp;&amp;
-make -C ../utils/asymptote</userinput></screen>
-
-    <para>To test the results, issue: <command>make -k check &amp;&amp;
-    make -C utils/asymptote check</command>.</para>
-
-    <para>If you have used the binary installer, you will want to
-    do a full install. As the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput role="nodump">make install &amp;&amp;
-make -C ../utils/asymptote install</userinput></screen>
-
-    <para>For people who have followed the LFS way and built from source,
-    it is only necessary to install <application>xindy</application> and
-    <application>asy</application>, so, as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen><userinput role="root">make -C utils/xindy install &amp;&amp;
-make -C ../utils/asymptote install</userinput></screen>
-
-    <para>One part of the package remains to be rebuilt:
-    <xref linkend="biber"/>.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-lib.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-shared.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-system.xml"/>
-
-<!--    <para>
-      <parameter>\-\-with-system-xpdf</parameter>: Uniquely, this parameter has
-      a non-standard meaning, it tells <command>configure</command> to use the
-      system-installed <application>poppler</application> headers and library.
-      Again, omit this if you have not installed
-      <application>poppler</application>.
-    </para> -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-xpdf.xml"/>
-
-    <para>
-      <parameter>echo "ac_cv_lib_m_sqrt=yes" ... LIBS="-ltirpc " &gt;config.cache,
-      ... --cache-file=config.cache</parameter> : The configure scripts in
-      <application>TeX Live</application> are uncommon. Asymptote not only has to
-      be separately configured and built, the configure script fails to find the
-      shared <filename class="libraryfile">libtirpc.so</filename>.  Passing that
-      in LIBS breaks the tests for (static) libm and (shared) libz, so we have to
-      fix things up, in much the same way as when cross-compiling.
-    </para>
-
-    <para>
-      <option>--without-x</option>: use this (and omit the configure and make in
-      <filename>utils/asymptote</filename> if you do not have Xorg installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>libkpathsea.so, libptexenc.so</seg>
-        <seg>/opt/texlive, /usr/include/kpathsea, /usr/include/ptexenc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="texlive-programs">
-        <term><command>TeX&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="texlive texlive-programs">
-            <primary sortas="b-texlive-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class="libraryfile">libkpathsea.so</filename></term>
-        <listitem>
-          <para>
-            (kpathsearch) exists to look up a file in a list of directories.
-          </para>
-          <indexterm zone="texlive libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libptexenc">
-        <term><filename class="libraryfile">libptexenc.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Japanese pTeX (publishing TeX).
-          </para>
-          <indexterm zone="texlive libptexenc">
-            <primary sortas="c-libptexenc">libptexenc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/tin.xml
===================================================================
--- archive/tin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,300 +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 tin-download-http "http://gd.tuwien.ac.at/infosys/newsreaders/tin/v1.8/tin-&tin-version;.tar.bz2">
-  <!ENTITY tin-download-ftp  "ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-&tin-version;.tar.bz2">
-  <!ENTITY tin-md5sum        "e6ed45205020665c097556822b0d575b">
-  <!ENTITY tin-size          "1.4 MB">
-  <!ENTITY tin-buildsize     "12.4 MB">
-  <!ENTITY tin-time          "0.4 SBU">
-]>
-
-<sect1 id="tin" xreflabel="tin-&tin-version;">
-  <?dbhtml filename="tin.html"?>
-
-
-  <title>TIN-&tin-version;</title>
-
-  <indexterm zone="tin">
-    <primary sortas="a-TIN">TIN</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TIN</title>
-
-    <para><application>TIN</application> is a threaded NNTP and spool based
-    console-mode UseNet newsreader. It supports threading, scoring,
-    different charsets, and many other useful things. It has also support for
-    different languages.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tin-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tin-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tin-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tin-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tin-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tin-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TIN Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pcre"/>,
-    <xref linkend="libidn"/>,
-    an <xref linkend="server-mail"/> that provides the
-    <command>sendmail</command> command or <xref linkend="mailx"/>,
-    <xref linkend="gnupg"/>,
-    <!-- a spell checker (<xref linkend="ispell"/> or <xref linkend="aspell"/>), -->
-    <xref linkend="aspell"/>,
-    <ulink url="http://www.isc.org/index.pl?/sw/inn/">INN</ulink>,
-    <ulink url="http://www.fpx.de/fp/Software/UUDeview/">UUDeview</ulink>,
-    <ulink url="http://www.inet.no/dante/">Socks</ulink>,
-    <ulink
-    url="http://ftp4.de.freesbie.org/pub/misc/metamail/mm2.7.tar.Z">Metamail</ulink>,
-    and
-    <ulink url="http://dmalloc.com/">Dmalloc</ulink>
-    or
-    <ulink url="ftp://invisible-island.net/dbmalloc/">dbmalloc</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/Tin"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TIN</title>
-
-    <para>Install <application>TIN</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-screen=ncursesw \
-    --enable-nntp-only --disable-printing &amp;&amp;
-make build</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;
-make install_sysdefs &amp;&amp;
-rm -vf doc/*.? &amp;&amp;
-install -v -m755 -d /usr/share/doc/tin-&tin-version; &amp;&amp;
-install -v -m644 doc/* /usr/share/doc/tin-&tin-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-screen=ncursesw</parameter>: This switch forces
-    the use of wide-character functions from the ncursesw library (for UTF-8
-    and Asian languages support).</para>
-
-    <para><parameter>--enable-nntp-only</parameter>: Reading news from a local
-    spool is disabled with this switch.  Don't use this if you have installed
-    INN and want to use its spool.</para>
-
-    <para><parameter>--disable-printing</parameter>: This switch disables
-    printing since <application>TIN</application> cannot send non-ASCII text
-    to the printer correctly. Remove this switch if you can tolerate this
-    limitation.</para>
-
-    <para><parameter>--with-editor</parameter>: This switch sets the default
-    editor used by <application>TIN</application>.  The default is
-    <command>vi</command>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring TIN</title>
-
-    <sect3 id="tin-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/tin/tinrc</filename>,
-      <filename>~/.tin/tinrc</filename>,
-      <filename>~/.newsrc</filename>,
-      <filename>/etc/tin/tin.defaults</filename>,
-      <filename>/etc/tin/mime.types</filename>,
-      <filename>/etc/tin/keymap</filename> and
-      <filename>/etc/mailcap</filename></para>
-
-      <indexterm zone="tin tin-config">
-        <primary sortas="e-etc-tinrc">/etc/tin/tinrc</primary>
-      </indexterm>
-
-      <indexterm zone="tin tin-config">
-        <primary sortas="e-AA.tinrc">~/.tin/tinrc</primary>
-      </indexterm>
-
-      <indexterm zone="tin tin-config">
-        <primary sortas="e-AA.newsrc">~/.newsrc</primary>
-      </indexterm>
-
-      <indexterm zone="tin tin-config">
-        <primary sortas="e-etc-tindefaults">/etc/tin/tin.defaults</primary>
-      </indexterm>
-
-      <indexterm zone="tin tin-config">
-        <primary sortas="e-etc-tinkeymap">/etc/tin/keymap</primary>
-      </indexterm>
-
-      <indexterm zone="tin tin-config">
-        <primary sortas="e-etc-mailcap">/etc/mailcap</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Set some global defaults for <application>TIN</application> by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>cat &gt; /etc/tin/tinrc &lt;&lt; "EOF"
-use_mouse=ON
-getart_limit=100
-translit=ON
-EOF</userinput></screen>
-
-      <para>Now, as an unprivileged user, subscribe to some newsgroups,
-      specify the news server, and run <command>tin</command>:</para>
-
-<screen><userinput>cat &gt;&gt; ~/.newsrc &lt;&lt; "EOF"
-gmane.linux.lfs.devel:
-gmane.linux.lfs.beyond.devel:
-EOF
-export NNTPSERVER=news.gmane.org
-tin -Q</userinput></screen>
-
-    <para>For printing, <application>TIN</application> executes the
-    <command>lpr</command> command. This can be provided by
-    <xref linkend="cups"/> or <xref linkend="LPRng"/>.</para>
-
-    <para>If you do not have the <command>metamail</command> program,
-    <application>TIN</application> will use an internal parser for multipart
-    MIME articles.  Alternatively, you can use <application>Mutt</application>
-    for MIME parsing through the <command>metamutt</command> shell script.
-    This requires both the <xref linkend="mutt"/> and
-    <xref linkend="procmail"/> programs.  To use <command>metamutt</command>,
-    set <option>metamail_prog=metamutt</option> in
-    <command>tin</command>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>tin, rtin, tinews.pl, metamutt, opt-case.pl, w2r.pl,
-        and url_handler.sh</seg>
-        <seg>None</seg>
-        <seg>/etc/tin</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tin-prog">
-        <term><command>tin</command></term>
-        <listitem>
-          <para>is a UseNet news reader.</para>
-          <indexterm zone="tin tin-prog">
-            <primary sortas="b-tin">tin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtin">
-        <term><command>rtin</command></term>
-        <listitem>
-          <para>is a symbolic link to <command>tin</command>.</para>
-          <indexterm zone="tin rtin">
-            <primary sortas="b-rtin">rtin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tinews.pl">
-        <term><command>tinews.pl</command></term>
-        <listitem>
-          <para>posts and signs an article via NNTP.</para>
-          <indexterm zone="tin tinews.pl">
-            <primary sortas="b-tinews.pl">tinews.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="metamutt">
-        <term><command>metamutt</command></term>
-        <listitem>
-          <para>is a replacement of <command>metamail</command> using
-          <application>Mutt</application>.</para>
-          <indexterm zone="tin metamutt">
-            <primary sortas="b-metamutt">metamutt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opt-case.pl">
-        <term><command>opt-case.pl</command></term>
-        <listitem>
-          <para>optimizes case insensitive regexp filters for tin.</para>
-          <indexterm zone="tin opt-case.pl">
-            <primary sortas="b-opt-case.pl">opt-case.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="w2r.pl">
-        <term><command>w2r.pl</command></term>
-        <listitem>
-          <para>converts tin wildmat filters to tin regexp filters.</para>
-          <indexterm zone="tin w2r.pl">
-            <primary sortas="b-w2r.pl">w2r.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="url_handler.sh">
-        <term><command>url_handler.sh</command></term>
-        <listitem>
-          <para>calls a web browser for viewing hyperlinks.</para>
-          <indexterm zone="tin url_handler.sh">
-            <primary sortas="b-url_handler.sh">url_handler.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/udev-extras-old.xml
===================================================================
--- archive/udev-extras-old.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 systemd-download-http "http://www.freedesktop.org/wiki/Software/systemd/">
-  <!ENTITY systemd-download-ftp  " ">
-  <!-- <!ENTITY udev-md5sum        " "> -->
-  <!ENTITY systemd-size          "1.3 MB">
-  <!ENTITY systemd-buildsize     "314 MB">
-  <!ENTITY systemd-time          "3.5 SBU">
-]>
-
-<sect1 id="udev-extras" xreflabel="udev-extras (from systemd)">
-  <?dbhtml filename="udev-extras.html"?>
-
-
-  <title>Udev Extras (from systemd)</title>
-
-  <indexterm zone="udev-extras">
-    <primary sortas="a-udev-extras">udev extras (from systemd)</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Udev Extras</title>
-
-    <para>Udev was installed as a part of systemd in LFS. However, not
-    all components were installed due to dependencies that were unavailable.
-    This procedure adds those missing components.</para>
-
-    <!-- &lfs75_checked; -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&systemd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&systemd-download-ftp;"/></para>
-      </listitem>
-      <!-- <listitem>
-        <para>Download MD5 sum: &systemd-md5sum;</para>
-      </listitem> -->
-      <listitem>
-        <para>Download size: &systemd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &systemd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &systemd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Udev Extras Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (for the gudev library)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="pciutils"/> and
-      <xref linkend="usbutils"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udev-extras"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Udev Extras</title>
-
-    <para>First, build systemd:</para>
-
-<screen><userinput>./configure --disable-tests &amp;&amp;
-make</userinput></screen>
-
-   <caution><para>If you maintained the default System V/systemd
-   installation in LFS, do not run <userinput>make install</userinput>.
-   It will overwrite the symbolic links needed to switch boot
-   systems.</para></caution>
-
-   <para>Now install gudev as the <systemitem class="username">root</systemitem>
-   user:</para>
-
-<screen><userinput>mkdir -pv /usr/include/gudev-1.0/gudev /usr/share/gtk-doc/html/gudev &amp;&amp;
-
-cp -v src/gudev/gudev.h             /usr/include/gudev-1.0/gudev &amp;&amp;
-cp -v src/gudev/gudev[a-e,t]*.h     /usr/include/gudev-1.0/gudev &amp;&amp;
-cp -v .libs/libgudev-1.0.so.0.2.0   /usr/lib                     &amp;&amp;
-
-ln -svfn libgudev-1.0.so.0.2.0      /usr/lib/libgudev-1.0.so     &amp;&amp;
-ln -svfn libgudev-1.0.so.0.2.0      /usr/lib/libgudev-1.0.so.0   &amp;&amp;
-
-cp -v src/gudev/gudev-1.0.pc        /usr/lib/pkgconfig           &amp;&amp;
-cp -v docs/gudev/html/*             /usr/share/gtk-doc/html/gudev</userinput></screen>
-
-    <para>If the optional gobject-introspection package is available, install
-    the gir-data files as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput>mkdir -pv /usr/lib/girepository-1.0 /usr/share/gir-1.0  &amp;&amp;
-
-cp -v src/gudev/GUdev-1.0.typelib /usr/lib/girepository-1.0 &amp;&amp;
-cp -v src/gudev/GUdev-1.0.gir     /usr/share/gir-1.0</userinput></screen>
-
-  </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>libgudev-1.0.so</seg>
-
-        <seg>/usr/include/gudev-1.0/gudev,
-             /usr/lib/girepository-1.0,
-             /usr/share/gir-1.0, and
-             /usr/share/gtk-doc/html/gudev</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgudev-1.0-systemd">
-        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>is a GObject-based wrapper library for libudev.</para>
-          <indexterm zone="udev-extras libgudev-1.0-systemd">
-            <primary sortas="c-libgudev-1.0-systemd">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/udev-extras.xml
===================================================================
--- archive/udev-extras.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +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 eudev-download-http "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-  <!ENTITY eudev-download-ftp  " ">
-  <!ENTITY eudev-md5sum        "80649a0350ff9620fc2da9562d9f2a6a">
-  <!ENTITY eudev-size          "1.7 MB">
-  <!ENTITY eudev-buildsize     "23 MB">
-  <!ENTITY eudev-time          "0.3 SBU">
-
-  <!ENTITY eudev-svn-download-http "http://dev.gentoo.org/~blueness/eudev">
-]>
-
-<sect1 id="udev-extras" xreflabel="udev-extras (from eudev)">
-  <?dbhtml filename="udev-extras.html"?>
-
-
-  <title>Udev Extras (from eudev)</title>
-
-  <indexterm zone="udev-extras">
-    <primary sortas="a-udev-extras">udev extras (from eudev)</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Udev Extras</title>
-
-    <para><application>Eudev</application> was indeed installed in LFS and
-    there is no reason to reinstall it unless the user is going to install a
-    package such as <application>UPower</application> that needs libgudev.
-    These instructions enable building libgudev and also optionally create gir
-    data for <application>Eudev</application>.  </para>
-
-    <para>Unlike other packages in BLFS, there is no set version of
-    <application>Eudev</application> in this page's title and no set version
-    specified for download. Version updates to <application>Eudev</application>
-    makes it possible that the user's system may have an
-    <application>Eudev</application> version different from the one in the
-    current LFS book. Therefore, users should use the version of
-    <application>Eudev</application> their computer currently uses. With few
-    exceptions, the BLFS team has no experience updating (or reverting to an
-    older version) the <application>Eudev</application> package <quote>on the
-    fly</quote>.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <caution>
-      <para>
-         If you are using a version of BLFS different from your currently
-         installed base LFS system, you should use the Eudev source from your
-         LFS build.  Newer versions of Eudev may occasionally be incompatible
-         with former ones, either because they require some new options to be
-         enabled in the kernel or because they change the way rules are parsed.
-         For in-system updates to Eudev, you may want to consult <ulink
-         url="http:wiki.gentoo.org/wiki/Udev/upgrade">the Gentoo page</ulink>
-         about upgrading Udev.
-      </para>
-    </caution>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&eudev-svn-download-http;"/></para>
-      </listitem>
-<!--      <listitem>
-        <para>Download (HTTP): <ulink url="&eudev-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&eudev-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &eudev-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &eudev-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &eudev-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &eudev-time;</para>
-      </listitem>-->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Udev Extras Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome),
-      <xref linkend="docbook-xsl"/> and <xref linkend="libxslt"/> (to build
-      man pages, which are not shipped with the package), and
-      <xref linkend="gtk-doc"/> (to rebuild the documentation)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="pciutils"/> and
-      <xref linkend="usbutils"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udev-extras"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Udev Extras</title>
-
-    <para>First, re-build eudev:</para>
-
-<screen><userinput>sed -r -i 's|/usr(/bin/test)|\1|'         test/udev-test.pl  &amp;&amp;
-
-./configure --prefix=/usr           \
-            --bindir=/sbin          \
-            --sbindir=/sbin         \
-            --libdir=/usr/lib       \
-            --sysconfdir=/etc       \
-            --libexecdir=/lib       \
-            --with-rootprefix=      \
-            --with-rootlibdir=/lib  \
-            --enable-split-usr      \
-            --enable-libkmod        \
-            --enable-rule_generator \
-            --enable-keymap         \
-            --disable-introspection \
-            --disable-gtk-doc-html  \
-            --disable-static        &amp;&amp;
-
-make</userinput></screen>
-
-   <para>To test the results, issue: <command>make check</command>.</para>
-
-   <para>Now re-install 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>--disable-introspection</parameter>: This prevents the
-      gir-data instructions from running.  Remove this option if the optional
-      <xref linkend="gobject-introspection"/> package is installed.
-    </para>
-
-    <para>
-      <parameter>--disable-gtk-doc-html</parameter>: This prevents the
-      building of the html data.  Remove this option if the optional
-      <xref linkend="gtk-doc"/> package is installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-
-        <seg>libgudev-1.0.so</seg>
-
-        <seg>/usr/include/gudev-1.0/gudev,
-             /usr/lib/girepository-1.0,
-             /usr/share/gir-1.0, and
-             /usr/share/gtk-doc/html/gudev (optional)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgudev-1.0-systemd">
-        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>is a GObject-based wrapper library for libudev.</para>
-          <indexterm zone="udev-extras libgudev-1.0-systemd">
-            <primary sortas="c-libgudev-1.0-systemd">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/udev.xml
===================================================================
--- archive/udev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +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 udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"> -->
-  <!ENTITY udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/">
-  <!ENTITY udev-download-ftp  " ">
-  <!-- <!ENTITY udev-md5sum        "aeae0e6273dcbec246c3c1b9868ebed1"> -->
-  <!ENTITY udev-size          "~500 KB">
-  <!ENTITY udev-buildsize     "~10 MB">
-  <!ENTITY udev-time          "~1.8 SBU">
-]>
-
-<sect1 id="udev" xreflabel="udev-&udev-version;">
-  <?dbhtml filename="udev.html"?>
-
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="udev">
-    <primary sortas="a-udev">udev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Udev</title>
-
-    <note><para>If you installed LFS from SVN-20120719, LFS-7.2, or later,
-    use <xref linkend='udev-extras'/> instead of this page.</para></note>
-
-    <para><application>Udev</application> was indeed installed in LFS and there
-    is no reason to reinstall it unless you are going to install a package such
-    as <application>UPower</application>. This installation of
-    <application>Udev</application> enables extra features which includes
-    <application>gudev</application>, a requirement for
-    <application>UPower</application> and optionally used by other
-    packages.</para>
-
-    <para>Unlike any other package in the BLFS book, there is no set version
-    of <application>Udev</application> specified to download. Several version
-    updates to LFS and none to BLFS means there are probably many different
-    versions of <application>Udev</application> on the platforms that BLFS is
-    being built upon. Therefore, you should download and use the version of
-    <application>Udev</application> your computer currently uses. The BLFS
-    team has no experience updating (or reverting to an older version) the
-    <application>Udev</application> package <quote>on the fly.</quote> To
-    discover the version of <application>Udev</application> your computer
-    currently uses, issue <command>/sbin/udevadm --version</command>.</para>
-
-    <para>You should look at the LFS instructions for the version you used, to
-    check that you are using the correct testfiles (for some versions, this was a
-    separate tarball, extracted in the udev directory with --strip-components=1)
-    and to compare the configure options you are about to use against those which
-    you used to build the version you are running (sometimes, the options change).
-    </para>
-
-    <para>This package is known to build and work properly using an LFS-7.0
-    platform. (Using Udev-173)</para>
-
-    <para>This package is known to build and work properly using an LFS-7.1
-    platform. (Using Udev-182)</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&udev-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&udev-download-ftp;"/></para>
-      </listitem>
-      <!-- <listitem>
-        <para>Download MD5 sum: &udev-md5sum;</para>
-      </listitem> -->
-      <listitem>
-        <para>Download size: &udev-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &udev-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &udev-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Udev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="acl"/>,
-    <xref linkend="glib2"/>,
-    <xref linkend="gperf"/>,
-    <xref linkend="pciutils"/>, and
-    <xref linkend="usbutils"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gobject-introspection"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udev"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <para>Install <application>Udev</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr                  \
-            --sysconfdir=/etc              \
-            --sbindir=/sbin                \
-            --with-rootlibdir=/lib         \
-            --libexecdir=/lib              \
-            --with-systemdsystemunitdir=no \
-            --disable-introspection        \
-            --docdir=/usr/share/doc/&lt;udev-&udev-version;&gt; &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para><option>--disable-introspection</option>: Remove this option if
-    the optional dependency gobject-introspection is installed.</para>
-
-    <para><option>--with-systemdsystemunitdir=no</option>: systemd is not used
-    in (B)LFS.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>A list of the installed files, along with their short descriptions
-    can be found at
-    <ulink url="&lfs-root;/chapter06/udev.html#contents-udev"/>.</para>
-
-    <para>The following is some additional content information.</para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>findkeyboards, firmware, input_id,
-        keyboard-force-release.sh, keymap, modem-modeswitch, pci-db, udev-acl,
-        usb-db, and v4l_id</seg>
-        <seg>libgudev-1.0.so</seg>
-        <seg>/lib/udev/keymaps/force-release,
-        /usr/{include/gudev-1.0/gudev,share/{doc/udev-&udev-version;,
-        gtk-doc/html/gudev}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keymap">
-        <term><command>keymap</command></term>
-        <listitem>
-          <para>configures computer model specific key mappings.</para>
-          <indexterm zone="udev keymap">
-            <primary sortas="b-keymap">keymap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgudev-1.0">
-        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>is a GObject-based wrapper library for libudev.</para>
-          <indexterm zone="udev libgudev-1.0">
-            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/udftools.xml
===================================================================
--- archive/udftools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,237 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY udftools-download-http "&sourceforge-repo;/linux-udf/udftools-&udftools-version;.tar.gz">
-  <!ENTITY udftools-download-ftp  " ">
-  <!ENTITY udftools-md5sum        "2f491ddd63f31040797236fe18db9e60">
-  <!ENTITY udftools-size          "287 KB">
-  <!ENTITY udftools-buildsize     "3.5 MB">
-  <!ENTITY udftools-time          "0.1 SBU">
-]>
-
-<sect1 id="udftools" xreflabel="UDFtools-&udftools-version;">
-  <?dbhtml filename="udftools.html"?>
-
-
-  <title>UDFtools-&udftools-version;</title>
-
-  <indexterm zone="udftools">
-    <primary sortas="a-UDFTools">UDFtools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UDFtools</title>
-
-    <para>The <application>UDFtools</application> package contains utilities
-    for creating and mounting CD-RW disks with UDF file systems for both
-    reading and writing. UDF files systems are used on both CD-RW media and
-    on DVD.  For more details of the UDF file system standard see:
-    <ulink url="http://www.osta.org"/> and
-    <ulink url="http://www.ecma-international.org"/>.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&udftools-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&udftools-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &udftools-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &udftools-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &udftools-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &udftools-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="http://w1.894.telia.com/~u89404340/patches/packet/udftools-&udftools-version;.patch.bz2"/>
-        </para>
-        <para>Required patch: <ulink
-        url="&patch-root;/udftools-&udftools-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udftools"/></para>
-
-  </sect2>
-
-  <sect2 id="udftools-kernel">
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="udftools udftools-kernel">
-      <primary sortas="d-UDF-File-System">UDF File System</primary>
-    </indexterm>
-
-    <para>In the kernel configuration, modify your settings to match those listed
-    here:</para>
-
-<screen><literal>Block devices
-    Packet writing on CD/DVD media:       Y or M
-CD-ROM/DVD Filesystems
-    UDF file system support               Y or M</literal></screen>
-
-    <para>Recompile and install the new kernel.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UDFtools</title>
-
-    <para>Install <application>UDFtools</application> by
-    running the following commands:</para>
-
-<screen><userinput>bzcat ../udftools-&udftools-version;.patch.bz2 | patch -Np1 &amp;&amp;
-patch -Np1 -i ../udftools-&udftools-version;-fixes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</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><command>sed -i -e 's/(char\*)spm +=/spm = (char\*)spm +/'
-     wrudf/wrudf.c</command>: This change is required to compile with
-     recent compilers.</para>
-
-  </sect2> -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cdrwtool, mkudffs, pktsetup, udffsck, and wrudf</seg>
-        <seg>libudffs.a</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cdrwtool">
-        <term><command>cdrwtool</command></term>
-        <listitem>
-          <para> provides facilities to manage CD-RW drives, including formatting
-          new disks, setting the read and write speeds, etc.</para>
-
-          <para>Example:</para>
-
-<screen><userinput>cdrwtool -d /dev/scd0 -q</userinput></screen>
-
-          <para>prepares a new CD-RW for use and
-          formats it with a UDF file system.</para>
-          <indexterm zone="udftools cdrwtool">
-            <primary sortas="b-cdrwtool">cdrwtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkudffs">
-        <term><command>mkudffs</command></term>
-        <listitem>
-          <para>is used to create new UDF file systems. It can be used on
-          hard disks and CD-Rs as well as CD-RWs.</para>
-          <indexterm zone="udftools mkudffs">
-            <primary sortas="b-mkudffs">mkudffs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pktsetup">
-        <term><command>pktsetup</command></term>
-        <listitem>
-          <para>is used to establish and break down associations between the
-          kernel packet driver and a physical drive.</para>
-
-          <para>Example:</para>
-
-<screen><userinput>pktsetup /dev/pktcdvd0 /dev/scd0
-mount /dev/pktcdvd0 /mnt/cdrom -t udf -o rw,noatime</userinput></screen>
-
-          <para>associates the physical device <filename>/dev/scd0</filename>
-          with the kernel packet driver <filename>/dev/pktcdvd0</filename>, then
-          mounts a UDF formatted CD-RW for read/write access.</para>
-          <indexterm zone="udftools pktsetup">
-            <primary sortas="b-pktsetup">pktsetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udffsck">
-        <term><command>udffsck</command></term>
-        <listitem>
-          <para>is used to check the integrity and correct errors on
-          UDF filesystems.</para>
-          <indexterm zone="udftools udffsck">
-            <primary sortas="b-udffsck">udffsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wrudf">
-        <term><command>wrudf</command></term>
-        <listitem>
-          <para>is used to maintain a UDF filesystem.</para>
-          <indexterm zone="udftools wrudf">
-            <primary sortas="b-wrudf">wrudf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libudffs">
-        <term><filename class='libraryfile'>libudffs.a</filename></term>
-        <listitem>
-          <para>contains functions used by the
-          <application>UDFtools</application> programs.</para>
-          <indexterm zone="udftools libudffs">
-            <primary sortas="c-libudffs">libudffs.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/udisks.xml
===================================================================
--- archive/udisks.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 udisks-download-http "https://hal.freedesktop.org/releases/udisks-&udisks-version;.tar.gz">
-  <!ENTITY udisks-download-ftp  " ">
-  <!ENTITY udisks-md5sum        "70d48dcfe523a74cd7c7fbbc2847fcdd">
-  <!ENTITY udisks-size          "720 KB">
-  <!ENTITY udisks-buildsize     "12 MB">
-  <!ENTITY udisks-time          "0.1 SBU">
-]>
-
-<sect1 id="udisks" xreflabel="UDisks-&udisks-version;">
-  <?dbhtml filename="udisks.html"?>
-
-
-  <title>UDisks-&udisks-version;</title>
-
-  <indexterm zone="udisks">
-    <primary sortas="a-UDisks">UDisks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UDisks</title>
-
-    <para>
-      The <application>UDisks</application> package provides a
-      storage daemon that implements well-defined D-Bus interfaces
-      that can be used to query and manipulate storage devices.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&udisks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&udisks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &udisks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &udisks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &udisks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &udisks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">udisks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libatasmart"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="lvm2"/>,
-      <xref linkend="parted"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="sg3_utils"/>
-    </para>
-
-    <bridgehead renderas="sect4" revision="systemd">Recommended</bridgehead>
-    <para role="recommended" revision="systemd">
-      <xref linkend="systemd"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/> and
-      <xref linkend="sudo"/> (to run the test)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udisks"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UDisks</title>
-
-    <para>
-      Fix a build issue with glibc-2.24:
-    </para>
-
-<screen><userinput>sed 's@#include &lt;stdio\.h&gt;@#include &lt;sys/stat.h&gt;\n#include &lt;stdio.h&gt;@' \
-    -i src/helpers/job-drive-detach.c</userinput></screen>
-
-    <para>
-      Install <application>UDisks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make profiledir=/etc/bash_completion.d install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          udisks,
-          udisks-daemon,
-          udisks-tcp-bridge, and
-          umount.udisks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/udisks and
-          /var/lib/udisks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udisks-prog">
-        <term><command>udisks</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface for the
-            <application>UDisks</application> Daemon.
-          </para>
-          <indexterm zone="udisks udisks-prog">
-            <primary sortas="b-udisks">udisks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udisks-tcp-bridge">
-        <term><command>udisks-tcp-bridge</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> TCP/IP bridge.
-          </para>
-          <indexterm zone="udisks udisks-tcp-bridge">
-            <primary sortas="b-udisks-tcp-bridge">udisks-tcp-bridge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udisks-daemon">
-        <term><command>udisks-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> Daemon.
-          </para>
-          <indexterm zone="udisks udisks-daemon">
-            <primary sortas="b-udisks-daemon">udisks-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/util-linux.xml
===================================================================
--- archive/util-linux.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,318 +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 util-linux-download-http "https://www.kernel.org/pub/linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-  <!ENTITY util-linux-download-ftp  " ">
-  <!ENTITY util-linux-md5sum        "d659bf7cd417d93dc609872f6334b019">
-  <!ENTITY util-linux-size          "5.4 MB">
-  <!ENTITY util-linux-buildsize     "60 MB">
-  <!ENTITY util-linux-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="util-linux" xreflabel="Util-linux-&util-linux-version;">
-  <?dbhtml filename="util-linux.html"?>
-
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Util-linux</title>
-
-    <para>
-      <application>Util-linux</application> was indeed installed in LFS and
-      there is no reason to reinstall it unless you installed
-      <application>Linux-PAM</application> after your LFS system was completed.
-      If you have installed <application>Linux-PAM</application>,
-      it's possible to build <command>su</command> and
-      <command>runuser</command> from <application>Util-linux</application>.
-      The <application>Shadow</application> maintainers recommend using
-      <command>su</command> from <application>Util-linux</application>
-      instead of the version from <application>Shadow</application>.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&util-linux-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&util-linux-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &util-linux-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &util-linux-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &util-linux-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &util-linux-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Util-linux Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="linux-pam"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/shadow"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <important>
-      <para>
-        The installation commands shown below are for installations where
-        <application>Linux-PAM</application> has been installed and
-        <application>Util-linux</application> is being rebuilt to
-        support the <application>Linux-PAM</application> installation.
-      </para>
-
-      <para>
-        If you are upgrading <application>Util-linux</application>, follow
-        the instruction for <application>Util-linux</application> in
-        <ulink url='&lfs-dev;/chapter08/util-linux.html'>LFS</ulink>.  If
-        <application>Linux-PAM</application> has been installed,
-        <command>su</command> and <command>runuser</command> will
-        automatically be built too.  You should follow
-        <xref linkend='pam-util-linux'/> to set up the PAM
-        configuration in this case.
-      </para>
-    </important>
-
-    <para>
-      Build <command>su</command> and <command>runuser</command> from
-      <application>Util-linux</application>:
-    </para>
-
-<screen><userinput>./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
-            --libdir=/usr/lib    \
-            --docdir=/usr/share/doc/util-linux-&util-linux-version; \
-            --disable-chfn-chsh  \
-            --disable-login      \
-            --disable-nologin    \
-            --disable-setpriv    \
-            --disable-pylibmount \
-            --disable-static     \
-            --without-python     \
-            runstatedir=/run     &amp;&amp;
-make su runuser</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>install -vm4755 su      /usr/bin/su
-install -vm0755 runuser /usr/sbin/runuser
-find /usr/share/man -name su.1 -delete
-install -vm0644 login-utils/{su,runuser}.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>find /usr/share/man -name su.1 -delete</command>: This
-      is used to remove the man pages for <command>su</command> installed
-      from <application>Shadow</application>.
-      <application>Shadow</application> installs man pages with multiple
-      languages. They need to be removed to prevent
-      <command>man su</command> from picking up a translated man page
-      instead of <filename>/usr/share/man/man1/su.1</filename>.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Linux-PAM to Work with Util-linux</title>
-
-    <sect3>
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/pam.d/su</filename>,
-        <filename>/etc/pam.d/su-l</filename>, and
-        <filename>/etc/pam.d/runuser</filename>
-      </para>
-
-      <indexterm zone="util-linux pam.d">
-        <primary sortas="e-etc-pam.d-su">/etc/pam.d/su</primary>
-      </indexterm>
-
-      <indexterm zone="util-linux pam.d">
-        <primary sortas="e-etc-pam.d-su">/etc/pam.d/su-l</primary>
-      </indexterm>
-
-      <indexterm zone="util-linux pam.d">
-        <primary sortas="e-etc-pam.d-su">/etc/pam.d/runuser</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 id='pam-util-linux'>
-      <title>Configuring the /etc/pam.d/ Files</title>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the following <application>Linux-PAM</application> configuration files
-        in the <filename class="directory">/etc/pam.d/</filename> directory
-        (or add the contents to the <filename>/etc/pam.conf</filename> file)
-        using the following commands:
-      </para>
-
-      <sect4>
-        <title>'su' and 'su-l'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/su &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/su
-
-# always allow root
-auth      sufficient  pam_rootok.so
-
-# Allow users in the wheel group to execute su without a password
-# disabled by default
-#auth      sufficient  pam_wheel.so trust use_uid
-
-# include system auth settings
-auth      include     system-auth
-
-# limit su to users in the wheel group
-auth      required    pam_wheel.so use_uid
-
-# include system account settings
-account   include     system-account
-
-# Set default environment variables for the service user
-session   required    pam_env.so
-
-# include system session settings
-session   include     system-session
-
-# End /etc/pam.d/su</literal>
-EOF
-ln -sv su /etc/pam.d/su-l</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>'runuser'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/runuser &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/runuser
-
-auth      sufficient  pam_rootok.so
-session   include     system-session
-
-# End /etc/pam.d/runuser</literal>
-EOF</userinput></screen>
-
-        <warning>
-          <para>
-            At this point, you should do a simple test to see if
-            <command>su</command> is working as expected. Open
-            another terminal and log in as a user, then
-            <command>su</command> to
-            <systemitem class="username">root</systemitem>.
-            If you do not see any errors, then all is well.
-            If you did receive errors, stop now and double check the
-            above configuration files manually. One obvious reason
-            for an error is if the user is not in group <systemitem
-            class="groupname">wheel</systemitem>. You may want to run
-            (as <systemitem class="username">root</systemitem>):
-            <command>usermod -a -G wheel
-            <replaceable>&lt;user&gt;</replaceable></command>.
-            Any other error is the sign of an error in the above
-            procedure. You can also run the test suite from the
-            <application>Linux-PAM</application> package to assist you
-            in determining the cause of the problem.
-          </para>
-        </warning>
-      </sect4>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>
-      Listed below are the newly installed programs along with short
-      descriptions.
-    </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          su and runuser
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="su">
-        <term><command>su</command></term>
-        <listitem>
-          <para>
-            runs a command with substitute user and group ID
-          </para>
-          <indexterm zone="util-linux su">
-            <primary sortas="b-su">su</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runuser">
-        <term><command>runuser</command></term>
-        <listitem>
-          <para>
-            runs a command with substitute user and group ID; it's like
-            <command>su</command> but can only be used as
-            the <systemitem class='username'>root</systemitem> user.
-          </para>
-          <indexterm zone="util-linux runuser">
-            <primary sortas="b-util-linux-runuser">runuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/vino.xml
===================================================================
--- archive/vino.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +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 vino-download-http "&gnome-download-http;/vino/&gnome-minor-22;/vino-&vino-version;.tar.xz">
-  <!ENTITY vino-download-ftp  "&gnome-download-ftp;/vino/&gnome-minor-22;/vino-&vino-version;.tar.xz">
-  <!ENTITY vino-md5sum        "7305feaa5cc9acb788d7a13389922012">
-  <!ENTITY vino-size          "752 KB">
-  <!ENTITY vino-buildsize     "19 MB">
-  <!ENTITY vino-time          "0.2 SBU">
-]>
-
-<sect1 id="vino" xreflabel="Vino-&vino-version;">
-  <?dbhtml filename="vino.html"?>
-
-
-  <title>Vino-&vino-version;</title>
-
-  <indexterm zone="vino">
-    <primary sortas="a-Vino">Vino</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vino</title>
-
-    <para>
-      The <application>Vino</application> package is a VNC server for
-      <application>GNOME</application>. VNC is a protocol that allows remote
-      display of a user's desktop.
-    </para>
-
-    &lfs90_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vino-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vino-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vino-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vino-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vino-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vino-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vino Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnutls"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libsecret"/>, and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/vino"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vino</title>
-
-    <para>
-      Install <application>Vino</application> by running the following
-      commands:
-    </para>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --with-systemduserunitdir=no &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-
-      <seglistitem>
-        <seg>
-          vino-server
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vino-server">
-        <term><command>vino-server</command></term>
-        <listitem>
-          <para>
-            is the <application>Vino</application> VNC server.
-          </para>
-          <indexterm zone="vino vino-server">
-            <primary sortas="b-vino-server">vino-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/virtuoso.xml
===================================================================
--- archive/virtuoso.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,293 +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 virtuoso-download-http "&sourceforge-repo;/virtuoso/virtuoso-opensource-&virtuoso-version;.tar.gz">
-  <!ENTITY virtuoso-download-ftp  " ">
-  <!ENTITY virtuoso-md5sum        "94ef4f93cad915f73bee547fe95db725">
-  <!ENTITY virtuoso-size          "113 MB">
-  <!ENTITY virtuoso-buildsize     "895 MB (additional 2 GB to run the test suite)">
-  <!ENTITY virtuoso-time          "3.3 SBU (additional 22 SBU to run the test suite)">
-]>
-
-<sect1 id="virtuoso" xreflabel="Virtuoso-&virtuoso-version;">
-  <?dbhtml filename="virtuoso.html"?>
-
-
-  <title>Virtuoso-&virtuoso-version;</title>
-
-  <indexterm zone="virtuoso">
-    <primary sortas="a-Virtuoso">Virtuoso</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Virtuoso</title>
-
-    <para><application>Virtuoso</application> is a cross-platform server that
-    implements multiple server-side protocols as part of a single-server product
-    offering. There is one server product that offers WebDAV/HTTP, Application,
-    and Database-server functionality alongside Native XML Storage, Universal
-    Data-Access Middleware, Business Process Integration and a Web-Services
-    Platform.</para>
-
-    &lfs75_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&virtuoso-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&virtuoso-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &virtuoso-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &virtuoso-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &virtuoso-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &virtuoso-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Virtuoso Dependencies</bridgehead>
-<!-- No longer needed?
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="net-tools"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="libiodbc"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="openssl"/>, and
-    <xref linkend="openldap"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="imagemagick"/>,
-    <xref linkend="python2"/>, and
-    <xref linkend="mitkrb"/>
-    <!-- Currently broken
-    <xref linkend="php"/>
-    <xref linkend="ruby"/>
-    <ulink url="https://libwbxml.opensync.org/">libwbxml</ulink
-    -->
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/virtuoso"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Virtuoso</title>
-
-    <para>Install <application>virtuoso</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i "s|virt_iodbc_dir/include|&amp;/iodbc|" configure  &amp;&amp;
-./configure --prefix=/usr                             \
-            --sysconfdir=/etc                         \
-            --localstatedir=/var                      \
-            --with-iodbc=/usr                         \
-            --with-readline                           \
-            --without-internal-zlib                   \
-            --program-transform-name="s/isql/isql-v/" \
-            --disable-all-vads                        \
-            --disable-static                          &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make -k check</command>.
-    Some tests are known to fail.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/virtuoso-&virtuoso-version; &amp;&amp;
-ln -s   -v          ../../virtuoso/doc \
-                    /usr/share/doc/virtuoso-&virtuoso-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ...</command>: This command is used to modify the
-    <envar>CPPFLAGS</envar> variable so that the <application>libiodbc</application>
-    interface headers are found by the <command>configure</command> script.</para>
-
-    <para><parameter>--with-iodbc=/usr</parameter>: This parameter is used so
-    that the build will use the system <application>libiodbc</application> interface
-    headers and not the headers in the source tree.</para>
-
-    <para><parameter>--with-readline</parameter>: This parameter is used so that
-    the system <application>Readline</application> library is used.</para>
-
-    <para><parameter>--without-internal-zlib</parameter>: This parameter is set
-    so that the installed <application>zlib</application> library is used and
-    not the bundled one.</para>
-
-    <para><parameter>--program-transform-name</parameter>: Both
-    <application>Virtuoso</application> and <application>unixODBC</application>
-    install a program named <command>isql</command>. Use this parameter to rename
-    <application>virtuoso</application>s program to <command>isql-v</command>.</para>
-
-    <para><parameter>--disable-all-vads</parameter>: This parameter disables
-    building all the VAD packages (tutorials, demos, etc.).</para>
-
-    <para><parameter>--disable-static</parameter>: This option disables building
-    static libraries. However, the main <application>Virtuoso</application>
-    libraries, <filename class="libraryfile">libvirtuoso-t</filename> and
-    <filename class="libraryfile">libvirtuoso-iodbc-t</filename> are still
-    built as static libraries.</para>
-
-    <para><option>--enable-python</option>: Add this option if
-    <application>Python</application> is installed to enable building
-    <application>Python</application> bindings.</para>
-
-<!-- broken with JDK-version7
-    <para><option>-&#45;with-jdk4</option>: Add this option to specify the path
-    to the <xref linkend="jdk"/> and to enable making use of Java.</para>
--->
-
-    <para><option>--with-port</option>: Add this if you want the
-    <application>Virtuoso</application> server to listen on a port other than
-    1111.</para>
-
-    <para><option>--enable-aio</option>: Add this if you want
-    <application>Virtuoso</application> to perform asynchronous file I/O
-    operations instead of synchronous file I/O.</para>
-
-    <para><option>--enable-perl</option>: Do not use this option if you built
-    Perl according to the LFS instructions. The build will fail with a note
-    similar to <computeroutput>Your perl should be compiled w -Dusemultiplicity.
-    Check the output of perl -V:usemultiplicity</computeroutput>.</para>
-
-    <para>Note that passing the <option>with-jdk4=${JAVA_HOME}</option>,
-    <option>--enable-php5=/usr</option>, <option>--enable-ruby</option>, and
-    <option>--enable-wbxml2=/usr</option> options all will fail during the
-    <command>configure</command> phase of the build. They will not break
-    the build, but the desired support will not be included in the build.</para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuration</title>
-
-    <note><para>If <application>Virtuoso</application> is only to be used
-    for <application>KDE</application>, there is no need to start the
-    <application>Virtuoso</application> server at boot time.</para></note>
-
-    <sect3 id="virtuoso-init">
-      <title>Boot Script</title>
-
-      <para>If you want the <application>Virtuoso</application> server to
-      start automatically when the system is booted, install the
-      <filename>/etc/rc.d/init.d/virtuoso</filename> init script included
-      in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="virtuoso virtuoso-init">
-        <primary sortas="f-virtuoso">virtuoso</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-virtuoso</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="virtuoso-users">
-      <title>User accounts</title>
-
-      <para>When the server is started using the start script, there is a web
-      interface to <application>Virtuoso</application> at
-      <ulink url="http://localhost:8890/"/>. Several links are pointing to
-      the OpenLink site, but the <application>Conductor</application> at
-      <ulink url="http://localhost:8890/conductor/"/>. This is a full featured
-      configuration site for <application>Virtuoso</application>. Login as
-      <systemitem class="username">dba</systemitem> with the predefined
-      password <literal>dba</literal>.</para>
-
-      <warning>
-        <title>Change password</title>
-
-        <para>Remember to immediately change the password of user
-        <systemitem class="username">dba</systemitem> as well as of all other
-        predefined users. Click on <literal>[System Admin]</literal> and
-        than on <literal>[User Accounts]</literal>.</para>
-
-      </warning>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          inifile, isql-v, isql-v-iodbc, isql-vw, isql-vw-iodbc, odbc_mail,
-          virt_mail, virtuoso-iodbc-t, and virtuoso-t
-        </seg>
-        <seg>
-          libvirtuoso-iodbc-t.a, libvirtuoso-t.a, virtodbc.so, virtodbc_r.so,
-          virtodbcu.so, and virtodbcu_r.so
-        </seg>
-        <seg>
-          /usr/lib/hibernate,
-          /usr/lib/jdbc-2.0,
-          /usr/lib/jdbc-3.0,
-          /usr/lib/jdbc-4.0,
-          /usr/lib/jdbc-4.1,
-          /usr/lib/jena,
-          /usr/lib/jena2,
-          /usr/lib/sesame,
-          /usr/lib/virtuoso
-          /usr/share/doc/virtuoso-&virtuoso-version;,
-          /usr/share/virtuoso, and
-          /var/lib/virtuoso
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="isql-v">
-        <term><command>isql-v</command></term>
-        <listitem>
-          <para>is an interactive SQL utility.</para>
-          <indexterm zone="virtuoso isql-v">
-            <primary sortas="b-isql-v">isql-v</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virtuoso-t">
-        <term><command>virtuoso-t</command></term>
-        <listitem>
-          <para>is the Universial Server daemon.</para>
-          <indexterm zone="virtuoso virtuoso-t">
-            <primary sortas="b-virtuoso-t">virtuoso-t</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/volume_key.xml
===================================================================
--- archive/volume_key.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +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 volume_key-download-http "https://github.com/felixonmars/volume_key/archive/volume_key-&volume_key-version;.tar.gz">
-  <!ENTITY volume_key-download-ftp  " ">
-  <!ENTITY volume_key-md5sum        "d1c76f24e08ddd8c1787687d0af5a814">
-  <!ENTITY volume_key-size          "196 KB">
-  <!ENTITY volume_key-buildsize     "11 MB">
-  <!ENTITY volume_key-time          "0.2 SBU">
-]>
-
-<sect1 id="volume_key" xreflabel="volume_key-&volume_key-version;">
-  <?dbhtml filename="volume_key.html"?>
-
-
-  <title>volume_key-&volume_key-version;</title>
-
-  <indexterm zone="volume_key">
-    <primary sortas="a-volume_key">volume_key</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to volume_key</title>
-
-    <para>
-      The <application>volume_key</application> package provides
-      a library for manipulating storage volume encryption keys and storing
-      them separately from volumes to handle forgotten passphrases.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&volume_key-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&volume_key-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &volume_key-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &volume_key-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &volume_key-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &volume_key-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">volume_key Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="glib2"/>,
-      <!-- To editors: if GnuPG is not installed, a wrong path to gpg will
-           be hard-coded into the library.  Even if GnuPG is installed, we
-           still need the 's/gpg2/gpg/' sed below.  I can't find an elegant
-           way to specify the path manually (so I can't make it a runtime
-           dependency).  -->
-	  <xref linkend="gnupg2"/>,
-      <xref linkend="gpgme"/>, and
-      <xref linkend="nss"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <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>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of volume_key</title>
-
-    <note>
-      <para>
-        This package expands to the directory
-        volume_key-volume_key-&volume_key-version;.
-      </para>
-    </note>
-
-    <para>
-      Tell the building system how to locate GPGME and GnuPG correctly:
-    </para>
-
-<screen><userinput remap='pre'>sed -e '/AM_PATH_GPGME/iAM_PATH_GPG_ERROR' \
-    -e 's/gpg2/gpg/' -i configure.ac</userinput></screen>
-
-    <para>
-      Install <application>volume_key</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoreconf -fiv              &amp;&amp;
-./configure --prefix=/usr    \
-            --without-python &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-python</parameter>: This parameter prevents building
-      the <application>Python 2</application> bindings, if <xref
-      linkend="python2"/> is installed.
-    </para>
-
-    <para>
-      <option>--without-python3</option>: Use this option if you do not want
-      to build the <application>Python 3</application> bindings. In this case,
-      <xref linkend="swig"/> is not needed.
-    </para>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          volume_key
-        </seg>
-        <seg>
-          libvolume_key.so
-        </seg>
-        <seg>
-          /usr/include/volume_key
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="volume_key-prog">
-        <term><command>volume_key</command></term>
-        <listitem>
-          <para>
-            manages encrypted volume keys and passphrases
-          </para>
-          <indexterm zone="volume_key volume_key-prog">
-            <primary sortas="b-volume_key">volume_key</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="volume_key-lib">
-        <term><filename class="libraryfile">volume_key.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for managing encrypted volume keys
-          </para>
-          <indexterm zone="volume_key volume_key-lib">
-            <primary sortas="c-volume_key">volume_key.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/w3m.xml
===================================================================
--- archive/w3m.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +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 w3m-download-http "&sourceforge-dl;/w3m/w3m-&w3m-version;.tar.gz">
-  <!ENTITY w3m-download-ftp  " ">
-  <!ENTITY w3m-md5sum        "1b845a983a50b8dec0169ac48479eacc">
-  <!ENTITY w3m-size          "2.1 MB">
-  <!ENTITY w3m-buildsize     "26 MB">
-  <!ENTITY w3m-time          "0.3 SBU">
-]>
-
-<sect1 id="w3m" xreflabel="w3m-&w3m-version;">
-  <?dbhtml filename="w3m.html"?>
-
-
-  <title>W3m-&w3m-version;</title>
-
-  <indexterm zone="w3m">
-    <primary sortas="a-W3m">W3m</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to W3m</title>
-
-    <para><application>w3m</application> is primarily a pager but it can
-    also be used as a text-mode WWW browser.</para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&w3m-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&w3m-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &w3m-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &w3m-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &w3m-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &w3m-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/w3m-&w3m-version;-bdwgc72-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">W3m Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gc"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gpm"/>,
-<!--      <xref linkend="openssl10"/>,-->
-      <xref linkend="imlib2"/>,
-      <xref linkend="gtk2"/>,
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/">Imlib</ulink>
-        (not recommended: obsolete, abandoned upstream,
-        <ulink url="http://bugs.debian.org/448360">buggy</ulink>, and gives no
-        additional functionality as compared to other image loading libraries),
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="compface"/>, and
-      <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
-      a Mail User Agent, and
-      an External Browser
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/W3M"/></para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of W3m</title>
-
-    <para>Install <application>w3m</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-2.patch      &amp;&amp;
-sed -i 's/file_handle/file_foo/' istream.{c,h}  &amp;&amp;
-sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
-sed -i '/USE_EGD/s/define/undef/' config.h.in   &amp;&amp;
-
-
-./configure --prefix=/usr --sysconfdir=/etc  &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;
-install -v -m644 -D doc/keymap.default /etc/w3m/keymap &amp;&amp;
-install -v -m644    doc/menu.default /etc/w3m/menu &amp;&amp;
-install -v -m755 -d /usr/share/doc/w3m-&w3m-version; &amp;&amp;
-install -v -m644    doc/{HISTORY,READ*,keymap.*,menu.*,*.html} \
-                    /usr/share/doc/w3m-&w3m-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -p1 &lt; ../w3m-&w3m-version;-bdwgc72-2.patch</command>:
-      This patch fixes compiling w3m with GC-7.2 and above installed.
-    </para>
-
-    <para><command>sed -i 's/file_handle/file_foo/' istream.{c,h}</command>:
-    This sed renames the file_handle function to avoid a clash with a glibc
-    function that has the same name, defined in
-    /usr/include/bits/fcntl.h.</para>
-
-    <para><command>sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#'
-    configure</command>: This sed fixes compiling <application>w3m</application>
-    using <xref linkend="gtk2"/> as its image library. It has no impact if
-    <xref linkend="gtk2"/> is not installed.</para>
-
-    <para>
-      <command>sed -i '/USE_EGD/s/define/undef/' config.h.in</command>: Allows
-      building against <application>openssl-1.1</application>.
-    </para>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This option puts the
-    configuration files in /etc.</para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring W3m</title>
-
-    <sect3 id="w3m-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/w3m/*</filename> and
-      <filename>~/.w3m/*</filename></para>
-
-      <indexterm zone="w3m w3m-config">
-        <primary sortas="e-etc-w3m/*">/etc/w3m/*</primary>
-      </indexterm>
-
-      <indexterm zone="w3m w3m-config">
-        <primary sortas="e-AA.w3m/*">~/.w3m/*</primary>
-      </indexterm>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>w3m and w3mman</seg>
-        <seg>None</seg>
-        <seg>/usr/libexec/w3m,
-             /usr/share/w3m, and
-             /usr/share/doc/w3m-&w3m-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="w3m-prog">
-        <term><command>w3m</command></term>
-        <listitem>
-          <para>is a text based web browser and pager.</para>
-          <indexterm zone="w3m w3m-prog">
-            <primary sortas="b-w3m">w3m</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="w3mman">
-         <!-- Don't remove the extra space, it prevent a FOP warning. -->
-        <term><command>w3mman</command> </term>
-        <listitem>
-          <para>is an interface to the on-line reference manuals in
-          <command>w3m</command>.</para>
-          <indexterm zone="w3m w3mman">
-            <primary sortas="b-w3mman">w3mman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: chive/webkitgtk.xml
===================================================================
--- archive/webkitgtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,256 +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 webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
-  <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
-  <!ENTITY webkitgtk-size          "8.3 MB">
-  <!ENTITY webkitgtk-buildsize     "650 MB">
-  <!ENTITY webkitgtk-time          "55 SBU">
-]>
-
-<sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
-  <?dbhtml filename="webkitgtk.html"?>
-
-
-  <title>WebKitGTK+-&webkitgtk-version;</title>
-
-  <indexterm zone="webkitgtk">
-    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK+</title>
-
-    <para>
-      The <application>WebKitGTK+</application> is the port of the portable
-      web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 2</application> platform.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue"/> and
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK+</title>
-
-    <para>
-      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
-      cause <command>make install</command> to fail:
-    </para>
-
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
-
-    <para>
-      Install <application>WebKitGTK+</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i '/parse-param/ a%lex-param {YYLEX_PARAM}' \
-             Source/ThirdParty/ANGLE/src/compiler/glslang.y &amp;&amp;
-patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
-./configure --prefix=/usr --with-gtk=2.0 --disable-webkit2  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there is a
-      useable basic graphical web browser in the source directory,
-      <application>Programs/GtkLauncher</application>. If it fails, there is a
-      problem with the build.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                    &amp;&amp;
-rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0    &amp;&amp;
-mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</command>:
-      There is a conflict with the directory installed with same name by
-      <xref linkend="webkitgtk2"/>.
-    </para>
-
-    <para>
-      <command>sed ... Source/ThirdParty/ANGLE/src/compiler/glslang.y</command>:
-      This command corrects a problem caused by the most recent version of
-      Bison.
-    </para>
-
-    <para>
-      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed.
-    </para>
-
-    <para>
-      <option>--disable-geolocation</option>: Use this option if you did not
-      install <xref linkend="geoclue"/> or <command>configure</command> will
-      fail.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jsc-1
-        </seg>
-        <seg>
-          libjavascriptcoregtk-1.0.so and libwebkitgtk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/webkit-1.0,
-          /usr/share/gtk-doc/html/webkitgtk-1.0 and
-          /usr/share/webkit-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jsc-1">
-        <term><command>jsc-1</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk jsc-1">
-            <primary sortas="b-jsc-1">jsc-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-1">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-1</command>
-            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-1">
-            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk libwebkitgtk-1">
-            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/webkitgtk2.xml
===================================================================
--- archive/webkitgtk2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,396 +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 webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
-  <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "1b3f18d4087dfc648e8060c14e16e202">
-  <!ENTITY webkitgtk2-size          "9.4 MB">
-  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
-  <!ENTITY webkitgtk2-time          "50 SBU (using parallelism=4, both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
-]>
-
-<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
-  <?dbhtml filename="webkitgtk2.html"?>
-
-
-  <title>WebKitGTK+-&webkitgtk2-version;</title>
-
-  <indexterm zone="webkitgtk2">
-    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK+</title>
-
-    <para>
-      The <application>WebKitGTK+</application> is the port of the portable web
-      rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> and/or <application>GTK+
-      2</application> platforms.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk2"/> or
-      <xref linkend="gtk3"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="which"/>
-    </para>
-
-    <note><para>
-      <application>WebKit2</application> links against<application>GTK+
-      2</application> (even if <application>GTK+ 3</application> is being
-      used), in order to be able to use NPAPI plugins such as Adobe Flash.
-    </para></note>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="llvm"/>,
-      <ulink url="http://freedesktop.org/wiki/Software/GeoClue/">GeoClue2</ulink>, and
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK+</title>
-
-    <para>
-      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
-      cause <command>make install</command> to fail:
-    </para>
-
-<screen><userinput>sed -e '/generate-gtkdoc --rebase/s:^:# :' \
-    -i GNUmakefile.in</userinput></screen>
-
-    <para>
-      Upstream standard now is to link this package against <application>GTK+
-      3</application>. However, for backward compatibility, many users need
-      also another instance, linked to  <application>GTK+ 2</application>. Both
-      can be installed in the same system, without any problems.  However, some
-      packages can alternatively be linked to either one. Here, both build
-      methods are presented and recommended to be built, but if you know which
-      one you need, just jump to the respective part.
-    </para>
-
-<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
-    <bridgehead renderas="sect3">Build and install
-    <application>WebKitGTK+</application> against <application>GTK+
-    3</application></bridgehead>
-
-    <para>
-      Install <application>WebKitGTK+</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -vp build-3           &amp;&amp;
-cp -a Documentation build-3 &amp;&amp;
-cd build-3                  &amp;&amp;
-
-../configure --prefix=/usr --enable-introspection &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there are two
-      useable basic graphical web browsers in the build directory,
-      <application>Programs/GtkLauncher</application> and
-      <application>Programs/MiniBrowser</application>. If launching any one
-      fails, there is a problem with the build.
-    </para>
-
-    <note><para>
-      When installing, the Makefile does some additional compiling and linking.
-      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
-      variables need to be defined for the root user.  If using sudo to assume
-      root, use the -E option to pass your current environment variables for the
-      install process.
-    </para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, leave the buid directory:
-    </para>
-
-<screen><userinput>cd ..</userinput></screen>
-
-<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
-    <bridgehead renderas="sect3">Build and install
-    <application>WebKitGTK+</application> against <application>GTK+
-    2</application></bridgehead>
-
-    <para>
-      Install <application>WebKitGTK+</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -vp build-1</userinput></screen>
-
-    <para>
-      If you have built and installed the package against <application>GTK+
-      3</application>. skip the following command, because the previous
-      docummentation also applies here:
-    </para>
-
-<screen><userinput>cp -a Documentation build-1</userinput></screen>
-
-    <para>
-      Now, change into the build directory and effectively start the build and
-      install:
-    </para>
-
-<screen><userinput>cd build-1  &amp;&amp;
-
-../configure --prefix=/usr  \
-             --with-gtk=2.0 \
-             --disable-webkit2 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there is one
-      useable basic graphical web browser in the build directory,
-      <application>Programs/GtkLauncher</application>. If launching it
-      fails, there is a problem with the build.
-    </para>
-
-    <note><para>
-      When installing, the Makefile does some additional compiling and linking.
-      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
-      variables need to be defined for the root user.  If using sudo to assume
-      root, use the -E option to pass your current environment variables for the
-      install process.
-    </para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, leave the buid directory:
-    </para>
-
-<screen><userinput>cd ..</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-introspection</option>: This switch enables support for
-      <application>Gobject Introspection</application> and is required for a
-      <application>GNOME</application> Desktop. Remove if you don't have
-      <application>Gobject Introspection</application> installed or you don't
-      want to install <application>GNOME</application>.
-    </para>
-
-    <para>
-      <option>--disable-geolocation</option>: Use this option if you did not
-      install <xref linkend="geoclue"/> or <command>configure</command> will
-      fail.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jsc-1 and jsc-3
-        </seg>
-        <seg>
-          libjavascriptcoregtk-{1,3}.0.so,
-          libwebkit2gtk-3.0.so, and
-          libwebkitgtk-{1,3}.0.so
-        </seg>
-        <seg>
-          /usr/include/webkitgtk-{1,3}.0,
-          /usr/lib/webkit2gtk-3.0,
-          /usr/share/gtk-doc/html/webkit{2,dom,}gtk, and
-          /usr/share/webkitgtk-{1,3}.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jsc-1">
-        <term><command>jsc-1</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-1">
-            <primary sortas="b-jsc-1">jsc-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsc-3">
-        <term><command>jsc-3</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-3">
-            <primary sortas="b-jsc-3">jsc-3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-1">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc-1</command> and <filename
-            class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1">
-            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-3">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc-3</command> and <filename
-            class="libraryfile">libwebkitgtk-3.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3">
-            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkitgtk-1">
-            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-3">
-        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkitgtk-3">
-            <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-3">
-        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkit2gtk-3">
-            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/webkitgtk2.xml-again
===================================================================
--- archive/webkitgtk2.xml-again	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,396 +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 webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
-  <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "24a25ccc30a7914ae50922aedf24b7bc">
-  <!ENTITY webkitgtk2-size          "9.5 MB">
-  <!ENTITY webkitgtk2-buildsize     "1.5 GB (both built)">
-  <!ENTITY webkitgtk2-time          "80 SBU (using parallelism=4, both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
-]>
-
-<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
-  <?dbhtml filename="webkitgtk2.html"?>
-
-
-  <title>WebKitGTK+-&webkitgtk2-version;</title>
-
-  <indexterm zone="webkitgtk2">
-    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK+</title>
-
-    <para>
-      The <application>WebKitGTK+</application> is the port of the portable
-      web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> and <application>GTK+ 2</application>
-      platforms.
-    </para>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch if using gcc-6 or later
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk2-version;-gcc6-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk3"/> or
-      <xref linkend="gtk2"/> or both,
-      <xref linkend="icu"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="which"/>
-    </para>
-
-    <note>
-      <para>
-        Note that WebKit2 links against <application>GTK+ 2</application>
-        (even if <application>GTK+ 3</application> is being used) in order
-        to be able to use NPAPI plugins such as Adobe Flash.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue2"/> or
-      <xref linkend="geoclue"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="llvm"/> and
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
-    </para>
-
-<!--    <caution>
-      <para>
-        The BLFS systemd development team is looking into archiving this
-        package due to ease of maintenance and incompatibility with GCC6.
-      </para>
-    </caution>-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK+</title>
-
-    <para>
-      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
-      cause <command>make install</command> to fail:
-    </para>
-
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
-
-    <para>
-      Fix a couple of compiler issues when built with GCC-6.1:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk2-version;-gcc6-1.patch</userinput></screen>
-
-    <note>
-      <para>
-        Unless noted otherwise, the packages depending on this package
-        expect it to be built against <application>GTK+ 3</application>.
-      </para>
-    </note>
-
-    <para>
-      To build <application>WebKitGTK+</application> against
-      <application>GTK+ 3</application>, run the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build3 &amp;&amp;
-pushd build3 &amp;&amp;
-CFLAGS="-fno-delete-null-pointer-checks"   \
-CXXFLAGS="-fno-delete-null-pointer-checks" \
-../configure --prefix=/usr --enable-introspection &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      To build <application>WebKitGTK+</application> against
-      <application>GTK+ 2</application>, run the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build2 &amp;&amp;
-pushd build2 &amp;&amp;
-CFLAGS="-fno-delete-null-pointer-checks"   \
-CXXFLAGS="-fno-delete-null-pointer-checks" \
-../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there are two
-      useable basic graphical web browsers in the build directory,
-      <application>Programs/GtkLauncher</application> and
-      <application>Programs/MiniBrowser</application>. If launching any one
-      fails, there is a problem with the build.
-    </para>
-
-    <para>
-      If you have built the package against <application>GTK+ 3</application>,
-      install it by running the following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C build3 install                             &amp;&amp;
-rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-3.0 &amp;&amp;
-if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
-  mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-3.0}
-fi
-if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
-  mv -v /usr/share/gtk-doc/html/webkitgtk{,-3.0}
-fi</userinput></screen>
-
-    <para>
-      If you have built the package against <application>GTK+ 2</application>,
-      install it by running the following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C build2 install                             &amp;&amp;
-rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-1.0 &amp;&amp;
-if [ -e /usr/share/gtk-doc/html/webkitdomgtk ]; then
-  mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-1.0}
-fi
-if [ -e /usr/share/gtk-doc/html/webkitgtk ]; then
-  mv -v /usr/share/gtk-doc/html/webkitgtk{,-1.0}
-fi</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-introspection</parameter>: This switch enables
-      <application>Gobject Introspection</application> bindings and is
-      required if building <application>GNOME</application> Desktop.
-      Remove if you don't have <application>Gobject
-      Introspection</application> installed or you don't want to install
-      <application>GNOME</application>. It is not needed if building
-      against <application>GTK+ 2</application>, although it can be used
-      if desired.
-    </para>
-
-    <para>
-      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These switches
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed.
-    </para>
-
-    <para>
-      <option>--disable-geolocation</option>: Use this switch if you don't
-      want to install <xref linkend="geoclue"/> or
-      <xref linkend="geoclue2"/>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jsc-3 <emphasis>or</emphasis> jsc-1
-        </seg>
-        <seg>
-          libjavascriptcoregtk-3.0.so,
-          libwebkit2gtk-3.0.so and
-          libwebkitgtk-3.0.so <emphasis>or</emphasis>
-          libjavascriptcoregtk-1.0.so and
-          libwebkitgtk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/webkitgtk-3.0,
-          /usr/lib/webkit2gtk-3.0,
-          /usr/share/gtk-doc/html/webkitgtk-3.0,
-          /usr/share/gtk-doc/html/webkitdomgtk-3.0,
-          /usr/share/gtk-doc/html/webkit2gtk and
-          /usr/share/webkitgtk-3.0 <emphasis>or</emphasis>
-          /usr/include/webkit-1.0,
-          /usr/share/gtk-doc/html/webkitgtk-1.0,
-          /usr/share/gtk-doc/html/webkitdomgtk-1.0 and
-          /usr/share/webkit-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jsc-3">
-        <term><command>jsc-3</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser linked against
-            <filename class="libraryfile">libjavascriptcoregtk-3.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-3">
-            <primary sortas="b-jsc-3">jsc-3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsc-1">
-        <term><command>jsc-1</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser linked against
-            <filename class="libraryfile">libjavascriptcoregtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-1">
-            <primary sortas="b-jsc-1">jsc-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-3.0">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-3</command>
-            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 libjavascriptcoregtk-3.0">
-            <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-3.0">
-        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkitgtk-3.0">
-            <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-3.0">
-        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkit2gtk-3.0">
-            <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-1.0">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-1</command>
-            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 libjavascriptcoregtk-1.0">
-            <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1.0">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk2 libwebkitgtk-1.0">
-            <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/weston.xml
===================================================================
--- archive/weston.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,392 +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 weston-download-http "http://wayland.freedesktop.org/releases/weston-&weston-version;.tar.xz">
-  <!ENTITY weston-download-ftp  " ">
-  <!ENTITY weston-md5sum        "310af6d7f8ba03c3418cec8ad72ea748">
-  <!ENTITY weston-size          "1.2 MB">
-  <!ENTITY weston-buildsize     "57 MB (with tests)">
-  <!ENTITY weston-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="weston" xreflabel="Weston-&weston-version;" revision="systemd">
-  <?dbhtml filename="weston.html"?>
-
-
-  <title>Weston-&weston-version;</title>
-
-  <indexterm zone="weston">
-    <primary sortas="a-Weston">Weston</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Weston</title>
-
-    <para>
-      <application>Weston</application> is the reference implementation of
-      a <application>Wayland</application> compositor, and a useful
-      compositor in its own right. It has various backends that lets it
-      run on Linux kernel modesetting and evdev input as well as under X11.
-      <application>Weston</application> also ships with a few example clients,
-      from simple clients that demonstrate certain aspects of the protocol
-      to more complete clients and a simplistic toolkit.
-    </para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&weston-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&weston-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &weston-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &weston-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &weston-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &weston-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Weston Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="mesa"/> (built with
-      <application>Wayland</application> support),
-      <xref linkend="mtdev"/>,
-      <xref linkend="wayland"/>, and
-      <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glu"/> (to build the screensaver client),
-      <xref linkend="linux-pam"/> (to build the
-      <command>weston-launch</command> utility),
-      <xref linkend="pango"/> (to build some demo clients),
-      <xref linkend="systemd"/>,
-      <xref linkend="xorg7-lib"/> (to build the X11
-      backend and X11 compatibility layer) and
-      <xref linkend="xorg-server"/> (with Xwayland, runtime
-      - for X11 backwards compatibility)
-    </para>
-
-    <note> 
-      <para>
-        The <command>weston-launch</command> utility is required if
-        you want to run <application>Weston</application> as a
-        non privileged user.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libva"/> (for H.264 VAAPI video encoding),
-      <xref linkend="libwebp"/>,
-      <ulink url="http://www.freerdp.com/">FreeRDP</ulink> and
-      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/weston"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Weston</title>
-
-    <para>
-      Install <application>Weston</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-demo-clients-install &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. The tests need
-      to be run from an X Terminal or equivalent.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-demo-clients-install</parameter>: This switch
-      enables the installation of the demo clients shipped with
-      <application>Weston</application>.
-    </para>
-
-    <note>
-      <para>
-        Consult <command>./configure --help</command> output for switches needed
-        to prevent <command>configure</command> from looking for some of the
-        recommended dependencies.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using Weston</title>
-
-    <para>
-      To start <application>Weston</application> as a X11 client,
-      from an X terminal, run the following command:
-    </para>
-
-<screen><userinput>weston</userinput></screen>
-
-    <para>
-      To run it as a DRM compositor, from a TTY, while logged
-      in as a normal user, run the following command:
-    </para>
-
-<screen><userinput>weston-launch</userinput></screen>
-
-    <para>
-      Note that <command>weston-launch</command> is a wrapper for
-      <command>weston</command>. If you need to pass a parameter
-      to <command>weston</command> while using
-      <command>weston-launch</command>, use the following syntax:
-    </para>
-
-<screen><userinput>weston-launch -- --backend=fbdev-backend.so</userinput></screen>
-
-    <para>
-      Note the -- between the <command>weston-launch</command> and
-      the <command>weston</command> parameter
-      <parameter>--backend=fbdev-backend.so</parameter>. For list
-      of parameters that you can pass to <command>weston</command>,
-      consult the <command>weston(1)</command> manual page.
-    </para>
-
-    <para>
-      To terminate <application>Weston</application> when running
-      as a DRM compositor, use the CTRL+ALT+Backspace
-      combination on your keyboard.
-    </para>
-
-    <para>
-      Note that the default backend, DRM, will only run if a
-      KMS driver is present on the system. It will not run in
-      a virtual machine such as VBox or Qemu and on NVidia or
-      AMD hardware with proprietary drivers. On these setups
-      it would be possible to use the FBDEV backend by running
-      the command described above.
-    </para>
-
-    <para>
-      Also note that the X11 backend requires a working EGL stack.
-      If you are running hardware that has no 3D support or
-      no EGL stack, you can't run accelerated applications
-      inside <application>Weston</application>. The latest
-      proprietary NVidia driver has the necessary EGL
-      stack needed to run <application>Weston</application>
-      as an X11 client, but it is not officially supported.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Weston</title>
-
-    <sect3 id="weston-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/weston.ini</filename>
-      </para>
-
-      <indexterm zone="weston weston-config">
-        <primary sortas="e-AA.config-weston.ini">~/.config/weston.ini</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <application>Weston</application> configuration file can be
-        used to configure which modules will be loaded, keyboard
-        layout, display resolution, touchpad behaviour, desktop shell
-        appearance, etc.
-      </para>
-
-      <para>
-        To change the keyboard layout inside <application>Weston</application>,
-        add the following to your config file:
-      </para>
-
-<screen><literal>[keyboard]
-keymap_model=pc105
-keymap_layout=de
-keymap_variant=euro
-keymap_options=grp:alt_shift_toggle</literal></screen>
-
-      <para>
-        For an explanation of each of the mentioned options,
-        consult the <command>xkeyboard-config(7)</command>
-        manual page.
-      </para>
-
-      <para>
-        To change the resolution of the compositor,
-        add the following to your config file:
-      </para>
-
-<screen><literal>[output]
-name=LVDS1
-mode=1366x768</literal></screen>
-
-      <para>
-        The name can be one of the following:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            DRM backend: LVDS1 (Laptop internal panel no.1)
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            DRM backend: VGA1 (VGA connector no.1)
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            X11 backend: X1 (X window no.1)
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Wayland backend: WL1 (Wayland window no.1)
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        For more information consult the
-        <command>weston-drm(7)</command> manual page.
-      </para>
-
-      <para>
-        To load a <application>Weston</application> module or a shell
-        backend, add the following to your config file:
-      </para>
-
-<screen><literal>[core]
-modules=xwayland.so
-shell=desktop-shell.so</literal></screen>
-
-      <para>
-        Note that you need to load the <filename>xwayland.so</filename>
-        module if you want to use X11 clients inside
-        <application>Weston</application>.
-      </para>
-
-      <para>
-        For a detailed list of configuration directives, consult the
-        <command>weston.ini(5)</command> manual page or examine the
-        <filename>weston.ini</filename> file inside the
-        <application>Weston</application> source directory.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wcap-decode, weston, weston-calibrator, weston-clickdot,
-          weston-cliptest, weston-dnd, weston-editor, weston-eventdemo,
-          weston-flower, weston-fullscreen, weston-image,
-          weston-info, weston-launch, weston-multi-resource,
-          weston-presentation-shm, weston-resizor, weston-scaler,
-          weston-simple-damage, weston-simple-dmabuf-intel,
-          weston-simple-dmabuf-v4l, weston-simple-egl, weston-simple-shm,
-          weston-simple-touch, weston-smoke, weston-stacking,
-          weston-subsurfaces, weston-terminal and weston-transformed
-        </seg>
-        <seg>
-          libweston-1.so and libweston-desktop-1.so
-        </seg>
-        <seg>
-          /usr/include/{libweston-1,weston}
-          /usr/lib/{libweston-1,weston},
-          /usr/share/wayland-sessions and
-          /usr/share/weston
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="weston-prog">
-        <term><command>weston</command></term>
-        <listitem>
-          <para>
-            is the reference implementation of a Wayland server.
-          </para>
-          <indexterm zone="weston weston-prog">
-            <primary sortas="b-weston">weston</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/wicd.xml
===================================================================
--- archive/wicd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,325 +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 wicd-download-http "https://launchpad.net/wicd/&wicd-major-version;/&wicd-version;/+download/wicd-&wicd-version;.tar.gz">
-  <!ENTITY wicd-download-ftp  " ">
-  <!ENTITY wicd-md5sum        "aaa2e9f5320849e0b5d053099a6f0007">
-  <!ENTITY wicd-size          "536 KB">
-  <!ENTITY wicd-buildsize     "4.2 MB">
-  <!ENTITY wicd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="wicd" xreflabel="Wicd-&wicd-version;">
-  <?dbhtml filename="wicd.html"?>
-
-
-  <title>Wicd-&wicd-version;</title>
-
-  <indexterm zone="wicd">
-    <primary sortas="a-wicd">wicd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wicd</title>
-
-    <para><application>Wicd</application> is a network manager written in
-    Python.  It simplifies network setup by automatically detecting and
-    connecting to wireless and wired networks. Wicd includes support for WPA
-    authentication and DHCP configuration. It provides Curses- and GTK-based
-    graphical frontends for user-friendly control. An excellent KDE-based
-    frontend is also available
-    <ulink url="http://projects.kde.org/projects/extragear/network/wicd-kde">
-    http://projects.kde.org/projects/extragear/network/wicd-kde</ulink>.
-    </para>
-
-    &lfs83_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&wicd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&wicd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &wicd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &wicd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &wicd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &wicd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wicd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="python2"/>,
-    <xref linkend="dbus-python"/>,
-    <xref linkend="wireless_tools"/>, and
-    <xref linkend="net-tools"/>
-    (Wicd needs <command>mii-tool</command> from this package)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="pygtk"/> (for the GTK frontend),
-    <xref linkend="wpa_supplicant"/> (for WPA support), and
-    <xref linkend="dhcpcd"/> or <xref linkend="dhcp"/> (for DHCP support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="pm-utils"/> (for suspend/resume integration),
-    <ulink url="http://urwid.org/">Urwid</ulink>
-    (for the Curses-based frontend), and
-    <ulink url="http://babel.edgewall.org/">Babel</ulink>
-    (for internationalization)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/wicd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wicd</title>
-
-    <para>Install <application>Wicd</application> by running the following
-    commands:</para>
-
-<screen revision="sysv"><userinput>sed -e "/wpath.logrotate\|wpath.systemd/d" \
-    -e "/detection failed/ a\                self.init='init/default/wicd'" \
-    -i.orig setup.py &amp;&amp;
-
-rm po/*.po           &amp;&amp;
-
-python setup.py configure --no-install-kde     \
-                          --no-install-acpi    \
-                          --no-install-pmutils \
-                          --no-install-init    \
-                          --no-install-gnome-shell-extensions \
-                          --docdir=/usr/share/doc/wicd-&wicd-version;</userinput></screen>
-
-<screen revision="systemd"><userinput>sed -e "/detection failed/ a\                self.init='init/default/wicd'" \
-    -i.orig setup.py &amp;&amp;
-
-rm po/*.po           &amp;&amp;
-
-python setup.py configure --no-install-kde     \
-                          --no-install-acpi    \
-                          --no-install-pmutils \
-                          --no-install-init    \
-                          --no-install-gnome-shell-extensions \
-                          --docdir=/usr/share/doc/wicd-&wicd-version;</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    install the package:</para>
-
-<screen role="root"><userinput>python setup.py install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para revision="sysv"><command>sed -e ... -i setup.py</command>: The first
-    expression in this <command>sed</command> command prevents installation of
-    logrotate and systemd configuration files. You may omit it if you use these
-    utilities. The second one fixes building with BLFS.</para>
-
-    <para revision="systemd"><command>sed ... -i.orig setup.py</command>: Fix
-    and issue while building with BLFS.</para>
-
-    <para><command>rm po/*.po</command>: This command removes the international
-    messages associated with this package.  The command is required unless Babel
-    is installed.  If it is installed, po/ast.po still needs to be removed in
-    order for the build to complete.</para>
-
-    <para><parameter>--no-install-kde</parameter>: Prevent installation of an
-    autostart desktop file for KDE. If you use KDE, you should instead install
-    the
-    <ulink url="http://projects.kde.org/projects/extragear/network/wicd-kde">Wicd
-    KDE Client</ulink>.</para>
-
-    <para><parameter>--no-install-acpi</parameter>: Prevent installation of
-    <command>suspend</command> and <command>resume</command> scripts for acpid.
-    Omit this option if you use acpid.</para>
-
-    <para><parameter>--no-install-pmutils</parameter>: Prevent installation of
-    hooks for pm-utils. Omit this option if you use pm-utils.</para>
-
-    <para revision="sysv"><parameter>--no-install-init</parameter>: Prevent
-    installation of any init scripts, as a bootscript is installed later in the
-    instructions.</para>
-
-    <para revision="systemd"><parameter>--no-install-init</parameter>: Prevent
-    installation of service files twice.  They are installed as a part of
-    the sed to setup.py.</para>
-
-    <para><parameter>--no-install-gnome-shell-extensions</parameter>: Prevent
-    installation of the respective extensions. Remove this switch, if you are
-    using Gnome Shell.</para>
-
-    <para><option>--wicdgroup=<replaceable>&lt;group&gt;</replaceable></option>:
-    The group that will have permission to use the Wicd client (default is the
-    <systemitem class="groupname">users</systemitem> group).</para>
-
-  </sect2>
-
-    <sect2 role="configuration">
-    <title>Configuring Wicd</title>
-
-    <sect3 id="wicd-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/wicd/manager-settings.conf</filename>,
-      <filename>/etc/wicd/wired-settings.conf</filename> and
-      <filename>/etc/wicd/wireless-settings.conf</filename></para>
-
-    </sect3>
-
-    <sect3 id="wicd-init">
-      <title>Configuration Information</title>
-
-      <note revision="systemd">
-        <para>
-          Make sure that you disable the <command>systemd-networkd</command>
-          service or configure it not to manage the interfaces you want to
-          manage with <application>Wicd</application>.
-        </para>
-      </note>
-
-      <para revision="sysv">To automatically start Wicd at boot time, you need
-      to first install the Wicd bootscript,
-      <filename>/etc/rc.d/init.d/wicd</filename> included in the <xref
-      linkend="bootscripts"/> package (as user <systemitem
-      class="username">root</systemitem>):</para>
-
-      <indexterm zone="wicd wicd-init" revision="sysv">
-        <primary sortas="f-wicd">wicd (bootscript)</primary>
-      </indexterm>
-
-      <screen role='root' revision="sysv"><userinput>make install-wicd</userinput></screen>
-
-      <para revision="sysv">Since Wicd will now handle all configuration of
-      network devices, the network bootscript installed by LFS should be
-      disabled. This can be achieved by either removing any
-      <filename>S*network</filename> and <filename>K*network</filename>
-      symlinks in the <filename>/etc/rc*.d</filename> directories or by setting
-      <literal>ONBOOT=no</literal> in any
-      <filename>/etc/sysconfig/ifconfig.*</filename> files.</para>
-
-      <para revision="systemd">To enable wicd at boot time, as the
-      <systemitem class="username">root</systemitem> user, run:</para>
-
-      <screen role='root' revision="systemd"><userinput>systemctl enable wicd</userinput></screen>
-
-      <para>No manual configuration of Wicd is needed if you use the graphical
-      frontends. If you are only going to use Wicd from command-line, you can
-      configure it using the configuration files in
-      <filename>/etc/wicd</filename>. For a list of available options, look at
-      the man-pages for: wicd-manager-settings.conf, wicd-wired-settings.conf
-      and wicd-wireless-settings.conf.</para>
-
-      <para>Be sure to add all users who are to have rights to open and close
-      network connections with Wicd to the
-      <systemitem class="groupname">users</systemitem> group (or the group
-      specified with the <option>--wicdgroup</option> configuration
-      option).</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>wicd, wicd-cli, wicd-client, wicd-curses (not functional if <ulink
-        url="http://urwid.org/">Urwid</ulink> is not installed), and
-        wicd-gtk</seg>
-        <seg>None</seg>
-        <seg>/{etc,usr/share,var/lib,var/log,var/run}/wicd,
-        /usr/lib/python2.7/site-packages/wicd and
-        /usr/share/doc/wicd-&wicd-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wicdd">
-        <term><command>wicd</command></term>
-        <listitem>
-          <para>is the wicd daemon.</para>
-          <indexterm zone="wicd wicdd">
-            <primary sortas="b-wicdd">wicd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wicd-cli">
-        <term><command>wicd-cli</command></term>
-        <listitem>
-          <para>is a command line interface for configuring the wicd daemon.</para>
-          <indexterm zone="wicd wicd-cli">
-            <primary sortas="b-wicd-cli">wicd-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wicd-client">
-        <term><command>wicd-client</command></term>
-        <listitem>
-          <para>is the wicd client. This script attempts to automatically choose
-          the relevant configuration interface.</para>
-          <indexterm zone="wicd wicd-client">
-            <primary sortas="b-wicd-client">wicd-client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wicd-curses">
-        <term><command>wicd-curses</command></term>
-        <listitem>
-          <para>is a curses interface for configuring the wicd daemon.</para>
-          <indexterm zone="wicd wicd-curses">
-            <primary sortas="b-wicd-curses">wicd-curses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wicd-gtk">
-        <term><command>wicd-gtk</command></term>
-        <listitem>
-          <para>is a GTK interface for configuring the wicd daemon</para>
-          <indexterm zone="wicd wicd-gtk">
-            <primary sortas="b-wicd-gtk">wicd-gtk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/wpebackend-fdo.xml
===================================================================
--- archive/wpebackend-fdo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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        "dafd899646b2e31ef2d97938a638c48d">
-  <!ENTITY wpebackend-fdo-size          "44 KB">
-  <!ENTITY wpebackend-fdo-buildsize     "1.7 MB">
-  <!ENTITY wpebackend-fdo-time          "0.1 SBU">
-]>
-
-<sect1 id="wpebackend-fdo" xreflabel="wpebackend-fdo-&wpebackend-fdo-version;">
-  <?dbhtml filename="wpebackend-fdo.html"?>
-
-
-  <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>
-
-    &lfs121_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>
-
-  </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 setup --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: chive/x-config.xml
===================================================================
--- archive/x-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +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="x-config">
-  <?dbhtml filename="xconfig.html"?>
-
-
-  <title>Additional X Window System Configuration</title>
-
-  <para>Below you will find information on fine tuning the components
-  of the <application>X Window System</application>. The documentation
-  links are specifically for <application>XFree86</application>,
-  which has been retired in BLFS, however, the
-  information contained in those documents usually pertains to
-  <application>Xorg</application> as well.  Detailed descriptions are also
-  located in the <filename>xorg.conf</filename> man page.</para>
-
-  <sect2 id='xinput'>
-    <title>Setting up X Input Devices</title>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/XInputDevices"/></para>
-
-    <sect3 id='xkeyboard'>
-      <title>Keyboards</title>
-
-      <para>The following external links provide a good introduction
-      to setting up various keyboards.</para>
-
-      <para><ulink url="http://www.xfree86.org/current/XKB-Config.html">The
-      <application>XKB</application> Configuration Guide</ulink></para>
-
-      <para><ulink url="http://www.xfree86.org/current/XKB-Enhancing.html">How
-      to further enhance <application>XKB</application>
-      configuration</ulink></para>
-
-    </sect3>
-
-    <sect3 id='xmice'>
-      <title>Mice</title>
-
-      <para>Multi-button mice can be used to their full potential by mapping
-      the additional buttons to X button events. Wheel mice are a common example.
-      The ordinary ones contain two buttons, and a scroll wheel that doubles as
-      a third button.  As far as <application>X</application> is concerned, there
-      are 5 buttons as it counts the 'scroll up' and 'scroll down' functions
-      (internally they are buttons). Here is an example 'InputDevice' section for
-      a typical PS/2 wheel mouse:</para>
-
-<screen><literal>Section "InputDevice"
-  Identifier  "Mouse 0"
-  Driver      "mouse"
-  Option      "Device"        "/dev/input/mice"
-  Option      "Protocol"      "IMPS/2"
-  Option      "ZAxisMapping"  "4 5"
-  Option      "Buttons"       "5"
-EndSection</literal></screen>
-
-      <para>Button assignments differ for every mouse type. On more exotic
-      mice, you may find that the rocker wheel buttons are 6 and 7. Simply
-      add those values to the <option>ZAxisMapping</option> option, and set
-      the <option>Buttons</option> option appropriately to enable side to
-      side scrolling. Additional information on button assignment can be
-      found in the following <application>XFree86</application>
-      document:</para>
-
-      <para><ulink url="http://www.xfree86.org/current/mouse.html">Mouse
-      Support in <application>XFree86</application></ulink></para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id='xdisplay'>
-    <title>Fine Tuning Display Settings</title>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xdisplay"/></para>
-
-    <sect3>
-      <title>The 'Monitor' Section</title>
-
-      <para>One or more monitor sections specify the characteristics of your
-      monitor(s).  Usually, the setup program can probe your monitor and setup
-      a monitor properly, however, this does not always work.  The most common
-      entries that need to be updated are <option>HorizSync</option> and
-      <option>VertRefresh</option>.  If the configuration program does not set
-      these properly, you will notice a resolution much lower than desired.
-      The default <option>HorizSync</option> setting is 28-33kHz which is very
-      conservative.  The default  <option>VertRefresh</option> is 43-72Hz.
-      Consult your monitor documentation or search online for the proper
-      settings for your monitor.</para>
-
-      <para>It is also possible to control many detailed timing characteristics
-      of a monitor with a <option>Modeline</option> setting.  Most users will
-      not need to do this, but details are in the man page referenced above.
-      </para>
-
-      <warning><para>Incorrect monitor settings can destroy your monitor or
-      even set it on fire!  For most newer monitors, the result of overly
-      aggressive settings is a blank screen, but older monitors do not all have
-      built in safeguards.</para></warning>
-
-      <para>Other items that may be of interest in this section is the
-      <option>DPMS</option> and associated <option>StandbyTime</option>,
-      <option>SuspendTime</option>, and <option>OffTime</option> options.
-      These parameters control the energy saving features of your monitor.  They
-      may also be controlled at runtime with the <command>xset</command> command
-      or via a graphical interface such as <application>KDE</application>'s
-      Control Center.</para>
-
-      <para>A typical monitor section will normally look like:</para>
-
-<screen><literal>Section "Monitor"
-    DisplaySize   400   300 # mm
-    Identifier   "Monitor0"
-    VendorName   "VSC"
-    ModelName    "G810-2"
-    HorizSync     30.0 - 92.0
-    VertRefresh   50.0 - 180.0
-    Option       "DPMS"
-    Option       "StandbyTime" "10"
-    Option       "SuspendTime" "20"
-    Option       "OffTime"     "30"
-EndSection</literal></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>The 'Device' Section</title>
-
-      <para>This section basically controls your video card. The key entry is
-      the <option>Driver</option> setting.  This can be a driver from the
-      <application>X</application> distribution you are using, from the kernel
-      source, or a proprietary driver for devices such as a Nvidia graphics
-      adaptor.  The driver often is a kernel module or built into the kernel
-      itself, but there are also separate non-kernel components usually found
-      in the <filename
-      class='directory'>/usr/X11R6/lib/modules/drivers/</filename> directory.
-      These were either built with the <application>X</application> server or
-      installed via external (i.e., proprietary) programs.</para>
-
-      <para>There are many options for device drivers and most are specific to
-      the driver being used.  Documentation for many drivers can be found at
-      the <ulink url="http://www.xfree86.org/current/manindex4.html">XFree86
-      Driver Manual Pages</ulink>.</para>
-
-      <para>A typical Device section will look like:</para>
-
-<screen><literal>Section "Device"
-    Identifier  "Videocard0"
-    Driver      "radeon"
-    VendorName  "Videocard vendor"
-    BoardName   "ATI Radeon 7500"
-EndSection</literal></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id='xlayouts'>
-    <title>Display Layouts</title>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xlayouts"/></para>
-
-    <para>Within the <application>X Window System</application> configuration
-    file there may be multiple layout sections like:</para>
-
-<screen><literal>Section "ServerLayout"
-    Identifier     "X.org Configured"
-    Screen      0  "Screen0" 0 0
-    InputDevice    "Mouse0" "CorePointer"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection</literal></screen>
-
-    <para>The default layout is the first, but if you have special needs,
-    you can create others with different configurations.  The
-    <option>Identifier</option> line in each section is the key.  Different
-    layouts can be created using different Screen and InputDevice sections.</para>
-
-    <para>After the configuration file is updated, an alternate configuration
-    can be specified on the <command>startx</command> line.  For instance,
-    to start <application>X</application> with an alternate layout with an
-    Identifier of "layout2", use the following command line:</para>
-
-<screen><command>startx -- -layout layout2</command></screen>
-
-
-  </sect2>
-
-</sect1>
Index: chive/x-setup.xml
===================================================================
--- archive/x-setup.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,633 +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="x-setup" xreflabel="X Window System Components">
-  <?dbhtml filename="x-setup.html"?>
-
-
-  <title>X Window System Components</title>
-
-  <para condition="html" role="usernotes">User Notes:
-  <ulink url='&blfs-wiki;/XWindowSystemComponents'/></para>
-
-  <sect2 role="configuration" id='X11R6-compat-symlink'
-         xreflabel="Creating an X11R6 Compatibility Symlink">
-
-    <title>Creating an X11R6 Compatibility Symlink</title>
-
-    <para>Until recently (relatively speaking) almost every
-    <application>X Window</application> installation you performed or came
-    across was installed in the
-    <filename class='directory'>/usr/X11R6</filename> directory. That was the
-    standard for years. Developers picked up on this and wrote their package
-    installation scripts looking for <application>X</application> in the
-    standard location. Things have changed and the trend is to now install
-    <application>X</application> in
-    <filename class='directory'>/usr</filename>. Some people want to install
-    it in a custom location.</para>
-
-    <para>Many package developers have not caught up to the change and their
-    packages are still trying to find <application>X</application> in
-    <filename class='directory'>/usr/X11R6</filename> and subsequently fail
-    when you try to build the package. Though for most packages it is not
-    difficult to 'hack' the installation script to fix the problem, that is not
-    the long term solution to the problem. Upstream developers need to modernize
-    their installation scripts and eliminate the problem altogether.</para>
-
-    <para>Until then, you can create a symbolic link to satisfy the
-    <filename class='directory'>/usr/X11R6</filename> requirement so that you
-    won't be inconvenienced with a package build failure due to this known
-    issue. If you wish to create the symlink, issue the following command as
-    the <systemitem class="username">root</systemitem> user (ensure you modify
-    <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> appropriately):</para>
-
-<screen role="root"><userinput>ln -vsf <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> /usr/X11R6</userinput></screen>
-
-<!--    <para>Packages in Xorg store their configuration files in
-    <filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
-    This is strictly against FHS guidelines.  Correct the installation
-    <filename class="directory">/etc/X11</filename> and create symlinks
-    in the original location with the commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>mkdir -p /etc/X11 &amp;&amp;
-for file in $XORG_PREFIX/{lib/X11/xinit,share/X11/{app-defaults,twm}}
-do
-     mv -v $file /etc/X11/ 2&gt; /dev/null &amp;&amp;
-     ln -v -s /etc/X11/$(basename $file) $file
-done
-</userinput></screen>
--->
-
-  </sect2>
-
-  <sect2 role="configuration" id='xconfig'>
-    <title>Configuring The X Window System</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user
-    create a basic X Window System configuration file with the following
-    command:</para>
-
-<screen><userinput>cd ~ &amp;&amp;
-Xorg -configure</userinput></screen>
-
-    <indexterm zone="x-setup xconfig">
-      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
-    </indexterm>
-
-    <para>The screen will go blank and you may hear some clicking of the
-    monitor.  This command will create a file,
-    <filename>xorg.conf.new</filename>, in your home directory.</para>
-
-<!--
-    <para>Recent versions of <application>xorg-server</application> force the
-    use of the evdev input driver, and ignore legacy input devices defined in
-    <filename>xorg.conf</filename>.  This will result in an X display that
-    seems to lock up if you are using legacy input devices and do not have the
-    proper input configuration files in place (added later).  Add the following
-    lines to the new <application>Xorg</application> configuration file to
-    overcome this issue:</para>
-
-<screen><userinput>cat &gt;&gt; ~/xorg.conf.new &lt;&lt; "EOF"
-Section "ServerFlags"
-        Option "AllowEmptyInput" "false"
-EndSection
-EOF</userinput></screen>
--->
-
-    <para>Edit the newly created configuration file to suit your system. The
-    details of the files are located in the <filename>xorg.conf.5x</filename>
-    man page.  Some things you may want to do are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Section "Files". Change the order of the font paths searched.
-        You may want to put 75dpi fonts ahead of 100dpi fonts if your system
-        normally comes up closer to 75 dots per inch. You may want to remove
-        some font directories completely.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Module". If you are going to install NVIDIA
-        drivers, remove the "dri" line.</para>
-      </listitem>
-      <listitem>
-        <para>Sections "InputDevice". You may want to change the
-        keyboard autorepeat rate by adding
-        <option>Option "Autorepeat" "250 30"</option>.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Monitor". Specify the <option>VertRefresh</option>
-        and <option>HorizSync</option> values if the system does not
-        automatically detect the monitor and its values.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Device". You may want to set some of the options
-        available for your selected video driver. A description of the driver
-        parameters is in the man page for your driver.</para>
-      </listitem>
-      <listitem><para>Section "Screen". Add a DefaultDepth statement such as:
-        <option>DefaultDepth 24</option>. In the SubSection for your
-        default depth, add a modes line such as:
-        <option>Modes "1600x1200" "1280x1024" "1024x768"</option>. The first
-        mode listed will normally be the starting resolution.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Test the system with the following command:</para>
-
-<screen><userinput>X -retro -config ~/xorg.conf.new</userinput></screen>
-
-    <para>You will only get a gray background with an X-shaped mouse cursor,
-    but it confirms the system is working. Exit with
-    <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
-    a look at <filename>/var/log/Xorg.0.log</filename> to see what went
-    wrong.</para>
-
-    <para>As the <systemitem class="username">root</systemitem> user, move the
-    configuration file to the new directory:</para>
-
-<screen role="root"><userinput>install -v -m644 ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-    <filename>.xinitrc</filename>:</para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># Begin .xinitrc file
-xterm  -g 80x40+0+0   &amp;
-xclock -g 100x100-0+0 &amp;
-twm</literal>
-EOF</userinput></screen>
-
-    <para>This provides an initial screen with a small clock that is
-    managed by a simple window manager, Tab Window Manager. For details of
-    <command>twm</command>, see the man page.</para>
-
-    <indexterm zone="x-setup xconfig">
-      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-    </indexterm>
-
-    <note>
-      <para>Both the default, and the BLFS configuration for
-      <application>Xorg</application> include <application>xterm</application>.
-      <application>Xorg</application>'s modular distribution no longer includes
-      <application>xterm</application>, and
-      as a result, the <command>startx</command> command will fail if you have
-      not installed <xref linkend="xterm2"/> when using the modular X Window
-      System.  You can remove the <application>xterm</application> line in the
-      above config file to test the xserver, or install one of the other
-      terminal emulators and make appropriate changes.</para>
-    </note>
-
-    <para>When needed, the X Window System creates the directory
-    <filename class='directory'>/tmp/.ICE-unix</filename> if it does not
-    exist. If this directory is not owned by
-    <systemitem class="username">root</systemitem>,
-    the X Window System delays startup by a few seconds and also
-    appends a warning to the logfile. This also affects startup of other
-    applications. To improve performance, it is advisable to manually create
-    the directory before the X Window System uses it. Add the file creation
-    to <filename>/etc/sysconfig/createfiles</filename> that is sourced by
-    the <filename>/etc/rc.d/init.d/cleanfs</filename> startup script.</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-/tmp/.ICE-unix dir 1777 root root
-EOF</userinput></screen>
-
-    <indexterm zone="x-setup xconfig">
-      <primary
-      sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
-    </indexterm>
-
-    <para>Start <application>X</application> with:</para>
-
-<screen><userinput>startx</userinput></screen>
-
-    <para>and a basic functional <application>X Window
-    System</application> should be displayed.</para>
-
-  </sect2>
-
-  <sect2 id='dri'>
-    <title>Checking Direct Rendering Infrastructure (DRI) Installation</title>
-
-    <indexterm zone="x-setup dri">
-      <primary sortas="g-DRI">DRI</primary>
-    </indexterm>
-
-    <para>DRI is a framework for allowing software to access graphics hardware
-    in a safe and efficient manner. It is installed in
-    <application>X</application> by default if you have a supported video card.
-    To enable direct rendering using the OpenGL implementation from
-    <xref linkend="mesalib"/> (built separately with <xref linkend="xorg7"/>
-    the "glx" and "dri" modules must be loaded.  Additionally, the created
-    device nodes in <filename class="directory">/dev/dri</filename> must
-    have proper permissions for your users.  A sample
-    <filename>xorg.conf</filename> file might look like this:</para>
-
-<screen><literal>Section "Module"
-    ...
-    Load  "glx"
-    Load  "dri"
-    ...
-EndSection
-...
-Section "DRI"
-    Group "video"
-    Mode  0660
-EndSection</literal></screen>
-
-    <para>The DRI devices are not accessible for any user except
-      <systemitem class="username">root</systemitem> and members of the
-      <systemitem class="groupname">video</systemitem> group. Add any users
-      that might use X to that group:</para>
-
-<screen role="root"><userinput>usermod -a -G video <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <note><para>DRI configuration may differ if you are using alternate
-    drivers, such as those from
-    <ulink url="http://www.nvidia.com/page/home.html">NVIDIA</ulink> or
-    <ulink url="http://www.ati.com/">ATI</ulink>.</para>
-    </note>
-
-    <para>To check if DRI is installed properly, check the log file
-    <filename>/var/log/Xorg.0.log</filename> for statements like:</para>
-
-<screen><literal>(II) R128(0): Direct rendering enabled</literal></screen>
-
-    <para>If you elected to install the Mesa-Demos package when installing
-    <xref linkend="mesalib"/>, from an <command>xterm</command>, run
-    <command>glxinfo</command> and look for the phrase:</para>
-
-<screen><computeroutput>direct rendering: Yes</computeroutput></screen>
-
-    <para>If direct rendering is not enabled, you can add verbosity by
-    running <command>LIBGL_DEBUG=verbose glxinfo</command>.  This will
-    show the drivers, device nodes and files used by the DRI system.</para>
-
-    <para>Again, if you have added the Mesa-Demos package, you can also
-    run the test program <command>glxgears</command>.
-    This program brings up a window with three gears turning.  The
-    <command>xterm</command> will display how many frames were drawn every
-    five seconds, so this is a reasonable benchmark.  The window is scalable,
-    and the frames drawn per second is highly dependent on the size of
-    the window.</para>
-
-    <indexterm zone="x-setup dri">
-      <primary sortas="b-glxgears">glxgears</primary>
-    </indexterm>
-
-    <indexterm zone="x-setup dri">
-      <primary sortas="b-glxinfo">glxinfo</primary>
-    </indexterm>
-
-    <para>For troubleshooting problems, check the DRI Users Guide at
-    <ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/>.</para>
-
-  </sect2>
-
-<!-- ================================================== -->
-
-  <sect2 id='fonts'>
-    <title>Setting up Fonts</title>
-
-    <para>There are two font systems in the
-    <application>X Window System</application>.  The first is the
-    core X font protocol, and the second is Xft.  Toolkits that use the core
-    X font protocol include Xt, Xaw, Motif clones and GTK+-1.2.  Toolkits that
-    use Xft include GTK+-2 and Qt and use <application>Fontconfig</application>
-    for control.  Both font systems should be configured for proper font
-    coverage in the <application>X Window System</application>.</para>
-
-    <indexterm zone="x-setup fonts">
-      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
-    </indexterm>
-
-    <sect3>
-      <title>Core X Font Protocol</title>
-
-      <indexterm zone="x-setup fonts">
-        <primary sortas="g-core-x-font">Core X Font Protocol</primary>
-      </indexterm>
-
-      <para>The core X font protocol finds fonts from the server configuration
-      file (<filename>xorg.conf</filename>).
-      If no font paths exist in the configuration file, the server will fall
-      back to an internal hard-coded path of
-      <filename class="directory">$XORG_PREFIX>/share/fonts/X11</filename>.
-      For each directory in the path, the server reads three files:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><filename>fonts.dir</filename> - maps font files to font
-          names&semi; updated with <command>mkfontdir</command></para>
-        </listitem>
-        <listitem>
-          <para><filename>fonts.alias</filename> - defines aliases (such as
-          "9x18") for existing fonts</para>
-        </listitem>
-        <listitem>
-          <para><filename>fonts.scale</filename> - lists scalable fonts&semi;
-          updated with <command>mkfontscale</command></para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The core X fonts protocol uses names such as
-      <systemitem>-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1</systemitem>.
-      These fonts are rendered by the <application>X</application> server
-      without antialiasing.  The server itself uses the "cursor" font for
-      painting the mouse cursor, and the protocol specification requires the
-      font "fixed" to be available.</para>
-
-      <para>Scalable fonts, such as Type1 and TrueType, are read from
-      <filename>fonts.scale</filename> files by the server.  The core X font
-      system uses the "freetype" module for non-antialiased rendering of these
-      fonts.  Ensure that the "freetype" module is loaded in the
-      <filename>xorg.conf</filename> file by adding it to the "Module"
-      section:</para>
-
-<screen><literal>Section "Module"
-    ...
-    Load  "freetype"
-    ...
-EndSection</literal></screen>
-
-      <para>The character set used is part of the font name, e.g. "-iso8859-1".
-      It is important that applications which support a non-English interface
-      specify the character set correctly so that the proper glyphs are used.
-      This can be controlled through the <application>X</application>
-      resources, which will be described later.</para>
-
-      <para>In some cases, applications rely upon the fonts named "fixed" or
-      something like "9x18".  In these cases, it is important that the
-      <filename>fonts.alias</filename> file specifies the correct character
-      set.  Users of ISO-8859-<replaceable>X</replaceable> encodings where
-      <replaceable>X</replaceable> != 1 should modify the
-      <filename>/usr/lib/X11/fonts/misc/fonts.alias</filename> file by
-      replacing the "iso8859-1" string with the proper encoding name.  This is
-      accomplished by running the following command as the <systemitem
-      class="username">root</systemitem> user, substituting the proper value
-      for <replaceable>&lt;X&gt;</replaceable>:</para>
-
-<screen role="root"><userinput>sed -i 's,iso8859-1\( \|$\),iso8859-<replaceable>&lt;X&gt;</replaceable>\1,g' \
-    /usr/lib/X11/fonts/{75dpi,100dpi,misc}/fonts.alias</userinput></screen>
-
-      <para>Users of Cyrillic fonts have properly defined aliases in
-      <filename>/usr/lib/X11/fonts/cyrillic/fonts.alias</filename>.  However,
-      this file will not be used unless the <filename
-      class="directory">/usr/lib/X11/fonts/cyrillic</filename> directory is
-      first in the font search path.  Otherwise, the
-      <filename>/usr/lib/X11/fonts/misc/fonts.alias</filename> file will be
-      used.</para>
-
-    </sect3>
-
-    <sect3 id="xft-font-protocol"  xreflabel="Xft Font Protocol">
-      <title>Xft Font Protocol</title>
-
-      <indexterm zone="x-setup fonts">
-        <primary sortas="g-truetype">TrueType Fonts</primary>
-      </indexterm>
-
-      <para>Xft provides antialiased font rendering through
-      <application>Freetype</application>, and fonts are controlled from the
-      client side using <application>Fontconfig</application>.  The default
-      search path is <filename class="directory">/usr/share/fonts</filename>
-      and <filename class="directory">~/.fonts</filename>.
-      <application>Fontconfig</application> searches directories in its
-      path recursively and maintains a cache of the font characteristics in
-      <filename>fonts.cache-1</filename> files in each directory.  If the cache
-      appears to be out of date, it is ignored, and information is (slowly)
-      fetched from the fonts themselves.  This cache
-      can be regenerated using the <command>fc-cache</command> command at any
-      time. You can see the list of fonts known by
-      <application>Fontconfig</application> by running the command
-      <command>fc-list</command>.</para>
-
-      <para>The <application>X</application> fonts were not installed in a
-      location known to <application>Fontconfig</application>. This prevents
-      <application>Fontconfig</application> from using the poorly rendered
-      Type 1 fonts or the non-scalable bitmapped fonts. Symlinks were created
-      from the <filename class="directory">OTF</filename> and <filename
-      class="directory">TTF</filename> <application>X</application> font
-      directories to <filename
-      class="directory">/usr/share/fonts/X11-{OTF,TTF}</filename>. This allows
-      <application>Fontconfig</application> to use the OpenType and TrueType
-      fonts provided by <application>X</application> (which are scalable and
-      of higher quality).</para>
-
-      <para><application>Fontconfig</application> uses names such as
-      "Monospace 12" to define fonts.  Applications generally use generic font
-      names such as "Monospace", "Sans" and "Serif".
-      <application>Fontconfig</application> resolves these names to a font that
-      has all characters that cover the orthography of the language indicated
-      by the locale settings.  Knowledge of these font names is included in
-      <filename>/etc/fonts/fonts.conf</filename>. Fonts that are not listed
-      in this file are still usable by <application>Fontconfig</application>,
-      but they will not be accessible by the generic family names.</para>
-
-      <para>Standard scalable fonts that come with <application>X</application>
-      provide very poor Unicode coverage.  You may notice in applications that
-      use <application>Xft</application> that some characters appear as a box
-      with four binary digits inside.  In this case, a font set with the
-      available glyphs has not been found.  Other times, applications that
-      don't use other font families by default and don't accept substitutions
-      from <application>Fontconfig</application> will display blank lines when
-      the default font doesn't cover the orthography of the user's language.
-      This happens, e.g., with <application>Fluxbox</application> in the
-      ru_RU.KOI8-R locale.</para>
-
-      <para>In order to provide greater Unicode coverage, it is recommended
-      that you install these fonts:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><ulink url="http://dejavu.sourceforge.net/">DejaVu fonts</ulink>
-          - These fonts are replacements for the Bitstream Vera fonts and
-          provide Latin-based scripts with accents and Cyrillic glyphs.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://download.savannah.nongnu.org/releases/freefont/">FreeFont</ulink>
-          - This set of fonts covers nearly every non-CJK character, but is not
-          visually pleasing.  <application>Fontconfig</application> will use it
-          as a last resort to substitute generic font family names.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://corefonts.sourceforge.net/">Microsoft Core fonts</ulink>
-          - These fonts provide slightly worse Unicode coverage than FreeFont,
-          but are better hinted.  Be sure to read the license before using
-          them. These fonts are listed in the
-          <filename>/etc/fonts/fonts.conf</filename> aliases by default.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://cle.linux.org.tw/fonts/FireFly">Firefly New Sung font</ulink>
-          - This font provides Chinese coverage. This font is not listed in
-          the <filename>/etc/fonts/fonts.conf</filename> aliases by default.
-          </para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://cle.linux.org.tw/fonts/Arphic">Arphic fonts</ulink> -
-          A similar set of Chinese fonts to the Firefly New Sung font.
-          These fonts are listed in the
-          <filename>/etc/fonts/fonts.conf</filename> aliases by default.
-          </para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://sourceforge.jp/projects/efont/">Kochi fonts</ulink> -
-          These provide Japanese characters, and they are listed in the aliases
-          in <filename>/etc/fonts/fonts.conf</filename> by default.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://kldp.net/projects/baekmuk/">Baekmuk fonts</ulink>
-          - These fonts provide Korean coverage, and they are listed in the
-          aliases in <filename>/etc/fonts/fonts.conf</filename> by default.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The list above will not provide complete Unicode coverage.  For
-      more information, please visit the <ulink
-      url="http://unifont.org/fontguide/">Unicode Font Guide</ulink>.</para>
-
-      <para>As an example, consider the installation of the DejaVu fonts.  From
-      the unpacked source directory, run the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/fonts/dejavu &amp;&amp;
-install -v -m644 *.ttf /usr/share/fonts/dejavu &amp;&amp;
-fc-cache -v /usr/share/fonts/dejavu</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-<!-- ================================================== -->
-
-  <sect2>
-    <title>Setting up Keyboards</title>
-
-    <para>In this version of <application>X</application>, non-Latin
-    keyboard layouts do not include Latin configurations as was previous
-    practice. To set up a keyboard for Latin and non-Latin input, change
-    the XkbLayout keyboard driver option in the InputDevice section
-    of the <filename>xorg.conf</filename> file. For example:</para>
-
-<screen><literal>Section "InputDevice"
-    Identifier          "Keyboard0"
-    Driver              "kbd"
-    Option "XkbModel"   "pc105"
-    Option "XkbLayout"  "en_US,ru"
-    Option "XkbOptions" "grp:switch,grp:alt_shift_toggle,grp_led:scroll"
-EndSection</literal></screen>
-
-    <para>In this example, you can use the <keycap>Alt+Shift</keycap>
-    combination to switch between keyboard layouts and use the Scroll Lock
-    LED to indicate when the second layout is active.</para>
-
-  </sect2>
-
-<!-- ================================================== -->
-<!--
-  <sect2 id='xdm'>
-    <title>Setting up XDM</title>
-
-    <para><command>xdm</command> provides a graphical logon capability and
-    is normally set up in <filename>/etc/inittab</filename>. Most of the
-    information you need to customize <command>xdm</command> is found in
-    its man page. To execute <command>xdm</command> during bootup, change
-    the initdefault level to 5 and add the following lines to
-    <filename>/etc/inittab</filename>:</para>
-
-    <indexterm zone="x-setup xdm">
-      <primary sortas="b-xdm">xdm</primary>
-    </indexterm>
-
-<screen><literal># Run xdm as a separate service
-x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</literal></screen>
-
-    <para>If <application>Linux-PAM</application> is installed on your
-    system, you should create a PAM entry for <command>xdm</command> by
-    duplicating the <command>login</command> entry using the following
-    command:</para>
-
-    <indexterm zone="x-setup xdm">
-      <primary sortas="e-etc-pam.d/xdm">/etc/pam.d/xdm</primary>
-    </indexterm>
-
-<screen role="root"><userinput>cp -v /etc/pam.d/login /etc/pam.d/xdm</userinput></screen>
-
-  </sect2>
--->
-
-<!-- ================================================== -->
-
-  <sect2 id='x-resources'>
-    <title>Using X Resources</title>
-
-    <para>There are many options that can be set in
-    <application>X</application> and <application>X</application>
-    clients via resources. Typically resources are set in the
-    <filename>~/.Xresources</filename> file.</para>
-
-    <para>The layout of the <filename>~/.Xresources</filename> file
-    consists of a list of specifications in the form of</para>
-
-    <indexterm zone="x-setup x-resources">
-      <primary sortas="e-AA.xresources">~/.Xresources</primary>
-    </indexterm>
-
-<screen><literal>object.subobject[.subobject...].attribute: value</literal></screen>
-
-    <para>Components of a resource specification are linked together by
-    either <emphasis>tight</emphasis>, represented by a dot (.), or
-    <emphasis>loose</emphasis>, represented by an asterisk (*), bindings.
-    A tight binding indicates that the components on either side of the
-    dot must be directly next to each other as defined in a specific
-    implementation. An asterisk is a wildcard character that means that
-    any number of levels in a defined hierarchy can be between the components.
-    For example, X offers two special cursors: redglass and whiteglass. To
-    use one of these resources, you need to add the following line:</para>
-
-<screen><literal>Xcursor.theme: whiteglass</literal></screen>
-
-    <para>However, you can specify the background for all clients with:</para>
-
-<screen><literal>*background: blue</literal></screen>
-
-    <para>More specific resource variables will override less specific
-    names.</para>
-
-    <para>Resource definitions can be found in the man pages for each
-    respective client.</para>
-
-    <para>In order to load your resources, the <command>xrdb</command>
-    program must be called with the appropriate parameters. Typically,
-    the first time resources are loaded, you use:</para>
-
-<screen><userinput>xrdb -load &lt;filename&gt;</userinput></screen>
-
-    <para>To add resources to <application>X</application>'s database
-    in memory, use:</para>
-
-<screen><userinput>xrdb -merge &lt;filename&gt;</userinput></screen>
-
-    <para>The <command>xrdb</command> instruction is usually placed in
-    <filename>~/.xinitrc</filename> or <filename>~/.xsession</filename>.
-    To get more information, see the <command>xrdb</command> man page.</para>
-
-    <indexterm zone="x-setup x-resources">
-      <primary sortas="b-xrdb">xrdb</primary>
-    </indexterm>
-
-  </sect2>
-
-</sect1>
Index: chive/x7driver-amdgpu.xml
===================================================================
--- archive/x7driver-amdgpu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +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 radeon-wiki "https://wiki.x.org/wiki/RadeonFeature">
-  <!ENTITY radeon-marketing-names "&radeon-wiki;#decoderringforengineeringvsmarketingnames">
-
-  <!ENTITY xorg-amdgpu-driver-version "23.0.0">
-
-  <!ENTITY xorg-amdgpu-driver-download-http "&xorg-download-http;/driver/xf86-video-amdgpu-&xorg-amdgpu-driver-version;.tar.xz">
-  <!ENTITY xorg-amdgpu-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-amdgpu-&xorg-amdgpu-driver-version;.tar.xz">
-  <!ENTITY xorg-amdgpu-driver-md5sum        "8a58421b3215769f0bfce855301f7964">
-  <!ENTITY xorg-amdgpu-driver-size          "376 KB">
-  <!ENTITY xorg-amdgpu-driver-buildsize     "6.0 MB">
-  <!ENTITY xorg-amdgpu-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg AMDGPU Driver -->
-  <sect2 id="xorg-amdgpu-driver" xreflabel="Xorg AMDGPU Driver-&xorg-amdgpu-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg AMDGPU Driver-&xorg-amdgpu-driver-version;</title>
-
-    <indexterm zone="xorg-amdgpu-driver">
-      <primary sortas="a-xorg-amdgpu-driver">xorg-amdgpu-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg AMDGPU Driver</title>
-
-      <para>
-        The <application>Xorg AMDGPU Driver</application> package contains the X.Org
-        Video Driver for newer AMD Radeon video cards and newer AMD-CPUs with
-        integrated graphics (APUs). This includes video cards starting with Volcanic Islands.
-        It can also be used for Southern and Sea Islands if the experimental support
-        was enabled in the kernel.
-      </para>
-
-      &lfs113_checked;
-
-      <note>
-        <para>
-          For Direct Rendering to work, you need to enable the radeonsi Gallium
-          driver at <xref linkend="mesa"/> build time. Also, all cards and newer APUs
-          require Firmware to be available when the kernel driver is loaded.
-          If you have not followed the instructions in the Firmware
-          for Video Cards part of <xref linkend="postlfs-firmware"/> which provided
-          that firmware in <filename class="directory">/lib/firmware</filename>
-          for a modular build,
-          firmware can be obtained from <ulink
-          url="&sources-anduin-http;/linux-firmware/"/> -
-          see <xref linkend="xorg-amdgpu-firmware-kernel"/> below for additional
-          firmware.
-        </para>
-      </note>
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-amdgpu-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-amdgpu-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-amdgpu-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-amdgpu-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-amdgpu-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-amdgpu-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg AMDGPU Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/> (must be built with glamor enabled)
-      </para>
-
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-amdgpu-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration and recompile
-        the kernel if necessary:
-      </para>
-
-<!-- Editor note: CONFIG_DRM_AMDGPU_SI available in 4.9+ -->
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-   &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt; [CONFIG_DRM]
-   &lt;*/M&gt; AMD GPU                                           [CONFIG_DRM_AMDGPU]
-    &lt; /*&gt; Enable amdgpu support for SI parts               [CONFIG_DRM_AMDGPU_SI]
-    &lt; /*&gt; Enable amdgpu support for CIK parts              [CONFIG_DRM_AMDGPU_CIK]</literal></screen>
-
-      <para>
-        The last two options enable experimental support for Southern and
-        Sea Islands AMD GPUs so they can be used with this driver. Note that
-        the support is marked experimental and disabled by default.
-        <xref linkend="xorg-ati-driver"/> should be used for those GPUs.
-      </para>
-
-      <indexterm zone="xorg-amdgpu-driver xorg-amdgpu-driver-kernel">
-        <primary sortas="d-xorg-amdgpu-driver">xorg-amdgpu-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-amdgpu-firmware-kernel">
-      <title>Kernel Configuration for additional firmware</title>
-
-      <para>
-        If you need to add firmware, install the file(s) and then point to them in the
-        kernel configuration and recompile the kernel if necessary. To find out which
-        firmware you need, consult the <ulink url="&radeon-marketing-names;">
-        Decoder ring for engineering vs marketing names</ulink>. Download any firmware
-        for your card which is named like:
-        <filename><replaceable>&lt;ENGINEERING_NAME&gt;</replaceable>_rlc.bin</filename>,
-        etc. Below is an example for Radeon R7 M340 GPU, which is codenamed
-        Iceland/Topaz, along with a network card that also requires the firmware:
-      </para>
-
-<screen><literal>CONFIG_EXTRA_FIRMWARE="amdgpu/topaz_ce.bin amdgpu/topaz_k_smc.bin amdgpu/topaz_mc.bin
-                       amdgpu/topaz_me.bin amdgpu/topaz_mec2.bin amdgpu/topaz_mec.bin
-                       amdgpu/topaz_pfp.bin amdgpu/topaz_rlc.bin amdgpu/topaz_sdma1.bin
-                       amdgpu/topaz_sdma.bin amdgpu/topaz_smc.bin rtl_nic/rtl8168e-3.fw"
-CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"</literal></screen>
-
-      <note>
-        <para>
-          CONFIG_EXTRA_FIRMWARE should all be on one line. It is shown above as
-          multiple lines for presentation only.
-        </para>
-      </note>
-
-      <tip>
-        <para>
-          You can check <command>dmesg</command> output after boot to see which firmware
-          is missing.
-        </para>
-      </tip>
-
-      <para>
-        Alternatively, if you change CONFIG_DRM_AMDGPU to '=m' in your linux
-        kernel .config the firmware can be loaded automatically from
-        /lib/firmware/amdgpu/ when it installs the module. This offers a tiny
-        space saving, but also means that the screen will be blank for a longer
-        time before the framebuffer appears. Distros take this approach because
-        it is not practical to specify every possible firmware and the kernel
-        would be excessively big.
-      </para>
-
-      <indexterm zone="xorg-amdgpu-driver xorg-amdgpu-firmware-kernel">
-        <primary sortas="d-xorg-amdgpu-firmware">xorg-amdgpu-firmware</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg AMDGPU Driver</title>
-
-      <para>
-        Install <application>Xorg AMDGPU Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            amdgpu_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="amdgpu_drv">
-          <term><filename class="libraryfile">amdgpu_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for latest AMD Radeon video cards
-            </para>
-            <indexterm zone="xorg-amdgpu-driver amdgpu_drv">
-              <primary sortas="c-amdgpu_drv">amdgpu_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: chive/x7driver-ati.xml
===================================================================
--- archive/x7driver-ati.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,338 +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 radeon-wiki "https://wiki.x.org/wiki/RadeonFeature">
-  <!ENTITY radeon-marketing-names "&radeon-wiki;#Decoder_ring_for_engineering_vs_marketing_names">
-
-  <!ENTITY xorg-ati-driver-version "22.0.0">
-
-  <!ENTITY xorg-ati-driver-download-http "&xorg-download-http;/driver/xf86-video-ati-&xorg-ati-driver-version;.tar.xz">
-  <!ENTITY xorg-ati-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-ati-&xorg-ati-driver-version;.tar.xz">
-  <!ENTITY xorg-ati-driver-md5sum        "33c7b049c526aa9bf3654890c4d7b860">
-  <!ENTITY xorg-ati-driver-size          "740 KB">
-  <!ENTITY xorg-ati-driver-buildsize     "19 MB">
-  <!ENTITY xorg-ati-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg ATI Driver -->
-  <sect2 id="xorg-ati-driver" xreflabel="Xorg ATI Driver-&xorg-ati-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg ATI Driver-&xorg-ati-driver-version;</title>
-
-    <indexterm zone="xorg-ati-driver">
-      <primary sortas="a-xorg-ati-driver">xorg-ati-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg ATI Driver</title>
-
-      <para>
-        The <application>Xorg ATI Driver</application> package contains the X.Org
-        Video Driver for ATI Radeon video cards including all chipsets ranging
-        from R100 to the "Volcanic Islands" chipsets.
-      </para>
-
-      &lfs113_checked;
-
-      <note>
-        <para>
-          For Direct Rendering to work with newer Radeon Cards (R300 and later
-          chipsets), you need to enable the r300, r600 and radeonsi Gallium
-          drivers at <xref linkend="mesa"/> build time. Also, some cards
-          require Firmware to be available when the kernel driver is loaded.
-          In that case, if you have not followed the instructions in the Firmware
-          for Video Cards part of <xref linkend="postlfs-firmware"/> which provided
-          that firmware in <filename class="directory">/lib/firmware</filename>
-          for a modular build,
-          firmware can be obtained from <ulink
-          url="&sources-anduin-http;/linux-firmware/"/> -
-          see <xref linkend="xorg-ati-firmware-kernel"/> below for additional
-          firmware.
-        </para>
-      </note>
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-ati-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-ati-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-ati-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-ati-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-ati-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <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>
-      </itemizedlist>
--->
-
-      <bridgehead renderas="sect4">Xorg ATI Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/> (recommended to be built with glamor enabled)
-      </para>
-
-      <note>
-        <para>
-          Glamor is required for Southern, Sea or Volcanic Islands GPUs, and
-          used by default in all other R600 or later radeon GPUs. To see which
-          GPUs are in these categories, read the <ulink url="&radeon-marketing-names;">
-          Decoder ring for engineering vs marketing names</ulink>.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-ati-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration and recompile
-        the kernel if necessary:
-      </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-   &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt; [CONFIG_DRM]
-   &lt;*&gt; ATI Radeon                                          [CONFIG_DRM_RADEON]</literal></screen>
-
-      <indexterm zone="xorg-ati-driver xorg-ati-driver-kernel">
-        <primary sortas="d-xorg-ati-driver">xorg-ati-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-ati-firmware-kernel">
-      <title>Kernel Configuration for additional firmware</title>
-
-      <para>
-        If you need to add firmware, install the file(s) and then point to them in the
-        kernel configuration and recompile the kernel if necessary. To find out which
-        firmware you need, consult the <ulink url="&radeon-marketing-names;">
-        Decoder ring for engineering vs marketing names</ulink>. Download any firmware
-        for your card which is named like:
-        <filename><replaceable>&lt;ENGINEERING_NAME&gt;</replaceable>_rlc.bin</filename>,
-        etc. Note that for R600 and R700 family, generic
-        <filename>R600_rlc.bin</filename> and <filename>R700_rlc.bin</filename> are
-        necessary in addition to the model specific firmware, while for later generations
-        you need the
-        <filename>BTC_rlc.bin</filename> in addition to the model specific firmware.
-        Below is an example for a Radeon HD6470 which is a "Northern Islands" GPU,
-        plus an RTL network chip that also requests extra firmware:
-      </para>
-
-<screen><literal>CONFIG_EXTRA_FIRMWARE="radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin
-radeon/CAICOS_pfp.bin radeon/CAICOS_smc.bin rtl_nic/rtl8168e-3.fw"
-CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"</literal></screen>
-
-     <note>
-       <para>
-         CONFIG_EXTRA_FIRMWARE should all be on one line.  It
-         is shown above as two lines for presentation only.
-       </para>
-     </note>
-
-      <tip>
-        <para>
-          You can check <command>dmesg</command> output after boot to see which firmware
-          is missing.
-        </para>
-      </tip>
-
-      <para>
-        Alternatively, if you change CONFIG_DRM_RADEON to '=m' in your .config
-        the firmware can be loaded automatically from /lib/firmware/radeon when
-        it installs the module. This offers a tiny space saving, but also means
-        that the screen will be blank for a longer time before the framebuffer
-        appears. Distros take this approach because it is not practical to
-        specify every possible firmware and the kernel would be excessively big.
-      </para>
-
-      <indexterm zone="xorg-ati-driver xorg-ati-firmware-kernel">
-        <primary sortas="d-xorg-ati-firmware">xorg-ati-firmware</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg ATI Driver</title>
-
-<!--
-  Note: Fixed upstream, should be unneeded for versions gtr 19.1.0.
-  Patch also includes the fix.
-
-      <para>
-        First, fix an issue exposed by GCC 10 and later:
-      </para>
-
-<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>
-        Install <application>Xorg ATI Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-<!-- following is (now) automatically installed
-install -v -m644 conf/10-radeon.conf \
-  $XORG_PREFIX/share/X11/xorg.conf.d -->
-    </sect3>
-
-<!--
-    <sect3 id="ati-glamor-accel">
-      <title>Glamor Acceleration</title>
-
-      <para>
-        Glamor is an acceleration library which uses cards' 3D capabilities
-        to accelerate 2D rendering. Glamor acceleration is either required
-        or used by default for all R600 and later GPUs. To see which GPUs are
-        in these categories, read the <ulink url="&radeon-marketing-names;">
-        Decoder ring for engineering vs marketing names</ulink>.
-      </para>
-
-      <para>
-        Please note
-        that Glamor acceleration can be used with other chips as well, from the
-        R300 onwards. On at least some Northern Islands chips it is beneficial.
-      </para>
-
-      <para>
-        Glamor acceleration is not enabled by default for chipsets that don't
-        use "radeonsi" Gallium3D driver. You have to use an
-        <filename>xorg.conf</filename> file to enable it. To enable
-        Glamor for cards other than "Southern Islands" and later, create the
-        following file in
-        <filename class="directory">${XORG_PREFIX}/share/X11/xorg.conf.d/</filename>
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; ${XORG_PREFIX}/share/X11/xorg.conf.d/20-glamor.conf &lt;&lt; "EOF"
-<literal>Section "Device"
-        Identifier "radeon"
-        Driver "ati"
-        Option "AccelMethod" "glamor"
-EndSection</literal>
-EOF</userinput></screen>
-
-    </sect3>-->
-
-    <!--
-    <sect3 role="commands">
-    <title>Command Explanations</title>
-
-
-      <para>
-        <command>install -v -m644 conf/10-radeon.conf ...</command>: this
-        ensures that the radeon driver can be loaded automatically even if
-        the ati wrapper driver has not been installed.
-      </para>
-
-    </sect3> -->
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Drivers</segtitle>
-
-        <seglistitem>
-          <seg>
-            ati_drv.so and radeon_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="ati_drv">
-          <term><filename class="libraryfile">ati_drv.so</filename></term>
-          <listitem>
-            <para>
-              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
-            </para>
-            <indexterm zone="xorg-ati-driver ati_drv">
-              <primary sortas="c-ati_drv">ati_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="radeon_drv">
-          <term><filename class="libraryfile">radeon_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for ATI Radeon based video cards
-            </para>
-            <indexterm zone="xorg-ati-driver radeon_drv">
-              <primary sortas="c-radeon_drv">radeon_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: chive/x7driver-cirrus.xml
===================================================================
--- archive/x7driver-cirrus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +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 xorg-cirrus-driver-version "1.5.2">
-
-  <!ENTITY xorg-cirrus-driver-download-http "&xorg-download-http;/driver/xf86-video-cirrus-&xorg-cirrus-driver-version;.tar.bz2">
-  <!ENTITY xorg-cirrus-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-cirrus-&xorg-cirrus-driver-version;.tar.bz2">
-  <!ENTITY xorg-cirrus-driver-md5sum        "91fd6b677d62027cd3001debb587a6a6">
-  <!ENTITY xorg-cirrus-driver-size          "320 KB">
-  <!ENTITY xorg-cirrus-driver-buildsize     "4.3 MB">
-  <!ENTITY xorg-cirrus-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg Cirrus Driver -->
-  <sect2 id="xorg-cirrus-driver" xreflabel="Xorg Cirrus Driver-&xorg-cirrus-driver-version;">
-
-    <title>Xorg Cirrus Driver-&xorg-cirrus-driver-version;</title>
-
-    <indexterm zone="xorg-cirrus-driver">
-      <primary sortas="a-xorg-cirrus-driver">xorg-cirrus-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Cirrus Driver</title>
-
-      <para>
-        The <application>Xorg Cirrus Driver</application> package contains the X.Org
-        Video Driver for Cirrus Logic video chips. <application>Qemu</application>
-        uses this driver for its virtual GPU.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-cirrus-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-cirrus-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-cirrus-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-cirrus-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-cirrus-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-cirrus-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Cirrus Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-cirrus-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-cirrus-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    Direct rendering Manager ---&gt;
-      &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt; [CONFIG_DRM]
-      &lt;*&gt; Cirrus driver for QEMU emulated device              [CONFIG_DRM_CIRRUS_QEMU]</literal></screen>
-
-      <indexterm zone="xorg-cirrus-driver xorg-cirrus-driver-kernel">
-        <primary sortas="d-xorg-cirrus-driver">xorg-cirrus-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Cirrus Driver</title>
-
-      <para>
-        Install <application>Xorg Cirrus Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            cirrus_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cirrus_drv">
-          <term><filename class="libraryfile">cirrus_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for Cirrus Logic grahpics chipsets.
-            </para>
-            <indexterm zone="xorg-cirrus-driver cirrus_drv">
-              <primary sortas="c-cirrus_drv">cirrus_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg Cirrus Driver -->
Index: chive/x7driver-fbdev.xml
===================================================================
--- archive/x7driver-fbdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +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 xorg-fbdev-driver-version "0.5.0">
-
-  <!ENTITY xorg-fbdev-driver-download-http "&xorg-download-http;/driver/xf86-video-fbdev-&xorg-fbdev-driver-version;.tar.bz2">
-  <!ENTITY xorg-fbdev-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-fbdev-&xorg-fbdev-driver-version;.tar.bz2">
-  <!ENTITY xorg-fbdev-driver-md5sum        "f07475655376be5a124d8187aacd87b6">
-  <!ENTITY xorg-fbdev-driver-size          "292 KB">
-  <!ENTITY xorg-fbdev-driver-buildsize     "2.5 MB">
-  <!ENTITY xorg-fbdev-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg Fbdev Driver -->
-  <sect2 id="xorg-fbdev-driver" xreflabel="Xorg Fbdev Driver-&xorg-fbdev-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg Fbdev Driver-&xorg-fbdev-driver-version;</title>
-
-    <indexterm zone="xorg-fbdev-driver">
-      <primary sortas="a-xorg-fbdev-driver">xorg-fbdev-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Fbdev Driver</title>
-
-      <para>
-        The <application>Xorg Fbdev Driver</application> package contains the X.Org
-        Video Driver for framebuffer devices. This driver is often used as fallback
-        driver if the hardware specific and VESA drivers fail to load or are not
-        present. If this driver is not installed, Xorg Server will print a warning
-        on startup, but it can be safely ignored if hardware specific driver works
-        well.
-      </para>
-
-      &lfs113_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-fbdev-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-fbdev-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-fbdev-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-fbdev-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-fbdev-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-fbdev-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Fbdev Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Fbdev Driver</title>
-
-      <para>
-        Install <application>Xorg Fbdev Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            fbdev_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="fbdev_drv">
-          <term><filename class="libraryfile">fbdev_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for framebuffer devices
-            </para>
-            <indexterm zone="xorg-fbdev-driver fbdev_drv">
-              <primary sortas="c-fbdev_drv">fbdev_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: chive/x7driver-glamor.xml
===================================================================
--- archive/x7driver-glamor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +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 glamor-egl-version "0.6.0">
-
-  <!ENTITY glamor-egl-download-http "http://xorg.freedesktop.org/archive/individual/driver/glamor-egl-&glamor-egl-version;.tar.bz2">
-  <!ENTITY glamor-egl-download-ftp  " ">
-  <!ENTITY glamor-egl-md5sum        "b3668594675f71a75153ee52dbd35535">
-  <!ENTITY glamor-egl-size          "419 KB">
-  <!ENTITY glamor-egl-buildsize     "11 MB">
-  <!ENTITY glamor-egl-time          "0.2 SBU">
-]>
-
-  <!-- Begin Glamor EGL -->
-  <sect2 id="glamor-egl" xreflabel="Glamor EGL-&glamor-egl-version;">
-
-    <title>Glamor EGL-&glamor-egl-version;</title>
-
-    <indexterm zone="glamor-egl">
-      <primary sortas="a-glamor-egl">glamor-egl</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Glamor EGL</title>
-
-      <para>
-        The <application>Glamor EGL</application> package contains a
-        GL-based rendering acceleration library for X server.
-      </para>
-
-      &lfs75_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&glamor-egl-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&glamor-egl-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &glamor-egl-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &glamor-egl-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &glamor-egl-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &glamor-egl-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Glamor EGL Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/glamor-egl"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Glamor EGL</title>
-
-      <para>
-        Install <application>Glamor EGL</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG --enable-glx-tls &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>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-glx-tls</parameter>: This switch enables
-        TLS support in GLX.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Xorg Module</segtitle>
-
-        <seglistitem>
-          <seg>
-            libglamor.so
-          </seg>
-          <seg>
-            libglamoregl.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libglamoregl">
-          <term><filename class="libraryfile">libglamoregl.so</filename></term>
-          <listitem>
-            <para>
-              contains functions to create and initialize OpenGL/EGL context.
-            </para>
-            <indexterm zone="glamor-egl libglamoregl">
-              <primary sortas="c-libglamoregl">libglamoregl.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libglamor">
-          <term><filename class="libraryfile">libglamor.so</filename></term>
-          <listitem>
-            <para>
-              contains the <application>Glamor</application> rendering functions.
-            </para>
-            <indexterm zone="glamor-egl libglamor">
-              <primary sortas="c-libglamor">libglamor.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Glamor EGL -->
Index: chive/x7driver-intel.xml
===================================================================
--- archive/x7driver-intel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,262 +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 xorg-intel-driver-download-http "&xorg-download-http;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
-  <!ENTITY xorg-intel-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">-->
-
-  <!-- git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
-       as of 2016-09-02 -->
-
-  <!--<!ENTITY xorg-intel-driver-version "2.99.917">-->
-  <!ENTITY xorg-intel-driver-version "20230223">
-
-  <!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        "875adabe0d053856b43bbdd77e728cc7">
-  <!ENTITY xorg-intel-driver-size          "948 KB">
-  <!ENTITY xorg-intel-driver-buildsize     "72 MB">
-  <!ENTITY xorg-intel-driver-time          "0.6 SBU">
-]>
-
-  <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>
-
-      <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>
-
-      &lfs113_checked;
-
-      <note>
-        <para>
-          This driver is for Intel integrated GPU, and a development
-          version is needed to work properly with the latest hardware.
-          This version is now one year old and has some problems. The
-          <quote>Kernel Modes Setting (KMS)</quote> driver shipped along
-          with Xorg Server is said to give better results.
-        </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>
-
-    </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;
-  Graphics support ---&gt;
-   &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt; [CONFIG_DRM]
-   &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>
-
-<!-- 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>
-
-<screen><userinput remap="pre">case $(uname -m) in
-   i?86) sed -i "s/#define force_inline inline __attribute__((always_inline))/#define force_inline inline/" src/sna/compiler.h
-         ;;
-esac</userinput></screen>-->
-
-      <para>
-        Install <application>Xorg Intel Driver</application> by running the
-        following commands:
-      </para>
-
-<screen><userinput>./autogen.sh $XORG_CONFIG     \
-            --enable-kms-only \
-            --enable-uxa      \
-            --mandir=/usr/share/man &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 -v /usr/share/man/man4/intel-virtual-output.4 \
-      /usr/share/man/man1/intel-virtual-output.1 &amp;&amp;
-
-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>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf.d/20-intel.conf &lt;&lt; "EOF"
-<literal>Section   "Device"
-        Identifier "Intel Graphics"
-        Driver     "intel"
-        #Option     "DRI" "2"            # DRI3 is default
-        #Option     "AccelMethod"  "sna" # default
-        #Option     "AccelMethod"  "uxa" # fallback
-EndSection</literal>
-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>
Index: chive/x7driver-mach64.xml
===================================================================
--- archive/x7driver-mach64.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +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 xorg-mach64-driver-version "6.9.4">
-
-  <!ENTITY xorg-mach64-driver-download-http "&xorg-download-http;/driver/xf86-video-mach64-&xorg-mach64-driver-version;.tar.bz2">
-  <!ENTITY xorg-mach64-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-mach64-&xorg-mach64-driver-version;.tar.bz2">
-  <!ENTITY xorg-mach64-driver-md5sum        "d645197cbf238ac0427c3904eafdce2f">
-  <!ENTITY xorg-mach64-driver-size          "508 KB">
-  <!ENTITY xorg-mach64-driver-buildsize     "13 MB">
-  <!ENTITY xorg-mach64-driver-time          "0.1 SBU">
-]>
-
-   <!-- Begin Xorg Mach64 Driver -->
-  <sect2 id="xorg-mach64-driver" xreflabel="Xorg Mach64 Driver-&xorg-mach64-driver-version;">
-
-    <title>Xorg Mach64 Driver-&xorg-mach64-driver-version;</title>
-
-    <indexterm zone="xorg-mach64-driver">
-      <primary sortas="a-xorg-mach64-driver">xorg-mach64-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Mach64 Driver</title>
-
-      <para>
-        The <application>Xorg Mach64 Driver</application> package contains the X.Org
-        Video Driver for ATI video adapters based on the Mach64 chipsets.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-mach64-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-mach64-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-mach64-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-mach64-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-mach64-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-mach64-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Mach64 Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-mach64-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Mach64 Driver</title>
-
-      <para>
-        Install <application>Xorg Mach64 Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            mach64_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="mach64_drv">
-          <term><filename class="libraryfile">mach64_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for ATI Mach64 grahpics chipsets.
-            </para>
-            <indexterm zone="xorg-mach64-driver mach64_drv">
-              <primary sortas="c-mach64_drv">mach64_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg Mach64 Driver -->
Index: chive/x7driver-mga.xml
===================================================================
--- archive/x7driver-mga.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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 xorg-mga-driver-version "1.6.3">
-
-  <!ENTITY xorg-mga-driver-download-http "&xorg-download-http;/driver/xf86-video-mga-&xorg-mga-driver-version;.tar.bz2">
-  <!ENTITY xorg-mga-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-mga-&xorg-mga-driver-version;.tar.bz2">
-  <!ENTITY xorg-mga-driver-md5sum        "a53b5ce166e31c181aaa4c3816d8babb">
-  <!ENTITY xorg-mga-driver-size          "445 KB">
-  <!ENTITY xorg-mga-driver-buildsize     "7.4 MB">
-  <!ENTITY xorg-mga-driver-time          "0.2 SBU">
-]>
-
-  <!-- Begin Xorg MGA Driver -->
-  <sect2 id="xorg-mga-driver" xreflabel="Xorg MGA Driver-&xorg-mga-driver-version;">
-
-    <title>Xorg MGA Driver-&xorg-mga-driver-version;</title>
-
-    <indexterm zone="xorg-mga-driver">
-      <primary sortas="a-xorg-mga-driver">xorg-mga-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg MGA Driver</title>
-
-      <para>
-        The <application>Xorg MGA Driver</application> package contains the
-        X.Org Video Driver for Matrox video cards including Millennium G2xx,
-        G4xx, G5xx, Millennium II and Mystique G200 chipsets.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-mga-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-mga-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-mga-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-mga-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-mga-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-mga-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg MGA Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-mga-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-mga-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    Matrox g200/g400: Y or M</literal></screen>
-
-      <indexterm zone="xorg-mga-driver xorg-mga-driver-kernel">
-        <primary sortas="d-xorg-mga-driver">xorg-mga-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg MGA Driver</title>
-
-      <para>
-        Install <application>Xorg MGA Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            mga_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="mga_drv">
-          <term><filename class="libraryfile">mga_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for Matrox video cards.
-            </para>
-            <indexterm zone="xorg-mga-driver mga_drv">
-              <primary sortas="c-mga_drv">mga_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg MGA Driver -->
Index: chive/x7driver-nouveau.xml
===================================================================
--- archive/x7driver-nouveau.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,212 +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 xorg-nouveau-driver-version "1.0.17">
-
-  <!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-time          "0.1 SBU">
-]>
-
- <!-- Begin Xorg Nouveau Driver -->
-  <sect2 id="xorg-nouveau-driver" xreflabel="Xorg Nouveau Driver-&xorg-nouveau-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg Nouveau Driver-&xorg-nouveau-driver-version;</title>
-
-    <indexterm zone="xorg-nouveau-driver">
-      <primary sortas="a-xorg-nouveau-driver">xorg-nouveau-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Nouveau Driver</title>
-
-      <para>
-        The <application>Xorg Nouveau Driver</application> package contains the
-        X.Org Video Driver for NVidia Cards including RIVA TNT, RIVA TNT2,
-        GeForce 256, QUADRO, GeForce2, QUADRO2, GeForce3, QUADRO DDC,
-        nForce, nForce2, GeForce4, QUADRO4, GeForce FX, QUADRO FX, GeForce 6XXX and
-        GeForce 7xxx chipsets.
-      </para>
-
-      &lfs113_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-nouveau-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-nouveau-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-nouveau-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-nouveau-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-nouveau-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-nouveau-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Nouveau Drivers Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/> (recommended to be built with glamor enabled)
-      </para>
-
-      <note>
-        <para>
-          The new <quote>Maxwell</quote> and <quote>Pascal</quote>
-          GPUs require Glamor to be built with the Xorg server.
-          <!-- I tested this driver with a GTX 1050ti - the above note is true. -->
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-nouveau-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-   &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt; [CONFIG_DRM]
-   &lt;*&gt; Nouveau (NVIDIA) cards                              [CONFIG_DRM_NOUVEAU]
-      [*]   Support for backlight control                     [CONFIG_DRM_NOUVEAU_BACKLIGHT]</literal></screen>
-
-      <indexterm zone="xorg-nouveau-driver xorg-nouveau-driver-kernel">
-        <primary sortas="d-xorg-nouveau-driver">xorg-nouveau-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Nouveau Driver</title>
-
-      <note>
-        <para>
-          Please ensure that you have installed <xref role="nodep" linkend="mesa"/>
-          with the nouveau fixes patch prior to continuing.
-        </para>
-      </note>
-
-      <para>
-        First, fix the <application>Xorg Nouveau Driver</application> to build
-        with the latest Xorg Server:
-      </para>
-
-<screen><userinput remap="pre">grep -rl slave | xargs sed -i s/slave/secondary/</userinput></screen>
-
-      <para>
-        Install <application>Xorg Nouveau Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-<!--
-    Glamor has been removed from the nouveau driver.
-
-    <sect3>
-      <title>Glamor Acceleration</title>
-
-      <para>
-        Glamor is an acceleration library which uses cards' 3D capabilities
-        to accelerate 2D rendering. Glamor acceleration is enabled by default
-        for the new <quote>Maxwell</quote> GPU's. According to the
-        documentation, Glamor acceleration can be used with other chips as
-        well, but that does not seem functional yet.
-      </para>
-
-      <para>
-        If you want anyway to try to enable Glamor for GPU's other than the new
-        <quote>Maxwell</quote> ones, create the following file as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf.d/nvidia.conf &lt;&lt; "EOF"
-<literal>Section "Device"
-        Identifier "nvidia"
-        Driver "nouveau"
-        Option "AccelMethod" "glamor"
-EndSection</literal>
-EOF</userinput></screen>
-
-    </sect3>
--->
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            nouveau_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="nouveau_drv">
-          <term><filename class="libraryfile">nouveau_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for nVidia video cards
-            </para>
-            <indexterm zone="xorg-nouveau-driver nouveau_drv">
-              <primary sortas="c-nouveau_drv">nouveau_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: chive/x7driver-openchrome.xml
===================================================================
--- archive/x7driver-openchrome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +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 xorg-openchrome-driver-version "0.3.3">
-
-  <!ENTITY xorg-openchrome-driver-download-http "&xorg-download-http;/driver/xf86-video-openchrome-&xorg-openchrome-driver-version;.tar.bz2">
-  <!ENTITY xorg-openchrome-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-openchrome-&xorg-openchrome-driver-version;.tar.bz2">
-  <!ENTITY xorg-openchrome-driver-md5sum        "f21abcdf87f73b5b547491281e894c87">
-  <!ENTITY xorg-openchrome-driver-size          "507 KB">
-  <!ENTITY xorg-openchrome-driver-buildsize     "14 MB">
-  <!ENTITY xorg-openchrome-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg OpenChrome Driver -->
-  <sect2 id="xorg-openchrome-driver" xreflabel="Xorg OpenChrome Driver-&xorg-openchrome-driver-version;">
-
-    <title>Xorg OpenChrome Driver-&xorg-openchrome-driver-version;</title>
-
-    <indexterm zone="xorg-openchrome-driver">
-      <primary sortas="a-xorg-openchrome-driver">xorg-openchrome-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg OpenChrome Driver</title>
-
-      <para>
-        The <application>Xorg OpenChrome Driver</application> package contains the X.Org
-        Video Driver for Via integrated video cards including Unichrome, Unichrome Pro
-        and Chrome9 series.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-openchrome-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-openchrome-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-openchrome-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-openchrome-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-openchrome-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-openchrome-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg OpenChrome Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-openchrome-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-openchrome-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    Via unichrome video cards: Y or M</literal></screen>
-
-      <indexterm zone="xorg-openchrome-driver xorg-openchrome-driver-kernel">
-        <primary sortas="d-xorg-openchrome-driver">xorg-openchrome-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg OpenChrome Driver</title>
-
-      <para>
-        Install <application>Xorg OpenChrome Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>sed -i "/via_3d.h/i #include &lt;xorg-server.h&gt;" src/via_3d.c &amp;&amp;
-
-./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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-      <para>
-        <command>sed -i ...</command>: This sed fixes building with the latest
-        version of <application>Glibc</application>.
-      </para>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            libchromeXvMCPro.so and libchromeXvMC.so
-          </seg>
-          <seg>
-            openchrome_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="openchrome_drv">
-          <term><filename class="libraryfile">openchrome_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for VIA integrated graphics chipsets.
-            </para>
-            <indexterm zone="xorg-openchrome-driver openchrome_drv">
-              <primary sortas="c-openchrome_drv">openchrome_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg OpenChrome Driver -->
Index: chive/x7driver-r128.xml
===================================================================
--- archive/x7driver-r128.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +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 xorg-r128-driver-version "6.9.2">
-
-  <!ENTITY xorg-r128-driver-download-http "&xorg-download-http;/driver/xf86-video-r128-&xorg-r128-driver-version;.tar.bz2">
-  <!ENTITY xorg-r128-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-r128-&xorg-r128-driver-version;.tar.bz2">
-  <!ENTITY xorg-r128-driver-md5sum        "2e906d856a1c477bde000254b142445c">
-  <!ENTITY xorg-r128-driver-size          "452 KB">
-  <!ENTITY xorg-r128-driver-buildsize     "5.7 MB">
-  <!ENTITY xorg-r128-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg R128 Driver -->
-  <sect2 id="xorg-r128-driver" xreflabel="Xorg R128 Driver-&xorg-r128-driver-version;">
-
-    <title>Xorg R128 Driver-&xorg-r128-driver-version;</title>
-
-    <indexterm zone="xorg-r128-driver">
-      <primary sortas="a-xorg-r128-driver">xorg-r128-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg R128 Driver</title>
-
-      <para>
-        The <application>Xorg R128 Driver</application> package contains the
-        X.Org Video Driver for ATI Rage 128 based video cards.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-r128-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-r128-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-r128-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-r128-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-r128-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-r128-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg R128 Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-r128-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-r128-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    ATI Rage 128: Y or M</literal></screen>
-
-      <indexterm zone="xorg-r128-driver xorg-r128-driver-kernel">
-        <primary sortas="d-xorg-r128-driver">xorg-r128-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg R128 Driver</title>
-
-      <para>
-        Install <application>Xorg R128 Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            r128_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="r128_drv">
-          <term><filename class="libraryfile">r128_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for ATI Rage 128 based video cards.
-            </para>
-            <indexterm zone="xorg-r128-driver r128_drv">
-              <primary sortas="c-r128_drv">r128_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg R128 Driver -->
Index: chive/x7driver-savage.xml
===================================================================
--- archive/x7driver-savage.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +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 xorg-savage-driver-version "2.3.7">
-
-  <!ENTITY xorg-savage-driver-download-http "&xorg-download-http;/driver/xf86-video-savage-&xorg-savage-driver-version;.tar.bz2">
-  <!ENTITY xorg-savage-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-savage-&xorg-savage-driver-version;.tar.bz2">
-  <!ENTITY xorg-savage-driver-md5sum        "e813271ab43cc6a95ac0ab252b90a885">
-  <!ENTITY xorg-savage-driver-size          "386 KB">
-  <!ENTITY xorg-savage-driver-buildsize     "6.6 MB">
-  <!ENTITY xorg-savage-driver-time          "0.1 SBU">
-]>
-
-   <!-- Begin Xorg Savage Driver -->
-  <sect2 id="xorg-savage-driver" xreflabel="Xorg Savage Driver-&xorg-savage-driver-version;">
-
-    <title>Xorg Savage Driver-&xorg-savage-driver-version;</title>
-
-    <indexterm zone="xorg-savage-driver">
-      <primary sortas="a-xorg-savage-driver">xorg-savage-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Savage Driver</title>
-
-      <para>
-        The <application>Xorg Savage Driver</application> package contains the X.Org
-        Video Driver for the S3 Savage family video accelerator chips including Savage3D,
-        Savage4, Savage/MX, Savage/IX, SuperSavage/MX, SuperSavage/IX, ProSavage PM133,
-        ProSavage KM133, Twister, TwisterK, ProSavage DDR and ProSavage DDR-K series.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-savage-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-savage-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-savage-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-savage-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-savage-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-savage-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Savage Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-savage-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-savage-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    Savage video cards: Y or M</literal></screen>
-
-      <indexterm zone="xorg-savage-driver xorg-savage-driver-kernel">
-        <primary sortas="d-xorg-savage-driver">xorg-savage-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Savage Driver</title>
-
-      <para>
-        Install <application>Xorg Savage Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            savage_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="savage_drv">
-          <term><filename class="libraryfile">savage_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for S3 Savage video cards.
-            </para>
-            <indexterm zone="xorg-savage-driver savage_drv">
-              <primary sortas="c-savage_drv">savage_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg Savage Driver -->
Index: chive/x7driver-sis.xml
===================================================================
--- archive/x7driver-sis.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY xorg-sis-driver-version "0.10.7">
-
-  <!ENTITY xorg-sis-driver-download-http "&xorg-download-http;/driver/xf86-video-sis-&xorg-sis-driver-version;.tar.bz2">
-  <!ENTITY xorg-sis-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-sis-&xorg-sis-driver-version;.tar.bz2">
-  <!ENTITY xorg-sis-driver-md5sum        "f01e5e20e37342acf1983d269886171b">
-  <!ENTITY xorg-sis-driver-size          "684 KB">
-  <!ENTITY xorg-sis-driver-buildsize     "16 MB">
-  <!ENTITY xorg-sis-driver-time          "0.2 SBU">
-]>
-
-   <!-- Begin Xorg SiS Driver -->
-  <sect2 id="xorg-sis-driver" xreflabel="Xorg SiS Driver-&xorg-sis-driver-version;">
-
-    <title>Xorg SiS Driver-&xorg-sis-driver-version;</title>
-
-    <indexterm zone="xorg-sis-driver">
-      <primary sortas="a-xorg-sis-driver">xorg-sis-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg SiS Driver</title>
-
-      <para>
-        The <application>Xorg SiS Driver</application> package contains the X.Org
-        Video Driver for SiS (Silicon Integrated Systems) and XGI video cards
-        including SiS5597/5598, SiS530/620, SiS6326/AGP/DVD, SiS300/305, SiS540,
-        SiS630/730, SiS315/E/H/PRO, SiS550/551/552, SiS650/651/661/741, SiS330
-        (Xabre), SiS760/761, XGI Volari V3/V5/V8 and XGI Volari Z7 chipsets.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-sis-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-sis-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-sis-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-sis-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-sis-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-sis-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/xf86-video-sis-&xorg-sis-driver-version;-upstream_fixes-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg SiS Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-sis-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-sis-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    SiS video cards: Y or M</literal></screen>
-
-      <indexterm zone="xorg-sis-driver xorg-sis-driver-kernel">
-        <primary sortas="d-xorg-sis-driver">xorg-sis-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg SiS Driver</title>
-
-      <para>
-        Install <application>Xorg SiS Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../xf86-video-sis-&xorg-sis-driver-version;-upstream_fixes-1.patch &amp;&amp;
-./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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            sis_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="sis_drv">
-          <term><filename class="libraryfile">sis_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for SiS and XGI video cards.
-            </para>
-            <indexterm zone="xorg-sis-driver sis_drv">
-              <primary sortas="c-sis_drv">sis_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg SiS Driver -->
Index: chive/x7driver-tdfx.xml
===================================================================
--- archive/x7driver-tdfx.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,169 +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 xorg-tdfx-driver-version "1.4.5">
-
-  <!ENTITY xorg-tdfx-driver-download-http "&xorg-download-http;/driver/xf86-video-tdfx-&xorg-tdfx-driver-version;.tar.bz2">
-  <!ENTITY xorg-tdfx-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-tdfx-&xorg-tdfx-driver-version;.tar.bz2">
-  <!ENTITY xorg-tdfx-driver-md5sum        "1b4a7815a604b3764900b520336a75ea">
-  <!ENTITY xorg-tdfx-driver-size          "332 KB">
-  <!ENTITY xorg-tdfx-driver-buildsize     "4.5 MB">
-  <!ENTITY xorg-tdfx-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg 3Dfx Driver -->
-  <sect2 id="xorg-tdfx-driver" xreflabel="Xorg 3Dfx Driver-&xorg-tdfx-driver-version;">
-
-    <title>Xorg 3Dfx Driver-&xorg-tdfx-driver-version;</title>
-
-    <indexterm zone="xorg-tdfx-driver">
-      <primary sortas="a-xorg-tdfx-driver">xorg-tdfx-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg 3Dfx Driver</title>
-
-      <para>
-        The <application>Xorg 3Dfx Driver</application> package contains the X.Org
-        Video Driver for 3Dfx video cards including Voodoo Banshee, Voodoo3,
-        Voodoo4 and Voodoo5 chipsets.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-tdfx-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-tdfx-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-tdfx-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-tdfx-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-tdfx-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-tdfx-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg 3Dfx Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-tdfx-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-tdfx-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    3dfx Banshee/Voodoo3+: Y or M</literal></screen>
-
-      <indexterm zone="xorg-tdfx-driver xorg-tdfx-driver-kernel">
-        <primary sortas="d-xorg-tdfx-driver">xorg-tdfx-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg 3Dfx Driver</title>
-
-      <para>
-        Install <application>Xorg 3Dfx Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>sed -i -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" src/tdfx_driver.c &amp;&amp;
-
-./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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -e "/mibstore.h/d" ...</command>: Fixes building
-        with <application>Xorg Server</application> 1.14.0 and later.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            tdfx_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="tdfx_drv">
-          <term><filename class="libraryfile">tdfx_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for 3Dfx video cards.
-            </para>
-            <indexterm zone="xorg-tdfx-driver tdfx_drv">
-              <primary sortas="c-tdfx_drv">tdfx_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg 3Dfx Driver -->
Index: chive/x7driver-vesa.xml
===================================================================
--- archive/x7driver-vesa.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +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 xorg-vesa-driver-version "2.3.3">
-
-  <!ENTITY xorg-vesa-driver-download-http "&xorg-download-http;/driver/xf86-video-vesa-&xorg-vesa-driver-version;.tar.bz2">
-  <!ENTITY xorg-vesa-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vesa-&xorg-vesa-driver-version;.tar.bz2">
-  <!ENTITY xorg-vesa-driver-md5sum        "3690a5356ed121b1a7dfb59a6dcf4bf9">
-  <!ENTITY xorg-vesa-driver-size          "300 KB">
-  <!ENTITY xorg-vesa-driver-buildsize     "2.6 MB">
-  <!ENTITY xorg-vesa-driver-time          "less than 0.1 SBU">
-]>
-
-<!-- Begin Xorg VESA Driver -->
-  <sect2 id="xorg-vesa-driver" xreflabel="Xorg VESA Driver-&xorg-vesa-driver-version;">
-
-    <title>Xorg VESA Driver-&xorg-vesa-driver-version;</title>
-
-    <indexterm zone="xorg-vesa-driver">
-      <primary sortas="a-xorg-vesa-driver">xorg-vesa-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VESA Driver</title>
-
-      <para>
-        The <application>Xorg VESA Driver</application> contains the
-        Generic VESA video driver for the Xorg X server. This driver
-        is often used as fallback driver if the hardware specific
-        driver fails to load or is not present. If this driver is not
-        installed, Xorg Server will print a warning on startup, but it
-        can be safely ignored if hardware specific driver works well.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vesa-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vesa-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vesa-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vesa-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vesa-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vesa-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VESA Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-vesa-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-vesa-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    Frame buffer Devices ---&gt;
-      &lt;*&gt; Support for frame buffer devices ---&gt; [CONFIG_FB]
-      [*] VESA VGA graphics support             [CONFIG_FB_VESA]</literal></screen>
-
-      <indexterm zone="xorg-vesa-driver xorg-vesa-driver-kernel">
-        <primary sortas="d-xorg-vesa-driver">xorg-vesa-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg VESA Driver</title>
-
-      <para>
-        Install <application>Xorg VESA Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            vesa_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vesa_drv">
-          <term><filename class="libraryfile">vesa_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for generic VESA video cards.
-            </para>
-            <indexterm zone="xorg-vesa-driver vesa_drv">
-              <primary sortas="c-vesa_drv">vesa_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg VESA Driver -->
Index: chive/x7driver-vmmouse.xml
===================================================================
--- archive/x7driver-vmmouse.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +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 xorg-vmmouse-driver-version "13.1.0">
-
-  <!ENTITY xorg-vmmouse-driver-download-http "&xorg-download-http;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmmouse-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmmouse-driver-md5sum        "85e2e464b7219c495ad3a16465c226ed">
-  <!ENTITY xorg-vmmouse-driver-size          "312 KB">
-  <!ENTITY xorg-vmmouse-driver-buildsize     "2.9 MB">
-  <!ENTITY xorg-vmmouse-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg VMMouse Driver -->
-  <sect2 id="xorg-vmmouse-driver" xreflabel="Xorg VMMouse Driver-&xorg-vmmouse-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg VMMouse Driver-&xorg-vmmouse-driver-version;</title>
-
-    <indexterm zone="xorg-vmmouse-driver">
-      <primary sortas="a-xorg-vmmouse-driver">xorg-vmmouse-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VMMouse Driver</title>
-
-      <para>
-        The <application>Xorg VMMouse Driver</application> package contains the
-        VMMouse input driver for the Xorg X server. The VMMouse driver enables
-        support for the special VMMouse protocol that is provided by VMware
-        virtual machines to give absolute pointer positioning. It can be used
-        with <application>Qemu</application>, too.
-      </para>
-
-      <note>
-        <para>
-          Starting with version 4.1, the linux kernel supports the VMMouse protocol
-          so that this driver is not needed anymore. Furthermore, kernel support
-          conflicts with earlier versions of this driver (before 13.1), so it is
-          advisable to either remove this driver if you plan to always use kernels
-          with versions greater or equal to 4.1, or update this driver to 13.1
-          or above if you want to be able to use both old and recent kernels.
-        </para>
-      </note>
-
-      &lfs84_checked;
-      <!-- I used this with both VMWare and QEMU. -->
-      <!-- with Kernel 5.1, this package is now obsolete and will cause X to crash.-->
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vmmouse-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vmmouse-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vmmouse-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vmmouse-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vmmouse-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vmmouse-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VMMouse Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-vmmouse-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="vmmouse-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      To get kernel support for the VMMouse, enable the following options in the
-      kernel configuration and recompile the kernel if necessary:
-    </para>
-
-<screen><literal>Processor type and features ---&gt;
-  [*] Symmetric multi-processing support          [CONFIG_SMP]
-  [*] Support for extended (non-PC) x86 platforms [CONFIG_X86_EXTENDED_PLATFORM]
-  [*] ScaleMP vSMP                                [CONFIG_X86_VSMP]
-Device Drivers ---&gt;
-  Input device support ---&gt;
-    [*] Mice ---&gt;                                 [CONFIG_INPUT_MOUSE]
-      &lt;*/M&gt; PS/2 mouse                            [CONFIG_MOUSE_PS2]
-      [*] Virtual mouse (vmmouse)                 [CONFIG_MOUSE_PS2_VMMOUSE]</literal></screen>
-    </sect3>
-    <sect3 role="installation">
-      <title>Installation of Xorg VMMouse Driver</title>
-
-      <para>
-        Install <application>Xorg VMMouse Driver</application> by running the
-        following commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG               \
-            --without-hal-fdi-dir      \
-            --without-hal-callouts-dir \
-            --with-udev-rules-dir=/lib/udev/rules.d &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>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--with-udev-rules-dir=/lib/udev/rules.d</parameter>:
-        This switch specifies where udev rules should be installed.
-      </para>
-
-      <para>
-        <parameter>--without-hal-*-dir</parameter>: These switches disable
-        installation of the <application>HAL</application> components
-        which are not needed on Linux.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Xorg Drivers</segtitle>
-
-        <seglistitem>
-          <seg>
-            vmmouse_detect
-          </seg>
-          <seg>
-            vmmouse_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vmmouse_detect">
-          <term><command>vmmouse_detect</command></term>
-          <listitem>
-            <para>
-              is a tool for detecting if running in a VMware environment where
-              vmmouse is used.
-            </para>
-            <indexterm zone="xorg-vmmouse-driver vmmouse_detect">
-              <primary sortas="b-vmmouse_detect">vmmouse_detect</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="vmmouse_drv">
-          <term><filename class="libraryfile">vmmouse_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for VMware Mouse.
-            </para>
-            <indexterm zone="xorg-vmmouse-driver vmmouse_drv">
-              <primary sortas="c-vmmouse_drv">vmmouse_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg VMMouse Driver -->
Index: chive/x7driver-vmware.xml
===================================================================
--- archive/x7driver-vmware.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +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 xorg-vmware-driver-version "13.4.0">
-
-  <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.xz">
-  <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.xz">
-  <!ENTITY xorg-vmware-driver-md5sum        "8c9ec4decaa262eb33a474219232bb1b">
-  <!ENTITY xorg-vmware-driver-size          "408 KB">
-  <!ENTITY xorg-vmware-driver-buildsize     "12 MB">
-  <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg VMware Driver -->
-  <sect2 id="xorg-vmware-driver" xreflabel="Xorg VMware Driver-&xorg-vmware-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg VMware Driver-&xorg-vmware-driver-version;</title>
-
-    <indexterm zone="xorg-vmware-driver">
-      <primary sortas="a-xorg-vmware-driver">xorg-vmware-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VMware Driver</title>
-
-      <para>
-        The <application>Xorg VMware Driver</application> package contains the X.Org
-        Video Driver for VMware SVGA virtual video cards.
-      </para>
-
-      &lfs113_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vmware-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vmware-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vmware-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vmware-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vmware-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vmware-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VMware Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-vmware-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support  ---&gt;
-   &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt;  [CONFIG_DRM]
-   &lt;*&gt; DRM driver for VMware Virtual GPU                    [CONFIG_DRM_VMWGFX]
-      [*]   Enable framebuffer console under vmwgfx by default [CONFIG_DRM_VMWGFX_FBCON]</literal></screen>
-
-      <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
-        <primary sortas="d-xorg-vmware-driver">xorg-vmware-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg VMware Driver</title>
-
-<!--  Applied in 13.4.0
-      <para>
-        First, fix a bug revealed by gcc-12:
-      </para>
-
-<screen><userinput>sed -i 's/>yuv.i/>yuv[j][i/' vmwgfx/vmwgfx_tex_video.c</userinput></screen>
--->
-
-      <para>
-        Install <application>Xorg VMware Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-<!--
-    <sect3>
-      <title>Command Explanations</title>
-      <para>
-        <command>sed -i ...</command>: This sed fixes building with the latest
-        version of <application>Glibc</application>.
-      </para>
-    </sect3>-->
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            vmware_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vmware_drv">
-          <term><filename class="libraryfile">vmware_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for VMware SVGA virtual video card
-            </para>
-            <indexterm zone="xorg-vmware-driver vmware_drv">
-              <primary sortas="c-vmware_drv">vmware_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: chive/x7proto.xml
===================================================================
--- archive/x7proto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,281 +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 x7proto-download-http "&xorg-download-http;/proto/">
-  <!ENTITY x7proto-download-ftp  "&xorg-download-ftp;/proto/">
-  <!ENTITY x7proto-size          "3.3 MB">
-  <!ENTITY x7proto-buildsize     "26 MB">
-  <!ENTITY x7proto-time          "0.8 SBU">
-
-  <!ENTITY bigreqsproto-version            "1.1.2">
-  <!ENTITY bigreqsproto-md5sum             "1a05fb01fa1d5198894c931cf925c025">
-
-  <!ENTITY compositeproto-version          "0.4.2">
-  <!ENTITY compositeproto-md5sum           "98482f65ba1e74a08bf5b056a4031ef0">
-
-  <!ENTITY damageproto-version             "1.2.1">
-  <!ENTITY damageproto-md5sum              "998e5904764b82642cc63d97b4ba9e95">
-
-  <!ENTITY dmxproto-version                "2.3.1">
-  <!ENTITY dmxproto-md5sum                 "4ee175bbd44d05c34d43bb129be5098a">
-
-  <!ENTITY dri2proto-version               "2.8">
-  <!ENTITY dri2proto-md5sum                "b2721d5d24c04d9980a0c6540cb5396a">
-
-  <!ENTITY dri3proto-version               "1.0">
-  <!ENTITY dri3proto-md5sum                "a3d2cbe60a9ca1bf3aea6c93c817fee3">
-
-  <!ENTITY fixesproto-version              "5.0">
-  <!ENTITY fixesproto-md5sum               "e7431ab84d37b2678af71e29355e101d">
-
-  <!ENTITY fontsproto-version              "2.1.3">
-  <!ENTITY fontsproto-md5sum               "36934d00b00555eaacde9f091f392f97">
-
-  <!ENTITY glproto-version                 "1.4.17">
-  <!ENTITY glproto-md5sum                  "5565f1b0facf4a59c2778229c1f70d10">
-
-  <!ENTITY inputproto-version              "2.3.2">
-  <!ENTITY inputproto-md5sum               "b290a463af7def483e6e190de460f31a">
-
-  <!ENTITY kbproto-version                 "1.0.7">
-  <!ENTITY kbproto-md5sum                  "94afc90c1f7bef4a27fdd59ece39c878">
-
-  <!ENTITY presentproto-version            "1.1">
-  <!ENTITY presentproto-md5sum             "92f9dda9c870d78a1d93f366bcb0e6cd">
-
-  <!ENTITY randrproto-version              "1.5.0">
-  <!ENTITY randrproto-md5sum               "a46765c8dcacb7114c821baf0df1e797">
-
-  <!ENTITY recordproto-version             "1.14.2">
-  <!ENTITY recordproto-md5sum              "1b4e5dede5ea51906f1530ca1e21d216">
-
-  <!ENTITY renderproto-version             "0.11.1">
-  <!ENTITY renderproto-md5sum              "a914ccc1de66ddeb4b611c6b0686e274">
-
-  <!ENTITY resourceproto-version           "1.2.0">
-  <!ENTITY resourceproto-md5sum            "cfdb57dae221b71b2703f8e2980eaaf4">
-
-  <!ENTITY scrnsaverproto-version          "1.2.2">
-  <!ENTITY scrnsaverproto-md5sum           "edd8a73775e8ece1d69515dd17767bfb">
-
-  <!ENTITY videoproto-version              "2.3.3">
-  <!ENTITY videoproto-md5sum               "fe86de8ea3eb53b5a8f52956c5cd3174">
-
-  <!ENTITY xcmiscproto-version             "1.2.2">
-  <!ENTITY xcmiscproto-md5sum              "5f4847c78e41b801982c8a5e06365b24">
-
-  <!ENTITY xextproto-version               "7.3.0">
-  <!ENTITY xextproto-md5sum                "70c90f313b4b0851758ef77b95019584">
-
-  <!ENTITY xf86bigfontproto-version        "1.2.0">
-  <!ENTITY xf86bigfontproto-md5sum         "120e226ede5a4687b25dd357cc9b8efe">
-
-  <!ENTITY xf86dgaproto-version            "2.1">
-  <!ENTITY xf86dgaproto-md5sum             "a036dc2fcbf052ec10621fd48b68dbb1">
-
-  <!ENTITY xf86driproto-version            "2.1.1">
-  <!ENTITY xf86driproto-md5sum             "1d716d0dac3b664e5ee20c69d34bc10e">
-
-  <!ENTITY xf86vidmodeproto-version        "2.3.1">
-  <!ENTITY xf86vidmodeproto-md5sum         "e793ecefeaecfeabd1aed6a01095174e">
-
-  <!ENTITY xineramaproto-version           "1.2.1">
-  <!ENTITY xineramaproto-md5sum            "9959fe0bfb22a0e7260433b8d199590a">
-
-  <!ENTITY xproto-version                  "7.0.31">
-  <!ENTITY xproto-md5sum                   "16791f7ca8c51a20608af11702e51083">
-
-]>
-
-<sect1 id="xorg7-proto" xreflabel="Xorg Protocol Headers">
-  <?dbhtml filename="x7proto.html"?>
-
-
-  <title>Xorg Protocol Headers</title>
-
-  <indexterm zone="xorg7-proto">
-    <primary sortas="a-xorg7-proto">Xorg Protocol Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Protocol Headers</title>
-
-    <para>The <application>Xorg</application> protocol headers provide the
-    header files required to build the system, and to allow other
-    applications to build against the installed X Window system.</para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&x7proto-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&x7proto-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download size: &x7proto-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &x7proto-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &x7proto-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Protocol Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"> <xref linkend="util-macros"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"> <xref linkend="sudo"/> and
-    <xref linkend="wget"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="fop"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/> (to build additional documentation)
-    </para>
-
-    <note><para>There is a reciprocal dependency with <xref linkend="fop"/>. If
-    you wish to build the documentation, you'll need to re-install the
-    Protocol Headers after the installation is complete and
-    <xref linkend="fop"/> has been installed.</para></note>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xorg7ProtocolHeaders'/></para>
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Protocol Headers</title>
-
-    <para>First, create a list of files to be downloaded. This file will also
-    be used to verify the integrity of the downloads when complete:</para>
-
-<screen><userinput>cat &gt; proto-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&bigreqsproto-md5sum;  bigreqsproto-&bigreqsproto-version;.tar.bz2
-&compositeproto-md5sum;  compositeproto-&compositeproto-version;.tar.bz2
-&damageproto-md5sum;  damageproto-&damageproto-version;.tar.bz2
-&dmxproto-md5sum;  dmxproto-&dmxproto-version;.tar.bz2
-&dri2proto-md5sum;  dri2proto-&dri2proto-version;.tar.bz2
-&dri3proto-md5sum;  dri3proto-&dri3proto-version;.tar.bz2
-&fixesproto-md5sum;  fixesproto-&fixesproto-version;.tar.bz2
-&fontsproto-md5sum;  fontsproto-&fontsproto-version;.tar.bz2
-&glproto-md5sum;  glproto-&glproto-version;.tar.bz2
-&inputproto-md5sum;  inputproto-&inputproto-version;.tar.bz2
-&kbproto-md5sum;  kbproto-&kbproto-version;.tar.bz2
-&presentproto-md5sum;  presentproto-&presentproto-version;.tar.bz2
-&randrproto-md5sum;  randrproto-&randrproto-version;.tar.bz2
-&recordproto-md5sum;  recordproto-&recordproto-version;.tar.bz2
-&renderproto-md5sum;  renderproto-&renderproto-version;.tar.bz2
-&resourceproto-md5sum;  resourceproto-&resourceproto-version;.tar.bz2
-&scrnsaverproto-md5sum;  scrnsaverproto-&scrnsaverproto-version;.tar.bz2
-&videoproto-md5sum;  videoproto-&videoproto-version;.tar.bz2
-&xcmiscproto-md5sum;  xcmiscproto-&xcmiscproto-version;.tar.bz2
-&xextproto-md5sum;  xextproto-&xextproto-version;.tar.bz2
-&xf86bigfontproto-md5sum;  xf86bigfontproto-&xf86bigfontproto-version;.tar.bz2
-&xf86dgaproto-md5sum;  xf86dgaproto-&xf86dgaproto-version;.tar.bz2
-&xf86driproto-md5sum;  xf86driproto-&xf86driproto-version;.tar.bz2
-&xf86vidmodeproto-md5sum;  xf86vidmodeproto-&xf86vidmodeproto-version;.tar.bz2
-&xineramaproto-md5sum;  xineramaproto-&xineramaproto-version;.tar.bz2
-&xproto-md5sum;  xproto-&xproto-version;.tar.bz2</literal>
-EOF</userinput></screen>
-
-    <para>To download the needed files using <application>wget</application>,
-    use the following commands:</para>
-
-<screen><userinput>mkdir proto &amp;&amp;
-cd proto &amp;&amp;
-grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
-    -B &xorg-download-http;/proto/ &amp;&amp;
-md5sum -c ../proto-&xorg-version;.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Protocol Headers</title>
-
-    &as_root;
-
-    <para>First, start a subshell that will exit on error:</para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>Install all of the packages by running the following
-    commands:</para>
-
-<screen><userinput>for package in $(grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}')
-do
-  packagedir=${package%.tar.bz2}
-  tar -xf $package
-  pushd $packagedir
-  ./configure $XORG_CONFIG
-  as_root make install
-  popd
-  rm -rf $packagedir
-done</userinput></screen>
-
-    <para>Finally, exit the shell that was started earlier:</para>
-
-<screen><userinput>exit</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>bash -e</command>: This command starts a subshell that will
-    exit if any command returns a value other than 0, causing the for loop to
-    exit immediately if an error occurs. This also eliminates the need for the
-    <command>&amp;&amp;</command> construct used elsewhere in the book.</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>None</seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/include/GL,
-          <envar>$XORG_PREFIX</envar>/include/X11,
-          <envar>$XORG_PREFIX</envar>/share/doc/bigreqsproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/compositeproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/damageproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/dri2proto,
-          <envar>$XORG_PREFIX</envar>/share/doc/dri3proto,
-          <envar>$XORG_PREFIX</envar>/share/doc/fixesproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/fontsproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/kbproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/presentproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/randrproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/recordproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/renderproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/resourceproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/scrnsaverproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/videoproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/xcmiscproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/xextproto and
-          <envar>$XORG_PREFIX</envar>/share/doc/xproto
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: chive/xchat.xml
===================================================================
--- archive/xchat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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;
-
-  <!ENTITY xchat-download-http "http://www.xchat.org/files/source/2.8/xchat-&xchat-version;.tar.bz2">
-  <!ENTITY xchat-download-ftp  "&gentoo-ftp-repo;/xchat-&xchat-version;.tar.bz2">
-  <!ENTITY xchat-md5sum        "6775c44f38e84d06c06c336b32c4a452">
-  <!ENTITY xchat-size          "1.4 MB">
-  <!ENTITY xchat-buildsize     "40 MB">
-  <!ENTITY xchat-time          "0.4 SBU">
-]>
-
-<sect1 id="xchat" xreflabel="XChat-&xchat-version;">
-  <?dbhtml filename="xchat.html"?>
-
-
-  <title>XChat-&xchat-version;</title>
-
-  <indexterm zone="xchat">
-    <primary sortas="a-XChat">XChat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XChat</title>
-
-    <para><application>XChat</application> is an IRC chat program.  It allows
-    you to join multiple IRC channels (chat rooms) at the same time, talk
-    publicly, have private one-on-one conversations, etc.  File transfers are
-    also possible.</para>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xchat-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xchat-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xchat-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xchat-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xchat-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xchat-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/xchat-&xchat-version;-glib-2.31-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XChat Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="glib2"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gtk2"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="enchant"/> (runtime),
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="GConf"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="python2"/>, and
-      <xref linkend="tcl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xchat"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XChat</title>
-
-    <para>Install <application>XChat</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../xchat-&xchat-version;-glib-2.31-1.patch &amp;&amp;
-
-LIBS+="-lgmodule-2.0"         \
-./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --enable-shm &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;
-install -v -m755 -d /usr/share/doc/xchat-&xchat-version; &amp;&amp;
-install -v -m644    README faq.html \
-                    /usr/share/doc/xchat-&xchat-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--enable-shm</parameter>: This parameter is used to enable
-    XShm for fast tinting.</para>
-
-    <para><option>--enable-ipv6</option>: Enable IPv6 support in xchat.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>xchat</seg>
-        <seg>XChat binding modules</seg>
-        <seg>/usr/lib/xchat and /usr/share/doc/xchat-&xchat-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xchat-prog">
-        <term><command>xchat</command></term>
-        <listitem>
-          <para> is a graphical Internet Relay Chat (IRC) client.</para>
-          <indexterm zone="xchat xchat-prog">
-            <primary sortas="b-xchat">xchat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- <varlistentry id="xchat-remote">
-        <term><command>xchat-remote</command></term>
-        <listitem>
-          <para> is a program for remote access
-          <application>XChat</application> using DBUS.</para>
-          <indexterm zone="xchat xchat-remote">
-            <primary sortas="b-xchat-remote">xchat-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/xconfig-dummy.xml
===================================================================
--- archive/xconfig-dummy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +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">
-
-
-  <title>Configuring X Window System</title>
-  <para/>
-</sect1>
-
Index: chive/xfce4-mixer.xml
===================================================================
--- archive/xfce4-mixer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +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-mixer-download-http
-           "http://archive.xfce.org/src/apps/xfce4-mixer/4.10/xfce4-mixer-&xfce4-mixer-version;.tar.bz2">
-  <!ENTITY xfce4-mixer-download-ftp  " ">
-  <!ENTITY xfce4-mixer-md5sum        "e47d5b3e873fdee3fa80d309a5f53e9c">
-  <!ENTITY xfce4-mixer-size          "452 KB">
-  <!ENTITY xfce4-mixer-buildsize     "9.3 MB">
-  <!ENTITY xfce4-mixer-time          "0.2 SBU">
-]>
-
-<sect1 id="xfce4-mixer" xreflabel="xfce4-mixer-&xfce4-mixer-version;">
-  <?dbhtml filename="xfce4-mixer.html"?>
-
-
-  <title>xfce4-mixer-&xfce4-mixer-version;</title>
-
-  <indexterm zone="xfce4-mixer">
-    <primary sortas="a-xfce4-mixer">xfce4-mixer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Mixer</title>
-
-    <para>
-      <application>Xfce4 Mixer</application> is a volume control
-      application for the <application>Xfce</application> desktop
-      based on <application>GStreamer</application>.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-mixer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-mixer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-mixer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-mixer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-mixer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-mixer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Mixer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="libunique"/> and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-      <para role="optional">
-      <xref linkend="keybinder2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xfce4-mixer"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Mixer</title>
-
-    <para>
-      Install <application>Xfce4 Mixer</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>
-          xfce4-mixer
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/pixmaps/xfce4-mixer and
-          /usr/share/xfce4-mixer
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-mixer-prog">
-        <term><command>xfce4-mixer</command></term>
-        <listitem>
-          <para>
-            is an audio mixer which allows you to adjust input
-            and output volume levels on your sound cards.
-          </para>
-          <indexterm zone="xfce4-mixer xfce4-mixer-prog">
-            <primary sortas="b-xfce4-mixer">xfce4-mixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/xfce4-xkb-plugin.xml
===================================================================
--- archive/xfce4-xkb-plugin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 xfce4-xkb-plugin-download-http
-           "http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.7/xfce4-xkb-plugin-&xfce4-xkb-plugin-version;.tar.bz2">
-  <!ENTITY xfce4-xkb-plugin-download-ftp  " ">
-  <!ENTITY xfce4-xkb-plugin-md5sum        "2f68e0d53baf68ecc1a7165ad33c26a9">
-  <!ENTITY xfce4-xkb-plugin-size          "820 KB">
-  <!ENTITY xfce4-xkb-plugin-buildsize     "7.8 MB">
-  <!ENTITY xfce4-xkb-plugin-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfce4-xkb-plugin" xreflabel="xfce4-xkb-plugin-&xfce4-xkb-plugin-version;">
-  <?dbhtml filename="xfce4-xkb-plugin.html"?>
-
-
-  <title>xfce4-xkb-plugin-&xfce4-xkb-plugin-version;</title>
-
-  <indexterm zone="xfce4-xkb-plugin">
-    <primary sortas="a-xfce4-xkb-plugin">xfce4-xkb-plugin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Keyboard Plugin</title>
-
-    <para>
-      If your system has a standard (US) keyboard, you probably do not need to
-      install this plugin.
-    </para>
-
-    <para>
-      The <application>Xfce4 Keyboard Plugin</application> package contains a
-      very customizable and useful <application>Xfce4</application> Panel
-      plugin to setup and use multiple (currently up to 4 due to X11 protocol
-      limitation) keyboard layouts and switch between them, individually by
-      application, individually by window, or globally for the desktop and all
-      applications and windows.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-xkb-plugin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-xkb-plugin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-xkb-plugin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-xkb-plugin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-xkb-plugin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-xkb-plugin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Keyboard Plugin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxklavier"/>, and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xfce4-xkb-plugin"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Keyboard Plugin</title>
-
-    <para>
-      Install <application>Xfce4 Keyboard Plugin</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -e 's|xfce4/panel-plugins|xfce4/panel/plugins|' \
-    -i panel-plugin/{Makefile.in,xkb-plugin.desktop.in.in} &amp;&amp;
-
-./configure --prefix=/usr         \
-            --libexecdir=/usr/lib \
-            --disable-debug       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ... xkb-plugin.desktop.in.in}</command> and
-      <parameter>--libexecdir=/usr/lib</parameter>: The sed and the
-      switch are necessary to place the xkb-plugin in the default
-      Xfce4 panel plugins directory.
-    </para>
-
-    <para>
-      <parameter>--disable-debug</parameter>: This switch disables debugging
-      support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-xkb-plugin
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xfce4/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-xkb-plugin-prog">
-        <term><command>xfce4-xkb-plugin</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> keyboard layout plugin.
-          </para>
-          <indexterm zone="xfce4-xkb-plugin xfce4-xkb-plugin-prog">
-            <primary sortas="b-xfce4-xkb-plugin">xfce4-xkb-plugin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/xinetd.xml
===================================================================
--- archive/xinetd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,503 +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;
-
-  <!-- Development seems to be over and the xinetd.og site does not seem to exist any more. -->
-  <!-- <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz"> -->
-  <!ENTITY xinetd-download-http " ">
-  <!ENTITY xinetd-download-ftp  "&sources-anduin-ftp;/xinetd/xinetd-&xinetd-version;.tar.gz">
-  <!ENTITY xinetd-md5sum        "77358478fd58efa6366accae99b8b04c">
-  <!ENTITY xinetd-size          "308 KB">
-  <!ENTITY xinetd-buildsize     "5.0 MB">
-  <!ENTITY xinetd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
-  <?dbhtml filename="xinetd.html"?>
-
-
-  <title>xinetd-&xinetd-version;</title>
-
-  <indexterm zone="xinetd">
-    <primary sortas="a-Xinetd">Xinetd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xinetd</title>
-
-    <para><application>xinetd</application> is the eXtended InterNET services
-    daemon, a secure replacement for <command>inetd</command>.</para>
-
-    &lfs7a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xinetd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xinetd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xinetd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xinetd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xinetd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xinetd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xinetd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="ftp://ftp.porcupine.org/pub/security/">TCP wrappers (deprecated)</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xinetd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xinetd</title>
-
-    <para>Install <application>xinetd</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i -e "s/exec_server/child_process/" xinetd/builtins.c       &amp;&amp;
-sed -i -e "/register unsigned count/s/register//" xinetd/itox.c  &amp;&amp;
-./configure --prefix=/usr --mandir=/usr/share/man --with-loadavg &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-     <title>Command Explanations</title>
-
-     <!-- CVE-2013-4342 https://bugzilla.redhat.com/show_bug.cgi?id=1006100 -->
-     <para><command>sed ... xinetd/builtins.c</command>: This command fixes
-     a security issue.</para>
-
-     <para><command>sed ... xinetd/itox.c</command>: This command fixes some
-     compiler warnings.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xinetd</title>
-
-    <sect3 id="xinetd-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/xinetd.conf</filename> and
-      <filename class="directory">/etc/xinetd.d/*</filename></para>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d">/etc/xinetd.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Ensure the path to all daemons is
-      <filename class="directory">/usr/sbin</filename>, rather than the default
-      path of <filename class="directory">/usr/bin</filename>, and install the
-      <application>xinetd</application> configuration files by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/xinetd.conf &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd
-# Configuration file for xinetd
-
-defaults
-{
-      instances       = 60
-      log_type        = SYSLOG daemon
-      log_on_success  = HOST PID USERID
-      log_on_failure  = HOST USERID
-      cps             = 25 30
-}
-
-# All service files are stored in the /etc/xinetd.d directory
-
-includedir /etc/xinetd.d
-
-# End /etc/xinetd</literal>
-EOF</userinput></screen>
-
-      <para>All of the following files have the statement, "disable = yes".
-      To activate any of the services, this statement will need to be changed
-      to "disable = no".</para>
-
-      <note>
-        <para>The following files are listed to demonstrate several
-        <application>xinetd</application> applications. In many cases, these
-        applications are not needed. Some classic applications are
-        considered security risks. For example, <command>telnet</command>,
-        <command>rlogin</command>, <command>rexec</command>, and
-        <command>rsh</command> transmit unencrypted usernames and passwords
-        over the network and can be easily replaced with a more secure
-        alternative: <command>ssh</command>.</para>
-      </note>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>install -v -d -m755 /etc/xinetd.d &amp;&amp;
-
-cat &gt; /etc/xinetd.d/systat &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/systat
-
-service systat
-{
-   disable           = yes
-   socket_type       = stream
-   wait              = no
-   user              = nobody
-   server            = /bin/ps
-   server_args       = -auwwx
-   only_from         = 128.138.209.0
-   log_on_success    = HOST
-}
-
-# End /etc/xinetd.d/systat</literal>
-EOF
-
-cat &gt; /etc/xinetd.d/echo &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/echo
-
-service echo
-{
-   disable     = yes
-   type        = INTERNAL
-   id          = echo-stream
-   socket_type = stream
-   protocol    = tcp
-   user        = root
-   wait        = no
-}
-
-service echo
-{
-   disable     = yes
-   type        = INTERNAL
-   id          = echo-dgram
-   socket_type = dgram
-   protocol    = udp
-   user        = root
-   wait        = yes
-}
-
-# End /etc/xinetd.d/echo</literal>
-EOF
-
-cat &gt; /etc/xinetd.d/chargen &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/chargen
-
-service chargen
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = chargen-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service chargen
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = chargen-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/chargen</literal>
-EOF
-
-cat &gt; /etc/xinetd.d/daytime &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/daytime
-
-service daytime
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = daytime-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service daytime
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = daytime-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/daytime</literal>
-EOF
-<!-- The last one without && -->
-cat &gt; /etc/xinetd.d/time &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd.d/time
-
-service time
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = time-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service time
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = time-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/time</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-login">/etc/xinetd.d/login</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-shell">/etc/xinetd.d/shell</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-exec">/etc/xinetd.d/exec</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-comsat">/etc/xinetd.d/comsat</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-talk">/etc/xinetd.d/talk</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-ntalk">/etc/xinetd.d/ntalk</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-telnet">/etc/xinetd.d/telnet</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-ftp">/etc/xinetd.d/ftp</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-tftp">/etc/xinetd.d/tftp</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-systat">/etc/xinetd.d/systat</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-finger">/etc/xinetd.d/finger</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-netstat">/etc/xinetd.d/netstat</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-echo">/etc/xinetd.d/echo</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-chargen">/etc/xinetd.d/chargen</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-daytime">/etc/xinetd.d/daytime</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-time">/etc/xinetd.d/time</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-rstatd">/etc/xinetd.d/rstatd</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-rquotad">/etc/xinetd.d/rquotad</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-ruserd">/etc/xinetd.d/ruserd</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-sprayd">/etc/xinetd.d/sprayd</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-walld">/etc/xinetd.d/walld</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-irc">/etc/xinetd.d/irc</primary>
-      </indexterm>
-
-      <para>The format of the <filename>/etc/xinetd.conf</filename> is
-      documented in the <filename>xinetd.conf.5</filename> man page.
-      <!-- 13-12-12 the http://www.xinetd.org is broken
-      Further
-      information can be found at <ulink url="http://www.xinetd.org"/>.
-      -->
-     </para>
-
-    </sect3>
-
-    <sect3  id="xinetd-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>As the <systemitem class="username">root</systemitem> user, install
-      the <phrase revision="sysv"><filename>/etc/rc.d/init.d/xinetd</filename>
-      init script</phrase>
-      <phrase revision="systemd"><filename>xinetd.service</filename>
-      unit</phrase> included in
-      the <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
-
-      <indexterm zone="xinetd xinetd-init">
-        <primary sortas="f-xinetd">xinetd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-xinetd</userinput></screen>
-
-      <para>As the <systemitem class="username">root</systemitem> user,
-      use the <phrase revision="sysv">new boot script</phrase>
-      <phrase revision="systemd"><command>systemctl</command> command</phrase>
-      to start <command>xinetd</command>:</para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/xinetd start</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl start xinetd</userinput></screen>
-
-      <para>Check the
-      <phrase revision="sysv"><filename>/var/log/daemon.log</filename></phrase>
-      <phrase revision="systemd"><command>journalctl</command> output</phrase>
-      to ensure the appropriate services are started. If no services are
-      enabled, the program will not start without the
-      <option>-stayalive</option> option.</para>
-
-<!--
-<screen><literal>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not
-executable [line=29]
-Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
-DISABLING SERVICE [line=29]
-Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
-executable [line=42]</literal></screen>
-
-      <para>These errors are because most of the servers
-      <command>xinetd</command> is trying to control are not
-      installed yet.</para>
--->
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>itox, xconv.pl, and xinetd</seg>
-        <seg>None</seg>
-        <seg>/etc/xinetd.d/</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="itox">
-        <term><command>itox</command></term>
-        <listitem>
-          <para>is a utility used for converting
-          <filename>inetd.conf</filename> files to
-          <filename>xinetd.conf</filename> format.</para>
-          <indexterm zone="xinetd itox">
-            <primary sortas="b-itox">itox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xconv.pl">
-        <term><command>xconv.pl</command></term>
-        <listitem>
-          <para>is a <application>Perl</application> script used for
-          converting <filename>inetd.conf</filename> files to
-          <filename>xinetd.conf</filename> format, similar to
-          <command>itox</command>.</para>
-          <indexterm zone="xinetd xconv.pl">
-            <primary sortas="b-xconv.pl">xconv.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xinetd-prog">
-        <term><command>xinetd</command></term>
-        <listitem>
-          <para>is the Internet services daemon.</para>
-          <indexterm zone="xinetd xinetd-prog">
-            <primary sortas="b-xinetd">xinetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/xpdf.xml
===================================================================
--- archive/xpdf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,270 +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 xpdf-download-http "http://gd.tuwien.ac.at/publishing/xpdf/xpdf-&xpdf-version;.tar.gz">
-  <!ENTITY xpdf-download-ftp  "ftp://ftp.foolabs.com/pub/xpdf/xpdf-&xpdf-version;.tar.gz">
-  <!ENTITY xpdf-md5sum        "599dc4cc65a07ee868cf92a667a913d2">
-  <!ENTITY xpdf-size          "674 KB">
-  <!ENTITY xpdf-buildsize     "46 MB">
-  <!ENTITY xpdf-time          "0.5 SBU">
-]>
-
-<sect1 id="xpdf" xreflabel="Xpdf-&xpdf-version;">
-  <?dbhtml filename="xpdf.html"?>
-
-
-  <title>Xpdf-&xpdf-version;</title>
-
-  <indexterm zone="xpdf">
-    <primary sortas="a-Xpdf">Xpdf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xpdf</title>
-
-    <para><application>Xpdf</application> is a viewer for Adobe's free
-    Portable Document Format (PDF) which is both fast and small and
-    comes with some useful command-line utilities.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xpdf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xpdf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xpdf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xpdf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xpdf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xpdf-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xpdf-&xpdf-version;-consolidated_pl5-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xpdf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="lesstif"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->
-    (just the fonts),
-    <ulink url="http://www.sfr-fresh.com/linux/misc/t1lib">t1lib</ulink>, and
-    <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/Xpdf"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xpdf</title>
-
-    <para>Install <application>Xpdf</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../xpdf-&xpdf-version;-consolidated_pl5-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-freetype2-includes=/usr/include/freetype2 \
-            --enable-opi \
-            --enable-multithreaded \
-            --enable-wordlist &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--enable-a4-paper</option>: This switch must be
-    added to set DIN A4 as the standard paper format.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xpdf</title>
-
-    <sect3 id="xpdf-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/xpdfrc</filename> and
-      <filename>~/.xpdfrc</filename></para>
-
-      <indexterm zone="xpdf xpdf-config">
-        <primary sortas="e-AA.xpdfrc">~/.xpdfrc</primary>
-      </indexterm>
-
-      <indexterm zone="xpdf xpdf-config">
-        <primary sortas="e-etc-xpdfrc">/etc/xpdfrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>In the <filename class='directory'>/etc</filename> directory you
-      will find a sample <filename>xpdfrc</filename> that can be either copied
-      to <filename>~/.xpdfrc</filename> or taken as an example to write your
-      own configuration file. Below you'll find a condensed version of the
-      file you may wish to build from.</para>
-
-<screen><literal># Example .xpdfrc
-displayFontT1 Times-Roman           /usr/share/ghostscript/fonts/n021003l.pfb
-displayFontT1 Times-Italic          /usr/share/ghostscript/fonts/n021023l.pfb
-displayFontT1 Times-Bold            /usr/share/ghostscript/fonts/n021004l.pfb
-displayFontT1 Times-BoldItalic      /usr/share/ghostscript/fonts/n021024l.pfb
-displayFontT1 Helvetica             /usr/share/ghostscript/fonts/n019003l.pfb
-displayFontT1 Helvetica-Oblique     /usr/share/ghostscript/fonts/n019023l.pfb
-displayFontT1 Helvetica-Bold        /usr/share/ghostscript/fonts/n019004l.pfb
-displayFontT1 Helvetica-BoldOblique /usr/share/ghostscript/fonts/n019024l.pfb
-displayFontT1 Courier               /usr/share/ghostscript/fonts/n022003l.pfb
-displayFontT1 Courier-Oblique       /usr/share/ghostscript/fonts/n022023l.pfb
-displayFontT1 Courier-Bold          /usr/share/ghostscript/fonts/n022004l.pfb
-displayFontT1 Courier-BoldOblique   /usr/share/ghostscript/fonts/n022024l.pfb
-displayFontT1 Symbol                /usr/share/ghostscript/fonts/s050000l.pfb
-displayFontT1 ZapfDingbats          /usr/share/ghostscript/fonts/d050000l.pfb
-
-fontDir                 /usr/share/fonts/X11-TTF
-
-psFile                  "|lpr"
-psPaperSize             letter
-#psPaperSize             A4
-textEOL                 unix
-
-enableT1lib             yes
-enableFreeType          yes
-antialias               yes
-
-urlCommand              "links -g %s"</literal></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content" id="xpdf-content"
-  xreflabel="See the Xpdf-&xpdf-version; program descriptions">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>pdffonts, pdfimages, pdfinfo, pdftoppm, pdftops, pdftotext,
-        and xpdf</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pdffonts">
-        <term><command>pdffonts</command></term>
-        <listitem>
-          <para>lists the fonts used in a PDF file along
-          with various information for each font.</para>
-          <indexterm zone="xpdf pdffonts">
-            <primary sortas="b-pdffonts">pdffonts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfimages">
-        <term><command>pdfimages</command></term>
-        <listitem>
-          <para>saves images from a PDF file as PPM, PBM, or JPEG files.</para>
-          <indexterm zone="xpdf pdfimages">
-            <primary sortas="b-pdfimages">pdfimages</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfinfo">
-        <term><command>pdfinfo</command></term>
-        <listitem>
-          <para>prints the contents of the 'Info' dictionary (plus some
-          other useful information) from a PDF file.</para>
-          <indexterm zone="xpdf pdfinfo">
-            <primary sortas="b-pdfinfo">pdfinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftoppm">
-        <term><command>pdftoppm</command></term>
-        <listitem>
-          <para>converts PDF files to PBM, PGM and PPM formats.</para>
-          <indexterm zone="xpdf pdftoppm">
-            <primary sortas="b-pdftoppm">pdftoppm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftops">
-        <term><command>pdftops</command></term>
-        <listitem>
-          <para> converts PDF files to Postscript format.</para>
-          <indexterm zone="xpdf pdftops">
-            <primary sortas="b-pdftops">pdftops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftotext">
-        <term><command>pdftotext</command></term>
-        <listitem>
-          <para>parses ASCII text from PDF files.</para>
-          <indexterm zone="xpdf pdftotext">
-            <primary sortas="b-pdftotext">pdftotext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpdf-prog">
-        <term><command>xpdf</command></term>
-        <listitem>
-          <para>displays files in PDF format.</para>
-          <indexterm zone="xpdf xpdf-prog">
-            <primary sortas="b-xpdf">xpdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/xsane.xml
===================================================================
--- archive/xsane.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,223 +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 xsane-download-http "&sources-anduin-http;/xsane/xsane-&xsane-version;.tar.gz">
-  <!ENTITY xsane-download-ftp  "&sources-anduin-ftp;/xsane/xsane-&xsane-version;.tar.gz">
-  <!ENTITY xsane-md5sum        "9927f21e1ab6ba96315e7f0e30746deb">
-  <!ENTITY xsane-size          "2.9 MB">
-  <!ENTITY xsane-buildsize     "23 MB">
-  <!ENTITY xsane-time          "0.2 SBU">
-]>
-
-<sect1 id="xsane" xreflabel="XSane-&xsane-version;">
-  <?dbhtml filename="xsane.html"?>
-
-
-  <title>XSane-&xsane-version;</title>
-
-  <indexterm zone="xsane">
-    <primary sortas="a-XSane">XSane</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XSane</title>
-
-    <para>
-      <application>XSane</application> is another front end for
-      <xref linkend="sane"/>. It has additional features to improve the image
-      quality and ease of use compared to <command>xscanimage</command>.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xsane-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xsane-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xsane-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xsane-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xsane-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xsane-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XSane Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="sane"/> (back ends)
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xdg-utils"/> (for the help documentation at runtime)
-    </para>-->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lcms"/> and
-      <xref linkend="gimp"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XSane</title>
-
-    <para>
-      Install <application>XSane</application> by running the following
-      commands:
-    </para>
-
-<!--sed -i -e 's/netscape/xdg-open/'                   src/xsane.h      &amp;&amp;-->
-<screen><userinput>sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c &amp;&amp;
-./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 xsanedocdir=/usr/share/doc/xsane-&xsane-version; install &amp;&amp;
-ln -v -s ../../doc/xsane-&xsane-version; /usr/share/sane/xsane/doc</userinput></screen>
-<!--
-    <para>
-      If you have not installed <xref linkend="xdg-utils"/> and have not
-      issued the first sed:
-    </para>-->
-    <para>
-      A browser of your choice can be used to get inline help, using the
-      following command,  as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>ln -v -s &lt;browser&gt; /usr/bin/netscape</userinput></screen>
-
-    <note>
-      <para>
-        Be sure to replace &lt;browser&gt; with the browser of your
-        choice on your system.
-      </para>
-    </note>
-
-    <para>
-      Alternatively, if the environment variable BROWSER is set to the browser
-      you want to use, eg, BROWSER="/usr/bin/firefox", the first time you run
-      <command>xsane</command>, it will be recorded in <filename>
-      ~/.sane/xsane/xsane.rc</filename>. If you wish to change it, edit this
-      file, or remove it, and use the instructions above, so that a new one is
-      created.
-    </para>
-
-    <para>
-      If <application>GIMP</application> is installed, issue the following
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>sed -i -e 's/netscape/xdg-open/' src/xsane.h </command>:
-      This is to use <command>xdg-open</command> for the help documentation,
-      instead of the hardcoded browser.
-    </para>-->
-
-    <para>
-      <command>ln -v -s ../../doc/xsane-&xsane-version;
-      /usr/share/sane/xsane/doc</command>: This symlink is created to ensure
-      that any program that looks for the <application>XSane</application>
-      documentation in the default location will find it, as the documentation
-      is installed in an alternate location specified in the <command>make
-      install</command> command.
-    </para>
-
-    <para>
-      <command>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</command>:
-      This creates a link in the system-wide <application>GIMP</application>
-      <filename class='directory'>plug-ins</filename> directory so that users
-      can access <application>XSane</application> directly from
-      <application>GIMP</application>. <application>GIMP</application> must
-      be available before building <application>XSane</application> for this
-      to work. Alternatively, create the link in <filename
-      class='directory'>~/.gimp-2.0/plug-ins/</filename> to provide individual
-      user access. <command>man xsane</command> for additional information.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>xsane</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/xsane-&xsane-version; and
-        /usr/share/sane/xsane</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xsane-prog">
-        <term><command>xsane</command></term>
-        <listitem>
-          <para>
-            is a graphical user-interface to control an image acquisition
-            device such as a flatbed scanner
-          </para>
-          <indexterm zone="xsane xsane-prog">
-            <primary sortas="b-xsane">xsane</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/xulrunner.xml
===================================================================
--- archive/xulrunner.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,378 +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 xulrunner-download-http
-           "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">-->
-  <!ENTITY xulrunner-download-http
-           "http:///ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-download-ftp
-           "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-md5sum        "499b70a9f08a2291d528e87eaf8804a3">
-  <!ENTITY xulrunner-size          "141 MB">
-  <!-- measured on LFS-7.5 x86_64 -->
-  <!ENTITY xulrunner-buildsize     "4.9 GB (103 MB installed)">
-  <!ENTITY xulrunner-time          "46 SBU">
-]>
-
-<sect1 id="xulrunner" xreflabel="Xulrunner-&xulrunner-version;">
-  <?dbhtml filename="xulrunner.html" ?>
-
-
-  <title>Xulrunner-&xulrunner-version;</title>
-
-  <indexterm zone="xulrunner">
-    <primary sortas="a-Xulrunner">Xulrunner</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xulrunner</title>
-
-    <para>
-      <application>Xulrunner</application> is a runtime environment for XUL
-      applications, and forms the major part of the
-      <application>Mozilla</application> codebase. In particular, it provides
-      the Gecko engine together with pkgconfig files so that other applications
-      can find and use it.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xulrunner-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xulrunner-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xulrunner-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xulrunner-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xulrunner-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xulrunner-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xulrunner Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="zip"/> and
-      <xref linkend="unzip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>,
-      <xref linkend="libevent"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="yasm"/>
-    </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>
-
-    <note>
-      <para>
-        With <application>Firefox-31.0</application> and later versions, 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 Xulrunner), check if
-        <filename>/usr/lib/python2.7/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 - if that package has not already
-        been installed).
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="gst-plugins-base"/> (with
-      <xref linkend="gst-plugins-good"/> and
-      <xref linkend="gst-ffmpeg"/> at runtime), or
-      <xref linkend="gst10-plugins-base"/> (with
-      <xref linkend="gst10-plugins-good"/> and
-      <xref linkend="gst10-libav"/> at runtime),
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="wget"/> and
-      <xref linkend="wireless_tools"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xulrunner"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xulrunner</title>
-
-    <para>
-      The configuration of <application>Xulrunner</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 each one), issue <command>./configure
-      --help</command>. You should review the entire file and comment or
-      uncomment options as necessary.
-    </para>
-
-<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-# If you have a multicore machine, firefox will now use all the cores by
-# default. Exceptionally, you can reduce the number of cores, 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:
-ac_add_options --disable-dbus
-
-# If you have installed dbus-glib, and 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
-
-# If you have installed libnotify comment out this line:
-ac_add_options --disable-libnotify
-
-# GStreamer is necessary for H.264 video playback in HTML5 Video Player;
-# to be enabled, also remember to set "media.gstreamer.enabled" to "true"
-# in about:config. If you have GStreamer 0.x.y, uncomment this line:
-#ac_add_options --enable-gstreamer
-# or uncomment this line, if you have GStreamer 1.x.y
-#ac_add_options --enable-gstreamer=1.0
-
-# Uncomment these lines if you have installed optional dependencies:
-#ac_add_options --enable-system-hunspell
-#ac_add_options --enable-startup-notification
-
-# Comment out following option if you have PulseAudio installed
-ac_add_options --disable-pulseaudio
-
-# If you have not installed Yasm then uncomment this line:
-#ac_add_options --disable-webm
-
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-
-# The BLFS editors recommend not changing anything below this line:
-ac_add_options --prefix=/usr
-ac_add_options --enable-application=xulrunner
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-ac_add_options --enable-shared-js
-ac_add_options --with-pthreads
-
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/xulrunner-build-dir
-EOF</userinput></screen>
-
-    <note>
-      <para>
-        <application>Xulrunner</application>'s build uses large amount of
-        memory. On some systems, the RAM/Swap combination needs 6 GB available.
-      </para>
-    </note>
-
-    <para>
-      Build <application>Xulrunner</application> by issuing the following
-      commands:
-    </para>
-
-    <note><para>
-      If you are compiling <application>Xulrunner</application> in chroot,
-      prepend <envar>SHELL=/bin/bash</envar> to the first make command below.
-    </para></note>
-
-<screen><userinput>sed -i '/^template class/s/JS::WeakMapPtr/JS_PUBLIC_API(&amp;)/' \
-       js/src/vm/WeakMapPtr.cpp &amp;&amp;
-make -f client.mk</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Install, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C xulrunner-build-dir install &amp;&amp;
-
-mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
-rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
-
-chmod -v 755 /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &amp;&amp;
-
-for library in libmozalloc.so libmozjs.so libxul.so; do
-    ln -sfv ../../../xulrunner-&xulrunner-version;/$library \
-            /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
-    ln -sfv xulrunner-&xulrunner-version;/$library /usr/lib/$library
-done
-
-ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
-        /usr/lib/xulrunner-&xulrunner-version;
-ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
-        /usr/lib/xulrunner-&xulrunner-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... js/src/vm/WeakMapPtr.cpp</command>: Fixes build with
-      <command>ac_add_options --enable-shared-js</command>.
-    </para>
-
-    <para>
-      <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>
-
-    <para>
-      <command>ln -sfv ../mozilla/plugins ...</command>: Some packages will
-      install browser plugins into
-      <filename class="directory">/usr/lib/mozilla/plugins</filename>.
-      Creating this symlink <application>Xulrunner</application> keeps
-      additional plugins in a common directory.
-    </para>
-
-    <para>
-      <command>for library in libmozalloc.so libmozjs.so libxul.so ...
-      </command>: The libraries shipped with this package are installed into
-      <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
-      which means they will not be found at runtime. These commands make
-      relative symbolic links to the shared libraries from
-      <filename class="directory">/usr/lib</filename>. They will also replace duplicate
-      libraries that are installed in
-      <filename class="directory">/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib</filename>
-      with symlinks in order to save some space.
-    </para>
-
-    <para>
-      <command>ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/ ...</command>
-      The <filename>run-mozilla.sh</filename> and <filename>xpcshell</filename> files
-      have been moved in this version, but the code which installs
-      <application>Firefox</application> (when linked to xulrunner) was not updated.
-      These symlinks allow<application>Firefox</application> to install when built against
-      <application>Xulrunner</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xulrunner
-        </seg>
-        <seg>
-          Numerous libraries, browser components, plugins, extensions, and
-          helper modules installed in <filename
-          class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
-        </seg>
-        <seg>
-          /usr/include/xulrunner-&xulrunner-version;,
-          /usr/lib/xulrunner-&xulrunner-version;,
-          /usr/lib/xulrunner-devel-&xulrunner-version; and
-          /usr/share/idl/xulrunner-&xulrunner-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xulrunner-prog">
-        <term><command>xulrunner</command></term>
-        <listitem>
-          <para>
-            is a shell script used for identifying the installed version
-            and running <application>Xulrunner</application> applications.
-          </para>
-          <indexterm zone="xulrunner xulrunner-prog">
-            <primary sortas="b-xulrunner">xulrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: basicnet/basicnet.ent
===================================================================
--- basicnet/basicnet.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/basicnet.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,59 @@
+<!ENTITY basicnet SYSTEM "basicnet.xml">
+
+<!-- Networking Libraries -->
+<!ENTITY basicnet-netlibs SYSTEM "netlibs/netlibs.xml">
+<!ENTITY % curl SYSTEM "netlibs/curl/curl.ent">
+<!ENTITY % wvstreams SYSTEM "netlibs/wvstreams/wvstreams.ent">
+%curl;
+%wvstreams;
+
+<!-- Text Web Browsers -->
+<!ENTITY basicnet-textweb SYSTEM "textweb/textweb.xml">
+<!ENTITY % links SYSTEM "textweb/links/links.ent">
+<!ENTITY % lynx SYSTEM "textweb/lynx/lynx.ent">
+<!ENTITY % w3m SYSTEM "textweb/w3m/w3m.ent">
+%links;
+%lynx;
+%w3m
+
+<!-- Basic Networking Programs -->
+<!ENTITY basicnet-netprogs SYSTEM "netprogs/netprogs.xml">
+<!ENTITY basicnet-netprogs-opensshclient SYSTEM "netprogs/openssh-client.xml">
+<!ENTITY % ncftp SYSTEM "netprogs/ncftp/ncftp.ent">
+<!ENTITY % telnet SYSTEM "netprogs/telnet/telnet.ent">
+<!ENTITY % cvs SYSTEM "netprogs/cvs/cvs.ent">
+<!ENTITY % wget SYSTEM "netprogs/wget/wget.ent">
+%ncftp;
+%telnet;
+%cvs;
+%wget;
+
+<!-- Basic Networking Utilities -->
+<!ENTITY basicnet-netutils SYSTEM "netutils/netutils.xml">
+<!ENTITY % traceroute SYSTEM "netutils/traceroute/traceroute.ent">
+<!ENTITY % nmap SYSTEM "netutils/nmap/nmap.ent">
+<!ENTITY % whois SYSTEM "netutils/whois/whois.ent">
+%traceroute;
+%nmap;
+%whois;
+
+<!-- Mail and News Progs -->
+<!ENTITY basicnet-mailnews SYSTEM "mailnews/mailnews.xml">
+<!ENTITY basicnet-mailnews-othermn SYSTEM "mailnews/other.xml">
+<!ENTITY % procmail SYSTEM "mailnews/procmail/procmail.ent">
+<!ENTITY % fetchmail SYSTEM "mailnews/fetchmail/fetchmail.ent">
+<!ENTITY % mutt SYSTEM "mailnews/mutt/mutt.ent">
+<!ENTITY % pine SYSTEM "mailnews/pine/pine.ent">
+<!ENTITY % slrn SYSTEM "mailnews/slrn/slrn.ent">
+%procmail;
+%fetchmail;
+%mutt;
+%pine;
+%slrn;
+
+<!-- DJB -->
+<!ENTITY basicnet-djb SYSTEM "djb/djb.xml">
+<!ENTITY % daemontools SYSTEM "djb/daemontools/daemontools.ent">
+<!ENTITY % ucspi-tcp SYSTEM "djb/ucspi-tcp/ucspi-tcp.ent">
+%daemontools;
+%ucspi-tcp;
Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/basicnet.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<part id="basicnet" xreflabel="Basic Networking">
+<?dbhtml filename="basicnet.html" dir="basicnet"?>
+<title>Basic Networking</title>
+
+&basicnet-netlibs;
+&basicnet-textweb;
+&basicnet-netprogs;
+&basicnet-netutils;
+&basicnet-mailnews;
+&basicnet-djb;
+
+</part>
Index: basicnet/djb/daemontools-man.xml
===================================================================
--- basicnet/djb/daemontools-man.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools-man.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="daemontools-man" xreflabel="daemontools-man">
+<?dbhtml filename="daemontools-man.html" dir="basicnet"?>
+<title>daemontools-man-&daemontools-man-version;</title>
+
+&daemontools-man-intro;
+&daemontools-man-inst;
+&daemontools-man-exp;
+&daemontools-man-desc;
+
+</sect1>
+
Index: basicnet/djb/daemontools.xml
===================================================================
--- basicnet/djb/daemontools.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="daemontools" xreflabel="daemontools">
+<?dbhtml filename="daemontools.html" dir="basicnet"?>
+<title>daemontools-&daemontools-version;</title>
+
+&daemontools-intro;
+&daemontools-inst;
+&daemontools-exp;
+&daemontools-desc;
+
+</sect1>
+
Index: basicnet/djb/daemontools/daemontools-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,83 @@
+<sect2>
+<title>Contents</title>
+
+<para>The daemontools package contains <userinput>svscanboot svscan 
+supervise svc svok svstat fghack pgrphack readproctitle multilog tai64n 
+tai64nlocal setuidgid envuidgid envdir softlimit</userinput> and 
+<userinput>setlock</userinput>. More detailed descriptions of these 
+commands may be found at http://cr.yp.to/daemontools.html.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>svscanboot</title>
+<para>svscanboot is simply a script that calls svscan and pipes its output 
+to readproctitle.</para></sect3>
+
+<sect3><title>svscan</title>
+<para>svscan checks the service directory for daemons to run and starts 
+a supervise process for each run script that it finds.</para></sect3>
+
+<sect3><title>supervise</title>
+<para>supervise runs the run script passed to it by svscan and monitors 
+the process the script starts so that if it dies, supervise restarts it.
+</para></sect3>
+
+<sect3><title>svc</title>
+<para>svc sends signals to processes being run under supervise.
+</para></sect3>
+
+<sect3><title>svok</title>
+<para>svok checks to see that supervise is running in the directory 
+passed to it.</para></sect3>
+
+<sect3><title>svstat</title>
+<para>svstat prints the status of processes monitored by supervise.
+</para></sect3>
+
+<sect3><title>fghack</title>
+<para>fghack prevents processes from putting themselves into the 
+background.</para></sect3>
+
+<sect3><title>pgrphack</title>
+<para>pgrphack runs a process in a separate process group.</para>
+</sect3>
+
+<sect3><title>readproctitle</title>
+<para>readproctitle displays log entries in the output of ps.</para>
+</sect3>
+
+<sect3><title>multilog</title>
+<para>multilog is a logging program. It takes output from a daemon and 
+appends it to any number of logs.</para></sect3>
+
+<sect3><title>tai64n</title>
+<para>tai64n is a timestamp generating program.</para></sect3>
+
+<sect3><title>tai64nlocal</title>
+<para>tai64nlocal converts output of tai64n into a human readable 
+format.</para></sect3>
+
+<sect3><title>setuidgid</title>
+<para>setuidgid runs a specified program under a given account's uid 
+and gid.</para></sect3>
+
+<sect3><title>envuidgid</title>
+<para>envuidgid performs the same function as setuidgid, but sets 
+environment variables $UID and $GID equal to the uid and gid of the 
+account specified.</para></sect3>
+
+<sect3><title>envdir</title>
+<para>envdir runs a given program with environment variables specified 
+by files in a directory.</para></sect3>
+
+<sect3><title>softlimit</title>
+<para>softlimit allows resource limits to be set for a given program.
+</para></sect3>
+
+<sect3><title>setlock</title>
+<para>setlock locks a file and runs a program.</para></sect3>
+
+</sect2>
+
Index: basicnet/djb/daemontools/daemontools-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,56 @@
+<sect2>
+<title>Command explanations</title>
+
+<para>The first thing to understand in installing any package written 
+by Daniel J. Bernstein, and 
+this includes Qmail, djbdns and ucspi-tcp in addition to daemontools, is 
+that he is willing to completely disregard standards if his idea of the 
+correct thing to do differs from an particular standard. Professor 
+Bernstein is a standards body unto himself when it comes to his own 
+software. </para>
+
+<para>It is therefore necessary to make quite a few changes to the 
+installation commands for his packages to get them to install in a manner 
+that is compliant with the Filesystem Hierarchy Standard (FHS). Most of 
+the following commands are due to this difficulty.</para>
+
+<para><userinput>cd admin/daemontools-0.76: </userinput>First off, the 
+package is unpacked in an "admin" directory. You will find the actual 
+packages two directory levels below this.</para>
+
+<para><userinput>package/compile: </userinput>This command actually 
+compiles the source and puts the binaries in a command directory.</para>
+
+<para><screen><userinput>sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~</userinput>
+<userinput>mv boot.inittab~ boot.inittab</userinput></screen></para>
+<para>These two commands are necessary to get the 
+binaries installed in /usr/sbin rather than 
+creating a non-standard /command directory and installing them there.
+</para>
+
+<para><screen><userinput>sed 's|/command:/usr/local/bin:/usr/local/sbin:||' svscanboot &gt; svscanboot~</userinput>
+<userinput>sed 's|/service|/etc/service|g' svscanboot~ &gt; svscanboot</userinput>
+<userinput>rm svscanboot~</userinput></screen></para>
+<para>This changes the svscanboot script so that it checks the 
+/etc/service directory for daemons to run instead of the default 
+/service directory.</para>
+
+<para><userinput>cp * /usr/sbin: </userinput>We must manually copy the 
+binaries to the /usr/sbin directory.</para>
+
+<para><screen><userinput>cat /etc/inittab boot.inittab &gt; /etc/inittab~</userinput>
+<userinput>mv -f /etc/inittab~ /etc/inittab</userinput></screen></para>
+
+<para>These commands append a line to /etc/inittab so that init will launch
+the svscan program.</para>
+
+<para><userinput>telinit Q: </userinput>This command tells the init 
+process to re-read its configuration file (inittab) and act upon any 
+changes that have been made.</para>
+
+<para><userinput>mkdir /etc/service: </userinput>This command creates
+the daemontools control directory, which needs to exist, even if empty
+for daemontools to run properly.</para>
+
+</sect2>
+
Index: basicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Installation of daemontools</title>
+
+<para>Install daemontools by running the following commands:</para>
+
+<para><screen><userinput>cd admin/daemontools-0.76 &amp;&amp; 
+package/compile &amp;&amp;
+cd package &amp;&amp; 
+sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~ &amp;&amp; 
+mv boot.inittab~ boot.inittab &amp;&amp;
+cd ../command &amp;&amp;
+sed 's|/command:/usr/local/bin:/usr/local/sbin:||' svscanboot &gt; svscanboot~ &amp;&amp;
+sed 's|/service|/etc/service|g' svscanboot~ &gt; svscanboot &amp;&amp; 
+rm svscanboot~ &amp;&amp; 
+cp * /usr/sbin &amp;&amp;
+cd ../package &amp;&amp; 
+cat /etc/inittab boot.inittab &gt; /etc/inittab~ &amp;&amp; 
+mv -f /etc/inittab~ /etc/inittab &amp;&amp; 
+telinit Q &amp;&amp;
+mkdir /etc/service</userinput></screen></para>
+</sect2>
+
Index: basicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to Daemontools</title>
+
+<screen>Download location:              &daemontools-download;
+Version used:                   &daemontools-version;
+Package size:                   &daemontools-size;
+Estimated Disk space required:  &daemontools-buildsize;</screen>
+
+<para>The daemontools package is a replacement for inetd or xinetd. The main 
+reason for using it here is because it's recommended for use with Qmail 
+and djbdns.</para>
+
+</sect2>
Index: basicnet/djb/daemontools/daemontools-man-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-man-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Contents</title>
+
+<para>The daemontools-man package contains manpages for the daemontools
+commands <userinput>envdir envuidgid fghack multilog pgrphack
+readproctitle setlock setuidgid softlimit supervise svc svok svscan
+svscanboot svstat tai64n</userinput> and
+<userinput>tai64nlocal</userinput>.</para>
+
+</sect2>
Index: basicnet/djb/daemontools/daemontools-man-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-man-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>gzip -9 *.8: </userinput>You can compress the manpages
+to save space, but it isn't needed for the manpages to work.</para>
+
+<para><userinput>package/compile: </userinput>This command actually 
+compiles the source and puts the binaries in a command directory.</para>
+
+</sect2>
+
Index: basicnet/djb/daemontools/daemontools-man-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-man-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of daemontools</title>
+
+<para>Install daemontools by running the following commands:</para>
+
+<para><screen><userinput>cd daemontools-man &amp;&amp; 
+gzip -9 *.8 &amp;&amp;
+cp *.8.gz /usr/share/man/man8/</userinput></screen></para>
+</sect2>
+
Index: basicnet/djb/daemontools/daemontools-man-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools-man-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Introduction to Daemontools-man</title>
+
+<screen>Download location:              &daemontools-man-download;
+Version used:                   &daemontools-man-version;
+Package size:                   &daemontools-man-size;
+Estimated Disk space required:  &daemontools-man-buildsize;</screen>
+
+<para>The Daemontools package does not come with manpages, so install
+this package if you want online help with the daemontools programs.</para>
+
+</sect2>
Index: basicnet/djb/daemontools/daemontools.ent
===================================================================
--- basicnet/djb/daemontools/daemontools.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/daemontools/daemontools.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<!ENTITY daemontools SYSTEM "../daemontools.xml">
+<!ENTITY daemontools-intro SYSTEM "daemontools-intro.xml">
+<!ENTITY daemontools-inst SYSTEM "daemontools-inst.xml">
+<!ENTITY daemontools-exp SYSTEM "daemontools-exp.xml">
+<!ENTITY daemontools-desc SYSTEM "daemontools-desc.xml">
+<!ENTITY daemontools-buildsize "approximately 1 MB">
+<!ENTITY daemontools-version "0.76">
+<!ENTITY daemontools-download "http://cr.yp.to/daemontools/daemontools-0.76.tar.gz" >
+<!ENTITY daemontools-size "162 KB">
+
+<!ENTITY daemontools-man SYSTEM "../daemontools-man.xml">
+<!ENTITY daemontools-man-intro SYSTEM "daemontools-man-intro.xml">
+<!ENTITY daemontools-man-inst SYSTEM "daemontools-man-inst.xml">
+<!ENTITY daemontools-man-exp SYSTEM "daemontools-man-exp.xml">
+<!ENTITY daemontools-man-desc SYSTEM "daemontools-man-desc.xml">
+<!ENTITY daemontools-man-buildsize "approximately 1 MB">
+<!ENTITY daemontools-man-version "0.76">
+<!ENTITY daemontools-man-download "http://smarden.org/pape/djb/manpages/daemontools-0.76-man.tar.gz" >
+<!ENTITY daemontools-man-size "8 KB">
Index: basicnet/djb/djb.xml
===================================================================
--- basicnet/djb/djb.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/djb.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<chapter id="basicnet-djb">
+<?dbhtml filename="djb.html" dir="basicnet"?>
+<title>DJB's Utilities</title>
+
+<para>Intro & Who want's to use them?</para>
+
+&daemontools;
+&daemontools-man;
+&ucspi-tcp;
+
+</chapter>
Index: basicnet/djb/ucspi-tcp.xml
===================================================================
--- basicnet/djb/ucspi-tcp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="ucspi-tcp" xreflabel="ucspi-tcp">
+<?dbhtml filename="ucspi-tcp.html" dir="basicnet"?>
+<title>ucspi-tcp-&ucspi-tcp-version;</title>
+
+&ucspi-tcp-intro;
+&ucspi-tcp-inst;
+&ucspi-tcp-exp;
+&ucspi-tcp-desc;
+
+</sect1>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,82 @@
+<sect2>
+<title>Contents</title>
+
+<para>The ucspi-tcp package contains <userinput>tcpserver, tcprules, 
+tcprulescheck, argv0, fixcrio, recordio, rblsmtpd, tcpclient, who@,
+date@, finger@, http@, tcpcat, mconnect, addcr, delcr</userinput></para>
+
+<para>You can also find detailed descriptions of each of these programs at 
+http://cr.yp.to/ucspi-tcp/tcpserver.html, but here is a brief summary:</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>tcpserver</title>
+<para>tcpserver listens for incoming tcp connections on a given port, and runs 
+a program of your choosing in response to a connection.</para></sect3>
+
+<sect3><title>tcprules</title>
+<para>tcprules compiles rules that govern access control for tcpserver into a 
+fast access database format.</para></sect3>
+
+<sect3><title>tcprulescheck</title>
+<para>tcprulescheck makes it possible to see how tcpserver will react to 
+connections from a given address without actually having to connect via that 
+address. This is useful for checking to see if the access control rules you 
+are using are doing what you expected.</para></sect3>
+
+<sect3><title>argv0</title>
+<para>argv0 runs a given program with a specified 0th argument.</para></sect3>
+
+<sect3><title>fixcrio</title>
+<para>fixcrio inserts carriage returns at the end of lines when they are 
+missing.</para></sect3>
+
+<sect3><title>recordio</title>
+<para>recordio records all input and output of a program given as an 
+argument.</para></sect3>
+
+<sect3><title>rblsmtpd</title>
+<para>rblsmtpd is a spam blocking program that works in conjunction with your 
+smtp daemon and tcpserver.</para></sect3>
+
+<sect3><title>tcpclient</title>
+<para>tcpclient creates a connection to a tcp port for a given 
+program.</para></sect3>
+
+<sect3><title>who@</title>
+<para>who@ is a demonstration program using tcpclient that has the 
+functionality of the rwho program. It requires a server running sysstat 
+on port 11.</para></sect3>
+
+<sect3><title>date@</title>
+<para>date@ is a demonstration program using tcpclient that will return the 
+system time of a remote host which is running a daytime service on 
+port 13.</para></sect3>
+
+<sect3><title>finger@</title>
+<para>finger@ is a demonstration program using tcpclient that mimics the 
+functionality of the finger program. It requires a server running fingerd 
+on port 79.</para></sect3>
+
+<sect3><title>http@</title>
+<para>http@ downloads web pages from web servers.</para></sect3>
+
+<sect3><title>tcpcat</title>
+<para>tcpcat connects to a tcp port and prints all that is returned from the 
+port.</para></sect3>
+
+<sect3><title>mconnect</title>
+<para>mconnect connects to a tcp port, delivers any input specified to the 
+port, and prints any output from the port.</para></sect3>
+
+<sect3><title>addcr</title>
+<para>addcr adds carriage returns to files. This and delcr are useful for 
+converting between Windows to UNIX file formats.</para></sect3>
+
+<sect3><title>delcr</title>
+<para>delcr removes carriage returns from files.</para></sect3>
+
+</sect2>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><userinput>sed 's|/usr/local|/usr|' conf-home &gt; conf-home~</userinput>
+<userinput>mv conf-home~ conf-home</userinput>
+<userinput>sed 's/bin/sbin/' hier.c &gt; hier.c~</userinput>
+<userinput>mv hier.c~ hier.c :</userinput></screen> 
+These commands change the installation directory to /usr/sbin from the default 
+of /usr/local/bin. Since these tools are used in conjuction with daemons, 
+they don't make much sense in general user directories. However, some of the 
+example programs and the tcpclient program might be of use to non-root users. 
+If you wish to make these available, then we would suggest installing as above, 
+and then executing the following commands: 
+<screen><userinput>cd /usr/sbin</userinput>
+<userinput>mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin</userinput></screen>This 
+will place the client related programs into /usr/bin for general use.</para>
+
+</sect2>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of ucspi-tcp</title>
+
+<para>Install ucspi-tcp by running the following commands:</para>
+<para><screen><userinput>sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;</userinput>
+<userinput>mv conf-home~ conf-home &amp;&amp;</userinput>
+<userinput>sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;</userinput>
+<userinput>mv hier.c~ hier.c &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make setup check</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to ucspi-tcp</title>
+
+<screen>Download location:              &ucspi-tcp-download;
+Version used:                   &ucspi-tcp-version;
+Package size:                   &ucspi-tcp-size;
+Estimated Disk space required:  &ucspi-tcp-buildsize;</screen>
+
+<para>The ucspi-tcp package consists of a suite of tools that allow the easy 
+creation of client-server tcp daemons. Tcpserver is a more secure alternative 
+to inetd. It has built in functionality for rule based access control, and 
+will gracefully defer connections when the configurable maximum load is reached,
+unlike inetd. Tcpserver is also recommended for use with Qmail, and was 
+written by the same author.</para>
+
+</sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp.ent
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY ucspi-tcp SYSTEM "../ucspi-tcp.xml">
+<!ENTITY ucspi-tcp-intro SYSTEM "ucspi-tcp-intro.xml">
+<!ENTITY ucspi-tcp-inst SYSTEM "ucspi-tcp-inst.xml">
+<!ENTITY ucspi-tcp-exp SYSTEM "ucspi-tcp-exp.xml">
+<!ENTITY ucspi-tcp-desc SYSTEM "ucspi-tcp-desc.xml">
+<!ENTITY ucspi-tcp-buildsize "199 KB">
+<!ENTITY ucspi-tcp-version "0.88">
+<!ENTITY ucspi-tcp-download "http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz">
+<!ENTITY ucspi-tcp-size "53 KB">
Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="fetchmail" xreflabel="fetchmail">
+<?dbhtml filename="fetchmail.html" dir="basicnet"?>
+<title>fetchmail-&fetchmail-version;</title>
+
+&fetchmail-intro;
+&fetchmail-inst;
+&fetchmail-exp;
+&fetchmail-config;
+&fetchmail-desc;
+
+</sect1>
+
Index: basicnet/mailnews/fetchmail/fetchmail-config.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,30 @@
+<sect2>
+<title>Configuring fetchmail</title>
+
+<sect3><title>Config files</title>
+<para><userinput>~/.fetchmailrc</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><screen><userinput>set logfile /var/log/fetchmail.log</userinput>
+<userinput>set no bouncemail</userinput>
+<userinput>set postmaster root</userinput>
+
+<userinput>poll SERVERNAME :</userinput>
+<userinput>        user "username" pass "password";</userinput>
+<userinput>        mda "/usr/bin/procmail -f %F -d %T";</userinput></screen>
+</para>
+
+<para>Is an example configuration that should surfice for most people.  You 
+can add as many users and servers as you need using the same syntax.</para>
+
+<para><userinput>man fetchmail</userinput> Look for the section near the bottom 
+named <userinput>CONFIGURATION EXAMPLES</userinput> it gives some quick 
+examples too.  There are countless other config options once you get used to 
+it.</para>
+
+</sect3>
+
+</sect2>
+
Index: basicnet/mailnews/fetchmail/fetchmail-desc.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail/fetchmail-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Contents</title>
+
+<para>The fetchmail package contains <userinput>fetchmail fetchmailconf</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fetchmail</title>
+<para>When executed as a user this will source that users ~/.fetchmailrc and 
+download the appropraite mail.  When run as root ALL users who have a 
+.fetchmailrc will have their mail downloaded and delivered accordingly.
+</para></sect3>
+
+<sect3><title>fetchmailconf</title>
+<para>This program provides a Tk GUI interface to your ~/.fetchmailrc making it 
+much easier to configure.  However you will require, Python, and it must 
+have the Tkinker module available.</para></sect3>
+
+</sect2>
+
Index: basicnet/mailnews/fetchmail/fetchmail-exp.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail/fetchmail-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--with-ssl</userinput> This enables SSL if found, so that you 
+can handle connections to secure POP3 and IMAP servers.</para>
+<para><userinput>--enable-fallback=procmail</userinput> This tells fetchmail 
+to hand incoming mail to procmail for delivery if your port 25 mail server is 
+not present or not responding.</para>
+</sect2>
+
Index: basicnet/mailnews/fetchmail/fetchmail-inst.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail/fetchmail-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of fetchmail</title>
+
+<para>Install fetchmail by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --with-ssl --enable-fallback=procmail &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput>
+</screen>
+</para>
+
+</sect2>
+
Index: basicnet/mailnews/fetchmail/fetchmail-intro.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to fetchmail</title>
+
+<screen>Download location:              &fetchmail-download;
+Version used:                   &fetchmail-version;
+Package size:                   &fetchmail-size;
+Estimated Disk space required:  &fetchmail-buildsize;</screen>
+
+<para>The fetchmail package contains the fetchmail program. &quot;It
+retrieves mail from remote mail servers and forwards it to your local
+(client) machine's delivery system, so it can then be be read by
+normal mail user agents.&quot; </para>
+
+<screen>fetchmail depends on:
+OpenSSL and a local MDA (procmail).</screen>
+
+</sect2>
Index: basicnet/mailnews/fetchmail/fetchmail.ent
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/fetchmail/fetchmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY fetchmail SYSTEM "../fetchmail.xml">
+<!ENTITY fetchmail-intro SYSTEM "fetchmail-intro.xml">
+<!ENTITY fetchmail-inst SYSTEM "fetchmail-inst.xml">
+<!ENTITY fetchmail-exp SYSTEM "fetchmail-exp.xml">
+<!ENTITY fetchmail-desc SYSTEM "fetchmail-desc.xml">
+<!ENTITY fetchmail-config SYSTEM "fetchmail-config.xml">
+<!ENTITY fetchmail-buildsize "4.1 MB">
+<!ENTITY fetchmail-version "5.8.15">
+<!ENTITY fetchmail-download "http://www.tuxedo.org/~esr/fetchmail/fetchmail-5.8.15.tar.gz">
+<!ENTITY fetchmail-size "854 KB">
Index: basicnet/mailnews/mailnews.xml
===================================================================
--- basicnet/mailnews/mailnews.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/mailnews.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<chapter id="basicnet-mailnews">
+<?dbhtml filename="mailnews.html" dir="basicnet"?>
+<title>Basic Networking Programs</title>
+
+&procmail;
+&fetchmail;
+&mutt;
+&pine;
+&slrn;
+&basicnet-mailnews-othermn;
+
+</chapter>
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/mutt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="mutt" xreflabel="mutt">
+<?dbhtml filename="mutt.html" dir="basicnet"?>
+<title>mutt</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/mailnews/mutt/mutt.ent
===================================================================
--- basicnet/mailnews/mutt/mutt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/mutt/mutt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY mutt SYSTEM "../mutt.xml">
Index: basicnet/mailnews/other.xml
===================================================================
--- basicnet/mailnews/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="basicnet-mailnews-other">
+<?dbhtml filename="othermn.html" dir="basicnet"?>
+<title>Other mail and news progs</title>
+
+<para>Mention the X-based ones here and link to relevant sections.</para>
+
+</sect1>
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/pine.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="pine" xreflabel="pine">
+<?dbhtml filename="pine.html" dir="basicnet"?>
+<title>pine</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/mailnews/pine/pine.ent
===================================================================
--- basicnet/mailnews/pine/pine.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/pine/pine.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY pine SYSTEM "../pine.xml">
Index: basicnet/mailnews/procmail.xml
===================================================================
--- basicnet/mailnews/procmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/procmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="procmail" xreflabel="procmail">
+<?dbhtml filename="procmail.html" dir="basicnet"?>
+<title>procmail</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/mailnews/procmail/procmail.ent
===================================================================
--- basicnet/mailnews/procmail/procmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/procmail/procmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY procmail SYSTEM "../procmail.xml">
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/slrn.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="slrn" xreflabel="slrn">
+<?dbhtml filename="slrn.html" dir="basicnet"?>
+<title>slrn</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/mailnews/slrn/slrn.ent
===================================================================
--- basicnet/mailnews/slrn/slrn.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/mailnews/slrn/slrn.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY slrn SYSTEM "../slrn.xml">
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/curl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="curl" xreflabel="curl-&curl-version;">
+<?dbhtml filename="curl.html" dir="basicnet"?>
+<title>curl-&curl-version;</title>
+
+&curl-intro;
+&curl-inst;
+&curl-config;
+&curl-desc;
+
+</sect1>
+
Index: basicnet/netlibs/curl/curl-config.xml
===================================================================
--- basicnet/netlibs/curl/curl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/curl/curl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring curl</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: basicnet/netlibs/curl/curl-desc.xml
===================================================================
--- basicnet/netlibs/curl/curl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/curl/curl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Contents</title>
+
+<para>The curl package contains <userinput>curl</userinput>, <userinput>curl-config</userinput> and the
+<userinput>curl library</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>curl</title>
+<para>curl is a client that can get documents from or send documents to
+any of the following protocols: HTTP, HTTPS (needs openssl), FTP,
+GOPHER, DICT, TELNET, LDAP (needs openldap) or FILE.</para></sect3>
+
+<sect3><title>curl-config</title>
+<para>curl-config prints information about the last compile, like
+libraries linked to and prefix setting.</para></sect3>
+
+<sect3><title>curl library</title>
+<para>libcurl provides the functionality of curl to other programs.</para></sect3>
+
+</sect2>
+
Index: basicnet/netlibs/curl/curl-inst.xml
===================================================================
--- basicnet/netlibs/curl/curl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/curl/curl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of curl</title>
+
+<para>Install curl by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install </userinput></screen></para>
+
+</sect2>
+
Index: basicnet/netlibs/curl/curl-intro.xml
===================================================================
--- basicnet/netlibs/curl/curl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/curl/curl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Introduction to curl</title>
+
+<screen>Download location:              <ulink url="&curl-download;"/>
+Version used:                   &curl-version;
+Package size:                   &curl-size;
+Estimated Disk space required:  &curl-buildsize;</screen>
+
+<para>The curl package contains curl and its support library. This is
+useful for transferring files with URL syntax. For example, curl
+http://curl.haxx.se/download/curl-&curl-version;.tar.gz &gt;
+curl-&curl-version;.tar.gz
+would download this programs tarball to the current directory. This
+ability to both download and redirect files can be incorporated
+into other programs to support functions like streaming media.</para>
+
+<screen>curl will utilize:
+<xref linkend="openssl"/> and openldap</screen>
+
+</sect2>
Index: basicnet/netlibs/curl/curl.ent
===================================================================
--- basicnet/netlibs/curl/curl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/curl/curl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY curl SYSTEM "../curl.xml">
+<!ENTITY curl-intro SYSTEM "curl-intro.xml">
+<!ENTITY curl-inst SYSTEM "curl-inst.xml">
+<!ENTITY curl-desc SYSTEM "curl-desc.xml">
+<!ENTITY curl-config SYSTEM "curl-config.xml">
+<!ENTITY curl-buildsize "5.8 MB">
+<!ENTITY curl-version "7.9.8">
+<!ENTITY curl-download "http://curl.haxx.se/download/curl-7.9.8.tar.gz">
+<!ENTITY curl-size "720 KB">
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/netlibs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<chapter id="basicnet-netlibs">
+<?dbhtml filename="netlibs.html" dir="basicnet"?>
+<title>Networking Libraries</title>
+
+&curl;
+&wvstreams;
+
+</chapter>
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/wvstreams.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="wvstreams" xreflabel="wvstreams-&wvstreams-version;">
+<?dbhtml filename="wvstreams.html" dir="basicnet"?>
+<title>wvstreams-&wvstreams-version;</title>
+
+&wvstreams-intro;
+&wvstreams-inst;
+&wvstreams-config;
+&wvstreams-desc;
+
+</sect1>
+
Index: basicnet/netlibs/wvstreams/wvstreams-config.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/wvstreams/wvstreams-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Configuring wvstreams</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
Index: basicnet/netlibs/wvstreams/wvstreams-desc.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Contents</title>
+
+<para>The wvstreams package contains the
+<userinput>wvcrypto</userinput>, <userinput>wvstreams</userinput> and
+<userinput>wvutils</userinput> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>wvcrypto</title>
+<para>No description is currently available.</para></sect3>
+
+<sect3><title>wvstreams</title>
+<para>No description is currently available.</para></sect3>
+
+<sect3><title>wvutils</title>
+<para>No description is currently available.</para></sect3>
+
+</sect2>
+
Index: basicnet/netlibs/wvstreams/wvstreams-inst.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of wvstreams</title>
+
+<para>Install wvstreams by running the following commands:</para>
+
+<para><screen><userinput>make PREFIX=/usr &amp;&amp;
+make PREFIX=/usr install</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/netlibs/wvstreams/wvstreams-intro.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to wvstreams</title>
+
+<screen>Download location:              &wvstreams-download;
+Version used:                   &wvstreams-version;
+Package size:                   &wvstreams-size;
+Estimated Disk space required:  &wvstreams-buildsize;</screen>
+
+<para>The wvstreams package contains the libwvutils, libwvstreams and
+libwvcrypto libraries.  These are needed to compile wvdial.</para>
+
+<screen>wvstreams needs <xref linkend="openssl"/> to build the wvcrypto library.</screen>
+
+</sect2>
Index: basicnet/netlibs/wvstreams/wvstreams.ent
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netlibs/wvstreams/wvstreams.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY wvstreams SYSTEM "../wvstreams.xml">
+<!ENTITY wvstreams-intro SYSTEM "wvstreams-intro.xml">
+<!ENTITY wvstreams-inst SYSTEM "wvstreams-inst.xml">
+<!ENTITY wvstreams-desc SYSTEM "wvstreams-desc.xml">
+<!ENTITY wvstreams-config SYSTEM "wvstreams-config.xml">
+<!ENTITY wvstreams-buildsize "9.6 MB">
+<!ENTITY wvstreams-version "3.70">
+<!ENTITY wvstreams-download "http://open.nit.ca/download/wvstreams-3.70.tar.gz">
+<!ENTITY wvstreams-size "178 KB">
Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/cvs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="cvs" xreflabel="cvs-&cvs-version;">
+<?dbhtml filename="cvs.html" dir="basicnet"?>
+<title>cvs-&cvs-version;</title>
+
+&cvs-intro;
+&cvs-inst;
+&cvs-config;
+&cvs-desc;
+
+</sect1>
+
Index: basicnet/netprogs/cvs/cvs-config.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/cvs/cvs-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Configuring cvs</title>
+
+<sect3><title>Config files</title>
+<para><userinput>~/.cvsrc ~/.cvswrappers</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>~/.cvsrc is the main cvs configuration file.  This file is used by
+users to specify defaults for different cvs commands, for example to
+make all cvs diff commands run with -u, a user would add diff -u to
+their .cvsrc file.</para>
+
+<para>~/.cvswrappers specifies wrappers to be used in addition to
+those specified in the CVSROOT/cvswrappers file in the
+repository.</para></sect3>
+
+</sect2>
+
Index: basicnet/netprogs/cvs/cvs-desc.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/cvs/cvs-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,23 @@
+<sect2>
+<title>Contents</title>
+
+<para>The cvs package contains <userinput>cvs, cvsbug</userinput> and
+<userinput>rcs2log</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cvs</title>
+<para>This is the main program file for the concurrent versioning 
+system</para></sect3>
+
+<sect3><title>cvsbug</title>
+<para>This is used to send problem reports about CVS to a central
+support site</para></sect3>
+
+<sect3><title>rcs2log</title>
+<para>RCS to ChangeLog generator</para></sect3>
+
+</sect2>
+
Index: basicnet/netprogs/cvs/cvs-inst.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/cvs/cvs-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of cvs</title>
+
+<para>Install cvs by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen>
+</para>
+
+</sect2>
+
Index: basicnet/netprogs/cvs/cvs-intro.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/cvs/cvs-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to cvs</title>
+
+<screen>Download location:              <ulink url="&cvs-download;"/>
+Version used:                   &cvs-version;
+Package size:                   &cvs-size;
+Estimated Disk space required:  &cvs-buildsize;</screen>
+
+<para>CVS is the concurrent versioning system. This is useful for
+projects on which multiple people are working or where archives of
+previous versions of files need to be kept.</para>
+
+</sect2>
Index: basicnet/netprogs/cvs/cvs.ent
===================================================================
--- basicnet/netprogs/cvs/cvs.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/cvs/cvs.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY cvs SYSTEM "../cvs.xml">
+<!ENTITY cvs-intro SYSTEM "cvs-intro.xml">
+<!ENTITY cvs-inst SYSTEM "cvs-inst.xml">
+<!ENTITY cvs-desc SYSTEM "cvs-desc.xml">
+<!ENTITY cvs-config SYSTEM "cvs-config.xml">
+<!ENTITY cvs-buildsize "14 MB">
+<!ENTITY cvs-version "1.11.2">
+<!ENTITY cvs-download "http://ccvs.cvshome.org/servlets/ProjectDownloadList">
+<!ENTITY cvs-size "2.6 MB">
Index: basicnet/netprogs/ncftp.xml
===================================================================
--- basicnet/netprogs/ncftp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="ncftp" xreflabel="ncftp-&ncftp-version;">
+<?dbhtml filename="ncftp.html" dir="basicnet"?>
+<title>ncftp-&ncftp-version;</title>
+
+&ncftp-intro;
+&ncftp-inst;
+&ncftp-exp;
+&ncftp-config;
+&ncftp-desc;
+
+</sect1>
+
Index: basicnet/netprogs/ncftp/ncftp-config.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp/ncftp-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Configuring ncftp</title>
+
+<sect3><title>Config files</title>
+<para><userinput>~/.ncftp/*</userinput>; especially
+<userinput>~/.ncftp/prefs_v3</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Most ncftp configuration is done whilst in the program and the
+configuration files are dealt with automatically.  One exception to this
+is <filename>~/.ncftp/prefs_v3</filename>.  There are various options to
+alter in there, including:</para>
+
+<para><userinput>yes-i-know-about-NcFTPd=yes</userinput>: This disables
+the splash screen advertising the NcFTPd server.</para>
+
+<para>There are other options in the prefs_v3 file.  Most of these are
+self-explanatory.</para>
+</sect3>
+
+</sect2>
+
Index: basicnet/netprogs/ncftp/ncftp-desc.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp/ncftp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,33 @@
+<sect2>
+<title>Contents</title>
+
+<para>The ncftp package contains <userinput>ncftp, ncftpbatch,
+ncftpbookmarks, ncftpget, ncftpls, ncftpput</userinput> 
+and <userinput>ncftpspooler</userinput>.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ncftp</title>
+<para>A browser program for File Transfer Protocol</para></sect3>
+
+<sect3><title>ncftpbatch</title>
+<para>Individual batch FTP job processor</para></sect3>
+
+<sect3><title>ncftpbookmarks</title>
+<para>NcFTP Bookmark Editor (NCurses-based)</para></sect3>
+
+<sect3><title>ncftpget</title>
+<para>Internet file transfer program for scripts</para></sect3>
+
+<sect3><title>ncftpls</title>
+<para>Internet file transfer program for scripts</para></sect3>
+
+<sect3><title>ncftpput</title>
+<para>Internet file transfer program for scripts</para></sect3>
+
+<sect3><title>ncftpspooler</title>
+<para>Global batch FTP job processor daemon</para></sect3>
+
+</sect2>
+
Index: basicnet/netprogs/ncftp/ncftp-exp.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp/ncftp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>cd libncftp &amp;&amp; make shared &amp;&amp; make
+soinstall :</userinput>  These commands make and install the 
+dynamic library libncftp which is then used to link against when compiling 
+the main program.</para>
+
+</sect2>
+
Index: basicnet/netprogs/ncftp/ncftp-inst.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp/ncftp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,33 @@
+<sect2>
+<title>Installation of ncftp</title>
+
+<para>There are two ways to build ncftp.  The first (and optimal) way,
+builds most of the functionality as a shared library and then builds and
+installs the program linked against this library.  The second method
+simply links all of the functionality into the binary statically.  This
+doesn't make the dynamic library available for linking by other
+applications.  You need to choose which method best suits you.  Note
+that the second method does <emphasis>not</emphasis> create an entirely
+statically linked binary; only the libncftp parts are statically linked
+in, in this case.</para>
+
+<para>To install ncftp using the first (and optimal) method, run the 
+following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+cd libncftp &amp;&amp;
+make shared &amp;&amp;
+make soinstall &amp;&amp;
+cd .. &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<para>To install ncftp using the second method (with the libncftp 
+functionality linked in statically) run the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/netprogs/ncftp/ncftp-intro.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp/ncftp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to ncftp</title>
+
+<screen>Download location:              &ncftp-download;
+Version used:                   &ncftp-version;
+Package size:                   &ncftp-size;
+Estimated Disk space required:  &ncftp-buildsize;</screen>
+
+<para>The ncftp package contains a powerful and flexible interface to 
+the Internet standard File Transfer Protocol.  It is intended to replace
+or supplement the stock ftp program.</para>
+
+</sect2>
Index: basicnet/netprogs/ncftp/ncftp.ent
===================================================================
--- basicnet/netprogs/ncftp/ncftp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/ncftp/ncftp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY ncftp SYSTEM "../ncftp.xml">
+<!ENTITY ncftp-intro SYSTEM "ncftp-intro.xml">
+<!ENTITY ncftp-inst SYSTEM "ncftp-inst.xml">
+<!ENTITY ncftp-exp SYSTEM "ncftp-exp.xml">
+<!ENTITY ncftp-desc SYSTEM "ncftp-desc.xml">
+<!ENTITY ncftp-config SYSTEM "ncftp-config.xml">
+<!ENTITY ncftp-buildsize "5.0 MB">
+<!ENTITY ncftp-version "3.1.2">
+<!ENTITY ncftp-download "ftp://ftp.ncftp.com/ncftp/ncftp-3.1.2-src.tar.bz2">
+<!ENTITY ncftp-size "378 KB">
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/netprogs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<chapter id="basicnet-netprogs">
+<?dbhtml filename="netprogs.html" dir="basicnet"?>
+<title>Basic Networking Programs</title>
+
+&ncftp;
+&basicnet-netprogs-opensshclient;
+&telnet;
+&cvs;
+&wget;
+
+</chapter>
Index: basicnet/netprogs/openssh-client.xml
===================================================================
--- basicnet/netprogs/openssh-client.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/openssh-client.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect1 id="basicnet-netprogs-openssh">
+<?dbhtml filename="openssh.html" dir="basicnet"?>
+<title>The OpenSSH-&openssh-version; client</title>
+
+<para>The ssh client is a secure replacement for telnet.  If you want to
+install it, the instructions can be found in Chapter 09 - <xref
+linkend="openssh"/>.  Note that if you only want to use the client, you
+do <emphasis>not</emphasis> need to run the server and so do not need
+the startup script and links.  In accordance with good practice, only
+run the server if you actually need it (and if you don't know whether
+you need it or not, it's likely that you don't!).</para>
+
+</sect1>
Index: basicnet/netprogs/telnet.xml
===================================================================
--- basicnet/netprogs/telnet.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/telnet.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect1 id="telnet" xreflabel="telnet">
+<?dbhtml filename="telnet.html" dir="basicnet"?>
+<title>telnet</title>
+
+<para>TO BE DONE - CLIENT ONLY - WARN NOT TO USE SERVER UNLESS YOU
+<emphasis>REALLY</emphasis> KNOW WHAT YOU'RE DOING.</para>
+
+</sect1>
+
Index: basicnet/netprogs/wget.xml
===================================================================
--- basicnet/netprogs/wget.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/wget.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="wget" xreflabel="wget">
+<?dbhtml filename="wget.html" dir="basicnet"?>
+<title>wget</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/netprogs/wget/wget.ent
===================================================================
--- basicnet/netprogs/wget/wget.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netprogs/wget/wget.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY wget SYSTEM "../wget.xml">
Index: basicnet/netutils/netutils.xml
===================================================================
--- basicnet/netutils/netutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/netutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<chapter id="basicnet-netutils">
+<?dbhtml filename="netutils.html" dir="basicnet"?>
+<title>Basic Networking Utilities</title>
+
+&traceroute;
+&nmap;
+&whois;
+
+</chapter>
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/nmap.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="nmap" xreflabel="nmap">
+<?dbhtml filename="nmap.html" dir="basicnet"?>
+<title>nmap</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/netutils/nmap/nmap.ent
===================================================================
--- basicnet/netutils/nmap/nmap.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/nmap/nmap.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY nmap SYSTEM "../nmap.xml">
Index: basicnet/netutils/traceroute.xml
===================================================================
--- basicnet/netutils/traceroute.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/traceroute.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="traceroute" xreflabel="traceroute">
+<?dbhtml filename="traceroute.html" dir="basicnet"?>
+<title>traceroute-&traceroute-version;</title>
+
+&traceroute-intro;
+&traceroute-inst;
+&traceroute-exp;
+&traceroute-desc;
+
+</sect1>
+
Index: basicnet/netutils/traceroute/traceroute-desc.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/traceroute/traceroute-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Contents</title>
+
+<para>The traceroute package contains <userinput>traceroute</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>traceroute</title>
+<para>Traceroute 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 steps (routers) along the way.</para></sect3>
+
+</sect2>
+
Index: basicnet/netutils/traceroute/traceroute-exp.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/traceroute/traceroute-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><userinput>sed 's|@prefix@|/usr|' Makefile.in &gt; Makefile.in~ mv Makefile.in~ Makefile.in :</userinput></screen>
+Adjusts the Makefile so that traceroute will be installed in /usr/sbin 
+instead of /usr/local/sbin, which is where the default 
+installation puts it.</para>
+
+<para><userinput>make install: </userinput> Installs traceroute setuid root 
+in the /usr/sbin directory. This makes it possible for all users to execute 
+traceroute. For absolute security, turn off the setuid bit in traceroute's 
+file permissions with the command 
+<screen><userinput>chmod 0755 /usr/sbin/traceroute</userinput></screen></para>
+
+<para>The risk is that if a security problem such as a buffer overflow were 
+ever found in the traceroute code, a regular user on your system could gain 
+root access if the program is setuid root. Removing the setuid permission 
+of course also makes it impossible for users other than root to utilize 
+traceroute, so decide what's right for your individual situation.</para>
+
+<para>Now, to be completely FHS compliant, as is our aim, if you do leave the 
+traceroute binary setuid root, then you should move traceroute to /usr/bin 
+with the following command: 
+<screen><userinput>mv /usr/sbin/traceroute /usr/bin</userinput></screen></para>
+
+<para>This ensures that the binary is in the path for non-root users.</para>
+
+</sect2>
+
Index: basicnet/netutils/traceroute/traceroute-inst.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/traceroute/traceroute-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Installation of traceroute</title>
+
+<para>Install traceroute by running the following commands:</para>
+
+<para><screen><userinput>sed 's|@prefix@|/usr|' Makefile.in &gt; Makefile.in~</userinput>
+<userinput>mv Makefile.in~ Makefile.in</userinput>
+<userinput>./configure</userinput>
+<userinput>make</userinput>
+<userinput>make install</userinput>
+<userinput>make install-man</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/netutils/traceroute/traceroute-intro.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/traceroute/traceroute-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to traceroute</title>
+
+<screen>Download location:              &traceroute-download; 
+Version used:                   &traceroute-version;
+Package size:                   &traceroute-size;
+Estimated Disk space required:  &traceroute-buildsize;</screen>
+
+<para>The traceroute package contains the traceroute program, which is used 
+to display the network route that packets take to reach a specified host. This 
+is a standard network troubleshooting tool. If you find yourself unable to 
+connect to another system, traceroute can help pinpoint the problem.</para>
+
+<screen>Traceroute does not depend on any packages that are not a part of 
+the base LFS system.</screen>
+
+</sect2>
Index: basicnet/netutils/traceroute/traceroute.ent
===================================================================
--- basicnet/netutils/traceroute/traceroute.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/traceroute/traceroute.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY traceroute SYSTEM "../traceroute.xml">
+<!ENTITY traceroute-intro SYSTEM "traceroute-intro.xml">
+<!ENTITY traceroute-inst SYSTEM "traceroute-inst.xml">
+<!ENTITY traceroute-exp SYSTEM "traceroute-exp.xml">
+<!ENTITY traceroute-desc SYSTEM "traceroute-desc.xml">
+<!ENTITY traceroute-buildsize "75 KB">
+<!ENTITY traceroute-version "1.4a12">
+<!ENTITY traceroute-download "ftp://ftp.ee.lbl.gov/traceroute.tar.gz">
+<!ENTITY traceroute-size "35 KB">
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/whois.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="whois" xreflabel="whois">
+<?dbhtml filename="whois.html" dir="basicnet"?>
+<title>whois</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/netutils/whois/whois.ent
===================================================================
--- basicnet/netutils/whois/whois.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/netutils/whois/whois.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY whois SYSTEM "../whois.xml">
Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/links.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="links" xreflabel="links-&links-version;">
+<?dbhtml filename="links.html" dir="basicnet"?>
+<title>links-&links-version;</title>
+
+&links-intro;
+&links-inst;
+&links-config;
+&links-desc;
+
+</sect1>
+
Index: basicnet/textweb/links/links-config.xml
===================================================================
--- basicnet/textweb/links/links-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/links/links-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Configuring links</title>
+
+<sect3><title>Config files</title>
+<para><userinput>~/.links/*</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Links stores its configuration in per-user files in the ~/.links
+directory.  These files are created automatically when links is run.</para>
+</sect3>
+
+</sect2>
+
Index: basicnet/textweb/links/links-desc.xml
===================================================================
--- basicnet/textweb/links/links-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/links/links-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Contents</title>
+
+<para>The links package contains <userinput>links</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>links</title>
+<para>links is a lynx-like alternative character mode WWW browser</para></sect3>
+
+</sect2>
+
Index: basicnet/textweb/links/links-inst.xml
===================================================================
--- basicnet/textweb/links/links-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/links/links-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of links</title>
+
+<para>Install links by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/textweb/links/links-intro.xml
===================================================================
--- basicnet/textweb/links/links-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/links/links-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to links</title>
+
+<screen>Download location:              &links-download;
+Version used:                   &links-version;
+Package size:                   &links-size;
+Estimated Disk space required:  &links-buildsize;</screen>
+
+<para>Links is a text-based WWW browser.</para>
+
+<screen>Links can use <xref linkend="openssl"></xref> and <xref linkend="gpm"></xref>.
+OpenSSL is needed in order to access HTTPS (i.e. secure) websites and so it is highly recommended that it is used.
+GPM provides console mouse support to links.</screen>
+
+</sect2>
Index: basicnet/textweb/links/links.ent
===================================================================
--- basicnet/textweb/links/links.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/links/links.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY links SYSTEM "../links.xml">
+<!ENTITY links-intro SYSTEM "links-intro.xml">
+<!ENTITY links-inst SYSTEM "links-inst.xml">
+<!ENTITY links-desc SYSTEM "links-desc.xml">
+<!ENTITY links-config SYSTEM "links-config.xml">
+<!ENTITY links-buildsize "4.3 MB">
+<!ENTITY links-version "0.97">
+<!ENTITY links-download "http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-0.97.tar.gz">
+<!ENTITY links-size "518 KB">
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="lynx" xreflabel="lynx-&lynx-version;">
+<?dbhtml filename="lynx.html" dir="basicnet"?>
+<title>lynx-&lynx-version;</title>
+
+&lynx-intro;
+&lynx-inst;
+&lynx-exp;
+&lynx-config;
+&lynx-desc;
+
+</sect1>
+
Index: basicnet/textweb/lynx/lynx-config.xml
===================================================================
--- basicnet/textweb/lynx/lynx-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx/lynx-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Configuring lynx</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/lynx.cfg</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Various settings such as proxies can be set in the system-wide
+lynx.cfg file found in /etc</para>
+</sect3>
+
+</sect2>
+
Index: basicnet/textweb/lynx/lynx-desc.xml
===================================================================
--- basicnet/textweb/lynx/lynx-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx/lynx-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The lynx package contains <userinput>lynx</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>lynx</title>
+<para>lynx is a general purpose, text-based, distributed information browser 
+for the World Wide Web.</para></sect3>
+
+</sect2>
+
Index: basicnet/textweb/lynx/lynx-exp.xml
===================================================================
--- basicnet/textweb/lynx/lynx-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx/lynx-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--libdir=/etc :</userinput> For some reason, the
+configure and make routine for lynx uses libdir as the prefix for the
+configuration file.  We set this to /etc so that the system wide
+configuration file is <userinput>/etc/lynx.cfg</userinput>.</para>
+
+<para><userinput>--with-ssl :</userinput> This enables support for
+linking SSL into lynx.</para>
+
+<para><userinput>--with-zlib :</userinput> This enables support for
+linking zlib into lynx.</para>
+
+<para><userinput>DOCDIR=... HELPDIR=... :</userinput> We set these
+variables to avoid getting the help and documentation files installed
+under /etc.</para>
+
+<para><userinput>sed... mv /etc/lynx.bak /etc/lynx.cfg :</userinput> This 
+sed command changes the /etc/lynx.cfg file so it looks for the help
+files in the correct place.</para>
+
+</sect2>
+
Index: basicnet/textweb/lynx/lynx-inst.xml
===================================================================
--- basicnet/textweb/lynx/lynx-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx/lynx-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,21 @@
+<sect2>
+<title>Installation of lynx</title>
+
+<para>Install lynx by running the following commands.  If you don't have
+openssl or zlib, miss out the <userinput>--with-ssl</userinput> or
+<userinput>--with-zlib</userinput> part of the configure command as
+appropriate.</para>
+
+<para><screen><userinput>./configure --prefix=/usr --libdir=/etc --with-ssl --with-zlib &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>make DOCDIR=/usr/share/doc/lynx-2.8.4/lynx_doc \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;HELPDIR=/usr/share/doc/lynx-2.8.4/lynx_help install-doc &amp;&amp;</userinput>
+<userinput>make DOCDIR=/usr/share/doc/lynx-2.8.4/lynx_doc \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;HELPDIR=/usr/share/doc/lynx-2.8.4/lynx_help install-help &amp;&amp;</userinput>
+<userinput>sed s/"t\/etc"/"t\/usr\/share\/doc\/lynx\-2\.8\.4"/ \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;/etc/lynx.cfg &gt; /etc/lynx.bak &amp;&amp;</userinput>
+<userinput>mv /etc/lynx.bak /etc/lynx.cfg</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/textweb/lynx/lynx-intro.xml
===================================================================
--- basicnet/textweb/lynx/lynx-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx/lynx-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to lynx</title>
+
+<screen>Download location:              &lynx-download;
+Version used:                   &lynx-version;
+Package size:                   &lynx-size;
+Estimated Disk space required:  &lynx-buildsize;</screen>
+
+<para>Lynx is a text based web browser.</para>
+
+<screen>lynx can use <xref linkend="openssl"></xref> and <xref linkend="zlib"></xref>.  
+OpenSSL is needed in order to access HTTPS (i.e. secure) websites and so it is highly recommended that it is used.
+Zlib is used by lynx for decompression of some gzip files.</screen>
+
+</sect2>
Index: basicnet/textweb/lynx/lynx.ent
===================================================================
--- basicnet/textweb/lynx/lynx.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/lynx/lynx.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY lynx SYSTEM "../lynx.xml">
+<!ENTITY lynx-intro SYSTEM "lynx-intro.xml">
+<!ENTITY lynx-inst SYSTEM "lynx-inst.xml">
+<!ENTITY lynx-exp SYSTEM "lynx-exp.xml">
+<!ENTITY lynx-desc SYSTEM "lynx-desc.xml">
+<!ENTITY lynx-config SYSTEM "lynx-config.xml">
+<!ENTITY lynx-buildsize "16 MB">
+<!ENTITY lynx-version "2.8.4">
+<!ENTITY lynx-download "http://lynx.isc.org/release/lynx2.8.4.tar.bz2">
+<!ENTITY lynx-size "1.9 MB">
Index: basicnet/textweb/textweb.xml
===================================================================
--- basicnet/textweb/textweb.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/textweb.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,22 @@
+<chapter id="basicnet-textweb">
+<?dbhtml filename="textweb.html" dir="basicnet"?>
+<title>Text Web Browsers</title>
+
+<para>People who are new to Unix-based systems tend to ask the question
+"Why on earth would I want a text-mode browser?  I'm going to compile X
+and use Konqueror/Mozilla/Whatever!".  Those who have been
+around systems for a while know that when (not if) you manage to mess up
+your graphical browser install and you need to look up some information
+on the web, a console based browser will save you.  Also, there are
+quite a few people who prefer to use one of these browsers as their
+principle method of browsing; either to avoid the clutter and bandwidth
+which accompanies images or because they may use a text-to-speech
+synthesiser which can read the page to them (of use for instance to
+partially sighted or blind users).  We currently have installation
+instructions for two console web browsers:</para>
+
+&links;
+&lynx;
+&w3m;
+
+</chapter>
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/w3m.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="w3m" xreflabel="w3m">
+<?dbhtml filename="w3m.html" dir="basicnet"?>
+<title>w3m</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: basicnet/textweb/w3m/w3m.ent
===================================================================
--- basicnet/textweb/w3m/w3m.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ basicnet/textweb/w3m/w3m.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY w3m SYSTEM "../w3m.xml">
Index: blfs.dsl
===================================================================
--- blfs.dsl	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ blfs.dsl	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,68 @@
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY docbook.dsl SYSTEM "docbook.dsl" CDATA dsssl>
+]>
+
+<style-sheet>
+
+<style-specification use="docbook">
+<style-specification-body>
+
+(define %generate-legalnotice-link%
+;; put the legal notice in a separate file
+#t)
+
+(define ($legalnotice-link-file$ legalnotice)
+;; filename of the legalnotice file
+(string-append "legalnotice"%html-ext%))
+
+(define %html-ext%
+;; html extenstion
+".html")
+
+(define %root-filename%
+;; index file of the book
+"index")
+
+(define %use-id-as-filename%
+;; filenames same as id attribute in title tags
+#t)
+
+(define %body-attr%
+;; html body settings
+(list
+(list "BGCOLOR" "#FFFFFF")
+(list "TEXT" "#000000")
+(list "LINK" "#0000FF")
+(list "VLINK" "#840084")
+(list "ALINK" "#006000")))
+
+(define (chunk-skip-first-element-list)
+;; forces the Table of Contents on separate page
+'())
+
+(define (list-element-list)
+;; fixes bug in Table of Contents generation
+'())
+
+(define %shade-verbatim%
+;; verbatim sections will be shaded if t(rue)
+#t)
+
+;;(define %section-autolabel%
+;; For enumerated sections (1.1, 1.1.1, 1.2, etc.)
+;;#t)
+
+(element emphasis
+;; make role=strong equate to bold for emphasis tag
+(if (equal? (attribute-string "role") "strong")
+(make element gi: "STRONG" (process-children))
+(make element gi: "EM" (process-children))))
+
+
+</style-specification-body>
+</style-specification>
+
+<external-specification id="docbook" document="docbook.dsl">
+
+</style-sheet>
+
Index: book/abstract.xml
===================================================================
--- book/abstract.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/abstract.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<abstract>
+
+<para>This book follows on from the LinuxFromScratch book.  It introduces and
+guides the reader through additions to the system including networking,
+X support, sound support and printer and scanner support.</para>
+
+</abstract>
+
Index: book/authorgroup.xml
===================================================================
--- book/authorgroup.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/authorgroup.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<authorgroup>
+
+<author>
+        <firstname>BLFS</firstname><surname>Development Team</surname>
+	
+</author>
+
+</authorgroup>
+
Index: book/book.ent
===================================================================
--- book/book.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/book.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,22 @@
+<!ENTITY book SYSTEM "book.xml">
+
+<!ENTITY book-info SYSTEM "bookinfo.xml">
+<!ENTITY book-info-authorgroup SYSTEM "authorgroup.xml">
+<!ENTITY book-info-copyright SYSTEM "copyright.xml">
+<!ENTITY book-info-legalnotice SYSTEM "legalnotice.xml">
+<!ENTITY book-info-abstract SYSTEM "abstract.xml">
+
+<!ENTITY book-dedication SYSTEM "dedication.xml">
+
+<!-- Generally used entities go here -->
+
+<!ENTITY library-config SYSTEM "library-config.xml">
+
+<!ENTITY maintainer-fullname "Mark Hymers">
+<!ENTITY maintainer-firstname "Mark">
+<!ENTITY maintainer-address "markh@linuxfromscratch.org">
+
+<!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
+<!ENTITY http-root "http://ftp.linuxfromscratch.org">
+<!ENTITY file-root "ftp://ftp.linuxfromscratch.org/blfs-patches/">
+<!ENTITY hints-root "http://hints.linuxfromscratch.org">
Index: book/book.xml
===================================================================
--- book/book.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/book.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+&book-info;
+&book-dedication;
+&preface;
+
+<!-- Parts -->
+
+&introduction;
+&postlfs;
+&general;
+&connect;
+&basicnet;
+&server;
+&content;
+&x;
+&kde;
+&gnome;
+&xsoft;
+&multimedia;
+&pst;
+
+<!-- End parts -->
+
+<!-- Appendices -->
+&appendices;
Index: book/bookinfo.xml
===================================================================
--- book/bookinfo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ book/bookinfo.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,239 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bookinfo 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;
-]>
-
 <bookinfo>
-
-  <date>$Date$</date>
-
-  <title>Beyond Linux<superscript>&reg;</superscript> From Scratch
-  <phrase revision="systemd">(systemd</phrase>
-  <phrase revision="sysv">(System V</phrase> Edition)</title>
-  <subtitle>Version &version;</subtitle>
-
-  <authorgroup>
-    <corpauthor>
-      &copyholder;
-    </corpauthor>
-  </authorgroup>
-
-  <pubdate>Published &pubdate;</pubdate>
-
-  <copyright id="copyright">
-    <year>&copyrightdate;</year>
-    <holder>&copyholder;</holder>
-  </copyright>
-
-  <legalnotice>
-    <para>Copyright &copy; &copyrightdate;, &copyholder;</para>
-
-    <para>All rights reserved.</para>
-
-    <para>This book is licensed under a <xref linkend="CC"/>.</para>
-
-    <para>
-      Computer instructions may be extracted from the book under the
-      <xref linkend="MIT"/>.
-    </para>
-
-    <para>
-      <trademark class='registered'>Linux</trademark> is a registered trademark
-      of Linus Torvalds.
-    </para>
-  </legalnotice>
-
-  <revhistory>
-    <revision>
-      <revnumber>&version;</revnumber>
-      <date>&pubdate;</date>
-      <revremark>Ongoing Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>12.1</revnumber>
-      <date>2024-03-01</date>
-      <revremark>Twenty-ninth Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>12.0</revnumber>
-      <date>2023-09-01</date>
-      <revremark>Twenty-eighth Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>11.3</revnumber>
-      <date>2023-03-01</date>
-      <revremark>Twenty-seventh Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>11.2</revnumber>
-      <date>2022-09-01</date>
-      <revremark>Twenty-sixth Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>11.1</revnumber>
-      <date>2022-03-01</date>
-      <revremark>Twenty-fifth 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>
-
-    <revision>
-      <revnumber>10.0</revnumber>
-      <date>2020-09-01</date>
-      <revremark>Twenty-second Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>9.1</revnumber>
-      <date>2020-03-01</date>
-      <revremark>Twenty-first Release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>9.0</revnumber>
-      <date>2019-09-01</date>
-      <revremark>Twentieth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.4</revnumber>
-      <date>2019-03-01</date>
-      <revremark>Nineteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.3</revnumber>
-      <date>2018-09-01</date>
-      <revremark>Eighteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.2</revnumber>
-      <date>2018-03-02</date>
-      <revremark>Seventeenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.1</revnumber>
-      <date>2017-09-01</date>
-      <revremark>Sixteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.0</revnumber>
-      <date>2017-02-25</date>
-      <revremark>Fifteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.10</revnumber>
-      <date>2016-09-07</date>
-      <revremark>Fourteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.9</revnumber>
-      <date>2016-03-08</date>
-      <revremark>Thirteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.8</revnumber>
-      <date>2015-10-01</date>
-      <revremark>Twelfth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.7</revnumber>
-      <date>2015-03-06</date>
-      <revremark>Eleventh release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.6</revnumber>
-      <date>2014-09-23</date>
-      <revremark>Tenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.5</revnumber>
-      <date>2014-03-05</date>
-      <revremark>Ninth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.4</revnumber>
-      <date>2013-09-14</date>
-      <revremark>Eighth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.3</revnumber>
-      <date>2008-08-24</date>
-      <revremark>Seventh release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.2</revnumber>
-      <date>2007-02-14</date>
-      <revremark>Sixth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.1</revnumber>
-      <date>2005-08-14</date>
-      <revremark>Fifth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.0</revnumber>
-      <date>2005-04-02</date>
-      <revremark>Fourth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>5.1</revnumber>
-      <date>2004-06-05</date>
-      <revremark>Third release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>5.0</revnumber>
-      <date>2003-11-06</date>
-      <revremark>Second release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>1.0</revnumber>
-      <date>2003-04-25</date>
-      <revremark>First release</revremark>
-    </revision>
-  </revhistory>
-
-  <abstract>
-    <para>
-      This book follows on from the Linux From Scratch book. It introduces
-      and guides the reader through additions to the system including
-      networking, graphical interfaces, sound support, and printer and scanner
-      support.
-    </para>
-  </abstract>
+<title>Beyond Linux From Scratch</title>
+<subtitle>Version &version;</subtitle>
+&book-info-authorgroup;
+&book-info-copyright;
+&book-info-legalnotice;
+&book-info-abstract;
 
 </bookinfo>
Index: book/copyright.xml
===================================================================
--- book/copyright.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/copyright.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,6 @@
+<copyright id="copyright">
+	<year>2001-2002</year>
+        <holder>BLFS Development Team</holder>
+
+</copyright>
+
Index: book/dedication.xml
===================================================================
--- book/dedication.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ book/dedication.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,13 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dedication 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;
-]>
+<dedication>
+<title>Dedication</title>
 
-<dedication>
-  <title>Dedication</title>
-
-  <para>This book is dedicated to the LFS community</para>
+<para>This book is dedicated to the LFS community</para>
 
 </dedication>
Index: ok/errata.xml
===================================================================
--- book/errata.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="errata" xreflabel="Errata">
-  <?dbhtml filename="errata.html"?>
-
-
-  <title>Errata</title>
-
-  <para>
-    The software used to create BLFS applications is constantly being
-    updated and enhanced. Security warnings and bug fixes may become available
-    after the BLFS book has been released. To check whether the package
-    versions or instructions in this release of BLFS need any modifications to
-    accommodate security vulnerabilities or other bug fixes, please visit
-    <ulink url="&errata;"/> before proceeding with your build. You should note
-    any changes shown and apply them to the relevant section of the book as you
-    progress with building the applications in BLFS.
-  </para>
-
-</sect1>
Index: ok/foreword.xml
===================================================================
--- book/foreword.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="foreword" xreflabel="Foreword">
-  <?dbhtml filename="foreword.html"?>
-
-
-  <title>Foreword</title>
-
-  <para>
-    This version of the book is intended to be used when building on top of
-    a system built using the LFS book.  Every effort has been made to ensure
-    accuracy and reliability of the instructions. Many people find that using
-    the instructions in this book after building the current stable or
-    development version of LFS provides a stable and very modern Linux system.
-  </para>
-
-  <para>Enjoy!</para>
-
-  <blockquote>
-<literallayout>Randy McMurchy
-August 24th, 2008</literallayout>
-  </blockquote>
-
-</sect1>
Index: book/legalnotice.xml
===================================================================
--- book/legalnotice.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/legalnotice.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,36 @@
+<legalnotice>
+
+<para>Copyright (c) 1999-2002, BLFS Development Team</para>
+
+<para>All rights reserved.</para>
+
+<para>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:</para>
+
+<itemizedlist>
+<listitem><para>Redistributions in any form must retain the above copyright 
+notice, this list of conditions and the following disclaimer.</para></listitem>
+
+<listitem><para>Neither the name of "Linux From Scratch" nor the names of 
+its contributors may be used to endorse or promote products derived from 
+this material without specific prior written permission.</para></listitem>
+
+<listitem><para>Any material derived from Linux From Scratch must contain 
+a reference to the "Linux From Scratch" project.</para></listitem>
+</itemizedlist>
+
+<para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
+
+</legalnotice>
+
Index: book/library-config.xml
===================================================================
--- book/library-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ book/library-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<para>As with most libraries, there is no configuration to do, save that
+the library directory i.e. <userinput>/usr/lib</userinput> or
+<userinput>/usr/local/lib</userinput> should appear in
+<userinput>/etc/ld.so.conf</userinput> so that ldd can find the shared
+libraries.  After checking that this is the case,
+<userinput>/sbin/ldconfig</userinput> should be run whilst logged in as
+root.</para>
Index: ok/organization.xml
===================================================================
--- book/organization.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="organization" xreflabel="Organization">
-  <?dbhtml filename="organization.html"?>
-
-
-  <title>Organization</title>
-
-  <para>
-    This book is divided into the following fourteen parts.
-  </para>
-
-  <bridgehead renderas="sect2">Part I - Introduction</bridgehead>
-
-  <para>
-    This part contains essential information which is needed to
-    understand the rest of the book.
-  </para>
-
-  <bridgehead renderas="sect2">Part II - Post LFS Configuration and Extra
-  Software</bridgehead>
-
-  <para>
-    Here we introduce basic configuration and security issues.  We also
-    discuss a range of text editors, file systems, and shells which aren't covered
-    in the main LFS book.
-  </para>
-
-  <bridgehead renderas="sect2">Part III - General Libraries and Utilities</bridgehead>
-
-  <para>
-    In this section we cover libraries which are often needed throughout
-    the book, as well as system utilities.  Information on programming
-    (including recompiling <application>GCC</application> to support its full
-    range of languages) concludes this part.
-  </para>
-
-  <bridgehead renderas="sect2">Part IV - Basic Networking</bridgehead>
-
-  <para>
-    Here we explain how to connect to a network when you aren't using the
-    simple static IP setup presented in the main LFS book. Networking libraries
-    and command-line networking tools are also covered here.
-  </para>
-
-  <bridgehead renderas="sect2">Part V - Servers</bridgehead>
-
-  <para>
-    Here we show you how to set up mail and other servers (such as
-    <application>FTP</application>, <application>Apache</application>, etc.).
-  </para>
-
-  <bridgehead renderas="sect2">Part VI - X + Window Managers</bridgehead>
-
-  <para>
-    This part explains how to set up a basic <application>X Window
-    System</application>, along with some generic
-    <application>X</application> libraries and Window managers.
-  </para>
-
-  <bridgehead renderas="sect2">Part VII - KDE</bridgehead>
-
-  <para>
-    This part is for those who want to use the <application>K Desktop
-    Environment</application>, or parts of it.
-  </para>
-
-  <bridgehead renderas="sect2">Part VIII - GNOME</bridgehead>
-
-  <para>
-    <application>GNOME</application> is the main alternative to
-    <application>KDE</application> in the Desktop Environment arena.
-  </para>
-
-  <bridgehead renderas="sect2">Part IX - Xfce</bridgehead>
-
-  <para>
-    <application>Xfce</application> is a lightweight alternative to
-    <application>GNOME</application> and <application>KDE</application>.
-  </para>
-
-  <bridgehead renderas="sect2">Part X - LXDE</bridgehead>
-
-  <para>
-    <application>LXDE</application> is another lightweight alternative to
-    <application>GNOME</application> and <application>KDE</application>.
-  </para>
-
-  <bridgehead renderas="sect2">Part XI - More X Software</bridgehead>
-
-  <para>
-    Office programs and graphical web browsers are important to most people.
-    They, and some generic <application>X</application> software, can be
-    found in this part of the book.
-  </para>
-
-  <bridgehead renderas="sect2">Part XII - Multimedia</bridgehead>
-
-  <para>
-    Here we cover multimedia libraries and drivers, along with some
-    audio, video, and CD-writing programs.
-  </para>
-
-  <bridgehead renderas="sect2">Part XIII - Printing, Scanning and
-  Typesetting (PST)</bridgehead>
-
-  <para>
-    This part covers document handling, from applications like
-    <application>Ghostscript</application>, <application>CUPS</application>, and
-    <application>DocBook</application>, all the way to
-    <application>texlive</application>.
-  </para>
-
-  <bridgehead renderas="sect2">Appendices</bridgehead>
-
-  <para>
-    The Appendices present information which doesn't belong in the body of
-    book; they are included as reference material. The glossary of acronyms
-    is a handy feature.
-  </para>
-
-</sect1>
Index: ok/preface.xml
===================================================================
--- book/preface.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE preface 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;
-]>
-
-<preface id="preface" xreflabel="Preface">
-  <?dbhtml filename="preface.html" dir="preface"?>
-
-  <title>Preface</title>
-
-  <para>
-    Having helped out with Linux From Scratch for a short time, I
-    noticed that we were getting many queries as to how to do things beyond
-    the base LFS system.  At the time, the only assistance specifically offered
-    relating to LFS were the LFS hints (<ulink url="&hints-root;"/>).
-    Most of the LFS hints are extremely good and well written
-    but I (and others) could still see a need for more comprehensive help to
-    go Beyond LFS &mdash; hence BLFS.
-  </para>
-
-  <para>
-    BLFS aims to be more than the LFS-hints converted to XML although
-    much of our work is based around the hints and indeed some authors write
-    both hints and the relevant BLFS sections.  We hope that we can provide
-    you with enough information to not only manage to build your system up to
-    what you want, whether it be a web server or a multimedia desktop system,
-    but also that you will learn a lot about system configuration as you go.
-  </para>
-
-  <para>
-    Thanks as ever go to everyone in the LFS/BLFS
-    community; especially those who have contributed instructions, written text,
-    answered questions and generally shouted when things were wrong!
-  </para>
-
-  <para>
-    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
-    in the <xref linkend="introduction"/> section of the book.
-  </para>
-
-  <para>
-    Enjoy using BLFS.
-  </para>
-
-  <blockquote>
-<literallayout>Mark Hymers
-markh &lt;at&gt; &lfs-domainname;
-BLFS Editor (July 2001&ndash;March 2003)</literallayout>
-  </blockquote>
-
-  <para>
-    I still remember how I found the BLFS project
-    and started using the instructions that were completed at the time.  I could
-    not believe how wonderful it was to get an application up and running very
-    quickly, with explanations as to why things were done a certain way.
-    Unfortunately, for me, it wasn't long before I was opening applications that
-    had nothing more  than "To be done" on the page.  I did what most would do,
-    I waited for someone else to do it.  It wasn't too long before I am looking
-    through  <application>Bugzilla</application> for something easy to do.
-    As with any learning experience, the definition of what was easy kept
-    changing.
-  </para>
-
-  <para>
-    We still encourage you to become involved as BLFS is
-    never really finished.  Contributing or just using, we hope you enjoy
-    your BLFS experience.
-  </para>
-
-  <blockquote>
-<literallayout>Larry Lawrence
-larry &lt;at&gt; &lfs-domainname;
-BLFS Editor (March 2003&ndash;June 2004)</literallayout>
-  </blockquote>
-
-  <para>
-    The BLFS project is a natural progression of
-    LFS.  Together, these projects provide a unique resource for
-    the Open Source Community.  They take the mystery out of the process of
-    building a complete, functional software system from the source code
-    contributed by many talented individuals throughout the world.  They truly
-    allow users to implement the slogan
-    <quote><emphasis>Your distro, your rules</emphasis></quote>.
-  </para>
-
-  <para>
-    Our goal is to continue to provide the best resource available that shows
-    you how to integrate many significant Open Source applications.  Since these
-    applications are constantly updated and new applications are developed, this
-    book will never be complete.  Additionally, there is always room for
-    improvement in explaining the nuances of how to install the different
-    packages.  To make these improvements, we need your feedback.  I encourage
-    you to participate on the different mailing lists, news groups, and
-    IRC channels to help meet these goals.
-  </para>
-
-  <blockquote>
-<literallayout>Bruce Dubbs
-bdubbs &lt;at&gt; &lfs-domainname;
-BLFS Editor (June 2004&ndash;December 2006 and February 2011&ndash;now)</literallayout>
-  </blockquote>
-
-  <para>
-    My introduction to the [B]LFS project was actually by accident. I
-    was trying to build a <application>GNOME</application> environment using
-    some how-tos and other information I found on the web. A couple of times
-    I ran into some build issues and Googling pulled up some old BLFS mailing
-    list messages. Out for curiosity, I visited the Linux From Scratch web site
-    and shortly thereafter was hooked. I've not used any other Linux
-    distribution for personal use since.
-  </para>
-
-  <para>
-    I can't promise anyone will feel the sense of satisfaction I felt
-    after building my first few systems using [B]LFS instructions, but I
-    sincerely hope that your BLFS experience is as rewarding for you as it has
-    been for me.
-  </para>
-
-  <para>
-    The BLFS project has grown significantly the last couple of years.
-    There are more package instructions and related dependencies than ever
-    before. The project requires your input for continued success. If you
-    discover that you enjoy building BLFS, please consider helping out in any
-    way you can. BLFS requires hundreds of hours of maintenance to keep it
-    even semi-current. If you feel confident enough in your editing skills,
-    please consider joining the BLFS team. Simply contributing to the mailing
-    list discussions with sound advice and/or providing patches to the book's
-    XML will probably result in you receiving an invitation to join the
-    team.
-  </para>
-
-  <blockquote>
-<literallayout>Randy McMurchy
-randy &lt;at&gt; &lfs-domainname;
-BLFS Editor (December 2006&ndash;January 2011)</literallayout>
-  </blockquote>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="foreword.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whoread.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="organization.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errata.xml"/> -->
-
-</preface>
Index: ok/whoread.xml
===================================================================
--- book/whoread.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="whoread" xreflabel="Who Would Want to Read this Book">
-  <?dbhtml filename="whoread.html"?>
-
-
-  <title>Who Would Want to Read this Book</title>
-
-  <para>
-    This book is mainly aimed at those who have built a system based
-    on the LFS book. It will also be useful for those who are using other
-    distributions, and for one reason or another want to manually build
-    software and need some assistance. Note that the material
-    in this book, in particular the dependency listings,
-    assumes that you are using a basic LFS system with every
-    package listed in the LFS book already installed and configured. BLFS can
-    be used to create a range of diverse systems and so the target audience is
-    probably as wide as that of the LFS book.  If you found LFS useful,
-    you should also like this!
-  </para>
-
-  <para>
-    Since Release 7.4, the BLFS book version has matched the LFS book version.
-    This book may be incompatible with a previous or later release of the LFS
-    book.
-  </para>
-
-</sect1>
Index: angelog.xml
===================================================================
--- changelog.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-introduction/welcome/changelog.xml
Index: connect/connect.ent
===================================================================
--- connect/connect.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/connect.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<!ENTITY connect SYSTEM "connect.xml">
+
+<!-- Dial-up -->
+<!ENTITY connect-dialup SYSTEM "dialup/dialup.xml">
+<!ENTITY % ppp SYSTEM "dialup/ppp/ppp.ent">
+<!ENTITY % wvdial SYSTEM "dialup/wvdial/wvdial.ent">
+%ppp;
+%wvdial;
+
+<!-- DHCP -->
+<!ENTITY connect-dhcp SYSTEM "dhcp/dhcp.xml">
+<!ENTITY connect-dhcp-client SYSTEM "dhcp/dhcp-client.xml">
+<!ENTITY % dhcpcd SYSTEM "dhcp/dhcpcd/dhcpcd.ent">
+%dhcpcd;
+<!ENTITY connect-dhcp-config SYSTEM "dhcp/config.xml">
+
+<!-- Other -->
+<!ENTITY connect-other SYSTEM "other/other.xml">
+<!ENTITY connect-other-isdn SYSTEM "other/isdn.xml">
+<!ENTITY connect-other-pppoe SYSTEM "other/pppoe.xml">
Index: connect/connect.xml
===================================================================
--- connect/connect.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/connect.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<part id="connect" xreflabel="Connecting to a Network">
+<?dbhtml filename="connect.html" dir="connect"?>
+<title>Connecting to a Network</title>
+
+<partintro><para>The LFS book covers setting up networking with a static 
+IP.  There are however, other methods which are used to connect to networks and
+importantly the internet.  We cover the most popular methods in this
+chapter.</para></partintro>
+
+&connect-dialup;
+&connect-dhcp;
+&connect-other;
+
+</part>
Index: connect/dhcp/config.xml
===================================================================
--- connect/dhcp/config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,87 @@
+<sect1 id="dhcpclient" xreflabel="Configuring dhcp for a client">
+<?dbhtml filename="configdhcp.html" dir="connect"?>
+<title>Configuring dhcp for a client</title>
+
+<sect2><title>Config files</title>
+<para><userinput>/etc/sysconfig/network, 
+/etc/sysconfig/network-devices/ifup-eth0,
+/etc/sysconfig/network-devices/ifdown-eth0,
+/etc/sysconfig/networkdevices/ifconfig.eth0</userinput></para>
+</sect2>
+
+<sect2><title>Configuration Information</title>
+
+<para>Note that we use <userinput>eth0</userinput> as the interface
+throughout these instructions.  If you want to configure a different (or
+more than one) interface, simply replace <userinput>eth0</userinput>
+with the interface you wish to use.</para>
+
+<para>These instructions will convert the configuration files from LFS
+(a static configuration) to a DHCP configuration.  Note that static and
+DHCP interfaces can co-exist on a LFS system, only make the
+alterations to those interfaces which need to support DHCP.</para>
+
+<para>The first step is to remove the GATEWAY and GATEWAY_IF variables 
+from <filename>/etc/sysconfig/network</filename>.  This should only be done
+if the default interface you intend to use will be using DHCP and only
+needs to be done once; regardless of how many interfaces you are setting
+up.</para>
+
+<para><screen><userinput>cd /etc/sysconfig &amp;&amp;
+cp network network.bak &amp;&amp;
+sed "s/GATEWAY/# GATEWAY/" network.bak > network</userinput></screen></para>
+
+<para>Now you can create the appropriate <filename>ifconfig.eth0</filename> 
+file with the following commands (note that this will overwrite any
+existing file):</para>
+
+<para><screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp;
+cat &gt; ifconfig.eth0 &lt;&lt; "EOF"</userinput>
+ONBOOT=yes
+DHCP_PROG=&lt;path to dhcp&gt;
+DHCP_START=&lt;start parameters&gt;
+DHCP_STOP=&lt;stop parameter&gt;
+<userinput>EOF</userinput></screen></para>
+
+<para>Review the appropriate manpages for parameters; for example, the
+stop parameter for dhcpcd is '-k', while the stop parameter for dhclient
+is '-r'.</para>
+
+<para>You then need to create DHCP specific scripts.  First, the
+<filename>ifup-eth0</filename> script:</para>
+
+<para><screen><userinput>cat &gt; ifup-eth0 &lt;&lt; "EOF" </userinput>
+#!/bin/sh
+
+source /etc/sysconfig/rc || exit
+source $rc_functions || exit
+source $network_devices/ifconfig.eth0 || exit
+
+echo "Bringing up the eth0 interface..."
+modprobe eth0
+loadproc $DHCP_PROG $DHCP_START
+<userinput>EOF</userinput></screen></para>
+
+<para>Then the <filename>ifdown-eth0</filename> script:</para>
+
+<para><screen><userinput>cat &gt; ifdown-eth0 &lt;&lt; "EOF" </userinput>
+#!/bin/sh
+
+source /etc/sysconfig/rc || exit
+source $rc_functions || exit
+source $network_devices/ifconfig.eth0 || exit
+
+echo "Bringing down the eth0 interface..."
+$DHCP_PROG $DHCP_STOP
+evaluate_retval
+<userinput>EOF</userinput></screen></para>
+
+<para>Finally, we need to make these scripts executable:</para>
+
+<para><screen><userinput>chmod 755 ifup-eth0 &amp;&amp;
+chmod 755 ifdown-eth0</userinput></screen></para>
+
+</sect2>
+
+</sect1>
+
Index: connect/dhcp/dhcp-client.xml
===================================================================
--- connect/dhcp/dhcp-client.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcp-client.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,39 @@
+<sect1 id="connect-dhcp-client">
+<?dbhtml filename="dhcpclient.html" dir="connect"?>
+<title>Installing dhcp-&dhcp-version;</title>
+
+<para>The dhcp package comes with both a client and a server program for
+using DHCP.  If you want to install it, the instructions can be found
+at <xref linkend="dhcp"/>.  Note that if you only want to
+use the client, you do <emphasis>not</emphasis> need to run the server and
+so do not need the startup script and links provided for the server daemon.
+Note that to use the client, you still need to alter your
+<filename>ethnet</filename> script as described in the next section.
+You only need to run the DHCP server however, if you're providing this
+service to a network, and it's likely that you'll know if that's the
+case; if it isn't, don't run the server!</para>
+
+<para>To configure the client, you need to modify the
+<filename>/etc/sysconfig/network-devices/ifconfig.eth0</filename> file
+(or the appropriate one for the interface you are running DHCP on)
+you created earlier by adding the appropriate <userinput>DHCP_PROG
+</userinput>, <userinput>DHCP_START</userinput> and
+<userinput>DHCP_STOP</userinput> values.</para>
+
+<para>Then create the <filename>/etc/dhclient.conf</filename> using the
+following command:</para>
+
+<para><screen><userinput>cat &gt; /etc/dhclient.conf &lt;&lt;
+"EOF"</userinput>
+# dhclient.conf
+
+interface "eth0"{
+prepend domain-name-servers 127.0.0.1;
+request subnet-mask, broadcast-address, time-offset, routers,
+        domain-name, domain-name-servers, host-name;
+require subnet-mask, domain-name-servers;
+}
+# end dhclient.conf
+<userinput>EOF</userinput></screen></para>
+
+</sect1>
Index: connect/dhcp/dhcp.xml
===================================================================
--- connect/dhcp/dhcp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,21 @@
+<chapter id="connect-dhcp">
+<?dbhtml filename="dhcp.html" dir="connect"?>
+<title>DHCP Clients</title>
+
+<para>DHCP stands for Dynamic Host Configuration Protocol.  It is a
+protocol which is used by many sites to automatically provide
+information such as IP addresses, subnet masks and routing information
+to computers.  If your network uses DHCP, you will need a DHCP client
+in order to connect to it.  DHCP is also used by some cable
+modems.</para>
+
+<para>We currently provide installation instructions for two DHCP
+clients, those from the dhcp and dhcpcd packages.  After we discuss
+installing the packages, we will also discuss how to
+configure your bootscripts to allow you to use dhcp as a client.</para>
+
+&connect-dhcp-client;
+&dhcpcd;
+&connect-dhcp-config;
+
+</chapter>
Index: connect/dhcp/dhcpcd.xml
===================================================================
--- connect/dhcp/dhcpcd.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
+<?dbhtml filename="dhcpcd.html" dir="connect"?>
+<title>dhcpcd-&dhcpcd-version;</title>
+
+&dhcpcd-intro;
+&dhcpcd-inst;
+&dhcpcd-exp;
+&dhcpcd-config;
+&dhcpcd-desc;
+
+</sect1>
+
Index: connect/dhcp/dhcpcd/dhcpcd-config.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd/dhcpcd-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Configuring dhcpcd</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/dhcpcd/*</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>To configure the client, you need to modify the
+<filename>/etc/sysconfig/network-devices/ifconfig.eth0</filename> file
+(or the appropriate one for the interface you are running DHCP on)
+you created earlier by adding the appropriate <userinput>DHCP_PROG
+</userinput>, <userinput>DHCP_START</userinput> and
+<userinput>DHCP_STOP</userinput> values.</para>
+
+</sect3>
+
+</sect2>
+
Index: connect/dhcp/dhcpcd/dhcpcd-desc.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd/dhcpcd-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The dhcpcd package contains <userinput>dhcpcd</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>dhcpcd</title>
+<para>dhcpcd is an implementation of the DHCP client specified in
+RFC2131 and RFC1541 (depending on which options are specified).</para></sect3>
+
+</sect2>
+
Index: connect/dhcp/dhcpcd/dhcpcd-exp.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Command explanations</title>
+
+<para>There may be a good reason for abandoning the normal BLFS convention 
+of using --prefix=/usr here.  If you are installing DHCP, it is likely that 
+it is required during the boot process and /usr may be network mounted in 
+which case, dhcpcd wouldn't be available due to being on the network!  
+Therefore, depending on your situation, you may want it to be installed
+in /sbin or /usr/sbin.</para>
+
+</sect2>
+
Index: connect/dhcp/dhcpcd/dhcpcd-inst.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd/dhcpcd-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Installation of dhcpcd</title>
+
+<para>Depending on whether you want dhcpcd to be in /sbin or /usr/sbin,
+use one of the following sets of commands.  For /sbin:</para>
+
+<para><screen><userinput>./configure --prefix=/ &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<para>and for /usr/sbin:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: connect/dhcp/dhcpcd/dhcpcd-intro.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd/dhcpcd-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to dhcpcd</title>
+
+<screen>Download location:              &dhcpcd-download;
+Version used:                   &dhcpcd-version;
+Package size:                   &dhcpcd-size;
+Estimated Disk space required:  &dhcpcd-buildsize;</screen>
+
+<para>The dhcpcd package contains the dhcpcd client. This is useful for
+connecting your computer to a network which uses DHCP to assign network
+addresses.</para>
+
+</sect2>
Index: connect/dhcp/dhcpcd/dhcpcd.ent
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dhcp/dhcpcd/dhcpcd.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<!ENTITY dhcpcd SYSTEM "../dhcpcd.xml">
+<!ENTITY dhcpcd-intro SYSTEM "dhcpcd-intro.xml">
+<!ENTITY dhcpcd SYSTEM "dhcpcd.xml">
+<!ENTITY dhcpcd-intro SYSTEM "dhcpcd-intro.xml">
+<!ENTITY dhcpcd-inst SYSTEM "dhcpcd-inst.xml">
+<!ENTITY dhcpcd-exp SYSTEM "dhcpcd-exp.xml">
+<!ENTITY dhcpcd-desc SYSTEM "dhcpcd-desc.xml">
+<!ENTITY dhcpcd-config SYSTEM "dhcpcd-config.xml">
+<!ENTITY dhcpcd-buildsize "728 KB">
+<!ENTITY dhcpcd-version "1.3.22-pl1">
+<!ENTITY dhcpcd-download "ftp://ftp.phystech.com/pub/dhcpcd-1.3.22-pl1.tar.gz">
+<!ENTITY dhcpcd-size "131 KB">
Index: connect/dialup/dialup.xml
===================================================================
--- connect/dialup/dialup.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/dialup.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<chapter id="connect-dialup">
+<?dbhtml filename="dialup.html" dir="connect"?>
+<title>Dial-up networking</title>
+
+&ppp;
+&wvdial;
+
+</chapter>
Index: connect/dialup/ppp.xml
===================================================================
--- connect/dialup/ppp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/ppp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="ppp" xreflabel="ppp-&ppp-version;">
+<?dbhtml filename="ppp.html" dir="connect"?>
+<title>ppp-&ppp-version;</title>
+
+&ppp-intro;
+&ppp-inst;
+&ppp-config;
+&ppp-desc;
+
+</sect1>
+
Index: connect/dialup/ppp/ppp-config.xml
===================================================================
--- connect/dialup/ppp/ppp-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/ppp/ppp-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Configuring ppp</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/ppp/*</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The ppp daemon itself requires very little configuration.  The
+main trick is script the connection.  This can be done either using the
+chat program which comes with this package or by using <xref
+linkend="wvdial"/>.</para>
+</sect3>
+
+</sect2>
+
Index: connect/dialup/ppp/ppp-desc.xml
===================================================================
--- connect/dialup/ppp/ppp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/ppp/ppp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Contents</title>
+
+<para>The ppp package contains the <userinput>chat</userinput>,
+<userinput>pppd</userinput>, <userinput>pppdump</userinput> and
+<userinput>pppstats</userinput> programs.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>chat</title>
+<para>The chat program defines a conversational exchange between the
+computer and the modem.  Its primary purpose is to establish the connection 
+between the Point-to-Point Protocol  Daemon  (pppd)  and  the remote's 
+pppd process.</para></sect3>
+
+<sect3><title>pppd</title>
+<para>pppd is the Point to Point Protocol daemon.</para></sect3>
+
+<sect3><title>pppdump</title>
+<para>pppdump is used to convert PPP record files 
+to a readable format.</para></sect3>
+
+<sect3><title>pppstats</title>
+<para>pppstats is used to print PPP statistics.</para></sect3>
+
+</sect2>
+
Index: connect/dialup/ppp/ppp-inst.xml
===================================================================
--- connect/dialup/ppp/ppp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/ppp/ppp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of ppp</title>
+
+<para>Install ppp by running the following commands:</para>
+
+<para><screen><userinput>./configure &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: connect/dialup/ppp/ppp-intro.xml
===================================================================
--- connect/dialup/ppp/ppp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/ppp/ppp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to ppp</title>
+
+<screen>Download location:              &ppp-download;
+Version used:                   &ppp-version;
+Package size:                   &ppp-size;
+Estimated Disk space required:  &ppp-buildsize;</screen>
+
+<para>The ppp package contains the pppd daemon and the chat program.
+This is used for connecting to other machines; often for connecting to
+the Internet via a dial-up connection to an ISP.</para>
+
+<screen>ppp needs nothing to compile but you must have PPP support
+either compiled in or as a kernel module to use it.</screen>
+
+</sect2>
Index: connect/dialup/ppp/ppp.ent
===================================================================
--- connect/dialup/ppp/ppp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/ppp/ppp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY ppp SYSTEM "../ppp.xml">
+<!ENTITY ppp-intro SYSTEM "ppp-intro.xml">
+<!ENTITY ppp-inst SYSTEM "ppp-inst.xml">
+<!ENTITY ppp-desc SYSTEM "ppp-desc.xml">
+<!ENTITY ppp-config SYSTEM "ppp-config.xml">
+<!ENTITY ppp-buildsize "4.1 MB">
+<!ENTITY ppp-version "2.4.1">
+<!ENTITY ppp-download "ftp://ftp.samba.org/pub/ppp/ppp-2.4.1.tar.gz">
+<!ENTITY ppp-size "524 KB">
Index: connect/dialup/wvdial.xml
===================================================================
--- connect/dialup/wvdial.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/wvdial.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="wvdial" xreflabel="wvdial-&wvdial-version;">
+<?dbhtml filename="wvdial.html" dir="connect"?>
+<title>wvdial-&wvdial-version;</title>
+
+&wvdial-intro;
+&wvdial-inst;
+&wvdial-config;
+&wvdial-desc;
+
+</sect1>
+
Index: connect/dialup/wvdial/wvdial-config.xml
===================================================================
--- connect/dialup/wvdial/wvdial-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/wvdial/wvdial-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Configuring wvdial</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/wvdial.conf</userinput>, 
+<userinput>/etc/ppp/*</userinput></para></sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><userinput>wvdialconf /etc/wvdial.conf</userinput></para>
+<para>wvdialconf will test that you have a working modem, try and determine 
+it's exact setup and then ask you some questions regarding your ISPs phone 
+number etc.  You will then need to enter that information into the
+<filename>/etc/wvdial.conf</filename> file.</para>
+
+<para>You then start wvdial with: <userinput>wvdial</userinput>.</para>
+
+<para>For more information examine the
+<userinput>wvdialconf</userinput>, <userinput>wvdial.conf</userinput>
+and <userinput>wvdial</userinput> man pages.</para>
+
+</sect3>
+
+</sect2>
+
Index: connect/dialup/wvdial/wvdial-desc.xml
===================================================================
--- connect/dialup/wvdial/wvdial-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/wvdial/wvdial-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>The wvdial package contains the <userinput>wvdial</userinput>
+and <userinput>wvdialconf</userinput> programs.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>wvdial</title>
+<para>Starts a ppp connection.</para></sect3>
+
+<sect3><title>wvdialconf</title>
+<para>Automates the configuration of wvdial</para></sect3>
+
+</sect2>
+
Index: connect/dialup/wvdial/wvdial-inst.xml
===================================================================
--- connect/dialup/wvdial/wvdial-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/wvdial/wvdial-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of wvdial</title>
+
+<para>Install wvdial by running the following commands:</para>
+
+<para><screen><userinput>make PREFIX=/usr &amp;&amp;
+make PREFIX=/usr install &amp;&amp;</userinput></screen></para>
+
+</sect2>
+
Index: connect/dialup/wvdial/wvdial-intro.xml
===================================================================
--- connect/dialup/wvdial/wvdial-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/wvdial/wvdial-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to wvdial</title>
+
+<screen>Download location:              &wvdial-download;
+Version used:                   &wvdial-version;
+Package size:                   &wvdial-size;
+Estimated Disk space required:  &wvdial-buildsize;</screen>
+
+<para>The wvdial package contains a no nonsense, quick and easy to use 
+alternative to chat and pppd scripts.  If you simply want to dial a modem 
+without the fuss and hassle of chat issues, then you'll want this.</para>
+
+<screen>wvdial needs <xref linkend="wvstreams"/> to compile and run and <xref
+linkend="ppp"/> to run.</screen>
+
+</sect2>
Index: connect/dialup/wvdial/wvdial.ent
===================================================================
--- connect/dialup/wvdial/wvdial.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/dialup/wvdial/wvdial.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY wvdial SYSTEM "../wvdial.xml">
+<!ENTITY wvdial-intro SYSTEM "wvdial-intro.xml">
+<!ENTITY wvdial-inst SYSTEM "wvdial-inst.xml">
+<!ENTITY wvdial-desc SYSTEM "wvdial-desc.xml">
+<!ENTITY wvdial-config SYSTEM "wvdial-config.xml">
+<!ENTITY wvdial-buildsize "2.5 MB">
+<!ENTITY wvdial-version "1.53">
+<!ENTITY wvdial-download "http://open.nit.ca/download/wvdial_1.53.tar.gz">
+<!ENTITY wvdial-size "66 KB">
Index: connect/other/isdn.xml
===================================================================
--- connect/other/isdn.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/other/isdn.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="isdn" xreflabel="isdn">
+<?dbhtml filename="isdn.html" dir="connect"?>
+<title>isdn</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: connect/other/other.xml
===================================================================
--- connect/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<chapter id="connect-other">
+<?dbhtml filename="other.html" dir="connect"?>
+<title>Other</title>
+
+&connect-other-isdn;
+&connect-other-pppoe;
+
+</chapter>
Index: connect/other/pppoe.xml
===================================================================
--- connect/other/pppoe.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ connect/other/pppoe.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="pppoe" xreflabel="pppoe">
+<?dbhtml filename="pppoe.html" dir="connect"?>
+<title>pppoe</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: content/content.ent
===================================================================
--- content/content.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/content.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<!ENTITY content SYSTEM "content.xml">
+
+<!-- Database software -->
+<!ENTITY content-databases SYSTEM "databases/databases.xml">
+<!ENTITY % db SYSTEM "databases/db/db.ent">
+<!ENTITY % mysql SYSTEM "databases/mysql/mysql.ent">
+%db;
+%mysql;
+
+<!-- Web server software -->
+<!ENTITY content-web SYSTEM "web/web.xml">
+<!ENTITY % apache SYSTEM "web/apache/apache.ent">
+<!ENTITY % php SYSTEM "web/php/php.ent">
+%apache;
+%php;
Index: content/content.xml
===================================================================
--- content/content.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/content.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<part id="content" xreflabel="Content Serving">
+<?dbhtml filename="content.html" dir="content"?>
+<title>Content Serving</title>
+
+&content-databases;
+&content-web;
+
+</part>
Index: content/databases/databases.xml
===================================================================
--- content/databases/databases.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/databases.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<chapter id="content-databases">
+<?dbhtml filename="databases.html" dir="content"?>
+<title>Databases</title>
+
+&db;
+&mysql;
+
+</chapter>
Index: content/databases/db.xml
===================================================================
--- content/databases/db.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="db" xreflabel="db-&db-version;">
+<?dbhtml filename="db.html" dir="content"?>
+<title>db-&db-version;</title>
+
+&db-intro;
+&db-inst;
+&db-exp;
+&db-config;
+&db-desc;
+
+</sect1>
+
Index: content/databases/db/db-config.xml
===================================================================
--- content/databases/db/db-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db/db-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring db</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: content/databases/db/db-desc.xml
===================================================================
--- content/databases/db/db-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db/db-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,48 @@
+<sect2>
+<title>Contents</title>
+
+<para>The db package contains <userinput>db_archive, db_checkpoint,
+db_deadlock, db_dump, db_load, db_printlog, db_recover, db_stat,
+db_upgrade, db_verify</userinput> and the <userinput>db
+libraries</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>db_archive</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_checkpoint</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_deadlock</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_dump</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_load</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_printlog</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_recover</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_stat</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_upgrade</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db_verify</title>
+<para>No description available</para></sect3>
+
+<sect3><title>db libraries</title>
+<para>These are used by many other programs to perform db linked
+functions.</para></sect3>
+
+</sect2>
+
Index: content/databases/db/db-exp.xml
===================================================================
--- content/databases/db/db-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db/db-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr --enable-compat185 :</userinput>
+This replaces the normal ./configure command as db comes with the various 
+build directories for different platforms.</para>
+
+<para><userinput>make docdir=/usr/share/doc/db-&db-version; 
+install :</userinput> This installs db installing the documentation in
+the correct place.</para>
+
+</sect2>
+
Index: content/databases/db/db-inst.xml
===================================================================
--- content/databases/db/db-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db/db-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of db</title>
+
+<para>Install db by running the following commands:</para>
+
+<para><screen><userinput>cd build_unix &amp;&amp;
+../dist/configure --prefix=/usr --enable-compat185 &amp;&amp;
+make &amp;&amp;
+make docdir=/usr/share/doc/db-&db-version; install</userinput></screen></para>
+
+</sect2>
Index: content/databases/db/db-intro.xml
===================================================================
--- content/databases/db/db-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db/db-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to db</title>
+
+<screen>Download location:              &db-download;
+Version used:                   &db-version;
+Package size:                   &db-size;
+Estimated Disk space required:  &db-buildsize;</screen>
+
+<para>The db package contains db_archive, db_checkpoint,
+db_deadlock, db_dump, db_load, db_printlog, db_recover, db_stat,
+db_upgrade, db_verify and the db libraries.  These are used by many
+other programs for db related functions.</para>
+
+</sect2>
Index: content/databases/db/db.ent
===================================================================
--- content/databases/db/db.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/db/db.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY db SYSTEM "../db.xml">
+<!ENTITY db-intro SYSTEM "db-intro.xml">
+<!ENTITY db-inst SYSTEM "db-inst.xml">
+<!ENTITY db-exp SYSTEM "db-exp.xml">
+<!ENTITY db-desc SYSTEM "db-desc.xml">
+<!ENTITY db-config SYSTEM "db-config.xml">
+<!ENTITY db-buildsize "23 MB">
+<!ENTITY db-version "4.0.14">
+<!ENTITY db-download "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz">
+<!ENTITY db-size "2.6 MB">
Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/mysql.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="mysql" xreflabel="mysql">
+<?dbhtml filename="mysql.html" dir="content"?>
+<title>mysql</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: content/databases/mysql/mysql.ent
===================================================================
--- content/databases/mysql/mysql.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/databases/mysql/mysql.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY mysql SYSTEM "../mysql.xml">
Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/web/apache.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="apache" xreflabel="apache">
+<?dbhtml filename="apache.html" dir="content"?>
+<title>apache</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: content/web/apache/apache.ent
===================================================================
--- content/web/apache/apache.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/web/apache/apache.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY apache SYSTEM "../apache.xml">
Index: content/web/php.xml
===================================================================
--- content/web/php.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/web/php.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="php" xreflabel="php">
+<?dbhtml filename="php.html" dir="content"?>
+<title>php</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: content/web/php/php.ent
===================================================================
--- content/web/php/php.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/web/php/php.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY php SYSTEM "../php.xml">
Index: content/web/web.xml
===================================================================
--- content/web/web.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ content/web/web.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<chapter id="content-web">
+<?dbhtml filename="web.html" dir="content"?>
+<title>Web serving</title>
+
+&apache;
+&php;
+
+</chapter>
Index: pand_date
===================================================================
--- expand_date	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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: neral.ent
===================================================================
--- general.ent	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,215 +1,0 @@
-<!-- Editing  up to the line of ==== should be enough
-     to generate a book for development, release, or rc-->
-<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
-                                      set to IGNORE for release or rc -->
-<!ENTITY % release     "IGNORE"> <!-- set to INCLUDE for release,
-                                      set to IGNORE for development or rc -->
-<!ENTITY % relyear    "2023">
-<!ENTITY % relnum     "11.3">
-<!ENTITY % reldate    "March 1st, 2023">
-<!ENTITY % relpubdate "2023-03-01">
-<!-- ================================================================== -->
-<!-- Do not change anything below unless the www or book layouts change -->
-
-<!-- Automatically generated by git-version.sh. Used for release or dev -->
-<!ENTITY % conditional-entities SYSTEM "conditional.ent">
-%conditional-entities;
-
-<![ %development; [
-<!-- version info automatically generated by git -->
-<!ENTITY % version-entities SYSTEM "version.ent">
-%version-entities;
-<![ %sysv; [
-<!ENTITY lfs-version   "development">
-<!ENTITY blfs-version  "svn">
-<!ENTITY patch-version "svn">
-]]>
-<![ %systemd; [
-<!ENTITY lfs-version   "systemd">
-<!ENTITY blfs-version  "systemd">
-<!ENTITY patch-version "svn">
-]]>
-]]><!-- End %development -->
-
-<![ %release; [
-<![ %sysv; [
-<!ENTITY lfs-version   "%relnum;">
-<!ENTITY blfs-version  "%relnum;">
-<!ENTITY patch-version "%relnum;">
-]]>
-<![ %systemd; [
-<!ENTITY lfs-version   "%relnum;-systemd">
-<!ENTITY blfs-version  "%relnum;-systemd">
-<!ENTITY patch-version "%relnum;">
-]]>
-
-<!ENTITY year           "%relyear;">
-<!ENTITY version        "%relnum;">
-<!ENTITY releasedate    "%reldate;">
-<!ENTITY pubdate        "%relpubdate;">
-]]><!-- End %release -->
-
-<!ENTITY copyrightdate  "1999-&year;">
-<!ENTITY copyholder     "The BLFS Development Team">
-<!ENTITY lfs-domainname "linuxfromscratch.org">
-
-<!ENTITY maintainer-fullname  "The BLFS Team">
-<!ENTITY maintainer-firstname "BLFS">
-<!ENTITY maintainer-address   "blfs-maintainer@&lfs-domainname;">
-
-
-<!ENTITY lfs-website          "https://www.&lfs-domainname;">
-<!-- downloads_root must have an entity because it is needed for scripts
-     Note:  s/_/-/ in comment to avoid grep error
-     It is also needed for systemd units
-     -->
-<!ENTITY downloads-root       "&lfs-website;/blfs/downloads/&blfs-version;">
-<!--<!ENTITY downloads-root-systemd "https://www.linuxfromscratch.org/blfs/downloads/systemd">
-<!ENTITY downloads-project    "https://downloads.&lfs-domainname;">-->
-
-<!ENTITY sources-anduin-http  "https://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/&patch-version;">
-<!ENTITY errata               "https://www.&lfs-domainname;/blfs/errata/&blfs-version;/">
-<!ENTITY blfs-ticket-root     "https://wiki.&lfs-domainname;/blfs/ticket/">
-
-<!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
-<!ENTITY lfs-dev              "../../../../lfs/view/development">
-<!ENTITY lfs-ticket-root      "https://wiki.&lfs-domainname;/lfs/ticket/">
-<!ENTITY gnu-http             "https://ftp.gnu.org/gnu">
-<!ENTITY gnu-ftp              "ftp://ftp.gnu.org/gnu">
-<!ENTITY gnupg-http           "https://www.gnupg.org/ftp/gcrypt">
-<!ENTITY gnupg-ftp            "ftp://ftp.gnupg.org/gcrypt">
-<!ENTITY gstreamer-dl         "https://gstreamer.freedesktop.org/src">
-<!ENTITY kernel-dl            "https://www.kernel.org/pub">
-<!ENTITY mozilla-http         "https://archive.mozilla.org/pub">
-<!ENTITY mozilla-hg           "https://hg.mozilla.org/releases/mozilla-release/archive/">
-<!ENTITY perl_authors         "https://www.cpan.org/authors">
-<!ENTITY metacpan_authors     "https://cpan.metacpan.org/authors/id">
-<!ENTITY pymodules-dl         "https://files.pythonhosted.org/packages/source">
-<!ENTITY sourceforge-dl       "https://downloads.sourceforge.net">
-
-<!ENTITY fedora-http-repo     "http://pkgs.fedoraproject.org/repo/pkgs">
-<!ENTITY jaist-ftp-repo       "ftp://ftp.jaist.ac.jp/pub//sourceforge">
-<!ENTITY lxqt-http-repo       "http://downloads.lxqt.org/lxqt">
-<!ENTITY publisher            "Unknown">
-<!ENTITY xorg-download-http   "https://www.x.org/pub/individual">
-<!ENTITY xorg-download-ftp    "ftp://ftp.x.org/pub/individual">
-<!ENTITY pypi                 "https://pypi.python.org/pypi">
-<!ENTITY appstream-glib-url   "http://people.freedesktop.org/~hughsient/appstream-glib/releases">
-<!ENTITY elinks-url           "http://elinks.or.cz">
-<!ENTITY w3m-url              "http://w3m.sourceforge.net/">
-<!ENTITY sysprof-url          "https://wiki.gnome.org/Apps/Sysprof">
-<!ENTITY man                  "https://man.archlinux.org/man/">
-
-<!-- Convenience entities -->
-<!ENTITY root                 "<systemitem class='username'>root</systemitem>">
-<!ENTITY gi-docgen-url        "https://gnome.pages.gitlab.gnome.org/gi-docgen/">
-
-<!-- These entities are used to identify versions of LFS
-     packages referenced throughout the BLFS book. -->
-
-<!ENTITY lfs-perl-version             "5.38"> <!-- used in git -->
-
-<!-- End LFS versions -->
-
-<!ENTITY blfs-bootscripts-version     "20240416">
-<!ENTITY systemd-units-version        "20240205">
-
-<!ENTITY blfs-wiki                    "https://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 lfs121_checked  "<note><para>Development versions of BLFS may not build or run
-                          some packages properly if LFS or dependencies have been updated
-                          since the most recent stable versions of the books.</para></note>">
-
-<!--<!ENTITY lfs121_checked  "<para>This package is known to build and work properly
-                          using an LFS 12.1 platform.</para>">-->
-
-
-<!-- End special entities about LFS compatibility -->
-
-<!ENTITY as_root "<note><para>When installing multiple packages in a script,
-  the installation needs to be done as the root user. There are three general
-  options that can be used to do this:</para>
-
-  <orderedlist>
-
-  <listitem><para>Run the entire script as the root user (not
-  recommended).</para></listitem>
-
-  <listitem><para>Use the <command>sudo</command> command from the <xref
-  linkend='sudo'/> package.</para></listitem>
-
-  <listitem><para>Use <command>su -c &quot;command arguments&quot;</command>
-  (quotes required) which will ask for the root  password for every iteration
-  of the loop.</para></listitem>
-
-  </orderedlist>
-
-  <para>One way to handle this situation is to create a short
-  <command>bash</command> function that automatically selects the appropriate
-  method.  Once the command is set in the environment, it does not need to be
-  set again.</para>
-
-  <screen><userinput>as_root()
-{
-  if   [ $EUID = 0 ];        then $*
-  elif [ -x /usr/bin/sudo ]; then sudo $*
-  else                            su -c \\&quot;$*\\&quot;
-  fi
-}
-
-export -f as_root</userinput></screen>
-</note>">
-
-<!ENTITY not-katamari         "<para>This package is provided for testing the
-                               completed Xorg installation.</para>">
-
-<!ENTITY % package-entities SYSTEM      "packages.ent">
-%package-entities;
-
-<!ENTITY parallel_issues "<note><para>This package may occasionally fail when
-                          building with multiple processors.  See <xref
-                          linkend='parallel-builds'/> for more information.</para></note>">
-
-<!ENTITY shell-env "<note><para>If installing in the chroot environment, be
-                    sure to export the <envar>SHELL</envar> environment
-                    variable or configuration of the package will
-                    fail.</para></note>">
-
-<!ENTITY gi-doc-disable
-         "Allow building this package without <xref linkend='gi-docgen'/>
-          installed.  If you have <xref linkend='gi-docgen'/> installed and
-          you wish to rebuild and install the API documentation, a
-          <command>meson configure</command> command will reset this
-          option.">
-
-<!ENTITY build-use-internet
-         "<note><para>An Internet connection is needed for building this
-          package.</para></note>">
-
-<!ENTITY test-use-internet
-         "<note><para>An Internet connection is needed for some tests of
-          this package.</para></note>">
-
-<!ENTITY logind
-         "<phrase revision='sysv'><xref linkend='elogind'/></phrase>
-          <phrase revision='systemd'><xref linkend='systemd'/></phrase>">
-
-<!ENTITY qt5-deps
-         "(<xref linkend='qt5'/> or <xref role='nodep' linkend='qt5-alternate'/>)">
-
-<!ENTITY build-wheel-cmd "pip3 wheel -w dist --no-build-isolation --no-deps --no-cache-dir">
-<!ENTITY build-wheel "<screen><userinput>&build-wheel-cmd; $PWD</userinput></screen>">
-
-<!ENTITY install-wheel "pip3 install --no-index --find-links=dist --no-cache-dir --no-user">
-
-<!ENTITY berkeley-db "<ulink url='https://anduin.linuxfromscratch.org/BLFS/bdb/db-5.3.28.tar.gz'>Berkeley DB</ulink> (deprecated)">
-
-<!ENTITY gobject-introspection "<xref linkend='glib2'/> (with GObject Introspection)">
Index: general/general.ent
===================================================================
--- general/general.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/general.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,65 @@
+<!ENTITY general SYSTEM "general.xml">
+
+<!-- General Libraries -->
+<!ENTITY general-genlib SYSTEM "genlib/genlib.xml">
+<!ENTITY % zlib SYSTEM "genlib/zlib/zlib.ent">
+<!ENTITY % openssl SYSTEM "genlib/openssl/openssl.ent">
+<!ENTITY % pcre SYSTEM "genlib/pcre/pcre.ent">
+<!ENTITY % xmllib SYSTEM "genlib/xmllib/xmllib.ent">
+<!ENTITY % popt SYSTEM "genlib/popt/popt.ent">
+<!ENTITY % libfam SYSTEM "genlib/libfam/libfam.ent">
+<!ENTITY % slang SYSTEM "genlib/slang/slang.ent">
+
+%zlib;
+%openssl;
+%pcre;
+%xmllib;
+%popt;
+%libfam;
+%slang;
+
+<!-- Graphics Libraries -->
+<!ENTITY general-graphlib SYSTEM "graphlib/graphlib.xml">
+<!ENTITY % lcms SYSTEM "graphlib/lcms/lcms.ent">
+<!ENTITY % libjpeg SYSTEM "graphlib/libjpeg/libjpeg.ent">
+<!ENTITY % libpng SYSTEM "graphlib/libpng/libpng.ent">
+<!ENTITY % libtiff SYSTEM "graphlib/libtiff/libtiff.ent">
+<!ENTITY % libungif SYSTEM "graphlib/libungif/libungif.ent">
+<!ENTITY % libmng SYSTEM "graphlib/libmng/libmng.ent">
+<!ENTITY % imlib SYSTEM "graphlib/imlib/imlib.ent">
+%lcms;
+%libjpeg;
+%libpng;
+%libtiff;
+%libungif;
+%libmng;
+%imlib;
+
+<!-- General Utilities -->
+<!ENTITY general-genutils SYSTEM "genutils/genutils.xml">
+<!ENTITY % bc SYSTEM "genutils/bc/bc.ent">
+%bc;
+
+<!-- System Utilities -->
+<!ENTITY general-sysutils SYSTEM "sysutils/sysutils.xml">
+<!ENTITY % gpm SYSTEM "sysutils/gpm/gpm.ent">
+<!ENTITY % fcron SYSTEM "sysutils/fcron/fcron.ent">
+<!ENTITY % hdparm SYSTEM "sysutils/hdparm/hdparm.ent">
+<!ENTITY % which SYSTEM "sysutils/which/which.ent">
+<!ENTITY % infozip SYSTEM "sysutils/infozip/infozip.ent">
+<!ENTITY % pccts SYSTEM "sysutils/pccts/pccts.ent">
+<!ENTITY % pciutils SYSTEM "sysutils/pciutils/pciutils.ent">
+<!ENTITY % pkgconfig SYSTEM "sysutils/pkgconfig/pkgconfig.ent">
+%gpm;
+%fcron;
+%hdparm;
+%which;
+%infozip;
+%pccts;
+%pciutils;
+%pkgconfig;
+
+<!-- Programming -->
+<!ENTITY general-prog SYSTEM "prog/prog.xml">
+<!ENTITY python SYSTEM "prog/python.xml">
+<!ENTITY jdk SYSTEM "prog/jdk.xml">
Index: general/general.xml
===================================================================
--- general/general.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/general.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,19 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<part id="general" xreflabel="General Libraries and Utilities">
+<?dbhtml filename="general.html" dir="general"?>
+<title>General Libraries and Utilities</title>
 
-<part id="general" xreflabel="General Libraries and Utilities">
-  <?dbhtml filename="general.html" dir="general"?>
-
-  <title>General Libraries and Utilities</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="genlib/genlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphlib/graphlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="genutils/genutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysutils/sysutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prog/prog.xml"/>
+&general-genlib;
+&general-graphlib;
+&general-genutils;
+&general-sysutils;
+&general-prog;
 
 </part>
Index: neral/genlib/abseil-cpp.xml
===================================================================
--- general/genlib/abseil-cpp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,269 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 abseil-cpp-download-http "https://github.com/abseil/abseil-cpp/releases/download/&abseil-cpp-version;/abseil-cpp-&abseil-cpp-version;.tar.gz">
-  <!ENTITY abseil-cpp-md5sum        "f2c807858166b0a8ce4f679b17111335">
-  <!ENTITY abseil-cpp-size          "2.1 MB">
-  <!ENTITY abseil-cpp-buildsize     "31 MB">
-  <!ENTITY abseil-cpp-time          "0.8 SBU">
-]>
-
-<sect1 id="abseil-cpp" xreflabel="Abseil-cpp-&abseil-cpp-version;">
-  <?dbhtml filename="abseil-cpp.html"?>
-
-  <title>Abseil-cpp-&abseil-cpp-version;</title>
-
-  <indexterm zone="abseil-cpp">
-    <primary sortas="a-abseil-cpp">Abseil-cpp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Abseil-cpp</title>
-
-    <para>
-      The <application>Abseil-cpp</application> package contains a series of
-      libraries designed to augment the C++ standard library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&abseil-cpp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &abseil-cpp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &abseil-cpp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &abseil-cpp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &abseil-cpp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Abseil-cpp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Abseil-cpp</title>
-
-    <para>
-      Install <application>Abseil-cpp</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  \
-      -DABSL_PROPAGATE_CXX_STD=ON \
-      -DBUILD_SHARED_LIBS=ON      \
-      -GNinja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DABSL_PROPAGATE_CXX_STD=ON</parameter>: This parameter
-      enables propagating C++ features to targets that link to this package's
-      libraries.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter builds
-      shared versions of the libraries provided by this package instead of
-      static libraries.
-    </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>
-          libabsl_bad_any_cast_impl.so,
-          libabsl_bad_optional_access.so,
-          libabsl_bad_variant_access.so,
-          libabsl_base.so,
-          libabsl_city.so,
-          libabsl_civil_time.so,
-          libabsl_cord_internal.so,
-          libabsl_cord.so,
-          libabsl_cordz_functions.so,
-          libabsl_cordz_handle.so,
-          libabsl_cordz_info.so,
-          libabsl_cordz_sample_token.so,
-          libabsl_crc32c.so,
-          libabsl_crc_cord_state.so,
-          libabsl_crc_cpu_detect.so,
-          libabsl_crc_internal.so,
-          libabsl_debugging_internal.so,
-          libabsl_demangle_internal.so,
-          libabsl_die_if_null.so,
-          libabsl_examine_stack.so,
-          libabsl_exponential_biased.so,
-          libabsl_failure_signal_handler.so,
-          libabsl_flags_commandlineflag_internal.so,
-          libabsl_flags_commandlineflag.so,
-          libabsl_flags_config.so,
-          libabsl_flags_internal.so,
-          libabsl_flags_marshalling.so,
-          libabsl_flags_parse.so,
-          libabsl_flags_private_handle_accessor.so,
-          libabsl_flags_program_name.so,
-          libabsl_flags_reflection.so,
-          libabsl_flags_usage_internal.so,
-          libabsl_flags_usage.so,
-          libabsl_graphcycles_internal.so,
-          libabsl_hash.so,
-          libabsl_hashtablez_sampler.so,
-          libabsl_int128.so,
-          libabsl_kernel_timeout_internal.so,
-          libabsl_leak_check.so,
-          libabsl_log_entry.so,
-          libabsl_log_flags.so,
-          libabsl_log_globals.so,
-          libabsl_log_initalize.so,
-          libabsl_log_internal_check_op.so,
-          libabsl_log_internal_conditions.so,
-          libabsl_log_internal_fnmatch.so,
-          libabsl_log_internal_format.so,
-          libabsl_log_internal_globals.so,
-          libabsl_log_internal_log_sink_set.so,
-          libabsl_log_internal_message.so,
-          libabsl_log_internal_nullguard.so,
-          libabsl_log_internal_proto.so,
-          libabsl_log_severity.so,
-          libabsl_log_sink.so,
-          libabsl_low_level_hash.so,
-          libabsl_malloc_internal.so,
-          libabsl_periodic_sampler.so,
-          libabsl_random_distributions.so,
-          libabsl_random_internal_distribution_test_util.so,
-          libabsl_random_internal_platform.so,
-          libabsl_random_internal_pool_urbg.so,
-          libabsl_random_internal_randen_hwaes_impl.so,
-          libabsl_random_internal_randen_hwaes.so,
-          libabsl_random_internal_randen_slow.so,
-          libabsl_random_internal_randen.so,
-          libabsl_random_internal_seed_material.so,
-          libabsl_random_seed_gen_exception.so,
-          libabsl_random_seed_sequences.so,
-          libabsl_raw_hash_set.so,
-          libabsl_raw_logging_internal.so,
-          libabsl_scoped_set_env.so,
-          libabsl_spinlock_wait.so,
-          libabsl_stacktrace.so,
-          libabsl_statusor.so,
-          libabsl_status.so,
-          libabsl_strerror.so,
-          libabsl_str_format_internal.so,
-          libabsl_strings_internal.so,
-          libabsl_strings.so,
-          libabsl_string_view.so,
-          libabsl_symbolize.so,
-          libabsl_synchronization.so,
-          libabsl_throw_delegate.so,
-          libabsl_time.so,
-          libabsl_time_zone.so, and
-          libabsl_vlog_config_internal.so
-        </seg>
-        <seg>
-          /usr/include/absl,
-          /usr/lib/cmake/absl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="PROGRAM1">
-        <term><command>PROGRAM1</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM1">
-            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="PROGRAM2">
-        <term><command>PROGRAM2</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM2">
-            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    -->
-  </sect2>
-</sect1>
Index: neral/genlib/appstream.xml
===================================================================
--- general/genlib/appstream.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,286 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 appstream-download-http "https://www.freedesktop.org/software/appstream/releases/AppStream-&appstream-version;.tar.xz">
-  <!ENTITY appstream-download-ftp  " ">
-  <!ENTITY appstream-md5sum        "00e749276887f816b6d68a7a150e6c97">
-  <!ENTITY appstream-size          "2.5 MB">
-  <!ENTITY appstream-buildsize     "27 MB">
-  <!ENTITY appstream-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="appstream" xreflabel="AppStream-&appstream-version;">
-  <?dbhtml filename="appstream.html"?>
-
-  <title>AppStream-&appstream-version;</title>
-
-  <indexterm zone="appstream">
-    <primary sortas="a-appstream">AppStream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AppStream</title>
-
-    <para>
-      The <application>AppStream</application> package contains a library and
-      tool that is useful for retrieving software metadata and making it
-      easily accessible to programs which need it.
-    </para>
-
-    <!-- Remember to update the org.linuxfromscratch.lfs.xml file in
-         configuration section when tagging this.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AppStream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="itstool"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxmlb"/>, and
-      <xref linkend="libyaml"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      &qt5-deps;,
-      <xref linkend="qt6"/>,
-      <ulink url="https://github.com/openSUSE/daps">DAPS</ulink>, and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AppStream</title>
-
-    <para>
-      Install <application>AppStream</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dapidocs=false     \
-            -Dstemming=false    .. &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 &amp;&amp;
-mv -v /usr/share/doc/appstream{,-&appstream-version;}</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>-Dapidocs=false</parameter>: This switch disables building the
-      API documentation. Remove it if you have
-      <xref linkend="gi-docgen" role="nodep"/> installed and wish to
-      regenerate the API documentation.  When the API documentation is
-      not regenerated, a pre-built copy is installed anyway.
-    </para>
-
-    <para>
-      <parameter>-Dstemming=false</parameter>: This switch disables stemming
-      support. Remove this switch if you have
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-      installed and want faster searches.
-    </para>
-    
-    <para>
-      <option>-Dqt5=true</option>: Use this option if you have &qt5-deps;
-      installed and you want to build support for Qt-5 applications into this
-      package.
-    </para>
-    
-    <para>
-      <option>-Dqt=true</option>: Use this option if you have
-      <xref linkend="qt6" role="nodep"/> installed and you want to build support
-      for Qt6 applications into this package. This option conflicts with
-      <option>-Dqt5=true</option>.
-    </para>
-
-  </sect2>
-  
-  <sect2 role="configuration">
-    <title>Configuring AppStream</title>
-
-    <sect3 id="appstream-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/usr/share/metainfo/org.linuxfromscratch.lfs.xml</filename>
-      </para>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>AppStream</application> expects an operating system
-        metainfo file describing the GNU/Linux distribution.  As the
-        &root; user, create the file describing LFS:
-      </para>
-
-      <indexterm zone="appstream appstream-config">
-        <primary sortas="e-usr-share-metainfo-org-linuxfromscratch-lfs-xml">
-          /usr/share/metainfo/org.linuxfromscratch.lfs.xml
-        </primary>
-      </indexterm>
-
-      <screen role="root"><userinput>install -vdm755 /usr/share/metainfo &amp;&amp;
-cat > /usr/share/metainfo/org.linuxfromscratch.lfs.xml &lt;&lt; EOF
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;component type="operating-system"&gt;
-  &lt;id&gt;org.linuxfromscratch.lfs&lt;/id&gt;
-  &lt;name&gt;Linux From Scratch&lt;/name&gt;
-  &lt;summary&gt;A customized Linux system built entirely from source&lt;/summary&gt;
-  &lt;description&gt;
-    &lt;p&gt;
-      Linux From Scratch (LFS) is a project that provides you with
-      step-by-step instructions for building your own customized Linux
-      system entirely from source.
-    &lt;/p&gt;
-  &lt;/description&gt;
-  &lt;url type="homepage"&gt;https://www.linuxfromscratch.org/lfs/&lt;/url&gt;
-  &lt;metadata_license&gt;MIT&lt;/metadata_license&gt;
-  &lt;developer id='linuxfromscratch.org'&gt;
-    &lt;name&gt;The Linux From Scratch Editors&lt;/name&gt;
-  &lt;/developer&gt;
-
-  &lt;releases&gt;
-    &lt;release version="12.2" type="development" date="2024-09-01"&gt;
-      &lt;description&gt;
-        &lt;p&gt;The next release of Linux From Scratch.&lt;/p&gt;
-      &lt;/description&gt;
-    &lt;/release&gt;
-
-    &lt;release version="12.1" type="stable" date="2024-03-01"&gt;
-      &lt;description&gt;
-        &lt;p&gt;Now contains Binutils 2.42, GCC-13.2.0, Glibc-2.39, and Linux
-        kernel 6.7.&lt;/p&gt;
-      &lt;/description&gt;
-    &lt;/release&gt;
-  &lt;/releases&gt;
-&lt;/component&gt;</literal>
-EOF</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>
-          appstreamcli
-        </seg>
-        <seg>
-          libappstream.so
-        </seg>
-        <seg>
-          /usr/include/appstream,
-          /usr/share/doc/appstream-&version;, and
-          /usr/share/installed-tests/appstream
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appstreamcli">
-        <term><command>appstreamcli</command></term>
-        <listitem>
-          <para>
-            queries information from AppStream metadata and from the AppStream
-            component index
-          </para>
-          <indexterm zone="appstream appstreamcli">
-            <primary sortas="b-appstreamcli">appstreamcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libappstream">
-        <term><filename class="libraryfile">libappstream.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that handle AppStream metadata queries and
-            request information from the AppStream component index
-          </para>
-          <indexterm zone="appstream libappstream">
-            <primary sortas="c-libappstream">libappstream.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apr-util-download-http
-           "https://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
-  <!ENTITY apr-util-download-ftp  " ">
-  <!ENTITY apr-util-md5sum        "b6e8c9b31d938fe5797ceb0d1ff2eb69">
-  <!ENTITY apr-util-size          "423 KB">
-  <!ENTITY apr-util-buildsize     "7.6 MB (add 1.4 MB for tests)">
-  <!ENTITY apr-util-time          "less than 0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="apr-util" xreflabel="Apr-Util-&apr-util-version;">
-  <?dbhtml filename="apr-util.html"?>
-
-
-  <title>Apr-Util-&apr-util-version;</title>
-
-  <indexterm zone="apr-util">
-    <primary sortas="a-Apr-Util">Apr-Util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apr Util</title>
-
-    <para>
-      The Apache Portable Runtime Utility Library provides a predictable and
-      consistent interface to underlying client library interfaces. This
-      application programming interface assures predictable if not identical
-      behavior regardless of which libraries are available on a given platform.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apr-util-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apr-util-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apr-util-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apr-util-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apr-util-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apr-util-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Apr Util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unixodbc"/>, and
-      &berkeley-db;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apr Util</title>
-
-    <para>
-      Install <application>Apr Util</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr       \
-            --with-apr=/usr     \
-            --with-gdbm=/usr    \
-            --with-openssl=/usr \
-            --with-crypto &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 test</command>.
-      One test, testdbm, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gdbm=/usr</parameter>: This switch enables the
-      <filename class="libraryfile">apr_dbm_gdbm-1.so</filename> plugin.
-    </para>
-
-    <para>
-      <parameter>--with-openssl=/usr</parameter>
-      <parameter>--with-crypto</parameter>: These
-      switches enable the
-      <filename class="libraryfile">apr_crypto_openssl-1.so</filename>
-      plugin.
-    </para>
-
-    <para>
-      <option>--with-berkeley-db=/usr</option>: If you have installed
-      &berkeley-db;, use this switch to compile the
-      <filename class="libraryfile">apr_dbm_db-1.so</filename> plugin.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: If you have installed
-      <xref linkend="openldap"/>, use this switch to compile the
-      <filename class="libraryfile">apr_ldap.so</filename> plugin.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          apu-1-config
-        </seg>
-        <seg>
-          libaprutil-1.so
-        </seg>
-        <seg>
-          /usr/lib/apr-util-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apu-1-config">
-        <term><command>apu-1-config</command></term>
-        <listitem>
-          <para>
-            is an APR-util script designed to allow easy command line access to
-            APR-util configuration parameters
-          </para>
-          <indexterm zone="apr-util apu-1-config">
-            <primary sortas="b-apu-1-config">apu-1-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaprutil-1">
-        <term><filename class="libraryfile">libaprutil-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a predictable and consistent
-            interface to underlying client library interfaces
-          </para>
-          <indexterm zone="apr-util libaprutil-1">
-            <primary sortas="c-libaprutil-1">libaprutil-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apr-download-http
-    "https://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
-  <!ENTITY apr-download-ftp  " ">
-  <!ENTITY apr-md5sum        "f8a62f3984898ba0ea8b6f26b851cb99">
-  <!ENTITY apr-size          "876 KB">
-  <!ENTITY apr-buildsize     "11 MB (additional 4 MB for the tests)">
-  <!ENTITY apr-time          "0.1 SBU (add 1.4 SBU for tests)">
-]>
-
-<sect1 id="apr" xreflabel="Apr-&apr-version;">
-  <?dbhtml filename="apr.html"?>
-
-
-  <title>Apr-&apr-version;</title>
-
-  <indexterm zone="apr">
-    <primary sortas="a-apr">Apr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apr</title>
-
-    <para>
-      The Apache Portable Runtime (APR) is a supporting library for the
-      Apache web server. It provides a set of application programming interfaces
-      (APIs) that map to the underlying Operating System (OS). Where the OS
-      doesn't support a particular function, APR will provide an emulation. Thus
-      programmers can use the APR to make a program portable across different
-      platforms.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <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>
-      Fix an issue checking a location in a script template:
-    </para>
-<screen><userinput>sed -e '/^case "$0"/s;$0;$(readlink -f $0);' \
-    -i apr-config.in</userinput></screen>
--->
-    <para>
-      Install <application>Apr</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-installbuilddir=/usr/share/apr-1/build &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>. <!-- teststr is
-      known to hang on some systems. - WORKS AS OF 1.6.5 (renodr) -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          apr-1-config
-        </seg>
-        <seg>
-          libapr-1.so
-        </seg>
-        <seg>
-          /usr/include/apr-1 and
-          /usr/share/apr-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apr-1-config">
-        <term><command>apr-1-config</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="apr apr-1-config">
-            <primary sortas="b-apr-1-config">apr-1-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libapr-1">
-        <term><filename class="libraryfile">libapr-1.so</filename></term>
-        <listitem>
-          <para>
-            is the Apache Portable Runtime library
-          </para>
-          <indexterm zone="apr libapr-1">
-            <primary sortas="c-libapr-1">libapr-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,380 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 aspell-download-http "&gnu-http;/aspell/aspell-&aspell-version;.tar.gz">
-  <!ENTITY aspell-download-ftp  " ">
-  <!ENTITY aspell-en-dict       "aspell6-en-2020.12.07-0">
-  <!ENTITY aspell-en-dict-url   "&gnu-http;/aspell/dict/en/&aspell-en-dict;.tar.bz2">
-  <!ENTITY aspell-md5sum        "187bd142f522ada555c7aa6b9cbf56e6">
-  <!ENTITY aspell-size          "3.4 MB">
-  <!ENTITY aspell-buildsize     "41 MB (Additional 8 MB for EN dictionary)">
-  <!ENTITY aspell-time          "0.4 SBU">
-]>
-
-<sect1 id="aspell" xreflabel="Aspell-&aspell-version;">
-  <?dbhtml filename="aspell.html"?>
-
-
-  <title>Aspell-&aspell-version;</title>
-
-  <indexterm zone="aspell">
-    <primary sortas="a-Aspell">Aspell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Aspell</title>
-
-    <para>
-      The <application>Aspell</application> package contains an interactive
-      spell checking program and the <application>Aspell</application>
-      libraries. <application>Aspell</application> can either be used as a
-      library or as an independent spell checker.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&aspell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&aspell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &aspell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &aspell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &aspell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &aspell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <para>
-      You'll need to download at least one dictionary. The English dictionary
-      is given as an example below. Dictionaries in many other languages can be
-      found at <ulink url="&gnu-http;/aspell/dict"/>.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Aspell English dictionary: <ulink url="&aspell-en-dict-url;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Aspell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/> (for the dictionaries)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Aspell</title>
-
-    <para>
-      Install <application>Aspell</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 &amp;&amp;
-ln -svfn aspell-0.60 /usr/lib/aspell &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/aspell-&aspell-version;/aspell{,-dev}.html &amp;&amp;
-
-install -v -m644 manual/aspell.html/* \
-    /usr/share/doc/aspell-&aspell-version;/aspell.html &amp;&amp;
-
-install -v -m644 manual/aspell-dev.html/* \
-    /usr/share/doc/aspell-&aspell-version;/aspell-dev.html</userinput></screen>
-
-    <para>
-      If you do not plan to install <application>Ispell</application>, then copy
-      the wrapper script <command>ispell</command>:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 scripts/ispell /usr/bin/</userinput></screen>
-
-    <para>
-      If you do not plan to install <application>Spell</application>, then copy
-      the wrapper script <command>spell</command>:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 scripts/spell /usr/bin/</userinput></screen>
- </sect2>
-
- <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -svfn aspell-0.60 /usr/lib/aspell</command>: This command is
-      useful for configuration of other applications, such as
-      <xref linkend="enchant"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Aspell</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        After <application>Aspell</application> is installed, you must set up at
-        least one dictionary. Install the English dictionary by running the
-        following commands:
-      </para>
-
-<screen><userinput>tar xf ../&aspell-en-dict;.tar.bz2 &amp;&amp;
-cd &aspell-en-dict;                &amp;&amp;
-
-./configure &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      <para>
-        Other dictionaries can be installed with the same instructions.
-      </para>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aspell, aspell-import, precat, preunzip, prezip, prezip-bin,
-          pspell-config, run-with-aspell, word-list-compress and optionally,
-          ispell and spell.
-        </seg>
-        <seg>libaspell.so and libpspell.so</seg>
-        <seg>/usr/include/pspell and /usr/lib/aspell-0.60</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aspell-prog">
-        <term><command>aspell</command></term>
-        <listitem>
-          <para>
-            is a utility that can function as an <command>ispell -a</command>
-            replacement, as an independent spell checker, as a test utility to
-            test out <application>Aspell</application> features, and as a
-            utility for managing dictionaries
-          </para>
-          <indexterm zone="aspell aspell-prog">
-            <primary sortas="b-aspell">aspell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-ispell">
-        <term><command>ispell</command></term>
-        <listitem>
-          <para>
-            is a wrapper around <command>aspell</command> to invoke it in
-            <command>ispell</command> compatible mode
-          </para>
-          <indexterm zone="aspell aspell-ispell">
-            <primary sortas="b-ispell">ispell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-spell">
-        <term><command>spell</command></term>
-        <listitem>
-          <para>
-            is a wrapper around <command>aspell</command> to invoke it in
-            <command>spell</command> compatible mode
-          </para>
-          <indexterm zone="aspell aspell-spell">
-            <primary sortas="b-spell">spell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-import">
-        <term><command>aspell-import</command></term>
-        <listitem>
-          <para>
-            imports old personal dictionaries into
-            <application>Aspell</application>
-          </para>
-          <indexterm zone="aspell aspell-import">
-            <primary sortas="b-aspell-import">aspell-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="precat">
-        <term><command>precat</command></term>
-        <listitem>
-          <para>
-            decompresses a <command>prezip</command>ped file to stdout
-          </para>
-          <indexterm zone="aspell precat">
-            <primary sortas="b-precat">precat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preunzip">
-        <term><command>preunzip</command></term>
-        <listitem>
-          <para>
-            decompresses a <command>prezip</command>ped file
-          </para>
-          <indexterm zone="aspell preunzip">
-            <primary sortas="b-preunzip">preunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prezip">
-        <term><command>prezip</command></term>
-        <listitem>
-          <para>
-            is a prefix delta compressor, used to compress sorted word lists or
-            other similar text files
-          </para>
-          <indexterm zone="aspell prezip">
-            <primary sortas="b-prezip">prezip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prezip-bin">
-        <term><command>prezip-bin</command></term>
-        <listitem>
-          <para>
-            is called by the various wrapper scripts to perform the actual
-            compressing and decompressing
-          </para>
-          <indexterm zone="aspell prezip-bin">
-            <primary sortas="b-prezip-bin">prezip-bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pspell-config">
-        <term><command>pspell-config</command></term>
-        <listitem>
-          <para>
-            displays information about the
-            <filename class="libraryfile">libpspell</filename> installation,
-            mostly for use in build scripts
-          </para>
-          <indexterm zone="aspell pspell-config">
-            <primary sortas="b-pspell-config">pspell-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="run-with-aspell">
-        <term><command>run-with-aspell</command></term>
-        <listitem>
-          <para>
-            is a script to help use <application>Aspell</application> as an
-            <command>ispell</command> replacement
-          </para>
-          <indexterm zone="aspell run-with-aspell">
-            <primary sortas="b-run-with-aspell">run-with-aspell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="word-list-compress">
-        <term><command>word-list-compress</command></term>
-        <listitem>
-          <para>
-            compresses or decompresses sorted word lists for use with the
-            <application>Aspell</application> spell checker
-          </para>
-          <indexterm zone="aspell word-list-compress">
-            <primary sortas="b-word-list-compress">word-list-compress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaspell">
-        <term><filename class="libraryfile">libaspell.so</filename></term>
-        <listitem>
-          <para>
-            contains spell checking API functions
-          </para>
-          <indexterm zone="aspell libaspell">
-            <primary sortas="c-libaspell">libaspell.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpspell">
-        <term><filename class="libraryfile">libpspell.so</filename></term>
-        <listitem>
-          <para>
-            is an interface to the
-            <filename class="libraryfile">libaspell</filename> library. All the
-            spell checking functionality is now in
-            <filename class="libraryfile">libaspell</filename> but this library
-            is included for backward compatibility
-          </para>
-          <indexterm zone="aspell libpspell">
-            <primary sortas="c-libpspell">libpspell.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 boost-download-http "https://github.com/boostorg/boost/releases/download/boost-&boost-version;/boost-&boost-dl-version;.tar.xz">
-  <!ENTITY boost-download-ftp  " ">
-  <!ENTITY boost-md5sum        "eff463ec1c67a8725fb3d2948abc5ca5">
-  <!ENTITY boost-size          "90 MB">
-  <!ENTITY boost-buildsize     "899 MB (197 MB installed)">
-  <!ENTITY boost-time          "1.8 SBU (Using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="boost" xreflabel="Boost-&boost-version;">
-  <?dbhtml filename="boost.html"?>
-
-  <title>boost-&boost-version;</title>
-
-  <indexterm zone="boost">
-    <primary sortas="a-Boost">Boost</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Boost</title>
-
-    <para>
-      <application>Boost</application> provides a set of free peer-reviewed
-      portable C++ source libraries. It includes libraries for linear algebra,
-      pseudorandom number generation, multithreading, image processing, regular
-      expressions and unit testing.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        This package will extract to the 
-        <filename>boost-&boost-version;</filename>/ directory.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&boost-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&boost-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &boost-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &boost-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &boost-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &boost-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch, required to build <xref linkend="libreoffice"/>:
-          <ulink url="&patch-root;/boost-&boost-version;-gcc_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">Boost Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> and
-      <ulink url="https://www.open-mpi.org/">Open MPI</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/boost"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Boost</title>
-
-    <para>
-      This package can be built with several jobs running in parallel. In
-      the instructions below, <parameter>&lt;N&gt;</parameter> stands for the
-      number of jobs. Install <application>Boost</application> by running the
-      following commands:
-    </para>
-
-
-<screen><userinput>./bootstrap.sh --prefix=/usr --with-python=python3 &amp;&amp;
-./b2 stage -j<replaceable>&lt;N&gt;</replaceable> threading=multi link=shared</userinput></screen>
-
-    <para>
-      To run Boost.Build's regression tests, issue
-      <command>pushd tools/build/test; python3 test_all.py; popd</command>.
-    </para>
-
-    <para>
-      To run every library's regression tests, issue <command>pushd status;
-      ../b2; popd</command>.  A few tests may fail. They take a very long time
-      (over 119 SBU at -j4) and use a very large amount of disk space
-      (46 GB). You should use the <parameter>-jN</parameter> switch to
-      speed them up.
-    </para>
-
-    <note>
-      <para>
-        Boost installs many versioned directories in /usr/lib/cmake.
-        If a new version of <application>Boost</application> is installed over a
-        previous version, the older cmake directories need to be
-        explicitly removed.  To do this, run as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>rm -rf /usr/lib/cmake/[Bb]oost*</userinput></screen>
-
-      <para>
-        before installing the new version.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: ./b2 - -prefix=<DESTDIR>/usr install threading=multi link=shared -->
-
-<screen role="root"><userinput>./b2 install threading=multi link=shared</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>sed -i '/#include ...</command>: This removes the inclusion
-      of <filename>boost/phoenix/stl/tuple.hpp</filename> from this header-only
-      library, allowing applications which use it to link using recent C++.
-    </para>
--->
-    <para>
-      <parameter>threading=multi</parameter>: This parameter ensures that
-      <application>Boost</application> is built with multithreading support.
-    </para>
-
-    <para>
-      <parameter>link=shared</parameter>: This parameter ensures that only
-      shared libraries are created, except for libboost_exception and
-      libboost_test_exec_monitor which are created as static. Most people
-      will not need the static libraries, and most programs using
-      <application>Boost</application> only use the headers. Omit
-      this parameter if you do need static libraries.
-    </para>
-
-    <para>
-      <parameter>--with-python=python3</parameter>: This switch ensures Python3
-      is used if Python2 is installed.
-    </para>
-
-    <para>
-       <option>-jN</option>: This switch may be added to the
-       <command>b2</command> command lines, to run up to N processes in
-       parallel.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libboost_atomic.so, libboost_charconv.so, libboost_chrono.so,
-          libboost_container.so, 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_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_numpy3&python3-minor;.so,
-          libboost_prg_exec_monitor.so, libboost_program_options.so,
-          libboost_python3&python3-minor;.so, libboost_random.so,
-          libboost_regex.so, libboost_serialization.so,
-          libboost_stacktrace_addr2line.so, libboost_stacktrace_basic.so,
-          libboost_stacktrace_noop.so, libboost_system.so,
-          libboost_test_exec_monitor.a, libboost_thread.so, libboost_timer.so,
-          libboost_type_erasure.so, libboost_unit_test_framework.so,
-          libboost_url.so, libboost_wave.so, and libboost_wserialization.so
-        </seg>
-        <seg>
-          /usr/include/boost
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/brotli.xml
===================================================================
--- general/genlib/brotli.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 brotli-download-http "https://github.com/google/brotli/archive/v&brotli-version;/brotli-&brotli-version;.tar.gz">
-  <!ENTITY brotli-download-ftp  " ">
-  <!ENTITY brotli-md5sum        "3a6a3dba82a3604792d3cb0bd41bca60">
-  <!ENTITY brotli-size          "500 KB">
-  <!ENTITY brotli-buildsize     "33 MB (with python3 bindings)">
-  <!-- The python tests for this package are broken.  The tarball is missing a lot of test files -->
-  <!ENTITY brotli-time          "0.3 SBU (with python3 bindings; parallelism=4)">
-]>
-
-<sect1 id="brotli" xreflabel="Brotli-&brotli-version;">
-  <?dbhtml filename="brotli.html"?>
-
-
-  <title>brotli-&brotli-version;</title>
-
-  <indexterm zone="brotli">
-    <primary sortas="a-brotli">Brotli</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Brotli</title>
-
-    <para>
-      <application>Brotli</application> provides a general-purpose lossless
-      compression algorithm that compresses data using a combination of a
-      modern variant of the LZ77 algorithm, Huffman coding and 2nd order
-      context modeling. Its libraries are particularly used for WOFF2 fonts
-      on webpages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&brotli-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&brotli-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &brotli-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &brotli-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &brotli-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &brotli-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Brotli Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="pluggy"/> and-->
-      <!-- Pluggy is a required dependency of pytest -->
-      <xref linkend="pytest"/> (for testing Python3 bindings)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Brotli</title>
-
-    <para>
-      Install <application>brotli</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  \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-<!--  These are broken
-    <para>
-      The python tests are missing most of the necessary testdata files and
-      therefore 240 of 311 tests fail.
-      If you nevertheless wish to test the bindings, go back to the top-level directory and
-      issue: <command>python3 setup.py test</command>.
-    </para>
--->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If desired, build the <application>Python3</application>
-      bindings:
-    </para>
-
-<screen><userinput>cd .. &amp;&amp;
-sed "/c\/.*\.[ch]'/d;\
-     /include_dirs=\[/\
-     i libraries=['brotlicommon','brotlidec','brotlienc']," \
-    -i setup.py &amp;&amp;
-&build-wheel-cmd; $PWD</userinput></screen>
-
-    <para>
-      Install the <application>Python3</application>
-      bindings as the &root; user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Brotli</userinput></screen>
-
-    <!-- "131 passed in 2.76s" for me with 1.1.0 -->
-    <para>
-      To test the <application>Python3</application> binding, issue:
-      <command>pytest</command>.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- https://github.com/google/brotli/issues/933 -->
-    <para>
-      <command>sed ... -i setup.py</command>: Stop
-      <filename>setup.py</filename> from rebuilding the entire package all
-      over again, use the already installed libraries for the
-      <application>Python3</application> binding instead.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          brotli
-        </seg>
-        <seg>
-          libbrotlicommon.so,
-          libbrotlidec.so, and
-          libbrotlienc.so
-        </seg>
-        <seg>
-          /usr/include/brotli and
-          /usr/lib/python&python3-majorver;/site-packages/Brotli-&brotli-version;.dist-info
-          (if you built and installed the Python3 bindings)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="brotli-prog">
-        <term><command>brotli</command></term>
-        <listitem>
-          <para>
-            can compress or decompress files, or test the integrity of
-            compressed files
-          </para>
-          <indexterm zone="brotli brotli-prog">
-            <primary sortas="b-brotli">brotli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlicommon">
-        <term><filename class="libraryfile">libbrotlicommon{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli common dictionary library
-          </para>
-          <indexterm zone="brotli libbrotlicommon">
-            <primary sortas="c-libbrotlicommon">libbrotlicommon{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlidec">
-        <term><filename class="libraryfile">libbrotlidec{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli decoder library
-          </para>
-          <indexterm zone="brotli libbrotlidec">
-            <primary sortas="c-libbrotlidec">libbrotlidec{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlienc">
-        <term><filename class="libraryfile">libbrotlienc{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli common encoder library
-          </para>
-          <indexterm zone="brotli libbrotlienc">
-            <primary sortas="c-libbrotlienc">libbrotlienc{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 clucene-download-http "&sourceforge-dl;/clucene/clucene-core-&clucene-version;.tar.gz">
-  <!ENTITY clucene-download-ftp  " ">
-  <!ENTITY clucene-md5sum        "48d647fbd8ef8889e5a7f422c1bfda94">
-  <!ENTITY clucene-size          "2.2 MB">
-  <!ENTITY clucene-buildsize     "78 MB">
-  <!ENTITY clucene-time          "0.8 SBU">
-]>
-
-<sect1 id="clucene" xreflabel="CLucene-&clucene-version;">
-  <?dbhtml filename="clucene.html"?>
-
-
-  <title>CLucene-&clucene-version;</title>
-
-  <indexterm zone="clucene">
-    <primary sortas="a-clucene">clucene</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CLucene</title>
-
-    <para>
-      <application>CLucene</application> is a C++ version of Lucene, a
-      high performance text search engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clucene-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clucene-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clucene-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clucene-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clucene-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clucene-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/clucene-&clucene-version;-contribs_lib-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CLucene Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLucene</title>
-
-    <para>
-      Install <application>CLucene</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../clucene-&clucene-version;-contribs_lib-1.patch &amp;&amp;
-
-sed -i '/Misc.h/a #include &lt;ctime&gt;' src/core/CLucene/document/DateTools.cpp &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_CONTRIBS_LIB=ON .. &amp;&amp;
-make</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>-DBUILD_CONTRIBS_LIB=ON</parameter>: This cmake variable
-      enables building the CLucene contribs library necessary for running
-      applications that use language specific text analyzers like LibreOffice
-      for example.
-    </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>
-          libclucene-contribs-lib.so,
-          libclucene-core.so, and
-          libclucene-shared.so
-        </seg>
-        <seg>
-          /usr/include/CLucene and
-          /usr/lib/CLuceneConfig.cmake
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/dbus-glib.xml
===================================================================
--- general/genlib/dbus-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="dbus-glib" xreflabel="dbus-glib-&dbus-glib-version;">
-  <?dbhtml filename="dbus-glib.html"?>
-
-
-  <title>dbus-glib-&dbus-glib-version;</title>
-
-  <indexterm zone="dbus-glib">
-    <primary sortas="a-dbus-glib">dbus-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to D-Bus GLib</title>
-
-    <para>
-      The <application>D-Bus GLib</application> package contains
-      <application>GLib</application> interfaces to the
-      <application>D-Bus</application> API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dbus-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dbus-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dbus-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dbus-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dbus-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dbus-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">D-Bus GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/> and
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus GLib</title>
-
-    <para>
-      Install <application>D-Bus GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that
-      more comprehensive tests can be run by following the same method used in
-      <application>D-Bus</application> instructions, which requires building the
-      package twice.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dbus-binding-tool
-        </seg>
-        <seg>
-          libdbus-glib-1.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/dbus-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glib-dbus-binding-tool">
-        <term><command>dbus-binding-tool</command></term>
-        <listitem>
-          <para>
-            is a tool used to interface with the D-Bus API
-          </para>
-          <indexterm zone="dbus-glib glib-dbus-binding-tool">
-            <primary sortas="b-dbus-binding-tool">dbus-binding-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-glib-1">
-        <term><filename class="libraryfile">libdbus-glib-1.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>GLib</application> interface functions
-            to the <application>D-Bus</application> API
-          </para>
-          <indexterm zone="dbus-glib libdbus-glib-1">
-            <primary sortas="c-libdbus-glib-1">libdbus-glib-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/double-conversion.xml
===================================================================
--- general/genlib/double-conversion.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 double-conversion-download-http "https://github.com/google/double-conversion/archive/v&double-conversion-version;/double-conversion-&double-conversion-version;.tar.gz">
-  <!ENTITY double-conversion-download-ftp  " ">
-  <!ENTITY double-conversion-md5sum        "b344abb64084a4a1d98a43e67752989b">
-  <!ENTITY double-conversion-size          "6.7 MB">
-  <!ENTITY double-conversion-buildsize     "62 MB (with tests)">
-  <!ENTITY double-conversion-time          "0.1 SBU (with tests)">
-
-]>
-
-<sect1 id="double-conversion" xreflabel="double-conversion-&double-conversion-version;">
-  <?dbhtml filename="double-conversion.html"?>
-
-
-  <title>Double-conversion-&double-conversion-version;</title>
-
-  <indexterm zone="double-conversion">
-    <primary sortas="a-double-conversion">double-conversion</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Double-conversion</title>
-
-    <para>
-      The <application>Double-conversion</application> package contains a
-      library that facilitates binary-to-decimal and decimal-to-binary routines
-      for IEEE doubles.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&double-conversion-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&double-conversion-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &double-conversion-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &double-conversion-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &double-conversion-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &double-conversion-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Double-conversion Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Double-conversion</title>
-
-    <para>
-      Install <application>Double-conversion</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_SHARED_LIBS=ON      \
-      -DBUILD_TESTING=ON          \
-      ..                          &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces cmake to build
-      a shared version of the library instead of the static version.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TESTING=ON</parameter>: This switch builds the test programs.
-    </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>
-          libdouble-conversion.so
-        </seg>
-        <seg>
-          /usr/include/double-conversion
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdouble-conversion">
-        <term><filename class="libraryfile">libdouble-conversion.so</filename></term>
-        <listitem>
-          <para>
-            provides binary-to-decimal and decimal-to-binary routines for IEEE doubles
-          </para>
-          <indexterm zone="double-conversion libdouble-conversion">
-            <primary sortas="c-libdouble-conversion">libdouble-conversion.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/duktape.xml
===================================================================
--- general/genlib/duktape.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 duktape-download-http "https://duktape.org/duktape-&duktape-version;.tar.xz">
-  <!ENTITY duktape-download-ftp  " ">
-  <!ENTITY duktape-md5sum        "b3200b02ab80125b694bae887d7c1ca6">
-  <!ENTITY duktape-size          "1003 KB">
-  <!ENTITY duktape-buildsize     "25 MB">
-  <!ENTITY duktape-time          "0.3 SBU">
-]>
-
-<sect1 id="duktape" xreflabel="duktape-&duktape-version;">
-  <?dbhtml filename="duktape.html"?>
-
-
-  <title>duktape-&duktape-version;</title>
-
-  <indexterm zone="duktape">
-    <primary sortas="a-duktape">duktape</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to duktape</title>
-
-    <para>
-      <application>duktape</application> is an embeddable Javascript
-      engine, with a focus on portability and compact footprint.
-    </para>
-
-    <!-- To editors: make sure polkit works with duktape before
-         tagging duktape.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&duktape-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&duktape-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &duktape-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &duktape-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &duktape-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &duktape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of duktape</title>
-
-    <para>
-      Install <application>duktape</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's/-Os/-O2/' Makefile.sharedlibrary
-make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libduktape.so and libduktaped.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libduktape.so">
-        <term><filename class="libraryfile">libduktape.so</filename></term>
-        <listitem>
-          <para>
-            is an embeddable Javascript engine
-          </para>
-          <indexterm zone="duktape">
-            <primary sortas="c-duktape">libduktape.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,261 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "5da2afd6cf92027b4871824d4da4afbf">
-  <!ENTITY enchant-size          "5.5 MB">
-  <!ENTITY enchant-buildsize     "20 MB (add 63 MB for tests)">
-  <!ENTITY enchant-time          "0.1 SBU (add 0.8 SBU for tests)">
-]>
-
-<sect1 id="enchant" xreflabel="enchant-&enchant-version;">
-  <?dbhtml filename="enchant.html"?>
-
-
-  <title>enchant-&enchant-version;</title>
-
-  <indexterm zone="enchant">
-    <primary sortas="a-enchant">enchant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to enchant</title>
-
-    <para>
-      The <application>enchant</application> package provides a generic
-      interface into various existing spell checking libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&enchant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&enchant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &enchant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &enchant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &enchant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &enchant-time;
-         </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">enchant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="aspell"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="doxygen"/>,
-      <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
-      <ulink url="https://hunspell.github.io/">Hunspell</ulink>,
-      <ulink url="https://nuspell.github.io/">Nuspell</ulink>,
-      <ulink url="https://hunspell.github.io/">Voikko</ulink>, and
-      <ulink url="https://github.com/unittest-cpp/unittest-cpp/releases">
-        unittest-cpp</ulink> (required for tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of enchant</title>
-
-    <para>
-      First, remove a generated file that causes the build to fail.
-      The file will be regenerated for the current system.
-    </para>
-
-<screen><userinput>rm -f src/api.c</userinput></screen>
-
-    <para>
-      Install <application>enchant</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir /usr/share/doc/enchant-&enchant-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run tests, unittest-cpp must be installed and the
-      <option>--enable-relocatable</option> option passed to configure above.
-      If these conditions are present, the tests may be run with <command>make
-      check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring enchant</title>
-
-    <sect3 id="enchant-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.enchant</filename> and
-        <filename>/usr/share/enchant/enchant.ordering</filename>
-      </para>
-
-      <indexterm zone="enchant enchant-config">
-        <primary sortas="e-AA.enchant">~/.enchant</primary>
-      </indexterm>
-
-      <indexterm zone="enchant enchant-config">
-        <primary
-        sortas="e-usr-share-enchant-enchant.ordering">/usr/share/enchant/enchant.ordering</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-<!--
-   Looks like this is not required when installing enchant in the flavor
-   we do above. Leaving it in source (for a while) in case I'm wrong and
-   it needs to be restored.
-      <para>
-        If you wish to use the <xref linkend="aspell"/> backend, create a
-        symlink, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -svfn ../../lib/aspell /usr/share/enchant/aspell</userinput></screen>
--->
-      <para>
-        You can test your installation and configuration by creating a test
-        file and running the following commands (you can replace the
-        en_GB dictionary by any other downloaded when installing <xref
-        linkend="aspell"/>):
-      </para>
-
-<screen remap="test"><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF"
-<literal>Tel me more abot linux
-Ther ar so many commads</literal>
-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>
-
-      <para>
-        You will see a list of the misspelled words followed by a list of
-        alternatives for them.
-      </para>
-
-      <para>
-        See more details in the enchant manual page.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>enchant-2 and enchant-lsmod-2</seg>
-        <seg>libenchant-2.so</seg>
-        <seg>/usr/include/enchant-2, /usr/lib/enchant-2,
-          /usr/share/enchant, and /usr/share/doc/enchant-&enchant-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="enchant-2">
-        <term><command>enchant-2</command></term>
-        <listitem>
-          <para>
-            is a spellchecker
-          </para>
-          <indexterm zone="enchant enchant-2">
-            <primary sortas="b-enchant-2">enchant-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enchant-lsmod-2">
-        <term><command>enchant-lsmod-2</command></term>
-        <listitem>
-          <para>
-            lists available backends, languages, and dictionaries
-          </para>
-          <indexterm zone="enchant enchant-lsmod-2">
-            <primary sortas="b-enchant-lsmod-2">enchant-lsmod-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libenchant-2">
-        <term><filename class="libraryfile">libenchant-2.so</filename></term>
-        <listitem>
-          <para>
-            contains spell checking interface API functions
-          </para>
-          <indexterm zone="enchant libenchant-2">
-            <primary sortas="c-libenchant-2">libenchant-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 exempi-download-http "https://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.xz">
-  <!ENTITY exempi-download-ftp  " ">
-  <!ENTITY exempi-md5sum        "51fe14c2a5fa44816ba8187c6ad87d78">
-  <!ENTITY exempi-size          "2.7 MB">
-  <!ENTITY exempi-buildsize     "289 MB (add 236 MB for tests)">
-  <!ENTITY exempi-time          "0.4 SBU (add 0.6 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="exempi" xreflabel="Exempi-&exempi-version;">
-  <?dbhtml filename="exempi.html"?>
-
-
-  <title>Exempi-&exempi-version;</title>
-
-  <indexterm zone="exempi">
-    <primary sortas="a-Exempi">Exempi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exempi</title>
-
-    <para>
-      <application>Exempi</application> is an implementation of XMP (Adobe's
-      Extensible Metadata Platform).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exempi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exempi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exempi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exempi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exempi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exempi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exempi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="required">
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exempi</title>
-
-    <para>
-      If you intend to run the regression tests, first remove a test
-      that depends on an apparently proprietary Adobe SDK:
-    </para>
-
-<screen><userinput>sed -i -r '/^\s?testadobesdk/d' exempi/Makefile.am &amp;&amp;
-autoreconf -fiv</userinput></screen>
-
-
-    <para>
-      Install <application>Exempi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.<!--
-      If valgrind is installed, mosts tests will indicate a failure, but
-      that is a test problem and not a package problem.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>exempi</seg>
-        <seg>libexempi.so</seg>
-        <seg>/usr/include/exempi-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="exempi-prog">
-        <term><command>exempi</command></term>
-        <listitem>
-          <para>
-            is a command line tool to manipulate XMP metadata
-          </para>
-          <indexterm zone="exempi exempi-prog">
-            <primary sortas="b-exempi">exempi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexempi">
-        <term><filename class="libraryfile">libexempi.so</filename></term>
-        <listitem>
-          <para>
-            is a library used to parse XMP metadata
-          </para>
-          <indexterm zone="exempi libexempi">
-            <primary sortas="c-libexempi">libexempi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/fftw.xml
===================================================================
--- general/genlib/fftw.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,339 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fftw-download-http "https://www.fftw.org/fftw-&fftw-version;.tar.gz">
-  <!ENTITY fftw-download-ftp  " ">
-  <!ENTITY fftw-md5sum        "8ccbf6a5ea78a16dbc3e1306e234cc5c">
-  <!ENTITY fftw-size          "4.0 MB">
-  <!ENTITY fftw-buildsize     "59 MB">
-  <!ENTITY fftw-time          "1.6 SBU (add 3.4 SBU for tests, both using parallelism=4)">
-]>
-
-<sect1 id="fftw" xreflabel="fftw-&fftw-version;">
-  <?dbhtml filename="fftw.html"?>
-
-
-  <title>fftw-&fftw-version;</title>
-
-  <indexterm zone="fftw">
-    <primary sortas="a-fftw">fftw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fftw</title>
-
-    <para>
-      FFTW is a C subroutine library for computing the discrete Fourier
-      transform (DFT) in one or more dimensions, of arbitrary input size, and
-      of both real and complex data (as well as of even/odd data, i.e. the
-      discrete cosine/sine transforms or DCT/DST).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fftw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fftw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fftw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fftw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fftw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fftw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fftw</title>
-
-    <note>
-      <para>
-        We build fftw three times for different libraries in different
-        numerical precisions: the default double precision floating point, the
-        older 32-bit (single precision) version named float which sacrifices
-        precision for speed, and the long double which offers increased
-        precision at the cost of slower execution.
-      </para>
-    </note>
-
-    <para>
-      The first build is for double precision arithmetic.  Install
-      <application>fftw</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-sse2    \
-            --enable-avx     \
-            --enable-avx2    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      On 32-bit systems, the tests can take substantially longer than
-      they would on 64-bit machines.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Now build single precision:
-    </para>
-
-<screen><userinput>make clean &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-sse2    \
-            --enable-avx     \
-            --enable-avx2    \
-            --enable-float   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, build long double precision:
-    </para>
-
-<screen><userinput>make clean &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-long-double &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      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>--enable-shared</parameter>
-        <parameter>--disable-static</parameter>: Use shared
-        libs instead of static libs.
-      </para>
-
-      <para>
-        <parameter>--enable-threads</parameter>: This enables <filename
-        class="libraryfile"> libfftw3_threads.so</filename> to be compiled.
-        It is used by e.g. the <application>gimp</application> plugin from
-        <ulink url="https://gmic.eu/">G'MIC</ulink>.
-      </para>
-
-      <para>
-        <parameter>--enable-{sse2,avx,avx2}</parameter>: These enables building
-        the optimized routines using SSE2, AVX, and AVX2 instructions.  FFTW
-        will check if these routines can be really used on the current CPU when
-        the FFTW library is loaded, so a FFTW build with these routines enabled
-        can still run on a CPU without SSE2, AVX, or AVX512.  These options
-        are not compatible with <parameter>--enable-long-double</parameter>.
-      </para>
-
-      <para>
-        <parameter>--enable-float</parameter>: This enables building the library that
-        uses single precision floating point arithmetic.  It is faster but less
-        precise than the default double precision library.  The library will be
-        called <filename class="libraryfile">libfftw3f.so</filename> needed by
-        <xref linkend="pulseaudio"/>.
-      </para>
-
-      <para>
-        <parameter>--enable-long-double</parameter>: This enables building the
-        library that uses higher precision long-double floating point arithmetic.
-        The library will be called <filename
-        class="libraryfile">libfftw3l.so</filename>.
-      </para>
-
-      <para>
-        <option>--enable-avx512</option>: This enables building the optimized
-        routines using AVX512F instructions.  FFTW will check if these routines
-        can be really used on the current CPU when the FFTW library is loaded,
-        so a FFTW build with these routines enabled can still run on a CPU
-        without AVX512F.  Use this option if the FFTW build will be used on
-        a CPU with AVX512F.  This option is not compatible with
-        <parameter>--enable-long-double</parameter>.
-      </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fftw-wisdom and fftw-wisdom-to-conf
-        </seg>
-        <seg>
-          libfftw3.so, libfftw3_threads.so, libfftw3f.so,
-          libfftw3f_threads.so, libfftw3l.so and libfftw3l_threads.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fftw-wisdom">
-        <term><command>fftw-wisdom</command></term>
-        <listitem>
-          <para>
-            is a utility to generate FFTW wisdom files, which contain saved
-            information about how to optimally compute (Fourier) transforms  of
-            various sizes
-          </para>
-          <indexterm zone="fftw fftw-wisdom">
-            <primary sortas="b-fftw-wisdom">fftw-wisdom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fftw-wisdom-to-conf">
-        <term><command>fftw-wisdom-to-conf</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="fftw fftw-wisdom-to-conf">
-            <primary sortas="b-fftw-wisdom-to-conf">fftw-wisdom-to-conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3">
-        <term><filename class="libraryfile">libfftw3.so</filename></term>
-        <listitem>
-          <para>
-            is the Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3">
-            <primary sortas="c-libfftw3">libfftw3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3_threads">
-        <term><filename class="libraryfile">libfftw3_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3_threads">
-            <primary sortas="c-libfftw3_threads">libfftw3_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3f">
-        <term><filename class="libraryfile">libfftw3f.so</filename></term>
-        <listitem>
-          <para>
-            is the single-precision Fast Fourier Transform library, described
-            as <quote>float</quote> for historic reasons
-          </para>
-          <indexterm zone="fftw libfftw3f">
-            <primary sortas="c-libfftw3f">libfftw3f.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3f_threads">
-        <term><filename class="libraryfile">libfftw3f_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded single-precision Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3f_threads">
-            <primary sortas="c-libfftw3f_threads">libfftw3f_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3l">
-        <term><filename class="libraryfile">libfftw3l.so</filename></term>
-        <listitem>
-          <para>
-            is the long double Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3l">
-            <primary sortas="c-libfftw3l">libfftw3l.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3l_threads">
-        <term><filename class="libraryfile">libfftw3l_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded long double Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3l_threads">
-            <primary sortas="c-libfftw3l_threads">libfftw3l_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/fmt.xml
===================================================================
--- general/genlib/fmt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fmt-download-http "https://github.com/fmtlib/fmt/archive/&fmt-version;/fmt-&fmt-version;.tar.gz">
-  <!ENTITY fmt-download-ftp  " ">
-  <!ENTITY fmt-md5sum        "dc09168c94f90ea890257995f2c497a5">
-  <!ENTITY fmt-size          "836 KB">
-  <!ENTITY fmt-buildsize     "4.5 MB (add 40 MB for tests)">
-  <!ENTITY fmt-time          "less than 0.1 SBU (add 0.2 SBU for tests)">
-]>
-
-<sect1 id="fmt" xreflabel="fmt-&fmt-version;">
-  <?dbhtml filename="fmt.html"?>
-
-
-  <title>fmt-&fmt-version;</title>
-
-  <indexterm zone="fmt">
-    <primary sortas="a-fmt">fmt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fmt</title>
-
-    <para>
-      The <application>fmt</application> package is an open-source formatting
-      library providing a fast and safe alternative to C stdio and C++
-      iostreams.</para>
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fmt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fmt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fmt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fmt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fmt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fmt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Fmt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fmt</title>
-
-    <para>
-      Install <application>fmt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DFMT_TEST=OFF                  \
-      -G Ninja ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have enabled tests, 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>
-      <parameter>-DFMT_TEST=OFF</parameter>: This switch initializes 
-      the package tests.  Set to ON if you wish to run tests.
-    </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>
-          libfmt.so
-        </seg>
-        <seg>
-          /usr/include/fmt and
-          /usr/lib/cmake/fmt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/genlib/genlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,179 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-genlib">
+<?dbhtml filename="genlib.html" dir="general"?>
+<title>General Libraries</title>
 
-<chapter id="general-genlib">
-  <?dbhtml filename="genlib.html"?>
+<para>Libraries contain code which is often required by more than
+one program.  This has the advantage that each program doesn't need to
+duplicate code (and risk introducing bugs), it just has to call
+functions from the libraries installed on the system.  The most obvious
+example of a set of libraries is glibc which is installed during the LFS
+book.  This contains all of the C library functions which programs
+use.</para>
 
-  <title>General Libraries</title>
+<para>There are two types of library, static and shared.  Shared
+libraries (usually libXXX.so) are loaded into memory from the shared
+copy at runtime (hence the name).  Static libraries (libXXX.a) are
+actually linked into the program executable file itself, thus making the
+program file larger.  Quite often, you will find both static and shared
+copies of the same library on your system.</para>
 
-  <para>
-    Libraries contain code which is often required by more than
-    one program.  This has the advantage that each program doesn't need to
-    duplicate code (and risk introducing bugs), it just has to call
-    functions from the libraries installed on the system.  The most obvious
-    example of a set of libraries is <application>Glibc</application> which is
-    installed during the LFS book.  This contains all of the
-    <application>C</application> library functions which programs use.
-  </para>
+<para>Generally, you only need to install libraries when you are
+installing software which requires functionality which they supply.  In
+the BLFS book, each package is listed with a list of (known)
+dependencies.  Thus, you can figure out which libraries you need to have
+before installing that program.  If you are installing something without
+using BLFS instructions, usually the <filename>README</filename>  or
+<filename>INSTALL</filename> file will contain details of the programs
+requirements.</para>
 
-  <para>
-    There are two types of libraries: static and shared.  Shared libraries
-    (usually <filename>libXXX.so</filename>) are loaded into memory from the
-    shared copy at runtime (hence the name).  Static libraries (<filename>
-    libXXX.a</filename>) are actually linked into the program executable file
-    itself, thus making the program file larger.  Quite often, you will find
-    both static and shared copies of the same library on your system.
-  </para>
+<para>There are certain libraries which nearly
+<emphasis>everyone</emphasis> will need at some point.  In this chapter
+we list these and some others and explain why you may want to install
+them.</para>
 
-  <para>
-    Generally, you only need to install libraries when you are
-    installing software that needs the functionality they supply.  In
-    the BLFS book, each package is presented with a list of (known)
-    dependencies.  Thus, you can figure out which libraries you need to have
-    before installing that program.  If you are installing something without
-    using BLFS instructions, usually the <filename>README</filename> or
-    <filename>INSTALL</filename> file will contain
-    details of the program's requirements.
-  </para>
-
-  <para>
-    There are certain libraries which nearly <emphasis>everyone</emphasis> will
-    need at some point.  In this chapter these and some others are listed and
-    it is explained why you may want to install them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abseil-cpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boost.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brotli.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clucene.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="double-conversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="duktape.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fftw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fmt.xml"/>
-
-<!-- systemd only -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcab.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime3.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highway.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inih.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-gmmlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jansson.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keyutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kirigami-addons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libassuan.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatasmart.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatomic_ops.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libblockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbytesize.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcloudproviders.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdisplay-info.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgrss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmbim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnvme.xml"/>
-
-   <!-- 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="libpaper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libportal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libptytty.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqalculate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqmi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libseccomp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++3.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc3.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigsegv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libssh2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstatgrab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuninameslist.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunistring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunwind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liburcu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb-compat.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxkbcommon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxmlb.xml"/>
-  <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="libyaml.xml"/>
-
-<!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="log4cplus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nodejs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="npth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nspr.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openobex.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="popt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf-c.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qcoro.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spidermonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uchardet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="umockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="utfcpp.xml"/>
-  <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="wv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
+&zlib;
+&openssl;
+&pcre;
+&popt;
+&slang;
+&libfam;
+&libxml;
+&libxml2;
+&libxslt;
 
 </chapter>
Index: neral/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,794 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-download-ftp  " ">
-  <!ENTITY glib2-md5sum        "3a51e2803ecd22c2dadcd07d9475ebe3">
-  <!ENTITY glib2-size          "5.3 MB">
-  <!ENTITY glib2-buildsize     "130 MB (add 20 MB for tests)">
-  <!ENTITY glib2-time          "0.8 SBU (add 0.5 SBU for tests; both using parallelism=4)">
-
-  <!ENTITY gobject-introspection-download-http
-    "&gnome-download-http;/gobject-introspection/1.80/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-md5sum        "ef1496a7a7abfcd31d25b3459ea86ebb">
-  <!ENTITY gobject-introspection-size          "1.0 MB">
-]>
-
-<sect1 id="glib2" xreflabel="GLib-&glib2-version;">
-  <?dbhtml filename="glib2.html"?>
-
-
-  <title>GLib-&glib2-version;</title>
-
-  <indexterm zone="glib2">
-    <primary sortas="a-GLib2">GLib2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLib</title>
-
-    <para>
-      The <application>GLib</application> package contains low-level
-      libraries useful for providing data structure handling for C, portability
-      wrappers and interfaces for runtime functionality such as an
-      event loop, threads, dynamic loading and an object system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glib2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glib2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glib2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glib2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glib2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glib2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <para>
-      <emphasis role="strong">GObject Introspection (Recommended)</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&gobject-introspection-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gobject-introspection-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gobject-introspection-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      <emphasis role="strong">Patch for Log Level Selection (Optional)</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/glib-skip_warnings-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend='packaging'/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend='docutils'/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend='cairo'/> (for some GObject Introspection tests),
-      <xref linkend="dbus"/> (for some tests),
-      <xref linkend="fuse3"/> and
-      <ulink url="https://bindfs.org/">bindfs</ulink>
-        (both needed for one test),
-      <xref linkend="gdb"/> (for bindings),
-      <xref linkend='gjs'/> (for some GObject Introspection tests),
-      <xref linkend='gtk-doc'/> (for GObject Introspection documentation),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gi-docgen"/> (to build API documentation),
-      <xref linkend="glib-networking"/> (for some tests, but this is a circular
-      dependency),
-      <xref linkend="Mako"/> and <xref linkend="markdown"/>
-      (both for <command>g-ir-doc-tool</command>), and
-      <!--<xref linkend="sysprof"/>-->
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="recommended">
-      Quoted directly from the <filename>INSTALL</filename> file:
-      <quote>Some of the mimetype-related functionality in GIO requires the
-      <command>update-mime-database</command> and
-      <command>update-desktop-database</command> utilities</quote>,
-      which are part of
-      <xref role="runtime" linkend="shared-mime-info"/> and
-      <xref role="runtime" linkend="desktop-file-utils"/>, respectively.
-      These two utilities are also needed for some tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLib</title>
-
-    <para>
-      If desired, apply the optional patch. In many cases, applications that
-      use this library, either  directly or indirectly via other libraries such
-      as <xref linkend="gtk3"/>, output numerous warnings when run from the
-      command line.  This patch enables the use of an environment variable,
-      <envar>GLIB_LOG_LEVEL</envar>, that suppresses unwanted messages. The
-      value of the variable is a digit that corresponds to:
-    </para>
-
-    <simplelist>
-      <member>1  Alert</member>
-      <member>2  Critical</member>
-      <member>3  Error</member>
-      <member>4  Warning</member>
-      <member>5  Notice</member>
-    </simplelist>
-
-    <para>
-      For instance <userinput>export GLIB_LOG_LEVEL=4</userinput> will skip
-      output of Warning and Notice messages (and Info/Debug messages if they
-      are turned on).  If <envar>GLIB_LOG_LEVEL</envar> is not defined, normal
-      message output will not be affected.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../glib-skip_warnings-1.patch</userinput></screen>
-
-    <warning>
-      <para>
-        If a previous version of glib is installed, move the headers out of the
-        way so that later packages do not encounter conflicts:
-      </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>
-
-    </warning>
-
-    <para>
-      Install <application>GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Dintrospection=disabled \
-      -Dman-pages=enabled      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The <application>GLib</application> test suite requires
-      <application>desktop-file-utils</application> for some tests. However,
-      <application>desktop-file-utils</application> requires
-      <application>GLib</application> in order to compile; therefore, you must
-      first install <application>GLib</application> and then run the test
-      suite.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user,
-      install this package for the first time to allow building
-      GObject Introspection:
-    </para>
-
-    <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Build GObject Introspection:
-    </para>
-
-    <screen><userinput>tar xf ../../gobject-introspection-&gobject-introspection-version;.tar.xz &amp;&amp;
-
-meson setup gobject-introspection-&gobject-introspection-version; gi-build \
-            --prefix=/usr --buildtype=release     &amp;&amp;
-ninja -C gi-build</userinput></screen>
-
-    <para>
-      To test the results of GObject Introspection, issue:
-      <command>ninja -C gi-build test</command>.
-    </para>
-
-    <para>
-      As the &root; user, install GObject Introspection for generating
-      the introspection data of GLib libraries (required by various packages
-      using Glib, especially some GNOME packages):
-    </para>
-
-    <screen role='root'><userinput>ninja -C gi-build install</userinput></screen>
-
-    <para>
-      Now generate the introspection data:
-    </para>
-
-    <screen><userinput>meson configure -Dintrospection=enabled &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-    <screen remap='doc'><userinput>sed 's/glib-2.0/glib-&glib2-version;/'        \
-    -i ../docs/reference/meson.build &amp;&amp;
-meson configure -Ddocumentation=true &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      As the &root; user, install this package again for the introspection
-      data (and optionally, the documentation):
-    </para>
-
-    <screen role='root'><userinput>ninja install</userinput></screen>
-
-    <para>
-      You should now install <xref linkend="desktop-file-utils"/> and
-      <xref linkend="shared-mime-info"/> and proceed to
-      run the test suite.
-    </para>
-
-    <warning>
-      <para>
-        Do not run the test suite as &root; or some tests will fail
-        unexpectedly and leave some non-FHS-compliant directories in the
-        <filename class='directory'>/usr</filename> hierarchy.
-      </para>
-    </warning>
-
-    <para>
-      To test the results, after having installed the packages, issue:
-      <command>LC_ALL=C ninja test</command> as a non-&root; user.
-    </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"/>
-
-    <para>
-      <parameter>-Dman-pages=enabled</parameter>: This switch causes the
-      build to create and install the package man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <bridgehead renderas="sect3">GLib Contents</bridgehead>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gapplication,           gdbus, gdbus-codegen,
-          gi-compile-repository,  gi-decompile-typelib, gi-inspect-typelib
-          gio,                    gio-querymodules,
-          glib-compile-resources, glib-compile-schemas,
-          glib-genmarshal,        glib-gettextize,
-          glib-mkenums,           gobject-query,
-          gresource,              gsettings,
-          gtester, and            gtester-report
-        </seg>
-        <seg>
-          libgio-2.0.so,
-          libgirepository-2.0.so,
-          libglib-2.0.so,
-          libgmodule-2.0.so,
-          libgobject-2.0.so, and
-          libgthread-2.0.so
-        </seg>
-        <seg>
-          /usr/include/gio-unix-2.0,
-          /usr/include/glib-2.0,
-          /usr/lib/gio,
-          /usr/lib/glib-2.0,
-          /usr/share/glib-2.0, and
-          /usr/share/doc/glib-&glib2-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">GObject Introspection Contents</bridgehead>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- g-ir-doc-tool is installed if Mako and Markdown are present -->
-      <seglistitem>
-        <seg>
-          g-ir-annotation-tool, g-ir-compiler, g-ir-doc-tool (optional),
-          g-ir-generate, g-ir-inspect, and g-ir-scanner
-        </seg>
-        <seg>
-          libgirepository-1.0.so and
-          _giscanner.&python3-lib-suffix;.so
-        </seg>
-        <seg>
-          /usr/include/gobject-introspection-1.0,
-          /usr/lib/girepository-1.0,
-          /usr/lib/gobject-introspection,
-          /usr/share/gir-1.0, and
-          /usr/share/gobject-introspection-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gapplication">
-        <term><command>gapplication</command></term>
-        <listitem>
-          <para>
-            can be used to start applications and to send
-            messages to already-running instances of other applications
-          </para>
-          <indexterm zone="glib2 gapplication">
-            <primary sortas="b-gapplication">application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbus">
-        <term><command>gdbus</command></term>
-        <listitem>
-          <para>
-            is a simple tool used for working with
-            <application>D-Bus</application> objects
-          </para>
-          <indexterm zone="glib2 gdbus">
-            <primary sortas="b-gdbus">gdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbus-codegen">
-        <term><command>gdbus-codegen</command></term>
-        <listitem>
-          <para>
-            is used to generate code and/or documentation for one or
-            more <application>D-Bus</application> interfaces
-          </para>
-          <indexterm zone="glib2 gdbus-codegen">
-            <primary sortas="b-gdbus-codegen">gdbus-codegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-compile-repository">
-        <term><command>gi-compile-repository</command></term>
-        <listitem>
-          <para>
-            converts one or more GIR files into one or more typelib files
-          </para>
-          <indexterm zone="glib2 gi-compile-repository">
-            <primary sortas="b-gi-compile-repository">gi-compile-repository</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-decompile-typelib">
-        <term><command>gi-decompile-typelib</command></term>
-        <listitem>
-          <para>
-            is a GIR decompiler that uses the repository API
-          </para>
-          <indexterm zone="glib2 gi-decompile-typelib">
-            <primary sortas="b-gi-decompile-typelib">gi-decompile-typelib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-inspect-typelib">
-        <term><command>gi-inspect-typelib</command></term>
-        <listitem>
-          <para>
-            is a utility that gives information about a GI typelib
-          </para>
-          <indexterm zone="glib2 gi-inspect-typelib">
-            <primary sortas="b-gi-inspect-typelib">gi-inspect-typelib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gio">
-        <term><command>gio</command></term>
-        <listitem>
-          <para>
-            is a utility that makes many <application>GIO</application>
-            features available from the command line
-          </para>
-          <indexterm zone="glib2 gio">
-            <primary sortas="b-gio">gio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gio-querymodules">
-        <term><command>gio-querymodules</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="glib2 gio-querymodules">
-            <primary sortas="b-gio-querymodules">gio-querymodules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-compile-resources">
-        <term><command>glib-compile-resources</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="glib2 glib-compile-resources">
-            <primary sortas="b-glib-compile-resources">glib-compile-resources</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-compile-schemas">
-        <term><command>glib-compile-schemas</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="glib2 glib-compile-schemas">
-            <primary sortas="b-glib-compile-resources">glib-compile-schemas</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-genmarshal">
-        <term><command>glib-genmarshal</command></term>
-        <listitem>
-          <para>
-            is a C code marshaller generation utility for GLib closures
-          </para>
-          <indexterm zone="glib2 glib-genmarshal">
-            <primary sortas="b-glib-genmarshal">glib-genmarshal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-gettextize">
-        <term><command>glib-gettextize</command></term>
-        <listitem>
-          <para>
-            is a variant of the <application>gettext</application>
-            internationalization utility
-          </para>
-          <indexterm zone="glib2 glib-gettextize">
-            <primary sortas="b-glib-gettextize">glib-gettextize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-mkenums">
-        <term><command>glib-mkenums</command></term>
-        <listitem>
-          <para>
-            is a C language enum description generation utility
-          </para>
-          <indexterm zone="glib2 glib-mkenums">
-            <primary sortas="b-glib-mkenums">glib-mkenums</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gobject-query">
-        <term><command>gobject-query</command></term>
-        <listitem>
-          <para>
-            is a small utility that draws a tree of types
-          </para>
-          <indexterm zone="glib2 gobject-query">
-            <primary sortas="b-gobject-query">gobject-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gresource">
-        <term><command>gresource</command></term>
-        <listitem>
-          <para>
-            offers a simple command line interface to GResource
-          </para>
-          <indexterm zone="glib2 gresource">
-            <primary sortas="b-gresource">gresource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsettings">
-        <term><command>gsettings</command></term>
-        <listitem>
-          <para>
-            offers a simple command line interface to GSettings
-          </para>
-          <indexterm zone="glib2 gsettings">
-            <primary sortas="b-gsettings">gsettings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester">
-        <term><command>gtester</command></term>
-        <listitem>
-          <para>
-            is a test running utility
-          </para>
-          <indexterm zone="glib2 gtester">
-            <primary sortas="b-gtester">gtester</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester-report">
-        <term><command>gtester-report</command></term>
-        <listitem>
-          <para>
-            is a test report formatting utility
-          </para>
-          <indexterm zone="glib2 gtester-report">
-            <primary sortas="b-gtester-report">gtester-report</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgio">
-        <term><filename class='libraryfile'>libgio-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a library providing useful classes for general purpose I/O,
-            networking, IPC, settings, and other high level application
-            functionality
-          </para>
-          <indexterm zone="glib2 libgio">
-            <primary sortas="c-libgio">libgio-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgirepository">
-        <term><filename class='libraryfile'>libgirepository-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a library providing access to typelibs and introspection data
-            which describes C APIs
-          </para>
-          <indexterm zone="glib2 libgirepository">
-            <primary sortas="c-libgirepository2">libgirepository-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglib">
-        <term><filename class='libraryfile'>libglib-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a general-purpose, portable utility library, which provides
-            many useful data types, macros, type conversions, string
-            utilities, file utilities, a mainloop abstraction, and so on
-          </para>
-          <indexterm zone="glib2 libglib">
-            <primary sortas="c-libglib">libglib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgmodule">
-        <term><filename class='libraryfile'>libgmodule-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides portable API for dynamically loading modules
-          </para>
-          <indexterm zone="glib2 libgmodule">
-            <primary sortas="c-libgmodule">libgmodule-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgobject">
-        <term><filename class='libraryfile'>libgobject-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the GLib base type system and object class
-          </para>
-          <indexterm zone="glib2 libgobject">
-            <primary sortas="c-libgobject">libgobject-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgthread">
-        <term><filename class='libraryfile'>libgthread-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a skeleton library for backwards compatibility; it used to
-            be the GLib thread library but the functionalities has been
-            merged info <systemitem class='library'>libglib-2.0</systemitem>
-          </para>
-          <indexterm zone="glib2 libgthread">
-            <primary sortas="c-libgthread">libgthread-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-annotation-tool">
-        <term><command>g-ir-annotation-tool</command></term>
-        <listitem>
-          <para>
-            creates or extracts annotation data from GI typelibs
-          </para>
-          <indexterm zone="glib2 g-ir-annotation-tool">
-            <primary sortas="b-g-ir-annotation-tool">g-ir-annotation-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-compiler">
-        <term><command>g-ir-compiler</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-compile-repository</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-compiler">
-            <primary sortas="b-g-ir-compiler">g-ir-compiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="g-ir-doc-tool">
-        <term><command>g-ir-doc-tool</command></term>
-        <listitem>
-          <para>
-            generates Mallard files that can be viewed with
-            <command>yelp</command> or rendered to HTML with
-            <command>yelp-build</command> from
-            <ulink url="&gnome-download-http;/yelp-tools">yelp-tools</ulink>
-          </para>
-          <indexterm zone="glib2 g-ir-doc-tool">
-            <primary sortas="b-g-ir-doc-tool">g-ir-doc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-inspect">
-        <term><command>g-ir-inspect</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-inspect-typelib</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-inspect">
-            <primary sortas="b-g-ir-inspect">g-ir-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-generate">
-        <term><command>g-ir-generate</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-decompile-typelib</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-generate">
-            <primary sortas="b-g-ir-generate">g-ir-generate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-scanner">
-        <term><command>g-ir-scanner</command></term>
-        <listitem>
-          <para>
-            is a tool which generates GIR XML files by parsing headers and
-            introspecting GObject based libraries
-          </para>
-          <indexterm zone="glib2 g-ir-scanner">
-            <primary sortas="b-g-ir-scanner">g-ir-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgirepository-1.0">
-        <term><filename class='libraryfile'>libgirepository-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is a counterpart of
-            <systemitem class='library'>libgirepository-2.0</systemitem>
-            with the old 1.0 API
-          </para>
-          <indexterm zone="glib2 libgirepository-1.0">
-            <primary sortas="c-libgirepository1">libgirepository-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glibmm-download-http "&gnome-download-http;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  " ">
-  <!ENTITY glibmm-md5sum        "c6edf4cc986adec2a6d21e7423bad7d1">
-  <!ENTITY glibmm-size          "8.4 MB">
-  <!ENTITY glibmm-buildsize     "83 MB (with tests)">
-  <!ENTITY glibmm-time          "0.5 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="glibmm" xreflabel="GLibmm-&glibmm-version;">
-  <?dbhtml filename="glibmm.html"?>
-
-
-  <title>GLibmm-&glibmm-version;</title>
-
-  <indexterm zone="glibmm">
-    <primary sortas="a-GLibmm">GLibmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLibmm</title>
-
-    <para>
-      The <application>GLibmm</application> package is a set of C++ bindings
-      for <application>GLib</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glibmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glibmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glibmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glibmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glibmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glibmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLibmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLibmm</title>
-
-    <para>
-      Install <application>GLibmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgiomm-2.4.so, libglibmm-2.4.so and
-          libglibmm_generate_extra_defs-2.4.so
-        </seg>
-        <seg>
-          /usr/lib/g{io,lib}mm-2.4 and
-          /usr/include/g{io,lib}mm-2.4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgiomm-2">
-        <term><filename class="libraryfile">libgiomm-2.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the GIO API classes
-          </para>
-          <indexterm zone="glibmm libgiomm-2">
-            <primary sortas="c-libgiomm-2">libgiomm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglibmm-2">
-        <term><filename class="libraryfile">libglibmm-2.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GLib</application> API classes
-          </para>
-          <indexterm zone="glibmm libglibmm-2">
-            <primary sortas="c-libglibmm-2">libglibmm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/glibmm2.xml
===================================================================
--- general/genlib/glibmm2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glibmm-download-http "&gnome-download-http;/glibmm/2.80/glibmm-&glibmm2-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  " ">
-  <!ENTITY glibmm-md5sum        "7e58344303cec7cd5f1e812f4c70cb43">
-  <!ENTITY glibmm-size          "9.1 MB">
-  <!ENTITY glibmm-buildsize     "97 MB (with tests)">
-  <!ENTITY glibmm-time          "0.6 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="glibmm2" xreflabel="GLibmm-&glibmm2-version;">
-  <?dbhtml filename="glibmm2.html"?>
-
-
-  <title>GLibmm-&glibmm2-version;</title>
-
-  <indexterm zone="glibmm2">
-    <primary sortas="a-GLibmm2">GLibmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLibmm</title>
-
-    <para>
-      The <application>GLibmm</application> package is a set of C++ bindings
-      for <application>GLib</application>. This version is part of a new API
-      for supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glibmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glibmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glibmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glibmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glibmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glibmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLibmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLibmm</title>
-
-    <para>
-      Install <application>GLibmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgiomm-2.68.so,
-          libglibmm-2.68.so, and
-          libglibmm_generate_extra_defs-2.68.so
-        </seg>
-        <seg>
-          /usr/lib/g{io,lib}mm-2.68 and
-          /usr/include/g{io,lib}mm-2.68
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgiomm-2.68">
-        <term><filename class="libraryfile">libgiomm-2.68.so</filename></term>
-        <listitem>
-          <para>
-            contains the GIO API classes
-          </para>
-          <indexterm zone="glibmm2 libgiomm-2.68">
-            <primary sortas="c-libgiomm-2.68">libgiomm-2.68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglibmm-2.68">
-        <term><filename class="libraryfile">libglibmm-2.68.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GLib</application> API classes
-          </para>
-          <indexterm zone="glibmm2 libglibmm-2.68">
-            <primary sortas="c-libglibmm-2.68">libglibmm-2.68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/gmime3.xml
===================================================================
--- general/genlib/gmime3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gmime3-download-http "&gnome-download-http;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
-  <!ENTITY gmime3-download-ftp  " ">
-  <!ENTITY gmime3-md5sum        "7ecd9aa75e0cd2e8668206b1d53df874">
-  <!ENTITY gmime3-size          "2.1 MB">
-  <!ENTITY gmime3-buildsize     "25 MB (with tests)">
-  <!ENTITY gmime3-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="gmime3" xreflabel="GMime-&gmime3-version;">
-  <?dbhtml filename="gmime3.html"?>
-
-
-  <title>GMime-&gmime3-version;</title>
-
-  <indexterm zone="gmime3">
-    <primary sortas="a-GMime-3">GMime 3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GMime</title>
-
-    <para>
-      The <application>GMime</application> package contains a set of
-      utilities for parsing and creating messages using the Multipurpose
-      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
-      <ulink url="https://spruce.sourceforge.net/gmime/">GMime web site</ulink>
-      for the RFCs resourced. This is useful as it provides an API which adheres
-      to the MIME specification as closely as possible while also providing
-      programmers with an extremely easy to use interface to the API functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gmime3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gmime3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gmime3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gmime3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gmime3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gmime3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="vala"/>, and
-      <ulink url="https://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
-      <ulink url="https://www.mono-project.com/Main_Page">Mono</ulink>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMime</title>
-
-    <para>
-      Install <application>GMime</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgmime-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gmime-3.0 and
-          /usr/share/gtk-doc/html/gmime-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmime-3">
-        <term><filename class="libraryfile">libgmime-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used by programs that need to comply to
-            the MIME standards
-          </para>
-          <indexterm zone="gmime3 libgmime-3">
-            <primary sortas="c-libgmime-3">libgmime-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gsl-download-http "&gnu-http;/gsl/gsl-&gsl-version;.tar.gz">
-  <!ENTITY gsl-download-ftp  " ">
-  <!ENTITY gsl-md5sum        "36aee97e67f64dbdab7afae197e3483b">
-  <!ENTITY gsl-size          "7.2 MB">
-  <!ENTITY gsl-buildsize     "213 MB (with tests, without docs)">
-  <!ENTITY gsl-time          "1.2 SBU (Using parallelism=4; with tests, without docs)">
-]>
-
-<sect1 id="gsl" xreflabel="Gsl-&gsl-version;">
-  <?dbhtml filename="gsl.html"?>
-
-
-  <title>Gsl-&gsl-version;</title>
-
-  <indexterm zone="gsl">
-    <primary sortas="a-gsl">Gsl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gsl</title>
-
-    <para>
-      The GNU Scientific Library (GSL) is a numerical library for C and C++
-      programmers. It provides a wide range of mathematical routines such as
-      random number generators, special functions and least-squares fitting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gsl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx_rtd_theme"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gsl</title>
-
-    <para>
-      Install <application>Gsl</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="sphinx_rtd_theme"/>
-      installed, build the documentation with:
-    </para>
-
-<screen remap="doc"><userinput>make html</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it (as <systemitem
-      class="username">root</systemitem>) with:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>mkdir                   /usr/share/doc/gsl-&gsl-version; &amp;&amp;
-cp -R doc/_build/html/* /usr/share/doc/gsl-&gsl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gsl-config, gsl-histogram, and gsl-randist
-        </seg>
-        <seg>
-          libgslcblas.so and libgsl.so
-        </seg>
-        <seg>
-          /usr/include/gsl and /usr/share/doc/gsl-&gsl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsl-config">
-        <term><command>gsl-config</command></term>
-        <listitem>
-          <para>
-            is a shell script to get the version number and compiler flags of
-            the installed <application>Gsl</application> library
-          </para>
-          <indexterm zone="gsl gsl-config">
-            <primary sortas="b-gsl-config">gsl-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsl-histogram">
-        <term><command>gsl-histogram</command></term>
-        <listitem>
-          <para>
-            is a demonstration program for the GNU Scientific Library that
-            computes a histogram from data taken from stdin
-          </para>
-          <indexterm zone="gsl gsl-histogram">
-            <primary sortas="b-gsl-histogram">gsl-histogram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsl-randist">
-        <term><command>gsl-randist</command></term>
-        <listitem>
-          <para>
-            is a demonstration program for the GNU Scientific Library that
-            generates random samples from various distributions
-          </para>
-          <indexterm zone="gsl gsl-randist">
-            <primary sortas="b-gsl-randist">gsl-randist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgslcblas">
-        <term><filename class="libraryfile">libgslcblas.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement a C interface to Basic Linear
-            Algebra Subprograms
-          </para>
-          <indexterm zone="gsl libgslcblas">
-            <primary sortas="c-libgslcblas">libgslcblas.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsl.so">
-        <term><filename class="libraryfile">libgsl.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a collection of numerical routines
-            for scientific computing
-          </para>
-          <indexterm zone="gsl libgsl.so">
-            <primary sortas="c-libgsl.so">libgsl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/gspell.xml
===================================================================
--- general/genlib/gspell.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gspell-download-http "&gnome-download-http;/gspell/&gspell-minor;/gspell-&gspell-version;.tar.xz">
-  <!ENTITY gspell-download-ftp  " ">
-  <!ENTITY gspell-md5sum        "f1e5f02695aee20ba543352889c28ff5">
-  <!ENTITY gspell-size          "436 KB">
-  <!ENTITY gspell-buildsize     "11 MB (with tests)">
-  <!ENTITY gspell-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="gspell" xreflabel="gspell-&gspell-version;">
-  <?dbhtml filename="gspell.html"?>
-
-
-  <title>gspell-&gspell-version;</title>
-
-  <indexterm zone="gspell">
-    <primary sortas="a-gspell">gspell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gspell</title>
-
-    <para>
-      The <application>gspell</application> package provides a flexible API to
-      add spell checking to a GTK+ application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gspell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gspell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gspell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gspell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gspell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gspell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gspell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="enchant"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &gobject-introspection;,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gspell</title>
-
-    <para>
-      Install <application>gspell</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  The tests
-      must be run in an X session. One test, test-checker, is known to fail if
-      the external package
-      <ulink url="https://hunspell.github.io/">Hunspell</ulink> is not
-      installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/rm-la-file-referring-icu.xml"/>
-
-<screen role="root"><userinput>rm -v /usr/lib/libgspell-1.la</userinput></screen>
- </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gspell-app1</seg>
-        <seg>libgspell-1.so</seg>
-        <seg>/usr/include/gspell-1 and
-             /usr/share/gtk-doc/html/gspell-1.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gspell-app1">
-        <term><command>gspell-app1</command></term>
-        <listitem>
-          <para>
-            checks the spelling of a text entered in a window
-          </para>
-          <indexterm zone="gspell gspell-app1">
-            <primary sortas="b-gspell-app1">gspell-app1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgspell">
-        <term><filename class="libraryfile">libgspell-1.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>gspell</application> API library
-          </para>
-          <indexterm zone="gspell libgspell">
-            <primary sortas="c-libgspell">libgspell-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/highway.xml
===================================================================
--- general/genlib/highway.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 highway-download-http "https://github.com/google/highway/archive/&highway-version;/highway-&highway-version;.tar.gz">
-  <!ENTITY highway-md5sum        "6a5d433b66626afbd3fcc5884d2f270a">
-  <!ENTITY highway-size          "2.1 MB">
-  <!ENTITY highway-buildsize     "25 MB">
-  <!ENTITY highway-time          "0.6 SBU (with parallelism=4)">
-]>
-
-<sect1 id="highway" xreflabel="highway-&highway-version;">
-  <?dbhtml filename="highway.html"?>
-
-   <title>highway-&highway-version;</title>
-
-  <indexterm zone="highway">
-    <primary sortas="a-highway">highway</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to highway</title>
-
-    <para>
-      The <application>highway</application> package contains a C++ library
-      that provides portable SIMD/vector intrinsics.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&highway-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &highway-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &highway-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &highway-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &highway-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">highway Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of highway</title>
-
-    <para>
-      Install <application>highway</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -D BUILD_SHARED_LIBS=ON      \
-      -G Ninja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This parameter disables the
-      test suite from being built because
-      <ulink url="https://github.com/google/googletest">gtest</ulink> is not
-      part of BLFS. Without this parameter, CMake will download this package
-      during the configuration process. If you wish to run the tests, install
-      <ulink url="https://github.com/google/googletest">gtest</ulink> and then
-      remove this parameter.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter enables
-      building shared versions of the libraries instead of static versions.
-    </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>
-          libhwy.so,
-          libhwy_contrib.so, and
-          libhwy_test.so
-        </seg>
-        <seg>
-          /usr/include/hwy and
-          /usr/lib/cmake/hwy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libhwy">
-        <term><filename class="libraryfile">libhwy.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide portable SIMD/vector intrinsics
-          </para>
-          <indexterm zone="highway libhwy">
-            <primary sortas="c-libhwy">libhwy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhwy_contrib">
-        <term><filename class="libraryfile">libhwy_contrib.so</filename></term>
-        <listitem>
-          <para>
-            contains several additions to Highway, including a series of dot
-            product, image, math, and sort routines
-          </para>
-          <indexterm zone="highway libhwy_contrib">
-            <primary sortas="c-libhwy_contrib">libhwy_contrib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libhwy_test">
-        <term><filename class="libraryfile">libhwy_test.so</filename></term>
-        <listitem>
-          <para>
-            contains test helpers for Highway
-          </para>
-          <indexterm zone="highway libhwy_test">
-            <primary sortas="c-libhwy_test">libhwy_test.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/icu.xml
===================================================================
--- general/genlib/icu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,520 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 icu-download-http
-           "https://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        "a83c1499e508f73ddbc60002f84ea42a">
-  <!ENTITY icu-size          "25 MB">
-  <!ENTITY icu-buildsize     "341 MB (add 45 MB for tests)">
-  <!ENTITY icu-time          "0.7 SBU (Using parallelism=4; add 2.0 SBU for tests)">
-]>
-
-<sect1 id="icu" xreflabel="ICU-&icu-version;">
-  <?dbhtml filename="icu.html"?>
-
-
-  <title>icu-&icu-version;</title>
-
-  <indexterm zone="icu">
-    <primary sortas="a-icu">icu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ICU</title>
-
-    <para>
-      The <application>International Components for Unicode</application> (ICU)
-      package is a mature, widely used set of C/C++ libraries providing Unicode
-      and Globalization support for software applications.
-      <application>ICU</application> is widely portable and gives applications
-      the same results on all platforms.
-    </para>
-
-    <warning>
-      <para>
-        Upgrading this package to a new major version (for example, from
-        72.1 to &icu-version;) will require rebuilding of many other
-        packages. If some packages that use the libraries built by
-        icu4c-&icu-major; are rebuilt, they will use the new libraries while
-        current packages will use the previous libraries.  If the Linux
-        application loader
-        (<filename class='libraryfile'>/usr/lib/ld-linux-x86-64.so.2</filename>)
-        determines that both the old and new libraries are needed, and a
-        symbol (name of data or function) exists in both versions of the
-        library, all references to the symbol will be resolved to the
-        version appearing earlier in the breadth-first sequence of the
-        dependency graph.  This may result in the application failing if
-        the definition of the data or the behavior of the function referred
-        by the symbol differs in two versions.  To avoid the issue, users
-        will need to rebuild every package linked to an ICU library as soon
-        as possible once ICU is updated to a new major version.
-      </para>
-
-      <para>
-        To determine what external libraries are needed (directly or indirectly)
-        by an application or a library, run:
-      </para>
-
-<screen><userinput>ldd &lt;application or library&gt; </userinput></screen>
-
-      <para>
-        or to see only the directly needed libraries:
-      </para>
-
-<screen><userinput>readelf -d  &lt;application or library&gt; | grep NEEDED</userinput></screen>
-
-    </warning>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&icu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&icu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &icu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &icu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &icu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &icu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/icu4c-&icu-version;-fix_enumeration-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">ICU Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="llvm"/> (with Clang), and
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ICU</title>
-
-    <note>
-      <para>
-        This package expands to the directory
-        <filename class='directory'>icu</filename>.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        If <command>clang++</command> is available, it will be used in the
-        mistaken belief that <command>g++</command> might not support C++11,
-        even though <command>configure</command> has tested for that.  If
-        using <command>g++</command> there will be an unnecessary warning at
-        the end of <command>configure</command>.  Building with
-        <command>g++</command> also takes longer than the estimated SBU shown.
-      </para>
-    </note>
-<!--
-    <para>
-      First, fix a regression in version 58.1:
-    </para>
-
-<screen><userinput>patch -p1 -i ../icu4c-&icu-version;-fix_enumeration-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>ICU</application> by running the following commands:
-    </para>
-
-<!-- Review comments at:
-https://chromium.googlesource.com/chromium/src/+/e58fa0ba66272c5f28828b15d06c7e42a9882b3b
-To see if the following prebuild command is appropriate for BLFS:
-sed '/fdef U_CHARSET_I/i#define U_CHARSET_IS_UTF8 1' -i common/unicode/platform.h
--->
-<screen><userinput>cd source                                    &amp;&amp;
-
-./configure --prefix=/usr                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          derb, escapesrc, genbrk, genccode, gencfu, gencmn, gencnval,
-          gendict, gennorm2,
-          genrb, gensprep, icu-config, icuexportdata, icuinfo, icupkg,
-          makeconv, pkgdata, and uconv
-        </seg>
-        <seg>
-          libicudata.so, libicui18n.so, libicuio.so,
-          libicutest.so, libicutu.so, and libicuuc.so
-        </seg>
-        <seg>
-          /usr/include/unicode,
-          /usr/lib/icu, and
-          /usr/share/icu
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="derb">
-        <term><command>derb</command></term>
-        <listitem>
-          <para>
-            disassembles a resource bundle
-          </para>
-          <indexterm zone="icu derb">
-            <primary sortas="b-derb">derb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escapesrc">
-        <term><command>escapesrc</command></term>
-        <listitem>
-          <para>
-            converts <quote>\u</quote> escaped characters into unicode
-            characters
-          </para>
-          <indexterm zone="icu escapesrc">
-            <primary sortas="b-escapesrc">escapesrc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genbrk">
-        <term><command>genbrk</command></term>
-        <listitem>
-          <para>
-            compiles ICU break iteration rules source files into binary data
-            files
-          </para>
-          <indexterm zone="icu genbrk">
-            <primary sortas="b-genbrk">genbrk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genccode">
-        <term><command>genccode</command></term>
-        <listitem>
-          <para>
-            generates C or platform specific assembly code from an ICU data
-            file
-          </para>
-          <indexterm zone="icu genccode">
-            <primary sortas="b-genccode">genccode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencfu">
-        <term><command>gencfu</command></term>
-        <listitem>
-          <para>
-            reads in Unicode confusable character definitions and writes out the
-            binary data
-          </para>
-          <indexterm zone="icu gencfu">
-            <primary sortas="b-gencfu">gencfu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencmn">
-        <term><command>gencmn</command></term>
-        <listitem>
-          <para>
-            generates an ICU memory-mappable data file
-          </para>
-          <indexterm zone="icu gencmn">
-            <primary sortas="b-gencmn">gencmn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencnval">
-        <term><command>gencnval</command></term>
-        <listitem>
-          <para>
-            compiles the converter's aliases file
-          </para>
-          <indexterm zone="icu gencnval">
-            <primary sortas="b-gencnval">gencnval</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gendict">
-        <term><command>gendict</command></term>
-        <listitem>
-          <para>
-            compiles word lists into ICU string trie dictionaries
-          </para>
-          <indexterm zone="icu gendict">
-            <primary sortas="b-gendict">gendict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gennorm2">
-        <term><command>gennorm2</command></term>
-        <listitem>
-          <para>
-            builds binary data files with Unicode normalization data
-          </para>
-          <indexterm zone="icu gennorm2">
-            <primary sortas="b-gennorm2">gennorm2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genrb">
-        <term><command>genrb</command></term>
-        <listitem>
-          <para>
-            compiles a resource bundle
-          </para>
-          <indexterm zone="icu genrb">
-            <primary sortas="b-genrb">genrb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gensprep">
-        <term><command>gensprep</command></term>
-        <listitem>
-          <para>
-            compiles StringPrep data from filtered RFC 3454 files
-          </para>
-          <indexterm zone="icu gensprep">
-            <primary sortas="b-gensprep">gensprep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icu-config">
-        <term><command>icu-config</command></term>
-        <listitem>
-          <para>
-            outputs ICU build options
-          </para>
-          <indexterm zone="icu icu-config">
-            <primary sortas="b-icu-config">icu-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icuinfo">
-        <term><command>icuinfo</command></term>
-        <listitem>
-          <para>
-            outputs configuration information about the current ICU
-          </para>
-          <indexterm zone="icu icuinfo">
-            <primary sortas="b-icuinfo">icuinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icupkg">
-        <term><command>icupkg</command></term>
-        <listitem>
-          <para>
-            extracts or modifies an ICU .dat archive
-          </para>
-          <indexterm zone="icu icupkg">
-            <primary sortas="b-icupkg">icupkg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeconv">
-        <term><command>makeconv</command></term>
-        <listitem>
-          <para>
-            compiles a converter table
-          </para>
-          <indexterm zone="icu makeconv">
-            <primary sortas="b-makeconv">makeconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkgdata">
-        <term><command>pkgdata</command></term>
-        <listitem>
-          <para>
-            packages data for use by ICU
-          </para>
-          <indexterm zone="icu pkgdata">
-            <primary sortas="b-pkgdata">pkgdata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uconv">
-        <term><command>uconv</command></term>
-        <listitem>
-          <para>
-            converts data from one encoding to another
-          </para>
-          <indexterm zone="icu uconv">
-            <primary sortas="b-uconv">uconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicudata">
-        <term><filename class="libraryfile">libicudata.so</filename></term>
-        <listitem>
-          <para>
-            is the data library
-          </para>
-          <indexterm zone="icu libicudata">
-            <primary sortas="c-libicudata">libicudata.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicui18n">
-        <term><filename class="libraryfile">libicui18n.so</filename></term>
-        <listitem>
-          <para>
-            is the internationalization (i18n) library
-          </para>
-          <indexterm zone="icu libicui18n">
-            <primary sortas="c-libicui18n">libicui18n.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicuio">
-        <term><filename class="libraryfile">libicuio.so</filename></term>
-        <listitem>
-          <para>
-            is the ICU I/O (unicode stdio) library
-          </para>
-          <indexterm zone="icu libicuio">
-            <primary sortas="c-libicuio">libicuio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="libicule">
-        <term><filename class="libraryfile">libicule.so</filename></term>
-        <listitem>
-          <para>
-            is the layout engine.
-          </para>
-          <indexterm zone="icu libicule">
-            <primary sortas="c-libicule">libicule.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiculx">
-        <term><filename class="libraryfile">libiculx.so</filename></term>
-        <listitem>
-          <para>
-            is the layout extensions engine.
-          </para>
-          <indexterm zone="icu libiculx">
-            <primary sortas="c-libiculx">libiculx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libicutest">
-        <term><filename class="libraryfile">libicutest.so</filename></term>
-        <listitem>
-          <para>
-            is the test library
-          </para>
-          <indexterm zone="icu libicutest">
-            <primary sortas="c-libicutest">libicutest.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicutu">
-        <term><filename class="libraryfile">libicutu.so</filename></term>
-        <listitem>
-          <para>
-            is the tool utility library
-          </para>
-          <indexterm zone="icu libicutu">
-            <primary sortas="c-libicutu">libicutu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicuuc">
-        <term><filename class="libraryfile">libicuuc.so</filename></term>
-        <listitem>
-          <para>
-            is the common library
-          </para>
-          <indexterm zone="icu libicuuc">
-            <primary sortas="c-libicuuc">libicuuc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/inih.xml
===================================================================
--- general/genlib/inih.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 inih-download-http
-    "https://github.com/benhoyt/inih/archive/r&inih-version;/inih-r&inih-version;.tar.gz">
-  <!ENTITY inih-download-ftp  " ">
-  <!ENTITY inih-md5sum        "5c9725320ad2c79e0b1f76568bd0ff24">
-  <!ENTITY inih-size          "20 KB">
-  <!ENTITY inih-buildsize     "724 KB">
-  <!ENTITY inih-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="inih" xreflabel="inih-&inih-version;">
-  <?dbhtml filename="inih.html"?>
-
-
-  <title>inih-&inih-version;</title>
-
-  <indexterm zone="inih">
-    <primary sortas="a-inih">inih</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to inih</title>
-
-    <para>
-      This package is a simple .INI file parser written in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&inih-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&inih-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &inih-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &inih-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &inih-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &inih-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of inih</title>
-
-    <para>
-      Install <application>inih</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-<!-- Note.  There is a tests directoy.  If we do:
-  cd ../tests
-  sh unittest.sh
-The tests seem to be run, but there is no output or log.
--->
-    <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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libinih.so, libINIReader.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libinih">
-        <term><filename class="libraryfile">libinih.so</filename></term>
-        <listitem>
-          <para>
-            is the inih main library
-          </para>
-          <indexterm zone="inih libinih">
-            <primary sortas="c-libinih">libinih.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libINIReader">
-        <term><filename class="libraryfile">libINIReader.so</filename></term>
-        <listitem>
-          <para>
-            is the inih parser library
-          </para>
-          <indexterm zone="inih libINIReader">
-            <primary sortas="c-libINIReader">libINIReader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/intel-gmmlib.xml
===================================================================
--- general/genlib/intel-gmmlib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 intel-gmmlib-download-http "https://github.com/intel/gmmlib/archive/intel-gmmlib-&intel-gmmlib-version;.tar.gz">
-  <!ENTITY intel-gmmlib-download-ftp  " ">
-  <!ENTITY intel-gmmlib-md5sum        "7d947d9fa06c101731ac4881857e056a">
-  <!ENTITY intel-gmmlib-size          "828 KB">
-  <!ENTITY intel-gmmlib-buildsize     "53 MB">
-  <!ENTITY intel-gmmlib-time          "0.5 SBU">
-]>
-
-<sect1 id="intel-gmmlib" xreflabel="Intel-gmmlib-&intel-gmmlib-version;">
-  <?dbhtml filename="intel-gmmlib.html"?>
-
-  <title>Intel-gmmlib-&intel-gmmlib-version;</title>
-
-  <indexterm zone="intel-gmmlib">
-    <primary sortas="a-intel-gmmlib">Intel-gmmlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Intel-gmmlib</title>
-
-    <para>
-      The <application>Intel-gmmlib</application> package contains the Intel
-      Graphics Memory Management Library, which provides device specific memory
-      and buffer management functions for the Intel Media Driver for VAAPI and
-      the Intel Graphics Computer Runtime for OpenCL (TM).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&intel-gmmlib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&intel-gmmlib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &intel-gmmlib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &intel-gmmlib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &intel-gmmlib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &intel-gmmlib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The tarball
-        <filename>intel-gmmlib-&intel-gmmlib-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">gmmlib-intel-gmmlib-&intel-gmmlib-version;</filename>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Intel-gmmlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intel-gmmlib</title>
-
-    <para>
-      Install <application>Intel-gmmlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr   \
-      -DBUILD_TYPE=Release          \
-      -G Ninja                      \
-      -Wno-dev ..                   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite is normally run by <command>ninja</command> unless
-      -DRUN_TEST_SUITE=NO is passed to cmake.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libigdgmm.so
-        </seg>
-        <seg>
-          /usr/include/igdgmm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libigdgmm">
-        <term><filename class="libraryfile">libigdgmm.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide Memory Management functions for
-            Intel Graphics Drivers
-          </para>
-          <indexterm zone="intel-gmmlib libigdgmm">
-            <primary sortas="c-libigdgmm">libigdgmm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/jansson.xml
===================================================================
--- general/genlib/jansson.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 jansson-download-http "https://github.com/akheron/jansson/releases/download/v&jansson-version;/jansson-&jansson-version;.tar.bz2">
-  <!ENTITY jansson-download-ftp  " ">
-  <!ENTITY jansson-md5sum        "3f90473d7d54ebd1cb6a2757396641df">
-  <!ENTITY jansson-size          "424 KB">
-  <!ENTITY jansson-buildsize     "5.6 MB (add 1.9 MB for tests)">
-  <!ENTITY jansson-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="jansson" xreflabel="jansson-&jansson-version;">
-  <?dbhtml filename="jansson.html"?>
-
-
-  <title>Jansson-&jansson-version;</title>
-
-  <indexterm zone="jansson">
-    <primary sortas="a-jansson">jansson</primary>
-  </indexterm>
-  <sect2 role="package">
-    <title>Introduction to Jansson</title>
-
-    <para>
-      The <application>Jansson</application> package contains a library used to
-      encode, decode, and manipulate JSON data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&jansson-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&jansson-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jansson-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &jansson-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &jansson-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &jansson-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- No dependencies -->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Jansson</title>
-
-    <para>
-      First fix one of the tests:
-    </para>
-
-<screen><userinput>sed -e "/DT/s;| sort;| sed 's/@@libjansson.*//' &amp;;" \
-    -i test/suites/api/check-exports</userinput></screen>
-
-    <para>
-      Install <application>jansson</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libjansson.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjansson">
-        <term><filename class="libraryfile">libjansson.so</filename></term>
-        <listitem>
-          <para>
-            contains an API for encoding, decoding, and manipulating JSON data
-          </para>
-          <indexterm zone="jansson libjansson">
-            <primary sortas="c-libjansson">libjansson.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 json-c-download-http "https://s3.amazonaws.com/json-c_releases/releases/json-c-&json-c-version;.tar.gz">
-  <!ENTITY json-c-download-ftp  " ">
-  <!ENTITY json-c-md5sum        "bad8f5e91b7b2563ee2d507054c70eb2">
-  <!ENTITY json-c-size          "384 KB">
-  <!ENTITY json-c-buildsize     "7.9 MB">
-  <!ENTITY json-c-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="json-c" xreflabel="JSON-C-&json-c-version;">
-  <?dbhtml filename="json-c.html"?>
-
-
-  <title>JSON-C-&json-c-version;</title>
-
-  <indexterm zone="json-c">
-    <primary sortas="a-JSON-C">JSON-C</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JSON-C</title>
-
-    <para>
-      The <application>JSON-C</application> implements a reference counting
-      object model that allows you to easily construct JSON objects in C,
-      output them as JSON formatted strings and parse JSON formatted strings
-      back into the C representation of JSON objects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&json-c-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&json-c-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &json-c-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &json-c-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &json-c-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &json-c-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JSON-C Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="graphviz"/> (for dot tool)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JSON-C</title>
-<!--
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
--->
-    <para>
-      Install <application>JSON-C</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  \
-      -DBUILD_STATIC_LIBS=OFF     \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="doxygen" role="nodep"/> and
-      <xref linkend="graphviz" role="nodep"/>, you can build the documentation
-      by running the following command:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it by running the following
-      commands as the &root; user:
-    </para>
-
-<screen role="root" remap="doc"><userinput>install -d -vm755 /usr/share/doc/json-c-&json-c-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/json-c-&json-c-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </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>
-          libjson-c.so
-        </seg>
-        <seg>
-          /usr/include/json-c
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjson-c">
-        <term><filename class="libraryfile">libjson-c.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JSON-C</application> API functions
-          </para>
-          <indexterm zone="json-c libjson-c">
-            <primary sortas="c-libjson-c">libjson-c.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 json-glib-download-http "&gnome-download-http;/json-glib/1.8/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-download-ftp  " ">
-  <!ENTITY json-glib-md5sum        "f1aac2b8a17fd68646653cc4d8426486">
-  <!ENTITY json-glib-size          "156 KB">
-  <!ENTITY json-glib-buildsize     "7.8 MB (with tests)">
-  <!ENTITY json-glib-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="json-glib" xreflabel="JSON-GLib-&json-glib-version;">
-  <?dbhtml filename="json-glib.html"?>
-
-
-  <title>JSON-GLib-&json-glib-version;</title>
-
-  <indexterm zone="json-glib">
-    <primary sortas="a-JSON-GLib">JSON-GLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JSON GLib</title>
-
-    <para>
-      The <application>JSON GLib</application> package is a library
-      providing serialization and deserialization support for the JavaScript
-      Object Notation (JSON) format described by RFC 4627.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&json-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&json-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &json-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &json-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &json-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &json-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JSON-GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required if building
-      GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JSON GLib</title>
-
-    <para>
-      Install <application>JSON GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=disabled</option>: Add this option if you have
-      <xref role="nodep" linkend="gtk-doc"/> installed and do not wish to
-      generate the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          json-glib-format and json-glib-validate
-        </seg>
-        <seg>
-          libjson-glib-1.0.so
-        </seg>
-        <seg>
-          /usr/{include,{libexec,share{/installed-tests}/json-glib-1.0 and
-          /usr/share/gtk-doc/html/json-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="json-glib-format">
-        <term><command>json-glib-format</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface to format JSON data
-          </para>
-          <indexterm zone="json-glib json-glib-format">
-            <primary sortas="b-json-glib-format">json-glib-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="json-glib-validate">
-        <term><command>json-glib-validate</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface to validate JSON data
-          </para>
-          <indexterm zone="json-glib json-glib-validate">
-            <primary sortas="b-json-glib-validate">json-glib-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjson-glib-1">
-        <term><filename class="libraryfile">libjson-glib-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JSON GLib</application> API functions
-          </para>
-          <indexterm zone="json-glib libjson-glib-1">
-            <primary sortas="c-libjson-glib-1">libjson-glib-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/keyutils-test-kernel.xml
===================================================================
--- general/genlib/keyutils-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>S</emphasis>ecurity options ---&gt;
-  [*] <emphasis role='blue'>E</emphasis>nable access key retention support                                 [KEYS]
-  [*]   <emphasis role='blue'>L</emphasis>arge payload keys                                            [BIG_KEYS]
-  [*]   <emphasis role='blue'>D</emphasis>iffie-Hellman operations on retained keys           [KEY_DH_OPERATIONS]
-
--*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>P</emphasis>ublic-key cryptography ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>R</emphasis>SA (Rivest-Shamir-Adleman)                               [CRYPTO_RSA]
-  H<emphasis role='blue'>a</emphasis>shes, digests, and MACs ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>HA-1                                                    [CRYPTO_SHA1]
-  [*] <emphasis role='blue'>A</emphasis>symmetric (public-key cryptographic) key type ---&gt;  [ASYMMETRIC_KEY_TYPE]
-    &lt;*&gt; <emphasis role='blue'>A</emphasis>symmetric public-key crypto algorithm subtype
-                                            ...  [ASYMMETRIC_PUBLIC_KEY_SUBTYPE]
-    # If not built into the kernel, [SYSTEM_TRUSTED_KEYRING] won't show up;
-    # building as a module won't work:
-    &lt;*&gt;   <emphasis role='blue'>X</emphasis>.509 certificate parser                     [X509_CERTIFICATE_PARSER]
-  <emphasis role='blue'>C</emphasis>ertificates for signature checking ---&gt;
-    [*] <emphasis role='blue'>P</emphasis>rovide system-wide ring of trusted keys        [SYSTEM_TRUSTED_KEYRING]
-    [*]   <emphasis role='blue'>P</emphasis>rovide a keyring to which extra trustable keys may be added
-                                                ...  [SECONDARY_TRUSTED_KEYRING]
-    [*] <emphasis role='blue'>P</emphasis>rovide system-wide ring of blacklisted keys  [SYSTEM_BLACKLIST_KEYRING]
-
-<emphasis role='blue'>L</emphasis>ibrary routines ---&gt;
-  <emphasis role='blue'>C</emphasis>rypto library routines ---&gt;
-    # If not built into the kernel, [BIG_KEYS] won't show up;
-    # building as a module won't work:
-    &lt;*&gt; <emphasis role='blue'>C</emphasis>haCha20-Poly1305 AEAD support (8-byte nonce library version)
-                                              ...  [CRYPTO_LIB_CHACHA20POLY1305]</screen>
Index: neral/genlib/keyutils.xml
===================================================================
--- general/genlib/keyutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,255 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 keyutils-download-http "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-&keyutils-version;.tar.gz">
-  <!ENTITY keyutils-download-ftp  " ">
-  <!ENTITY keyutils-md5sum        "6b70b2b381c1b6d9adfaf66d5d3e7c00">
-  <!ENTITY keyutils-size          "136 KB">
-  <!ENTITY keyutils-buildsize     "2.6 MB (with tests)">
-  <!ENTITY keyutils-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
-]>
-
-<sect1 id="keyutils" xreflabel="keyutils-&keyutils-version;">
-  <?dbhtml filename="keyutils.html"?>
-
-
-  <title>keyutils-&keyutils-version;</title>
-
-  <indexterm zone="keyutils">
-    <primary sortas="a-keyutils">keyutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keyutils</title>
-
-    <para>
-      <application>Keyutils</application> is a set of utilities for managing
-      the key retention facility in the kernel, which can be used by
-      filesystems, block devices and more to gain and retain the authorization
-      and encryption keys required to perform secure operations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keyutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keyutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keyutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keyutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keyutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keyutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Keyutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lsb-tools"/> (referred by the test suite)
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="keyutils-test-kernel"
-         xreflabel="Keyutils Kernel Configuration">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If running the test suite, some tests needs the following kernel
-      features enabled:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="keyutils-test-kernel.xml"/>
-
-    <indexterm zone="keyutils keyutils-test-kernel">
-      <primary sortas="d-keyutils">keyutils (testing)</primary>
-    </indexterm>
-  </sect2>
-  <sect2 role="installation">
-    <title>Installation of keyutils</title>
-
-    <para>
-      Install <application>keyutils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make NO_ARLIB=1 LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/usr/sbin install</userinput></screen>
-
-    <para>
-      The test suite can only run after installing this package.
-      To test the results, issue, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" remap="test"><userinput>make -k test</userinput></screen>
-
-    <para>
-      If <xref linkend='lsb-tools'/> is not installed, the test suite will
-      output some lines complaining the <command>lsb_release</command>
-      command not available but it won't affect the test result.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para>
-      <command>sed ... Makefile</command>: This command ensures the pkgconfig
-      file is placed in the correct directory.
-    </para>
-
-    <para>
-      <command>sed ... tests/toolbox.inc.sh</command>: In LFS, GCC has been
-      configured with <option>- -enable-default-pie</option> so
-      <command>/usr/bin/bash</command> is a PIE, but the test script does
-      not anticipate it.  Fix this oversight so the test can run on a LFS
-      system.
-    </para>
--->
-
-    <para>
-      <parameter>NO_ARLIB=1</parameter>: This make flag disables installing the
-      static library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring keyutils</title>
-
-    <sect3 id="keyutils-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/request-key.conf</filename> and
-        <filename>/etc/request-key.d/*</filename>
-      </para>
-
-      <indexterm zone="keyutils keyutils-config">
-        <primary sortas="e-etc-request-key.conf">/etc/request-key.conf</primary>
-      </indexterm>
-
-      <indexterm zone="keyutils keyutils-config">
-        <primary sortas="e-etc-request-key.d">/etc/request-key.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>keyctl, key.dns_resolver, and request-key</seg>
-        <seg>libkeyutils.so</seg>
-        <seg>/etc/keyutils,
-        /etc/request-key.d,
-        and /usr/share/keyutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keyctl">
-        <term><command>keyctl</command></term>
-        <listitem>
-          <para>
-            controls the key management facility with a variety of subcommands
-          </para>
-          <indexterm zone="keyutils keyctl">
-            <primary sortas="b-keyctl">keyctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="key.dns_resolver">
-        <term><command>key.dns_resolver</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>request-key</command> on behalf of the
-            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
-          </para>
-          <indexterm zone="keyutils key.dns_resolver">
-            <primary sortas="b-key.dns_resolver">key.dns_resolver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="request-key">
-        <term><command>request-key</command></term>
-        <listitem>
-          <para>
-            is invoked by the kernel when the kernel is asked for a key that it
-            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
-          </para>
-          <indexterm zone="keyutils request-key">
-            <primary sortas="b-request-keyt-key">request-key</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkeyutils">
-        <term><filename class="libraryfile">libkeyutils.so</filename></term>
-        <listitem>
-          <para>
-            contains the keyutils library API instantiation
-          </para>
-          <indexterm zone="keyutils libkeyutils">
-            <primary sortas="c-libkeyutils">libkeyutils.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/kirigami-addons.xml
===================================================================
--- general/genlib/kirigami-addons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kirigami-addons-download-http "https://download.kde.org/stable/kirigami-addons/kirigami-addons-&kirigami-addons-version;.tar.xz">
-  <!ENTITY kirigami-addons-download-ftp  " ">
-  <!ENTITY kirigami-addons-md5sum        "14dc120c21d6fe165cac577f26f4d6e3">
-  <!ENTITY kirigami-addons-size          "1.0 MB">
-  <!ENTITY kirigami-addons-buildsize     "35 MB">
-  <!ENTITY kirigami-addons-time          "0.4 SBU (Using parallelism=4">
-]>
-
-<sect1 id="kirigami-addons" xreflabel="kirigami-addons-&kirigami-addons-version;">
-  <?dbhtml filename="kirigami-addons.html"?>
-
-  <title>kirigami-addons-&kirigami-addons-version;</title>
-
-  <indexterm zone="kirigami-addons">
-    <primary sortas="g-kirigami-addons">kirigami-addons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kirigami-addons</title>
-
-    <para>
-      This package provides add-on qml files for the Kirigami framework.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kirigami-addons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kirigami-addons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kirigami-addons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kirigami-addons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kirigami-addons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kirigami-addons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kirigami-addons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kirigami-addons</title>
-
-    <para>
-      Install <application>kirigami-addons</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE__INSTALL_PREFIX=$KF6_PREFIX \
-      -D CMAKE_BUILD_TYPE=Release          \
-      -D BUILD_TESTING=OFF                 \
-       ..                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This packages does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!-- We don't need to repeat this for every package
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </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>None</seg>
-        <seg>
-          $KF6_PREFIX/lib/qml/org/kde/kirigamiaddons and
-          $KF6_PREFIX/lib/cmake/KF6KirigamiAddons
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libaio.xml
===================================================================
--- general/genlib/libaio.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libaio-download-http "https://pagure.io/libaio/archive/libaio-&libaio-version;/libaio-&libaio-version;.tar.gz">
-  <!ENTITY libaio-download-ftp  " ">
-  <!ENTITY libaio-md5sum        "605237f35de238dfacc83bcae406d95d">
-  <!ENTITY libaio-size          "48 KB">
-  <!ENTITY libaio-buildsize     "1.0 MB">
-  <!ENTITY libaio-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libaio" xreflabel="libaio-&libaio-version;">
-  <?dbhtml filename="libaio.html"?>
-
-
-  <title>libaio-&libaio-version;</title>
-
-  <indexterm zone="libaio">
-    <primary sortas="a-libaio">libaio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libaio</title>
-
-    <para>
-      The <application>libaio</application> package is an asynchronous I/O
-      facility ("async I/O", or "aio") that has a richer API and capability set
-      than the simple POSIX async I/O facility.  This library, libaio, provides
-      the Linux-native API for async I/O.  The POSIX async I/O facility
-      requires this library in order to provide kernel-accelerated async I/O
-      capabilities, as do applications which require the Linux-native async I/O
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libaio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libaio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libaio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libaio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libaio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libaio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libaio</title>
-
-    <para>
-      First, disable the installation of the static library:
-    </para>
-
-<screen><userinput>sed -i '/install.*libaio.a/s/^/#/' src/Makefile</userinput></screen>
-
-    <para>
-      Build <application>libaio</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make partcheck</command>.
-    </para>
-
-    <para>
-      Now, install the package as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libaio.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libaio-lib">
-        <term><filename class="libraryfile">libaio.so</filename></term>
-        <listitem>
-          <para>
-            is the libaio library
-          </para>
-          <indexterm zone="libaio libaio-lib">
-            <primary sortas="c-libaio">libaio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
-  <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "b60683739a16ff6f00f32aa3516402ed">
-  <!ENTITY libarchive-size          "5.2 MB">
-  <!ENTITY libarchive-buildsize     "42 MB (add 32 MB for tests)">
-  <!ENTITY libarchive-time          "0.4 SBU (add 0.6 SBU for tests)">
-]>
-
-<sect1 id="libarchive" xreflabel="libarchive-&libarchive-version;">
-  <?dbhtml filename="libarchive.html"?>
-
-
-  <title>libarchive-&libarchive-version;</title>
-
-  <indexterm zone="libarchive">
-    <primary sortas="a-libarchive">libarchive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libarchive</title>
-
-    <para>
-      The <application>libarchive</application> library provides a single
-      interface for reading/writing various compression formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libarchive-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libarchive-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libarchive-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libarchive-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libarchive-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libarchive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libarchive-&libarchive-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libarchive Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="lzo"/>, 
-      <xref linkend="nettle"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libarchive</title>
-
-    <para>
-      Install <application>libarchive</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--without-xml2</option>: This switch sets expat for xar archive
-      format support instead of preferred libxml2 if both packages are installed.
-    </para>
-
-    <para>
-      <option>--without-nettle</option>: This switch sets OpenSSL for crypto
-      support instead of preferred Nettle if both packages are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bsdcat, bsdcpio, bsdtar, and bsdunzip
-        </seg>
-        <seg>
-          libarchive.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bsdcat">
-        <term><command>bsdcat</command></term>
-        <listitem>
-          <para>
-            expands files to standard output
-          </para>
-          <indexterm zone="libarchive bsdcat">
-            <primary sortas="b-bsdcat">bsdcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdcpio">
-        <term><command>bsdcpio</command></term>
-        <listitem>
-          <para>
-            is a tool similar to <command>cpio</command>
-          </para>
-          <indexterm zone="libarchive bsdcpio">
-            <primary sortas="b-bsdcpio">bsdcpio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdtar">
-        <term><command>bsdtar</command></term>
-        <listitem>
-          <para>
-            is a tool similar to GNU <command>tar</command>
-          </para>
-          <indexterm zone="libarchive bsdtar">
-            <primary sortas="b-bsdtar">bsdtar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdunzip">
-        <term><command>bsdunzip</command></term>
-        <listitem>
-          <para>
-            is a tool similar to Info-ZIP <command>unzip</command>
-          </para>
-          <indexterm zone="libarchive bsdunzip">
-            <primary sortas="b-bsdunzip">bsdunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libarchive-lib">
-        <term><filename class="libraryfile">libarchive.so</filename></term>
-        <listitem>
-          <para>
-            is a library that can create and read several streaming
-            archive formats
-          </para>
-          <indexterm zone="libarchive libarchive-lib">
-            <primary sortas="c-libarchive">libarchive.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libassuan-download-http "&gnupg-http;/libassuan/libassuan-&libassuan-version;.tar.bz2">
-  <!ENTITY libassuan-download-ftp  " ">
-  <!ENTITY libassuan-md5sum        "fe8310b1a5bcaa32d70af476fa2b942a">
-  <!ENTITY libassuan-size          "592 KB">
-  <!ENTITY libassuan-buildsize     "7.9 MB (with tests, add 3.4 MB for documentation)">
-  <!ENTITY libassuan-time          "0.1 SBU (with tests and documentation)">
-]>
-
-<sect1 id="libassuan" xreflabel="libassuan-&libassuan-version;">
-  <?dbhtml filename="libassuan.html"?>
-
-
-  <title>libassuan-&libassuan-version;</title>
-
-  <indexterm zone="libassuan">
-    <primary sortas="a-libassuan">libassuan</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libassuan</title>
-
-    <para>
-      The <application>libassuan</application> package contains an inter
-      process communication library used by some of the other
-      <application>GnuPG</application> related packages.
-      <application>libassuan</application>'s primary use is to allow a
-      client to interact with a non-persistent server.
-      <application>libassuan</application> is not, however, limited to
-      use with <application>GnuPG</application> servers and clients. It
-      was designed to be flexible enough to meet the demands of many
-      transaction based environments with non-persistent servers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libassuan-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libassuan-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libassuan-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libassuan-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libassuan-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libassuan-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libassuan Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libassuan</title>
-
-    <para>
-      Install <application>libassuan</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make                      &amp;&amp;
-
-make -C doc html                                                       &amp;&amp;
-makeinfo --html --no-split -o doc/assuan_nochunks.html doc/assuan.texi &amp;&amp;
-makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi
-</userinput></screen>
-
-    <para>
-      The above commands build the documentation in html and plaintext formats.
-      If you wish to build alternate formats of the documentation, you must
-      have <xref linkend="texlive"/> installed and issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -dm755   /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan.html/* \
-                    /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan_nochunks.html \
-                    /usr/share/doc/libassuan-&libassuan-version;      &amp;&amp;
-install -v -m644 doc/assuan.{txt,texi} \
-                    /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
-
-    <para>
-      If you built alternate formats of the documentation, install them by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644  doc/assuan.{pdf,ps,dvi} \
-                  /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          libassuan-config
-        </seg>
-        <seg>
-          libassuan.so
-        </seg>
-        <seg>
-          /usr/share/doc/libassuan-&libassuan-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libassuan-config">
-        <term><command>libassuan-config</command></term>
-        <listitem>
-          <para>
-            is a <filename class="libraryfile">libassuan</filename> build information script
-          </para>
-          <indexterm zone="libassuan libassuan-config">
-            <primary sortas="b-libassuan-config">libassuan-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libassuan-lib">
-        <term><filename class="libraryfile">libassuan.so</filename></term>
-        <listitem>
-          <para>
-            is an inter process communication library which
-            implements the Assuan protocol
-          </para>
-          <indexterm zone="libassuan libassuan-lib">
-            <primary sortas="c-libassuan">libassuan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libatasmart-download-http "https://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">
-  <!ENTITY libatasmart-download-ftp  " ">
-  <!ENTITY libatasmart-md5sum        "53afe2b155c36f658e121fe6def33e77">
-  <!ENTITY libatasmart-size          "248 KB">
-  <!ENTITY libatasmart-buildsize     "3 MB">
-  <!ENTITY libatasmart-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libatasmart" xreflabel="libatasmart-&libatasmart-version;">
-  <?dbhtml filename="libatasmart.html"?>
-
-
-  <title>libatasmart-&libatasmart-version;</title>
-
-  <indexterm zone="libatasmart">
-    <primary sortas="a-libatasmart">libatasmart</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libatasmart</title>
-
-    <para>
-      The <application>libatasmart</application> package is a disk reporting
-      library. It only supports a subset of the ATA S.M.A.R.T. functionality.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libatasmart-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libatasmart-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libatasmart-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libatasmart-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libatasmart-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libatasmart-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/libatasmart"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libatasmart</title>
-
-    <para>
-      Install <application>libatasmart</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/libatasmart-&libatasmart-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          skdump and sktest
-        </seg>
-        <seg>
-          libatasmart.so
-        </seg>
-        <seg>
-          /usr/share/doc/libatasmart-&libatasmart-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="skdump">
-        <term><command>skdump</command></term>
-        <listitem>
-          <para>
-            is a utility that reports on the status of the disk
-          </para>
-          <indexterm zone="libatasmart skdump">
-            <primary sortas="b-skdump">skdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sktest">
-        <term><command>sktest</command></term>
-        <listitem>
-          <para>
-            is a utility to issue disks tests
-          </para>
-          <indexterm zone="libatasmart sktest">
-            <primary sortas="b-sktest">sktest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatasmart-lib">
-        <term><filename class="libraryfile">libatasmart.so</filename></term>
-        <listitem>
-          <para>
-            contains the ATA S.M.A.R.T API functions
-          </para>
-          <indexterm zone="libatasmart libatasmart-lib">
-            <primary sortas="c-libatasmart">libatasmart.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libatomic_ops.xml
===================================================================
--- general/genlib/libatomic_ops.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libatomic_ops-download-http "https://github.com/ivmai/libatomic_ops/releases/download/v&libatomic_ops-version;/libatomic_ops-&libatomic_ops-version;.tar.gz">
-  <!ENTITY libatomic_ops-download-ftp  " ">
-  <!ENTITY libatomic_ops-md5sum        "d07b3d8369d7f9efdca59f7501dd1117">
-  <!ENTITY libatomic_ops-size          "516 KB">
-  <!ENTITY libatomic_ops-buildsize     "6.8 MB (with tests)">
-  <!ENTITY libatomic_ops-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libatomic_ops" xreflabel="libatomic_ops-&libatomic_ops-version;">
-  <?dbhtml filename="libatomic_ops.html"?>
-
-
-  <title>libatomic_ops-&libatomic_ops-version;</title>
-
-  <indexterm zone="libatomic_ops">
-    <primary sortas="a-libatomic_ops">libatomic_ops</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libatomic_ops</title>
-
-    <para>
-      <application>libatomic_ops</application> provides implementations for
-      atomic memory update operations on a number of architectures. This allows
-      direct use of these in reasonably portable code. Unlike earlier similar
-      packages, this one explicitly considers memory barrier semantics, and
-      allows the construction of code that involves minimum overhead across a
-      variety of architectures.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libatomic_ops-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libatomic_ops-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libatomic_ops-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libatomic_ops-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libatomic_ops-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libatomic_ops-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libatomic_ops</title>
-
-    <para>
-      Install <application>libatomic_ops</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --docdir=/usr/share/doc/libatomic_ops-&libatomic_ops-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch enables building of the
-      <filename class="libraryfile">libatomic_ops</filename> shared libraries.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatomic_ops.so and libatomic_ops_gpl.so
-        </seg>
-        <seg>
-          /usr/include/libatomic_ops and
-          /usr/share/doc/libatomic_ops-&libatomic_ops-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatomic_ops-lib">
-        <term><filename class="libraryfile">libatomic_ops.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for atomic memory operations
-          </para>
-          <indexterm zone="libatomic_ops libatomic_ops-lib">
-            <primary sortas="c-libatomic_ops">libatomic_ops.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,275 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libblockdev-download-http
-    "https://github.com/storaged-project/libblockdev/releases/download/&libblockdev-version;-1/libblockdev-&libblockdev-version;.tar.gz">
-  <!ENTITY libblockdev-download-ftp " ">
-  <!ENTITY libblockdev-md5sum        "28d43f2d6bff85245502a8c4c478c5a3">
-  <!ENTITY libblockdev-size          "1.0 MB">
-  <!ENTITY libblockdev-buildsize     "13 MB">
-  <!ENTITY libblockdev-time          "0.1 SBU">
-]>
-
-<sect1 id="libblockdev" xreflabel="libblockdev-&libblockdev-version;">
-  <?dbhtml filename="libblockdev.html"?>
-
-
-  <title>libblockdev-&libblockdev-version;</title>
-
-  <indexterm zone="libblockdev">
-    <primary sortas="a-libblockdev">libblockdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libblockdev</title>
-
-    <para>
-      libblockdev is a C library supporting GObject Introspection for
-      manipulation of block devices. It has a plugin-based architecture where
-      each technology (like LVM, Btrfs, MD RAID, Swap,...) is implemented in a
-      separate plugin, possibly with multiple implementations (e.g. using LVM
-      CLI or the new LVM DBus API).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libblockdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libblockdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libblockdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libblockdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libblockdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libblockdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libblockdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="keyutils"/>,
-      <xref linkend="libbytesize"/>,
-      <xref linkend="libnvme"/>, and
-      <xref linkend="lvm2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="btrfs-progs"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="mdadm"/>,
-      <xref linkend="parted"/>,
-      <ulink url="https://github.com/felixonmars/volume_key">volume_key</ulink>,
-<!--      <xref linkend="volume_key"/>,-->
-<!--      <ulink url="https://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>, -->
-<!--      <ulink url="https://bcachefs.org/">bcachefs</ulink>, -->
-      <ulink url="https://github.com/pmem/ndctl">ndctl</ulink>, and
-      <ulink url="https://github.com/Datera/targetcli">targetcli</ulink>
-      (for tests)
-    </para>
-
-  </sect2>
-
-  <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
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --sysconfdir=/etc  \
-            --with-python3     \
-            --without-escrow   \
-            --without-gtk-doc  \
-            --without-lvm      \
-            --without-lvm_dbus \
-            --without-nvdimm   \
-            --without-tools    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite requires <application>targetcli</application>, which
-      is not a part of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-escrow</parameter>: This switch allows building
-      <application>libblockdev</application> without volume_key installed.  
-    </para>
-
-    <para>
-      <parameter>--without-lvm</parameter>
-      <parameter>--without-lvm_dbus</parameter>
-      <parameter>--without-tools</parameter>: The combination of these
-      switches allows
-      building <application>libblockdev</application> without
-      <xref linkend="parted"/> installed.  Remove it if you've installed
-      <xref linkend="parted"/> and wish to build the
-      <command>lvm-cache-stats</command> or <command>vfat-resize</command>
-      utilities, or wish <application>libblockdev</application> to support
-      logical volumes.
-    </para>
-
-    <para>
-      <option>--without-btrfs --without-mdraid --without-tools</option>:
-      The combination of these switches allows building
-      <application>libblockdev</application> without
-      <xref linkend="libbytesize"/> installed.  The
-      <option>--without-mdraid</option> option will break
-      <xref linkend="udisks2"/>, so don't use it unless you really know what
-      you are doing.
-    </para>
-
-    <para>
-      <option>--without-crypto</option>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="cryptsetup"/> or <xref linkend="keyutils"/> installed.
-      This switch will break <xref linkend="udisks2"/>, so don't use it
-      unless you really know what you are doing.
-    </para>
-
-    <para>
-      <option>--without-dm --without-lvm --without-lvm_dbus
-      --without-mpath</option>: The combination of these switches allows
-      building <application>libblockdev</application> without
-      <xref linkend="lvm2"/> installed.  The <option>--without-dm</option>
-      and <option>--without-mpath</option> options are not in the instructions
-      provided by the book because <xref linkend="lvm2"/> is required for
-      <xref linkend="cryptsetup"/> and <xref linkend="cryptsetup"/> is a
-      recommended dependency of <application>libblockdev</application> anyway.
-    </para>
-
-    <para>
-      <option>--without-nvme</option>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="libnvme"/> installed.  This switch will break
-      <xref linkend="udisks2"/>, so don't use it unless you really know what
-      you are doing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lvm-cache-stats and vfat-resize (both optional)
-        </seg>
-        <seg>
-          libbd_btrfs.so,
-          libbd_crypto.so,
-          libbd_dm.so,
-          libbd_fs.so,
-          libbd_loop.so,
-          libbd_lvm.so (optional),
-          libbd_lvm-dbus.so (optional),
-          libbd_mdraid.so,
-          libbd_mpath.so,
-          libbd_nvme.so,
-          libbd_part.so,
-          libbd_swap.so,
-          libbd_utils.so, and
-          libblockdev.so
-        </seg>
-        <seg>
-          /etc/libblockdev,
-          /usr/include/blockdev, and
-          /usr/share/gtk-doc/html/libblockdev (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lvm-cache-stats">
-        <term><command>lvm-cache-stats</command></term>
-        <listitem>
-          <para>
-            prints statistics on caches on LVM Logical Volumes
-          </para>
-          <indexterm zone="libblockdev lvm-cache-stats">
-            <primary sortas="b-lvm-cache-stats">lvm-cache-stats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vfat-resize">
-        <term><command>vfat-resize</command></term>
-        <listitem>
-          <para>
-            resizes <systemitem class="filesystem">vfat</systemitem>
-            file systems
-          </para>
-          <indexterm zone="libblockdev vfat-resize">
-            <primary sortas="b-vfat-resize">vfat-resize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libbytesize.xml
===================================================================
--- general/genlib/libbytesize.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "2ed2ad2e44c4017f016e1ca55be83e62">
-  <!ENTITY libbytesize-size          "452 KB">
-  <!ENTITY libbytesize-buildsize     "3.5 MB">
-  <!ENTITY libbytesize-time          "less than 0.1 SBU (including tests)">
-]>
-
-<sect1 id="libbytesize" xreflabel="libbytesize-&libbytesize-version;">
-  <?dbhtml filename="libbytesize.html"?>
-
-
-  <title>libbytesize-&libbytesize-version;</title>
-
-  <indexterm zone="libbytesize">
-    <primary sortas="a-libbytesize">libbytesize</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libbytesize</title>
-
-    <para>
-      The <application>libbytesize</application> package is a library which
-      facilitates the common operations with sizes in bytes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libbytesize-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libbytesize-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libbytesize-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libbytesize-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libbytesize-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libbytesize-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libbytesize Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pcre2"/> and
-      <xref linkend="pygments"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-
-    <para role="recommended">
-      <xref linkend="six"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://github.com/rhinstaller/pocketlint/releases">pocketlint</ulink> (python module for one test), and
-      <ulink url="https://pypi.python.org/pypi/polib">polib</ulink> (python module for one test)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libbytesize</title>
-
-    <para>
-      Install <application>libbytesize</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have the optional python modules installed, the regression
-      tests can be run with: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-i -without-python2</option>: If
-      <application>Python 2</application> is installed, use this switch to
-      prevent the use of <application>Python 2</application>. This may be
-      required to run the tests, if some of the needed python modules have been
-      installed for <application>Python 3</application> only.
-    </para>
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bscalc
-        </seg>
-        <seg>
-          libbytesize.so
-        </seg>
-        <seg>
-          /usr/include/bytesize and
-          /usr/lib/python&python3-majorver;/site-packages/bytesize
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bscalc">
-        <term><command>bscalc</command></term>
-        <listitem>
-          <para>
-            converts from a larger unit, such as MB or TB,
-            back to a value in bytes
-          </para>
-          <indexterm zone="libbytesize bscalc">
-            <primary sortas="b-bscalc">bscalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbytesize-lib">
-        <term><filename class="libraryfile">libbytesize.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle common read/write operations
-            with sizes in bytes
-          </para>
-          <indexterm zone="libbytesize libbytesize-lib">
-            <primary sortas="c-libbytesize">libbytesize.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libcloudproviders.xml
===================================================================
--- general/genlib/libcloudproviders.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcloudproviders-download-http "&gnome-download-http;/libcloudproviders/0.3/libcloudproviders-&libcloudproviders-version;.tar.xz">
-  <!ENTITY libcloudproviders-download-ftp  " ">
-  <!ENTITY libcloudproviders-md5sum        "f0f994bdc36fdfe9b31e3655b8071599">
-  <!ENTITY libcloudproviders-size          "24 KB">
-  <!ENTITY libcloudproviders-buildsize     "1.4 MB">
-  <!ENTITY libcloudproviders-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libcloudproviders" xreflabel="libcloudproviders-&libcloudproviders-version;">
-  <?dbhtml filename="libcloudproviders.html"?>
-
-  <title>libcloudproviders-&libcloudproviders-version;</title>
-
-  <indexterm zone="libcloudproviders">
-    <primary sortas="a-libcloudproviders">libcloudproviders</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcloudproviders</title>
-
-    <para>
-      The <application>libcloudproviders</application> package contains a
-      library which provides a DBus API that allows cloud storage sync clients
-      to expose their services.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcloudproviders-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcloudproviders-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcloudproviders-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcloudproviders-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcloudproviders-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcloudproviders-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcloudproviders Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcloudproviders</title>
-
-    <para>
-      Install <application>libcloudproviders</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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"/>
-
-    <para>
-      <option>-Denable-gtk-doc</option>: Use this switch if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to generate the
-      API documentation.
-    </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>
-          libcloudproviders.so
-        </seg>
-        <seg>
-          /usr/include/cloudproviders
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcloudproviders-lib">
-        <term><filename class="libraryfile">libcloudproviders.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a DBus API to allow cloud storage
-            sync clients to expose their services
-          </para>
-          <indexterm zone="libcloudproviders libcloudproviders-lib">
-            <primary sortas="c-libcloudproviders">libcloudproviders.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdaemon-download-http "https://0pointer.de/lennart/projects/libdaemon/libdaemon-&libdaemon-version;.tar.gz">
-  <!ENTITY libdaemon-download-ftp  " ">
-  <!ENTITY libdaemon-md5sum        "509dc27107c21bcd9fbf2f95f5669563">
-  <!ENTITY libdaemon-size          "332 KB">
-  <!ENTITY libdaemon-buildsize     "3 MB">
-  <!ENTITY libdaemon-time          "0.1 SBU">
-]>
-
-<sect1 id="libdaemon" xreflabel="libdaemon-&libdaemon-version;">
-  <?dbhtml filename="libdaemon.html"?>
-
-
-  <title>libdaemon-&libdaemon-version;</title>
-
-  <indexterm zone="libdaemon">
-    <primary sortas="a-libdaemon">libdaemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdaemon</title>
-
-    <para>
-      The <application>libdaemon</application> package is a lightweight C
-      library that eases the writing of UNIX daemons.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdaemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdaemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdaemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdaemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdaemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdaemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdaemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="lynx"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdaemon</title>
-
-    <para>
-      Install <application>libdaemon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <application>Doxygen</application> installed and wish to
-      build the API documentation, issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc doxygen</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 docdir=/usr/share/doc/libdaemon-&libdaemon-version; install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it using the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- there is a link from README.html to reference/html, so install there -->
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libdaemon-&libdaemon-version;/reference/html &amp;&amp;
-install -v -m644 doc/reference/html/* /usr/share/doc/libdaemon-&libdaemon-version;/reference/html &amp;&amp;
-install -v -m644 doc/reference/man/man3/* /usr/share/man/man3</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdaemon.so
-        </seg>
-        <seg>
-          /usr/include/libdaemon and
-          /usr/share/doc/libdaemon-&libdaemon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdaemon-lib">
-        <term><filename class="libraryfile">libdaemon.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libdaemon</application> API functions
-          </para>
-          <indexterm zone="libdaemon libdaemon-lib">
-            <primary sortas="c-libdaemon">libdaemon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libdisplay-info.xml
===================================================================
--- general/genlib/libdisplay-info.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdisplay-info-download-http "https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/&libdisplay-info-version;/downloads//libdisplay-info-&libdisplay-info-version;.tar.xz">
-  <!ENTITY libdisplay-info-download-ftp  " ">
-  <!ENTITY libdisplay-info-md5sum        "56e8d2213d2aefd7defaaddfd9cb80e1">
-  <!ENTITY libdisplay-info-size          "t6 KB">
-  <!ENTITY libdisplay-info-buildsize     "2.4 MB">
-  <!ENTITY libdisplay-info-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libdisplay-info" xreflabel="libdisplay-info-&libdisplay-info-version;">
-  <?dbhtml filename="libdisplay-info.html"?>
-
-  <title>libdisplay-info-&libdisplay-info-version;</title>
-
-  <indexterm zone="libdisplay-info">
-    <primary sortas="a-libdisplay-info">libdisplay-info</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdisplay-info</title>
-
-    <para>
-      The <application>libdisplay-info</application> package provides 
-       a set of high-level and low-level functions to 
-       access detailed Extended Display Identification Data (EDID) information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdisplay-info-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdisplay-info-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdisplay-info-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdisplay-info-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdisplay-info-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdisplay-info-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libdisplay-info Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="hwdata"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdisplay-info</title>
-
-    <para>
-      Install <application>libdisplay-info</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package requires special software to run tests.
-    </para>
-
-    <para>
-      Now, as the &root; 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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdisplay-info.so 
-        </seg>
-        <seg>
-          /usr/include/libdisplay-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdisplay-info-lib">
-        <term><filename class="libraryfile">libdisplay-info.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle operations
-            relating to NVMe devices.
-          </para>
-          <indexterm zone="libdisplay-info libdisplay-info-lib">
-            <primary sortas="c-libdisplay-info">libdisplay-info.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/libfam.xml
===================================================================
--- general/genlib/libfam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libfam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="libfam" xreflabel="libfam">
+<?dbhtml filename="libfam.html" dir="general"?>
+<title>libfam</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/genlib/libfam/libfam.ent
===================================================================
--- general/genlib/libfam/libfam.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libfam/libfam.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY libfam SYSTEM "../libfam.xml">
Index: neral/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgcrypt-download-http "&gnupg-http;/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
-  <!ENTITY libgcrypt-download-ftp  " ">
-  <!ENTITY libgcrypt-md5sum        "a8cada0b343e10dbee51c9e92d856a94">
-  <!ENTITY libgcrypt-size          "3.6 MB">
-  <!ENTITY libgcrypt-buildsize     "131 MB (with tests)">
-  <!ENTITY libgcrypt-time          "0.3 SBU (with documentation; add 0.4 SBU for tests)">
-]>
-
-<sect1 id="libgcrypt" xreflabel="libgcrypt-&libgcrypt-version;">
-  <?dbhtml filename="libgcrypt.html"?>
-
-
-  <title>libgcrypt-&libgcrypt-version;</title>
-
-  <indexterm zone="libgcrypt">
-    <primary sortas="a-libgcrypt">libgcrypt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgcrypt</title>
-
-    <para>
-      The <application>libgcrypt</application> package contains a general
-      purpose crypto library based on the code used in
-      <application>GnuPG</application>. The library provides a high level
-      interface to cryptographic building blocks using an extendable and flexible
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgcrypt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgcrypt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgcrypt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgcrypt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgcrypt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgcrypt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgcrypt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="libcap-pam"/> -->
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgcrypt</title>
-
-    <para>
-      Install <application>libgcrypt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make                      &amp;&amp;
-
-make -C doc html                                                       &amp;&amp;
-makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi &amp;&amp;
-makeinfo --plaintext       -o doc/gcrypt.txt           doc/gcrypt.texi</userinput></screen>
-
-<!--  The commands for building the pdf and ps formats are broken.
-    <para>
-      The above commands build the documentation in html and plaintext
-      formats. If you wish to build alternate formats of the documentation, you
-      need <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>). Issue
-      the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf</userinput></screen>
--->
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-
-install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
-install -v -m644 doc/gcrypt.html/* \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
-install -v -m644 doc/gcrypt_nochunks.html \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;      &amp;&amp;
-install -v -m644 doc/gcrypt.{txt,texi} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
-<!--
-    <para>
-      If you built alternate formats of the documentation, install them by
-      issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/gcrypt.{pdf,ps,dvi} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-capabilities</option>: This option enables libcap2 support.
-      Note that this breaks <xref linkend="cryptsetup"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          dumpsexp, hmac256, libgcrypt-config, and mpicalc
-        </seg>
-        <seg>
-          libgcrypt.so
-        </seg>
-        <seg>
-          /usr/share/doc/libgcrypt-&libgcrypt-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dumpsexp">
-        <term><command>dumpsexp</command></term>
-        <listitem>
-          <para>
-            is a debug tool for S-expressions
-          </para>
-          <indexterm zone="libgcrypt dumpsexp">
-            <primary sortas="b-dumpsexp">dumpsexp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmac256">
-        <term><command>hmac256</command></term>
-        <listitem>
-          <para>
-            is a standalone HMAC-SHA-256 implementation used to compute
-            an HMAC-SHA-256 authentication code
-          </para>
-          <indexterm zone="libgcrypt hmac256">
-            <primary sortas="b-hmac256">hmac256</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcrypt-config">
-        <term><command>libgcrypt-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use <filename class="libraryfile">libgcrypt</filename>
-          </para>
-          <indexterm zone="libgcrypt libgcrypt-config">
-            <primary sortas="b-libgcrypt-config">libgcrypt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpicalc">
-        <term><command>mpicalc</command></term>
-        <listitem>
-          <para>
-            is a RPN (Reverse Polish Notation) calculator
-          </para>
-          <indexterm zone="libgcrypt mpicalc">
-            <primary sortas="b-mpicalc">mpicalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcrypt-lib">
-        <term><filename class="libraryfile">libgcrypt.so</filename></term>
-        <listitem>
-          <para>
-            contains the cryptographic API functions
-          </para>
-          <indexterm zone="libgcrypt libgcrypt-lib">
-            <primary sortas="c-libgcrypt">libgcrypt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgpg-error-download-http "&gnupg-http;/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
-  <!ENTITY libgpg-error-download-ftp  " ">
-  <!ENTITY libgpg-error-md5sum        "eb171d62d761f49e110b77b747d8a157">
-  <!ENTITY libgpg-error-size          "1.0 MB">
-  <!ENTITY libgpg-error-buildsize     "11 MB (with tests)">
-  <!ENTITY libgpg-error-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libgpg-error" xreflabel="libgpg-error-&libgpg-error-version;">
-  <?dbhtml filename="libgpg-error.html"?>
-
-
-  <title>libgpg-error-&libgpg-error-version;</title>
-
-  <indexterm zone="libgpg-error">
-    <primary sortas="a-libgpg-error">libgpg-error</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgpg-error</title>
-
-    <para>
-      The <application>libgpg-error</application> package contains a
-      library that defines common error values for all
-      <application>GnuPG</application> components.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgpg-error-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgpg-error-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgpg-error-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgpg-error-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgpg-error-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgpg-error</title>
-
-    <para>
-      Install <application>libgpg-error</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D README /usr/share/doc/libgpg-error-&libgpg-error-version;/README</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gpg-error, gpgrt-config, and yat2m
-        </seg>
-        <seg>
-          libgpg-error.so
-        </seg>
-        <seg>
-          /usr/share/common-lisp/source/gpg-error,
-          /usr/share/libgpg-error, and
-          /usr/share/doc/libgpg-error-&libgpg-error-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpg-error">
-        <term><command>gpg-error</command></term>
-        <listitem>
-          <para>
-            is used to determine <application>libgpg-error</application>
-            error codes
-          </para>
-          <indexterm zone="libgpg-error gpg-error">
-            <primary sortas="b-gpg-error">gpg-error</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgrt-config">
-        <term><command>gpgrt-config</command></term>
-        <listitem>
-          <para>
-            is a <command>pkg-config</command> style tool for querying the
-            information about installed version of libgpg-error
-          </para>
-          <indexterm zone="libgpg-error gpgrt-config">
-            <primary sortas="b-gpgrt-config">gpgrt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yat2m">
-        <term><command>yat2m</command></term>
-        <listitem>
-          <para>
-            extracts man pages from a Texinfo source
-          </para>
-          <indexterm zone="libgpg-error yat2m">
-            <primary sortas="b-yat2m">yat2m</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgpg-error-lib">
-        <term><filename class="libraryfile">libgpg-error.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgpg-error</application> API
-            functions
-          </para>
-          <indexterm zone="libgpg-error libgpg-error-lib">
-            <primary sortas="c-libgpg-error">libgpg-error.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libgrss.xml
===================================================================
--- general/genlib/libgrss.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgrss-download-http "&gnome-download-http;/libgrss/0.7/libgrss-0.7.0.tar.xz">
-  <!ENTITY libgrss-download-ftp  " ">
-  <!ENTITY libgrss-md5sum        "7c0ee46a82dc0e9610183fe9ef8c7c1d">
-  <!ENTITY libgrss-size          "356 KB">
-  <!ENTITY libgrss-buildsize     "10 MB">
-  <!ENTITY libgrss-time          "0.1 SBU">
-]>
-
-<sect1 id="libgrss" xreflabel="libgrss-&libgrss-version;">
-  <?dbhtml filename="libgrss.html"?>
-
-
-  <title>libgrss-&libgrss-version;</title>
-
-  <indexterm zone="libgrss">
-    <primary sortas="a-libgrss">libgrss</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgrss</title>
-
-    <para>
-      The <application>libgrss</application> package contains a library
-      designed to manipulate RSS and Atom feeds.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgrss-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgrss-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgrss-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgrss-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgrss-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgrss-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libgrss-&libgrss-version;-bugfixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgrss Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgrss</title>
-
-    <para>
-      Install <application>libgrss</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>patch -Np1 -i ../libgrss-&libgrss-version;-bugfixes-2.patch &amp;&amp;
-autoreconf -fv &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgrss.so
-        </seg>
-        <seg>
-          /usr/include/libgrss and
-          /usr/share/doc/libgrss-&libgrss-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgrss-lib">
-        <term><filename class="libraryfile">libgrss.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for handling RSS feeds
-          </para>
-          <indexterm zone="libgrss libgrss-lib">
-            <primary sortas="c-libgrss">libgrss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
-  <!ENTITY libgsf-download-ftp  " ">
-  <!ENTITY libgsf-md5sum        "c64b4a29dd2e67749313f3917a12a709">
-  <!ENTITY libgsf-size          "692 KB">
-  <!ENTITY libgsf-buildsize     "14 MB (with tests)">
-  <!ENTITY libgsf-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libgsf" xreflabel="libgsf-&libgsf-version;">
-  <?dbhtml filename="libgsf.html"?>
-
-
-  <title>libgsf-&libgsf-version;</title>
-
-  <indexterm zone="libgsf">
-    <primary sortas="a-libgsf">libgsf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgsf</title>
-
-    <para>
-      The <application>libgsf</application> package contains a library
-      used for providing an extensible input/output abstraction layer for
-      structured file formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgsf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgsf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgsf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgsf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgsf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgsf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgsf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/>
-      (To build <command>gsf-office-thumbnailer</command>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgsf</title>
-
-    <para>
-      Install <application>libgsf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. 
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gsf, gsf-office-thumbnailer, and gsf-vba-dump
-        </seg>
-        <seg>
-          libgsf-1.so
-        </seg>
-        <seg>
-          /usr/include/libgsf-1,
-          /usr/share/gtk-doc/html/gsf and
-          /usr/share/thumbnailers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsf">
-        <term><command>gsf</command></term>
-        <listitem>
-          <para>
-            is a simple archive utility, somewhat similar to
-            <ulink role='man' url='&man;tar.1'>tar(1)</ulink>
-          </para>
-          <indexterm zone="libgsf gsf">
-            <primary sortas="b-gsf">gsf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsf-office-thumbnailer">
-        <term><command>gsf-office-thumbnailer</command></term>
-        <listitem>
-          <para>
-            is used internally by <application>GNOME</application> applications
-            such as <application>Nautilus</application> to generate
-            thumbnails of several types of office application files
-          </para>
-          <indexterm zone="libgsf gsf-office-thumbnailer">
-            <primary sortas="b-gsf-office-thumbnailer">gsf-office-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsf-vba-dump">
-        <term><command>gsf-vba-dump</command></term>
-        <listitem>
-          <para>
-            is used to extract Visual Basic for Applications macros from files
-          </para>
-          <indexterm zone="libgsf gsf-vba-dump">
-            <primary sortas="b-gsf-vba-dump">gsf-vba-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsf-1">
-        <term><filename class="libraryfile">libgsf-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgsf</application> API functions
-          </para>
-          <indexterm zone="libgsf libgsf-1">
-            <primary sortas="c-libgsf-1">libgsf-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libgudev.xml
===================================================================
--- general/genlib/libgudev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgudev-download-http
-           "&gnome-download-http;/libgudev/&libgudev-version;/libgudev-&libgudev-version;.tar.xz">
-  <!ENTITY libgudev-download-ftp  " ">
-  <!ENTITY libgudev-md5sum        "46da30a1c69101c3a13fa660d9ab7b73">
-  <!ENTITY libgudev-size          "32 KB">
-  <!ENTITY libgudev-buildsize     "2.0 MB">
-  <!ENTITY libgudev-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libgudev" xreflabel="libgudev-&libgudev-version;">
-  <?dbhtml filename="libgudev.html"?>
-
-
-  <title>libgudev-&libgudev-version;</title>
-
-  <indexterm zone="libgudev">
-    <primary sortas="a-libgudev">libgudev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgudev</title>
-
-    <para>
-      The <application>libgudev</application> package contains
-      GObject bindings for libudev.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgudev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgudev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgudev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgudev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgudev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgudev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="umockdev"/> (for testing)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgudev</title>
-
-    <para>
-      Install <application>libgudev</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.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
-      <xref role="nodep" linkend="umockdev"/>. Omit this switch if you
-      wish to run the test suite.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgudev-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gudev-1.0 and
-          /usr/share/gtk-doc/html/gudev
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgudev-1.0">
-        <term><filename class="libraryfile">libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is a GObject-based wrapper library for libudev
-          </para>
-          <indexterm zone="libgudev libgudev-1.0">
-            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,200 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgusb-download-http "https://github.com/hughsie/libgusb/releases/download/&libgusb-version;/libgusb-&libgusb-version;.tar.xz">
-  <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "354a3227334991ea4e924843c144bd82">
-  <!ENTITY libgusb-size          "52 KB">
-  <!ENTITY libgusb-buildsize     "5.0 MB (with tests and docs)">
-  <!ENTITY libgusb-time          "0.1 SBU (with tests and docs)">
-]>
-
-<sect1 id="libgusb" xreflabel="libgusb-&libgusb-version;">
-  <?dbhtml filename="libgusb.html"?>
-
-
-  <title>libgusb-&libgusb-version;</title>
-
-  <indexterm zone="libgusb">
-    <primary sortas="a-libgusb">libgusb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgusb</title>
-
-    <para>
-      The <application>libgusb</application> package contains the GObject
-      wrappers for <application>libusb-1.0</application> that makes it
-      easy to do asynchronous control, bulk and interrupt transfers with
-      proper cancellation and integration into a mainloop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgusb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgusb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgusb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgusb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgusb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgusb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgusb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="usbutils"/> (for <filename>usb.ids</filename> data file,
-      which is also required for the tests), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and
-      <xref linkend="umockdev"/> (for full test coverage)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgusb</title>
-
-    <para>
-      Install <application>libgusb</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Ddocs=false        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed -E "/output|install_dir/s/('libgusb)'/\1-&libgusb-version;'/" \
-    -i ../docs/meson.build                            &amp;&amp;
-meson configure -Ddocs=true                           &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: &gi-doc-disable;
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gusbcmd
-        </seg>
-        <seg>
-          libgusb.so
-        </seg>
-        <seg>
-          /usr/include/gusb-1 and
-          /usr/share/doc/libgusb-&libgusb-version; (if gi-docgen is used)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gusbcmd">
-        <term><command>gusbcmd</command></term>
-        <listitem>
-          <para>
-            is a debugging tool for the libgusb library
-          </para>
-          <indexterm zone="libgusb gusbcmd">
-            <primary sortas="b-gusbcmd">gusbcmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgusb-lib">
-        <term><filename class="libraryfile">libgusb.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgusb</application> API functions
-          </para>
-          <indexterm zone="libgusb libgusb-lib">
-            <primary sortas="c-libgusb">libgusb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,325 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "cc790ea49701df0335d42b89d57c04bc">
-  <!ENTITY libical-size          "888 KB">
-  <!ENTITY libical-buildsize     "24 MB (with tests)">
-  <!ENTITY libical-time          "0.1 SBU (iusing parallelism=4; with tests)">
-<!-- run at -j1 because it fails at -j4 -->
-]>
-
-<sect1 id="libical" xreflabel="libical-&libical-version;">
-  <?dbhtml filename="libical.html"?>
-
-
-  <title>libical-&libical-version;</title>
-
-  <indexterm zone="libical">
-    <primary sortas="a-libical">libical</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libical</title>
-
-    <para>
-      The <application>libical</application> package contains an implementation
-      of the iCalendar protocols and data formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libical-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libical-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libical-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libical-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libical-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libical-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libical Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/> (both required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for the API documentation),
-      <xref linkend="graphviz"/> (for the API documentation),
-      <xref linkend="gtk-doc"/> (for the API documentation),
-      <xref linkend="icu"/>, 
-      <xref linkend="pygobject3"/> (for some tests), and
-      &berkeley-db;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libical</title>
-
-    <para>
-      Install <application>libical</application> by running the
-      following commands:
-    </para>
-
-  <!-- Needs confirmation, but I got a race condition at -j8,
-  -j1 allowed the build to pass. Pierre 2019-12-06
-  I always have it actually. Hence the entity.
-
-  Works at -j8 and -j4 for version 3.0.18
-    &parallel_issues;-->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr  \
-      -D CMAKE_BUILD_TYPE=Release   \
-      -D SHARED_ONLY=yes            \
-      -D ICAL_BUILD_DOCS=false      \
-      -D ICAL_BUILD_EXAMPLES=false  \
-      -D GOBJECT_INTROSPECTION=true \
-      -D ICAL_GLIB_VAPI=true        \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/>, <xref linkend="graphviz"/>,
-      and <xref linkend="gtk-doc"/>
-      installed and wish to build the API documentation,  you should
-      remove the <parameter>-DICAL_BUILD_DOCS=false</parameter> switch
-      and issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <!-- One test, timezones, is known to fail on SysV systems. -->
-      <!-- On systemd, we symlink the current timezone to
-           /etc/localtime, which is what libical expects.
-           This is now done on SysV as well.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the API documentation, install by issuing, as
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        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>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-D CMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-D SHARED_ONLY=yes</parameter>: This switch is used
-      in order to only build the shared libraries.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_BUILD_DOCS=false</parameter>: This switch prevents
-      building the <application>GTK</application> documentation. Remove
-      if you want to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_BUILD_EXAMPLES=false</parameter>: This switch prevents
-      building examples. Remove if you want to build them.
-    </para>
-
-    <para>
-      <parameter>-D GOBJECT_INTROSPECTION=true</parameter>: This switch is used
-      to generate GObject metadata bindings.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_GLIB_VAPI=true</parameter>: This switch is used
-      in order to build bindings for <xref linkend="vala"/>.
-    </para>
-
-    <para>
-      <option>-D USE_BUILTIN_TZDATA=yes</option>: This switch is used
-      in order to build using your own timezone data.
-    </para>
-
-    <!-- No CMake equivalents
-    <para>
-      <parameter>- -enable-cxx</parameter>: This switch enables
-      <application>libical</application> C++ library.
-    </para>
-
-    <para>
-      <option>- -enable-python</option>: This switch enables
-      <application>libical</application> Python bindings.
-    </para> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libical_cxx.so,
-          libical.so,
-          libical-glib.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,
-          /usr/share/gtk-doc/html/libical-glib (optional),
-          and /usr/share/doc/libical-&libical-version;/html
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libical-lib">
-        <term><filename class="libraryfile">libical.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> API
-            functions
-          </para>
-          <indexterm zone="libical libical-lib">
-            <primary sortas="c-libical">libical.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libical_cxx-lib">
-        <term><filename class="libraryfile">libical_cxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> C++ bindings
-          </para>
-          <indexterm zone="libical libical_cxx-lib">
-            <primary sortas="c-libical_cxx">libical_cxx.so</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            is a library that allows you to store iCal component data
-            to disk in a variety of ways
-          </para>
-          <indexterm zone="libical libicalss">
-            <primary sortas="c-libicalss">libicalss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalss_cxx">
-        <term><filename class="libraryfile">libicalss_cxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libicalss</application> C++
-            bindings
-          </para>
-          <indexterm zone="libical libicalss_cxx">
-            <primary sortas="c-libicalss_cxx">libicalss_cxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalvcal">
-        <term><filename class="libraryfile">libicalvcal.so</filename></term>
-        <listitem>
-          <para>
-            is a vCard/vCalendar C interface
-          </para>
-          <indexterm zone="libical libicalvcal">
-            <primary sortas="c-libicalvcal">libicalvcal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libidn-download-http "&gnu-http;/libidn/libidn-&libidn-version;.tar.gz">
-  <!ENTITY libidn-download-ftp  " ">
-  <!ENTITY libidn-md5sum        "fe061a95ae23979150a692d102dce4ad">
-  <!ENTITY libidn-size          "2.5 MB">
-  <!ENTITY libidn-buildsize     "19 MB (with tests)">
-  <!ENTITY libidn-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libidn" xreflabel="libidn-&libidn-version;">
-  <?dbhtml filename="libidn.html"?>
-
-
-  <title>libidn-&libidn-version;</title>
-
-  <indexterm zone="libidn">
-    <primary sortas="a-libidn">libidn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libidn</title>
-
-    <para>
-      <application>libidn</application> is a package designed for
-      internationalized string handling based on the
-      <ulink url="https://www.ietf.org/rfc/rfc3454.txt">Stringprep</ulink>,
-      <ulink url="https://www.ietf.org/rfc/rfc3492.txt">Punycode</ulink> and
-      <ulink url="https://www.ietf.org/rfc/rfc3490.txt">IDNA</ulink>
-      specifications defined by the Internet Engineering Task Force
-      (IETF) Internationalized Domain Names (IDN) working group, used for
-      internationalized domain names. This is useful for converting data from the
-      system's native representation into UTF-8, transforming Unicode strings
-      into ASCII strings, allowing applications to use certain ASCII name labels
-      (beginning with a special prefix) to represent non-ASCII name labels, and
-      converting entire domain names to and from the ASCII Compatible Encoding
-      (ACE) form.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libidn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libidn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libidn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libidn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libidn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libidn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libidn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://www.mono-project.com/">Mono</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libidn</title>
-
-    <para>
-      Install <application>libidn</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, run:
-    </para>
-
-<screen remap="test"><userinput>pushd tests  &amp;&amp;
-  make check &amp;&amp;
-popd </userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-find doc -name "Makefile*" -delete            &amp;&amp;
-rm -rf -v doc/{gdoc,idn.1,stamp-vti,man,texi} &amp;&amp;
-mkdir -v       /usr/share/doc/libidn-&libidn-version;     &amp;&amp;
-cp -r -v doc/* /usr/share/doc/libidn-&libidn-version;</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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--enable-java</option>: Use this switch to enable building
-      the Java implementation of <application>libidn</application>. Note that
-      <xref linkend="openjdk"/> must be installed to use this option.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          idn
-        </seg>
-        <seg>
-          libidn.so
-        </seg>
-        <seg>
-          /usr/share/doc/libidn-&libidn-version; and
-          /usr/share/gtk-doc/html/libidn
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="idn">
-        <term><command>idn</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the internationalized domain
-            name library
-          </para>
-          <indexterm zone="libidn idn">
-            <primary sortas="b-idn">idn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libidn-lib">
-        <term><filename class="libraryfile">libidn.so</filename></term>
-        <listitem>
-          <para>
-            contains a generic Stringprep implementation that does Unicode
-            3.2 NFKC normalization, mapping and prohibition of characters, and
-            bidirectional character handling. Profiles for Nameprep, iSCSI, SASL
-            and XMPP are included as well as support for Punycode and ASCII
-            Compatible Encoding (ACE) via IDNA. A mechanism to define Top-Level
-            Domain (TLD) specific validation tables, and to compare strings
-            against those tables, as well as default tables for some TLDs are
-            included
-          </para>
-          <indexterm zone="libidn libidn-lib">
-            <primary sortas="c-libidn">libidn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libidn2.xml
===================================================================
--- general/genlib/libidn2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libidn2-download-http "&gnu-http;/libidn/libidn2-&libidn2-version;.tar.gz">
-  <!ENTITY libidn2-download-ftp  " ">
-  <!ENTITY libidn2-md5sum        "de2818c7dea718a4f264f463f595596b">
-  <!ENTITY libidn2-size          "2.1 MB">
-  <!ENTITY libidn2-buildsize     "21 MB (add 3 MB for tests)">
-  <!ENTITY libidn2-time          "0.1 SBU (add 0.6 SBU for tests)">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="libidn2" xreflabel="libidn2-&libidn2-version;">
-  <?dbhtml filename="libidn2.html"?>
-
-
-  <title>libidn2-&libidn2-version;</title>
-
-  <indexterm zone="libidn2">
-    <primary sortas="a-libidn2">libidn2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libidn2</title>
-
-    <para>
-      <application>libidn2</application> is a package designed for
-      internationalized string handling based on standards from the
-      Internet Engineering Task Force (IETF)'s IDN working group, designed for
-      internationalized domain names.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libidn2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libidn2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libidn2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libidn2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libidn2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libidn2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libidn2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libunistring"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="installation">
-    <title>Installation of libidn2</title>
-
-    <para>
-      Install <application>libidn2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          idn2
-        </seg>
-        <seg>
-          libidn2.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/libidn2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="idn2">
-        <term><command>idn2</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the internationalized domain
-            library
-          </para>
-          <indexterm zone="libidn2 idn2">
-            <primary sortas="b-idn2">idn2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libidn2-lib">
-        <term><filename class="libraryfile">libidn2.so</filename></term>
-        <listitem>
-          <para>
-            contains a generic Stringprep implementation used for
-            internationalized string handling
-          </para>
-          <indexterm zone="libidn2 libidn2-lib">
-            <primary sortas="c-libidn2">libidn2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/libiodbc.xml
===================================================================
--- general/genlib/libiodbc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,193 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-buildsize     "26 MB">
-  <!ENTITY libiodbc-time          "0.2 SBU">
-]>
-
-<sect1 id="libiodbc" xreflabel="libiodbc-&libiodbc-version;">
-  <?dbhtml filename="libiodbc.html"?>
-
-
-  <title>libiodbc-&libiodbc-version;</title>
-
-  <indexterm zone="libiodbc">
-    <primary sortas="a-libiodbc">libiodbc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libiodbc</title>
-
-    <para>
-      <application>libiodbc</application> is an API to ODBC compatible
-      databases.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libiodbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libiodbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libiodbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libiodbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libiodbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libiodbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libiodbc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk2"/> (to create the GUI admin tool)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libiodbc</title>
-
-    <para>
-      Install <application>libiodbc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --with-iodbc-inidir=/etc/iodbc  \
-            --includedir=/usr/include/iodbc \
-            --disable-libodbc               \
-            --disable-static                &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-iodbc-inidir=/etc/iodbc</parameter>:
-      <application>libiodbc</application> will install configuration files
-      in this directory.
-    </para>
-
-    <para>
-      <parameter>--includedir=/usr/include/iodbc</parameter>: This installs the
-      interface headers to a private directory to avoid a conflict with headers
-      installed by <application>unixODBC</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-libodbc</parameter>: This prevents the installation
-      of the <filename class="symlink">libodbc.so</filename> symbolic link to
-      avoid a conflict with <application>unixODBC</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>iodbc-config, iodbctest, iodbctestw, and iodbcadm-gtk</seg>
-        <seg>libdrvproxy.so, libiodbc.so, libiodbcinst.so, and
-        libiodbcadm.so</seg>
-        <seg>/usr/include/iodbc, /usr/share/libiodbc, and /etc/iodbc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="iodbc-config">
-        <term><command>iodbc-config</command></term>
-        <listitem>
-          <para>
-            is a utility for retrieving the installation options of libiodbc
-          </para>
-          <indexterm zone="libiodbc iodbc-config">
-            <primary sortas="b-iodbc-config">iodbc-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbctest">
-        <term><command>iodbctest{,w}</command></term>
-        <listitem>
-          <para>
-            are interactive SQL processors
-          </para>
-          <indexterm zone="libiodbc iodbctest">
-            <primary sortas="b-iodbctest">iodbctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbcadm">
-        <term><command>iodbcadm-gtk</command></term>
-        <listitem>
-          <para>
-            is a graphical administration utility
-          </para>
-          <indexterm zone="libiodbc iodbcadm">
-            <primary sortas="b-iodbcadm">iodbcadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libksba-download-http "&gnupg-http;/libksba/libksba-&libksba-version;.tar.bz2">
-  <!ENTITY libksba-download-ftp  " ">
-  <!ENTITY libksba-md5sum        "b84be832461d4704c227c3719288bfc9">
-  <!ENTITY libksba-size          "692 KB">
-  <!ENTITY libksba-buildsize     "9.4 MB (with tests)">
-  <!ENTITY libksba-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libksba" xreflabel="libksba-&libksba-version;">
-  <?dbhtml filename="libksba.html"?>
-
-
-  <title>libksba-&libksba-version;</title>
-
-  <indexterm zone="libksba">
-    <primary sortas="a-libksba">libksba</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libksba</title>
-
-    <para>
-      The <application>Libksba</application> package contains a library
-      used to make X.509 certificates as well as making the CMS (Cryptographic
-      Message Syntax) easily accessible by other applications. Both
-      specifications are building blocks of S/MIME and TLS. The library does
-      not rely on another cryptographic library but provides hooks for easy
-      integration with <application>Libgcrypt</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libksba-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libksba-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libksba-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libksba-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libksba-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libksba-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libksba Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libksba</title>
-
-    <para>
-      Install <application>Libksba</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen><!-- &amp;&amp;
-
-makeinfo - -html - -no-split -o doc/ksba_nochunks.html doc/ksba.texi &amp;&amp;
-makeinfo - -plaintext       -o doc/ksba.txt           doc/ksba.texi</userinput></screen>
-
-    <para>
-      If you wish to build alternate formats of the documentation, you
-      must have <xref linkend="texlive"/> installed,
-      then issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc ps pdf html</userinput></screen> -->
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen><!-- &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/libksba-&libksba-version; &amp;&amp;
-install -v -m644    README doc/ksba{_nochunks.html,.txt,.texi} \
-                    /usr/share/doc/libksba-&libksba-version;</userinput></screen>
-
-    <para>
-      If you built the additional documentation, install it by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba.html/* \
-                    /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba.{pdf,ps,dvi} \
-                    /usr/share/doc/libksba-&libksba-version;</userinput></screen> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg><!--ksba-config not in 1.6.3-->None</seg>
-        <seg>libksba.so</seg>
-        <seg>None<!--/usr/share/doc/libksba-&libksba-version;--></seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-      <!--
-      <varlistentry id="ksba-config">
-        <term><command>ksba-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            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
-          </para>
-          <indexterm zone="libksba ksba-config">
-            <primary sortas="b-ksba-config">ksba-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="libksba-lib">
-        <term><filename class="libraryfile">libksba.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains the cryptographic API functions
-          </para>
-          <indexterm zone="libksba libksba-lib">
-            <primary sortas="c-libksba">libksba.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/liblinear.xml
===================================================================
--- general/genlib/liblinear.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liblinear-download-http "https://github.com/cjlin1/liblinear/archive/v&liblinear-version;/liblinear-&liblinear-version;.tar.gz">
-  <!ENTITY liblinear-download-ftp  " ">
-  <!ENTITY liblinear-md5sum        "0c81dd2b2cabc4fba85f61b9dc51c4a3">
-  <!ENTITY liblinear-size          "560 KB">
-  <!ENTITY liblinear-buildsize     "1.6 MB">
-  <!ENTITY liblinear-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liblinear" xreflabel="liblinear-&liblinear-version;">
-  <?dbhtml filename="liblinear.html"?>
-
-
-  <title>liblinear-&liblinear-version;</title>
-
-  <indexterm zone="liblinear">
-    <primary sortas="a-liblinear">liblinear</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liblinear</title>
-
-    <para>
-      This package provides a library for learning linear classifiers for large
-      scale applications. It supports Support Vector Machines (SVM) with L2 and
-      L1 loss, logistic regression, multi class classification and also Linear
-      Programming Machines (L1-regularized SVMs). Its computational complexity
-      scales linearly with the number of training examples making it one of the
-      fastest SVM solvers around.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        After updating this package from
-        <application>liblinear-1.96</application> or earlier, you need to
-        reinstall <xref linkend="nmap"/>, in order to link to the new library.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liblinear-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liblinear-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liblinear-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liblinear-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liblinear-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liblinear-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liblinear</title>
-
-    <para>
-      Install <application>liblinear</application> by running the following commands:
-    </para>
-
-<screen><userinput>make lib</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>install -vm644 linear.h /usr/include &amp;&amp;
-install -vm755 liblinear.so.5 /usr/lib &amp;&amp;
-ln -sfv liblinear.so.5 /usr/lib/liblinear.so</userinput></screen>
-  </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>
-          liblinear.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblinear-lib">
-        <term><filename class="libraryfile">liblinear.so</filename></term>
-        <listitem>
-          <para>
-            is a large linear classification library
-          </para>
-          <indexterm zone="liblinear liblinear-lib">
-            <primary sortas="c-liblinear">liblinear.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libmbim.xml
===================================================================
--- general/genlib/libmbim.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmbim-download-http "https://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
-  <!ENTITY libmbim-download-ftp  " ">
-  <!ENTITY libmbim-md5sum        "58dea20cad346f31d2873b68385a9973">
-  <!ENTITY libmbim-size          "553 KB">
-  <!ENTITY libmbim-buildsize     "33 MB (with tests)">
-  <!ENTITY libmbim-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;">
-  <?dbhtml filename="libmbim.html"?>
-
-
-  <title>libmbim-&libmbim-version;</title>
-
-  <indexterm zone="libmbim">
-    <primary sortas="a-libmbim">libmbim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmbim</title>
-
-    <para>
-      The <application>libmbim</application> package contains a GLib-based library
-      for talking to WWAN modems and devices which speak the Mobile Interface
-      Broadband Model (MBIM) protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmbim-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmbim-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmbim-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmbim-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmbim-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmbim-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <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>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmbim</title>
-
-    <para>
-      Install <application>libmbim</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mbimcli and mbim-network
-        </seg>
-        <seg>
-          libmbim-glib.so
-        </seg>
-        <seg>
-          /usr/include/libmbim-glib and
-          /usr/share/gtk-doc/html/libmbim-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mbimcli">
-        <term><command>mbimcli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control MBIM devices
-          </para>
-          <indexterm zone="libmbim mbimcli">
-            <primary sortas="b-mbimcli">mbimcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbim-network">
-        <term><command>mbim-network</command></term>
-        <listitem>
-          <para>
-            is an utility used for simple network management
-            of MBIM devices
-          </para>
-          <indexterm zone="libmbim mbim-network">
-            <primary sortas="b-mbim-network">mbim-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmbim-glib">
-        <term><filename class="libraryfile">libmbim-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for talking to WWAN modems and devices
-            which speak the Mobile Interface Broadband Model (MBIM)
-            protocol
-          </para>
-          <indexterm zone="libmbim libmbim-glib">
-            <primary sortas="c-libmbim-glib">libmbim-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libnvme.xml
===================================================================
--- general/genlib/libnvme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libnvme-download-http "https://github.com/linux-nvme/libnvme/archive/v&libnvme-version;/libnvme-&libnvme-version;.tar.gz">
-  <!ENTITY libnvme-download-ftp  " ">
-  <!ENTITY libnvme-md5sum        "ff72b83dc2ada1da0bd528570154eed3">
-  <!ENTITY libnvme-size          "616 KB">
-  <!ENTITY libnvme-buildsize     "13 MB">
-  <!ENTITY libnvme-time          "0.1 SBU (including tests)">
-]>
-
-<sect1 id="libnvme" xreflabel="libnvme-&libnvme-version;">
-  <?dbhtml filename="libnvme.html"?>
-
-  <title>libnvme-&libnvme-version;</title>
-
-  <indexterm zone="libnvme">
-    <primary sortas="a-libnvme">libnvme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnvme</title>
-
-    <para>
-      The <application>libnvme</application> package is a library which
-      provides type definitions for NVMe specification structures,
-      enumerations, and bit fields, helper functions to construct, dispatch,
-      and decode commands and payloads, and utilities to connect, scan, and
-      manage NVMe devices on a Linux system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnvme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnvme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnvme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnvme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnvme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnvme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libnvme Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="json-c"/>,
-      <xref linkend="keyutils"/>, and
-      <xref linkend="swig"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnvme</title>
-
-    <para>
-      Install <application>libnvme</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dlibdbus=auto .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, 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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libnvme.so and
-          libnvme-mi.so
-        </seg>
-        <seg>
-          /usr/include/nvme and
-          /usr/lib/python3.11/site-packages/libnvme
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnvme-lib">
-        <term><filename class="libraryfile">libnvme.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle operations
-            relating to NVMe devices.
-          </para>
-          <indexterm zone="libnvme libnvme-lib">
-            <primary sortas="c-libnvme">libnvme.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,212 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpaper-download-http "https://github.com/rrthomas/libpaper/releases/download/v&libpaper-version;/libpaper-&libpaper-version;.tar.gz">
-  <!ENTITY libpaper-download-ftp  " ">
-  <!ENTITY libpaper-md5sum        "4b914c3ca6d8277260fce418e12bae6b">
-  <!ENTITY libpaper-size          "1.1 MB">
-  <!ENTITY libpaper-buildsize     "11 MB (with tests)">
-  <!ENTITY libpaper-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libpaper" xreflabel="libpaper-&libpaper-version;">
-  <?dbhtml filename="libpaper.html"?>
-
-
-  <title>libpaper-&libpaper-version;</title>
-
-  <indexterm zone="libpaper">
-    <primary sortas="a-libpaper">libpaper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpaper</title>
-
-    <para>
-      This package is intended to provide a simple way for applications to take
-      actions based on a system or user-specified paper size.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpaper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpaper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpaper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpaper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpaper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpaper-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpaper</title>
-
-    <para>
-      Install <application>libpaper</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-static     \
-            --enable-relocatable \
-            --docdir=/usr/share/doc/libpaper-&libpaper-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-relocatable</parameter>:
-      This switch is needed to run the tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring libpaper</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The paper size is automatically determined from the system locale;
-        see <literal>LC_PAPER</literal> in <ulink role='man'
-        url='&man;locale.7'>locale(7)</ulink>.
-        If you want to override it, create a <filename>papersize</filename>
-        file in the user configuration directory.  For example:
-      </para>
-
-<screen role="nodump"><userinput>mkdir -pv ~/.config &amp;&amp;
-echo "a4" &gt; ~/.config/papersize</userinput></screen>
-
-      <para>
-        If you want to override the paper size globally (for all users),
-        set up the <envar>PAPERSIZE</envar> environment variable.  For
-        example:
-      </para>
-
-<screen role="nodump"><userinput>echo "PAPERSIZE=a4" &gt; /etc/profile.d/libpaper.sh</userinput></screen>
-
-      <para>
-        You may use a different paper size, such as
-        <quote><literal>letter</literal></quote>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          paper and
-          paperconf
-        </seg>
-        <seg>
-          libpaper.so
-        </seg>
-        <seg>
-          /usr/share/doc/libpaper-&libpaper-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="paper">
-        <term><command>paper</command></term>
-        <listitem>
-          <para>
-            prints paper configuration information
-          </para>
-          <indexterm zone="libpaper paper">
-            <primary sortas="b-paper">paper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paperconf">
-        <term><command>paperconf</command></term>
-        <listitem>
-          <para>
-            prints paper configuration information in a compatibility mode
-          </para>
-          <indexterm zone="libpaper paperconf">
-            <primary sortas="b-paperconf">paperconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpaper-lib">
-        <term><filename class="libraryfile">libpaper.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for interrogating the paper library
-          </para>
-          <indexterm zone="libpaper libpaper-lib">
-            <primary sortas="c-libpaper">libpaper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libportal.xml
===================================================================
--- general/genlib/libportal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libportal-download-http "https://github.com/flatpak/libportal/releases/download/&libportal-version;/libportal-&libportal-version;.tar.xz">
-  <!ENTITY libportal-download-ftp  " ">
-  <!ENTITY libportal-md5sum        "f94be41e8495ae7d6aaed046481daa61">
-  <!ENTITY libportal-size          "76 KB">
-  <!ENTITY libportal-buildsize     "3.0 MB (with tests)">
-  <!ENTITY libportal-time          "0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libportal" xreflabel="libportal-&libportal-version;">
-  <?dbhtml filename="libportal.html"?>
-
-
-  <title>libportal-&libportal-version;</title>
-
-  <indexterm zone="libportal">
-    <primary sortas="a-libportal">libportal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libportal</title>
-
-    <para>
-      The <application>libportal</application> package provides
-      a library that contains GIO-style async APIs for most Flatpak portals.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libportal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libportal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libportal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libportal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libportal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libportal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (required for running the test suite):
-          <ulink url="&patch-root;/libportal-&libportal-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libportal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/> and
-      <xref linkend="gtk4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="runtime">
-      To make this package really useful, install
-      <xref linkend="xdg-desktop-portal"/>,
-      <xref linkend="xdg-desktop-portal-gtk"/>,
-      <xref role="nodep" linkend="xdg-desktop-portal-gnome"/> (if running
-      a GNOME desktop environment), and
-      <xref role="nodep" linkend="xdg-desktop-portal-lxqt"/> (if running
-      a LXQt desktop environment).  They are not needed if only using this
-      package to satisfy a build dependency.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> (for documentation),
-      <xref linkend="python-dbusmock"/> and
-      <xref linkend="pytest"/> (for testing),
-      &qt5-deps; (for the Qt5 version of libportal), and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libportal</title>
-
-    <warning>
-      <para>
-        If a previous version of libportal is installed, move the
-        headers out of the way so that later packages do not encounter
-        conflicts (as the <systemitem role="username">root</systemitem>
-        user):
-      </para>
-<screen role="root"><userinput>if [ -e /usr/include/libportal ]; then
-    rm -rf /usr/include/libportal.old &amp;&amp;
-    mv -vf /usr/include/libportal{,.old}
-fi</userinput></screen>
-    </warning>
-
-    <para>
-      If running the test suite, apply a patch to fix a dozen of test
-      failures with python-dbusmock 0.30.0 or later:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../libportal-&libportal-version;-testsuite_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>libportal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Ddocs=false .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/output/s/-1/-&libportal-version;/" -i ../doc/meson.build &amp;&amp;
-meson configure -Ddocs=true                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that
-      additional <filename>dbus-daemon</filename> processes may need to be
-      killed after the tests are run.
-    </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>-Ddocs=false</parameter>: &gi-doc-disable;
-    </para>
-
-<!-- These options are now automatically detected, so it doesn't make sense to
-     explicitly set which ones are used (as of version 0.7)
-    <para>
-      <option>-Dbackends=gtk3,gtk4,qt5</option>: This switch allows you to set
-      the available backends. You can use it to disable the dependency on gtk-3,
-      gtk-4, or qt-5. Most applications that use libportal will use either
-      gtk-4 or gtk-3. The default is to build all three backends.
-    </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>
-          libportal.so,
-          libportal-gtk3.so,
-          libportal-gtk4.so, and
-          libportal-qt5.so
-        </seg>
-        <seg>
-          /usr/include/libportal and
-          /usr/share/gtk-doc/html/libportal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libportal-lib">
-        <term><filename class="libraryfile">libportal.so</filename></term>
-        <listitem>
-          <para>
-            provides GIO-style async APIs for most Flatpak portals
-          </para>
-          <indexterm zone="libportal libportal-lib">
-            <primary sortas="c-libportal">libportal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-gtk3">
-        <term><filename class="libraryfile">libportal-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            provides GTK+-3 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-gtk3">
-            <primary sortas="c-libportal-gtk3">libportal-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-gtk4">
-        <term><filename class="libraryfile">libportal-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            provides GTK-4 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-gtk4">
-            <primary sortas="c-libportal-gtk4">libportal-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-qt5">
-        <term><filename class="libraryfile">libportal-qt5.so</filename></term>
-        <listitem>
-          <para>
-            provides Qt5 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-qt5">
-            <primary sortas="c-libportal-qt5">libportal-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/libptytty.xml
===================================================================
--- general/genlib/libptytty.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libptytty-download-http "http://dist.schmorp.de/libptytty/libptytty-&libptytty-version;.tar.gz">
-  <!ENTITY libptytty-download-ftp  " ">
-  <!ENTITY libptytty-md5sum        "2a7f3f3c0d3ef71902da745dc7959529">
-  <!ENTITY libptytty-size          "48 KB">
-  <!ENTITY libptytty-buildsize     "1.4 MB">
-  <!ENTITY libptytty-time          "less than 0.1 SBU">
-
-]>
-
-<sect1 id="libptytty" xreflabel="libptytty-&libptytty-version;">
-  <?dbhtml filename="libptytty.html"?>
-
-
-  <title>libptytty-&libptytty-version;</title>
-
-  <indexterm zone="libptytty">
-    <primary sortas="a-libptytty">libptytty</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libptytty</title>
-
-    <para>
-      The <application>libptytty</application> package provides a library that
-      allows for OS independent and secure pty/tty and utmp/wtmp/lastlog
-      handling.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libptytty-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libptytty-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libptytty-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libptytty-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libptytty-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libptytty-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libptytty Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libptytty</title>
-
-    <para>
-      Install <application>libptytty</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      \
-      -DPT_UTMP_FILE:STRING=/run/utmp \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libptytty.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libptytty-lib">
-        <term><filename class="libraryfile">libptytty.so</filename></term>
-        <listitem>
-          <para>
-            provides for OS independent and secure pty/tty and utmp/wtmp/lastlog handling
-          </para>
-          <indexterm zone="libptytty libptytty-lib">
-            <primary sortas="c-libptytty">libptytty.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/libqalculate.xml
===================================================================
--- general/genlib/libqalculate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqalculate-download-http "https://github.com/Qalculate/libqalculate/releases/download/v&libqalculate-version;/libqalculate-&libqalculate-version;.tar.gz">
-  <!ENTITY libqalculate-download-ftp  " ">
-  <!ENTITY libqalculate-md5sum        "7283e883d79287a57d635bd9ff9a9932">
-  <!ENTITY libqalculate-size          "2.6 MB">
-  <!ENTITY libqalculate-buildsize     "150 MB (with tests)">
-  <!ENTITY libqalculate-time          "0.9 SBU (With tests; both using parallelism=8)">
-]>
-
-<sect1 id="libqalculate" xreflabel="libqalculate-&libqalculate-version;">
-  <?dbhtml filename="libqalculate.html"?>
-
-  <title>libqalculate-&libqalculate-version;</title>
-
-  <indexterm zone="libqalculate">
-    <primary sortas="a-libqalculate">libqalculate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqalculate</title>
-
-    <para>
-      The <application>libqalculate</application> package contains a library
-      that provides functions for a multi-purpose calculator.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqalculate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqalculate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqalculate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqalculate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqalculate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqalculate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqalculate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <ulink url="http://www.gnuplot.info/download.html">gnuplot</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqalculate</title>
-
-    <para>
-      Install <application>libqalculate</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libqalculate-&libqalculate-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/rm-la-file-referring-icu.xml"/>
-
-<screen role="root"><userinput>rm -v /usr/lib/libqalculate.la</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qalc
-        </seg>
-        <seg>
-          libqalculate.so
-        </seg>
-        <seg>
-          /usr/include/libqalculate,
-          /usr/share/doc/libqalculate-&libqalculate-version;, and
-          /usr/share/qalculate
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qalc">
-        <term><command>qalc</command></term>
-        <listitem>
-          <para>
-            is a powerful and easy to use command line calculator
-          </para>
-          <indexterm zone="libqalculate qalc">
-            <primary sortas="b-qalc">qalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqalculate.so">
-        <term><filename class="libraryfile">libqalculate.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libqalculate</application> API functions
-          </para>
-          <indexterm zone="libqalculate libqalculate.so">
-            <primary sortas="c-libqalculate">libqalculate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libqmi.xml
===================================================================
--- general/genlib/libqmi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,216 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqmi-download-http "https://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
-  <!ENTITY libqmi-download-ftp  " ">
-  <!ENTITY libqmi-md5sum        "5ec8838914f80e1dfa4d2fa8cc2f186d">
-  <!ENTITY libqmi-size          "1.2 MB">
-  <!ENTITY libqmi-buildsize     "151 MB (with tests)">
-  <!ENTITY libqmi-time          "0.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;">
-  <?dbhtml filename="libqmi.html"?>
-
-
-  <title>libqmi-&libqmi-version;</title>
-
-  <indexterm zone="libqmi">
-    <primary sortas="a-libqmi">libqmi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqmi</title>
-
-    <para>
-      The <application>libqmi</application> package contains a GLib-based library
-      for talking to WWAN modems and devices which speak the Qualcomm MSM Interface
-      (QMI) protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqmi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqmi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqmi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqmi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqmi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqmi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqmi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libmbim"/>
-    </para>
-
-    <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>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqmi</title>
-
-    <para>
-      Install <application>libqmi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 ./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--disable-mbim-qmux</option>: This switch disables support for
-      using a MBIM control device for QMI messages. Use this switch if you
-      did not install <application>libmbim</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qmicli,
-          qmi-firmware-update,
-          and qmi-network
-        </seg>
-        <seg>
-          libqmi-glib.so
-        </seg>
-        <seg>
-          /usr/include/libqmi-glib and
-          /usr/share/gtk-doc/html/libqmi-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qmicli">
-        <term><command>qmicli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control QMI devices
-          </para>
-          <indexterm zone="libqmi qmicli">
-            <primary sortas="b-qmicli">qmicli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmi-firmware-update">
-        <term><command>qmi-firmware-update</command></term>
-        <listitem>
-          <para>
-            is an utility used to perform firmware updates on QMI devices
-          </para>
-          <indexterm zone="libqmi qmi-firmware-update">
-            <primary sortas="b-qmi-firmware-update">qmi-firmware-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmi-network">
-        <term><command>qmi-network</command></term>
-        <listitem>
-          <para>
-            is an utility used for simple network management
-            of QMI devices
-          </para>
-          <indexterm zone="libqmi qmi-network">
-            <primary sortas="b-qmi-network">qmi-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqmi-glib">
-        <term><filename class="libraryfile">libqmi-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for talking to WWAN modems and devices
-            which speak the Qualcomm MSM Interface (QMI) protocol
-          </para>
-          <indexterm zone="libqmi libqmi-glib">
-            <primary sortas="c-libqmi-glib">libqmi-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libseccomp.xml
===================================================================
--- general/genlib/libseccomp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libseccomp-download-http "https://github.com/seccomp/libseccomp/releases/download/v&libseccomp-version;/libseccomp-&libseccomp-version;.tar.gz">
-  <!ENTITY libseccomp-download-ftp  " ">
-  <!ENTITY libseccomp-md5sum        "c27a5e43cae1e89e6ebfedeea734c9b4">
-  <!ENTITY libseccomp-size          "628 KB">
-  <!ENTITY libseccomp-buildsize     "7.1 MB (additional 4.7 MB for tests)">
-  <!ENTITY libseccomp-time          "less than 0.1 SBU (additional 2.9 SBU for tests)">
-<!-- EDITORS NOTE:
-   This library is heavily dependent on system calls at the time of it's release.
-   This should be tested with every new minor (v4.13, v4.14, etc.) release
-   of the kernel, as it is very finicky and relies on hacks to accomplish
-   it's purpose. -->
-]>
-
-<sect1 id="libseccomp" xreflabel="libseccomp-&libseccomp-version;">
-  <?dbhtml filename="libseccomp.html"?>
-
-
-  <title>libseccomp-&libseccomp-version;</title>
-
-  <indexterm zone="libseccomp">
-    <primary sortas="a-libseccomp">libseccomp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libseccomp</title>
-
-    <para>
-      The <application>libseccomp</application> package provides an easy to use
-      and platform independent interface to the <application>Linux</application>
-      kernel's syscall filtering mechanism.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libseccomp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libseccomp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libseccomp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libseccomp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libseccomp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libseccomp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libseccomp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="which"/> (needed for tests),
-      <xref linkend="valgrind"/>,
-      <!--<xref linkend="cython"/> (for python bindings), -->and
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libseccomp</title>
-
-    <para>
-      Install <application>libseccomp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-<!--
-    <para>
-      <option>- -enable-python</option>: this switch is needed to build
-      python bindings if <xref linkend="cython"/> is installed.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          scmp_sys_resolver
-        </seg>
-        <seg>
-          libseccomp.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scmp_sys_resolver">
-        <term><command>scmp_sys_resolver</command></term>
-        <listitem>
-          <para>
-            is used to resolve system calls for applications
-          </para>
-          <indexterm zone="libseccomp scmp_sys_resolver">
-            <primary sortas="b-scmp_sys_resolver">scmp_sys_resolver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libseccomp-lib">
-        <term><filename class="libraryfile">libseccomp.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for translating syscalls
-          </para>
-          <indexterm zone="libseccomp libseccomp-lib">
-            <primary sortas="c-libseccomp-lib">libseccomp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigc-download-http "&gnome-download-http;/libsigc++/&libsigc-minor;/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  " ">
-  <!ENTITY libsigc-md5sum        "891f1b2dbaebd8007eda8c639bbe1149">
-  <!ENTITY libsigc-size          "4.8 MB">
-  <!ENTITY libsigc-buildsize     "27 MB (with tests)">
-  <!ENTITY libsigc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libsigc" xreflabel="libsigc++-&libsigc-version;">
-  <?dbhtml filename="libsigc.html"?>
-
-
-  <title>libsigc++-&libsigc-version;</title>
-
-  <indexterm zone="libsigc">
-    <primary sortas="a-libsigc++">libsigc++</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++</title>
-
-    <para>
-      The <application>libsigc++</application> package implements a typesafe
-      callback system for standard C++.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="docbook5"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="fop"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++</title>
-
-    <para>
-      Install <application>libsigc++</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </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>
-          libsigc-2.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-2.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-2.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-2">
-        <term><filename class="libraryfile">libsigc-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a typesafe callback system for standard C++
-          </para>
-          <indexterm zone="libsigc libsigc-2">
-            <primary sortas="c-libsigc-2">libsigc-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libsigc++3.xml
===================================================================
--- general/genlib/libsigc++3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigc-download-http "&gnome-download-http;/libsigc++/&libsigc3-minor;/libsigc++-&libsigc3-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  " ">
-  <!ENTITY libsigc-md5sum        "b7205d5465ac15fbc0c781d39b4011be">
-  <!ENTITY libsigc-size          "972 KB">
-  <!ENTITY libsigc-buildsize     "12 MB (with tests)">
-  <!ENTITY libsigc-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="libsigc3" xreflabel="libsigc++-&libsigc3-version;">
-  <?dbhtml filename="libsigc3.html"?>
-
-
-  <title>libsigc++-&libsigc3-version;</title>
-
-  <indexterm zone="libsigc3">
-    <primary sortas="a-libsigc++-3">libsigc++-3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++</title>
-
-    <para>
-      The <application>libsigc++</application> package implements a typesafe
-      callback system for standard C++. This version is part of a new API for
-      supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="docbook5"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="fop"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++</title>
-
-    <para>
-      Install <application>libsigc++</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </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>
-          libsigc-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-3.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-3.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-3">
-        <term><filename class="libraryfile">libsigc-3.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a typesafe callback system for standard C++
-          </para>
-          <indexterm zone="libsigc3 libsigc-3">
-            <primary sortas="c-libsigc-3">libsigc-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libsigsegv.xml
===================================================================
--- general/genlib/libsigsegv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigsegv-download-http "&gnu-http;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
-  <!ENTITY libsigsegv-download-ftp  " ">
-  <!ENTITY libsigsegv-md5sum        "63a2b35f11b2fbccc3d82f9e6c6afd58">
-  <!ENTITY libsigsegv-size          "456 KB">
-  <!ENTITY libsigsegv-buildsize     "3.6 MB (with tests)">
-  <!ENTITY libsigsegv-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libsigsegv" xreflabel="libsigsegv-&libsigsegv-version;">
-  <?dbhtml filename="libsigsegv.html"?>
-
-
-  <title>libsigsegv-&libsigsegv-version;</title>
-
-  <indexterm zone="libsigsegv">
-    <primary sortas="a-libsigsegv">libsigsegv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigsegv</title>
-
-    <para>
-      libsigsegv is a library for handling page faults in user mode. A page fault
-      occurs when a program tries to access to a region of memory that is
-      currently not available. Catching and handling a page fault is a useful
-      technique for implementing pageable virtual memory, memory-mapped access
-      to persistent databases, generational garbage collectors, stack overflow
-      handlers, and distributed shared memory.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigsegv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigsegv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigsegv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigsegv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigsegv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigsegv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigsegv</title>
-
-    <para>
-      Install <application>libsigsegv</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr   \
-            --enable-shared \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch ensures that shared
-      libraries are compiled.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libsigsegv.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigsegv-lib">
-        <term><filename class="libraryfile">libsigsegv.so</filename></term>
-        <listitem>
-          <para>
-            is a library for handling page faults in user mode
-          </para>
-          <indexterm zone="libsigsegv libsigsegv-lib">
-            <primary sortas="c-libsigsegv">libsigsegv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libssh2.xml
===================================================================
--- general/genlib/libssh2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libssh2-download-http "https://www.libssh2.org/download/libssh2-&libssh2-version;.tar.gz">
-  <!ENTITY libssh2-download-ftp  " ">
-  <!ENTITY libssh2-md5sum        "a01d543fd891ca48fe47726540d50b17">
-  <!ENTITY libssh2-size          "1.1 MB">
-  <!ENTITY libssh2-buildsize     "13 MB (with tests)">
-  <!ENTITY libssh2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libssh2" xreflabel="libssh2-&libssh2-version;">
-  <?dbhtml filename="libssh2.html"?>
-
-
-  <title>libssh2-&libssh2-version;</title>
-
-  <indexterm zone="libssh2">
-    <primary sortas="a-libssh2">libssh2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libssh2</title>
-
-    <para>
-      <application>Libssh2</application> package is a client-side C library
-      implementing the SSH2 protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libssh2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libssh2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libssh2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libssh2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libssh2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libssh2-time;
-        </para>
-      </listitem>
-    </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>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cmake"/> (can be used instead of the
-      <command>configure</command> script),
-      <xref linkend="libgcrypt"/> (can be used instead of OpenSSL),
-      <xref linkend="openssh"/> (for some tests), and
-      <ulink url='https://www.docker.com'>Docker</ulink> (for some tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libssh2</title>
-
-    <para>
-      <!-- the Terrapin attack -->
-      First, fix a critical security vulnerability in libssh2:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libssh2-&libssh2-version;-security_fixes-1.patch</userinput></screen>
-
-    <para>
-      If you want to test the package, exclude the tests requiring a static
-      library:
-    </para>
-
-<screen><userinput>sed -E '/^DOCKER_TEST/,/^SSHD_TEST/s/test_(auth_keyboard_info.* |hostkey |simple)/$(NOTHING)/' \
-    -i tests/Makefile.inc &amp;&amp;
-autoreconf -fi</userinput></screen>
-
-    <para>
-      Install <application>libssh2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --disable-docker-tests \
-            --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-docker-tests</parameter>: Disable the tests
-      requiring Docker, which is beyond the scope of BLFS.  Remove this
-      switch if you've installed Docker and you wish to run the test suite.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libssh2.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libssh2-lib">
-        <term><filename class="libraryfile">libssh2.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to use the SSH2 protocol
-          </para>
-          <indexterm zone="libssh2 libssh2-lib">
-            <primary sortas="c-libssh2">libssh2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/libstatgrab.xml
===================================================================
--- general/genlib/libstatgrab.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libstatgrab-download-http "https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
-  <!ENTITY libstatgrab-download-ftp  " ">
-  <!ENTITY libstatgrab-md5sum        "af685494e985229e0ac46365bc0cd50e">
-  <!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)">
-]>
-
-<sect1 id="libstatgrab" xreflabel="libstatgrab-&libstatgrab-version;">
-  <?dbhtml filename="libstatgrab.html"?>
-
-
-  <title>libstatgrab-&libstatgrab-version;</title>
-
-  <indexterm zone="libstatgrab">
-    <primary sortas="a-libstatgrab">libstatgrab</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libstatgrab</title>
-
-    <para>
-      This is a library that provides cross platform access to statistics about
-      the system on which it's run. It's written in C and presents a selection
-      of useful interfaces which can be used to access key system statistics.
-      The current list of statistics includes CPU usage, memory utilisation,
-      disk usage, process counts, network traffic, disk I/O, and more.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libstatgrab-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libstatgrab-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libstatgrab-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libstatgrab-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libstatgrab-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libstatgrab-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libstatgrab Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="log4cplus"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libstatgrab</title>
-
-    <para>
-      Install <application>libstatgrab</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr   \
-            --disable-static \
-            --docdir=/usr/share/doc/libstatgrab-&libstatgrab-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          saidar, statgrab, statgrab-make-mrtg-config, and
-          statgrab-make-mrtg-index
-        </seg>
-        <seg>
-          libstatgrab.so
-        </seg>
-        <seg>
-          /usr/share/doc/libstatgrab-&libstatgrab-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="saidar">
-        <term><command>saidar</command></term>
-        <listitem>
-          <para>
-            is a curses-based tool for viewing system statistics
-          </para>
-          <indexterm zone="libstatgrab saidar">
-            <primary sortas="b-saidar">saidar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab">
-        <term><command>statgrab</command></term>
-        <listitem>
-          <para>
-            is a sysctl-style interface to system statistics
-          </para>
-          <indexterm zone="libstatgrab statgrab">
-            <primary sortas="b-statgrab">statgrab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab-make-mrtg-config">
-        <term><command>statgrab-make-mrtg-config</command></term>
-        <listitem>
-          <para>
-            generates MRTG configuration
-          </para>
-          <indexterm zone="libstatgrab statgrab-make-mrtg-config">
-            <primary sortas="b-statgrab-make-mrtg-config">statgrab-make-mrtg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab-make-mrtg-index">
-        <term><command>statgrab-make-mrtg-index</command></term>
-        <listitem>
-          <para>
-            generates an XHTML index page from MRTG configuration files or
-            stdin
-          </para>
-          <indexterm zone="libstatgrab statgrab-make-mrtg-index">
-            <primary sortas="b-statgrab-make-mrtg-index">statgrab-make-mrtg-index</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstatgrab-lib">
-        <term><filename class="libraryfile">libstatgrab.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libstatgrab</application> API functions
-          </para>
-          <indexterm zone="libstatgrab libstatgrab-lib">
-            <primary sortas="c-libstatgrab">libstatgrab.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libtasn1-download-http "&gnu-http;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
-  <!ENTITY libtasn1-download-ftp  " ">
-  <!ENTITY libtasn1-md5sum        "f701ab57eb8e7d9c105b2cd5d809b29a">
-  <!ENTITY libtasn1-size          "1.7 MB">
-  <!ENTITY libtasn1-buildsize     "17 MB (with tests)">
-  <!ENTITY libtasn1-time          "0.8 SBU (with tests)">
-]>
-
-<sect1 id="libtasn1" xreflabel="libtasn1-&libtasn1-version;">
-  <?dbhtml filename="libtasn1.html"?>
-
-
-  <title>libtasn1-&libtasn1-version;</title>
-
-  <indexterm zone="libtasn1">
-    <primary sortas="a-libtasn1">libtasn1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtasn1</title>
-
-    <para>
-      <application>libtasn1</application> is a highly portable C library
-      that encodes and decodes DER/BER data following an ASN.1 schema.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtasn1-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtasn1-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtasn1-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtasn1-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtasn1-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtasn1-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libtasn1 Dependencies</bridgehead>
-
-<!-- does not seem to be needed anymore:
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="six"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtasn1</title>
-
-    <para>
-      Install <application>libtasn1</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not pass the <option>--enable-gtk-doc</option> parameter
-      to the <command>configure</command> script, you can install the API
-      documentation using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C doc/reference install-data-local</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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild-problem.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          asn1Coding, asn1Decoding and asn1Parser
-        </seg>
-        <seg>
-          libtasn1.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/libtasn1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asn1Coding">
-        <term><command>asn1Coding</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 DER encoder
-          </para>
-          <indexterm zone="libtasn1 asn1Coding">
-            <primary sortas="b-asn1Coding">asn1Coding</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asn1Decoding">
-        <term><command>asn1Decoding</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 DER decoder
-          </para>
-          <indexterm zone="libtasn1 asn1Decoding">
-            <primary sortas="b-asn1Decoding">asn1Decoding</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asn1Parser">
-        <term><command>asn1Parser</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 syntax tree generator for
-            <application>libtasn1</application>
-          </para>
-          <indexterm zone="libtasn1 asn1Parser">
-            <primary sortas="b-asn1Parser">asn1Parser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtasn1-lib">
-        <term><filename class="libraryfile">libtasn1.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Abstract Syntax Notation One (ASN.1) and
-            Distinguish Encoding Rules (DER) manipulation
-          </para>
-          <indexterm zone="libtasn1 libtasn1-lib">
-            <primary sortas="c-libtasn1">libtasn1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libunistring.xml
===================================================================
--- general/genlib/libunistring.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libunistring-download-http "&gnu-http;/libunistring/libunistring-&libunistring-version;.tar.xz">
-  <!ENTITY libunistring-download-ftp  " ">
-  <!ENTITY libunistring-md5sum        "6b4ea63617bf09d76e5234379e75e7f9">
-  <!ENTITY libunistring-size          "2.4 MB">
-  <!ENTITY libunistring-buildsize     "54 MB (add 56 MB for tests)">
-  <!ENTITY libunistring-time          "0.5 SBU; add 0.3 SBU for tests; both using parallelism=4">
-]>
-
-<sect1 id="libunistring" xreflabel="libunistring-&libunistring-version;">
-  <?dbhtml filename="libunistring.html"?>
-
-
-  <title>libunistring-&libunistring-version;</title>
-
-  <indexterm zone="libunistring">
-    <primary sortas="a-libunistring">libunistring</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunistring</title>
-
-    <para>
-      <application>libunistring</application> is a library that provides
-      functions for manipulating Unicode strings and for manipulating C
-      strings according to the Unicode standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunistring-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunistring-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunistring-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunistring-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunistring-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunistring-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunistring Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      (to rebuild the documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunistring</title>
-
-    <para>
-      Install <application>libunistring</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libunistring-&libunistring-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libunistring.so</seg>
-        <seg>
-          /usr/include/unistring and
-          /usr/share/doc/libunistring-&libunistring-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunistring-lib">
-        <term><command>libunistring.so</command></term>
-        <listitem>
-          <para>
-            provides the unicode string library API
-          </para>
-          <indexterm zone="libunistring libunistring-lib">
-            <primary sortas="c-libunistring-lib">libunistring.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libunwind.xml
===================================================================
--- general/genlib/libunwind.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libunwind-download-http "https://download.savannah.nongnu.org/releases/libunwind/libunwind-&libunwind-version;.tar.gz">
-  <!ENTITY libunwind-download-ftp  " ">
-  <!ENTITY libunwind-md5sum        "f625b6a98ac1976116c71708a73dc44a">
-  <!ENTITY libunwind-size          "884 KB">
-  <!ENTITY libunwind-buildsize     "20 MB (with tests)">
-  <!ENTITY libunwind-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libunwind" xreflabel="libunwind-&libunwind-version;">
-  <?dbhtml filename="libunwind.html"?>
-
-  <title>libunwind-&libunwind-version;</title>
-
-  <indexterm zone="libunwind">
-    <primary sortas="a-libunwind">libunwind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunwind</title>
-
-    <para>
-      The <application>libunwind</application> package contains a portable and
-      efficient C programming interface (API) to determine the call-chain of a
-      program. The API additionally provides the means to manipulate the
-      preserved (callee-saved) state of each call-frame and to resume execution
-      at any point in the call-chain (non-local goto). The API supports both
-      local (same-process) and remote (across-process) operation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunwind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunwind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunwind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunwind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunwind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunwind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunwind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (for latex2man)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunwind</title>
-
-    <para>
-      Install <application>libunwind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  Two
-      tests, run-coredump-unwind and run-coredump-unwind-mdi are known
-      to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libunwind.so,
-          libunwind-coredump.so,
-          libunwind-generic.so,
-          libunwind-ptrace.so,
-          libunwind-setjmp.so, and
-          libunwind-x86_64.so (libunwind-x86.so on i686)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/liburcu.xml
===================================================================
--- general/genlib/liburcu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liburcu-download-http "https://lttng.org/files/urcu/userspace-rcu-&liburcu-version;.tar.bz2">
-  <!ENTITY liburcu-download-ftp  " ">
-  <!ENTITY liburcu-md5sum        "0cd5647788b048a5d6bbdb3b08d46299">
-  <!ENTITY liburcu-size          "648 KB">
-  <!ENTITY liburcu-buildsize     "25 MB (with tests)">
-  <!ENTITY liburcu-time          "0.2 SBU (with tests)">
-
-]>
-
-<sect1 id="liburcu" xreflabel="liburcu-&liburcu-version;">
-  <?dbhtml filename="liburcu.html"?>
-
-
-  <title>liburcu-&liburcu-version;</title>
-
-  <indexterm zone="liburcu">
-    <primary sortas="a-liburcu">liburcu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liburcu</title>
-
-    <para>
-      The <application>userspace-rcu</application> package provides
-      a set of userspace RCU (read-copy-update) libraries. These data synchronization
-      libraries provide read-side access which scales linearly with the number of cores.
-      It does so by allowing multiples copies of a given data structure to live at
-      the same time, and by monitoring the data structure accesses to detect grace
-      periods after which memory reclamation is possible.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liburcu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liburcu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liburcu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liburcu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liburcu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liburcu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liburcu</title>
-
-    <para>
-      Install <application>liburcu</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/liburcu-&liburcu-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liburcu.so,
-          liburcu-bp.so,
-          liburcu-cds.so,
-          liburcu-common.so,
-          liburcu-mb.so,
-          liburcu-memb.so,
-          liburcu-qsbr.so, and
-          liburcu-signal.so
-        </seg>
-        <seg>
-          /usr/include/urcu and
-          /usr/share/doc/liburcu-&liburcu-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liburcu-lib">
-        <term><filename class="libraryfile">liburcu.so</filename></term>
-        <listitem>
-          <para>
-            provides for
-          </para>
-          <indexterm zone="liburcu liburcu-lib">
-            <primary sortas="c-liburcu">liburcu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: neral/genlib/libusb-kernel.xml
===================================================================
--- general/genlib/libusb-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>U</emphasis>SB support ---&gt;                                             [USB_SUPPORT]
-    &lt;*/M&gt;   <emphasis role='blue'>S</emphasis>upport for Host-side USB                                      [USB]
-    [*]     <emphasis role='blue'>P</emphasis>CI based USB host interface                               [USB_PCI]
-    # These are most common USB controller drivers for PC-like systems.
-    # For modern systems often [USB_XHCI_HCD] is the only one needed
-    # even if the system has USB 2.0 ports:
-    &lt; /*/M&gt; <emphasis role='blue'>x</emphasis>HCI HCD (USB 3.0) support                            [USB_XHCI_HCD]
-    &lt; /*/M&gt; <emphasis role='blue'>E</emphasis>HCI HCD (USB 2.0) support                            [USB_EHCI_HCD]
-    &lt; /*/M&gt; <emphasis role='blue'>O</emphasis>HCI HCD (USB 1.1) support                            [USB_OHCI_HCD]</screen>
Index: neral/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libusb-download-http "https://github.com/libusb/libusb/releases/download/v&libusb-version;/libusb-&libusb-version;.tar.bz2">
-  <!ENTITY libusb-download-ftp  " ">
-  <!ENTITY libusb-md5sum        "1fb61afe370e94f902a67e03eb39c51f">
-  <!ENTITY libusb-size          "632 KB">
-  <!ENTITY libusb-buildsize     "5.7 MB">
-  <!ENTITY libusb-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libusb" xreflabel="libusb-&libusb-version;">
-  <?dbhtml filename="libusb.html"?>
-
-
-  <title>libusb-&libusb-version;</title>
-
-  <indexterm zone="libusb">
-    <primary sortas="a-libusb">libusb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libusb</title>
-
-    <para>
-      The <application>libusb</application> package contains a library
-      used by some applications for USB device access.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libusb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libusb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libusb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libusb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libusb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libusb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libusb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel">
-    <title>Configuring Libusb</title>
-
-    <para id="libusb-kernel">
-      To access raw USB devices (those not treated as a disk by the mass-storage
-      driver), appropriate support must be available in the kernel.  Check your
-      kernel configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="libusb-kernel.xml"/>
-
-    <indexterm zone="libusb libusb-kernel">
-      <primary sortas="d-USB-device-filesystem">Support for Host-side USB</primary>
-    </indexterm>
-
-    <para>
-      For more details on setting up USB devices, see <xref
-      linkend="usb-device-issues"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libusb</title>
-
-    <para>
-      Install <application>libusb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If <application>Doxygen</application> is installed and you wish to
-      build the API documentation, issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>pushd doc                &amp;&amp;
-  doxygen -u doxygen.cfg &amp;&amp;
-  make docs              &amp;&amp;
-popd</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>
-
-    <para>
-      If you built the API documentation, install it using the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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/* \
-                    /usr/share/doc/libusb-&libusb-version;/apidocs</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: This sed prevents some warnings when
-      building the documentation.
-    </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>
-          libusb-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libusb-1.0 and
-          /usr/share/doc/libusb-&libusb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libusb-lib">
-        <term><filename class="libraryfile">libusb-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used for accessing USB hardware
-          </para>
-          <indexterm zone="libusb libusb-lib">
-            <primary sortas="c-libusb">libusb-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libuv.xml
===================================================================
--- general/genlib/libuv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libuv-download-http "https://dist.libuv.org/dist/v&libuv-version;/libuv-v&libuv-version;.tar.gz">
-  <!ENTITY libuv-download-ftp  " ">
-  <!ENTITY libuv-md5sum        "a808517c32ebd07c561bf21a4e30aeab">
-  <!ENTITY libuv-size          "1.3 MB">
-  <!ENTITY libuv-buildsize     "14 MB (add 16 MB for tests)">
-  <!ENTITY libuv-time          "less than 0.1 SBU (add 0.5 SBU for tests)">
-]>
-
-<sect1 id="libuv" xreflabel="libuv-&libuv-version;">
-  <?dbhtml filename="libuv.html"?>
-
-
-  <title>libuv-&libuv-version;</title>
-
-  <indexterm zone="libuv">
-    <primary sortas="a-libuv">libuv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libuv</title>
-
-    <para>
-      The <application>libuv</application> package is a
-      multi-platform support library with a focus on asynchronous I/O.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libuv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libuv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libuv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libuv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libuv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libuv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libuv Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="???"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libuv</title>
-
-    <para>
-      Install <application>libuv</application> by running the following
-      commands:
-    </para>
-
-    <caution>
-      <para>
-        The <command>sh autogen.sh</command> command below fails if the ACLOCAL
-        environment variable is set as specified in <xref linkend="xorg7"/>.
-        If it is used, ACLOCAL needs to be unset for this package and then
-        reset for other packages.
-      </para>
-    </caution>
-
-<!--
-Don't use cmake here to avoid circular dependency
-
-<screen><userinput>sed -i "/TARGETS uv_a ARCHIVE/d" CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make </userinput></screen>
--->
-
-<screen><userinput>sh autogen.sh                              &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make </userinput></screen>
-
-    <para>
-      If you installed the optional <xref linkend="sphinx"/> python module,
-      create the man page:
-    </para>
-
-<screen remap="doc"><userinput>make man -C docs</userinput></screen>
-
-    <para>
-      If you want to run the tests, run: <command>make check</command> as
-      a non-root user. <!-- the test suite refuses to run as root -->
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
- 
-    <para>
-      If you built the man page, install it  as the &root; user:
-    </para>
-    
-<screen role="root" remap="doc"><userinput>install -Dm644 docs/build/man/libuv.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: This command disables installation
-      of the static library.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libuv.so
-        </seg>
-        <seg>
-          /usr/include/uv
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libuv.so">
-        <term><filename class="libraryfile">libuv.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for asynchronous I/O operations
-          </para>
-          <indexterm zone="libuv libuv.so">
-            <primary sortas="c-libuv.so">libuv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libwacom-download-http "https://github.com/linuxwacom/libwacom/releases/download/libwacom-&libwacom-version;/libwacom-&libwacom-version;.tar.xz">
-  <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "fa489522c2b5f014360f44a3e38a30f8">
-  <!ENTITY libwacom-size          "116 KB">
-  <!ENTITY libwacom-buildsize     "3.6 MB (with tests)">
-  <!ENTITY libwacom-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;">
-  <?dbhtml filename="libwacom.html"?>
-
-
-  <title>libwacom-&libwacom-version;</title>
-
-  <indexterm zone="libwacom">
-    <primary sortas="a-libwacom">libwacom</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwacom</title>
-
-    <para>
-      The <application>libwacom</application> package contains a library used
-      to identify wacom tablets and their model-specific features.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwacom-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwacom-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwacom-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwacom-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwacom-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwacom-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwacom Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="git"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="valgrind"/> (optional for some tests), and
-      <xref linkend="pytest"/> with
-      <ulink url="https://pypi.org/project/libevdev/">python-libevdev</ulink> and
-      <ulink url="https://pypi.org/project/pyudev/">pyudev</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwacom</title>
-
-<!--  Fixed in libwacom-1.7
-    <para>
-      First, adapt the udev rules to upstream udev/kernel changes:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/ACTION!="add|change"/ACTION=="remove"/' tools/65-libwacom.rules.in</userinput></screen>
--->
-
-    <para>
-      Install <application>libwacom</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dtests=disabled    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      To run additional tests, install
-      <xref linkend="pytest"/>, python-libevdev, and pyudev, then remove
-      the "-Dtests=disabled" option from the meson line above.
-    </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>-Dtests=disabled</parameter>: This parameter disables some of
-      the more advanced tests because they require <xref linkend="pytest"/> and
-      other two Python modules beyond the scope of BLFS to work properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libwacom-list-devices,
-          libwacom-list-local-devices,
-          libwacom-show-stylus, and
-          libwacom-update-db
-        </seg>
-        <seg>
-          libwacom.so
-        </seg>
-        <seg>
-          /usr/include/libwacom-1.0 and
-          /usr/share/libwacom
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?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
-          </para>
-          <indexterm zone="libwacom libwacom-list-local-devices">
-            <primary sortas="b-libwacom-list-local-devices">libwacom-list-local-devices</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="libwacom libwacom-lib">
-            <primary sortas="c-libwacom">libwacom.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxkbcommon-download-http "https://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
-  <!ENTITY libxkbcommon-download-ftp  " ">
-  <!ENTITY libxkbcommon-md5sum        "b05b1a0d473189efb2dd995dd944f152">
-  <!ENTITY libxkbcommon-size          "524 KB">
-  <!ENTITY libxkbcommon-buildsize     "26 MB (with tests)">
-  <!ENTITY libxkbcommon-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="libxkbcommon" xreflabel="libxkbcommon-&libxkbcommon-version;">
-  <?dbhtml filename="libxkbcommon.html"?>
-
-
-  <title>libxkbcommon-&libxkbcommon-version;</title>
-
-  <indexterm zone="libxkbcommon">
-    <primary sortas="a-libxkbcommon">libxkbcommon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxkbcommon</title>
-
-    <para>
-      <application>libxkbcommon</application> is a keymap compiler and
-      support library which processes a reduced subset of keymaps as
-      defined by the XKB specification.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxkbcommon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxkbcommon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxkbcommon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxkbcommon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxkbcommon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxkbcommon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxkbcommon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="xkeyboard-config"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref linkend="libxcb"/>,
-       <xref linkend="wayland"/>, and
-       <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-       <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxkbcommon</title>
-
-    <para>
-      Install <application>libxkbcommon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Denable-docs=false &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>
-
-    <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/static-libraries.xml"/>
-
-    <para>
-      <option>- -disable-x11</option>: Use this switch if you
-      have not installed <xref linkend="libxcb"/> and
-      don't need the <filename>libxkbcommon-x11.so</filename>
-      library.
-    </para>
-    -->
-
-    <para>
-      <parameter>-Denable-docs=true</parameter>: This switch enables
-      documentation generation. The <xref linkend="doxygen"/> is
-      required.
-    </para>
-
-    <para>
-      <command>mv -v /usr/share/doc/libxkbcommon{,-&libxkbcommon-version;}</command>:
-      If you built the documentation, use this command to install the
-      it in a versioned directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xkbcli
-        </seg>
-        <seg>
-          libxkbcommon.so,
-          libxkbcommon-x11.so, and
-          libxkbregistry.so
-        </seg>
-        <seg>
-          /usr/include/xkbcommon,
-          /usr/libexec/xkbcommon, and
-          /usr/share/doc/libxkbcommon-&libxkbcommon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xkbcli">
-        <term><command>xkbcli</command></term>
-        <listitem>
-          <para>
-            provides a debugger and compiler for XKB keymaps
-          </para>
-          <indexterm zone="libxkbcommon xkbcli">
-            <primary sortas="b-xkbcli">xkbcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbcommon-lib">
-        <term><filename class="libraryfile">libxkbcommon.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libxkbcommon</application> API functions
-          </para>
-          <indexterm zone="libxkbcommon libxkbcommon-lib">
-            <primary sortas="c-libxkbcommon">libxkbcommon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbcommon-x11">
-        <term><filename class="libraryfile">libxkbcommon-x11.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libxkbcommon</application> X11 specific API
-            functions
-          </para>
-          <indexterm zone="libxkbcommon libxkbcommon-x11">
-            <primary sortas="c-libxkbcommon-x11">libxkbcommon-x11.so</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="libxkbregistry">
-       <term><filename class="libraryfile">libxkbregistry.so</filename></term>
-       <listitem>
-         <para>
-           contains a list of available XKB models, layouts, and variants for a
-           given ruleset
-         </para>
-         <indexterm zone="libxkbcommon libxkbregistry">
-           <primary sortas="c-libxkbregistry">libxkbregistry.so</primary>
-         </indexterm>
-       </listitem>
-     </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libxml.xml
===================================================================
--- general/genlib/libxml.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libxml.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="libxml" xreflabel="libxml-&libxml-version;">
+<?dbhtml filename="libxml.html" dir="general"?>
+<title>libxml-&libxml-version;</title>
+
+&libxml-intro;
+&libxml-inst;
+&libxml-config;
+&libxml-desc;
+
+</sect1>
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/genlib/libxml2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,295 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libxml2" xreflabel="libxml2-&libxml2-version;">
+<?dbhtml filename="libxml2.html" dir="general"?>
+<title>libxml2-&libxml2-version;</title>
 
-  <!-- Also update the download, md5, size entities in libxml2py2.xml -->
-  <!ENTITY libxml2-download-http "https://download.gnome.org/sources/libxml2/2.12/libxml2-&libxml2-version;.tar.xz">
-<!--  <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.xz">-->
-  <!ENTITY libxml2-download-ftp  " ">
-  <!ENTITY libxml2-md5sum        "37fab9ace78d8a085af81dc9a19f36d9">
-  <!ENTITY libxml2-size          "2.5 MB">
-  <!ENTITY libxml2-buildsize     "103 MB (with tests)">
-  <!ENTITY libxml2-time          "0.4 SBU (Using parallelism=4; with tests)">
-  <!ENTITY testsuite-version     "20130923">
-]>
-
-<sect1 id="libxml2" xreflabel="libxml2-&libxml2-version;">
-  <?dbhtml filename="libxml2.html"?>
-
-
-  <title>libxml2-&libxml2-version;</title>
-
-  <indexterm zone="libxml2">
-    <primary sortas="a-libxml2">libxml2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxml2</title>
-
-    <para>
-      The <application>libxml2</application> package contains libraries
-      and utilities used for parsing XML files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxml2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxml2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxml2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxml2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxml2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxml2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional Test Suite:
-          <ulink url="https://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
-          enables <command>make check</command> to do complete testing.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (may be used in the tests)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxml2</title>
-
-    <para>
-      Install <application>libxml2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --disable-static        \
-            --with-history          \
-            --with-icu              \
-            PYTHON=/usr/bin/python3 \
-            --docdir=/usr/share/doc/libxml2-&libxml2-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you downloaded the test suite, issue the following command:
-    </para>
-
-<screen><userinput>tar xf ../xmlts&testsuite-version;.tar.gz</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check &gt; check.log</command>.
-      This command will print several lines of error messages like
-      <quote><computeroutput>Failed to parse
-      xstc/...</computeroutput></quote> because some test files are missing
-      and these messages can be safely ignored.
-      A summary of the results can be obtained with <command>grep -E
-      '^Total|expected|Ran' check.log</command>. If <xref linkend="valgrind"/> is
-      installed and you want to check for memory leaks, replace
-      <command>check</command> with <command>check-valgrind</command>.
-    </para>
-
-    <note>
-      <para>
-        The tests use <ulink url="http://localhost/">http://localhost/</ulink>
-        to test parsing of external entities. If the machine where you run the
-        tests serves as a web site, the tests may hang, depending on the
-        content of the file served. It is therefore recommended to shut down
-        the server during the tests, as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump" revision="sysv"><userinput>/etc/init.d/httpd stop</userinput></screen>
-<screen role="nodump" revision="systemd"><userinput>systemctl stop httpd.service</userinput></screen>
-
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, prevent some packages from unnecessarily linking to ICU using
-      the following commands as the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -vf /usr/lib/libxml2.la &amp;&amp;
-sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</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>
-      <parameter>--with-history</parameter>: This switch enables
-      <application>Readline</application> support when running
-      <command>xmlcatalog</command> or <command>xmllint</command> in shell mode.
-    </para>
-
-    <para>
-      <parameter>--with-icu</parameter>: This switch enables support for
-      <application>ICU</application>, which provides additional Unicode support.
-      This is needed for some packages in BLFS, such as for QtWebEngine.
-    </para>
-
-    <para>
-      <parameter>PYTHON=/usr/bin/python3</parameter>: Allows building
-      the libxml2 module with Python3 instead of Python2.
-    </para>
-
-<!--
-    <para>
-      <option>- -with-icu</option>: Add this switch if you have built
-      <xref linkend="icu"/>, for better unicode support.
-    </para>
-
-    <note>
-      <para>
-        If the <option>- -with-icu</option> switch is used, the BLFS editors
-        recommend removing unneeded references to the ICU libraries. This
-        will prevent many packages that use libxml2 from unnecessarily linking
-        to the ICU libraries.  This, in turn, will prevent the need for
-        rebuilding many packages when upgrading ICU to a new major version.
-        After installing libxml2, as the &root; user, issue:
-      </para>
-
-<screen role="nodump"><userinput>rm -vf /usr/lib/libxml2.la &amp;&amp;
-sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</userinput></screen>
-    </note>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xml2-config,
-          xmlcatalog, and
-          xmllint
-        </seg>
-        <seg>
-          libxml2.so
-        </seg>
-        <seg>
-          /usr/include/libxml2,
-          /usr/lib/cmake/libxml2,
-          /usr/share/doc/libxml2-&libxml2-version;, and
-          /usr/share/gtk-doc/html/libxml2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xml2-config">
-        <term><command>xml2-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use
-            <filename class="libraryfile">libxml2</filename>
-          </para>
-          <indexterm zone="libxml2 xml2-config">
-            <primary sortas="b-xml2-config">xml2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlcatalog">
-        <term><command>xmlcatalog</command></term>
-        <listitem>
-          <para>
-            is used to monitor and manipulate XML and SGML catalogs
-          </para>
-          <indexterm zone="libxml2 xmlcatalog">
-            <primary sortas="b-xmlcatalog">xmlcatalog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmllint">
-        <term><command>xmllint</command></term>
-        <listitem>
-          <para>
-            parses XML files and outputs reports (based upon options) to detect
-            errors in XML coding
-          </para>
-          <indexterm zone="libxml2 xmllint">
-            <primary sortas="b-xmllint">xmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2-lib">
-        <term><filename class="libraryfile">libxml2.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for programs to parse files that use the XML
-            format
-          </para>
-          <indexterm zone="libxml2 libxml2-lib">
-            <primary sortas="c-libxml2">libxml2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libxml2-intro;
+&libxml2-inst;
+&libxml2-config;
+&libxml2-desc;
 
 </sect1>
+
Index: neral/genlib/libxmlb.xml
===================================================================
--- general/genlib/libxmlb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxmlb-download-http "https://github.com/hughsie/libxmlb/releases/download/&libxmlb-version;/libxmlb-&libxmlb-version;.tar.xz">
-  <!ENTITY libxmlb-download-ftp  " ">
-  <!ENTITY libxmlb-md5sum        "0749fbcd7179b800c68ed8a6aa31cb74">
-  <!ENTITY libxmlb-size          "104 KB">
-  <!ENTITY libxmlb-buildsize     "3.8 MB">
-  <!ENTITY libxmlb-time          "0.1 SBU">
-]>
-
-<sect1 id="libxmlb" xreflabel="libxmlb-&libxmlb-version;">
-  <?dbhtml filename="libxmlb.html"?>
-
-  <title>libxmlb-&libxmlb-version;</title>
-
-  <indexterm zone="libxmlb">
-    <primary sortas="a-libxmlb">libxmlb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxmlb</title>
-
-    <para>
-      The <application>libxmlb</application> package contains a library and
-      a tool which help create and query binary XML blobs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxmlb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxmlb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxmlb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxmlb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxmlb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxmlb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxmlb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/libxmlb"/>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxmlb</title>
-
-    <para>
-      Install <application>libxmlb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dgtkdoc=false .. &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-    
-<!-- Over in meson_options.txt, gtkdoc is set to 'true' by default. This would
-     introduce a dependency on gtk-doc, so let's set it as 'false' and let the
-     user enable it if they want the documentation. -renodr -->
-    <para>
-      <parameter>-Dgtkdoc=false</parameter>: This switch disables building the
-      API documentation. Remove it if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to build the
-      API documentation.
-    </para>
-
-    <para>
-      <option>-Dintrospection=false</option>: Use this switch if you do not
-      have built <xref linkend='glib2'/> with GObject Introspection.
-    </para>
-
-    <para>
-      <option>-Dstemmer=true</option>: Use this switch if you have
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-      installed and wish to build stemmer support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xb-tool
-        </seg>
-        <seg>
-          libxmlb.so
-        </seg>
-        <seg>
-          /usr/include/libxmlb-2,
-          /usr/libexec/installed-tests/libxmlb, and
-          /usr/share/gtk-doc/html/libxmlb (if gtk-doc was enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xb-tool">
-        <term><command>xb-tool</command></term>
-        <listitem>
-          <para>
-            is a tool used to create, dump, or query a binary XML blob
-          </para>
-          <indexterm zone="libxmlb xb-tool">
-            <primary sortas="b-xb-tool">xb-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxmlb-lib">
-        <term><filename class="libraryfile">libxmlb.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow for creating and querying binary XML
-            blobs
-          </para>
-          <indexterm zone="libxmlb libxmlb-lib">
-            <primary sortas="c-libxmlb">libxmlb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/libxslt.xml
===================================================================
--- general/genlib/libxslt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/genlib/libxslt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,232 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libxslt" xreflabel="libxslt-&libxslt-version;">
+<?dbhtml filename="libxslt.html" dir="general"?>
+<title>libxslt-&libxslt-version;</title>
 
-  <!ENTITY libxslt-download-http "https://download.gnome.org/sources/libxslt/1.1/libxslt-&libxslt-version;.tar.xz">
-  <!ENTITY libxslt-download-ftp  " ">
-  <!ENTITY libxslt-md5sum        "22e9eb7c23825124e786611b3760a3c7">
-  <!ENTITY libxslt-size          "1.5 MB">
-  <!ENTITY libxslt-buildsize     "34 MB (with tests)">
-  <!ENTITY libxslt-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libxslt" xreflabel="libxslt-&libxslt-version;">
-  <?dbhtml filename="libxslt.html"?>
-
-
-  <title>libxslt-&libxslt-version;</title>
-
-  <indexterm zone="libxslt">
-    <primary sortas="a-libxslt">libxslt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxslt</title>
-
-    <para>
-      The <application>libxslt</application> package contains
-      XSLT libraries used for extending <filename
-      class="libraryfile">libxml2</filename> libraries to
-      support XSLT files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxslt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxslt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxslt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxslt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxslt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxslt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libxslt-&libxslt-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libxslt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="DocBook"/> and
-      <xref role="runtime" linkend="docbook-xsl"/>
-    </para>
-
-    <note>
-      <para>
-        Although it is not a direct dependency, many applications
-        using <application>libxslt</application> will expect
-        <xref linkend="DocBook"/> and <xref linkend="docbook-xsl"/>
-        to be present.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libgcrypt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxslt</title>
-
-    <para>
-      Install <application>libxslt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                          \
-            --disable-static                       \
-            --docdir=/usr/share/doc/libxslt-&libxslt-version; \
-            PYTHON=/usr/bin/python3 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xslt-config and xsltproc
-        </seg>
-        <seg>
-          libexslt.so, libxslt.so and optionally, libxsltmod.so
-          <application>Python</application> module
-        </seg>
-        <seg>
-          /usr/include/libexslt,
-          /usr/include/libxslt,
-          /usr/lib/cmake/libxslt,
-          /usr/lib/libxslt-plugins,
-          /usr/share/gtk-doc/lib{xslt,exslt},
-          /usr/share/doc/libxslt-&libxslt-version;, and
-          /usr/share/doc/libxslt-python-&libxslt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xslt-config">
-        <term><command>xslt-config</command></term>
-        <listitem>
-          <para>
-            is used to find out the pre-processor, linking and
-            compiling flags necessary to use the <application>libxslt</application>
-            libraries in 3rd-party programs
-          </para>
-          <indexterm zone="libxslt xslt-config">
-            <primary sortas="b-xslt-config">xslt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xsltproc">
-        <term><command>xsltproc</command></term>
-        <listitem>
-          <para>
-            is used to apply XSLT stylesheets to XML documents
-          </para>
-          <indexterm zone="libxslt xsltproc">
-            <primary sortas="b-xsltproc">xsltproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexslt">
-        <term><filename class="libraryfile">libexslt.so</filename></term>
-        <listitem>
-          <para>
-            is used to provide extensions to XSLT functions
-          </para>
-          <indexterm zone="libxslt libexslt">
-            <primary sortas="c-libexslt">libexslt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxslt-lib">
-        <term><filename class="libraryfile">libxslt.so</filename></term>
-        <listitem>
-          <para>
-            provides extensions to the
-            <filename class="libraryfile">libxml2</filename>
-            libraries to parse files that use the XSLT format
-          </para>
-          <indexterm zone="libxslt libxslt-lib">
-            <primary sortas="c-libxslt">libxslt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libxslt-intro;
+&libxslt-inst;
+&libxslt-config;
+&libxslt-desc;
 
 </sect1>
+
Index: neral/genlib/libyaml.xml
===================================================================
--- general/genlib/libyaml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yaml-download-http "https://github.com/yaml/libyaml/releases/download/&yaml-version;/yaml-&yaml-version;.tar.gz">
-  <!ENTITY yaml-download-ftp  " ">
-  <!ENTITY yaml-md5sum        "bb15429d8fb787e7d3f1c83ae129a999">
-  <!ENTITY yaml-size          "596 KB">
-  <!ENTITY yaml-buildsize     "6.4 MB (with tests)">
-  <!ENTITY yaml-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libyaml" xreflabel="libyaml-&yaml-version;">
-  <?dbhtml filename="libyaml.html"?>
-
-
-  <title>libyaml-&yaml-version;</title>
-
-  <indexterm zone="libyaml">
-    <primary sortas="a-libyaml">libyaml</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libyaml</title>
-
-    <para>
-      The <application>yaml</application> package contains a C
-      library for parsing and emitting YAML (YAML Ain't Markup
-      Language) code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yaml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yaml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yaml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yaml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yaml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yaml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libyaml Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libyaml</title>
-
-    <para>
-      Install <application>libyaml</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-<!--
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_SHARED_LIBS=true    \
-      -DCMAKE_BUILD_TYPE=RELEASE ..  &amp;&amp;
-make</userinput></screen> -->
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libyaml.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libyaml-lib">
-        <term><filename class="libraryfile">libyaml.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for parsing and emitting YAML code
-          </para>
-          <indexterm zone="libyaml libyaml-lib">
-            <primary sortas="c-libyaml">libyaml.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/log4cplus.xml
===================================================================
--- general/genlib/log4cplus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 log4cplus-download-http "https://github.com/log4cplus/log4cplus/releases/download/REL_&log4cplus-release;/log4cplus-&log4cplus-version;.tar.xz">
-  <!ENTITY log4cplus-download-ftp  " ">
-  <!ENTITY log4cplus-md5sum        "6ee2555be39cd269086cc871c834e43f">
-  <!ENTITY log4cplus-size          "919 KB">
-  <!ENTITY log4cplus-buildsize     "73 MB">
-  <!ENTITY log4cplus-time          "0.3 SBU (Using parallelism=4; add 0.5 SBU for tests)">
-]>
-
-<sect1 id="log4cplus" xreflabel="log4cplus-&log4cplus-version;">
-  <?dbhtml filename="log4cplus.html"?>
-
-
-  <title>log4cplus-&log4cplus-version;</title>
-
-  <indexterm zone="log4cplus">
-    <primary sortas="a-log4cplus">log4cplus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to log4cplus</title>
-
-    <para>
-      <application>log4cplus</application> is an easy to use C++20
-      logging API providing thread-safe, flexible, and arbitrarily
-      granular control over log management and configuration. It is
-      modeled after the Java log4j API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&log4cplus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&log4cplus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &log4cplus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &log4cplus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &log4cplus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &log4cplus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">log4cplus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &qt5-deps;
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of log4cplus</title>
-
-    <para>
-      Build <application>log4cplus</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, install the package 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>
-      <option>--with-qt5</option>: This option enables
-      compilation of a separate shared library (liblog4cplusqt5debugappender)
-      that implements Qt5DebugAppender. It requires Qt5 and pkg-config
-      to be available.
-    </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>
-          log4cplus.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="log4cplus-lib">
-        <term><filename class="libraryfile">log4cplus.so</filename></term>
-        <listitem>
-          <para>
-            is the log4cplus library
-          </para>
-          <indexterm zone="log4cplus log4cplus-lib">
-            <primary sortas="c-log4cplus">log4cplus.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lzo-download-http "https://www.oberhumer.com/opensource/lzo/download/lzo-&lzo-version;.tar.gz">
-  <!ENTITY lzo-download-ftp  " ">
-  <!ENTITY lzo-md5sum        "39d3f3f9c55c87b1e5d6888e1420f4b5">
-  <!ENTITY lzo-size          "588 KB">
-  <!ENTITY lzo-buildsize     "12 MB">
-  <!ENTITY lzo-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="lzo" xreflabel="LZO-&lzo-version;">
-  <?dbhtml filename="lzo.html"?>
-
-
-  <title>LZO-&lzo-version;</title>
-
-  <indexterm zone="lzo">
-    <primary sortas="a-LZO">LZO</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LZO</title>
-
-    <para>
-      <application>LZO</application> is a data compression
-      library which is suitable for data decompression and compression in
-      real-time. This means it favors speed over compression ratio.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lzo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lzo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lzo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lzo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lzo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lzo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LZO</title>
-
-    <para>
-      Install <application>LZO</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                    \
-            --enable-shared                  \
-            --disable-static                 \
-            --docdir=/usr/share/doc/lzo-&lzo-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. All the
-      checks should pass. Now issue <command>make test</command> to run the full
-      suite of tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liblzo2.so
-        </seg>
-        <seg>
-          /usr/include/lzo and
-          /usr/share/doc/lzo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblzo2">
-        <term><filename class="libraryfile">liblzo2.so</filename></term>
-        <listitem>
-          <para>
-            is a data compression and decompression library
-          </para>
-          <indexterm zone="lzo liblzo2">
-            <primary sortas="c-liblzo2">liblzo2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/mtdev.xml
===================================================================
--- general/genlib/mtdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mtdev-download-http "https://bitmath.org/code/mtdev/mtdev-&mtdev-version;.tar.bz2">
-  <!ENTITY mtdev-download-ftp  " ">
-  <!ENTITY mtdev-md5sum        "483ed7fdf7c1e7b7375c05a62848cce7">
-  <!ENTITY mtdev-size          "296 KB">
-  <!ENTITY mtdev-buildsize     "2.5 MB">
-  <!ENTITY mtdev-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mtdev" xreflabel="mtdev-&mtdev-version;">
-  <?dbhtml filename="mtdev.html"?>
-
-
-  <title>mtdev-&mtdev-version;</title>
-
-  <indexterm zone="mtdev">
-    <primary sortas="a-mtdev">mtdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mtdev</title>
-
-    <para>
-      The <application>mtdev</application> package contains Multitouch
-      Protocol Translation Library which is used to transform all
-      variants of kernel MT (Multitouch) events to the slotted type B
-      protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mtdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mtdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mtdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mtdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mtdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mtdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mtdev</title>
-
-    <para>
-      Install <application>mtdev</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mtdev-test
-        </seg>
-        <seg>
-          libmtdev.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mtdev-test">
-        <term><command>mtdev-test</command></term>
-        <listitem>
-          <para>
-            is a tool to test <filename class="libraryfile">libmtdev</filename>
-          </para>
-          <indexterm zone="mtdev mtdev-test">
-            <primary sortas="b-mtdev-test">mtdev-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmtdev">
-        <term><filename class="libraryfile">libmtdev.so</filename></term>
-        <listitem>
-          <para>
-            contains Multitouch Protocol Translation API functions
-          </para>
-          <indexterm zone="mtdev libmtdev">
-            <primary sortas="c-libmtdev">libmtdev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
-  <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "85986134f75f98e9a1c006e7a72d1172">
-  <!ENTITY nodejs-size          "40 MB">
-  <!ENTITY nodejs-buildsize     "974 MB (add 62 MB for tests)">
-  <!ENTITY nodejs-time          "10.9 SBU (add 3.2 SBU for tests: both using parallelism=8 and 8 CPUs online, parts of the tests will use all online CPUs)">
-]>
-
-<sect1 id="nodejs" xreflabel="nodejs-&nodejs-version;">
-  <?dbhtml filename="nodejs.html"?>
-
-
-  <title>Node.js-&nodejs-version;</title>
-
-  <indexterm zone="nodejs">
-    <primary sortas="a-nodejs">nodejs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Node.js</title>
-
-    <para>
-      <application>Node.js</application> is a
-      <application>JavaScript</application> runtime built on
-      <application>Chrome's</application> V8 JavaScript engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nodejs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nodejs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nodejs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nodejs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nodejs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nodejs-time;
-        </para>
-      </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>
--->
-
-    <bridgehead renderas="sect3">Node.js Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="brotli"/>,
-      <xref linkend="c-ares"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libuv"/>, and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/nodejs/http-parser">http-parser</ulink> and
-      <ulink url="https://www.npmjs.com/">npm</ulink> (an internal copy of
-      <command>npm</command> will be installed if not present)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Node.js</title>
-
-<!--
-    <para>
-      If Python-3.12 is installed, fix the <command>configure</command> script:
-    </para>
-
-<screen><userinput>sed -e '/python3.11/i command -v python3.12 >/dev/null &amp;&amp; exec python3.12 "$0" "$@"' \
-    -e '/3, 11/s/\(.3, 11.\)/(3, 12), \1/' \
-    -i configure</userinput></screen>
--->
-
-    <para>
-      Build <application>Node.js</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --shared-brotli        \
-            --shared-cares         \
-            --shared-libuv         \
-            --shared-openssl       \
-            --shared-nghttp2       \
-            --shared-zlib          \
-            --with-intl=system-icu &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test-only</command>.
-<!--
-Failed tests:
-out/Release/node - -tls-min-v1.0 /build/node/node-v18.18.2/test/parallel/test-https-agent-session-eviction.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-alert.js
-out/Release/node - -tls-max-v1.2 /build/node/node-v18.18.2/test/parallel/test-tls-cli-max-version-1.2.js
-out/Release/node - -tls-max-v1.3 /build/node/node-v18.18.2/test/parallel/test-tls-cli-max-version-1.3.js
-out/Release/node - -tls-min-v1.1 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.1.js
-out/Release/node - -tls-min-v1.2 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.2.js
-out/Release/node - -tls-min-v1.3 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.3.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-getprotocol.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-min-max-version.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-session-cache.js
-
-For node-v20.9.0 all 3969 tests passed.  bdubbs 3 Nov 23
--->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sf node /usr/share/doc/node-&nodejs-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <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
-      <application>icu</application> library) and <option>small-icu</option>
-      (to build a local, minimal <application>icu</application> library).
-    </para>
-
-    <para>
-      <parameter>--shared-{brotli,cares,libuv,nghttp2,openssl,zlib}</parameter>:
-      use the system installed libraries instead of local copies.
-    </para>
-
-    <para>
-      <option>--without-npm</option>: do not build
-      <application>npm</application> (use if you'd like to build a separate
-      <application>npm</application> later).
-    </para>
-
-    <para>
-      <option>--shared-http-parser</option>: use the system
-      installed library instead of a local copy.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          corepack, node, npm, and npx
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/node,
-          /usr/lib/node_modules/{corepack,npm},
-          /usr/share/doc/{node,node-&nodejs-version;}, and
-          /usr/share/systemtap/tapset
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="corepack">
-        <term><command>corepack</command></term>
-        <listitem>
-          <para>
-            is an experimental tool to help with managing versions of package
-            managers.
-          </para>
-          <indexterm zone="nodejs corepack">
-            <primary sortas="b-corepack">corepack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="node">
-        <term><command>node</command></term>
-        <listitem>
-          <para>
-            is the server-side JavaScript runtime
-          </para>
-          <indexterm zone="nodejs node">
-            <primary sortas="b-node">node</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="npm">
-        <term><command>npm</command></term>
-        <listitem>
-          <para>
-            is the <application>Node.js</application> package manager
-          </para>
-          <indexterm zone="nodejs npm">
-            <primary sortas="b-npm">npm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <filename class="directory">/usr/lib/node_modules/npm/</filename>
-        </term>
-        <listitem>
-          <para>
-            is the installation root for Node.js executables and libraries
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/npth.xml
===================================================================
--- general/genlib/npth.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 npth-download-http "&gnupg-http;/npth/npth-&npth-version;.tar.bz2">
-  <!ENTITY npth-download-ftp  " ">
-  <!ENTITY npth-md5sum        "286274d0106ec408efebe4a399975b11">
-  <!ENTITY npth-size          "308 KB">
-  <!ENTITY npth-buildsize     "2.6 MB (with checks)">
-  <!ENTITY npth-time          "less than 0.1 SBU (with checks)">
-]>
-
-<sect1 id="npth" xreflabel="npth-&npth-version;">
-  <?dbhtml filename="npth.html"?>
-
-
-  <title>npth-&npth-version;</title>
-
-  <indexterm zone="npth">
-    <primary sortas="a-NPth">NPth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NPth</title>
-
-    <para>
-      The <application>NPth</application> package contains a very portable
-      POSIX/ANSI-C based library for Unix platforms which provides
-      non-preemptive priority-based scheduling for multiple threads of
-      execution (multithreading) inside event-driven applications. All threads
-      run in the same address space of the server application, but each thread
-      has its own individual program-counter, run-time stack, signal mask and
-      errno variable.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&npth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&npth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &npth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &npth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &npth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &npth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NPth</title>
-
-    <para>
-      Install <application>NPth</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#$(LOBJS) ...</command>: This <command>sed</command>
-      fixes a race condition in the <filename>Makefile</filename>. It allows
-      running <command>make</command> with multiple jobs (e.g., <command>make
-      -j4</command>).
-    </para>
-
-    <para>
-      <option>-\-disable-static</option>: This option stops it compiling a
-      static version of the library.
-    </para>
-
-    <para>
-      <option>-\-mandir=/usr/share/man</option>: This option puts the man
-      pages in <filename class="directory">/usr/share/man</filename> and not
-      <filename class="directory">/usr/man</filename>.
-    </para>
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>npth-config</seg>
-        <seg>libnpth.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="npth-config">
-        <term><command>npth-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            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
-          </para>
-          <indexterm zone="npth npth-config">
-            <primary sortas="b-npth-config">npth-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnpth">
-        <term><filename class="libraryfile">libnpth.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the New Portable Threads
-            Library
-          </para>
-          <indexterm zone="npth libnpth">
-            <primary sortas="c-libnpth">libnpth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nspr-download-http "&mozilla-http;/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-  <!ENTITY nspr-download-ftp  " ">
-  <!ENTITY nspr-md5sum        "5e0acf9fbdde85181bddd510f4624841">
-  <!ENTITY nspr-size          "1.0 MB">
-  <!ENTITY nspr-buildsize     "9.6 MB">
-  <!ENTITY nspr-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="nspr" xreflabel="NSPR-&nspr-version;">
-  <?dbhtml filename="nspr.html"?>
-
-
-  <title>NSPR-&nspr-version;</title>
-
-  <indexterm zone="nspr">
-    <primary sortas="a-NSPR">NSPR</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NSPR</title>
-
-    <para>
-      <application>Netscape Portable Runtime</application> (NSPR) provides a
-      platform-neutral API for system level and libc like functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nspr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nspr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nspr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-         Download size: &nspr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nspr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nspr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NSPR</title>
-
-    <para>
-      Install <application>NSPR</application> by running the following commands:
-    </para>
-
-<screen><userinput>cd nspr &amp;&amp;
-
-sed -i '/^RELEASE/s|^|#|' pr/src/misc/Makefile.in &amp;&amp;
-sed -i 's|$(LIBRARY) ||'  config/rules.mk         &amp;&amp;
-
-./configure --prefix=/usr   \
-            --with-mozilla  \
-            --with-pthreads \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite is designed for testing changes to nss or nspr and is
-      not particularly useful for checking a released version (e.g. it needs
-      to be run on a non-optimized build with both nss and nspr directories
-      existing alongside each other). For further details, see the Editor Notes
-      for nss at <ulink url="&blfs-wiki;/nss"/>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in</command>:
-      This sed disables installing two unneeded scripts.
-    </para>
-
-    <para>
-      <command>sed -i 's#$(LIBRARY) ##' config/rules.mk</command>: This sed disables
-      installing the static libraries.
-    </para>
-
-    <para>
-      <parameter>--with-mozilla</parameter>: This parameter adds Mozilla support
-      to the libraries (required if you want to build any other Mozilla
-      products and link them to these libraries).
-    </para>
-
-    <para>
-      <parameter>--with-pthreads</parameter>: This parameter forces use of the
-      system pthread library.
-    </para>
-
-    <para>
-      <parameter>--enable-64bit</parameter>: The --enable-64bit parameter is
-      <emphasis>required</emphasis> on an x86_64 system to prevent
-      <command>configure</command> failing with a claim that this is a system
-      without pthread support. The [ $(uname -m) = x86_64 ] test ensures it has
-      no effect on a 32 bit system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nspr-config
-        </seg>
-        <seg>
-          libnspr4.so, libplc4.so, and libplds4.so
-        </seg>
-        <seg>
-          /usr/include/nspr
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nspr-config">
-        <term><command>nspr-config</command></term>
-        <listitem>
-          <para>
-            provides compiler and linker options to other packages that use
-            <application>NSPR</application>
-          </para>
-          <indexterm zone="nspr nspr-config">
-            <primary sortas="b-nspr-config">nspr-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnspr4">
-        <term><filename class="libraryfile">libnspr4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide platform independence for non-GUI
-            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
-          </para>
-          <indexterm zone="nspr libnspr4">
-            <primary sortas="c-libnspr4">libnspr4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libplc4">
-        <term><filename class="libraryfile">libplc4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement many of the features offered by
-            libnspr4
-          </para>
-          <indexterm zone="nspr libplc4">
-            <primary sortas="c-libplc4">libplc4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libplds4">
-        <term><filename class="libraryfile">libplds4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide data structures
-          </para>
-          <indexterm zone="nspr libplds4">
-            <primary sortas="c-libplds4">libplds4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/openssl.xml
===================================================================
--- general/genlib/openssl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="openssl" xreflabel="openssl-&openssl-version;">
+<?dbhtml filename="openssl.html" dir="general"?>
+<title>openssl-&openssl-version;</title>
+
+&openssl-intro;
+&openssl-inst;
+&openssl-exp;
+&openssl-config;
+&openssl-desc;
+
+</sect1>
Index: general/genlib/openssl/openssl-config.xml
===================================================================
--- general/genlib/openssl/openssl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Configuring Openssl</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/ssl/openssl.cnf</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Most people who just want to use openssl for providing functions
+to other programs such as OpenSSH and web browsers won't need to worry
+about configuring openssl.  Configuring openssl is an advanced topic and
+so those who do would normally be expected to either know how to do it
+or to be able to find out how to do it.</para>
+</sect3>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-desc.xml
===================================================================
--- general/genlib/openssl/openssl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,47 @@
+<sect2>
+<title>Contents</title>
+
+<para>The openssl package contains <userinput>c_rehash</userinput>,
+<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
+<userinput>libssl</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>c_rehash</title>
+
+<para>No description is available for c_rehash.</para>
+
+</sect3>
+
+<sect3><title>openssl</title>
+
+<para>The openssl program is a command line tool for using the various
+cryptography functions of OpenSSL's crypto library from the shell.  
+It can be used for various functions which are documented in
+<userinput>man 1 openssl</userinput>.</para>
+
+</sect3>
+
+<sect3><title>libcrypto</title>
+
+<para>The OpenSSL crypto library implements a wide range of cryptographic 
+algorithms used in various Internet standards. The services provided by 
+this library are used by the OpenSSL implementations of SSL, TLS and S/MIME, 
+and they have also been used to implement SSH, OpenPGP, and other 
+cryptographic standards.</para>
+
+</sect3>
+
+<sect3><title>libssl</title>
+ 
+<para>The OpenSSL ssl library implements the Secure Sockets Layer (SSL 
+v2/v3) and Transport Layer Security (TLS v1) protocols. It provides a rich 
+API, documentation on which can be found by running 
+<userinput>man 3 ssl</userinput>.</para>
+ 
+</sect3>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-exp.xml
===================================================================
--- general/genlib/openssl/openssl-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>mv doc/apps/passwd.pod
+doc/apps/openssl-passwd.pod :</userinput> We do this because otherwise
+openssl installs it's passwd man page over the existing system one which
+isn't what we want.</para>
+
+<para><screen><userinput>make MANDIR=/usr/share/man</userinput>
+<userinput>make MANDIR=/usr/share/man install :</userinput></screen> These
+commands install openssl with the man pages in /usr/share/man instead of
+the default which is /etc/ssl/man.</para>
+ 
+<para><userinput>rmdir /etc/ssl/lib :</userinput> This is simply a
+tidy-up command.  For some reason, the openssl install routine creates
+the /etc/ssl/lib directory even though the libraries have been installed
+in /usr/lib.  We remove it to keep things nice and tidy!</para>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-inst.xml
===================================================================
--- general/genlib/openssl/openssl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,21 @@
+<sect2>
+<title>Installation of openssl</title>
+
+<para>Install openssl by running the following commands:</para>
+
+<note><para>GCC issues a warning on every compilation because the Configure 
+command uses -m486 instead of -march=i486.  To fix this behavior, 
+change the definition on line 337 of Configure.  The line begins with "linux-elf". 
+</para></note>
+
+<para><screen><userinput>mv doc/apps/passwd.pod doc/apps/openssl-passwd.pod &amp;&amp;
+./Configure linux-elf  --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;</userinput>
+<userinput>make MANDIR=/usr/share/man &amp;&amp;</userinput>
+<userinput>make MANDIR=/usr/share/man install &amp;&amp;</userinput>
+<userinput>rmdir /etc/ssl/lib</userinput>
+</screen>
+</para>
+
+
+</sect2>
+
Index: general/genlib/openssl/openssl-intro.xml
===================================================================
--- general/genlib/openssl/openssl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to openssl</title>
+
+<screen>Download location:              <ulink url="&openssl-download;"/>
+Version used:                   &openssl-version;
+Package size:                   &openssl-size;
+Estimated Disk space required:  &openssl-buildsize;</screen>
+
+<para>The openssl package contains <userinput>c_rehash</userinput>,
+<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
+<userinput>libssl</userinput>.  These are useful for providing
+cryptography functions to other packages, notably OpenSSH and web
+browsers (for accessing secure https sites).</para>
+
+</sect2>
Index: general/genlib/openssl/openssl.ent
===================================================================
--- general/genlib/openssl/openssl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY openssl SYSTEM "../openssl.xml">
+<!ENTITY openssl-intro SYSTEM "openssl-intro.xml">
+<!ENTITY openssl-inst SYSTEM "openssl-inst.xml">
+<!ENTITY openssl-exp SYSTEM "openssl-exp.xml">
+<!ENTITY openssl-desc SYSTEM "openssl-desc.xml">
+<!ENTITY openssl-config SYSTEM "openssl-config.xml">
+<!ENTITY openssl-buildsize "23 MB">
+<!ENTITY openssl-version "0.9.6d">
+<!ENTITY openssl-download "ftp://ftp.openssl.org/source/openssl-0.9.6d.tar.gz">
+<!ENTITY openssl-size "2.0 MB">
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="pcre" xreflabel="pcre-&pcre-version;">
+<?dbhtml filename="pcre.html" dir="general"?>
+<title>pcre-&pcre-version;</title>
+
+&pcre-intro;
+&pcre-inst;
+&pcre-config;
+&pcre-desc;
+
+</sect1>
Index: general/genlib/pcre/pcre-config.xml
===================================================================
--- general/genlib/pcre/pcre-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring pcre</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-desc.xml
===================================================================
--- general/genlib/pcre/pcre-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pcre package contains the <userinput>pcre
+libraries</userinput>, <userinput>pcregrep</userinput>,
+<userinput>pcretest</userinput> and 
+<userinput>pcre-config</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>pcregrep</title>
+<para>pcregrep is a grep that understands perl compatible regular
+expressions.</para></sect3>
+
+<sect3><title>pcretest</title>
+<para>pcretest can test your perl compatible regular expression.</para></sect3>
+
+<sect3><title>pcre-config</title>
+<para>pcre-config is used during the compile process of programs
+linking to this library.</para></sect3>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-inst.xml
===================================================================
--- general/genlib/pcre/pcre-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of pcre</title>
+
+<para>Install pcre by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-intro.xml
===================================================================
--- general/genlib/pcre/pcre-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to pcre</title>
+
+<screen>Download location:              &pcre-download;
+Version used:                   &pcre-version;
+Package size:                   &pcre-size;
+Estimated Disk space required:  &pcre-buildsize;</screen>
+
+<para>The pcre package contains perl compatible regular expression
+libraries. These are useful for implementing regular expression pattern
+matching using the same syntax and semantics as Perl 5.</para>
+
+
+</sect2>
Index: general/genlib/pcre/pcre.ent
===================================================================
--- general/genlib/pcre/pcre.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY pcre SYSTEM "../pcre.xml">
+<!ENTITY pcre-intro SYSTEM "pcre-intro.xml">
+<!ENTITY pcre-inst SYSTEM "pcre-inst.xml">
+<!ENTITY pcre-desc SYSTEM "pcre-desc.xml">
+<!ENTITY pcre-config SYSTEM "pcre-config.xml">
+<!ENTITY pcre-buildsize "2.1 MB">
+<!ENTITY pcre-version "3.9">
+<!ENTITY pcre-download "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-3.9.tar.bz2">
+<!ENTITY pcre-size "255 KB">
Index: neral/genlib/pcre2.xml
===================================================================
--- general/genlib/pcre2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,233 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pcre2-download-http "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-&pcre2-version;/pcre2-&pcre2-version;.tar.bz2">
-  <!ENTITY pcre2-download-ftp  " ">
-  <!ENTITY pcre2-md5sum        "c8e2043cbc4abb80e76dba323f7c409f">
-  <!ENTITY pcre2-size          "1.8 MB">
-  <!ENTITY pcre2-buildsize     "20 MB (with tests)">
-  <!ENTITY pcre2-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="pcre2" xreflabel="pcre2-&pcre2-version;">
-  <?dbhtml filename="pcre2.html"?>
-
-
-  <title>PCRE2-&pcre2-version;</title>
-
-  <indexterm zone="pcre2">
-    <primary sortas="a-pcre2">PCRE2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCRE2</title>
-
-    <para>
-      The <application>PCRE2</application> package contains a new generation of
-      the <application>Perl Compatible Regular Expression</application>
-      libraries. These are useful for implementing regular expression pattern
-      matching using the same syntax and semantics as <application>Perl</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcre2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcre2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcre2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcre2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcre2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcre2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PCRE2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> and
-      <ulink url="https://thrysoee.dk/editline/">libedit</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCRE2</title>
-
-    <para>
-      Install <application>PCRE2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                       \
-            --docdir=/usr/share/doc/pcre2-&pcre2-version; \
-            --enable-unicode                    \
-            --enable-jit                        \
-            --enable-pcre2-16                   \
-            --enable-pcre2-32                   \
-            --enable-pcre2grep-libz             \
-            --enable-pcre2grep-libbz2           \
-            --enable-pcre2test-libreadline      \
-            --disable-static                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-unicode</parameter>: This switch enables Unicode
-      support and includes the functions for handling UTF-8/16/32 character
-      strings in the library.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2-16</parameter>: This switch enables 16 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2-32</parameter>: This switch enables 32 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2grep-libz</parameter>: This switch adds support
-      for reading .gz compressed files to <application>pcre2grep</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2grep-libbz2</parameter>: This switch adds
-      support for reading .bz2 compressed files to
-      <application>pcre2grep</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2test-libreadline</parameter>: This switch adds
-      line editing and history features to the
-      <application>pcre2test</application> program.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-jit</parameter>: this option enables Just-in-time
-      compiling, which can greatly speed up pattern matching.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcre2-config,
-          pcre2grep,
-          and pcre2test.
-        </seg>
-        <seg>
-          libpcre2-8.so,
-          libpcre2-16.so,
-          libpcre2-32.so,
-          and libpcre2-posix.so
-        </seg>
-        <seg>
-          /usr/share/doc/pcre2-&pcre2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcre2grep">
-        <term><command>pcre2grep</command></term>
-        <listitem>
-          <para>
-            is a version of <application>grep</application>
-            that understands
-            <application>Perl compatible regular expressions.</application>
-          </para>
-          <indexterm zone="pcre2 pcre2grep">
-            <primary sortas="b-pcre2grep">pcre2grep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre2test">
-        <term><command>pcre2test</command></term>
-        <listitem>
-          <para>
-            can test a
-            <application>Perl compatible regular expression.</application>
-          </para>
-          <indexterm zone="pcre2 pcre2test">
-            <primary sortas="b-pcre2test">pcre2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre2-config">
-        <term><command>pcre2-config</command></term>
-        <listitem>
-          <para>
-            outputs compilation information to programs linking against the
-            <application>PCRE2</application> libraries
-          </para>
-          <indexterm zone="pcre2 pcre2-config">
-            <primary sortas="b-pcre2-config">pcre2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/genlib/popt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,173 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="popt" xreflabel="popt">
+<?dbhtml filename="popt.html" dir="general"?>
+<title>popt</title>
 
-  <!ENTITY popt-download-http "http://ftp.rpm.org/popt/releases/popt-1.x/popt-&popt-version;.tar.gz">
-  <!ENTITY popt-download-ftp  " ">
-  <!ENTITY popt-md5sum        "eaa2135fddb6eb03f2c87ee1823e5a78">
-  <!ENTITY popt-size          "584 KB">
-  <!ENTITY popt-buildsize     "6.9 MB (includes installing documentation and tests)">
-  <!ENTITY popt-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="popt" xreflabel="popt-&popt-version;">
-  <?dbhtml filename="popt.html"?>
-
-
-  <title>Popt-&popt-version;</title>
-
-  <indexterm zone="popt">
-    <primary sortas="a-Popt">Popt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Popt</title>
-
-    <para>
-      The <application>popt</application> package contains the
-      <application>popt</application> libraries which are used by
-      some programs to parse command-line options.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&popt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&popt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &popt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &popt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &popt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &popt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">popt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for generating documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Popt</title>
-
-    <para>
-      Install <application>popt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and wish to build
-      the API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>sed -i 's@\./@src/@' Doxyfile &amp;&amp;
-doxygen</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it using the following
-      commands issued by the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/popt-&popt-version; &amp;&amp;
-install -v -m644 doxygen/html/* /usr/share/doc/popt-&popt-version;</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"/>
-
-    <!-- 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 available in case
-      <systemitem class="filesystem">/usr</systemitem> is offline and
-      <xref linkend="efibootmgr"/> is installed and linked to popt.
-    </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>libpopt.so</seg>
-        <seg>/usr/share/doc/popt-&popt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpopt">
-      <term><filename class="libraryfile">libpopt.so</filename></term>
-      <listitem>
-        <para>
-          is used to parse command-line options
-        </para>
-        <indexterm zone="popt libpopt">
-          <primary sortas="c-libpopt">libpopt.so</primary>
-        </indexterm>
-      </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: general/genlib/popt/popt.ent
===================================================================
--- general/genlib/popt/popt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/popt/popt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY popt SYSTEM "../popt.xml">
Index: neral/genlib/protobuf-c.xml
===================================================================
--- general/genlib/protobuf-c.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 protobuf-c-download-http "https://github.com/protobuf-c/protobuf-c/releases/download/v&protobuf-c-version;/protobuf-c-&protobuf-c-version;.tar.gz">
-  <!ENTITY protobuf-c-md5sum        "03030a3994b9f89ef166336048992484">
-  <!ENTITY protobuf-c-size          "496 KB">
-  <!ENTITY protobuf-c-buildsize     "60 MB">
-  <!ENTITY protobuf-c-time          "0.6 SBU">
-]>
-
-<sect1 id="protobuf-c" xreflabel="Protobuf-c-&protobuf-c-version;">
-  <?dbhtml filename="protobuf-c.html"?>
-
-  <title>Protobuf-c-&protobuf-c-version;</title>
-
-  <indexterm zone="protobuf-c">
-    <primary sortas="a-protobuf-c">Protobuf-c</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Protobuf-c</title>
-
-    <para>
-      The <application>Protobuf-c</application> package contains an
-      implementation of the Google Protocol Buffers data serialization format
-      in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&protobuf-c-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &protobuf-c-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &protobuf-c-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &protobuf-c-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &protobuf-c-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/protobuf-c-&protobuf-c-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Protobuf-c Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="protobuf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Protobuf-c</title>
-
-    <para>
-      First, apply some upstream fixes to make this package compatible 
-      with protobuf-26.1:
-    </para>
-
-    <screen role="pre"><userinput>patch -Np1 -i ../protobuf-c-&protobuf-c-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Protobuf-c</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          protoc-gen-c and protoc-c (symlinked to protoc-gen-c)
-        </seg>
-        <seg>
-          libprotobuf-c.so
-        </seg>
-        <seg>
-          /usr/include/google and
-          /usr/include/protobuf-c
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protoc-c">
-        <term><command>protoc-c</command></term>
-        <listitem>
-          <para>
-            generates C descriptor code from a .proto file
-          </para>
-          <indexterm zone="protobuf-c protoc-c">
-            <primary sortas="b-protoc-c">protoc-c</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf-c">
-        <term><filename class="libraryfile">libprotobuf-c.so</filename></term>
-        <listitem>
-          <para>
-            contains a C implementation of the Google Protocol Buffers data
-            serialization format
-          </para>
-          <indexterm zone="protobuf-c libprotobuf-c">
-            <primary sortas="c-libprotobuf-c">libprotobuf-c.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/protobuf.xml
===================================================================
--- general/genlib/protobuf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 protobuf-download-http "https://github.com/protocolbuffers/protobuf/releases/download/v&protobuf-version;/protobuf-&protobuf-version;.tar.gz">
-  <!ENTITY protobuf-md5sum        "6ad6edec05fd08477a442db77dbebf98">
-  <!ENTITY protobuf-size          "5.7 MB">
-  <!ENTITY protobuf-buildsize     "89 MB">
-  <!ENTITY protobuf-time          "1.3 SBU (with parallelism=4)">
-]>
-
-<sect1 id="protobuf" xreflabel="Protobuf-&protobuf-version;">
-  <?dbhtml filename="protobuf.html"?>
-
-  <title>Protobuf-&protobuf-version;</title>
-
-  <indexterm zone="protobuf">
-    <primary sortas="a-protobuf">Protobuf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Protobuf</title>
-
-    <para>
-      The <application>Protobuf</application> package contains utilities and
-      libraries for using data in Google's data interchange format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&protobuf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &protobuf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &protobuf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &protobuf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &protobuf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Protobuf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="abseil-cpp"/> and
-      <xref linkend="cmake"/>
-    </para>
-    
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/google/googletest">gtest (for tests)</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Protobuf</title>
-
-    <para>
-      Install <application>Protobuf</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       \
-      -Dprotobuf_BUILD_TESTS=OFF       \
-      -Dprotobuf_ABSL_PROVIDER=package \
-      -Dprotobuf_BUILD_SHARED_LIBS=ON  \
-      -Dutf8_range_ENABLE_INSTALL=OFF  \
-      -G Ninja ..                      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not part of BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>sed 's/utf8_range//' -i *.pc &amp;&amp;
-ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed 's/utf8_range//' -i *.pc</command>: This command removes a
-      leftover reference to libutf8_range from the pkg-config files installed
-      by this package.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_BUILD_TESTS=OFF</parameter>: This parameter prevents
-      the tests from being built because
-      <ulink url="https://github.com/google/googletest">gtest</ulink> is not
-      part of BLFS.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_ABSL_PROVIDER=package</parameter>: This parameter
-      allows the build system to use the system-installed copy of
-      <xref linkend="abseil-cpp" role="nodep"/>.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_BUILD_SHARED_LIBS=ON</parameter>: This parameter
-      enables building shared versions of the libraries provided by this package
-      instead of static versions.
-    </para>
-
-    <para>
-      <parameter>-Dutf8_range_ENABLE_INSTALL=OFF</parameter>: This parameter
-      disables installing the utf8_range static library.  The functions
-      provided by this library and used by protobuf is already embedded into
-      <filename class='libraryfile'>libprotobuf.so</filename>, so installing
-      a full copy of the static library is just wasting the disk space.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          protoc-26.1.0 and protoc (a symlink to protoc-26.1.0)
-        </seg>
-        <seg>
-          libprotobuf.so,
-          libprotobuf-lite.so, and
-          libprotoc.so
-        </seg>
-        <seg>
-          /usr/include/google,
-          /usr/include/java,
-          /usr/include/upb_generator, and
-          /usr/lib/cmake/protobuf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protoc">
-        <term><command>protoc</command></term>
-        <listitem>
-          <para>
-            parses protocol buffer files and generates output for several
-            programming languages and formats
-          </para>
-          <indexterm zone="protobuf protoc">
-            <primary sortas="b-protoc">protoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf">
-        <term><filename class="libraryfile">libprotobuf.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for utilizing data in Google's data interchange
-            format
-          </para>
-          <indexterm zone="protobuf libprotobuf">
-            <primary sortas="c-libprotobuf">libprotobuf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf-lite">
-        <term><filename class="libraryfile">libprotobuf-lite.so</filename></term>
-        <listitem>
-          <para>
-            contains a simpler version of the functions for utilizing data in
-            Google's data interchange format
-          </para>
-          <indexterm zone="protobuf libprotobuf-lite">
-            <primary sortas="c-libprotobuf-lite">libprotobuf-lite.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotoc">
-        <term><filename class="libraryfile">libprotoc.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by protoc at runtime for outputting data
-            for several programming languages and formats
-          </para>
-          <indexterm zone="protobuf libprotoc">
-            <primary sortas="c-libprotoc">libprotoc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,240 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qca-download-http "https://download.kde.org/stable/qca/&qca-version;/qca-&qca-version;.tar.xz">
-  <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "4c6348286c170b3da24820c977565d75">
-  <!ENTITY qca-size          "744 KB">
-  <!ENTITY qca-buildsize     "42 MB">
-  <!ENTITY qca-time          "0.5 SBU (using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="qca" xreflabel="qca-&qca-version;">
-  <?dbhtml filename="qca.html"?>
-
-
-  <title>Qca-&qca-version;</title>
-
-  <indexterm zone="qca">
-    <primary sortas="a-qca">qca</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qca</title>
-
-    <para>
-      <application>Qca</application> aims to provide a straightforward and
-      cross-platform crypto API, using <application>Qt</application> datatypes
-      and conventions. <application>Qca</application> separates the API from
-      the implementation, using plugins known as Providers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qca-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qca-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qca-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qca-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qca-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qca-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qca-&qca-version;-openssl-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Qca Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="make-ca"/>,
-    <xref linkend="cmake"/>,
-    <xref linkend="qt6"/>, and
-    <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="Optional">
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="gnupg2"/>,
-    <xref linkend="libgcrypt"/>,
-    <xref linkend="libgpg-error"/>,
-    <xref linkend="nss"/>,
-    <xref linkend="nspr"/>,
-    <xref linkend="p11-kit"/>,
-    <xref linkend="doxygen"/>,
-    <xref linkend="which"/>, and
-    <ulink url="https://botan.randombit.net/">Botan</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qca</title>
-
-    <para>
-      Fix the location of the CA certificates:
-    </para>
-
-<screen><userinput>sed -i 's@cert.pem@certs/ca-bundle.crt@' CMakeLists.txt</userinput></screen>
-
-    <para>
-      Install <application>Qca</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$QT6DIR            \
-      -DCMAKE_BUILD_TYPE=Release                \
-      -DQT6=ON                                  \
-      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make test</command>. <!--One test
-      using <xref linkend="gnupg2"/> fails without a correct passphrase.  The
-      required passphrase does not seem to be published.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DQT6=ON</parameter>:
-      Ensure the packages is built with <xref linkend="qt6"/>.
-    </para>
-
-    <para>
-      <parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
-      Install the qca man page in the normal location.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>mozcerts-qt6 and qcatool-qt6</seg>
-        <seg>
-          libqca-qt6.so,
-          libqca-cyrus-sasl.so,
-          libqca-gcrypt.so,
-          libqca-gnupg.so,
-          libqca-logger.so,
-          libqca-nss.so,
-          libqca-ossl.so, and
-          libqca-softstore.so
-        </seg>
-        <seg>
-          &qt6-dir;/include/Qca-qt6,
-          &qt6-dir;/lib/cmake/Qca-qt6, and
-          &qt6-dir;/lib/qca-qt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for converting certdata.txt into
-            outfile.pem files
-          </para>
-          <indexterm zone="qca mozcerts">
-            <primary sortas="b-mozcerts">mozcerts-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcatool">
-        <term><command>qcatool-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for performing various cryptographic
-            operations with Qca
-          </para>
-          <indexterm zone="qca qcatool">
-            <primary sortas="b-qcatool">qcatool-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqca">
-        <term><filename class="libraryfile">libqca-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is the Qt Cryptography Architecture (Qca) library
-          </para>
-          <indexterm zone="qca libqca">
-            <primary sortas="c-libqca">libqca-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/qcoro.xml
===================================================================
--- general/genlib/qcoro.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qcoro-download-http "https://github.com/danvratil/qcoro/archive/v&qcoro-version;/qcoro-&qcoro-version;.tar.gz">
-  <!ENTITY qcoro-download-ftp  " ">
-  <!ENTITY qcoro-md5sum        "2af4e86cd77493cd41ba5ffcac33d5f4">
-  <!ENTITY qcoro-size          "148 KB">
-  <!ENTITY qcoro-buildsize     "8.4 MB (Add 19 MB for tests)">
-  <!ENTITY qcoro-time          "0.4 SBU (Add 0.5 SBU for tests)">
-]>
-
-<sect1 id="qcoro" xreflabel="qcoro-&qcoro-version;">
-  <?dbhtml filename="qcoro.html"?>
-
-  <title>qcoro-&qcoro-version;</title>
-
-  <indexterm zone="qcoro">
-    <primary sortas="b-qcoro">qcoro</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qcoro</title>
-
-    <para>
-      This package provides a set of tools to make use of C++20 coroutines with Qt.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qcoro-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qcoro-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qcoro-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qcoro-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qcoro-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qcoro-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qcoro Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qcoro</title>
-
-    <para>
-      Install <application>qcoro</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=$QT6DIR \
-      -D CMAKE_BUILD_TYPE=Release     \
-      -D BUILD_TESTING=OFF            \
-      -D QCORO_BUILD_EXAMPLES=OFF     \
-      -D BUILD_SHARED_LIBS=ON         \
-       ..                             &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test this package, remove the 'BUILD_TESTING=OFF' parameter
-      above and run:
-    </para>
-
-<screen><userinput>make test</userinput></screen>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </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>
-          libQCoro6Core.so,
-          libQCoro6DBus.so,
-          libQCoro6Network.so,
-          libQCoro6Qml.so,
-          libQCoro6Quick.so, and
-          libQCoro6WebSockets.so
-        </seg>
-        <seg>
-          Nine directories in $QT6DIR/lib/cmake/ and 
-          $QT6DIR/include/qcoro6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for converting certdata.txt into
-            outfile.pem files
-          </para>
-          <indexterm zone="qcoro mozcerts">
-            <primary sortas="b-mozcerts">mozcerts-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcorotool">
-        <term><command>qcorotool-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for performing various cryptographic
-            operations with qcoro
-          </para>
-          <indexterm zone="qcoro qcorotool">
-            <primary sortas="b-qcorotool">qcorotool-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqcoro">
-        <term><filename class="libraryfile">libqcoro-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is the Qt Cryptography Architecture (qcoro) library
-          </para>
-          <indexterm zone="qcoro libqcoro">
-            <primary sortas="c-libqcoro">libqcoro-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/slang.xml
===================================================================
--- general/genlib/slang.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/slang.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="slang" xreflabel="slang">
+<?dbhtml filename="slang.html" dir="general"?>
+<title>slang</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/genlib/slang/slang.ent
===================================================================
--- general/genlib/slang/slang.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/slang/slang.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY slang SYSTEM "../slang.xml">
Index: neral/genlib/spidermonkey.xml
===================================================================
--- general/genlib/spidermonkey.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,425 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spidermonkey-download-http "&mozilla-http;/firefox/releases/&spidermonkey-version;esr/source/firefox-&spidermonkey-version;esr.source.tar.xz">
-  <!ENTITY spidermonkey-download-ftp  " ">
-  <!ENTITY spidermonkey-md5sum        "150ac3fe6200f01879148ef32c5dd16f">
-  <!ENTITY spidermonkey-size          "484 MB">
-  <!ENTITY spidermonkey-buildsize     "3.6 GB (40 MB installed after removing 36MB static lib; add 34 MB for the main tests and 37 MB for the jit tests)">
-  <!ENTITY spidermonkey-time          "1.9 SBU (with parallelism=4; add 1.1 SBU for the main tests and 3.7 SBU for the jit tests)">
-]>
-
-<sect1 id="spidermonkey" xreflabel="SpiderMonkey from Firefox-&spidermonkey-version;">
-  <?dbhtml filename="spidermonkey.html"?>
-
-
-  <title>SpiderMonkey from firefox-&spidermonkey-version;</title>
-
-  <indexterm zone="spidermonkey">
-    <primary sortas="a-spidermonkey">SpiderMonkey</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SpiderMonkey</title>
-
-    <para>
-      <application>SpiderMonkey</application> is Mozilla's JavaScript and
-      WebAssembly Engine, written in C++ and Rust.
-      In BLFS, the source code of SpiderMonkey is taken from Firefox.
-    </para>
-
-    <!-- To editors: make sure polkit works with mozjs when
-         tagging SpiderMonkey or upgrading it to a new major version.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spidermonkey-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spidermonkey-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spidermonkey-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spidermonkey-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spidermonkey-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spidermonkey-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js-&JS91-version;-python_3_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">SpiderMonkey Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="icu"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="six"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- If clang is installed, it will be used instead of gcc.
-           gcc does not work for 32-bit system w/o -msse2 -mfpmath=sse:
-           https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 -->
-      <xref linkend="llvm"/> (with <application>Clang</application>,
-      required for 32-bit systems without SSE2 capabilities)
-    </para>
-
-    <important>
-      <para>
-        If you are building this package on a 32-bit system, and Clang
-        is not installed or you're overriding the default compiler choice
-        with the environment variable <envar>CXX</envar>, please read the
-        Command Explanations section first.
-      </para>
-    </important>
-
-    <!-- It seems nasm is only used for aarch64-win64. -->
-    <!--bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nasm"/>
-    </para-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SpiderMonkey</title>
-
-    <note>
-      <para>
-        Unlike most other packages in BLFS, the instructions below require
-        you to untar
-        <filename>firefox-&spidermonkey-version;esr.tar.xz</filename> and
-        change into the <filename>firefox-&spidermonkey-version;</filename>
-        folder.
-      </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>
-
-    </note>
-
-    <para>
-      The building system ships several internal copies of the Python 3
-      module <filename>six.py</filename>.  The shipped copies are too old
-      to work well with Python 3.12 or later.  Replace them with the
-      symlinks to <xref linkend='six'/> already installed on the system:
-    </para>
-
-<screen><userinput>for i in $(find -name six.py); do
-  ln -sfv /usr/lib/python&python3-majorver;/site-packages/six.py $i;
-done</userinput></screen>
-
-    <para>
-      Install <application>SpiderMonkey</application> by running the following
-      commands:
-    </para>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-         href="../../xincludes/mozshm.xml"/>
-      <para>
-        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-        the rust code will use all processors.
-      </para>
-    </note>
-
-<screen><userinput>mkdir obj &amp;&amp;
-cd    obj &amp;&amp;
-
-../js/src/configure --prefix=/usr            \
-                    --disable-debug-symbols  \
-                    --disable-jemalloc       \
-                    --enable-readline        \
-                    --enable-rust-simd       \
-                    --with-intl-api          \
-                    --with-system-icu        \
-                    --with-system-zlib       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the SpiderMonkey test suite, issue:
-      <command>make -C js/src check-jstests
-      JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled"</command>.
-      It's recommended to redirect the output into a log.
-      <!-- recheck when ICU gets upgraded -->
-      Because we are building with system ICU, 39 tests
-      (out of a total of more than 50,000) are known to fail.
-      The test suite is executed with all CPU cores available: even in a
-      cgroup with less cores assigned, it still attempts to spawn as many
-      testing jobs as the number of <emphasis>all</emphasis> cores in the
-      system; fortunately the kernel still won't run these jobs on cores
-      not assigned to the cgroup so the CPU usage is still controlled.
-    </para>
-    <para>
-      To run the JIT test suite, issue: <command>make -C js/src
-      check-jit-test JITTEST_EXTRA_ARGS="--timeout 300"</command>.
-      Like the SpiderMonkey test suite, the number of test jobs is same as
-      the number of all CPU cores in the system even if a cgroup is used. To
-      make things worse, there are six tests each of them will use 3 GB
-      of system memory, so the peak memory usage may be up to 18 GB if the
-      number of cores is six or more.  Running the JIT test suite without
-      enough memory may invoke the kernel OOM killer and cause stability
-      issues.  If you don't have enough system memory available, append
-      <option>-jN</option> after <option>--timeout 300</option> with N
-      replaced by the number of parallel test jobs you want to start.  For
-      example, if you have 16 GB system memory available and 8 CPU cores,
-      issue <command>make -C js/src check-jit-test
-      JITTEST_EXTRA_ARGS="--timeout=300 -j5"</command> to run the test with
-      5 parallel jobs so the memory usage won't exceed 15 GB.
-      <!-- TL;DR: DO NOT REMOVE MEMORY USAGE NOTE W/O MY CONFIRMATION!
-
-           "six tests": bug1782468-ptrdiff-veclen.js, it's ran with 6
-           different configurations.
-
-           "may": this is stochasitic (like all parallelization issue),
-           don't remove the note about memory usage simply because "I cannot
-           reproduce it".
-
-           "peak": the time period using so much memory is very short, so
-           don't just watch the output of "top" or "free" with eyesight.
-           Run the test in a cgroup and read the "memory.peak" psuedo file
-           for a proper measurement.
-
-           Q: Why not just document some test failures?
-           A: This *really* can cause stability issue because the kernel
-              may OOM kill another process if the test is not ran in a
-              cgroup with memory.max set.  Even if running it in a cgroup,
-              the kernel may still OOM kill the "main" process controlling
-              the test process instead of a single test job, causing a
-              incomplete test.
-
-                                                                 - xry111
-      -->
-    </para>
-
-    <caution>
-      <para>
-        An issue in the installation process causes any running program which
-        links to SpiderMonkey shared library (for example, GNOME Shell) to
-        crash if SpiderMonkey is reinstalled, or upgraded or downgraded
-        without a change of the major version number
-        (&spidermonkey-major; in &spidermonkey-version;).  To work around
-        this issue, remove the old version of the SpiderMonkey shared
-        library before installation:
-      </para>
-
-<screen role="root"><userinput>rm -fv /usr/lib/libmozjs-&spidermonkey-major;.so</userinput></screen>
-    </caution>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -v /usr/lib/libjs_static.ajs &amp;&amp;
-sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js&spidermonkey-major;-config</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-debug-symbols</parameter>: Don't generate debug
-      symbols since they are very large and most users won't need it. Remove
-      it if you want to debug SpiderMonkey.
-    </para>
-
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in SpiderMonkey. jemalloc is only
-      intended for the Firefox browser environment. For other applications
-      using SpiderMonkey, the application may crash as items allocated in
-      the jemalloc allocator are freed on the system (glibc) allocator.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the SpiderMonkey command line interface.
-    </para>
-
-    <para>
-      <parameter>--enable-rust-simd</parameter>: This switch enables SIMD
-      optimization in the shipped encoding_rs crate.
-    </para>
-
-    <para>
-      <parameter>--with-intl-api</parameter>: This enables the
-      internationalization functions required by
-      <application>Gjs</application>.
-    </para>
-
-    <para>
-      <parameter>--with-system-*</parameter>: These parameters allow the build system
-      to use system versions of the above libraries. These are required for
-      stability.
-    </para>
-
-    <para>
-      <command>rm -v /usr/lib/libjs_static.ajs</command>: Remove a large
-      static library which is not used by any BLFS package.
-    </para>
-
-    <para>
-      <command>sed -i '/@NSPR_CFLAGS@/d'
-      /usr/bin/js&spidermonkey-major;-config</command>:
-      Prevent <command>js&spidermonkey-major;-config</command> from using
-      buggy CFLAGS.
-    </para>
-
-    <para>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Pass these environment variables
-      to the configure script if you wish to continue to use gcc, g++
-      (by exporting them and unset them after the installation, or simply
-      prepending them before the
-      <command>../js/src/configure</command> command).  If you are
-      building on a 32-bit system, also see below.
-    </para>
-
-    <para>
-      <option><envar>CXXFLAGS="-msse2 -mfpmath=sse"</envar></option>:
-      Use SSE2 instead of 387 for double-precision floating-point
-      operations.  It's needed by GCC to satisfy the expectations of
-      upstream (Mozilla) developers with floating-point arithmetic.
-      Use it if you are building this package on a 32-bit system with
-      GCC (if Clang is not installed or GCC is explicitly specified).
-      Note that this will cause SpiderMonkey to crash on a processor without
-      SSE2 capability.  If you are running the system on such an old
-      processor, Clang is strictly needed.  This setting is not needed on
-      64-bit systems because all 64-bit x86 processors support SSE2 and the
-      64-bit compilers (both Clang and GCC) use SSE2 by default.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js&spidermonkey-major; and js&spidermonkey-major;-config
-        </seg>
-        <seg>
-          libmozjs-&spidermonkey-major;.so
-        </seg>
-        <seg>
-          /usr/include/mozjs-&spidermonkey-major;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js&spidermonkey-major;">
-        <term><command>js&spidermonkey-major;</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine
-          </para>
-          <indexterm zone="spidermonkey js&spidermonkey-major;">
-            <primary sortas="b-js&spidermonkey-major;">
-              js&spidermonkey-major;
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js&spidermonkey-major;-config">
-        <term><command>js&spidermonkey-major;-config</command></term>
-        <listitem>
-          <para>
-            is used to find the SpiderMonkey compiler and linker flags
-          </para>
-          <indexterm zone="spidermonkey js&spidermonkey-major;-config">
-            <primary sortas="b-js&spidermonkey-major;-config">i
-              js&spidermonkey-major;-config
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-&spidermonkey-major;">
-        <term>
-          <filename class="libraryfile">
-            libmozjs-&spidermonkey-major;.so
-          </filename>
-        </term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions
-          </para>
-          <indexterm zone="spidermonkey libmozjs-&spidermonkey-major;">
-            <primary sortas="c-libmozjs&spidermonkey-major;">
-              libmozjs-&spidermonkey-major;.so
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/spirv-headers.xml
===================================================================
--- general/genlib/spirv-headers.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spirv-headers-download-http "https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-&spirv-headers-version;/SPIRV-Headers-&spirv-headers-version;.tar.gz">
-  <!ENTITY spirv-headers-download-ftp  " ">
-  <!ENTITY spirv-headers-md5sum        "438892138fe25c123cdacd05eb4a4b17">
-  <!ENTITY spirv-headers-size          "464 KB">
-  <!ENTITY spirv-headers-buildsize     "3.7 MB">
-  <!ENTITY spirv-headers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="spirv-headers" xreflabel="SPIRV-Headers-&spirv-headers-version;">
-  <?dbhtml filename="spirv-headers.html"?>
-
-  <title>SPIRV-Headers-&spirv-headers-version;</title>
-
-  <indexterm zone="spirv-headers">
-    <primary sortas="a-spirv-headers">SPIRV-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SPIRV-Headers</title>
-
-    <para>
-      The <application>SPIRV-Headers</application> package contains headers
-      that allow for applications to the SPIR-V language and instruction set
-      with Vulkan. SPIR-V is a binary intermediate language for representing
-      graphical shader stages and compute kernels for multiple Khronos APIs,
-      including OpenGL and Vulkan.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spirv-headers-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spirv-headers-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spirv-headers-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spirv-headers-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spirv-headers-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spirv-headers-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SPIRV-Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SPIRV-Headers</title>
-
-    <note>
-      <para>
-        This tarball
-        <filename>SPIRV-Headers-&spirv-headers-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">SPIRV-Headers-vulkan-sdk-&spirv-headers-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>SPIRV-Headers</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -G Ninja .. &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/spirv and
-          /usr/share/cmake/SPIRV-Headers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-</sect1>
Index: neral/genlib/spirv-tools.xml
===================================================================
--- general/genlib/spirv-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spirv-tools-download-http "https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-&spirv-tools-version;/SPIRV-Tools-&spirv-tools-version;.tar.gz">
-  <!ENTITY spirv-tools-download-ftp  " ">
-  <!ENTITY spirv-tools-md5sum        "d55af678b61667313d478db9399c09d4">
-  <!ENTITY spirv-tools-size          "3.0 MB">
-  <!ENTITY spirv-tools-buildsize     "59 MB">
-  <!ENTITY spirv-tools-time          "0.9 SBU (with tests; both using parallelism=8)">
-]>
-
-<sect1 id="spirv-tools" xreflabel="SPIRV-Tools-&spirv-tools-version;">
-  <?dbhtml filename="spirv-tools.html"?>
-
-  <title>SPIRV-Tools-&spirv-tools-version;</title>
-
-  <indexterm zone="spirv-tools">
-    <primary sortas="a-spirv-tools">SPIRV-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SPIRV-Tools</title>
-
-    <para>
-      The <application>SPIRV-Tools</application> package contains libraries
-      and utilities for processing SPIR-V modules.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spirv-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spirv-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spirv-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spirv-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spirv-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spirv-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SPIRV-Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="spirv-headers"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SPIRV-Tools</title>
-
-    <note>
-      <para>
-        This tarball
-        <filename>SPIRV-Tools-&spirv-tools-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">SPIRV-Tools-vulkan-sdk-&spirv-tools-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>SPIRV-Tools</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      \
-      -DSPIRV_WERROR=OFF              \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DSPIRV_TOOLS_BUILD_STATIC=OFF  \
-      -DSPIRV-Headers_SOURCE_DIR=/usr \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DSPIRV_WERROR=OFF</parameter>: This switch stops the build
-      system from treating warnings as errors.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces the
-      build system to install shared libraries instead of static libraries.
-    </para>
-    
-    <para>
-      <parameter>-DSPIRV_TOOLS_BUILD_STATIC=OFF</parameter>: This switch
-      disables building static versions of the libraries.
-    </para>
-
-    <para>
-      <parameter>-DSPIRV-Headers_SOURCE_DIR</parameter>: This switch tells the
-      build system that <xref linkend="spirv-headers" role="nodep"/> is
-      installed in /usr. This is needed since the build system tries to use an
-      internal copy by default.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          spirv-as,
-          spirv-cfg,
-          spirv-dis,
-          spirv-lesspipe.sh,
-          spirv-link,
-          spirv-lint,
-          spirv-objdump,
-          spirv-opt,
-          spirv-reduce, and
-          spirv-val
-        </seg>
-        <seg>
-          libSPIRV-Tools-diff.so,
-          libSPIRV-Tools-link.so,
-          libSPIRV-Tools-lint.so,
-          libSPIRV-Tools-opt.so,
-          libSPIRV-Tools-reduce.so,
-          libSPIRV-Tools-shared.so, and
-          libSPIRV-Tools.so
-        </seg>
-        <seg>
-          /usr/include/spirv-tools and
-          /usr/lib/cmake/SPIRV-Tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="spirv-as">
-        <term><command>spirv-as</command></term>
-        <listitem>
-          <para>
-            creates a SPIR-V binary module from SPIR-V assembly text
-          </para>
-          <indexterm zone="spirv-tools spirv-as">
-            <primary sortas="b-spirv-as">spirv-as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-cfg">
-        <term><command>spirv-cfg</command></term>
-        <listitem>
-          <para>
-            shows the control flow graph in "dot" format
-          </para>
-          <indexterm zone="spirv-tools spirv-cfg">
-            <primary sortas="b-spirv-cfg">spirv-cfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-dis">
-        <term><command>spirv-dis</command></term>
-        <listitem>
-          <para>
-            disassembles a SPIR-V binary module
-          </para>
-          <indexterm zone="spirv-tools spirv-dis">
-            <primary sortas="b-spirv-dis">spirv-dis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-lesspipe.sh">
-        <term><command>spirv-lesspipe.sh</command></term>
-        <listitem>
-          <para>
-            automatically disassembles a .SPV file for 'less'
-          </para>
-          <indexterm zone="spirv-tools spirv-lesspipe.sh">
-            <primary sortas="b-spirv-lesspipe.sh">spirv-lesspipe.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-link">
-        <term><command>spirv-link</command></term>
-        <listitem>
-          <para>
-            links SPIR-V binary files together
-          </para>
-          <indexterm zone="spirv-tools spirv-link">
-            <primary sortas="b-spirv-link">spirv-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-lint">
-        <term><command>spirv-lint</command></term>
-        <listitem>
-          <para>
-            checks a SPIR-V binary module for errors
-          </para>
-          <indexterm zone="spirv-tools spirv-lint">
-            <primary sortas="b-spirv-lint">spirv-lint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-objdump">
-        <term><command>spirv-objdump</command></term>
-        <listitem>
-          <para>
-            dumps information from a SPIR-V binary
-          </para>
-          <indexterm zone="spirv-tools spirv-objdump">
-            <primary sortas="b-spirv-objdump">spirv-objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-opt">
-        <term><command>spirv-opt</command></term>
-        <listitem>
-          <para>
-            performs optimizations on SPIR-V binary files
-          </para>
-          <indexterm zone="spirv-tools spirv-opt">
-            <primary sortas="b-spirv-opt">spirv-opt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-reduce">
-        <term><command>spirv-reduce</command></term>
-        <listitem>
-          <para>
-            reduces a SPIR-V binary file
-          </para>
-          <indexterm zone="spirv-tools spirv-reduce">
-            <primary sortas="b-spirv-reduce">spirv-reduce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-val">
-        <term><command>spirv-val</command></term>
-        <listitem>
-          <para>
-            validates a SPIR-V binary file
-          </para>
-          <indexterm zone="spirv-tools spirv-val">
-            <primary sortas="b-spirv-val">spirv-val</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSPIRV-Tools">
-        <term><filename class="libraryfile">libSPIRV-Tools.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for processing SPIR-V modules
-          </para>
-          <indexterm zone="spirv-tools libSPIRV-Tools">
-            <primary sortas="c-libSPIRV-Tools">libSPIRV-Tools.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
-  <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "d29bdf75ce181e148c46b16a83de6d76">
-  <!ENTITY talloc-size          "664 KB">
-  <!ENTITY talloc-buildsize     "10 MB (with tests)">
-  <!ENTITY talloc-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="talloc" xreflabel="Talloc-&talloc-version;">
-  <?dbhtml filename="talloc.html"?>
-
-
-  <title>Talloc-&talloc-version;</title>
-
-  <indexterm zone="talloc">
-    <primary sortas="a-Talloc">Talloc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Talloc</title>
-
-    <para>
-      <application>Talloc</application> provides a hierarchical, reference
-      counted memory pool system with destructors. It is the core memory
-      allocator used in <application>Samba</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&talloc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&talloc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &talloc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &talloc-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &talloc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &talloc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Talloc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (To generate man pages),
-      <xref linkend="gdb"/>,
-      <xref linkend="git"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="valgrind"/>, and
-      <xref linkend="xfsprogs"/>
-      <!-- These are all looked for at build time, but might not actually be used.-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Talloc</title>
-
-    <para>
-      Install <application>Talloc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-
-  </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>
-          libpytalloc-util.&python3-lib-suffix;.so,
-          libtalloc.so, and
-          talloc.&python3-lib-suffix;.so (Python 3 Module)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtalloc">
-        <term><filename class="libraryfile">libtalloc.so</filename></term>
-        <listitem>
-          <para>
-            contains a replacement for the <application>Glibc</application>
-            malloc function
-          </para>
-          <indexterm zone="talloc libtalloc">
-            <primary sortas="c-libtalloc">libtalloc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,215 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 telepathy-glib-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "a3a75657e9389381b44fee1680f770a7">
-  <!ENTITY telepathy-glib-size          "3.7 MB">
-  <!ENTITY telepathy-glib-buildsize     "256 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/telepathy-glib-&telepathy-glib-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Glib</title>
-
-<!--
-    <para>
-      First, apply a patch to fix several bugs discovered after
-      release:
-    </para>
-
-<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>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>PYTHON=/usr/bin/python3 ./configure --prefix=/usr          \
-                                    --enable-vala-bindings \
-                                    --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      <!--Four tests are known to fail: <emphasis>test-account</emphasis>,
-      <emphasis>test-cm</emphasis>, <emphasis>test-contact-lists</emphasis>, and
-      <emphasis>test-contact-list-client</emphasis>.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-vala-bindings</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/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/uchardet.xml
===================================================================
--- general/genlib/uchardet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 uchardet-download-http "https://www.freedesktop.org/software/uchardet/releases/uchardet-&uchardet-version;.tar.xz">
-  <!ENTITY uchardet-download-ftp  " ">
-  <!ENTITY uchardet-md5sum        "9e267be7aee81417e5875086dd9d44fd">
-  <!ENTITY uchardet-size          "217 KB">
-  <!ENTITY uchardet-buildsize     "4.6 MB (with test)">
-  <!ENTITY uchardet-time          "less than 0.1 SBU (with test)">
-
-]>
-
-<sect1 id="uchardet" xreflabel="uchardet-&uchardet-version;">
-  <?dbhtml filename="uchardet.html"?>
-
-
-  <title>Uchardet-&uchardet-version;</title>
-
-  <indexterm zone="uchardet">
-    <primary sortas="a-uchardet">uchardet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Uchardet</title>
-
-    <para>
-      The <application>Uchardet</application> package contains an encoding
-      detectory library which takes a sequence of bytes in an unknown character
-      encoding and attempts to determine the encoding of the text.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&uchardet-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&uchardet-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &uchardet-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &uchardet-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &uchardet-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &uchardet-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Uchardet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Uchardet</title>
-
-    <para>
-      Install <application>Uchardet</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_STATIC=OFF          \
-      -Wno-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_STATIC=OFF</parameter>: This switch disables building
-      the static version of the library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          uchardet
-        </seg>
-        <seg>
-          libuchardet.so
-        </seg>
-        <seg>
-          /usr/include/uchardet
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="uchardet-prog">
-        <term><command>uchardet</command></term>
-        <listitem>
-          <para>
-            detects what character set is used inside of a file
-          </para>
-          <indexterm zone="uchardet uchardet-prog">
-            <primary sortas="b-uchardet">uchardet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuchardet">
-        <term><filename class="libraryfile">libuchardet.so</filename></term>
-        <listitem>
-          <para>
-            provides an API for detecting the encoding of text in a file
-          </para>
-          <indexterm zone="uchardet libuchardet">
-            <primary sortas="c-libuchardet">libuchardet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/umockdev.xml
===================================================================
--- general/genlib/umockdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 umockdev-download-http "https://github.com/martinpitt/umockdev/releases/download/&umockdev-version;/umockdev-&umockdev-version;.tar.xz">
-  <!ENTITY umockdev-download-ftp  " ">
-  <!ENTITY umockdev-md5sum        "74342306a6d25e266dfa2a7b7695c2e1">
-  <!ENTITY umockdev-size          "484 KB">
-  <!ENTITY umockdev-buildsize     "6.8 MB (with tests)">
-  <!ENTITY umockdev-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="umockdev" xreflabel="umockdev-&umockdev-version;">
-  <?dbhtml filename="umockdev.html"?>
-
-
-  <title>Umockdev-&umockdev-version;</title>
-
-  <indexterm zone="umockdev">
-    <primary sortas="a-umockdev">umockdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Umockdev</title>
-
-    <para>
-      The <application>Umockdev</application> package contains a framework
-      that allows a developer to mock devices for use in unit testing.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&umockdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&umockdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &umockdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &umockdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &umockdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &umockdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Umockdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>,
-      <xref linkend="libpcap"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink> (optional for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Umockdev</title>
-
-    <para>
-      Install <application>Umockdev</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue as the &root; user: <command>ninja test</command>.
-      One test needs to be run in an X session.
-    </para>
-
-    <para>
-      Now, as the &root; 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" role="nodep"/> installed and wish to rebuild and
-      install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-           umockdev-record,
-           umockdev-run, and
-           umockdev-wrapper
-        </seg>
-        <seg>
-          libumockdev-preload.so <!-- Only intended for use by
-          umockdev-wrapper. Don't put in a short description for this--> and
-          libumockdev.so
-        </seg>
-        <seg>
-          /usr/include/umockdev-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="umockdev-record">
-        <term><command>umockdev-record</command></term>
-        <listitem>
-          <para>
-            records Linux devices and their ancestors from sysfs/udev or
-            records ioctls for a device
-          </para>
-          <indexterm zone="umockdev umockdev-record">
-            <primary sortas="b-umockdev-record">umockdev-record</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umockdev-run">
-        <term><command>umockdev-run</command></term>
-        <listitem>
-          <para>
-            runs a program under an <application>umockdev</application>
-            testbed
-          </para>
-          <indexterm zone="umockdev umockdev-run">
-            <primary sortas="b-umockdev-run">umockdev-run</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umockdev-wrapper">
-        <term><command>umockdev-wrapper</command></term>
-        <listitem>
-          <para>
-            wraps a program around
-            <filename class="libraryfile">libumockdev-preload.so.0</filename>
-            through LD_PRELOAD
-          </para>
-          <indexterm zone="umockdev umockdev-wrapper">
-            <primary sortas="b-umockdev-wrapper">umockdev-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libumockdev">
-        <term><filename class="libraryfile">libumockdev.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions that allow mocking hardware devices for unit
-            testing
-          </para>
-          <indexterm zone="umockdev libumockdev">
-            <primary sortas="c-libumockdev">libumockdev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/utfcpp.xml
===================================================================
--- general/genlib/utfcpp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 utfcpp-download-http "https://github.com/nemtrif/utfcpp/archive/v&utfcpp-version;/utfcpp-&utfcpp-version;.tar.gz">
-  <!ENTITY utfcpp-download-ftp  " ">
-  <!ENTITY utfcpp-md5sum        "8e0fe13266a7fa02f61340bf399986c3">
-  <!ENTITY utfcpp-size          "36 KB">
-  <!ENTITY utfcpp-buildsize     "496 KB">
-  <!ENTITY utfcpp-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="utfcpp" xreflabel="utfcpp-&utfcpp-version;">
-  <?dbhtml filename="utfcpp.html"?>
-
-  <title>utfcpp-&utfcpp-version;</title>
-
-  <indexterm zone="utfcpp">
-    <primary sortas="a-utfcpp">utfcpp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to utfcpp</title>
-
-    <para>
-      The <application>utfcpp</application> package contains a set of
-      include files to provide UTF-8 with C++ in a Portable Way.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&utfcpp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&utfcpp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &utfcpp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &utfcpp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &utfcpp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &utfcpp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">utfcpp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of utfcpp</title>
-
-    <para>
-      Install <application>utfcpp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..</userinput></screen>
-<!-- Running make does nothing -->
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/utfcpp and
-          /usr/share/utfcpp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: neral/genlib/wayland-protocols.xml
===================================================================
--- general/genlib/wayland-protocols.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wayland-protocols-download-http "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/&wayland-protocols-version;/downloads/wayland-protocols-&wayland-protocols-version;.tar.xz">
-  <!ENTITY wayland-protocols-download-ftp  " ">
-  <!ENTITY wayland-protocols-md5sum        "cd0f2a1ab6e54568e4f856f140dedca9">
-  <!ENTITY wayland-protocols-size          "96 KB">
-  <!ENTITY wayland-protocols-buildsize     "8.9 MB (with tests)">
-  <!ENTITY wayland-protocols-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="wayland-protocols" xreflabel="wayland-protocols-&wayland-protocols-version;">
-  <?dbhtml filename="wayland-protocols.html"?>
-
-
-  <title>Wayland-Protocols-&wayland-protocols-version;</title>
-
-  <indexterm zone="wayland-protocols">
-    <primary sortas="a-wayland-protocols">wayland-protocols</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wayland-Protocols</title>
-
-    <para>
-      The <application>Wayland-Protocols</application> package contains
-      additional Wayland protocols that add functionality outside of
-      protocols already in the Wayland core.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wayland-protocols-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wayland-protocols-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wayland-protocols-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wayland-protocols-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wayland-protocols-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wayland-protocols-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wayland-protocols Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="wayland"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wayland-protocols</title>
-
-    <para>
-      Install <application>Wayland-protocols</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/wayland-protocols
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: neral/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wayland-download-http "https://gitlab.freedesktop.org/wayland/wayland/-/releases/&wayland-version;/downloads/wayland-&wayland-version;.tar.xz">
-  <!ENTITY wayland-download-ftp  " ">
-  <!ENTITY wayland-md5sum        "7410ab549e3928fce9381455b17b0803">
-  <!ENTITY wayland-size          "228 KB">
-  <!ENTITY wayland-buildsize     "7.4 MB (with tests)">
-  <!ENTITY wayland-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="wayland" xreflabel="Wayland-&wayland-version;">
-  <?dbhtml filename="wayland.html"?>
-
-
-  <title>Wayland-&wayland-version;</title>
-
-  <indexterm zone="wayland">
-    <primary sortas="a-Wayland">Wayland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wayland</title>
-
-    <para>
-      <application>Wayland</application> is a project to define a protocol
-      for a compositor to talk to its clients as well as a library
-      implementation of the protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wayland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wayland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wayland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wayland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wayland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wayland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wayland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/> and
-      <xref linkend="xmlto"/> (to build the API documentation) and
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (to build the manual pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wayland</title>
-
-    <para>
-      Install <application>Wayland</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Ddocumentation=false &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      <!-- If XDG_RUNTIME_DIR is set but the value is a non-exist path,
-           19 tests will fail.  Unfortunately BLFS /etc/profile sets
-           XDG_RUNTIME_DIR but does not create it.  For now simply unset
-           the variable.  -->
-      To test the results, issue:
-      <command>env -u XDG_RUNTIME_DIR 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>-Ddocumentation=false</parameter>: This switch is used to
-      disable building of the API documentation. Remove it if you have
-      installed optional dependencies.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wayland-scanner
-        </seg>
-        <seg>
-          libwayland-client.so,
-          libwayland-cursor.so,
-          libwayland-egl.so,
-          and libwayland-server.so
-        </seg>
-        <seg>
-          /usr/share/wayland
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wayland-scanner">
-        <term><command>wayland-scanner</command></term>
-        <listitem>
-          <para>
-            is a tool to generate proxy methods in wayland-client-protocol.h
-            and wayland-server-protocol.h
-          </para>
-          <indexterm zone="wayland wayland-scanner">
-            <primary sortas="b-wayland-scanner">wayland-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-client">
-        <term><filename class="libraryfile">libwayland-client.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for writing <application>Wayland</application>
-            applications
-          </para>
-          <indexterm zone="wayland libwayland-client">
-            <primary sortas="c-libwayland-client">libwayland-client.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-cursor">
-        <term><filename class="libraryfile">libwayland-cursor.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for managing cursors in <application>Wayland</application>
-            applications
-          </para>
-          <indexterm zone="wayland libwayland-cursor">
-            <primary sortas="c-libwayland-cursor">libwayland-cursor.so</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            contains API functions for writing <application>Wayland</application>
-            compositors
-          </para>
-          <indexterm zone="wayland libwayland-server">
-            <primary sortas="c-libwayland-server">libwayland-server.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/wv.xml
===================================================================
--- general/genlib/wv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wv-download-http   "&sources-anduin-http;/wv/wv-&wv-version;.tar.gz">
-  <!ENTITY wv-download-ftp    " ">
-  <!ENTITY wv-md5sum          "dbccf2e9f747e50c913b7e3d126b73f7">
-  <!ENTITY wv-size            "608 KB">
-  <!ENTITY wv-buildsize       "25 MB">
-  <!ENTITY wv-time            "0.4 SBU">
-]>
-
-<sect1 id="wv" xreflabel="wv-&wv-version;">
-  <?dbhtml filename="wv.html"?>
-
-
-  <title>wv-&wv-version;</title>
-
-  <indexterm zone="wv">
-    <primary sortas="a-Wv">Wv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to wv</title>
-
-    <para>
-      The <application>wv</application> package contains tools for reading
-      information from an MS Word document.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">wv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgsf"/> and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of wv</title>
-
-    <para>
-      Install <application>wv</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>wvSummary and several other wv* programs which are deprecated in
-        favour of abiword: see
-        <ulink url="https://wvware.sourceforge.net/"/></seg>
-        <seg>libwv-1.2.so</seg>
-        <seg>/usr/share/wv</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wv-prog">
-        <term><command>wvSummary</command></term>
-        <listitem>
-          <para>
-            displays the summary information from an MS Word document
-          </para>
-          <indexterm zone="wv wv-prog">
-            <primary sortas="b-wv">wv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwv-1.2">
-        <term><filename class="libraryfile">libwv-1.2.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to access MS Word documents
-          </para>
-          <indexterm zone="wv libwv-1.2">
-            <primary sortas="c-libwv-1.2">libwv-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,355 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xapian-download-http
-           "https://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
-  <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "b570c2e47f157bee29584994657aafbb">
-  <!ENTITY xapian-size          "3.1 MB">
-  <!ENTITY xapian-buildsize     "144 MB (add 162 MB for tests)">
-  <!ENTITY xapian-time          "0.5 SBU (add 3.5 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="xapian" xreflabel="xapian-&xapian-version;">
-  <?dbhtml filename="xapian.html"?>
-
-
-  <title>Xapian-&xapian-version;</title>
-
-  <indexterm zone="xapian">
-    <primary sortas="a-xapian">xapian</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xapian</title>
-
-    <para>
-      Xapian is an open source search engine library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xapian-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xapian-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xapian-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xapian-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xapian-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xapian-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xapian Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xapian</title>
-    <!-- Interesting footnote - SSE support is only enabled on i686.
-    There seems to be some trickery involved in that. It's not essential
-    to operation on x86_64 though, so look into it at the next version of
-    xapian. -->
-
-    <para>
-      Install <application>Xapian</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/xapian-core-&xapian-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!--
-      The regression tests are not recommended.  On a fast (3.2 GHz i7)
-      system they took over five hours and two of four tests (the valgrind
-      tests) failed.  To run the test suite anyway,
-      issue: <command>make check</command>.
-      The tests with 1.4.15 took under an hour, at 34 SBU total. Marking
-      the test suite as usable again. I had four passes and 0 failures:
-      PASS: apitest
-      PASS: internaltest
-      PASS: stemtest
-      PASS: unittest
-      I did have Valgrind installed too. -renodr -->
-      To run the test suite, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          copydatabase, quest, simpleexpand, simpleindex, simplesearch,
-          xapian-check, xapian-compact, xapian-config,
-          xapian-delve, xapian-metadata, xapian-pos, xapian-progsrv,
-          xapian-replicate, xapian-replicate-server and xapian-tcpsrv
-        </seg>
-        <seg>
-          libxapian.so
-        </seg>
-        <seg>
-          /usr/include/xapian,
-          /usr/lib/cmake/xapian,
-          /usr/share/doc/xapian-core-&xapian-version;, and
-          /usr/share/xapian-core
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="copydatabase">
-        <term><command>copydatabase</command></term>
-        <listitem>
-          <para>
-            performs a document-by-document copy of one or more
-            <application>Xapian</application> databases
-          </para>
-          <indexterm zone="xapian copydatabase">
-            <primary sortas="b-copydatabase">copydatabase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="quest">
-        <term><command>quest</command></term>
-        <listitem>
-          <para>
-            is a command line tool to search through a database
-          </para>
-          <indexterm zone="xapian quest">
-            <primary sortas="b-quest">quest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleexpand">
-        <term><command>simpleexpand</command></term>
-        <listitem>
-          <para>
-            is a simple example program demonstrating query expansion
-          </para>
-          <indexterm zone="xapian simpleexpand">
-            <primary sortas="b-simpleexpand">simpleexpand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleindex">
-        <term><command>simpleindex</command></term>
-        <listitem>
-          <para>
-            indexes each paragraph of a text file as a
-            <application>Xapian</application> document
-          </para>
-          <indexterm zone="xapian simpleindex">
-            <primary sortas="b-simpleindex">simpleindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simplesearch">
-        <term><command>simplesearch</command></term>
-        <listitem>
-          <para>
-            is a simple command line search utility
-          </para>
-          <indexterm zone="xapian simplesearch">
-            <primary sortas="b-simplesearch">simplesearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-check">
-        <term><command>xapian-check</command></term>
-        <listitem>
-          <para>
-            checks the consistency of a database or table
-          </para>
-          <indexterm zone="xapian xapian-check">
-            <primary sortas="b-xapian-check">xapian-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="xapian-chert-update">
-        <term><command>xapian-chert-update</command></term>
-        <listitem>
-          <para>
-            update a chert database to the new format keys.
-          </para>
-          <indexterm zone="xapian xapian-chert-update">
-            <primary sortas="b-xapian-chert-update">xapian-chert-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      No longer installed in 1.4.15. - renodr
-      -->
-
-      <varlistentry id="xapian-compact">
-        <term><command>xapian-compact</command></term>
-        <listitem>
-          <para>
-            compacts a database, or merges and compacts several databases
-          </para>
-          <indexterm zone="xapian xapian-compact">
-            <primary sortas="b-xapian-compact">xapian-compact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-config">
-        <term><command>xapian-config</command></term>
-        <listitem>
-          <para>
-            reports information about the installed version of xapian
-          </para>
-          <indexterm zone="xapian xapian-config">
-            <primary sortas="b-xapian-config">xapian-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-delve">
-        <term><command>xapian-delve</command></term>
-        <listitem>
-          <para>
-            inspects the contents of a <application>Xapian</application>
-            database
-          </para>
-          <indexterm zone="xapian xapian-delve">
-            <primary sortas="b-xapian-delve">xapian-delve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-metadata">
-        <term><command>xapian-metadata</command></term>
-        <listitem>
-          <para>
-            reads and writes user metadata
-          </para>
-          <indexterm zone="xapian xapian-metadata">
-            <primary sortas="b-xapian-metadata">xapian-metadata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-pos">
-        <term><command>xapian-pos</command></term>
-        <listitem>
-          <para>
-            inspects the contents of a flint table for development or debugging
-          </para>
-          <indexterm zone="xapian xapian-pos">
-            <primary sortas="b-xapian-pos">xapian-pos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-progsrv">
-        <term><command>xapian-progsrv</command></term>
-        <listitem>
-          <para>
-            is a remote server for use with <application>ProgClient</application>
-          </para>
-          <indexterm zone="xapian xapian-progsrv">
-            <primary sortas="b-xapian-progsrv">xapian-progsrv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-replicate">
-        <term><command>xapian-replicate</command></term>
-        <listitem>
-          <para>
-            replicates a database from a master server to a local copy
-          </para>
-          <indexterm zone="xapian xapian-replicate">
-            <primary sortas="b-xapian-replicate">xapian-replicate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-replicate-server">
-        <term><command>xapian-replicate-server</command></term>
-        <listitem>
-          <para>
-            services database replication requests from clients
-          </para>
-          <indexterm zone="xapian xapian-replicate-server">
-            <primary sortas="b-xapian-replicate-server">xapian-replicate-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-tcpsrv">
-        <term><command>xapian-tcpsrv</command></term>
-        <listitem>
-          <para>
-            is the TCP daemon for use with <application>Xapian</application>'s
-            remote backend
-          </para>
-          <indexterm zone="xapian xapian-tcpsrv">
-            <primary sortas="b-xapian-tcpsrv">xapian-tcpsrv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/zlib.xml
===================================================================
--- general/genlib/zlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/zlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect1 id="zlib" xreflabel="zlib-&zlib-version;">
+<?dbhtml filename="zlib.html" dir="general"?>
+<title>zlib-&zlib-version;</title>
+
+<para>Zlib provides compression and decompression functions to programs.
+Most people will want zlib because both servers and clients are 
+likely to need the openssl libraries which in turn require zlib.
+Servers will want openssl because it is needed for running OpenSSH services and
+clients because most web browsers need it to deal with https (secure)
+websites.</para>
+
+&zlib-intro;
+&zlib-inst;
+&zlib-exp;
+&zlib-config;
+&zlib-desc;
+
+</sect1>
+
Index: neral/genutils/asciidoctor.xml
===================================================================
--- general/genutils/asciidoctor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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        "6a733671b337c518d7ecc39240885ed0">
-  <!ENTITY asciidoctor-size          "1.6 MB">
-  <!ENTITY asciidoctor-buildsize     "5.5 MB">
-  <!ENTITY asciidoctor-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="asciidoctor" xreflabel="asciidoctor-&asciidoctor-version;">
-  <?dbhtml filename="asciidoctor.html"?>
-
-
-  <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>
-
-    &lfs121_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>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Asciidoctor</title>
-
-    <note>
-      <para>
-        When building this package, the following message may appear:
-        <screen>fatal: not a git repository (or any of the parent directories): .git</screen>.
-        This is normal, and the package will continue building past this point.
-      </para>
-    </note>
-
-    <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/bc.xml
===================================================================
--- general/genutils/bc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genutils/bc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="bc" xreflabel="bc">
+<?dbhtml filename="bc.html" dir="general"?>
+<title>bc</title>
+
+<para>NEW ITEM - TO BE DONE</para>
+
+</sect1>
+
Index: general/genutils/bc/bc.ent
===================================================================
--- general/genutils/bc/bc.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genutils/bc/bc.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY bc SYSTEM "../bc.xml">
Index: neral/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,277 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bogofilter-download-http "&sourceforge-dl;/bogofilter/bogofilter-&bogofilter-version;.tar.xz">
-  <!ENTITY bogofilter-download-ftp  " ">
-  <!ENTITY bogofilter-md5sum        "8763f87adfff7b802ced177d8c654539">
-  <!ENTITY bogofilter-size          "784 KB">
-  <!ENTITY bogofilter-buildsize     "19 MB">
-  <!ENTITY bogofilter-time          "0.1 SBU">
-]>
-
-<sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;">
-  <?dbhtml filename="bogofilter.html"?>
-
-
-  <title>Bogofilter-&bogofilter-version;</title>
-
-  <indexterm zone="bogofilter">
-    <primary sortas="a-Bogofilter">Bogofilter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Bogofilter</title>
-
-    <para>
-      The <application>Bogofilter</application> application is a mail filter that classifies
-      mail as spam or ham (non-spam) by a statistical analysis of the message's header and
-      content (body).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bogofilter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bogofilter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bogofilter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bogofilter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bogofilter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bogofilter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bogofilter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gsl"/>,
-      <xref linkend="libxml2"/>, and
-      <!-- 'required' to make this strong to jhalfs -->
-      <xref role='required' linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lmdb"/>,
-      <xref linkend="xmlto"/>,
-      &berkeley-db;,
-      <ulink url="https://dbmx.net/qdbm/">QDBM</ulink> and
-      <ulink url="https://dbmx.net/tokyocabinet/">TokyoCabinet</ulink>
-    </para>
-
-    <note>
-      <para>
-        If you do not install the recommended <xref linkend="gsl"/> package
-        then a statically linked shipped version will be used instead.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bogofilter</title>
-
-    <note>
-      <para>
-        If you plan to change the version of your database library on an
-        existing installation, or to change to a different database, read the
-        warning at the top of the RELEASE.NOTES file.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Bogofilter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc/bogofilter \
-            --with-database=sqlite3      &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-database=sqlite3</parameter>: This switch makes
-      Bogofilter use <xref linkend='sqlite'/> as the database, instead of
-      Berkeley DB<!-- which is beyond the scope of BLFS (slated for removal)-->.
-    </para>
-
-    <para>
-      <option>--with-database={lmdb,qdbm,tokyocabinet}</option>: This switch
-      also allows to use lmdb, qdbm, or tokyocabinet as the database.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bf_compact, bf_copy, bf_tar, bogofilter, bogolexer, bogotune,
-          bogoupgrade and bogoutil
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/bogofilter
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bf_compact">
-        <term><command>bf_compact</command></term>
-        <listitem>
-          <para>
-            creates a more compact bogofilter working directory with a
-            dump/load cycle
-          </para>
-          <indexterm zone="bogofilter bf_compact">
-            <primary sortas="b-bf_compact">bf_compact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bf_copy">
-        <term><command>bf_copy</command></term>
-        <listitem>
-          <para>
-            copies a bogofilter working directory to another directory
-          </para>
-          <indexterm zone="bogofilter bf_copy">
-            <primary sortas="b-bf_copy">bf_copy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bf_tar">
-        <term><command>bf_tar</command></term>
-        <listitem>
-          <para>
-            bundles a bogofilter working directory in tar format and
-            copies it to standard output
-          </para>
-          <indexterm zone="bogofilter bf_tar">
-            <primary sortas="b-bf_tar">bf_tar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogofilter-prog">
-        <term><command>bogofilter</command></term>
-        <listitem>
-          <para>
-            is a fast Bayesian spam filter
-          </para>
-          <indexterm zone="bogofilter bogofilter-prog">
-            <primary sortas="b-bogofilter">bogofilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogolexer">
-        <term><command>bogolexer</command></term>
-        <listitem>
-          <para>
-            is used to separate messages into tokens and to test new
-            versions of the lexer.l code
-          </para>
-          <indexterm zone="bogofilter bogolexer">
-            <primary sortas="b-bogolexer">bogolexer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogotune">
-        <term><command>bogotune</command></term>
-        <listitem>
-          <para>
-            attempts to find optimum parameter settings for bogofilter
-          </para>
-          <indexterm zone="bogofilter bogotune">
-            <primary sortas="b-bogotune">bogotune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogoupgrade">
-        <term><command>bogoupgrade</command></term>
-        <listitem>
-          <para>
-            upgrades the bogofilter database to the current version
-          </para>
-          <indexterm zone="bogofilter bogoupgrade">
-            <primary sortas="b-bogoupgrade">bogoupgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogoutil">
-        <term><command>bogoutil</command></term>
-        <listitem>
-          <para>
-            dumps, loads, and maintains bogofilter database files
-          </para>
-          <indexterm zone="bogofilter bogoutil">
-            <primary sortas="b-bogoutil">bogoutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 compface-download-http "&sources-anduin-http;/compface/compface-&compface-version;.tar.gz">
-  <!ENTITY compface-download-ftp  " ">
-  <!ENTITY compface-md5sum        "62f4f79c0861ad292ba3cf77b4c48319">
-  <!ENTITY compface-size          "47 KB">
-  <!ENTITY compface-buildsize     "520 KB">
-  <!ENTITY compface-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="compface" xreflabel="Compface-&compface-version;">
-  <?dbhtml filename="compface.html"?>
-
-
-  <title>Compface-&compface-version;</title>
-
-  <indexterm zone="compface">
-    <primary sortas="a-Compface">Compface</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Compface</title>
-
-    <para>
-      <application>Compface</application> provides utilities and a library to
-      convert from/to X-Face format, a 48x48 bitmap format used to carry
-      thumbnails of email authors in a mail header.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&compface-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&compface-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &compface-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &compface-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &compface-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &compface-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Compface</title>
-
-    <para>
-      Install <application>Compface</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &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;
-install -m755 -v xbm2xface.pl /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>compface, uncompface and xbm2xface.pl</seg>
-        <seg>libcompface.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="compface-prog">
-        <term><command>compface</command></term>
-        <listitem>
-          <para>
-            is a filter for generating highly compressed representations
-            of 48x48x1 face image files
-          </para>
-          <indexterm zone="compface compface-prog">
-            <primary sortas="b-compface">compface</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uncompface">
-        <term><command>uncompface</command></term>
-        <listitem>
-          <para>
-            is an inverse filter which performs an inverse
-            transformation with no loss of data
-          </para>
-          <indexterm zone="compface uncompface">
-            <primary sortas="b-uncompface">uncompface</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xbm2xface">
-        <term><command>xbm2xface.pl</command></term>
-        <listitem>
-          <para>
-            is a script to generate xfaces
-          </para>
-          <indexterm zone="compface xbm2xface">
-            <primary sortas="b-xbm2xface.pl">xbm2xface.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcompface">
-        <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
-          </para>
-          <indexterm zone="compface libcompface">
-            <primary sortas="c-libcompface">libcompface.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 desktop-file-utils-download-http
-           "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-&desktop-file-utils-version;.tar.xz">
-  <!ENTITY desktop-file-utils-download-ftp  " ">
-  <!ENTITY desktop-file-utils-md5sum        "fdf9215aea91acb6aebc43f770537f2c">
-  <!ENTITY desktop-file-utils-size          "80 KB">
-  <!ENTITY desktop-file-utils-buildsize     "1.2 MB">
-  <!ENTITY desktop-file-utils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="desktop-file-utils" xreflabel="desktop-file-utils-&desktop-file-utils-version;">
-  <?dbhtml filename="desktop-file-utils.html"?>
-
-
-  <title>desktop-file-utils-&desktop-file-utils-version;</title>
-
-  <indexterm zone="desktop-file-utils">
-    <primary sortas="a-desktop-file-utils">desktop-file-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Desktop File Utils</title>
-
-    <para>
-      The <application>Desktop File Utils</application> package contains
-      command line utilities for working with <ulink
-      url="https://standards.freedesktop.org/desktop-entry-spec/latest/">
-      Desktop entries</ulink>. These utilities are used by Desktop
-      Environments and other applications to manipulate the MIME-types
-      application databases and help adhere to the Desktop Entry
-      Specification.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&desktop-file-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&desktop-file-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &desktop-file-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &desktop-file-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &desktop-file-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &desktop-file-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Desktop File Utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Desktop File Utils</title>
-
-    <warning>
-      <para>
-        If you are upgrading from a previous version of desktop-file-utils that
-        used the Autotools method of installing and configuring the package,
-        you must remove the desktop-file-edit symlink by using the following
-        commands.
-      </para>
-    </warning>
-    <!-- Works around a bug in meson's symlink creation exposed by this package -->
-
-<screen role="root"><userinput>rm -fv /usr/bin/desktop-file-edit</userinput></screen>
-
-    <para>
-      Install <application>Desktop File Utils</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="configuration">
-    <title>Configuring Desktop File Utils</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <ulink
-        url="https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
-        Base Directory</ulink> specification defines the standard locations for
-        applications to place data and configuration files. These files can be
-        used, for instance, to define the menu structure and menu items in a
-        desktop environment.
-      </para>
-
-      <para>
-        The default location for configuration files to be installed
-        is <filename class="directory">/etc/xdg</filename>, and the default
-        locations for data files are <filename
-        class="directory">/usr/local/share</filename> and <filename
-        class="directory">/usr/share</filename>. These locations can be
-        extended with the environment variables <envar>XDG_CONFIG_DIRS</envar>
-        and <envar>XDG_DATA_DIRS</envar>, respectively. The
-        <application>GNOME</application>, <application>KDE</application> and
-        <application>XFCE</application> environments respect these
-        settings.
-      </para>
-
-      <para>
-        When a package installs a <filename>.desktop</filename> file
-        to a location in one of the base data directories, the database
-        that maps MIME-types to available applications can be updated. For
-        instance, the cache file at
-        <filename>/usr/share/applications/mimeinfo.cache</filename> can
-        be rebuilt by executing the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -vdm755 /usr/share/applications &amp;&amp;
-update-desktop-database /usr/share/applications</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>
-          desktop-file-edit, desktop-file-install,
-          desktop-file-validate and
-          update-desktop-database
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="desktop-file-edit">
-        <term><command>desktop-file-edit</command></term>
-        <listitem>
-          <para>
-            is used to modify an existing desktop file entry
-          </para>
-          <indexterm zone="desktop-file-utils desktop-file-edit">
-            <primary sortas="b-desktop-file-edit">desktop-file-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="desktop-file-install">
-        <term><command>desktop-file-install</command></term>
-        <listitem>
-          <para>
-            is used to install a new desktop file entry. It is
-            also used to rebuild or modify the MIME-types application
-            database
-          </para>
-          <indexterm zone="desktop-file-utils desktop-file-install">
-            <primary sortas="b-desktop-file-install">desktop-file-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="desktop-file-validate">
-        <term><command>desktop-file-validate</command></term>
-        <listitem>
-          <para>
-            is used to verify the integrity of a desktop file
-          </para>
-          <indexterm zone="desktop-file-utils desktop-file-validate">
-            <primary sortas="b-desktop-file-validate">desktop-file-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="update-desktop-database">
-        <term><command>update-desktop-database</command></term>
-        <listitem>
-          <para>
-            is used to update the MIME-types application database
-          </para>
-          <indexterm zone="desktop-file-utils update-desktop-database">
-            <primary sortas="b-update-desktop-database">update-desktop-database</primary>
-          </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/dos2unix.xml
===================================================================
--- general/genutils/dos2unix.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dos2unix-download-http "&sourceforge-dl;/dos2unix/dos2unix-&dos2unix-version;.tar.gz">
-<!ENTITY dos2unix-download-ftp  " ">
-<!ENTITY dos2unix-md5sum        "646272020848c9b673de24c4e8e3422e">
-<!ENTITY dos2unix-size          "972 KB">
-<!ENTITY dos2unix-buildsize     "7.2 MB (with tests)">
-<!ENTITY dos2unix-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="dos2unix" xreflabel="dos2unix-&dos2unix-version;">
-  <?dbhtml filename="dos2unix.html"?>
-
-
-  <title>dos2unix-&dos2unix-version;</title>
-
-  <indexterm zone="dos2unix">
-    <primary sortas="a-dos2unix">dos2unix</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dos2unix</title>
-
-    <para>
-      The <application>dos2unix</application> package contains
-      an any-to-any text format converter.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dos2unix-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dos2unix-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dos2unix-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dos2unix-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dos2unix-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dos2unix-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dos2unix</title>
-
-    <para>
-      Build <application>dos2unix</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dos2unix, mac2unix, unix2dos, and unix2mac</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/dos2unix-&dos2unix-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dos2unix-prog">
-        <term><command>dos2unix</command></term>
-        <listitem>
-          <para>
-            converts plain text files in DOS format to Unix format
-          </para>
-          <indexterm zone="dos2unix dos2unix">
-            <primary sortas="b-dos2unix">dos2unix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mac2unix">
-        <term><command>mac2unix</command></term>
-        <listitem>
-          <para>
-            converts plain text files in Mac format to Unix format
-          </para>
-          <indexterm zone="dos2unix mac2unix">
-            <primary sortas="b-mac2unix">mac2unix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unix2dos">
-        <term><command>unix2dos</command></term>
-        <listitem>
-          <para>
-            converts plain text files in Unix format to DOS format
-          </para>
-          <indexterm zone="dos2unix unix2dos">
-            <primary sortas="b-unix2dos">unix2dos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unix2mac">
-        <term><command>unix2mac</command></term>
-        <listitem>
-          <para>
-            converts plain text files in Unix format to Mac format
-          </para>
-          <indexterm zone="dos2unix unix2mac">
-            <primary sortas="b-unix2mac">unix2mac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/genutils/genutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,56 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-genutils">
+<?dbhtml filename="genutils.html" dir="general"?>
+<title>General Utilities</title>
 
-<chapter id="general-genutils">
-  <?dbhtml filename="genutils.html"?>
-
-  <title>General Utilities</title>
-
-  <para>
-    This chapter contains various utilities that do not fit conveniently into
-    other chapters.  Programs include some documentation generators, several
-    utilities for manipulating text and graphics, programs for listing files,
-    a program for entering PIN numbers and pass-phrases, and a connection
-    manager.
-  </para>
-
-<!--
-  <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"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dos2unix.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highlight.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mandoc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>-->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sharutils.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy-html5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="time.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tree.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unixodbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-dbus-proxy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-user-dirs.xml"/>
+&bc;
 
 </chapter>
Index: neral/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,952 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.bz2">
-  <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "5d343d0ba08dc11624d3961af2b4755c">
-  <!ENTITY graphviz-size          "26 MB">
-  <!ENTITY graphviz-buildsize     "220 MB">
-  <!ENTITY graphviz-time          "0.8 SBU (using parallelism=4)">
-]>
-
-<sect1 id="graphviz" xreflabel="Graphviz-&graphviz-version;">
-  <?dbhtml filename="graphviz.html"?>
-
-
-  <title>Graphviz-&graphviz-version;</title>
-
-  <indexterm zone="graphviz">
-    <primary sortas="a-Graphviz">Graphviz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Graphviz</title>
-
-    <para>
-      The <application>Graphviz</application> package contains graph
-      visualization software. Graph visualization is a way of representing
-      structural information as diagrams of abstract graphs and networks.
-      <application>Graphviz</application> has several main graph layout
-      programs. It also has web and interactive graphical interfaces, auxiliary
-      tools, libraries, and language bindings.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&graphviz-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&graphviz-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &graphviz-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &graphviz-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &graphviz-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &graphviz-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
-
-    <note>
-      <para>
-        <application>Graphviz</application> basic usage does not need any
-        libraries out of what is found in the LFS book. Its <quote>core</quote>
-        rendering engine allows to generate several graphic formats, such as
-        Postscript, SVG, VML, .fig, and Tk. Those formats can be converted
-        to almost any other format using for example tools from
-        <xref role="nodep" linkend="imagemagick"/>. The dependencies below add
-        the ability to generate graph images in bitmap format, to display the
-        graph image on screen, to edit a graph by viewing the resulting image
-        directly, or to view large graphs. Since
-        <application>Graphviz</application> is a dependency
-        of several other packages in this book, it is suggested to first build
-        it without any dependencies, then to rebuild it when you have built
-        enough packages to suit your needs.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional, for various bitmap outputs</bridgehead>
-    <para role="optional">
-      <xref linkend="pango"/>, with
-      <xref linkend="cairo"/>,
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="fontconfig"/>, and
-      <xref linkend="libpng"/>, to generate images in bitmap SVG, postscript,
-      PNG, and PDF formats, or displaying the image on screen. The PNG
-      output is required for building <xref role="nodep" linkend="gegl"/>
-    </para>
-
-    <para role="optional">
-      Adding
-      <xref linkend="gtk2"/> with
-      <xref linkend="libjpeg"/> adds support for JPEG, BMP, TIF, and ICO
-      formats, and allows displaying the image in a GTK+ window
-    </para>
-
-    <para role="optional">
-      <ulink url="https://www.libgd.org/">GD Library</ulink> may be used
-      instead of <application>Pango</application>. It adds the ability to
-      generate images in GIF, VRML, and GD formats, but
-      <application>Pango</application> provides better outputs for the other
-      formats, and is needed for displaying images
-    </para>
-
-    <para role="optional">
-      Other formats may be added with
-      <xref linkend="libwebp"/> (WebP support is considered experimental),
-      <ulink url="https://openil.sourceforge.net/projects.php">DevIL</ulink>,
-      <ulink url="https://sourceforge.net/projects/lasi/">libLASi</ulink>, and
-      <ulink url="https://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, to load graphic images that may be
-    displayed inside the nodes of a graph</bridgehead>
-
-    <para role="optional">
-      <filename class="libraryfile">libgs.so</filename> from
-      <xref linkend="gs"/>,
-      <xref linkend="librsvg"/>, and
-      <xref linkend="poppler"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, to build more tools</bridgehead>
-
-    <para role="optional">
-      <xref linkend="freeglut"/> (with 
-      <ulink url="https://sourceforge.net/projects/gtkglext/">GtkGLExt</ulink> and
-      <ulink url="https://gts.sourceforge.net/">libGTS</ulink> for building
-      the <command>smyrna</command> large graph viewer, which is
-      considered experimental), and
-      &qt5-deps; (for building the <command>gvedit</command>
-      graph editor.)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (To Build Language Bindings)</bridgehead>
-    <para role="optional">
-      <xref linkend="swig"/> (<application>SWIG</application> must be
-      installed or no bindings will be built),
-      <xref linkend="gcc"/> (for the go compiler),
-      <xref linkend="guile"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="php"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="tk"/>,
-      <ulink url="https://iolanguage.org/">Io</ulink>,
-      <ulink url="https://www.mono-project.com/Main_Page">Mono</ulink>,
-      <ulink url="https://ocaml.org/">OCaml</ulink>, and
-      <ulink url="https://www.r-project.org/">R</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (building tools)</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/Snaipe/Criterion">Criterion</ulink>
-          (framework for tests) and
-      <ulink url="https://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for building the pdf documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/> (for the <command>ps2pdf</command> command)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Graphviz</title>
-
-    <para>
-      Install <application>Graphviz</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
-
-./autogen.sh              &amp;&amp;
-./configure --prefix=/usr \
-            --docdir=/usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
-
-    <note>
-      <para>
-        A warning is generated by <command>autogen.sh</command> because the
-        build tree is not a git repository. As a result, the build date is set
-        to 0. To get a meaningful date in the version string, you can run:
-      </para>
-
-<screen><userinput>sed -i "s/0/$(date +%Y%m%d)/" builddate.h</userinput></screen>
-    </note>
-
-    <para>
-      Whether or not you fix the date, proceed to compile the package:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite that provides
-      meaningful results.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... configure.ac</command>: This command is needed to
-      avoid installing files in /usr/lib64.
-    </para>
-    <para>
-      <option>--with-javaincludedir="$JAVA_HOME/include
-                                   -I$JAVA_HOME/include/linux"</option>:
-      If you have built <xref linkend="openjdk"/> in /opt, and you want to
-      build the JAVA bindings, it is necessary to specify the location of the
-      JAVA header files to configure. The configure switch is designed for
-      only one directory, but two directories need to be included.
-      This is possible nevertheless by using the -I switch inside the variable.
-    </para>
-
-    <para>
-      <option>--with-webp</option>: Even if <xref linkend="libwebp"/> is
-      installed, it is not included in the build without this option.
-    </para>
-
-    <para>
-      <option>--with-smyrna</option>: Even if the needed dependencies are
-      installed, the interactive graph viewer <command>smyrna</command> is not
-      built without this option.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Graphviz</title>
-
-    <sect3 id="graphviz-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/usr/lib/graphviz/config</filename>
-      </para>
-
-      <indexterm zone="graphviz graphviz-config">
-        <primary sortas="e-usr-share-graphviz-config">/usr/share/graphviz/config</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        There are no specific configuration requirements for
-        <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
-        capabilities. If additional plugins are installed, you can run
-        <command>dot -c</command> (as the
-        <systemitem class="username">root</systemitem> user) to update the
-        <filename>config</filename> file in
-        <filename class="directory">/usr/lib/graphviz</filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          acyclic, bcomps, ccomps, circo, cluster, dijkstra,
-          dot, dot2gxl, dot_builtins, edgepaint, fdp, gc, gml2gv,
-          graphml2gv, gv2gml, gv2gxl, gvcolor, gvedit, gvgen, gvmap, gvmap.sh,
-          gvpack, gvpr, gxl2dot, gxl2gv, mm2gv, neato, nop,
-          osage, patchwork, prune, sccmap, sfdp, tred, twopi,
-          unflatten, and vimdot
-        </seg>
-        <seg>
-          libcdt.so, libcgraph.so, libgvc.so, libgvpr.so, liblab_gamut.so,
-          libpathplan.so, libxdot.so, and several plugins in /usr/lib/graphviz.
-          There are also several in subdirectories of
-          /usr/lib/{lua,perl5,php,python&python3-majorver;,tcl8.6}.
-          Unfortunately, some libraries are duplicated.
-        </seg>
-        <seg>
-          /usr/include/graphviz,
-          /usr/lib/graphviz,
-          /usr/lib/tcl8.6/graphviz,
-          /usr/share/doc/graphviz-&graphviz-version;, and
-          /usr/share/graphviz
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acyclic">
-        <term><command>acyclic</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz acyclic">
-            <primary sortas="b-acyclic">acyclic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bcomps">
-        <term><command>bcomps</command></term>
-        <listitem>
-          <para>
-            decomposes graphs into their biconnected components,
-            printing the components to standard output
-          </para>
-          <indexterm zone="graphviz bcomps">
-            <primary sortas="b-bcomps">bcomps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ccomps">
-        <term><command>ccomps</command></term>
-        <listitem>
-          <para>
-            decomposes graphs into their connected components,
-            printing the components to standard output
-          </para>
-          <indexterm zone="graphviz ccomps">
-            <primary sortas="b-ccomps">ccomps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="circo">
-        <term><command>circo</command></term>
-        <listitem>
-          <para>
-            draws graphs using a circular layout
-          </para>
-          <indexterm zone="graphviz circo">
-            <primary sortas="b-circo">circo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cluster">
-        <term><command>cluster</command></term>
-        <listitem>
-          <para>
-            takes a graph in DOT format as input, finds node clusters
-            and then augments the graph with this information
-          </para>
-          <indexterm zone="graphviz cluster">
-            <primary sortas="b-cluster">cluster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diffimg">
-        <term><command>diffimg</command></term>
-        <listitem>
-          <para>
-            (needs <ulink url="https://www.libgd.org/">GD Library</ulink>)
-            generates an image where each pixel is the
-            difference between the corresponding pixel in
-            each of the two source images
-          </para>
-          <indexterm zone="graphviz diffimg">
-            <primary sortas="b-diffimg">diffimg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dijkstra">
-        <term><command>dijkstra</command></term>
-        <listitem>
-          <para>
-            reads a stream of graphs and for each computes the distance of
-            every node from sourcenode
-          </para>
-          <indexterm zone="graphviz dijkstra">
-            <primary sortas="b-dijkstra">dijkstra</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dot">
-        <term><command>dot</command></term>
-        <listitem>
-          <para>
-            draws directed graphs. It works well on DAGs and other graphs
-            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
-          </para>
-          <indexterm zone="graphviz dot">
-            <primary sortas="b-dot">dot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dot2gxl">
-        <term><command>dot2gxl</command></term>
-        <listitem>
-          <para>
-            converts between graphs represented in GXL and in the DOT
-            language. Unless a conversion type is specified using a flag,
-            <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
-            conversion from DOT to GXL, and a
-            <filename class="extension">.gxl</filename> suffix causing a
-            conversion from GXL to DOT
-          </para>
-          <indexterm zone="graphviz dot2gxl">
-            <primary sortas="b-dot2gxl">dot2gxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="dotty">
-        <term><command>dotty</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz dotty">
-            <primary sortas="b-dotty">dotty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="edgepaint">
-        <term><command>edgepaint</command></term>
-        <listitem>
-          <para>
-            performs edge coloring to disambiguate crossing edges
-          </para>
-          <indexterm zone="graphviz edgepaint">
-            <primary sortas="b-edgepaint">edgepaint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdp">
-        <term><command>fdp</command></term>
-        <listitem>
-          <para>
-            draws undirected graphs using a <quote>spring</quote> model. It
-            relies on a force-directed approach in the spirit of Fruchterman
-            and Reingold
-          </para>
-          <indexterm zone="graphviz fdp">
-            <primary sortas="b-fdp">fdp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gc-graphviz">
-        <term><command>gc</command></term>
-        <listitem>
-          <para>
-            is a graph analogue to <command>wc</command> in that it prints
-            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
-          </para>
-          <indexterm zone="graphviz gc-graphviz">
-            <primary sortas="b-gc">gc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gml2gv">
-        <term><command>gml2gv</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GML format to
-            a graph in the GV (formerly DOT) format
-          </para>
-          <indexterm zone="graphviz gml2gv">
-            <primary sortas="b-gml2gv">gml2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="graphml2gv">
-        <term><command>graphml2gv</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GRAPHML format to a graph in
-            the GV (formerly DOT) format
-          </para>
-          <indexterm zone="graphviz graphml2gv">
-            <primary sortas="b-graphml2gv">graphml2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gv2gml">
-        <term><command>gv2gml</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GV format to a graph in the GML format
-          </para>
-          <indexterm zone="graphviz gv2gml">
-            <primary sortas="b-gv2gml">gv2gml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gv2gxl">
-        <term><command>gv2gxl</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GV format to a graph in the GXL format
-          </para>
-          <indexterm zone="graphviz gv2gxl">
-            <primary sortas="b-gv2gxl">gv2gxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvcolor">
-        <term><command>gvcolor</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz gvcolor">
-            <primary sortas="b-gvcolor">gvcolor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvedit">
-        <term><command>gvedit</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz gvedit">
-            <primary sortas="b-gvedit">gvedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvgen">
-        <term><command>gvgen</command></term>
-        <listitem>
-          <para>
-            generates a variety of simple, regularly-structured
-            abstract graphs
-          </para>
-          <indexterm zone="graphviz gvgen">
-            <primary sortas="b-gvgen">gvgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvmap">
-        <term><command>gvmap</command></term>
-        <listitem>
-          <para>
-            takes as input a graph in DOT format, finds node
-            clusters and produces a rendering of the graph as
-            a geographic-style map, with clusters highlighted,
-            in xdot format
-          </para>
-          <indexterm zone="graphviz gvmap">
-            <primary sortas="b-gvmap">gvmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvmap.sh">
-        <term><command>gvmap.sh</command></term>
-        <listitem>
-          <para>
-            is a pipeline for running gvmap
-          </para>
-          <indexterm zone="graphviz gvmap.sh">
-            <primary sortas="b-gvmap.sh">gvmap.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvpack">
-        <term><command>gvpack</command></term>
-        <listitem>
-          <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
-          </para>
-          <indexterm zone="graphviz gvpack">
-            <primary sortas="b-gvpack">gvpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvpr">
-        <term><command>gvpr</command></term>
-        <listitem>
-          <para>
-            is a graph stream editor inspired by <command>awk</command>. It
-            copies input graphs to its output, possibly transforming their
-            structure and attributes, creating new graphs, or printing arbitrary
-            information
-          </para>
-          <indexterm zone="graphviz gvpr">
-            <primary sortas="b-gvpr">gvpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gxl2dot">
-        <term><command>gxl2dot</command></term>
-        <listitem>
-          <para>
-            converts between graphs represented in GXL and in the DOT
-            language. Unless a conversion type is specified using a flag,
-            <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
-            conversion from DOT to GXL, and a
-            <filename class="extension">.gxl</filename> suffix causing a
-            conversion from GXL to DOT
-          </para>
-          <indexterm zone="graphviz gxl2dot">
-            <primary sortas="b-gxl2dot">gxl2dot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gxl2gv">
-        <term><command>gxl2gv</command></term>
-        <listitem>
-          <para>
-            converts between graphs represented in GXL and in
-            the GV language
-          </para>
-          <indexterm zone="graphviz gxl2gv">
-            <primary sortas="b-gxl2gv">gxl2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="lefty">
-        <term><command>lefty</command></term>
-        <listitem>
-          <para>
-            is a two-view graphics editor for technical pictures
-          </para>
-          <indexterm zone="graphviz lefty">
-            <primary sortas="b-lefty">lefty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lneato">
-        <term><command>lneato</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz lneato">
-            <primary sortas="b-lneato">lneato</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="mm2gv">
-        <term><command>mm2gv</command></term>
-        <listitem>
-          <para>
-            converts a sparse matrix of the Matrix Market format
-            to a graph in the GV (formerly DOT) format
-          </para>
-          <indexterm zone="graphviz mm2gv">
-            <primary sortas="b-mm2gv">mm2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="neato">
-        <term><command>neato</command></term>
-        <listitem>
-          <para>
-            draws undirected graphs using <quote>spring</quote> models. Input
-            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
-          </para>
-          <indexterm zone="graphviz neato">
-            <primary sortas="b-neato">neato</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nop">
-        <term><command>nop</command></term>
-        <listitem>
-          <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
-          </para>
-          <indexterm zone="graphviz nop">
-            <primary sortas="b-nop">nop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osage">
-        <term><command>osage</command></term>
-        <listitem>
-          <para>
-            draws clustered graphs. It takes any graph in DOT format as input
-          </para>
-          <indexterm zone="graphviz osage">
-            <primary sortas="b-osage">osage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="patchwork">
-        <term><command>patchwork</command></term>
-        <listitem>
-          <para>
-            draws clustered graphs using a squarified treemap layout.
-            It takes any graph in DOT format as input
-          </para>
-          <indexterm zone="graphviz patchwork">
-            <primary sortas="b-patchwork">patchwork</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prune">
-        <term><command>prune</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz prune">
-            <primary sortas="b-prune">prune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sccmap">
-        <term><command>sccmap</command></term>
-        <listitem>
-          <para>
-            decomposes digraphs into strongly connected components and an
-            auxiliary map of the relationship between components. In this map,
-            each component is collapsed into a node. The resulting graphs are
-            printed to stdout
-          </para>
-          <indexterm zone="graphviz sccmap">
-            <primary sortas="b-sccmap">sccmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfdp">
-        <term><command>sfdp</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz sfdp">
-            <primary sortas="b-sfdp">sfdp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tred">
-        <term><command>tred</command></term>
-        <listitem>
-          <para>
-            computes the transitive reduction of directed graphs, and
-            prints the resulting graphs to standard output. This removes edges
-            implied by transitivity. Nodes and subgraphs are not otherwise
-            affected
-          </para>
-          <indexterm zone="graphviz tred">
-            <primary sortas="b-tred">tred</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="twopi">
-        <term><command>twopi</command></term>
-        <listitem>
-          <para>
-            draws graphs using a radial layout. Basically, one node is
-            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
-          </para>
-          <indexterm zone="graphviz twopi">
-            <primary sortas="b-twopi">twopi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unflatten">
-        <term><command>unflatten</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz unflatten">
-            <primary sortas="b-unflatten">unflatten</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimdot">
-        <term><command>vimdot</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="graphviz vimdot">
-            <primary sortas="b-vimdot">vimdot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcdt">
-        <term><filename class="libraryfile">libcdt.so</filename></term>
-        <listitem>
-          <para>
-            manages run-time dictionaries using standard container data
-            types: unordered set/multiset, ordered set/multiset, list, stack,
-            and queue
-          </para>
-          <indexterm zone="graphviz libcdt">
-            <primary sortas="c-libcdt">libcdt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcgraph">
-        <term><filename class="libraryfile">libcgraph.so</filename></term>
-        <listitem>
-          <para>
-            supports graph programming by maintaining graphs in memory and
-            reading and writing graph files. Graphs are composed of nodes,
-            edges, and nested subgraphs
-          </para>
-          <indexterm zone="graphviz libcgraph">
-            <primary sortas="c-libcgraph">libcgraph.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvc">
-        <term><filename class="libraryfile">libgvc.so</filename></term>
-        <listitem>
-          <para>
-            provides a context for applications wishing to manipulate
-            and render graphs. It provides command line parsing interfaces,
-            common rendering code, and a plugin mechanism for renderers
-          </para>
-          <indexterm zone="graphviz libgvc">
-            <primary sortas="c-libgvc">libgvc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpathplan">
-        <term><filename class="libraryfile">libpathplan.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to find the shortest path between two points
-            in a simple polygon
-          </para>
-          <indexterm zone="graphviz libpathplan">
-            <primary sortas="c-libpathplan">libpathplan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxdot">
-        <term><filename class="libraryfile">libxdot.so</filename></term>
-        <listitem>
-          <para>
-            provides support for parsing and deparsing graphical
-            operations specified by the xdot language
-          </para>
-          <indexterm zone="graphviz libxdot">
-            <primary sortas="c-libxdot">libxdot.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtk-doc-download-http "&gnome-download-http;/gtk-doc/&gtk-doc-major;/gtk-doc-&gtk-doc-version;.tar.xz">
-  <!ENTITY gtk-doc-download-ftp  " ">
-  <!ENTITY gtk-doc-md5sum        "f0e7385ba25eddb6ce0953e8cf63d1bf">
-  <!ENTITY gtk-doc-size          "484 KB">
-  <!ENTITY gtk-doc-buildsize     "14 MB (with tests)">
-  <!ENTITY gtk-doc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="gtk-doc" xreflabel="GTK-Doc-&gtk-doc-version;">
-  <?dbhtml filename="gtk-doc.html"?>
-
-
-  <title>GTK-Doc-&gtk-doc-version;</title>
-
-  <indexterm zone="gtk-doc">
-    <primary sortas="a-GTK-Doc">GTK-Doc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK-Doc</title>
-
-    <para>
-      The <application>GTK-Doc</application> package contains a code
-      documenter. This is useful for extracting specially formatted comments
-      from the code to create API documentation. This package is
-      <emphasis>optional</emphasis>; if it is not installed, packages will
-      not build the documentation. This does not mean that you will not have
-      any documentation. If <application>GTK-Doc</application> is not
-      available, the install process will copy any pre-built documentation
-      to your system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-doc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-doc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-doc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-doc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch to allow building <xref linkend="glib2"/>
-          documentation:
-          <ulink url="&patch-root;/gtk-doc-&gtk-doc-version;-glib2_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">GTK-Doc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="pygments"/> at run time
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      For tests:
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink> or
-      <xref linkend="fop"/> (XML PDF support),
-      <xref linkend="glib2"/>,
-      <xref linkend="which"/>, and
-      Python modules
-      <xref linkend="lxml"/>,
-      <!--<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>
-    </para>
-
-    <note>
-      <para>
-      The optional python modules above can be easily installed with
-      the <command>pip3</command> command.
-      </para>
-    </note>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK-Doc</title>
-
-    <para>
-      Install <application>GTK-Doc</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir -p build &amp;&amp;
-cd       build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite will hang if the package (or a previous version)
-      is not already installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      Some tests will fail depending on optionally installed packages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtkdocize,
-          gtkdoc-check,
-          gtkdoc-depscan,
-          gtkdoc-fixxref,
-          gtkdoc-mkdb,
-          gtkdoc-mkhtml,
-          gtkdoc-mkhtml2,
-          gtkdoc-mkman,
-          gtkdoc-mkpdf,
-          gtkdoc-rebase,
-          gtkdoc-scan, and
-          gtkdoc-scangobj
-        </seg>
-
-        <seg>None</seg>
-
-        <seg>
-          /usr/share/gtk-doc and
-          /usr/share/cmake/GtkDoc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtkdoc">
-        <term><command>gtkdoc*</command></term>
-        <listitem>
-          <para>
-            these are all shell, or
-            <application>Python</application> scripts used by
-            package <filename>Makefile</filename> scripts to generate
-            documentation for the package being built
-          </para>
-          <indexterm zone="gtk-doc gtkdoc">
-            <primary sortas="b-gtkdoc*">gtkdoc*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,212 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
-  <!ENTITY highlight-download-ftp  " ">
-  <!ENTITY highlight-md5sum        "187a16136f7aa4310e57eecb994b7ac4">
-  <!ENTITY highlight-size          "1.4 MB">
-  <!ENTITY highlight-buildsize     "24 MB (with gui)">
-  <!ENTITY highlight-time          "0.3 SBU (Using parallelism=4; with gui)">
-]>
-
-<sect1 id="highlight" xreflabel="Highlight-&highlight-version;">
-  <?dbhtml filename="highlight.html"?>
-
-
-  <title>Highlight-&highlight-version;</title>
-
-  <indexterm zone="highlight">
-    <primary sortas="a-Highlight">Highlight</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Highlight</title>
-
-    <para>
-      <application>Highlight</application> is an utility that converts
-      source code to formatted text with syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&highlight-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&highlight-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &highlight-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &highlight-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &highlight-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &highlight-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Highlight Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/> and
-      <xref linkend="lua"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- make apidocs fails because there is no Doxyfile
-      <xref linkend="doxygen"/> (to build the API documentation) and -->
-      &qt5-deps; (to build the GUI front-end)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Highlight</title>
-
-    <para>
-      For consistency, do not compress man pages.
-    </para>
-
-<screen><userinput>sed -i '/GZIP/s/^/#/' makefile</userinput></screen>
-
-    <para>
-      To build <application>Highlight</application> run the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To build the <application>Qt5</application> GUI front-end, run the
-      following command:
-    </para>
-
-<screen role="nodump"><userinput>make doc_dir=/usr/share/doc/highlight-&highlight-version;/ gui</userinput></screen>
-<!--
-    <para>
-      To build the API documentation, run the following command:
-    </para>
-
-<screen><userinput>make apidocs</userinput></screen>
--->
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      To install <application>Highlight</application>, run the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make doc_dir=/usr/share/doc/highlight-&highlight-version;/ install</userinput></screen>
-
-    <para>
-      To install the GUI program, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>make install-gui</userinput></screen>
-<!--
-    <para>
-      To install the API documentation, run the following command
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -rv apidocs/html /usr/share/doc/highlight/apidocs</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>doc_dir=/usr/share/doc/highlight-&highlight-version;/</parameter>:
-      installs the 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.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          highlight and highlight-gui (optional)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/highlight,
-          /usr/share/doc/highlight-&highlight-version;, and
-          /usr/share/highlight
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="highlight-prog">
-        <term><command>highlight</command></term>
-        <listitem>
-          <para>
-            is a universal source code to formatted text converter
-          </para>
-          <indexterm zone="highlight highlight-prog">
-            <primary sortas="b-highlight">highlight</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="highlight-gui">
-        <term><command>highlight-gui</command></term>
-        <listitem>
-          <para>
-            is the <application>Qt5</application> interface to
-            <command>highlight</command>.
-          </para>
-          <indexterm zone="highlight highlight-gui">
-            <primary sortas="b-highlight-gui">highlight-gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/ibus.xml
===================================================================
--- general/genutils/ibus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,382 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ibus-download-http "https://github.com/ibus/ibus/archive/&ibus-version;/ibus-&ibus-version;.tar.gz">
-  <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "2e29a7fb0f8c5ffcf42462fda45348fd">
-  <!ENTITY ibus-size          "1.4 MB">
-  <!ENTITY ibus-buildsize     "54 MB (add 3 MB for tests)">
-  <!ENTITY ibus-time          "0.3 SBU (Using parallelism=4; add 0.6 SBU for tests)">
-<!-- Since UCD.zip can be used by gucharmap too, let's use the same version:
-     This prevents version mismatches, since UCD.zip filename is not versioned.
--->
-  <!ENTITY ucd-download-http  "https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/UCD.zip">
-]>
-
-<sect1 id="ibus" xreflabel="ibus-&ibus-version;">
-  <?dbhtml filename="ibus.html"?>
-
-
-  <title>ibus-&ibus-version;</title>
-
-  <indexterm zone="ibus">
-    <primary sortas="a-ibus">ibus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ibus</title>
-
-    <para>
-      <application>ibus</application> is an Intelligent Input Bus. It is a new
-      input framework for the Linux OS. It provides a fully featured and user
-      friendly input method user interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ibus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ibus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ibus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ibus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ibus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ibus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Unicode Character Database:
-          <ulink url="&ucd-download-http;"> &ucd-download-http;</ulink>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ibus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/>,
-      <!-- needed since we're using autogen.sh -->
-      <xref linkend="iso-codes"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk4"/> (to build IM module for it),
-      <xref linkend="gtk-doc"/> (for generating API documentation),
-      <xref linkend="dbus-python"/> and
-      <xref linkend="pygobject3"/> (both to build the Python support library),
-      <!--<xref linkend="pyxdg" role="runtime"/>
-      (runtime, for the <command>ibus-setup</command>), and
-      NOTE: The reference to the 'xdg' python module is commented out in the source -->
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="wayland"/> (both to build the Wayland support programs),
-      <ulink url="https://www.joypixels.com/">EmojiOne</ulink>, and
-      <ulink url="https://github.com/AyatanaIndicators/libdbusmenu">libdbusmenu</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ibus</title>
-
-<!--
-    <para>
-      If the optional Unicode Character Database was downloaded, install it
-      now as the <systemitem class="username">root</systemitem> user:
-    </para>
--->
-
-    <para>
-      First, install the Unicode Character Database as the &root; user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p               /usr/share/unicode/ucd &amp;&amp;
-unzip -o ../UCD.zip -d /usr/share/unicode/ucd</userinput></screen>
-
-<!--
-    <note>
-      <para>
-        Be sure to also remove the - -disable-unicode-dict in
-        the configure step below.
-      </para>
-    </note>
--->
-    <para>
-      Fix an issue with deprecated schema entries:
-    </para>
-
-<screen><userinput>sed -e 's@/desktop/ibus@/org/freedesktop/ibus@g' \
-    -i data/dconf/org.freedesktop.ibus.gschema.xml</userinput></screen>
-
-    <para>
-      If <xref linkend='gtk-doc'/> is not installed, remove the references
-      to it:
-    </para>
-
-<screen><userinput>if ! [ -e /usr/bin/gtkdocize ]; then
-  sed '/docs/d;/GTK_DOC/d' -i Makefile.am configure.ac
-fi</userinput></screen>
-
-    <para>
-      Install <application>ibus</application> by running the following
-      commands:
-    </para>
-
-<screen revision='sysv'><userinput>SAVE_DIST_FILES=1 NOCONFIGURE=1 ./autogen.sh &amp;&amp;
-
-PYTHON=python3                     \
-./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --disable-python2      \
-            --disable-appindicator \
-            --disable-emoji-dict   \
-            --disable-gtk2         \
-            --disable-systemd-services &amp;&amp;
-make</userinput></screen>
-
-<screen revision='systemd'><userinput>SAVE_DIST_FILES=1 NOCONFIGURE=1 ./autogen.sh &amp;&amp;
-
-PYTHON=python3                     \
-./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --disable-python2      \
-            --disable-appindicator \
-            --disable-gtk2         \
-            --disable-emoji-dict   &amp;&amp;
-make</userinput></screen>
-
-    <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 log says "No idea to simulate key events in Wayland"
-           in a Mutter wayland session.  DO NOT REMOVE UNLESS TESTED
-           IN WAYLAND.  -->
-      The test named ibus-keypress will fail if running in a Wayland
-      session.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-appindicator</parameter>: This switch disables
-      use of libdbusmenu. Omit if you installed the optional dependency.
-    </para>
-
-    <para>
-      <parameter>--disable-emoji-dict</parameter>: This switch disables the
-      use of emoticon dictionaries. Omit if you installed the optional
-      package.
-    </para>
-
-    <para>
-      <parameter>--disable-gtk2</parameter>: This switch removes the dependency
-      on <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>
-
-    <para>
-      <option>--enable-python-library</option>: This switch enables
-      building the <application>Python</application> support
-      library. Use it if you have installed the optional Python modules.
-    </para>
-
-    <para>
-      <option>--enable-wayland</option>: This switch enables building
-      the <application>Wayland</application> support programs.
-      It's automatically enabled if both <xref linkend='libxkbcommon'/> and
-      <xref linkend='wayland'/> are installed.
-    </para>
-
-    <para>
-      <envar>NOCONFIGURE=1</envar>: Prevent <command>autogen.sh</command>
-      from running the generated <command>configure</command> script.  We'll
-      run the script manually instead of relying on
-      <command>autogen.sh</command> to run it, because
-      <command>autogen.sh</command> would set <option>-fsanitize=address
-      -fsanitize=leak</option> in <envar>CFLAGS</envar> running
-      <command>configure</command>, but those compiler options are not
-      suitable for productive use and they may also cause a build failure.
-      <!-- GCC security policy: "Libraries like libvtv and the sanitizers
-           are intended to be used in diagnostic cases and not intended for
-           use in sensitive environments."  In my build it also causes
-           "compose/sequences-little-endian" bail out with a sanitizer
-           warning and the package to FTBFS.  -->
-    </para>
-
-    <para>
-      <envar>PYTHON=python3</envar>: This environment variable makes
-      the <command>configure</command> script look for
-      <application>Python 3</application>. Use it if you want
-      to build the <application>Python 3</application> support
-      library.
-    </para>
-
-    <para>
-      <envar>SAVE_DIST_FILES=1</envar>: This environment variable makes
-      the <command>autogen.sh</command> script save some pre-generated
-      header files instead of overwriting them when it is run. This prevents
-      build failures when generating <filename>ibusemojigen.h</filename>.
-      <!-- This is needed because we do not have the Emoji dictionary.-->
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-<!--
-    <para>
-      <command>gzip -dfv ...</command>: Decompress installed man pages
-      in accordance with other man pages.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Ibus</title>
-
-    <para>
-      If GTK+-3 or GTK+-2 are installed and
-      <option>--disable-gtk{3,2}</option> are not used, the ibus IM module
-      for GTK+-3 or GTK+-2 will be installed.  As the &root; user,
-      update a cache file of GTK+-3 or GTK+-2 so the GTK-based applications
-      can find the newly installed IM module and use ibus as an input
-      method:
-    </para>
-
-    <screen role='nodump'><userinput>gtk-query-immodules-3.0 --update-cache</userinput></screen>
-
-    <para>
-      The command above updates the cache file for GTK+-3.  For GTK+-2,
-      use <command>gtk-query-immodules-2.0</command> instead of
-      <command>gtk-query-immodules-3.0</command>.  GTK-4 does not require
-      a cache file for IM modules.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ibus,
-          ibus-daemon, and
-          ibus-setup
-        </seg>
-        <seg>
-          libibus-1.0.so and
-          im-ibus.so (<application>GTK+ Immodule</application>)
-        </seg>
-        <seg>
-          /etc/dconf/db/ibus.d,
-          /usr/include/ibus-1.0,
-          /usr/share/gtk-doc/html/ibus, and
-          /usr/share/ibus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ibus-daemon">
-        <term><command>ibus-daemon</command></term>
-        <listitem>
-          <para>
-            is the Intelligent Input Bus Daemon
-          </para>
-          <indexterm zone="ibus ibus-daemon">
-            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ibus-setup">
-        <term><command>ibus-setup</command></term>
-        <listitem>
-          <para>
-            is the <application>GTK+</application> program used to configure
-            the <command>ibus-daemon</command>
-          </para>
-          <indexterm zone="ibus ibus-setup">
-            <primary sortas="b-ibus-setup">ibus-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libibus-1.0">
-        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>ibus</application> API functions
-          </para>
-          <indexterm zone="ibus libibus-1.0">
-            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,611 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 imagemagick-patch-version "28">
-
-  <!ENTITY imagemagick-download-http "https://www.imagemagick.org/archive/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-download-ftp  " ">
-  <!ENTITY imagemagick-md5sum        "954931222003bbc79c976db4d79e934c">
-  <!ENTITY imagemagick-size          "11 MB">
-  <!ENTITY imagemagick-buildsize     "210 MB, 45 MB installed (with typical dependencies; add 10 MB for checks)">
-  <!ENTITY imagemagick-time          "0.7 SBU (with typical dependencies; add 0.7 SBU for checks, both using  parallelism=4)">
-]>
-
-<!-- Editors: It is highly unlikely that the buildsize (disk space used) will
-     be less than the figure shown above. Unless you have installed *all* the
-     delegate dependencies, you will see a smaller buildsize, but what is
-     currently listed above is the space one would require if all the
-     dependencies available in the book are installed.
-
-     Marked as 'typical' because nobody builds ALL the optional extras [ken]
-
-     [bdubbs] I do; at least the internal ones.  I still got only 141 MB.
-
-     [pierre 2017-02-14, v7.0.4-8]. I did too, and got 184 MB. I added the
-     all the corresponding switches to configure, that may make a difference.
-     All 6733 tests passed.
-
-     Saved the "full" 450MB as a comment - feel free to update this iff you
-     do build all dependencies, it's probably a lot bigger now.
-
-     [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.
-
-     For those of us who touch this infrequently:
-     DPS/dpsXclient is from apple so not relevant to linux builds
-     GVC is part of Graphviz and documented in the explanations
-     iLQR is Liquid Rescale
-     ufraw-batch (ufraw) is unmaintained and does not build with current exiv2  -->
-
-<sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
-  <?dbhtml filename="imagemagick.html"?>
-
-
-  <title>ImageMagick-&imagemagick-version;-&imagemagick-patch-version;</title>
-
-  <indexterm zone="imagemagick">
-    <primary sortas="a-ImageMagick">ImageMagick</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ImageMagick</title>
-
-    <para>
-      <application>ImageMagick</application> is a collection of tools and
-      libraries to read, write, and manipulate an image in various image
-      formats.  Image processing operations are available from the command line.
-      Bindings for Perl and C++ are also available.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&imagemagick-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&imagemagick-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &imagemagick-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &imagemagick-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &imagemagick-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &imagemagick-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The <application>ImageMagick</application> source releases are updated
-        frequently and the version shown above may no longer be available from
-        the download locations. You can download a more recent version and use
-        the existing BLFS instructions to install it. Chances are that it will
-        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, you can download it from the BLFS package server at Oregon State
-        University: <ulink url="https://ftp.osuosl.org/pub/blfs/conglomeration/ImageMagick/"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">ImageMagick Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para>
-      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
-      the <quote>MAGICK DELEGATES</quote> section of the
-      <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
-      well as issuing the <command>./configure --help</command> command. A
-      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"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional System Utilities</bridgehead>
-    <para role="optional">
-      Clang from <xref linkend="llvm"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="fftw"/>,
-      <xref linkend="p7zip"/> (LZMA),
-      <xref linkend="sane"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="xdg-utils"/>,
-      <xref linkend="xterm2"/>,
-      <ulink url="https://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="https://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink> and
-      <ulink url="https://www.openpgp.org/about/">PGP</ulink> or
-      <xref linkend="gnupg2"/>
-      (you'll have to do some hacking to use <application>GnuPG</application>),
-      <ulink url="https://imagemagick.org/archive/delegates/">Profiles</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="jasper"/>,
-      <xref linkend="lcms2"/>,
-      <!-- although libexif may have been used in the past, I can find no
-          evidence that it has been used in imagemagick-7.  ken
-      <xref linkend="libexif"/>,-->
-      <xref linkend="libgxps"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libjxl"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libraw"/> (for dng files, needs the thread-safe libraw_r),
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="pango"/>,
-      <ulink url="https://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="https://imagemagick.org/archive/delegates/">
-      FlashPIX (libfpx)</ulink>,
-      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
-      <ulink url="https://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/HOST-Oman/libraqm/">libraqm</ulink>,
-      <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://www.agocg.ac.uk/train/cgm/ralcgm.htm">RALCGM</ulink>
-      (or <ulink url="http://www.mcmurchy.com/ralcgm/ralcgm-3.51.tar.gz">ralcgm</ulink>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="dejavu-fonts"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="gimp"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="inkscape"/>,
-      <ulink url="https://www.blender.org/">Blender</ulink>,
-      <ulink url="https://corefonts.sourceforge.net/">corefonts</ulink>,
-      <ulink url="https://ghostscript.com/releases/gpcldnld.html">GhostPCL</ulink>,
-      <ulink url="http://www.gnuplot.info/">Gnuplot</ulink>,
-      <ulink url="https://www.povray.org/">POV-Ray</ulink>, and
-      <ulink url="https://www.radiance-online.org/">Radiance</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Conversion Tools</bridgehead>
-    <para role="optional">
-      <xref linkend="enscript"/>,
-      <xref linkend="potrace"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      <ulink url="https://autotrace.sourceforge.net/">AutoTrace</ulink>,
-      <ulink url="https://www.extensis.com/">
-      GeoExpress Command Line Utilities, AKA MrSID Utilities (binary package)</ulink>,
-      <ulink url="https://www.gnu.org/software/hp2xx/">hp2xx</ulink>,
-      <!-- not accessible
-      <ulink url="https://user.it.uu.se/~jan/html2ps.html">html2ps</ulink>,
-      -->
-      <ulink url="https://wvware.sourceforge.net/">libwmf</ulink>,
-      <ulink url="https://sk1project.net/uc2/">
-      UniConvertor</ulink>,
-      <!-- ufraw-batch was a delegate program, the delegate library coders/dng.so
-      is used if librar_r is present, ufraw now ftbfs with exiv2-0.28, and IM-7.1.1
-      in any case (if no libraw) invokes it to ask for a temp png file, but then
-      tries to open the temp file using a ppm suffix, which of course fails.
-      <ulink url="https://ufraw.sourceforge.net/">ufraw</ulink> (for dng files,
-      see
-      <ulink url="https://imagemagick.org/script/formats.php">
-      https://imagemagick.org/script/formats.php</ulink> for some special switches)
-      -->
-      and
-      <ulink url="https://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink>
-      (or <ulink url="http://www.mcmurchy.com/urt/urt-3.1b.tar.gz">URT-3.1b</ulink>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ImageMagick</title>
-
-    <para>
-      Install <application>ImageMagick</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --enable-hdri     \
-            --with-modules    \
-            --with-perl       \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make DOCUMENTATION_PATH=/usr/share/doc/imagemagick-&imagemagick-version; install</userinput></screen>
-
-    <para>
-      To test the installation, issue: <command>make check</command>.
-              <!-- seems to have been dropped                         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
-       The result summary may be obtained with <command>grep
-      "validation suite" validate.log</command>. -->
-     <!-- I'm not convinced that Helvetica is required, I don't install the gs
-      fonts. But lots of references to it. Surely fontconfig provides it? ken -->
-                                                 Note that the EPS, PS, and PDF
-      tests require a working <application>Ghostscript</application>. One test
-      in 'make check' needs <quote>Helvetica</quote> from <quote>Ghostscript
-      Standard Fonts</quote>, which are optionally installed in
-      <xref linkend="gs"/> - that test, and one other, might fail, but all the
-      validation can still pass.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-hdri</parameter>: Enables building of a
-      high dynamic range version of ImageMagick.
-    </para>
-
-    <para>
-      <parameter>--with-modules</parameter>: Enables support for
-      dynamically loadable modules.
-    </para>
-
-    <para>
-      <parameter>--with-perl</parameter>: Enables building and
-      installing of PerlMagick.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-fftw</option>: Enables support for the
-      <application>FFTW</application> shared library.
-    </para>
-
-    <para>
-      <option>--with-rsvg</option>: Enables support for the
-      <application>librsvg</application> library.
-    </para>
-
-    <para>
-      <option>--with-autotrace</option>: Enables support for
-      the <application>Autotrace</application> library.
-    </para>
-
-    <para>
-      <option>--with-wmf</option>: Enables support for the
-      <application>libwmf</application> library.
-    </para>
-
-    <para>
-      <option>--with-gvc</option>: Enables support for
-      <application>GraphViz</application>.
-    </para>
-
-    <para>
-      <option>--with-security-policy=open|limited|secure|websafe</option>:
-      If you wish to enforce a policy other than the default 'open' see
-      <filename>www/security-policy.html</filename> in the source for
-     details.
-    </para>
-
-    <para>
-      <option>--with-windows-font-dir=
-      <replaceable>&lt;Some/Directory&gt;</replaceable></option>:
-      This option specifies the directory where the Windows CoreFonts are
-      installed.
-    </para>
-
-    <para>
-      <option>--with-dejavu-font-dir=
-      <replaceable>&lt;Some/Directory&gt;</replaceable></option>:
-      This option specifies the directory where the DejaVu fonts are
-      installed.
-    </para>
-
-    <para>
-      The options and parameters listed above are the only ones you should
-      have to pass to the <command>configure</command> script to activate all
-      the delegate dependencies. All other dependencies will be automatically
-      detected and utilized in the build if they are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          magick, Magick++-config, MagickCore-config, and MagickWand-config.
-          (animate, compare, composite, conjure, convert, display,
-          identify, import, magick-script, mogrify, montage, and stream
-          are all symbolic links to magick)
-        </seg>
-        <seg>
-          libMagickCore-7.Q16HDRI.so,
-          libMagickWand-7.Q16HDRI.so and
-          libMagick++-7.Q16HDRI.so
-        </seg>
-        <seg>
-          /etc/ImageMagick-7,
-          /usr/include/ImageMagick-7,
-          /usr/lib/ImageMagick-&imagemagick-version;,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
-          /usr/share/doc/ImageMagick-&imagemagick-version;, and
-          /usr/share/ImageMagick-7
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="animate">
-      <term><command>animate</command></term>
-      <listitem>
-        <para>
-          animates a sequence of images
-        </para>
-        <indexterm zone="imagemagick animate">
-          <primary sortas="b-animate">animate</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="compare">
-      <term><command>compare</command></term>
-      <listitem>
-        <para>
-          compares an image to a reconstructed image
-        </para>
-        <indexterm zone="imagemagick compare">
-          <primary sortas="b-compare">compare</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="composite">
-      <term><command>composite</command></term>
-      <listitem>
-        <para>
-          composites various images into the given base image
-        </para>
-        <indexterm zone="imagemagick composite">
-          <primary sortas="b-composite">composite</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="conjure">
-      <term><command>conjure</command></term>
-      <listitem>
-        <para>
-          processes a MSL script to create an image
-        </para>
-        <indexterm zone="imagemagick conjure">
-          <primary sortas="b-conjure">conjure</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="convert">
-      <term><command>convert</command></term>
-      <listitem>
-        <para>
-          converts image(s) from one format to another
-        </para>
-        <indexterm zone="imagemagick convert">
-          <primary sortas="b-convert">convert</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="display">
-      <term><command>display</command></term>
-      <listitem>
-        <para>
-          displays an image
-        </para>
-        <indexterm zone="imagemagick display">
-          <primary sortas="b-display">display</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="identify">
-      <term><command>identify</command></term>
-      <listitem>
-        <para>
-          describes the format and characteristics of an image file
-        </para>
-        <indexterm zone="imagemagick identify">
-          <primary sortas="b-identify">identify</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="import">
-      <term><command>import</command></term>
-      <listitem>
-        <para>
-          captures an X window
-        </para>
-        <indexterm zone="imagemagick import">
-          <primary sortas="b-import">import</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="magick">
-      <term><command>magick</command></term>
-      <listitem>
-        <para>
-          convert between image formats as well as resize an image,
-          blur, crop, despeckle, dither, draw on, flip, join, re-sample
-          and much more
-        </para>
-        <indexterm zone="imagemagick magick">
-          <primary sortas="b-magick">magick</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="magick-config">
-      <term><command>Magick{++,Core,Wand}-config</command></term>
-      <listitem>
-        <para>
-          show information about the installed versions of the
-          <application>ImageMagick</application> libraries
-        </para>
-        <indexterm zone="imagemagick magick-config">
-          <primary sortas="b-Magick-config">Magick-config</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="mogrify">
-      <term><command>mogrify</command></term>
-      <listitem>
-        <para>
-          transforms an image
-        </para>
-        <indexterm zone="imagemagick mogrify">
-          <primary sortas="b-mogrify">mogrify</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="montage">
-      <term><command>montage</command></term>
-      <listitem>
-        <para>
-          composites various images into a new image
-        </para>
-        <indexterm zone="imagemagick montage">
-          <primary sortas="b-montage">montage</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="stream">
-      <term><command>stream</command></term>
-      <listitem>
-        <para>
-          streams one or more pixel components of an image or
-          portion of the image to your choice of storage formats
-        </para>
-        <indexterm zone="imagemagick stream">
-          <primary sortas="b-stream">stream</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="perlmagick">
-      <term><filename class="libraryfile">Image::Magick</filename></term>
-      <listitem>
-        <para>
-          allows the reading, manipulation and writing of a large number of
-          image file formats using the <application>ImageMagick</application>
-          library. Run <command>make</command> in the
-          <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
-        </para>
-        <indexterm zone="imagemagick perlmagick">
-          <primary sortas="g-Image-Magick">Image::Magick</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickCore-7.Q16HDRI">
-      <term><filename class="libraryfile">libMagickCore-7.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          provides the C API for ImageMagick
-        </para>
-        <indexterm zone="imagemagick libMagickCore-7.Q16HDRI">
-          <primary sortas="c-libMagickCore-7.Q16HDRI">libMagickCore-7.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickWand-7.Q16HDRI">
-      <term><filename class="libraryfile">libMagickWand-7.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          is the recommended C API for ImageMagick. Unlike the MagickCore API it
-          uses  only a few opaque types
-        </para>
-        <indexterm zone="imagemagick libMagickWand-7.Q16HDRI">
-          <primary sortas="c-libMagickWand-7.Q16HDRI">libMagickWand-7.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickpp-7.Q16HDRI">
-      <term><filename class="libraryfile">libMagick++-7.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          provides the C++ API for ImageMagick
-        </para>
-        <indexterm zone="imagemagick libMagickpp-7.Q16HDRI">
-          <primary sortas="c-libMagick++-7.Q16HDRI">libMagick++-7.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 iso-codes-download-http "https://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes_&iso-codes-version;.orig.tar.xz">
-  <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "5760b5a359301397cc3ab2baa165c31c">
-  <!ENTITY iso-codes-size          "3.7 MB">
-  <!ENTITY iso-codes-buildsize     "95 MB">
-  <!ENTITY iso-codes-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="iso-codes" xreflabel="ISO Codes-&iso-codes-version;">
-  <?dbhtml filename="iso-codes.html"?>
-
-
-  <title>ISO Codes-&iso-codes-version;</title>
-
-  <indexterm zone="iso-codes">
-    <primary sortas="a-ISO-Codes">ISO Codes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ISO Codes</title>
-
-    <para>
-      The <application>ISO Codes</application> package contains a list of
-      country, language and currency names and it is used as a central
-      database for accessing this data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&iso-codes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&iso-codes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &iso-codes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &iso-codes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &iso-codes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &iso-codes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ISO Codes</title>
-
-    <para>
-      The directory is called iso-codes-&iso-codes-version;.
-    </para>
-
-    <para>
-      Install <application>ISO Codes</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <note>
-      <para>
-        If you install <application>ISO codes</application> over a previous
-        installed version, the install step will fail when creating some
-        symlinks. In order to properly update them, run:
-      </para>
-
-<screen><userinput>sed -i '/^LN_S/s/s/sfvn/' */Makefile</userinput></screen>
-
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/iso-codes, /usr/share/xml/iso-codes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/lsof-test-kernel.xml
===================================================================
--- general/genutils/lsof-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  [*] <emphasis role='blue'>P</emphasis>OSIX Message Queues                                        [POSIX_MQUEUE]</screen>
Index: neral/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lsof-download-http "https://github.com/lsof-org/lsof/releases/download/&lsof-version;/lsof-&lsof-version;.tar.gz">
-<!ENTITY lsof-download-ftp  " ">
-<!ENTITY lsof-md5sum        "8c858675f6d6e137df9b4e26ad6c46e8">
-<!ENTITY lsof-size          "1.1 MB">
-<!ENTITY lsof-buildsize     "14 MB (with tests)">
-<!ENTITY lsof-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="lsof" xreflabel="lsof-&lsof-version;">
-  <?dbhtml filename="lsof.html"?>
-
-
-  <title>lsof-&lsof-version;</title>
-
-  <indexterm zone="lsof">
-    <primary sortas="a-lsof">lsof</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lsof</title>
-
-    <para>
-      The <application>lsof</application> package is useful to LiSt Open
-      Files for a given running application or process.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lsof-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lsof-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lsof-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lsof-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lsof-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lsof-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lsof Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nmap"/> (with a symbolic link <command>nc</command>
-      pointing to <command>ncat</command> in <filename class="directory">
-      /usr/bin</filename>; used in tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="lsof-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      To run the tests, the following option should be enabled in the kernel
-      configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="lsof-test-kernel.xml"/>
-
-    <indexterm zone="lsof lsof-kernel">
-      <primary sortas="d-lsof">lsof (testing)</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lsof</title>
-
-    <para>
-      Install <application>lsof</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The tests should be run as the <systemitem
-      class="username">root</systemitem> user. They require that the
-      POSIX message queues are enabled in the kernel, and that <xref
-      linkend="nmap"/> be installed with a symbolic link
-      <filename>/usr/bin/nc</filename> pointing to <command>ncat</command>.
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>make check</userinput></screen>
-
-<!--
-    <para>
-      One test, case-20-ux-socket-endpoint, is known to fail.
-      Other test may fail if the tests are run in a script.
-    </para>
--->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para>
-      <command>./Configure -n linux</command>: Avoid AFS, customization, and
-      inventory checks, and use the linux dialect.
-    </para>
-
-    <para>
-      <command>install -m4755 ...</command>: <command>lsof</command> should
-      be suid root to allow users to list all files. This may be a security
-      threat on some systems. In that case change to <option>-m755</option>
-      and use <command>sudo</command> to run the program.
-    </para>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>lsof</seg>
-        <seg>liblsof.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsof-app">
-        <term><command>lsof</command></term>
-        <listitem>
-          <para>
-            lists open files for running processes
-          </para>
-          <indexterm zone="lsof lsof-app">
-            <primary sortas="b-lsof">lsof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblsof">
-        <term><filename class="libraryfile">liblsof.so</filename></term>
-        <listitem>
-          <para>
-            contains an interface for applications to list open files
-          </para>
-          <indexterm zone="lsof liblsof">
-            <primary sortas="c-liblsof">liblsof.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/mandoc.xml
===================================================================
--- general/genutils/mandoc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mandoc-download-http "https://mandoc.bsd.lv/snapshots/mandoc-&mandoc-version;.tar.gz">
-  <!ENTITY mandoc-download-ftp  " ">
-  <!ENTITY mandoc-md5sum        "f0adf24e8fdef5f3e332191f653e422a">
-  <!ENTITY mandoc-size          "684 KB">
-  <!ENTITY mandoc-buildsize     "22 MB (with tests)">
-  <!ENTITY mandoc-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="mandoc" xreflabel="mandoc-&mandoc-version;">
-  <?dbhtml filename="mandoc.html"?>
-
-
-  <title>mandoc-&mandoc-version;</title>
-
-  <indexterm zone="mandoc">
-    <primary sortas="a-mandoc">mandoc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mandoc</title>
-
-    <para>
-      mandoc is an utility to format manual pages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mandoc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mandoc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mandoc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mandoc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mandoc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mandoc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mandoc</title>
-
-    <para>
-      Many utilities provided by <application>mandoc</application> conflicts
-      with <application>Man-DB</application> in LFS.  Only build the
-      <command>mandoc</command> command:
-    </para>
-
-<screen><userinput>./configure &amp;&amp;
-make mandoc</userinput></screen>
-
-    <para>
-      To test the package, issue: <command>make regress</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vm755 mandoc   /usr/bin &amp;&amp;
-install -vm644 mandoc.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          mandoc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mandoc-prog">
-        <term><command>mandoc</command></term>
-        <listitem>
-          <para>
-            Formats manual pages
-          </para>
-          <indexterm zone="mandoc mandoc-prog">
-            <primary sortas="b-mandoc-prog">mandoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,298 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pinentry-download-http "&gnupg-http;/pinentry/pinentry-&pinentry-version;.tar.bz2">
-  <!ENTITY pinentry-download-ftp  " ">
-  <!ENTITY pinentry-md5sum        "ccae9619032fda53b234849c7c2253ac">
-  <!ENTITY pinentry-size          "600 KB">
-  <!ENTITY pinentry-buildsize     "17 MB">
-  <!ENTITY pinentry-time          "0.2 SBU">
-]>
-
-<sect1 id="pinentry" xreflabel="pinentry-&pinentry-version;">
-  <?dbhtml filename="pinentry.html"?>
-
-
-  <title>pinentry-&pinentry-version;</title>
-
-  <indexterm zone="pinentry">
-    <primary sortas="a-PIN-Entry">PIN-Entry</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PIN-Entry</title>
-
-    <para>
-      The <application>PIN-Entry</application> package contains a
-      collection of simple PIN or pass-phrase entry dialogs which utilize the
-      Assuan protocol as described by the
-      <ulink url="https://www.gnupg.org/aegypten/">Ägypten project</ulink>.
-      <application>PIN-Entry</application> programs are usually invoked by
-      the <command>gpg-agent</command> daemon, but can be run from the command
-      line as well. There are programs for various text-based and GUI
-      environments, including interfaces designed for
-      <application>Ncurses</application> (text-based), and for the common
-      <application>GTK</application> and <application>Qt</application>
-      toolkits.
-    </para>
-
-    &lfs121_checked;
-
-    <!-- For testing this package, use: "echo GETPIN | pinentry-qt5" -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pinentry-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pinentry-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pinentry-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pinentry-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pinentry-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pinentry-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PIN-Entry Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libassuan"/> and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>,
-      <xref linkend="fltk"/>,
-      <xref linkend="gcr4"/> (or <xref role="nodep" linkend="gcr"/>),
-      <!--<xref linkend="gtk 2"/>, We don't wan to reference this any more -->
-      <!-- <xref linkend="libcap-pam"/>, This is in LFS already. PAM is not
-      necessary. -->
-      <xref linkend="kf6-frameworks"/> (or <xref linkend="lxqt-kwayland"/>),
-      <!-- If Qt5 is present, it will look for KWayland for Wayland support.-->
-      <xref linkend="libsecret"/>,
-      &qt5-deps;, and
-      <ulink url="https://www.enlightenment.org/about-efl">efl</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PIN-Entry</title>
-
-    <para>
-      Install <application>PIN-Entry</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --enable-pinentry-tty  \
-            --disable-pinentry-qt5 \
-            &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-pinentry-qt5</option>: Don't use qt5 even if 
-      it is available.  Qt5 is deprecated.
-    </para>
-
-    <para>
-      <option>--enable-inside-emacs=yes/no</option>: Default is no.
-    </para>
-
-    <para>
-      <option>--enable-pinentry-qt=yes/no</option>: Default is yes.
-    </para>
-
-    <para>
-      <option>--enable-pinentry-gtk2=yes/no</option>: Default is yes. Even if
-      other <command>pinentry-*</command> is installed,
-      <command>pinentry</command> will be a symlink to
-      <command>pinentry-gtk-2</command>.
-    </para>
-
-    <para>
-      <option>--enable-pinentry-gnome3=yes/no</option>: Default is yes.
-      Actually, it uses <xref linkend='gcr4'/> (or
-      <xref linkend='gcr'/> if the former is not installed) for the pinentry
-      dialog.
-    </para>
-
-    <para>
-      <parameter>--enable-pinentry-tty</parameter>: Default is 'maybe'.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pinentry (symlink), pinentry-curses, pinentry-emacs, pinentry-fltk,
-          pinentry-gnome3, pinentry-gtk-2, pinentry-qt, and pinentry-tty
-        </seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pinentry-prog">
-        <term><command>pinentry</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to the default
-            <application>PIN-Entry</application> program
-          </para>
-          <indexterm zone="pinentry pinentry-prog">
-            <primary sortas="b-pinentry">pinentry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-curses">
-        <term><command>pinentry-curses</command></term>
-        <listitem>
-          <para>
-            is an <application>Ncurses</application> text-based
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-curses">
-            <primary sortas="b-pinentry-curses">pinentry-curses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-emacs">
-        <term><command>pinentry-emacs</command></term>
-        <listitem>
-          <para>
-            is an <application>Emacs</application> version of the
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-emacs">
-            <primary sortas="b-pinentry-emacs">pinentry-emacs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-fltk">
-        <term><command>pinentry-fltk</command></term>
-        <listitem>
-          <para>
-            is a <application>FLTK</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-fltk">
-            <primary sortas="b-pinentry-fltk">pinentry-fltk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-gnome3">
-        <term><command>pinentry-gnome3</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME-3</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-gnome3">
-            <primary sortas="b-pinentry-gnome3">pinentry-gnome3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-gtk-2">
-        <term><command>pinentry-gtk-2</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+2</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-gtk-2">
-            <primary sortas="b-pinentry-gtk-2">pinentry-gtk-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-qt">
-        <term><command>pinentry-qt</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt4 or 5</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-qt">
-            <primary sortas="b-pinentry-qt">pinentry-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-tty">
-        <term><command>pinentry-tty</command></term>
-        <listitem>
-          <para>
-            is a <application>tty</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-tty">
-            <primary sortas="b-pinentry-tty">pinentry-tty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,229 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 screen-download-http "&gnu-http;/screen/screen-&screen-version;.tar.gz">
-  <!ENTITY screen-download-ftp  " ">
-  <!ENTITY screen-md5sum        "9a9bdc956bd93e4f0cb9e48678889e26">
-  <!ENTITY screen-size          "1020 KB">
-  <!ENTITY screen-buildsize     "9.5 MB">
-  <!ENTITY screen-time          "0.1 SBU">
-]>
-
-<sect1 id="screen" xreflabel="Screen-&screen-version;">
-  <?dbhtml filename="screen.html"?>
-
-
-  <title>Screen-&screen-version;</title>
-
-  <indexterm zone="screen">
-    <primary sortas="a-Screen">Screen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Screen</title>
-
-    <para>
-      <application>Screen</application> is a terminal multiplexor that runs
-      several separate processes, typically interactive shells, on a single
-      physical character-based terminal. Each virtual terminal emulates a DEC
-      VT100 plus several ANSI X3.64 and ISO 2022 functions and also provides
-      configurable input and output translation, serial port support,
-      configurable logging, multi-user support, and many character encodings,
-      including UTF-8. Screen sessions can be detached and resumed
-      later on a different terminal.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&screen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&screen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &screen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &screen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &screen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <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>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Screen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>
-    </para>
-
-  </sect2>
-
-  <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>
-      Install <application>Screen</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sh autogen.sh                                 &amp;&amp;
-./configure --prefix=/usr                     \
-            --infodir=/usr/share/info         \
-            --mandir=/usr/share/man           \
-            --with-socket-dir=/run/screen     \
-            --with-pty-group=5                \
-            --with-sys-screenrc=/etc/screenrc &amp;&amp;
-
-sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &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;
-install -m 644 etc/etcscreenrc /etc/screenrc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-socket-dir=/run/screen</parameter>: This option
-      places the per-user sockets in a standard location.
-    </para>
-
-    <para>
-      <parameter>--with-sys-screenrc=/etc/screenrc</parameter>: This option
-      places the global screenrc file in <filename
-      class='directory'>/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-pty-group=5</parameter>: This option sets the gid
-      to the value used by LFS.
-    </para>
-
-    <para>
-      <command>sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%"
-      {etc,doc}/*</command>: This command corrects the configuration and
-      documentation files to the location that is used here for the global
-      screenrc file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Screen</title>
-
-    <sect3 id ="screen-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/screenrc</filename> and
-        <filename>~/.screenrc</filename>
-      </para>
-
-      <indexterm zone="screen screen-config">
-        <primary sortas="e-AA.screenrc">~/.screenrc</primary>
-      </indexterm>
-
-      <indexterm zone="screen screen-config">
-        <primary sortas="e-etc-screenrc">/etc/screenrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        You may want to look at the example configuration file that was
-        installed and customize it for your needs.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>screen (symlink) and screen-&screen-version;</seg>
-        <seg>None</seg>
-        <seg>/usr/share/screen and /run/screen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="screen-prog">
-        <term><command>screen</command></term>
-        <listitem>
-          <para>
-            is a terminal multiplexor with VT100/ANSI terminal emulation
-          </para>
-          <indexterm zone="screen screen-prog">
-            <primary sortas="b-screen">screen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/shared-mime-info.xml
===================================================================
--- general/genutils/shared-mime-info.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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">
-  <!ENTITY shared-mime-info-download-ftp  " ">
-  <!ENTITY shared-mime-info-md5sum        "aac56db912b7b12a04fb0018e28f2f36">
-  <!ENTITY shared-mime-info-size          "7.5 MB">
-  <!ENTITY shared-mime-info-buildsize     "26 MB (with tests)">
-  <!ENTITY shared-mime-info-time          "less than 0.1 SBU (with tests)">
-
-  <!ENTITY xdgmime-download-http "&sources-anduin-http;/xdgmime/xdgmime.tar.xz">
-  <!ENTITY xdgmime-md5sum        "7dfb4446705d345d3acd672024049e86">
-
-]>
-
-<sect1 id="shared-mime-info"
-xreflabel="shared-mime-info-&shared-mime-info-version;">
-  <?dbhtml filename="shared-mime-info.html" ?>
-
-
-  <title>shared-mime-info-&shared-mime-info-version;</title>
-
-  <indexterm zone="shared-mime-info">
-    <primary sortas="a-shared-mime-info">shared-mime-info</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Shared Mime Info</title>
-
-    <para>
-      The <application>Shared Mime Info</application> package contains a
-      MIME database. This allows central updates of MIME information for all
-      supporting applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&shared-mime-info-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&shared-mime-info-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &shared-mime-info-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &shared-mime-info-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &shared-mime-info-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &shared-mime-info-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional download, required to run the test suite:
-          <ulink url="&xdgmime-download-http;"/>
-        </para>
-        <para>
-          xdgmime md5sum: &xdgmime-md5sum;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Shared Mime Info Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shared Mime Info</title>
-
-    <para>
-      Install <application>Shared Mime Info</application> by running the
-      following commands:
-    </para>
-
-    <para>
-      If you wish to run the test suite, you must first extract the
-      <filename>xdgmime</filename> tarball into the current directory,
-      and compile it so that <command>meson</command> can find it:
-    </para>
-
-<screen remap="test"><userinput>tar -xf ../xdgmime.tar.xz &amp;&amp;
-make -C xdgmime</userinput></screen>
-
-    <para>
-      Now build the package:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dupdate-mimedb=true .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para role="optional">
-      If you have followed the instructions above to build
-      <application>xdgmime</application>, to test the result 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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dupdate-mimedb=true</parameter>: This parameter tells
-      the build system to run <command>update-mime-database</command> during
-      installation. Otherwise, this must be done manually in order to be
-      able to use the MIME database.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          update-mime-database
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/mime
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="update-mime-database">
-        <term><command>update-mime-database</command></term>
-        <listitem>
-          <para>
-            assists in adding MIME data to the database
-          </para>
-          <indexterm zone="shared-mime-info update-mime-database">
-            <primary sortas="b-update-mime-database">update-mime-database</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/sharutils.xml
===================================================================
--- general/genutils/sharutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sharutils-download-http "&gnu-http;/sharutils/sharutils-&sharutils-version;.tar.xz">
-  <!ENTITY sharutils-download-ftp  " ">
-  <!ENTITY sharutils-md5sum        "5975ce21da36491d7aa6dc2b0d9788e0">
-  <!ENTITY sharutils-size          "1.1 MB">
-  <!ENTITY sharutils-buildsize     "22 MB (with the test suite)">
-  <!ENTITY sharutils-time          "0.4 SBU (with the test suite)">
-]>
-
-<sect1 id="sharutils" xreflabel="Sharutils-&sharutils-version;">
-  <?dbhtml filename="sharutils.html"?>
-
-
-  <title>Sharutils-&sharutils-version;</title>
-
-  <indexterm zone="sharutils">
-    <primary sortas="a-Sharutils">Sharutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sharutils</title>
-
-    <para>
-      The <application>Sharutils</application> package contains
-      utilities that can create 'shell' archives.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sharutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sharutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sharutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sharutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sharutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sharutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sharutils</title>
-
-    <para>
-      Fix a heap buffer overflow, and an issue exposed by GCC-10:
-    </para>
-
-<screen><userinput>sed -i 's/BUFSIZ/rw_base_size/' src/unshar.c &amp;&amp;
-sed -i '/program_name/s/^/extern /' src/*opts.h</userinput></screen>
-
-    <para>
-      Install <application>Sharutils</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c        &amp;&amp;
-echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          shar, unshar, uudecode and uuencode
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="shar">
-        <term><command>shar</command></term>
-        <listitem>
-          <para>
-            creates "shell archives" (or shar files) which are in
-            text format and can be mailed
-          </para>
-          <indexterm zone="sharutils shar">
-            <primary sortas="b-shar">shar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unshar">
-        <term><command>unshar</command></term>
-        <listitem>
-          <para>
-            unpacks a shar file
-          </para>
-          <indexterm zone="sharutils unshar">
-            <primary sortas="b-unshar">unshar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uudecode">
-        <term><command>uudecode</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="sharutils uudecode">
-            <primary sortas="b-uudecode">uudecode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuencode">
-        <term><command>uuencode</command></term>
-        <listitem>
-          <para>
-            reads a file (or by default the standard input) and decodes
-            the uuencoded version to the standard output
-          </para>
-          <indexterm zone="sharutils uuencode">
-            <primary sortas="b-uuencode">uuencode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/telepathy-mission-control.xml
===================================================================
--- general/genutils/telepathy-mission-control.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 telepathy-mission-control-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
-  <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "911e990c7755eb98a8022223f649405d">
-  <!ENTITY telepathy-mission-control-size          "1.1 MB">
-  <!ENTITY telepathy-mission-control-buildsize     "28 MB">
-  <!ENTITY telepathy-mission-control-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
-  <?dbhtml filename="telepathy-mission-control.html"?>
-
-
-  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
-
-  <indexterm zone="telepathy-mission-control">
-    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Mission Control</title>
-
-    <para>
-      <application>Telepathy Mission Control</application> is an account manager
-      and channel dispatcher for the <application>Telepathy</application>
-      framework, allowing user interfaces  and other clients to share connections
-      to real-time communication services without conflicting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-mission-control-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-mission-control-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-mission-control-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-mission-control-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/> (for the <quote>twisted</quote> tests),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="upower"/>, and
-      <ulink url="https://pypi.org/project/Twisted/">Twisted</ulink>
-         (for the <quote>twisted</quote> tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Mission Control</title>
-
-    <para>
-      Install <application>Telepathy Mission Control</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 \
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>PYTHON=python3</command>: prevents using Python2 if it
-      is installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mc-tool, mc-wait-for-name and mission-control-5 (library executable)
-        </seg>
-        <seg>
-          libmission-control-plugins.so
-        </seg>
-        <seg>
-          /usr/include/mission-control-5.5 and
-          /usr/share/gtk-doc/html/mission-control-plugins
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mc-tool">
-        <term><command>mc-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to manipulate Mission Control accounts
-          </para>
-          <indexterm zone="telepathy-mission-control mc-tool">
-            <primary sortas="b-mc-tool">mc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mc-wait-for-name">
-        <term><command>mc-wait-for-name</command></term>
-        <listitem>
-          <para>
-            waits for a D-Bus bus name that will be provided
-            automatically by the desktop session
-          </para>
-          <indexterm zone="telepathy-mission-control mc-wait-for-name">
-            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mission-control-5">
-        <term><command>mission-control-5</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="telepathy-mission-control mission-control-5">
-            <primary sortas="b-mission-control-5">mission-control-5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmission-control-plugins">
-        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Mission Control</application> plugin API functions
-          </para>
-          <indexterm zone="telepathy-mission-control libmission-control-plugins">
-            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/tidy-html5.xml
===================================================================
--- general/genutils/tidy-html5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-buildsize     "11 MB">
-  <!ENTITY tidy-html5-time          "0.2 SBU">
-]>
-
-<sect1 id="tidy-html5" xreflabel="tidy-html5-&tidy-html5-version;">
-  <?dbhtml filename="tidy-html5.html"?>
-
-
-  <title>tidy-html5-&tidy-html5-version;</title>
-
-  <indexterm zone="tidy-html5">
-    <primary sortas="a-Tidy-HTML5">Tidy HTML5</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tidy HTML5</title>
-
-    <para>
-      The <application>Tidy HTML5</application> package contains a
-      command line tool and libraries used to read HTML, XHTML and XML files
-      and write cleaned up markup. It detects and corrects many common coding
-      errors and strives to produce visually equivalent markup that is both
-      W3C compliant and compatible with most browsers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tidy-html5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tidy-html5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tidy-html5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tidy-html5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tidy-html5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tidy-html5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tidy HTML5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tidy HTML5</title>
-
-    <para>
-      Install <application>Tidy HTML5</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd build/cmake &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_TAB2SPACE=ON        \
-      ../..    &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;
-rm -fv /usr/lib/libtidy.a &amp;&amp;
-install -v -m755 tab2space /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      build the release library without any debug `assert` in the code.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TAB2SPACE=ON</parameter>: This switch is used to enable
-      building the <command>tab2space</command> utility.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tidy HTML5</title>
-
-    <sect3>
-      <title>Config Files</title>
-
-      <para>
-        The absolute path of the file specified in <envar>HTML_TIDY</envar>.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The default configuration options can be set in the file defined in
-        <envar>HTML_TIDY</envar>. Additional configuration options can be
-        passed to <command>tidy</command> via command line parameters or the
-        <option>-config &lt;file&gt;</option> parameter.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-    <segtitle>Installed Programs</segtitle>
-    <segtitle>Installed Library</segtitle>
-    <segtitle>Installed Directory</segtitle>
-    <seglistitem>
-    <seg>tab2space and tidy</seg>
-    <seg>libtidy.so</seg>
-    <seg>/usr/share/doc/tidy-&tidy-html5-version;</seg>
-    </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tab2space">
-        <term><command>tab2space</command></term>
-        <listitem>
-          <para>
-            is a utility to expand tabs and ensure consistent line endings
-          </para>
-          <indexterm zone="tidy-html5 tab2space">
-            <primary sortas="b-tab2space">tab2space</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tidy">
-        <term><command>tidy</command></term>
-        <listitem>
-          <para>
-            validates, corrects, and pretty-prints HTML files
-          </para>
-          <indexterm zone="tidy-html5 tidy">
-            <primary sortas="b-tidy">tidy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtidy">
-        <term>
-          <filename class="libraryfile">libtidy.so</filename>
-        </term>
-        <listitem>
-          <para>
-            library provides the <application>Tidy HTML5</application> API
-            functions to <command>tidy</command> and can also be called by other
-            programs
-          </para>
-          <indexterm zone="tidy-html5 libtidy">
-            <primary sortas="c-libtidy">libtidy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/time.xml
===================================================================
--- general/genutils/time.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 time-download-http "&gnu-http;/time/time-&time-version;.tar.gz">
-  <!ENTITY time-download-ftp  " ">
-  <!ENTITY time-md5sum        "d2356e0fe1c0b85285d83c6b2ad51b5f">
-  <!ENTITY time-size          "584 KB">
-  <!ENTITY time-buildsize     "4.0 MB (with tests)">
-  <!ENTITY time-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="time" xreflabel="time-&time-version;">
-  <?dbhtml filename="time.html"?>
-
-
-  <title>Time-&time-version;</title>
-
-  <indexterm zone="time">
-    <primary sortas="a-time">time</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Time</title>
-
-    <para>
-      The <application>time</application> utility is a program that
-      measures many of the CPU resources, such as time and memory, that
-      other programs use.  The GNU version can format the output in
-      arbitrary ways by using a printf-style format string to include
-      various resource measurements.
-    </para>
-    <para>
-      Although the shell has a builtin command providing similar
-      functionalities, this utility is required by the LSB.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&time-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&time-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &time-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &time-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &time-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &time-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Time</title>
-
-    <para>
-      Install <application>Time</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          time
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="time-prog">
-        <term><command>time</command></term>
-        <listitem>
-          <para>
-            reports various statistics about an executed command
-          </para>
-          <indexterm zone="time time-prog">
-            <primary sortas="b-time">time</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/genutils/tree.xml
===================================================================
--- general/genutils/tree.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tree-download-http "https://gitlab.com/OldManProgrammer/unix-tree/-/archive/&tree-version;/unix-tree-&tree-version;.tar.bz2">
-<!ENTITY tree-download-ftp  " ">
-<!ENTITY tree-md5sum        "85f9a6d1e48f1d5262a9b2d58d47431f">
-<!ENTITY tree-size          "52 KB">
-<!ENTITY tree-buildsize     "732 KB">
-<!ENTITY tree-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="tree" xreflabel="tree-&tree-version;">
-  <?dbhtml filename="tree.html"?>
-
-
-  <title>tree-&tree-version;</title>
-
-  <indexterm zone="tree">
-    <primary sortas="a-tree">tree</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to tree</title>
-
-    <para>
-      The <application>tree</application> application is useful to display a
-      dictionary tree's contents, including files, directories, and links.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tree-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tree-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tree-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tree-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tree-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tree-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of tree</title>
-
-    <para>
-      Install <application>tree</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>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>
-
-    <!-- Without MANDIR=/usr/share/man, it'll create /usr/share/man1/man1 and
-         install 'tree.1' there. Also, without prefix=/usr, it'll install the
-         'tree' command in /usr/local/bin. -->
-
-<screen role="root"><userinput>make PREFIX=/usr MANDIR=/usr/share/man 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>tree</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tree-app">
-        <term><command>tree</command></term>
-        <listitem>
-          <para>
-            displays a directory tree in a terminal
-          </para>
-          <indexterm zone="tree tree-app">
-            <primary sortas="b-tree">tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unixodbc-download-http "https://github.com/lurcher/unixODBC/releases/download/&unixodbc-version;/unixODBC-&unixodbc-version;.tar.gz">
-  <!ENTITY unixodbc-download-ftp  " ">
-  <!ENTITY unixodbc-md5sum        "d62167d85bcb459c200c0e4b5a63ee48">
-  <!ENTITY unixodbc-size          "1.7 MB">
-  <!ENTITY unixodbc-buildsize     "28 MB">
-  <!ENTITY unixodbc-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="unixodbc" xreflabel="unixODBC-&unixodbc-version;">
-  <?dbhtml filename="unixodbc.html"?>
-
-
-  <title>unixODBC-&unixodbc-version;</title>
-
-  <indexterm zone="unixodbc">
-    <primary sortas="a-unixODBC">unixODBC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to unixODBC</title>
-
-    <para>
-      The <application>unixODBC</application> package is an Open Source
-      ODBC (Open DataBase Connectivity) sub-system and an ODBC SDK for Linux, Mac
-      OSX, and UNIX. ODBC is an open specification for providing application
-      developers with a predictable API with which to access data sources. Data
-      sources include optional SQL Servers and any data source with an ODBC Driver.
-      <application>unixODBC</application> contains the following components used
-      to assist with the manipulation of ODBC data sources: a driver manager, an
-      installer library and command line tool, command line tools to help install
-      a driver and work with SQL, drivers and driver setup libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unixodbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unixodbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unixodbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unixodbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unixodbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unixodbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">unixODBC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://hughestech.com.au/products/msql/">Mini SQL</ulink> 
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of unixODBC</title>
-
-    <para>
-      Install <application>unixODBC</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc/unixODBC &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;
-
-find doc -name "Makefile*" -delete                &amp;&amp;
-chmod 644 doc/{lst,ProgrammerManual/Tutorial}/*   &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/unixODBC-&unixodbc-version; &amp;&amp;
-cp      -v -R doc/* /usr/share/doc/unixODBC-&unixodbc-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-drivers</option>: This parameter enables building
-      the drivers that were installed by default in previous versions.
-    </para>
-
-    <para>
-      <option>--enable-drivers-conf</option>: This parameter enables
-      building the driver configuration libraries that were installed
-      by default in previous versions.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring unixODBC</title>
-
-    <sect3 id="unixodbc-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/unixODBC/*</filename>
-      </para>
-
-        <indexterm zone="unixodbc unixodbc-config">
-          <primary sortas="e-etc-unixODBC-">/etc/unixODBC/*</primary>
-        </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The files in <filename class='directory'>/etc/unixODBC</filename>
-        are meant to be configured by the system administrator (or the ODBC site
-        administrator if appropriate privileges are granted to
-        <filename class='directory'>/etc/unixODBC</filename>). These files
-        are not meant to be directly edited. The ODBC installer library is
-        responsible for reading and writing the
-        <application>unixODBC</application> config files.
-      </para>
-
-      <para>
-        Unfortunately, there are not many <command>man</command>, or any
-        <command>info</command> pages for the various programs available in the
-        <application>unixODBC</application> package. Along with the information
-        in the <quote>Short Descriptions</quote> below and the documentation
-        installed in <filename
-        class='directory'>/usr/share/doc/unixODBC-&unixodbc-version;</filename>,
-        there are many <filename>README</filename> files throughout the source
-        tree where the use and functionality of the programs can be found.
-        Additionally, you can use the parameter <option>-?</option> for syntax
-        and usage information. Lastly, the <application>unixODBC</application>
-        web site at <ulink url="http://www.unixodbc.org/"/> has very good
-        information.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dltest, isql, iusql, odbc_config, odbcinst, and slencheck
-        </seg>
-        <seg>
-          libodbc.so, libodbccr.so, and libodbcinst.so
-        </seg>
-        <seg>
-          /etc/unixODBC and
-          /usr/share/doc/unixODBC-&unixodbc-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dltest">
-        <term><command>dltest</command></term>
-        <listitem>
-          <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
-          </para>
-          <indexterm zone="unixodbc dltest">
-            <primary sortas="b-dltest">dltest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isql">
-        <term><command>isql</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="unixodbc isql">
-            <primary sortas="b-isql">isql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iusql">
-        <term><command>iusql</command></term>
-        <listitem>
-          <para>
-            provides the same functionality as the <command>isql</command>
-            program
-          </para>
-          <indexterm zone="unixodbc iusql">
-            <primary sortas="b-iusql">iusql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="odbc_config">
-        <term><command>odbc_config</command></term>
-        <listitem>
-          <para>
-            is used to find out details about the installation of
-            the <application>unixODBC</application> package
-          </para>
-          <indexterm zone="unixodbc odbc_config">
-            <primary sortas="b-odbc_config">odbc_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="odbcinst">
-        <term><command>odbcinst</command></term>
-        <listitem>
-          <para>
-            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
-            not copy any files (i.e., libraries) but it will modify the ODBC
-            System Information for the user
-          </para>
-          <indexterm zone="unixodbc odbcinst">
-            <primary sortas="b-odbcinst">odbcinst</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="slencheck">
-        <term><command>slencheck</command></term>
-        <listitem>
-          <para>
-            is a utility which attempts to check whether an ODBC driver
-            was built with 32-bit or 64-bit SQLLEN types
-          </para>
-          <indexterm zone="unixodbc slencheck">
-            <primary sortas="b-slencheck">slencheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/xdg-dbus-proxy.xml
===================================================================
--- general/genutils/xdg-dbus-proxy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-dbus-proxy-download-http "https://github.com/flatpak/xdg-dbus-proxy/releases/download/&xdg-dbus-proxy-version;/xdg-dbus-proxy-&xdg-dbus-proxy-version;.tar.xz">
-  <!ENTITY xdg-dbus-proxy-download-ftp  "">
-  <!ENTITY xdg-dbus-proxy-md5sum        "b496f34b0fa4747a66eb5adb63b7d626">
-  <!ENTITY xdg-dbus-proxy-size          "124 KB">
-  <!ENTITY xdg-dbus-proxy-buildsize     "1.4 MB">
-  <!ENTITY xdg-dbus-proxy-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-dbus-proxy" xreflabel="xdg-dbus-proxy-&xdg-dbus-proxy-version;">
-  <?dbhtml filename="xdg-dbus-proxy.html"?>
-
-  <title>xdg-dbus-proxy-&xdg-dbus-proxy-version;</title>
-
-  <indexterm zone="xdg-dbus-proxy">
-    <primary sortas="a-xdg-dbus-proxy">xdg-dbus-proxy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-dbus-proxy</title>
-
-    <para>
-      The <application>xdg-dbus-proxy</application> package contains a
-      filtering proxy for D-Bus connections. This is useful for forwarding data
-      in and out of a sandbox.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-dbus-proxy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-dbus-proxy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-dbus-proxy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-dbus-proxy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-dbus-proxy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-dbus-proxy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-dbus-proxy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-dbus-proxy</title>
-
-    <para>
-      Install <application>xdg-dbus-proxy</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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>
-          xdg-dbus-proxy
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdg-dbus-proxy-prog">
-        <term><command>xdg-dbus-proxy</command></term>
-        <listitem>
-          <para>
-            is a filtering proxy for D-Bus connections
-          </para>
-          <indexterm zone="xdg-dbus-proxy xdg-dbus-proxy-prog">
-            <primary sortas="b-xdg-dbus-proxy">xdg-dbus-proxy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genutils/xdg-user-dirs.xml
===================================================================
--- general/genutils/xdg-user-dirs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-user-dirs-download-http "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-&xdg-user-dirs-version;.tar.gz">
-  <!ENTITY xdg-user-dirs-download-ftp  " ">
-  <!ENTITY xdg-user-dirs-md5sum        "dc7decea7ffb58cd067eff1fe1798cae">
-  <!ENTITY xdg-user-dirs-size          "267 KB">
-  <!ENTITY xdg-user-dirs-buildsize     "3.0 MB">
-  <!ENTITY xdg-user-dirs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-user-dirs" xreflabel="Xdg-user-dirs-&xdg-user-dirs-version;">
-  <?dbhtml filename="xdg-user-dirs.html"?>
-
-
-  <!-- No other tags inside any title.
-       Use Title Case in All Titles -->
-  <title>Xdg-user-dirs-&xdg-user-dirs-version;</title>
-
-  <indexterm zone="xdg-user-dirs">
-    <primary sortas="a-xdg-user-dirs">xdg-user-dirs</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to Xdg-user-dirs</title>
-
-    <para>
-      <application>Xdg-user-dirs</application> is a tool to help manage <quote>well
-      known</quote> user directories like the desktop folder and the music folder.
-      It also handles localization (i.e. translation) of the filenames.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-user-dirs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-user-dirs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-user-dirs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-user-dirs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-user-dirs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-user-dirs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xdg-user-dirs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/> (all three for building the man pages)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xdg-user-dirs</title>
-
-    <para>
-      Install <application>xdg-user-dirs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --disable-documentation &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-documentation</parameter>: Disable the
-      installation of the man pages.  Remove this switch if you've installed
-      the optional dependencies and you wish to install the man pages of
-      this package.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xdg-user-dirs</title>
-
-    <sect3 id="xdg-user-dirs-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/user-dirs.dirs</filename>,
-        <filename>/etc/xdg/user-dirs.conf</filename>, and
-        <filename>/etc/xdg/user-dirs.defaults</filename>. Those default
-        locations can be overridden by <envar>XDG_CONFIG_HOME</envar> and
-        <envar>XDG_CONFIG_DIRS</envar>
-      </para>
-
-      <indexterm zone="xdg-user-dirs xdg-user-dirs-config">
-        <primary sortas="e-AA.config-user-dirs.dirs">~/.config/user-dirs.dirs</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-user-dirs xdg-user-dirs-config">
-        <primary
-        sortas="e-etc-xdg-user-dirs.conf">/etc/xdg/user-dirs.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-user-dirs xdg-user-dirs-config">
-        <primary
-        sortas="e-etc-xdg-user-dirs.defaults">/etc/xdg/user-dirs.defaults</primary>
-      </indexterm>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdg-user-dir and xdg-user-dirs-update
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdg-user-dir">
-        <term><command>xdg-user-dir</command></term>
-        <listitem>
-          <para>
-            looks up the current path for one of the XDG user directories
-          </para>
-          <indexterm zone="xdg-user-dirs xdg-user-dir">
-            <primary sortas="b-xdg-user-dir">xdg-user-dir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-user-dirs-update">
-        <term><command>xdg-user-dirs-update</command></term>
-        <listitem>
-          <para>
-            creates localized versions of the user directories
-          </para>
-          <indexterm zone="xdg-user-dirs xdg-user-dirs-update">
-            <primary sortas="b-xdg-user-dirs-update">xdg-user-dirs-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 aalib-download-http "&sourceforge-dl;/aa-project/aalib-&aalib-version;.tar.gz">
-  <!ENTITY aalib-download-ftp  " ">
-  <!ENTITY aalib-md5sum        "9801095c42bba12edebd1902bcf0a990">
-  <!ENTITY aalib-size          "388 KB">
-  <!ENTITY aalib-buildsize     "6.5 MB">
-  <!ENTITY aalib-time          "0.1 SBU">
-]>
-
-<sect1 id="aalib" xreflabel="AAlib-&aalib-version;">
-  <?dbhtml filename="aalib.html"?>
-
-
-  <title>AAlib-&aalib-version;</title>
-
-  <indexterm zone="aalib">
-    <primary sortas="a-AAlib">AAlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AAlib</title>
-
-    <para>
-      <application>AAlib</application> is a library to render any graphic into
-      ASCII Art.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&aalib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&aalib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &aalib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &aalib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &aalib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &aalib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AAlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="xorg7-font"/> (runtime),
-      <xref linkend="slang"/>, and
-      <xref linkend="gpm"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AAlib</title>
-
-    <para>
-      Fix a minor problem with the included m4 file:
-    </para>
-
-<screen><userinput>sed -i -e '/AM_PATH_AALIB,/s/AM_PATH_AALIB/[&amp;]/' aalib.m4</userinput></screen>
-
-    <para>
-      Change the default X11 font from <xref linkend='xorg7-legacy'/> to
-      <xref linkend='xorg7-font'/>:
-    </para>
-
-<screen><userinput>sed -e 's/8x13bold/-*-luxi mono-bold-r-normal--13-120-*-*-m-*-*-*/' \
-    -i src/aax.c</userinput></screen>
-
-    <para>
-      Install <application>AAlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr             \
-            --infodir=/usr/share/info \
-            --mandir=/usr/share/man   \
-            --with-ncurses=/usr       \
-            --disable-static          &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>aafire, aainfo, aalib-config, aasavefont, and aatest</seg>
-        <seg>libaa.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aafire">
-        <term><command>aafire</command></term>
-        <listitem>
-          <para>
-            is a demo of <application>AAlib</application>, rendering
-            an animated fire in ASCII Art
-          </para>
-          <indexterm zone="aalib aafire">
-            <primary sortas="b-aafire">aafire</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aainfo">
-        <term><command>aainfo</command></term>
-        <listitem>
-          <para>
-            provides information for your current settings related to
-            <application>AAlib</application>
-          </para>
-          <indexterm zone="aalib aainfo">
-            <primary sortas="b-aainfo">aainfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aalib-config">
-        <term><command>aalib-config</command></term>
-        <listitem>
-          <para>
-            provides configuration info for <application>AAlib</application>
-          </para>
-          <indexterm zone="aalib aalib-config">
-            <primary sortas="b-aalib-config">aalib-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aasavefont">
-        <term><command>aasavefont</command></term>
-        <listitem>
-          <para>
-            saves a font to a file
-          </para>
-          <indexterm zone="aalib aasavefont">
-            <primary sortas="b-aasavefont">aasavefont</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aatest">
-        <term><command>aatest</command></term>
-        <listitem>
-          <para>
-            shows the abilities of <application>AAlib</application>
-            in a little test
-          </para>
-          <indexterm zone="aalib aatest">
-            <primary sortas="b-aatest">aatest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaa">
-        <term><filename class="libraryfile">libaa.so</filename></term>
-        <listitem>
-          <para>
-            is a collection of routines to render any graphical input in
-            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
-          </para>
-          <indexterm zone="aalib libaa">
-            <primary sortas="c-libaa">libaa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 babl-download-http "https://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.xz">
-  <!ENTITY babl-download-ftp  " ">
-  <!ENTITY babl-md5sum        "749169721b551882332a64ac17735de6">
-  <!ENTITY babl-size          "312 KB">
-  <!ENTITY babl-buildsize     "13 MB (with tests)">
-  <!ENTITY babl-time          "0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="babl" xreflabel="babl-&babl-version;">
-  <?dbhtml filename="babl.html"?>
-
-
-  <title>babl-&babl-version;</title>
-
-  <indexterm zone="babl">
-    <primary sortas="a-Babl">Babl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Babl</title>
-
-    <para>
-      The <application>Babl</application> package is a dynamic, any to any,
-      pixel format translation library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&babl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&babl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &babl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &babl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &babl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &babl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Babl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lcms2"/> and
-      <ulink url="&w3m-url;">w3m</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Babl</title>
-
-<!--
-    <para>
-      First, fix a typo that causes Meson to fail to run:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/check:/d' meson.build</userinput></screen>
--->
-
-    <para>
-      Install <application>Babl</application> by running the following commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --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 &amp;&amp;
-
-install -v -m755 -d                         /usr/share/gtk-doc/html/babl/graphics &amp;&amp;
-install -v -m644 docs/*.{css,html}          /usr/share/gtk-doc/html/babl          &amp;&amp;
-install -v -m644 docs/graphics/*.{html,svg} /usr/share/gtk-doc/html/babl/graphics</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>install -v -m755 -d
-      /usr/share/gtk-doc/html/babl/graphics</command>: This and the subsequent
-      commands install the library html documentation under
-      <filename class="directory">/usr/share/gtk-doc/html</filename> where
-      other gtk packages put the programmer-oriented documentation.
-    </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>libbabl-0.1.so and libraries in /usr/lib/babl-0.1</seg>
-        <seg>
-          /usr/{include,lib}/babl-0.1 and
-          /usr/share/gtk-doc/html/babl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libbabl">
-        <term><filename class="libraryfile">libbabl-0.1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to access BablFishes to convert between formats
-          </para>
-          <indexterm zone="babl libbabl">
-            <primary sortas="c-libbabl">libbabl-0.1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 exiv2-download-http "https://github.com/Exiv2/exiv2/archive/v&exiv2-version;/exiv2-&exiv2-version;.tar.gz">
-  <!ENTITY exiv2-download-ftp  " ">
-  <!ENTITY exiv2-md5sum        "75a8766216a15ad104f09ab4a0eab7ca">
-  <!ENTITY exiv2-size          "43 MB">
-  <!ENTITY exiv2-buildsize     "127 MB (with tests)">
-  <!ENTITY exiv2-time          "0.3 SBU (Using parallelism=4, with tests)">
-]>
-
-<sect1 id="exiv2" xreflabel="Exiv2-&exiv2-version;">
-  <?dbhtml filename="exiv2.html"?>
-
-
-  <title>Exiv2-&exiv2-version;</title>
-
-  <indexterm zone="exiv2">
-    <primary sortas="a-Exiv2">Exiv2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exiv2</title>
-
-    <para>
-      <application>Exiv2</application> is a C++ library and a command
-      line utility for managing image and video metadata.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exiv2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exiv2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exiv2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exiv2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exiv2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exiv2-time;
-        </para>
-      </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>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="brotli"/>,
-      <xref linkend="curl"/>, and
-      <xref linkend="inih"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.libssh.org/">libssh</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional for documentation</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exiv2</title>
-<!--
-    <para>
-      First, disable building a sample program that fails:
-    </para>
-
-<screen><userinput>sed -i '/conntest/s/^/#/' samples/CMakeLists.txt</userinput></screen>
--->
-    <para>
-      Install <application>Exiv2</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   \
-      -DEXIV2_ENABLE_VIDEO=yes     \
-      -DEXIV2_ENABLE_WEBREADY=yes  \
-      -DEXIV2_ENABLE_CURL=yes      \
-      -DEXIV2_BUILD_SAMPLES=no     \
-      -G "Unix Makefiles" .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DEXIV2_ENABLE_VIDEO=yes</parameter>:
-      This switch enables managing video metadata.
-    </para>
-
-    <para>
-      <parameter>-DEXIV2_ENABLE_WEBREADY=yes</parameter>:
-      This switch enables managing web image metadata.
-    </para>
-
-    <para>
-      <parameter>-DEXIV2_BUILD_SAMPLES=no</parameter>:
-      This switch is necessary to suppress building and installing
-      sample programs.  If the sample programs are built, 34 additional
-      programs are installed in /usr/bin.
-    </para>
-
-    <para>
-      <parameter>-DEXIV2_ENABLE_CURL=yes</parameter>:
-      This switch is necessary to enable network/http capabilities.
-    </para>
-
-    <para>
-      <option>-DEXIV2_ENABLE_INIH=no</option>:
-      Use this switch if you have not installed <xref linkend="inih"/>.
-    </para>
-
-    <para>
-      <option>-DEXIV2_ENABLE_BROTLI=no</option>:
-      Use this switch if you have not installed <xref linkend="brotli"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          exiv2
-        </seg>
-        <seg>
-          libexiv2.so <!-- and
-          libexiv2-xmp.a -->
-        </seg>
-        <seg>
-          /usr/include/exiv2 and
-          /usr/lib/cmake/exiv2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exiv2-prog">
-        <term><command>exiv2</command></term>
-        <listitem>
-          <para>
-            is a utility used to dump Exif data
-          </para>
-          <indexterm zone="exiv2 exiv2-prog">
-            <primary sortas="b-exiv2">exiv2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,422 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fontconfig-download-http
-           "https://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.xz">
-  <!ENTITY fontconfig-download-ftp  " ">
-  <!ENTITY fontconfig-md5sum        "5bb3a2829aecb22ae553c39099bd0d6a">
-  <!ENTITY fontconfig-size          "1.4 MB">
-  <!ENTITY fontconfig-buildsize     "17 MB (with tests)">
-  <!ENTITY fontconfig-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="fontconfig" xreflabel="Fontconfig-&fontconfig-version;">
-  <?dbhtml filename="fontconfig.html"?>
-
-
-  <title>Fontconfig-&fontconfig-version;</title>
-
-  <indexterm zone="fontconfig">
-    <primary sortas="a-Fontconfig">Fontconfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fontconfig</title>
-
-    <para>
-      The <application>Fontconfig</application> package contains
-      a library and support programs used for configuring and
-      customizing font access.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fontconfig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fontconfig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fontconfig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fontconfig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fontconfig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fontconfig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fontconfig-&fontconfig-version;-gperf-3.1-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="freetype2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bubblewrap"/> (used by some tests),
-      <xref linkend="curl"/> and <xref linkend="unzip"/>
-      (both used by some tests for downloading and extracting test files),
-      <xref linkend="json-c"/>,
-      <xref linkend="docbook-utils"/> and
-      <xref linkend="libxml2"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-    &test-use-internet;
-
-    <note>
-      <para>
-        If you have <application>DocBook Utils</application> installed and
-        you remove the <parameter>--disable-docs</parameter> parameter from
-        the <command>configure</command> command below, you must have
-        <xref linkend="perl-sgmlspm"/> and <xref linkend="texlive"/> installed
-        also, or the <application>Fontconfig</application> build will fail.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fontconfig</title>
-
-    <para>
-      Install <application>Fontconfig</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-docs       \
-            --docdir=/usr/share/doc/fontconfig-&fontconfig-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  One test
-      is known to fail if the kernel does not support user namespaces.  Some
-      tests will download some font files via Internet.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not remove the <parameter>--disable-docs</parameter>
-      parameter from the <command>configure</command> command, you can install
-      the pre-generated documentation by using the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 \
-        /usr/share/{man/man{1,3,5},doc/fontconfig-&fontconfig-version;/fontconfig-devel} &amp;&amp;
-install -v -m644 fc-*/*.1         /usr/share/man/man1 &amp;&amp;
-install -v -m644 doc/*.3          /usr/share/man/man3 &amp;&amp;
-install -v -m644 doc/fonts-conf.5 /usr/share/man/man5 &amp;&amp;
-install -v -m644 doc/fontconfig-devel/* \
-                                  /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &amp;&amp;
-install -v -m644 doc/*.{pdf,sgml,txt,html} \
-                                  /usr/share/doc/fontconfig-&fontconfig-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-docs</parameter>: This switch avoids building the
-      documentation (the release tarball includes pre-generated
-      documentation).
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Fontconfig</title>
-
-    <sect3 id="fontconfig-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>
-          /etc/fonts/*,
-          /etc/fonts/conf.d/* and
-          /usr/share/fontconfig/conf.avail/*
-        </filename>
-      </para>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-etc-fonts">/etc/fonts/*</primary>
-      </indexterm>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-etc-fonts-conf.d">/etc/fonts/conf.d/*</primary>
-      </indexterm>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-usr-share-fontconfig-conf.avail">/usr/share/fontconfig/conf.avail/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The main configuration file for <application>Fontconfig</application> is
-        <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want
-        to edit this file. It will also read <filename>/etc/fonts/local.conf</filename>
-        and any files in <filename class="directory">/etc/fonts/conf.d</filename>.
-        To put a new font directory in the configuration, create
-        (or update) the <filename>/etc/fonts/local.conf</filename> file with your
-        local information or add a new file in
-        <filename class="directory">/etc/fonts/conf.d</filename>. The default
-        location of fonts in <application>Fontconfig</application> is:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            /usr/share/fonts
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            ~/.local/share/fonts
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            ~/.fonts <emphasis>(this is now deprecated, but for the moment
-            it still works)</emphasis>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        <application>Fontconfig</application> also ships many example
-        configuration files in the
-        <filename class="directory">/usr/share/fontconfig/conf.avail</filename>
-        directory. Symlinking specific files to
-        <filename class="directory">/etc/fonts/conf.d</filename>
-        will enable them. The default setup is generally good enough for
-        most users. See <filename>/etc/fonts/conf.d/README</filename>
-        for a description of the configuration files.
-      </para>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-usr-share-fonts">/usr/share/fonts</primary>
-      </indexterm>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-AA.fonts">~/.fonts</primary>
-      </indexterm>
-
-      <para>
-        More information about configuring <application>Fontconfig</application>
-        can be found in the user's manual in <ulink
-        url="file:///usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-user.html"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fc-cache, fc-cat, fc-conflist, fc-list, fc-match, fc-pattern,
-          fc-query, fc-scan, and fc-validate
-        </seg>
-        <seg>
-          libfontconfig.so
-        </seg>
-        <seg>
-          /etc/fonts,
-          /usr/include/fontconfig,
-          /usr/share/doc/fontconfig-&fontconfig-version;,
-          /usr/share/fontconfig,
-          /usr/share/xml/fontconfig, and
-          /var/cache/fontconfig
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fc-cache">
-        <term><command>fc-cache</command></term>
-        <listitem>
-          <para>
-            is used to create font information caches
-          </para>
-          <indexterm zone="fontconfig fc-cache">
-            <primary sortas="b-fc-cache">fc-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-cat">
-        <term><command>fc-cat</command></term>
-        <listitem>
-          <para>
-            is used to read font information caches
-          </para>
-          <indexterm zone="fontconfig fc-cat">
-            <primary sortas="b-fc-cat">fc-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-conflist">
-        <term><command>fc-conflist</command></term>
-        <listitem>
-          <para>
-            shows the ruleset files' information on the system
-          </para>
-          <indexterm zone="fontconfig fc-conflist">
-            <primary sortas="b-fc-conflist">fc-conflist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-list">
-        <term><command>fc-list</command></term>
-        <listitem>
-          <para>
-            is used to create font lists
-          </para>
-          <indexterm zone="fontconfig fc-list">
-            <primary sortas="b-fc-list">fc-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-match">
-        <term><command>fc-match</command></term>
-        <listitem>
-          <para>
-            is used to match available fonts, or find fonts that match
-            a given pattern
-          </para>
-          <indexterm zone="fontconfig fc-match">
-            <primary sortas="b-fc-match">fc-match</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-pattern">
-        <term><command>fc-pattern</command></term>
-        <listitem>
-          <para>
-            is used to parse pattern (empty pattern by default) and show
-            the parsed result
-          </para>
-          <indexterm zone="fontconfig fc-pattern">
-            <primary sortas="b-fc-pattern">fc-pattern</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-query">
-        <term><command>fc-query</command></term>
-        <listitem>
-          <para>
-            is used to query fonts files and print resulting patterns
-          </para>
-          <indexterm zone="fontconfig fc-query">
-            <primary sortas="b-fc-query">fc-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-scan">
-        <term><command>fc-scan</command></term>
-        <listitem>
-          <para>
-            is used to scan font files and directories, and print resulting
-            patterns
-          </para>
-          <indexterm zone="fontconfig fc-scan">
-            <primary sortas="b-fc-scan">fc-scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-validate">
-        <term><command>fc-validate</command></term>
-        <listitem>
-          <para>
-            is used to validate font files
-          </para>
-          <indexterm zone="fontconfig fc-validate">
-            <primary sortas="b-fc-validate">fc-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfontconfig">
-        <term><filename class="libraryfile">libfontconfig.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by the <application>Fontconfig</application>
-            programs and also by other programs to configure or customize font
-            access
-          </para>
-          <indexterm zone="fontconfig libfontconfig">
-            <primary sortas="c-libfontconfig">libfontconfig.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,257 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 freetype2-download-http "&sourceforge-dl;/freetype/freetype-&freetype2-version;.tar.xz">
-  <!ENTITY freetype2-download-ftp  " ">
-  <!ENTITY freetype2-md5sum        "1f625f0a913c449551b1e3790a1817d7">
-  <!ENTITY freetype2-size          "2.4 MB">
-  <!ENTITY freetype2-buildsize     "33 MB (with additional documentation)">
-  <!ENTITY freetype2-time          "0.2 SBU (with additional documentation)">
-
-  <!ENTITY freetype2-doc-version   "&freetype2-version;">
-  <!ENTITY freetype2-doc-download-http "&sourceforge-dl;/freetype/freetype-doc-&freetype2-doc-version;.tar.xz">
-  <!ENTITY freetype2-doc-download-ftp  " ">
-  <!ENTITY freetype2-doc-md5sum        "e6466f08934ebf2d7f711b0464d7a6cf">
-  <!ENTITY freetype2-doc-size          "2.1 MB">
-]>
-
-<sect1 id="freetype2" xreflabel="FreeType-&freetype2-version;">
-  <?dbhtml filename="freetype2.html"?>
-
-
-  <title>FreeType-&freetype2-version;</title>
-
-  <indexterm zone="freetype2">
-    <primary sortas="a-FreeType">FreeType</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FreeType2</title>
-
-    <para>
-      The <application>FreeType2</application> package contains
-      a library which allows applications to properly render
-      <application>TrueType</application> fonts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freetype2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&freetype2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freetype2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freetype2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &freetype2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &freetype2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Additional Documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freetype2-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freetype2-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freetype2-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FreeType2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="harfbuzz"/>
-      (first, install without it, after it is installed, reinstall
-      <xref linkend="freetype2"/>),
-      <xref linkend="libpng"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="brotli"/> and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for documentation)</bridgehead>
-    <para role="optional">
-      <ulink url="https://pypi.org/project/docwriter/">docwriter</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FreeType2</title>
-
-    <para>
-      If you downloaded the additional documentation, unpack it into the
-      source tree using the following command:
-    </para>
-
-<screen><userinput>tar -xf ../freetype-doc-&freetype2-doc-version;.tar.xz --strip-components=2 -C docs</userinput></screen>
-
-    <para>
-      Install <application>FreeType2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg &amp;&amp;
-
-sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \
-    -i include/freetype/config/ftoption.h  &amp;&amp;
-
-./configure --prefix=/usr --enable-freetype-config --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -v -R docs -T /usr/share/doc/freetype-&freetype2-version; &amp;&amp;
-rm -v /usr/share/doc/freetype-&freetype2-version;/freetype-config.1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -ri ...</command>: First command enables GX/AAT and OpenType
-      table validation and second command enables Subpixel Rendering. Note that
-      Subpixel Rendering may have patent issues.  Be sure to read the
-      <literal>'Other patent issues'</literal> part of <ulink
-      url="https://freetype.org/patents.html"/> before enabling this option.
-    </para>
-
-    <para>
-      <parameter>--enable-freetype-config</parameter>: This switch
-      ensure that the man page for freetype-config is installed.
-    </para>
-
-    <para>
-      <option>--without-harfbuzz</option>: If
-      <application>harfbuzz</application> is installed prior to
-      <application>freetype</application> without
-      <application>freetype</application> support, use this switch to avoid a
-      build failure.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-    <!-- No longer valid with 2.10.1, /usr/bin/freetype-config is installed
-         by the 'make install' command.
-    <para>
-      <command>cp builds/unix/freetype-config /usr/bin</command>: Manually
-      place the freetype configureation program needed by other programs when
-      using the freetype library.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          freetype-config
-        </seg>
-        <seg>
-          libfreetype.so
-        </seg>
-        <seg>
-          /usr/include/freetype2 and
-          /usr/share/doc/freetype-&freetype2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="freetype-config">
-        <term><command>freetype-config</command></term>
-        <listitem>
-          <para>
-            is used to get <application>FreeType</application> compilation
-            and linking information
-          </para>
-          <indexterm zone="freetype2 freetype-config">
-            <primary sortas="b-freetype-config">freetype2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfreetype">
-        <term><filename class="libraryfile">libfreetype.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for rendering various font types, such
-            as TrueType and Type1
-          </para>
-          <indexterm zone="freetype2 libfreetype">
-            <primary sortas="c-libfreetype">libfreetype.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/fribidi.xml
===================================================================
--- general/graphlib/fribidi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fribidi-download-http "https://github.com/fribidi/fribidi/releases/download/v&fribidi-version;/fribidi-&fribidi-version;.tar.xz">
-  <!ENTITY fribidi-download-ftp  " ">
-  <!ENTITY fribidi-md5sum        "49b17442e0d8fa2e97b5c898078f6f51">
-  <!ENTITY fribidi-size          "1.1 MB">
-  <!ENTITY fribidi-buildsize     "21 MB (with tests)">
-  <!ENTITY fribidi-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="fribidi" xreflabel="FriBidi-&fribidi-version;">
-  <?dbhtml filename="fribidi.html"?>
-
-
-  <title>FriBidi-&fribidi-version;</title>
-
-  <indexterm zone="fribidi">
-    <primary sortas="a-FriBidi">FriBidi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FriBidi</title>
-
-    <para>
-      The <application>FriBidi</application> package is an implementation
-      of the <ulink url="https://www.unicode.org/reports/tr9/">Unicode
-      Bidirectional Algorithm (BIDI)</ulink>. This is useful for supporting
-      Arabic and Hebrew alphabets in other packages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fribidi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fribidi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fribidi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fribidi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fribidi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fribidi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FriBidi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.ciselant.de/c2man/c2man.html">c2man (to build man pages)</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FriBidi</title>
-
-    <para>
-      Install <application>FriBidi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          fribidi
-        </seg>
-        <seg>
-          libfribidi.so
-        </seg>
-        <seg>
-          /usr/include/fribidi
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fribidi-prog">
-        <term><command>fribidi</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="fribidi fribidi-prog">
-            <primary sortas="b-fribidi">fribidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfribidi">
-        <term><filename class="libraryfile">libfribidi.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to implement the
-            <ulink url="https://www.unicode.org/reports/tr9/">Unicode
-            Bidirectional Algorithm</ulink>
-          </para>
-          <indexterm zone="fribidi libfribidi">
-            <primary sortas="c-libfribidi">libfribidi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gegl-download-http "https://download.gimp.org/pub/gegl/0.4/gegl-&gegl-version;.tar.xz">
-  <!ENTITY gegl-download-ftp  " ">
-  <!ENTITY gegl-md5sum        "a96ae32d46855ab4eefa1fce2dbefda1">
-  <!ENTITY gegl-size          "5.5 MB">
-  <!ENTITY gegl-buildsize     "80 MB (Add 4 MB for tests)">
-  <!ENTITY gegl-time          "0.7 SBU (add 0.1 SBU for tests, both with parallelism=4)">
-]>
-
-<sect1 id="gegl" xreflabel="gegl-&gegl-version;">
-  <?dbhtml filename="gegl.html"?>
-
-
-  <title>gegl-&gegl-version;</title>
-
-  <indexterm zone="gegl">
-    <primary sortas="a-Gegl">Gegl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gegl</title>
-
-    <para>
-      This package provides the GEneric Graphics Library, which is a graph based
-      image processing format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gegl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gegl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gegl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gegl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gegl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gegl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg5_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">gegl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="babl"/> and 
-      <xref linkend="json-glib"/>
-      <!-- These are marked obsolete - no effect in meson_options.txt
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="graphviz"/> (build with pango),
-      <!-- EDITORS NOTE: Graphviz is required for the gegl:introspect
-      function. Without this function, GIMP will not start. You'll get the
-      following error:
-
-      "GEGL Operation Missing! GIMP rqeuires the GEGL operation
-      'gegl:introspect'. This operation cannot be found. Check your GEGL
-      install and ensure it has been compiled with any dependencies required
-      for GIMP."
-
-      Reference: https://gitlab.gnome.org/GNOME/gegl/-/commit/1f50456de59c686941a861d299a63bfcd4126ee5
-      -->
-      <xref linkend="pygments"/>, and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/>,
-      <xref linkend="cairo"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="gexiv2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libraw"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="pango"/>,
-      <xref linkend="poppler"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sdl2"/>,
-      <xref linkend="v4l-utils"/>,
-      <xref linkend="vala"/>,
-      <xref linkend="libspiro"/>,
-      <ulink url="https://luajit.org/luajit.html">LuaJIT</ulink>,
-      <ulink url="https://lensfun.github.io/">lensfun</ulink>,
-      <ulink url="https://luajit.org/luajit.html">LuaJIT</ulink>,
-      <ulink url="https://www.netsurf-browser.org/projects/libnsgif/">libnsgif</ulink>,
-      <ulink url="https://faculty.cse.tamu.edu/davis/suitesparse.html">libumfpack</ulink>,
-      <ulink url="https://github.com/gerddie/maxflow">maxflow</ulink>,
-      <ulink url="https://github.com/hodefoting/mrg/releases">MRG</ulink>,
-      <ulink url="https://www.khronos.org/opencl/">OpenCL</ulink>,
-      <ulink url="https://www.openexr.com">OpenEXR</ulink>,
-      <ulink url="https://github.com/KyleLink/poly2tri-c">poly2tri-c</ulink>,
-      <ulink url="https://www.gnu.org/software/src-highlite/">source-highlight</ulink>, and
-      <ulink url="https://w3m.sourceforge.net/">w3m</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gegl</title>
-
-    <para>
-      If installing over a previous version of <application>gegl</application>,
-      one module needs to be removed.  As the <systemitem class="username">root</systemitem>
-      user, run:
-    </para>
-
-<screen role="root"><userinput>rm -f /usr/lib/gegl-0.4/vector-fill.so</userinput></screen>
-
-    <para>
-      Install <application>gegl</application> by running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dlibav=disabled .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>ninja test</command>. <!--This should
-      indicate no failures, but will skip many tests depending on optional
-      dependencies installed on the system.--> 7 tests in the
-      <filename>gegl:ff-load-save</filename> portion of the test suite are
-      known to fail due to incompatibilities with ffmpeg-6.0.
-    </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>-Ddocs=true</option>: Build and
-      install documentation (requires <xref linkend="gtk-doc"/>).
-
-      <option>-Dlibav=disabled</option>: Disable FFMpeg support
-      as the build fails with <xref linkend="ffmpeg"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gegl and
-             gegl-imgcmp
-        </seg>
-        <seg>libgegl-0.4.so,
-             libgegl-npd-0.4.so,
-         <!--libgegl-sc-0.4.so,--> and
-             modules in /usr/lib/gegl-0.4
-        </seg>
-        <seg>/usr/lib/gegl-0.4 and
-             /usr/include/gegl-0.4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gegl-prog">
-        <term><command>gegl</command></term>
-        <listitem>
-          <para>
-            is a commandline tool for working with the XML data model
-          </para>
-          <indexterm zone="gegl gegl-prog">
-            <primary sortas="b-gegl">gegl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gegl-imgcmp">
-        <term><command>gegl-imgcmp</command></term>
-        <listitem>
-          <para>
-            is a simple image difference detection tool for use in regression
-            testing
-          </para>
-          <indexterm zone="gegl gegl-imgcmp">
-            <primary sortas="b-gegl-imgcmp">gegl-imgcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgegl-0.4">
-        <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
-          </para>
-          <indexterm zone="gegl libgegl-0.4">
-            <primary sortas="c-libgegl-0.4">libgegl-0.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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
-          </para>
-          <indexterm zone="gegl libgegl-npd-0.4">
-            <primary sortas="c-libgegl-npd-0.4">libgegl-npd-0.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <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
-          </para>
-          <indexterm zone="gegl libgegl-sc-0.4">
-            <primary sortas="c-libgegl-sc-0.4">libgegl-sc-0.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 giflib-download-http "https://sourceforge.net/projects/giflib/files/giflib-&giflib-version;.tar.gz">
-  <!ENTITY giflib-download-ftp  " ">
-  <!ENTITY giflib-http-md5sum   "913dd251492134e235ee3c9a91987a4d">
-  <!ENTITY giflib-http-size     "440 KB">
-  <!ENTITY giflib-buildsize     "4.0 MB (with documentation)">
-  <!ENTITY giflib-time          "less than 0.1 SBU (with documentation)">
-]>
-
-<sect1 id="giflib" xreflabel="giflib-&giflib-version;">
-  <?dbhtml filename="giflib.html"?>
-
-
-  <title>giflib-&giflib-version;</title>
-
-  <indexterm zone="giflib">
-    <primary sortas="a-giflib">giflib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to giflib</title>
-
-    <para>
-      The <application>giflib</application> package contains libraries
-      for reading and writing GIFs as well as programs for converting and
-      working with GIF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&giflib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&giflib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &giflib-http-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &giflib-http-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &giflib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &giflib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/giflib-&giflib-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">giflib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xmlto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of giflib</title>
-
-    <para>
-      First, prevent the build process from installing XML files instead of man
-      pages:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../giflib-&giflib-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, remove an unnecessary dependency on <xref linkend="imagemagick"/>
-      by moving a file into an expected location:
-    </para>
-
-<screen><userinput remap="pre">cp pic/gifgrid.gif doc/giflib-logo.gif</userinput></screen>
-
-    <para>
-      Install <application>giflib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-<!--    <para>
-      To test the results, issue: <command>make check-TESTS</command>. Test
-      suite results are kept in <filename>test.sh.log</filename>.
-    </para>
-    There doesn't seem to be a test suite in 5.1.6 -->
-
-    <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 PREFIX=/usr install &amp;&amp;
-
-rm -fv /usr/lib/libgif.a &amp;&amp;
-
-find doc \( -name Makefile\* -o -name \*.1 \
-         -o -name \*.xml \) -exec rm -v {} \; &amp;&amp;
-
-install -v -dm755 /usr/share/doc/giflib-&giflib-version; &amp;&amp;
-cp -v -R doc/* /usr/share/doc/giflib-&giflib-version;</userinput></screen>
-<!--
-    <para>
-      If <xref linkend="xmlto"/> is installed, then the API documentation has
-      been built.  If you wish to install the distributed and the just built
-      documentations, issue, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
--->
-  </sect2>
-
-  <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>
-      <command>find doc ... -exec rm -v {} \;</command>: This command removes
-      <filename>Makefiles</filename>, man and xml files from the documentation
-      directory that would otherwise be installed by the commands that follow.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gif2rgb, gifbuild, gifclrmp, giffix, giftext, and giftool</seg>
-        <seg>libgif.so</seg>
-        <seg>/usr/share/doc/giflib-&giflib-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gif2rgb">
-        <term><command>gif2rgb</command></term>
-        <listitem>
-          <para>
-            converts images saved as GIF to 24-bit RGB images
-          </para>
-          <indexterm zone="giflib gif2rgb">
-            <primary sortas="b-gif2rgb">gif2rgb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifbuild">
-        <term><command>gifbuild</command></term>
-        <listitem>
-          <para>
-            dumps GIF data in a textual format, or undumps it to a GIF
-          </para>
-          <indexterm zone="giflib gifbuild">
-            <primary sortas="b-gifbuild">gifbuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifclrmp">
-        <term><command>gifclrmp</command></term>
-        <listitem>
-          <para>
-            modifies GIF image colormaps
-          </para>
-          <indexterm zone="giflib gifclrmp">
-            <primary sortas="b-gifclrmp">gifclrmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giffix">
-        <term><command>giffix</command></term>
-        <listitem>
-          <para>
-            clumsily attempts to fix truncated GIF images
-          </para>
-          <indexterm zone="giflib giffix">
-            <primary sortas="b-giffix">giffix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giftext">
-        <term><command>giftext</command></term>
-        <listitem>
-          <para>
-            prints (text only) general information about a GIF file
-          </para>
-          <indexterm zone="giflib giftext">
-            <primary sortas="b-giftext">giftext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giftool">
-        <term><command>giftool</command></term>
-        <listitem>
-          <para>
-            is a GIF transformation tool
-          </para>
-          <indexterm zone="giflib giftool">
-            <primary sortas="b-giftool">giftool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgif">
-        <term><filename class="libraryfile">libgif.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions required by the
-            <application>giflib</application> programs and any other programs
-            needing library functionality to read, write and manipulate GIF
-            images
-          </para>
-          <indexterm zone="giflib libgif">
-            <primary sortas="c-libgif">libgif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/glad.xml
===================================================================
--- general/graphlib/glad.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glad-download-http "https://github.com/Dav1dde/glad/archive/v&glad-version;/glad-&glad-version;.tar.gz">
-  <!ENTITY glad-download-ftp  " ">
-  <!ENTITY glad-md5sum        "350c34126e47988f378285adf4cf2efc">
-  <!ENTITY glad-size          "620 KB">
-  <!ENTITY glad-buildsize     "14 MB">
-  <!ENTITY glad-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="glad" xreflabel="Glad-&glad-version;">
-  <?dbhtml filename="glad.html"?>
-
-  <title>Glad-&glad-version;</title>
-
-  <indexterm zone="glad">
-    <primary sortas="a-glad">Glad</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Glad</title>
-
-    <para>
-      The <application>Glad</application> package contains a generator for
-      loading Vulkan, OpenGL, EGL, GLES, and GLX contexts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glad-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glad-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glad-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glad-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glad-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glad-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Glad Dependencies</bridgehead>
-
-    <!-- Nothing required other than Jinja2, which is in LFS -->
-    
-    <!-- Tests cannot be run without these dependencies -->
-    <bridgehead renderas="sect4">Optional (required to run the tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="pytest"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="xorg7-lib"/>,
-      <ulink url="https://www.glfw.org/">glfw</ulink>, and
-      <ulink url="http://winehq.org/">WINE</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glad</title>
-
-    <para>
-      Install <application>Glad</application> by running the following
-      commands:
-    </para>
-
-&build-wheel;
-
-    <para>
-      This package comes with a test suite, but it cannot be run without
-      installing the external dependencies listed above.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; glad2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glad
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/glad and
-          /usr/lib/python&python3-majorver;/site-packages/glad2-&glad-version;.dist-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glad-prog">
-        <term><command>glad</command></term>
-        <listitem>
-          <para>
-            generates loaders for Vulkan, OpenGL, EGL, GLES, and GLX contexts
-          </para>
-          <indexterm zone="glad glad-prog">
-            <primary sortas="b-glad">glad</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/graphlib/glm.xml
===================================================================
--- general/graphlib/glm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glm-download-http "https://github.com/g-truc/glm/archive/&glm-version;/glm-&glm-version;.tar.gz">
-  <!ENTITY glm-download-ftp  " ">
-  <!ENTITY glm-md5sum        "f824ac50e16310a95279032f82cbd341">
-  <!ENTITY glm-size          "4.4 MB">
-  <!ENTITY glm-buildsize     "44 MB">
-  <!ENTITY glm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="glm" xreflabel="GLM-&glm-version;">
-  <?dbhtml filename="glm.html"?>
-
-
-  <title>GLM-&glm-version;</title>
-
-  <indexterm zone="glm">
-    <primary sortas="a-GLM">GLM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLM</title>
-
-    <para>
-      OpenGL Mathematics (<application>GLM</application>) is a header-only C++
-      mathematics library for graphics software based on the OpenGL Shading
-      Language (GLSL) specifications. An extension system provides extended
-      capabilities such as matrix transformations and quaternions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">GLM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLM</title>
-
-    <note>
-      <para>
-        This package is unusual as it includes its functionality in
-        header files.  We just copy them into position.
-      </para>
-    </note>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -r glm /usr/include/ &amp;&amp;
-cp -r doc /usr/share/doc/glm-&glm-version;</userinput></screen>
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>-DCMAKE_INSTALL_LIBDIR=lib ..</command>: Although no compiled
-      libraries are installed, this command ensures that the
-      <application>cmake</application> and
-      <application>pkg-config</application> files are installed into
-      <filename class="directory">/usr/lib</filename>.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/glm and
-          /usr/share/doc/glm-&glm-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!-- this package has no programs or libraries to describe -->
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 graphite2-download-http
-           "https://github.com/silnrsi/graphite/releases/download/&graphite2-version;/graphite2-&graphite2-version;.tgz">
-  <!ENTITY graphite2-download-ftp  " ">
-  <!ENTITY graphite2-md5sum        "1bccb985a7da01092bfb53bb5041e836">
-  <!ENTITY graphite2-size          "6.3 MB">
-  <!ENTITY graphite2-buildsize     "30 MB (with tests)">
-  <!ENTITY graphite2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="graphite2" xreflabel="Graphite2-&graphite2-version;">
-  <?dbhtml filename="graphite2.html"?>
-
-
-  <title>Graphite2-&graphite2-version;</title>
-
-  <indexterm zone="graphite2">
-    <primary sortas="a-Graphite2">Graphite2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Graphite2</title>
-
-    <para>
-      <application>Graphite2</application> is a rendering engine for graphite
-      fonts. These are TrueType fonts with additional tables containing smart
-      rendering information and were originally developed to support complex
-      non-Roman writing systems.  They may contain rules for e.g. ligatures,
-      glyph substitution, kerning, justification - this can make them useful
-      even on text written in Roman writing systems such as English.  Note that
-      <application>firefox</application> by default provides an internal copy of
-      the graphite engine and cannot use a system version (although it can now
-      be patched to use it), but it too should benefit from the availability of
-      graphite fonts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&graphite2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&graphite2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &graphite2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &graphite2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &graphite2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &graphite2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Graphite2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freetype2"/>,
-      <ulink url="https://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
-      <xref linkend="harfbuzz"/> to add more functionality to it (this is a
-      circular dependency, you would need to first build
-      <application>graphite2</application> without
-      <application>harfbuzz</application>).
-    </para>
-
-    <para role="optional">
-      To build the documentation:
-      <xref linkend="asciidoc"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
-      <ulink url="https://dblatex.sourceforge.net/">
-      dblatex</ulink>  (for PDF docs)
-    </para>
-
-    <para role="optional">
-      To execute the test suite you will need
-      <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
-      (Python 3 module), otherwise, the "cmp" tests fail.
-    </para>
-
-    <bridgehead renderas="sect4">Optional (at runtime)</bridgehead>
-    <para role="optional">
-      You will need at least one suitable <ulink role="runtime"
-      url="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&amp;item_id=graphite_fonts">graphite font</ulink>
-      for the package to be useful.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Graphite2</title>
-
-    <para>
-      Some tests fail if
-      <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
-      (Python 3 module) is not installed. These tests can be removed with:
-    </para>
-
-<screen><userinput>sed -i '/cmptest/d' tests/CMakeLists.txt</userinput></screen>
-
-    <para>
-      Install <application>Graphite2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to build the documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <!-- https://github.com/silnrsi/graphite/pull/74 -->
-    <para>
-      To test the results, issue: <command>make test</command>.
-      One test named <filename>nametabletest</filename> is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/graphite2-&graphite2-version; &amp;&amp;
-<!-- doc/doxygen seems to have gone, so I removed the api dir, but now both html
-and pdf for the GTF and the manual
-cp      -v -r -f    doc/doxygen/{html,latex/refman.pdf} \
-                    /usr/share/doc/graphite2-&graphite2-version;/api &amp;&amp;-->
-cp      -v -f    doc/{GTF,manual}.html \
-                    /usr/share/doc/graphite2-&graphite2-version; &amp;&amp;
-cp      -v -f    doc/{GTF,manual}.pdf \
-                    /usr/share/doc/graphite2-&graphite2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This switch turns on
-      build verbose mode.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gr2fonttest, and optionally comparerender
-        </seg>
-        <seg>
-          libgraphite2.so
-        </seg>
-        <seg>
-          /usr/{include,share}/graphite2 and optionally
-          /usr/share/doc/graphite2-&graphite2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="comparerender">
-        <term><command>comparerender</command></term>
-        <listitem>
-          <para>
-            is a test and benchmarking tool
-          </para>
-          <indexterm zone="graphite2 comparerender">
-            <primary sortas="b-comparerender">comparerender</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gr2fonttest">
-        <term><command>gr2fonttest</command></term>
-        <listitem>
-          <para>
-            is a diagnostic console tool for graphite fonts
-          </para>
-          <indexterm zone="graphite2 gr2fonttest">
-            <primary sortas="b-gr2fonttest">gr2fonttest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgraphite2">
-        <term><filename class="libraryfile">libgraphite2.so</filename></term>
-        <listitem>
-          <para>
-            is a rendering engine for graphite fonts
-          </para>
-          <indexterm zone="graphite2 libgraphite2">
-            <primary sortas="c-libgraphite2">libgraphite2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/graphlib/graphlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,60 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-graphlib">
+<?dbhtml filename="graphlib.html" dir="general"?>
+<title>Graphics Libraries</title>
 
-<chapter id="general-graphlib">
-  <?dbhtml filename="graphlib.html"?>
+<para>Depending on what your system will be used for, you may or
+may not require the graphics libraries.  Most desktop machines will 
+want them for use with graphical applications.  Most servers on the 
+other hand, will not require them.</para>
 
-  <title>Graphics and Font Libraries</title>
-
-  <para>
-    Depending on what your system will be used for, you may or
-    may not require the graphics and font libraries. Most desktop machines will
-    want them for use with graphical applications.  Most servers on the
-    other hand, will not require them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aalib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="babl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exiv2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freetype2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fribidi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gegl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="giflib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphite2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libavif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libexif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgxps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjpeg-turbo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjxl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmypaint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librsvg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libspiro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtiff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwebp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mypaint-brushes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opencv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="potrace.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qrencode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sassc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webp-pixbuf-loader.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="woff2.xml"/>
+&lcms;
+&libjpeg;
+&libpng;
+&libtiff;
+&libungif;
+&libmng;
+&imlib;
 
 </chapter>
Index: neral/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 harfbuzz-download-http
-           "https://github.com/harfbuzz/harfbuzz/releases/download/&harfbuzz-version;/harfbuzz-&harfbuzz-version;.tar.xz">
-  <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "961e77201ff4738382ea06e9f15ade70">
-  <!ENTITY harfbuzz-size          "18 MB">
-  <!ENTITY harfbuzz-buildsize     "149 MB (With tests)">
-  <!ENTITY harfbuzz-time          "0.8 SBU (With tests; both using parallelism=4)">
-]>
-
-<sect1 id="harfbuzz" xreflabel="harfBuzz-&harfbuzz-version;">
-  <?dbhtml filename="harfbuzz.html"?>
-
-
-  <title>harfBuzz-&harfbuzz-version;</title>
-
-  <indexterm zone="harfbuzz">
-    <primary sortas="a-HarfBuzz">HarfBuzz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Harfbuzz</title>
-
-    <para>
-      The <application>HarfBuzz</application> package contains an OpenType text
-      shaping engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&harfbuzz-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&harfbuzz-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &harfbuzz-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &harfbuzz-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &harfbuzz-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &harfbuzz-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">HarfBuzz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glib2"/> (required for Pango; GObject Introspection
-      required for building GNOME),
-      <xref role="first" linkend="graphite2"/> (required for building
-        <xref role="nodep" linkend="texlive"/> or
-        <xref role="nodep" linkend="libreoffice"/> with system harfbuzz),
-      <xref linkend="icu"/>, and
-      <xref role="first" linkend="freetype2"/>
-      (after <xref role="nodep" linkend="harfbuzz"/> is installed, reinstall
-      <xref role="nodep" linkend="freetype2"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/> (circular: build cairo and all its recommended
-      dependencies, including harfbuzz, first, then rebuild harfbuzz if the
-      cairo backend is needed),
-      <xref linkend="git"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://pypi.org/project/FontTools/">FontTools</ulink>
-      (Python 3 module, for the test suite),
-      <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>,
-      and <ulink url="https://github.com/bytecodealliance/wasm-micro-runtime">wasm-micro-runtime</ulink>
-    </para>
-
-    <warning>
-      <para>
-        Recommended dependencies are not strictly required to build
-        the package. However, you might not get expected results at
-        runtime if you don't install them. Please do not report bugs
-        with this package if you <emphasis>have not</emphasis>
-        installed the recommended dependencies.
-      </para>
-    </warning>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of HarfBuzz</title>
-
-    <para>
-      Install <application>HarfBuzz</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dcpp_std=c++17     \
-      -Dgraphite2=enabled &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dcpp_std=c++17</parameter>: This switch ensures compiling
-      the C++ code following the C++17 standard, overriding the default of
-      this package (C++11).  It's required to build this package with
-      <xref linkend='icu'/> installed because some ICU headers use C++17
-      features.  It is unnecessary if <xref linkend='icu'/> is not
-      installed, but does no harm anyway.
-    </para>
-
-    <para>
-      <parameter>-Dgraphite2=enabled</parameter>: This switch enables
-      <application>Graphite2</application> support, which is required for
-      building <xref linkend="texlive"/> or <xref linkend="libreoffice"/>
-      with system harfbuzz.
-    </para>
-<!--
-    <para>
-      <parameter>-Dbenchmark=disabled</parameter>: This switch disables
-      downloading and building the <application>google-benchmark</application>
-      subproject, which requires <xref linkend="git"/>, and is of no
-      use for non developers.
-    </para>
--->
-    <para>
-      <option>-Ddocs=disabled</option>: If <xref linkend="gtk-doc"/> is
-      installed, the documentation is built and installed. This switch
-      prevents that.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          hb-info,
-          hb-ot-shape-closure,
-          hb-shape,
-          hb-subset, and
-          hb-view (only if Cairo is installed)
-        </seg>
-        <seg>
-          libharfbuzz.so,
-          libharfbuzz-cairo.so (only if Cairo is installed),
-          libharfbuzz-gobject.so,
-          libharfbuzz-icu.so, and
-          libharfbuzz-subset.so
-        </seg>
-        <seg>
-          /usr/include/harbuzz,
-          /usr/lib/cmake/harfbuzz, and
-          /usr/share/gtk-doc/html/harfbuzz (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="hb-info">
-       <term><command>hb-info</command></term>
-       <listitem>
-         <para>
-           is used for gathering information about fonts installed on the
-           system
-         </para>
-         <indexterm zone="harfbuzz hb-info">
-           <primary sortas="b-hb-info">hb-info</primary>
-         </indexterm>
-       </listitem>
-     </varlistentry>
-
-     <varlistentry id="hb-ot-shape-closure">
-        <term><command>hb-ot-shape-closure</command></term>
-        <listitem>
-          <para>
-            gives the set of characters contained in a string, represented as
-            single characters and/or single character names. Example:
-            <command>hb-ot-shape-closure
-              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>
-          </para>
-          <indexterm zone="harfbuzz hb-ot-shape-closure">
-            <primary sortas="b-hb-ot-shape-closure">hb-ot-shape-closure</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hb-shape">
-        <term><command>hb-shape</command></term>
-        <listitem>
-          <para>
-            is used for the conversion of text strings into positioned glyphs
-          </para>
-          <indexterm zone="harfbuzz hb-shape">
-            <primary sortas="b-hb-shape">hb-shape</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hb-subset">
-        <term><command>hb-subset</command></term>
-        <listitem>
-          <para>
-            is used to create subsets of fonts, and display text using them
-          </para>
-          <indexterm zone="harfbuzz hb-subset">
-            <primary sortas="b-hb-subset">hb-subset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hb-view">
-        <term><command>hb-view</command></term>
-        <listitem>
-          <para>
-            displays a graphical view of a string shape using a
-            particular font as a set of glyphs. The output format is
-            automatically defined by the file extension, the supported ones
-            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>
-          </para>
-          <indexterm zone="harfbuzz hb-view">
-            <primary sortas="b-hb-view">hb-view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz">
-        <term><filename class="libraryfile">libharfbuzz.so</filename></term>
-        <listitem>
-          <para>
-            is the HarfBuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz">
-            <primary sortas="c-libharfbuzz">libharfbuzz.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-cairo">
-        <term><filename class="libraryfile">libharfbuzz-cairo.so</filename></term>
-        <listitem>
-          <para>
-            provides Cairo integration for the Harfbuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-cairo">
-            <primary sortas="c-libharfbuzz-cairo">libharfbuzz-cairo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-gobject">
-        <term><filename class="libraryfile">libharfbuzz-gobject.so</filename></term>
-        <listitem>
-          <para>
-            provides GObject integration for the HarfBuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-gobject">
-            <primary sortas="c-libharfbuzz-gobject">libharfbuzz-gobject.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-icu">
-        <term><filename class="libraryfile">libharfbuzz-icu.so</filename></term>
-        <listitem>
-          <para>
-            provides ICU integration for the HarfBuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-icu">
-            <primary sortas="c-libharfbuzz-icu">libharfbuzz-icu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-subset">
-        <term><filename class="libraryfile">libharfbuzz-subset.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for performing subsetting operations on font
-            files
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-subset">
-            <primary sortas="c-libharfbuzz-subset">libharfbuzz-subset.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/imlib.xml
===================================================================
--- general/graphlib/imlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="imlib" xreflabel="imlib-&imlib-version;">
+<?dbhtml filename="imlib.html" dir="general"?>
+<title>imlib-&imlib-version;</title>
+
+&imlib-intro;
+&imlib-inst;
+&imlib-config;
+&imlib-desc;
+
+</sect1>
+
Index: general/graphlib/imlib/imlib-config.xml
===================================================================
--- general/graphlib/imlib/imlib-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring imlib</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/imlib/imlib-desc.xml
===================================================================
--- general/graphlib/imlib/imlib-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The imlib package contains <userinput>imlib libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>imlib libraries</title>
+<para>imlib provides the functions for programs to display and edit a
+wide variety of image data formats.</para></sect3>
+
+
+</sect2>
+
Index: general/graphlib/imlib/imlib-inst.xml
===================================================================
--- general/graphlib/imlib/imlib-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,23 @@
+<sect2>
+<title>Installation of imlib</title>
+
+<para>Install imlib by running the following commands:</para>
+
+<para><screen><userinput>CPPFLAGS=-w ./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
+
+<sect2>
+<title>Command explanations</title>
+ 
+<para><userinput>CPPFLAGS=-w :</userinput>
+This
+disables gcc 3.1 warnings that confuse configure.</para>
+
+<para><userinput>./configure --prefix=/usr:</userinput>
+This compiles and installs imlib into the <filename>/usr</filename>
+hierarchy instead of <filename>/usr/local</filename>.</para>
+</sect2>
Index: general/graphlib/imlib/imlib-intro.xml
===================================================================
--- general/graphlib/imlib/imlib-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to imlib</title>
+
+<screen>Download location:              <ulink url= "&imlib-download;"/>
+Version used:                   &imlib-version;
+Package size:                   &imlib-size;
+Estimated Disk space required:  &imlib-buildsize;</screen>
+
+<para>The imlib package contains image libraries. These are useful for
+loading, rendering and dithering a wide variety of image data formats.</para>
+
+<screen>imlib depends on: 
+<xref linkend="xfree86"/>, <xref linkend="libjpeg"/>, <xref linkend="libtiff"/>, <xref linkend="libungif"/> and <xref linkend="libpng"/>
+imlib will utilize: 
+glib, gtk and gtk-config if installed prior to imlib.</screen>
+
+</sect2>
Index: general/graphlib/imlib/imlib.ent
===================================================================
--- general/graphlib/imlib/imlib.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY imlib SYSTEM "../imlib.xml">
+<!ENTITY imlib-intro SYSTEM "imlib-intro.xml">
+<!ENTITY imlib-inst SYSTEM "imlib-inst.xml">
+<!ENTITY imlib-desc SYSTEM "imlib-desc.xml">
+<!ENTITY imlib-config SYSTEM "imlib-config.xml">
+<!ENTITY imlib-buildsize "8.6 MB">
+<!ENTITY imlib-version "1.9.14">
+<!ENTITY imlib-download "ftp://ftp.gnome.org/pub/GNOME/stable/sources/imlib/imlib-1.9.14.tar.gz">
+<!ENTITY imlib-size "736 KB">
Index: neral/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 jasper-download-http "https://github.com/jasper-software/jasper/archive/version-&jasper-version;/jasper-&jasper-version;.tar.gz">
-  <!ENTITY jasper-download-ftp  " ">
-  <!ENTITY jasper-md5sum        "a1ba86fdad2e800d0cb233c13cd13cb3">
-  <!ENTITY jasper-size          "1.9 MB">
-  <!ENTITY jasper-buildsize     "9.4 MB (with tests)">
-  <!ENTITY jasper-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="jasper" xreflabel="JasPer-&jasper-version;">
-  <?dbhtml filename="jasper.html"?>
-
-
-  <title>JasPer-&jasper-version;</title>
-
-  <indexterm zone="jasper">
-    <primary sortas="a-jasper-&jasper-version;">JasPer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JasPer</title>
-
-    <para>
-      The <application>JasPer</application> Project is an open-source
-      initiative to provide a free software-based reference implementation
-      of the JPEG-2000 codec.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&jasper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&jasper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jasper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &jasper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &jasper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &jasper-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JasPer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freeglut"/> (required for <command>jiv</command>),
-      <xref linkend="doxygen"/> (needed for generating html documentation), and
-      <xref linkend="texlive"/> (needed to regenerate the pdf documentation)
-    </para>
-
-  </sect2>
-
-  <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>
-      First, fix a problem that happens due to cmake-3.22:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/GLUT_glut_LIBRARY/s/^/#/' build/cmake/modules/JasOpenGL.cmake</userinput></screen>
--->
-    <para>
-      Install <application>JasPer</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     \
-      -DCMAKE_SKIP_INSTALL_RPATH=YES \
-      -DJAS_ENABLE_DOC=NO            \
-      -DALLOW_IN_SOURCE_BUILD=YES    \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/jasper-&jasper-version; \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:  <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_SKIP_INSTALL_RPATH=YES</parameter>: This option
-      removes embedded library search paths.
-    </para>
-
-    <para>
-      <parameter>-DJAS_ENABLE_DOC=NO</parameter>: This option disables
-      rebuilding the pdf documentation if <xref linkend="texlive"/>
-      is installed.
-    </para>
-
-    <para>
-      <parameter>-DALLOW_IN_SOURCE_BUILD=YES</parameter>: This switch allows
-      building from within the source tree. In our case, this is needed to
-      allow us to build inside of the BUILD directory instead of needing to
-      create another directory outside of the source tree.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>imgcmp, imginfo, jasper, and jiv</seg>
-        <seg>libjasper.so</seg>
-        <seg>/usr/include/jasper and /usr/share/doc/jasper-&jasper-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="imgcmp">
-        <term><command>imgcmp</command></term>
-        <listitem>
-          <para>
-            compares two images of the same geometry
-          </para>
-          <indexterm zone="jasper imgcmp">
-            <primary sortas="b-imgcmp">imgcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imginfo">
-        <term><command>imginfo</command></term>
-        <listitem>
-          <para>
-            displays information about an image
-          </para>
-          <indexterm zone="jasper imginfo">
-            <primary sortas="b-imginfo">imginfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jasper-command">
-        <term><command>jasper</command></term>
-        <listitem>
-          <para>
-            converts images between formats (BMP, JPS, JPC, JPG, PGX, PNM, MIF,
-            and RAS)
-          </para>
-          <indexterm zone="jasper jasper">
-            <primary sortas="b-jasper">jasper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jiv">
-        <term><command>jiv</command></term>
-        <listitem>
-          <para>
-            displays images
-          </para>
-          <indexterm zone="jasper jiv">
-            <primary sortas="b-jiv">jiv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jasper-lib">
-        <term><filename class="libraryfile">libjasper.so</filename></term>
-        <listitem>
-          <para>
-            is a library used by programs for reading and writing
-            JPEG2000 format files
-          </para>
-          <indexterm zone="jasper jasper-lib">
-            <primary sortas="c-libjasper">libjasper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="lcms" xreflabel="lcms-&lcms-version;">
+<?dbhtml filename="lcms.html" dir="general"?>
+<title>lcms-&lcms-version;</title>
+
+&lcms-intro;
+&lcms-inst;
+&lcms-exp;
+&lcms-config;
+&lcms-desc;
+
+</sect1>
+
Index: general/graphlib/lcms/lcms-config.xml
===================================================================
--- general/graphlib/lcms/lcms-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring lcms</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-desc.xml
===================================================================
--- general/graphlib/lcms/lcms-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The lcms package contains the <userinput>lcms library</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>lcms library</title>
+<para>The lcms library is used by other programs to provide color
+management facilities.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-exp.xml
===================================================================
--- general/graphlib/lcms/lcms-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>CC="gcc $CFLAGS" :</userinput> This makes lcms use 
+the CFLAGS set in your environment.</para>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-inst.xml
===================================================================
--- general/graphlib/lcms/lcms-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of lcms</title>
+
+<para>Install lcms by running the following commands:</para>
+
+<para><screen><userinput>make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-intro.xml
===================================================================
--- general/graphlib/lcms/lcms-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Introduction to lcms</title>
+
+<screen>Download location:              &lcms-download;
+Version used:                   &lcms-version;
+Package size:                   &lcms-size;
+Estimated Disk space required:  &lcms-buildsize;</screen>
+
+<para>The lcms library is used by other programs to provide
+color management facilities.</para>
+
+</sect2>
Index: general/graphlib/lcms/lcms.ent
===================================================================
--- general/graphlib/lcms/lcms.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY lcms SYSTEM "../lcms.xml">
+<!ENTITY lcms-intro SYSTEM "lcms-intro.xml">
+<!ENTITY lcms-inst SYSTEM "lcms-inst.xml">
+<!ENTITY lcms-exp SYSTEM "lcms-exp.xml">
+<!ENTITY lcms-desc SYSTEM "lcms-desc.xml">
+<!ENTITY lcms-config SYSTEM "lcms-config.xml">
+<!ENTITY lcms-buildsize "3.7 MB">
+<!ENTITY lcms-version "1.08">
+<!ENTITY lcms-download "http://www.littlecms.com/lcms-1.08.tar.gz">
+<!ENTITY lcms-size "158 KB">
Index: neral/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lcms2-download-http "https://github.com/mm2/Little-CMS/releases/download/lcms&lcms2-version;/lcms2-&lcms2-version;.tar.gz">
-  <!ENTITY lcms2-download-ftp  " ">
-  <!ENTITY lcms2-md5sum        "7f7baa3e605c961b9301135105ee9a34">
-  <!ENTITY lcms2-size          "7.1 MB">
-  <!ENTITY lcms2-buildsize     "20 MB (with the tests)">
-  <!ENTITY lcms2-time          "0.2 SBU (with the tests)">
-]>
-
-<sect1 id="lcms2" xreflabel="Little CMS-&lcms2-version;">
-  <?dbhtml filename="lcms2.html"?>
-
-
-  <title>Little CMS-&lcms2-version;</title>
-
-  <indexterm zone="lcms2">
-    <primary sortas="a-little-cms2">Little CMS2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Little CMS2</title>
-
-    <para>
-      The Little Color Management System is a small-footprint color management
-      engine, with special focus on accuracy and performance. It uses
-      the International Color Consortium standard (ICC), which is the modern
-      standard for color management.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lcms2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lcms2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lcms2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lcms2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lcms2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lcms2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Little CMS2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libtiff"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Little CMS2</title>
-
-    <!-- Will be fixed in the next release (2.15 or 2.14.1?)
-         https://github.com/mm2/Little-CMS/commit/93629504f8175e0002 -->
-    <para>
-      Apply the upstream fix for an issue breaking colord:
-    </para>
-
-<screen><userinput>sed '/BufferSize &lt; TagSize/,+1 s/goto Error/TagSize = BufferSize/' \
-    -i src/cmsio0.c</userinput></screen>
-
-    <para>
-      Install <application>Little CMS2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>jpgicc, linkicc, psicc, tificc, and transicc</seg>
-        <seg>liblcms2.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jpgicc">
-        <term><command>jpgicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC profile applier for JPEG
-          </para>
-          <indexterm zone="lcms2 jpgicc">
-            <primary sortas="b-jpgicc">jpgicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linkicc">
-        <term><command>linkicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC device link generator
-          </para>
-          <indexterm zone="lcms2 linkicc">
-            <primary sortas="b-linkicc">linkicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psicc">
-        <term><command>psicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC PostScript generator
-          </para>
-          <indexterm zone="lcms2 psicc">
-            <primary sortas="b-psicc">psicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tificc">
-        <term><command>tificc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC tiff generator
-          </para>
-          <indexterm zone="lcms2 tificc">
-            <primary sortas="b-tificc">tificc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transicc">
-        <term><command>transicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ColorSpace conversion calculator
-          </para>
-          <indexterm zone="lcms2 transicc">
-            <primary sortas="b-transicc">transicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblcms2">
-        <term><filename class="libraryfile">liblcms2.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the lcms2 API
-          </para>
-          <indexterm zone="lcms2 liblcms2">
-            <primary sortas="c-liblcms2">liblcms2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/graphlib/libavif.xml
===================================================================
--- general/graphlib/libavif.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,219 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libavif-download-http "https://github.com/AOMediaCodec/libavif/archive/v&libavif-version;/libavif-&libavif-version;.tar.gz">
-  <!ENTITY libavif-download-ftp  " ">
-  <!ENTITY libavif-md5sum        "8c786fd21f8757ace8cc011401e4d420">
-  <!ENTITY libavif-size          "11 MB">
-  <!ENTITY libavif-buildsize     "16 MB">
-  <!ENTITY libavif-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libavif" xreflabel="libavif-&libavif-version;">
-  <?dbhtml filename="libavif.html"?>
-
-  <title>libavif-&libavif-version;</title>
-
-  <indexterm zone="libavif">
-    <primary sortas="a-libavif">libavif</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libavif</title>
-
-    <para>
-      The <application>libavif</application> package contains a library used
-      for encoding and decoding AVIF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libavif-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libavif-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libavif-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libavif-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libavif-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libavif-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libavif Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libaom"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/google/googletest">gtest</ulink>,
-      <ulink url="https://code.videolan.org/videolan/dav1d">libdav1d</ulink>,
-      <ulink url="https://chromium.googlesource.com/libyuv/libyuv/">libyuv</ulink>,
-      <ulink url="https://github.com/xiph/rav1e">rav1e</ulink>, and
-      <ulink url="https://gitlab.com/AOMediaCodec/SVT-AV1">svt-av1</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libavif</title>
-
-    <para>
-      Install <application>libavif</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  \
-      -DAVIF_CODEC_AOM=ON         \
-      -DAVIF_BUILD_GDK_PIXBUF=ON  \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not part of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      The AV1 format needs to be added to the loaders cache. As the
-      &root; user:
-    </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DAVIF_CODEC_AOM=ON</parameter>: This switch enables using
-      the AOM codec. This package is useless without at least one codec
-      built in.
-    </para>
-
-    <para>
-      <parameter>-DAVIF_BUILD_GDK_PIXBUF=ON</parameter>: This switch builds
-      the AVIF loader for applications which use gdk-pixbuf. Remove it if you
-      have not installed <xref role="nodep" linkend="gdk-pixbuf"/>.
-    </para>
-
-    <para>
-      <option>-DAVIF_CODEC_DAV1D=ON</option>: Use this switch if you have
-      installed <ulink url="https://code.videolan.org/videolan/dav1d">libdav1d</ulink>
-      and wish to use it as a codec.
-    </para>
-
-    <para>
-      <option>-DAVIF_CODEC_RAV1E=ON</option>: Use this switch if you have
-      installed <ulink url="https://github.com/xiph/rav1e">rav1e</ulink> and
-      wish to use it as a codec.
-    </para>
-
-    <para>
-      <option>-DAVIF_CODEC_SVT=ON</option>: Use this switch if you have
-      installed <ulink url="https://gitlab.com/AOMediaCodec/SVT-AV1">svt-av1</ulink>
-      and wish to use it as a codec.
-    </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>
-          libavif.so and
-          libpixbbufloader-avif.so (in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
-        </seg>
-        <seg>
-          /usr/include/avif and
-          /usr/lib/cmake/libavif
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libavif-lib">
-        <term><filename class="libraryfile">libavif.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a portable C implementation of the
-            AV1 Image Format
-          </para>
-          <indexterm zone="libavif-lib libavif">
-            <primary sortas="c-libavif">libavif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpixbufloader-avif">
-        <term><filename class="libraryfile">libpixbufloader-avif.so</filename></term>
-        <listitem>
-          <para>
-            allows applications which use gdk-pixbuf to read AVIF images
-          </para>
-          <indexterm zone="libavif libpixbufloader-avif">
-            <primary sortas="c-libpixbufloader-avif">libpixbufloader-avif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Because the maintainer of libexif is releasing versions in a scheme such
-       as this: libexif-0_6_22-release/libexif-0.6.22.tar.xz, let's keep the
-       0_6_22 as a separate entity. -->
-  <!--<!ENTITY dl-version "0_6_22">
-      not used in version 0.6.23 -->
-
-  <!ENTITY libexif-download-http "https://github.com/libexif/libexif/releases/download/v&libexif-version;/libexif-&libexif-version;.tar.bz2">
-  <!ENTITY libexif-download-ftp  " ">
-  <!ENTITY libexif-md5sum        "00ea6e7ff62d3fd41ea9b2139746703c">
-  <!ENTITY libexif-size          "1.9 MB">
-  <!ENTITY libexif-buildsize     "17 MB">
-  <!ENTITY libexif-time          "0.1 SBU">
-]>
-
-<sect1 id="libexif" xreflabel="libexif-&libexif-version;">
-  <?dbhtml filename="libexif.html"?>
-
-
-  <title>libexif-&libexif-version;</title>
-
-  <indexterm zone="libexif">
-    <primary sortas="a-libexif">libexif</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libexif</title>
-
-    <para>
-      The <application>libexif</application> package contains a library for
-      parsing, editing, and saving EXIF data. Most digital cameras produce
-      EXIF files, which are JPEG files with extra tags that contain information
-      about the image. All EXIF tags described in EXIF standard 2.1 are
-      supported.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libexif-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libexif-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libexif-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libexif-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libexif-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libexif-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libexif Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (to Build Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="graphviz"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libexif</title>
-
-<!--
-    <para>
-      First, apply a patch to fix a security issue (integer overflow leading to
-      Out Of Buffer write):
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libexif-&libexif-version;-security_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>libexif</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-doc-dir=/usr/share/doc/libexif-&libexif-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Documentation was built and installed if you have the dependencies
-      shown above installed. If you don't have the dependencies installed,
-      there is a compressed tarball in the source tree
-      <filename class="directory">doc</filename> directory that can be
-      unpacked into /usr/share/doc/libexif-&libexif-version;.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libexif.so
-        </seg>
-        <seg>
-          /usr/include/libexif and
-          /usr/share/doc/libexif-&libexif-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libexif-lib">
-        <term><filename class="libraryfile">libexif.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for parsing, editing, and saving
-            EXIF data
-          </para>
-          <indexterm zone="libexif libexif-lib">
-            <primary sortas="c-libexif">libexif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/libgxps.xml
===================================================================
--- general/graphlib/libgxps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgxps-download-http "&gnome-download-http;/libgxps/0.3/libgxps-&libgxps-version;.tar.xz">
-  <!ENTITY libgxps-download-ftp  " ">
-  <!ENTITY libgxps-md5sum        "0527ac7c8c405445e96a5baa6019a0c3">
-  <!ENTITY libgxps-size          "80 KB">
-  <!ENTITY libgxps-buildsize     "5.4 MB">
-  <!ENTITY libgxps-time          "0.1 SBU">
-]>
-
-<sect1 id="libgxps" xreflabel="libgxps-&libgxps-version;">
-  <?dbhtml filename="libgxps.html"?>
-
-
-  <title>Libgxps-&libgxps-version;</title>
-
-  <indexterm zone="libgxps">
-    <primary sortas="a-libgxps">libgxps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgxps</title>
-
-    <para>
-      The <application>libgxps</application> package provides an interface
-      to manipulate XPS documents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgxps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgxps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgxps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgxps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgxps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgxps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libgxps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libgxps</title>
-
-    <para>
-      Install <application>Libgxps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xpstojpeg, xpstopdf, xpstopng, xpstops, and xpstosvg
-        </seg>
-        <seg>
-          libgxps.so
-        </seg>
-        <seg>
-          /usr/include/libgxps
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xpstojpeg">
-        <term><command>xpstojpeg</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to a JPEG image
-          </para>
-          <indexterm zone="libgxps xpstojpeg">
-            <primary sortas="b-xpstojpeg">xpstojpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstopdf">
-        <term><command>xpstopdf</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to PDF format
-          </para>
-          <indexterm zone="libgxps xpstopdf">
-            <primary sortas="b-xpstopdf">xpstopdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstopng">
-        <term><command>xpstopng</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to a PNG image
-          </para>
-          <indexterm zone="libgxps xpstopng">
-            <primary sortas="b-xpstopng">xpstopng</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstops">
-        <term><command>xpstops</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to PostScript
-          </para>
-          <indexterm zone="libgxps xpstops">
-            <primary sortas="b-xpstops">xpstops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstosvg">
-        <term><command>xpstosvg</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to SVG images
-          </para>
-          <indexterm zone="libgxps xpstosvg">
-            <primary sortas="b-xpstosvg">xpstosvg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgxps-lib">
-        <term><filename class="libraryfile">libgxps.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for manipulating XPS documents
-          </para>
-          <indexterm zone="libgxps libgxps-lib">
-            <primary sortas="c-libgxps">libgxps.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libjpeg-download-http "&sourceforge-dl;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
-  <!ENTITY libjpeg-download-ftp  " ">
-  <!ENTITY libjpeg-md5sum        "1fdc6494521a8724f5f7cf39b0f6aff3">
-  <!ENTITY libjpeg-size          "2.7 MB">
-  <!ENTITY libjpeg-buildsize     "55 MB (with tests)">
-  <!ENTITY libjpeg-time          "0.5 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="libjpeg" xreflabel="libjpeg-turbo-&libjpeg-turbo-version;">
-  <?dbhtml filename="libjpeg.html"?>
-
-
-  <title>libjpeg-turbo-&libjpeg-turbo-version;</title>
-
-  <indexterm zone="libjpeg">
-    <primary sortas="a-libjpeg-turbo">libjpeg-turbo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libjpeg-turbo</title>
-
-    <para>
-      <application>libjpeg-turbo</application> is a fork of the original
-      IJG <application>libjpeg</application> which uses SIMD to accelerate
-      baseline JPEG compression and decompression.
-      <application>libjpeg</application> is a library that implements JPEG
-      image encoding, decoding and transcoding.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libjpeg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libjpeg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libjpeg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libjpeg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libjpeg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libjpeg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libjpeg-turbo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nasm"/> or <xref linkend="yasm"/>
-      (for building the package with optimized assembly routine)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libjpeg-turbo</title>
-
-    <para>
-      Install <application>libjpeg-turbo</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         \
-      -DENABLE_STATIC=FALSE              \
-      -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo-&libjpeg-turbo-version; \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-<!--
-    <note><para>
-      If installing <application>libjpeg-turbo</application> over an older jpeg
-      installation, not all library symbolic links are updated properly.  To fix
-      this before installation, run the following as the <systemitem
-      class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>rm -f /usr/lib/libjpeg.so*</userinput></screen>
-
-    </note>
--->
-    <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>
-      <option>-DWITH_JPEG8=ON</option>: This switch enables compatibility
-      with <application>libjpeg</application> version 8.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cjpeg, djpeg, jpegtran, rdjpgcom, tjbench, and wrjpgcom
-        </seg>
-        <seg>
-          libjpeg.so and libturbojpeg.so
-        </seg>
-        <seg>
-          /usr/share/doc/libjpeg-turbo-&libjpeg-turbo-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cjpeg">
-        <term><command>cjpeg</command></term>
-        <listitem>
-          <para>
-            compresses image files to produce a JPEG/JFIF file on the
-            standard output. Currently supported input file formats are: PPM
-            (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-            BMP, and Targa
-          </para>
-          <indexterm zone="libjpeg cjpeg">
-            <primary sortas="b-cjpeg">cjpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="djpeg">
-        <term><command>djpeg</command></term>
-        <listitem>
-          <para>
-            decompresses image files from JPEG/JFIF format to either
-            PPM (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-            BMP, or Targa format
-          </para>
-          <indexterm zone="libjpeg djpeg">
-            <primary sortas="b-djpeg">djpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpegtran">
-        <term><command>jpegtran</command></term>
-        <listitem>
-          <para>
-            is used for lossless transformation of JPEG files
-          </para>
-          <indexterm zone="libjpeg jpegtran">
-            <primary sortas="b-jpegtran">jpegtran</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdjpgcom">
-        <term><command>rdjpgcom</command></term>
-        <listitem>
-          <para>
-            displays text comments from within a JPEG file
-          </para>
-          <indexterm zone="libjpeg rdjpgcom">
-            <primary sortas="b-rdjpgcom">rdjpgcom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tjbench">
-        <term><command>tjbench</command></term>
-        <listitem>
-          <para>
-            is used to benchmark the performance of libjpeg-turbo
-          </para>
-          <indexterm zone="libjpeg tjbench">
-            <primary sortas="b-tjbench">tjbench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wrjpgcom">
-        <term><command>wrjpgcom</command></term>
-        <listitem>
-          <para>
-            inserts text comments into a JPEG file
-          </para>
-          <indexterm zone="libjpeg wrjpgcom">
-            <primary sortas="b-wrjpgcom">wrjpgcom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjpeg-lib">
-        <term><filename class="libraryfile">libjpeg.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for reading and writing JPEG images
-        </para>
-          <indexterm zone="libjpeg libjpeg-lib">
-            <primary sortas="c-libjpeg">libjpeg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/libjpeg.xml
===================================================================
--- general/graphlib/libjpeg.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="libjpeg" xreflabel="libjpeg-&libjpeg-version;">
+<?dbhtml filename="libjpeg.html" dir="general"?>
+<title>libjpeg-&libjpeg-version;</title>
+
+&libjpeg-intro;
+&libjpeg-inst;
+&libjpeg-exp;
+&libjpeg-config;
+&libjpeg-desc;
+
+</sect1>
+
Index: general/graphlib/libjpeg/libjpeg-config.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libjpeg</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-desc.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,38 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libjpeg package contains <userinput>cjpeg, djpeg, jpegtran,
+rdjpgcom, wrjpgcom</userinput> and the <userinput>jpeg
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cjpeg</title>
+<para>cjpeg compresses image files to produce a JPEG/JFIF file on the standard
+output.  Currently supported input file formats are: PPM (PBMPLUS color
+format), PGM (PBMPLUS gray-scale format), BMP, and Targa</para></sect3>
+
+<sect3><title>djpeg</title>
+<para>djpeg decompresses image files from JPEG/JFIF format to either PPM 
+(PBMPLUS color format), PGM (PBMPLUS gray-scale format), BMP, or Targa
+format.</para></sect3>
+
+<sect3><title>jpegtran</title>
+<para>jpegtran is used for lossless transformation of JPEG
+files</para></sect3>
+
+<sect3><title>rdjpgcom</title>
+<para>rdjpgcom displays text comments from within a JPEG
+file</para></sect3>
+
+<sect3><title>wrjpgcom</title>
+<para>wrjpgcom inserts text comments into a JPEG file</para></sect3>
+
+<sect3><title>jpeg libraries</title>
+<para>These libraries are used by many programs for reading and writing
+jpeg format files.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-exp.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>./configure --enable-static --enable-shared --prefix=/usr</userinput> 
+This command tells libjpeg to build both shared and
+static libraries and to install them with a base of /usr.</para>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-inst.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of libjpeg</title>
+
+<para>Install libjpeg by running the following commands:</para>
+
+<para><screen><userinput>./configure --enable-static --enable-shared --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-intro.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to libjpeg</title>
+
+<screen>Download location:              &libjpeg-download;
+Version used:                   &libjpeg-version;
+Package size:                   &libjpeg-size;
+Estimated Disk space required:  &libjpeg-buildsize;</screen>
+
+<para>The libjpeg package contains the jpeg libraries.  These allow compression
+of image files based on the Joint Photographic Experts Group standard.  It is a
+"lossy" compression algorithm.</para>
+
+</sect2>
Index: general/graphlib/libjpeg/libjpeg.ent
===================================================================
--- general/graphlib/libjpeg/libjpeg.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libjpeg SYSTEM "../libjpeg.xml">
+<!ENTITY libjpeg-intro SYSTEM "libjpeg-intro.xml">
+<!ENTITY libjpeg-inst SYSTEM "libjpeg-inst.xml">
+<!ENTITY libjpeg-exp SYSTEM "libjpeg-exp.xml">
+<!ENTITY libjpeg-desc SYSTEM "libjpeg-desc.xml">
+<!ENTITY libjpeg-config SYSTEM "libjpeg-config.xml">
+<!ENTITY libjpeg-buildsize "3.7 MB">
+<!ENTITY libjpeg-version "6b">
+<!ENTITY libjpeg-download "ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz">
+<!ENTITY libjpeg-size "599 KB">
Index: neral/graphlib/libjxl.xml
===================================================================
--- general/graphlib/libjxl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,337 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libjxl-download-http "https://github.com/libjxl/libjxl/archive/v&libjxl-version;/libjxl-&libjxl-version;.tar.gz">
-  <!ENTITY libjxl-md5sum        "e383b622cb2caef4dfcc8047f5a0fe72">
-  <!ENTITY libjxl-size          "1.8 MB">
-  <!ENTITY libjxl-buildsize     "53 MB">
-  <!ENTITY libjxl-time          "0.8 SBU (with parallelism=4)">
-
-]>
-
-<sect1 id="libjxl" xreflabel="libjxl-&libjxl-version;">
-  <?dbhtml filename="libjxl.html"?>
-
-  <title>libjxl-&libjxl-version;</title>
-
-  <indexterm zone="libjxl">
-    <primary sortas="a-libjxl">libjxl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libjxl</title>
-
-    <para>
-      The <application>libjxl</application> package contains the reference
-      implementation of the JPEG XL image format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libjxl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libjxl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libjxl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libjxl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libjxl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libjxl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="brotli"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="highway"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/> (for the plugin)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and <xref linkend="graphviz"/>
-      (for documentation),
-      <xref linkend="gimp"/> (for the plugin),
-      <xref linkend="java"/> (for the JAR),
-      <xref linkend="libavif"/>,
-      <xref linkend="libwebp"/>,
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libjxl</title>
-
-    <para>
-      Install <application>libjxl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr             \
-      -D CMAKE_BUILD_TYPE=Release              \
-      -D BUILD_TESTING=OFF                     \
-      -D BUILD_SHARED_LIBS=ON                  \
-      -D JPEGXL_ENABLE_SKCMS=OFF               \
-      -D JPEGXL_ENABLE_SJPEG=OFF               \
-      -D JPEGXL_ENABLE_PLUGINS=ON              \
-      -D JPEGXL_INSTALL_JARDIR=/usr/share/java \
-      -G Ninja ..                              &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>gdk-pixbuf-query-loaders --update-cache</command>: This command
-      regenerates the <application>GDK Pixbuf</application> loader cache so
-      that it is aware of the JPEG-XL loader.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This parameter disables the
-      tests because they require
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS. If you wish to run the tests and have
-      <ulink url="https://github.com/google/googletest">gtest</ulink> installed,
-      remove this parameter.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter enables
-      building shared versions of the libraries instead of static ones.
-    </para>
-    
-    <para>
-      <parameter>-DJPEGXL_ENABLE_SKCMS=OFF</parameter>: This parameter disables
-      building support for Skia's <application>skcms</application> since it is
-      not necessary for BLFS purposes and requires
-      <ulink url="https://skia.googlesource.com/skcms/">skcms</ulink>.
-    </para>
-    
-    <para>
-      <parameter>-DJPEGXL_ENABLE_SJPEG=OFF</parameter>: This parameter disables
-      support for SimpleJPEG since it is not necessary for BLFS purposes and
-      requires <ulink url="https://github.com/webmproject/sjpeg">sjpeg</ulink>.
-    </para>
-    
-    <para>
-      <parameter>-DJPEGXL_ENABLE_PLUGINS=ON</parameter>: This parameter enables
-      Plugin support, which creates plugins for <xref linkend="gimp"/> and 
-      <xref linkend="gdk-pixbuf"/> if those packages are installed.
-    </para>
-
-    <para>
-      <parameter>-DJPEGXL_INSTALL_JARDIR=/usr/share/java</parameter>: This
-      parameter places the JAR file for JPEG XL support in the correct 
-      directory if <xref linkend="java"/> is installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          benchmark_xl,
-          cjxl,
-          djxl, and
-          jxlinfo
-        </seg>
-        <seg>
-          libjxl.so,
-          libjxl_cms.so,
-          libjxl_extras_codec.so,
-          libjxl_jni.so,
-          libjxl_threads.so, and
-          libpixbufloader-jxl.so (in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders),
-        </seg>
-        <seg>
-          /usr/include/jxl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="benchmark_xl">
-        <term><command>benchmark_xl</command></term>
-        <listitem>
-          <para>
-            runs performance benchmarks against libjxl
-          </para>
-          <indexterm zone="libjxl benchmark_xl">
-            <primary sortas="b-benchmark_xl">benchmark_xl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cjxl">
-        <term><command>cjxl</command></term>
-        <listitem>
-          <para>
-            compresses images into JPEG XL format
-          </para>
-          <indexterm zone="libjxl cjxl">
-            <primary sortas="b-cjxl">cjxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="djxl">
-        <term><command>djxl</command></term>
-        <listitem>
-          <para>
-            decompresses images from JPEG XL format into other formats
-          </para>
-          <indexterm zone="libjxl djxl">
-            <primary sortas="b-djxl">djxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jxlinfo">
-        <term><command>jxlinfo</command></term>
-        <listitem>
-          <para>
-            displays information about JPEG XL images
-          </para>
-          <indexterm zone="libjxl jxlinfo">
-            <primary sortas="b-jxlinfo">jxlinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjxl-lib">
-        <term><filename class="libraryfile">libjxl.so</filename></term>
-        <listitem>
-          <para>
-            contains the reference implementation of the JPEG XL standard
-          </para>
-          <indexterm zone="libjxl libjxl-lib">
-            <primary sortas="c-libjxl">libjxl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjxl_cms">
-        <term><filename class="libraryfile">libjxl_cms.so</filename></term>
-        <listitem>
-          <para>
-            contains support for Little CMS in libjxl
-          </para>
-          <indexterm zone="libjxl libjxl_cms">
-            <primary sortas="c-libjxl_cms">libjxl_cms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libjxl_extras_codec">
-        <term><filename class="libraryfile">libjxl_extras_codec.so</filename></term>
-        <listitem>
-          <para>
-            contains additional codec support for JPEG XL images
-          </para>
-          <indexterm zone="libjxl libjxl_extras_codec">
-            <primary sortas="c-libjxl_extras_codec">libjxl_extras_codec.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libjxl_jni">
-        <term><filename class="libraryfile">libjxl_jni.so</filename></term>
-        <listitem>
-          <para>
-            contains a Java interface to support JPEG XL on systems where
-            <xref linkend="java"/> was installed at build time
-          </para>
-          <indexterm zone="libjxl libjxl_jni">
-            <primary sortas="c-libjxl_jni">libjxl_jni.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libjxl_threads">
-        <term><filename class="libraryfile">libjxl_threads.so</filename></term>
-        <listitem>
-          <para>
-            contains threading functions for JPEG XL
-          </para>
-          <indexterm zone="libjxl libjxl_threads">
-            <primary sortas="c-libjxl_threads">libjxl_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libpixbufloader-jxl">
-        <term><filename class="libraryfile">libpixbufloader-jxl.so</filename></term>
-        <listitem>
-          <para>
-            contains a loader for gdk-pixbuf to allow it to load JPEG XL images
-          </para>
-          <indexterm zone="libjxl libpixbufloader-jxl">
-            <primary sortas="c-libpixbufloader-jxl">libpixbufloader-jxl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/graphlib/libmng.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,152 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libmng" xreflabel="libmng-&libmng-version;">
+<?dbhtml filename="libmng.html" dir="general"?>
+<title>libmng-&libmng-version;</title>
 
-  <!ENTITY libmng-download-http "&sourceforge-dl;/libmng/libmng-&libmng-version;.tar.xz">
-  <!ENTITY libmng-download-ftp  " ">
-  <!ENTITY libmng-md5sum        "e9e899adb1b681b17f14d91e261878c5">
-  <!ENTITY libmng-size          "932 KB">
-  <!ENTITY libmng-buildsize     "15 MB">
-  <!ENTITY libmng-time          "0.1 SBU">
-]>
-
-<sect1 id="libmng" xreflabel="libmng-&libmng-version;">
-  <?dbhtml filename="libmng.html"?>
-
-
-  <title>libmng-&libmng-version;</title>
-
-  <indexterm zone="libmng">
-    <primary sortas="a-Libmng">Libmng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmng</title>
-
-    <para>
-      The <application>libmng</application> libraries are used by
-      programs wanting to read and write Multiple-image Network Graphics
-      (MNG) files which are the animation equivalents to PNG files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmng-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmng-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmng-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmng-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmng-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmng-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmng Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="lcms2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmng</title>
-
-    <para>
-      Install <application>libmng</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d        /usr/share/doc/libmng-&libmng-version; &amp;&amp;
-install -v -m644 doc/*.txt /usr/share/doc/libmng-&libmng-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libmng.so</seg>
-        <seg>/usr/share/doc/libmng-&libmng-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmng-lib">
-        <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
-          </para>
-          <indexterm zone="libmng libmng-lib">
-            <primary sortas="c-libmng">libmng.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libmng-intro;
+&libmng-inst;
+&libmng-exp;
+&libmng-config;
+&libmng-desc;
 
 </sect1>
+
Index: general/graphlib/libmng/libmng-config.xml
===================================================================
--- general/graphlib/libmng/libmng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libmng</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-desc.xml
===================================================================
--- general/graphlib/libmng/libmng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libmng package contains the <userinput>mng
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>mng libraries</title>
+<para>libmng provides functions for programs wishing to read and write mng 
+files which are animation files without the patent problems associated with
+certain other formats.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-exp.xml
===================================================================
--- general/graphlib/libmng/libmng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>sed 's/lcms\/lcms.h/lcms.h/' configure.bak &gt;
+configure :</userinput> This change is to make the libmng configure
+routine look in the right place for the lcms header files.</para>
+
+<para><screen><userinput>./configure --prefix=/usr --with-zlib \
+--with-jpeg --with-lcms </userinput></screen>
+
+This command sets the install directory and also tells the configuration
+routine to look and find zlib, libjpeg and lcms.</para>
+
+<para><userinput>cp doc/man/*.X /usr/share/man/manX :</userinput> The
+install procedure doesn't properly install the man pages so we do it
+manually.</para>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-inst.xml
===================================================================
--- general/graphlib/libmng/libmng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Installation of libmng</title>
+
+<para>Install libmng by running the following commands:</para>
+
+<para><screen><userinput>cp configure configure.bak &amp;&amp;
+sed 's/lcms\/lcms.h/lcms.h/' configure.bak &gt; configure &amp;&amp;
+./configure --prefix=/usr --with-zlib \
+   --with-jpeg --with-lcms &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cp doc/man/*.3 /usr/share/man/man3 &amp;&amp;
+cp doc/man/*.5 /usr/share/man/man5</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-intro.xml
===================================================================
--- general/graphlib/libmng/libmng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to libmng</title>
+
+<screen>Download location:              &libmng-download;
+Version used:                   &libmng-version;
+Package size:                   &libmng-size;
+Estimated Disk space required:  &libmng-buildsize;</screen>
+
+<para>The libmng libraries are used by programs wanting to read and
+write mng files which are the animation equivalents to png files.</para>
+
+<screen>libmng depends on: <xref linkend="zlib"></xref>, <xref linkend="libjpeg"></xref> and <xref linkend="lcms"></xref></screen>
+
+</sect2>
Index: general/graphlib/libmng/libmng.ent
===================================================================
--- general/graphlib/libmng/libmng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libmng SYSTEM "../libmng.xml">
+<!ENTITY libmng-intro SYSTEM "libmng-intro.xml">
+<!ENTITY libmng-inst SYSTEM "libmng-inst.xml">
+<!ENTITY libmng-exp SYSTEM "libmng-exp.xml">
+<!ENTITY libmng-desc SYSTEM "libmng-desc.xml">
+<!ENTITY libmng-config SYSTEM "libmng-config.xml">
+<!ENTITY libmng-buildsize "4.6 MB">
+<!ENTITY libmng-version "1.0.3">
+<!ENTITY libmng-download "http://www.libmng.com/download/libmng-1.0.3.tar.gz">
+<!ENTITY libmng-size "516 KB">
Index: neral/graphlib/libmypaint.xml
===================================================================
--- general/graphlib/libmypaint.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmypaint-download-http "https://github.com/mypaint/libmypaint/releases/download/v&libmypaint-version;/libmypaint-&libmypaint-version;.tar.xz">
-  <!ENTITY libmypaint-download-ftp  " ">
-  <!ENTITY libmypaint-md5sum        "7f1dab2d30ce8a3f494354c7c77a2977">
-  <!ENTITY libmypaint-size          "508 KB">
-  <!ENTITY libmypaint-buildsize     "11 MB (add 1 MB for tests)">
-  <!ENTITY libmypaint-time          "0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libmypaint" xreflabel="libmypaint-&libmypaint-version;">
-  <?dbhtml filename="libmypaint.html"?>
-
-
-  <title>libmypaint-&libmypaint-version;</title>
-
-  <indexterm zone="libmypaint">
-    <primary sortas="a-libmypaint">libmypaint</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmypaint</title>
-
-    <para>
-      The <application>libmypaint</application> package, a.k.a. "brushlib", is a
-      library for making brushstrokes which is used by MyPaint and other
-      projects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmypaint-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmypaint-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmypaint-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmypaint-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmypaint-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmypaint-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmypaint Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-c"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to create XML docs),
-      <ulink url="https://download.gimp.org/pub/gegl/0.3/">gegl (0.3 versions only)</ulink> and
-      <ulink url="https://github.com/gperftools/gperftools">gperftools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmypaint</title>
-
-    <para>
-      Install <application>libmypaint</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          libmypaint.so (and optionally libmypaint-gegl.so which is not
-          used by any packages in this book).
-        </seg>
-        <seg>
-          /usr/include/libmypaint
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmypaint-lib">
-        <term><filename class="libraryfile">libmypaint.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for making brushstrokes
-          </para>
-          <indexterm zone="libmypaint libmypaint-lib">
-            <primary sortas="c-libmypaint">libmypaint.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/graphlib/libpng.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,221 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libpng" xreflabel="libpng-&libpng-version;">
+<?dbhtml filename="libpng.html" dir="general"?>
+<title>libpng-&libpng-version;</title>
 
-  <!ENTITY libpng-download-http "&sourceforge-dl;/libpng/libpng-&libpng-version;.tar.xz">
-  <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "22b8362d16c3724eba9c1fb8d187320a">
-  <!ENTITY libpng-size          "1.0 MB">
-  <!ENTITY libpng-buildsize     "15 MB (with tests)">
-  <!ENTITY libpng-time          "0.1 SBU (add 0.5 SBU for tests)">
-
-  <!ENTITY apng-version "1.6.43">
-  <!ENTITY apng-md5sum  "fc21268c9c583c5d2e7ead8a9ec17240">
-
-  <!ENTITY apng-patch
-        "&sourceforge-dl;/sourceforge/libpng-apng/libpng-&apng-version;-apng.patch.gz">
-]>
-
-<sect1 id="libpng" xreflabel="libpng-&libpng-version;">
-  <?dbhtml filename="libpng.html"?>
-
-
-  <title>libpng-&libpng-version;</title>
-
-  <indexterm zone="libpng">
-    <primary sortas="a-libpng">libpng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpng</title>
-
-    <para>
-      The <application>libpng</application> package contains libraries used
-      by other programs for reading and writing PNG files. The PNG format
-      was designed as a replacement for GIF and, to a lesser extent, TIFF,
-      with many improvements and extensions and lack of patent problems.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpng-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpng-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpng-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpng-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpng-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpng-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch to include animated png functionality in
-          <application>libpng</application> (required to use the system
-          <application>libpng</application> in
-          <application>Firefox</application>,
-          <application>Seamonkey</application>, and
-          <application>Thunderbird</application>): <ulink url="&apng-patch;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Patch md5sum: &apng-md5sum;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpng</title>
-
-    <para>
-      If you want to patch libpng to support apng files, apply it here:
-    </para>
-
-<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p1</userinput></screen>
-
-    <para>
-      Install <application>libpng</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mkdir -v /usr/share/doc/libpng-&libpng-version; &amp;&amp;
-cp -v README libpng-manual.txt /usr/share/doc/libpng-&libpng-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libpng-config (symlink), libpng16-config, pngfix and png-fix-itxt
-        </seg>
-        <seg>
-          libpng.so
-        </seg>
-        <seg>
-          /usr/include/libpng16 and
-          /usr/share/doc/libpng-&libpng-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pngfix">
-        <term><command>pngfix</command></term>
-        <listitem>
-          <para>
-            tests, optimizes and optionally fixes the zlib header in PNG files.
-            Optionally, when fixing, strips ancillary chunks from the file
-          </para>
-          <indexterm zone="libpng pngfix">
-            <primary sortas="b-pngfix">pngfix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="png-fix-itxt">
-        <term><command>png-fix-itxt</command></term>
-        <listitem>
-          <para>
-            fixes PNG files that have an incorrect length field in the
-            iTXt chunks
-          </para>
-          <indexterm zone="libpng png-fix-itxt">
-            <primary sortas="b-png-fix-itxt">png-fix-itxt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpng-config">
-        <term><command>libpng-config</command></term>
-        <listitem>
-          <para>
-            is a shell script that provides configuration information
-            for applications wanting to use
-            <application>libpng</application>
-          </para>
-          <indexterm zone="libpng libpng-config">
-            <primary sortas="b-libpng-config">libpng-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpng-lin">
-        <term><filename class="libraryfile">libpng.so</filename></term>
-        <listitem>
-          <para>
-            contain routines used to create and manipulate PNG
-            format graphics files
-          </para>
-          <indexterm zone="libpng libpng-lin">
-            <primary sortas="c-libpng">libpng.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libpng-intro;
+&libpng-inst;
+&libpng-exp;
+&libpng-config;
+&libpng-desc;
 
 </sect1>
+
Index: general/graphlib/libpng/libpng-config.xml
===================================================================
--- general/graphlib/libpng/libpng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libpng</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-desc.xml
===================================================================
--- general/graphlib/libpng/libpng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libpng package contains the <userinput>png
+libraries</userinput> .</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>png libraries</title>
+<para>The PNG library is a collection of routines used to create and
+manipulate PNG format graphics files. The PNG format was designed as a
+replacement for GIF and, to a lesser extent, TIFF, with many
+improvements and extensions and lack of patent problems.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-exp.xml
===================================================================
--- general/graphlib/libpng/libpng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>CC="gcc $CFLAGS" :</userinput> This makes libpng use
+CFLAGS when compiling.</para>
+
+<para><userinput>ZLIBINC=/usr/include ZLIBLIB=/usr/lib
+:</userinput> This forces libpng to look for the zlib includes and
+libraries where we have them installed.</para>
+
+<para><userinput>-f scripts/makefile.linux :</userinput> This points
+make at the the Linux version of the makefile as libpng doesn't use a
+autoconf routine instead coming with various makefiles for different
+platforms.</para>
+
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-inst.xml
===================================================================
--- general/graphlib/libpng/libpng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of libpng</title>
+
+<para>Install libpng by running the following commands:</para>
+
+<para><screen><userinput>make prefix=/usr CC="gcc $CFLAGS" \
+   ZLIBINC=/usr/include ZLIBLIB=/usr/lib -f scripts/makefile.linux &amp;&amp;
+make prefix=/usr install -f scripts/makefile.linux</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-intro.xml
===================================================================
--- general/graphlib/libpng/libpng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to libpng</title>
+
+<screen>Download location - HTTP:       <ulink url="&libpng-download;"/>
+Download location - FTP:	<ulink url="&libpng-download-ftp;"/>
+Version used:                   &libpng-version;
+Package size:                   &libpng-size;
+Estimated Disk space required:  &libpng-buildsize;</screen>
+
+<para>The libpng package contains the libpng libraries.  These are used
+by other programs for reading and writing png files.</para>
+
+<screen>libpng depends on: 
+<xref linkend="zlib"></xref></screen>
+
+</sect2>
Index: general/graphlib/libpng/libpng.ent
===================================================================
--- general/graphlib/libpng/libpng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<!ENTITY libpng SYSTEM "../libpng.xml">
+<!ENTITY libpng-intro SYSTEM "libpng-intro.xml">
+<!ENTITY libpng-inst SYSTEM "libpng-inst.xml">
+<!ENTITY libpng-exp SYSTEM "libpng-exp.xml">
+<!ENTITY libpng-desc SYSTEM "libpng-desc.xml">
+<!ENTITY libpng-config SYSTEM "libpng-config.xml">
+<!ENTITY libpng-buildsize "3.5 MB">
+<!ENTITY libpng-version "1.2.3">
+<!ENTITY libpng-download "http://www.libpng.org/pub/png/src/libpng-1.2.3.tar.gz">
+<!ENTITY libpng-download-ftp "ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.3.tar.gz">
+<!ENTITY libpng-size "481 KB">
Index: neral/graphlib/libraw.xml
===================================================================
--- general/graphlib/libraw.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,324 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libraw-download-http "https://www.libraw.org/data/LibRaw-&libraw-version;.tar.gz">
-  <!ENTITY libraw-download-ftp  " ">
-  <!ENTITY libraw-md5sum        "0533724bad17c0fde22e642e4594e45d">
-  <!ENTITY libraw-size          "1.6 MB">
-  <!ENTITY libraw-buildsize     "30 MB">
-  <!ENTITY libraw-time          "0.2 SBU (Using parallelism=4)">
-  <!ENTITY dcraw-manpage-url    "https://linux.die.net/man/1/dcraw">
-]>
-
-<sect1 id="libraw" xreflabel="libraw-&libraw-version;">
-  <?dbhtml filename="libraw.html"?>
-
-
-  <title>libraw-&libraw-version;</title>
-
-  <indexterm zone="libraw">
-    <primary sortas="a-libraw">libraw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libraw</title>
-
-    <para>
-      <application>Libraw</application> is a library for reading RAW files
-      obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libraw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libraw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libraw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libraw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libraw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libraw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libraw Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="jasper"/>, and
-      <xref linkend="lcms2"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.libraw.org/download">LibRaw-demosaic-pack-GPL2</ulink> and
-      <ulink url="http://www.libraw.org/download">LibRaw-demosaic-pack-GPL3</ulink>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libraw</title>
-
-    <para>
-      Install <application>libraw</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoreconf -fiv              &amp;&amp;
-./configure --prefix=/usr    \
-            --enable-jpeg    \
-            --enable-jasper  \
-            --enable-lcms    \
-            --disable-static \
-            --docdir=/usr/share/doc/libraw-&libraw-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-jpeg</parameter>: This switch enables
-      support for jpeg. Remove if you don't have
-      <xref linkend="libjpeg"/> installed.
-    </para>
-
-    <para>
-      <parameter>--enable-jasper</parameter>: This switch enables
-      support for jasper. Remove if you don't have
-      <xref linkend="jasper"/> installed.
-    </para>
-
-    <para>
-      <parameter>--enable-lcms</parameter>: This switch enables
-      support for Little CMS2. Remove if you don't have
-      <xref linkend="lcms2"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-      <note>
-         <para>
-           All the installed programs are examples of using libraw.
-         </para>
-      </note>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          4channels, dcraw_emu, dcraw_half, half_mt, mem_image,
-          multirender_test, postprocessing_benchmark, raw-identify,
-          simple_dcraw, and unprocessed_raw
-        </seg>
-        <seg>
-          libraw.so and libraw_r.so
-        </seg>
-        <seg>
-          /usr/include/libraw and
-          /usr/share/doc/libraw-&libraw-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="_4channels">
-        <term><command>4channels</command></term>
-        <listitem>
-          <para>
-            generates four TIFF files from RAW data, one file per channel
-          </para>
-          <indexterm zone="libraw _4channels">
-            <primary sortas="b-_4channels">4channels</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dcraw_half">
-        <term><command>dcraw_half</command></term>
-        <listitem>
-          <para>
-            emulates "dcraw -h" (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw dcraw_half">
-            <primary sortas="b-dcraw_half">dcraw_half</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mem_image">
-        <term><command>mem_image</command></term>
-        <listitem>
-          <para>
-            emulates "dcraw [-4] [-6] [-e]" (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw mem_image">
-            <primary sortas="b-mem_image">mem_image</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postprocessing_benchmark">
-        <term><command>postprocessing_benchmark</command></term>
-        <listitem>
-          <para>
-            creates eight different renderings from one source file.
-            The first and fourth one should be identical
-          </para>
-          <indexterm zone="libraw postprocessing_benchmark">
-            <primary sortas="b-postprocessing_benchmark">
-            postprocessing_benchmark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simple_dcraw">
-        <term><command>simple_dcraw</command></term>
-        <listitem>
-          <para>
-            emulates call to "dcraw  [-D]  [-T] [-v] [-e] [-4]"  (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw simple_dcraw">
-            <primary sortas="b-simple_dcraw">simple_dcraw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dcraw_emu">
-        <term><command>dcraw_emu</command></term>
-        <listitem>
-          <para>
-            is an almost complete dcraw emulator (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw dcraw_emu">
-            <primary sortas="b-dcraw_emu">dcraw_emu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="half_mt">
-        <term><command>half_mt</command></term>
-        <listitem>
-          <para>
-            emulates call to "dcraw -h [-w] [-a] [-v]"  (see
-            <ulink url="&dcraw-manpage-url;">DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw half_mt">
-            <primary sortas="b-half_mt">half_mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="multirender_test">
-        <term><command>multirender_test</command></term>
-        <listitem>
-          <para>
-            creates eight different renderings from one source file.
-            The first and fourth one should be identical
-          </para>
-          <indexterm zone="libraw multirender_test">
-            <primary sortas="b-multirender_test">multirender_test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="raw-identify">
-        <term><command>raw-identify</command></term>
-        <listitem>
-          <para>
-            emulates call to "dcraw -i [-v]"  (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw raw-identify">
-            <primary sortas="b-raw-identify">half_mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unprocessed_raw">
-        <term><command>unprocessed_raw</command></term>
-        <listitem>
-          <para>
-            generates unprocessed raw image: with masked pixels and without
-            black subtraction
-          </para>
-          <indexterm zone="libraw unprocessed_raw">
-            <primary sortas="b-unprocessed_raw">unprocessed_raw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="libraw-lib">
-        <term><filename class='libraryfile'>libraw.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for parsing, editing, and saving
-            data.
-          </para>
-          <indexterm zone="libraw libraw-lib">
-            <primary sortas="c-libraw">libraw.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 librsvg-download-http "&gnome-download-http;/librsvg/&librsvg-minor;/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-download-ftp  " ">
-  <!ENTITY librsvg-md5sum        "21b2957a2e7ceeb7ddbd207aa2c7ed29">
-  <!ENTITY librsvg-size          "5.5 MB">
-  <!ENTITY librsvg-buildsize     "778 MB (17 MB installed), add 545 MB for tests">
-  <!ENTITY librsvg-time          "1.0 SBU (add 0.8 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="librsvg" xreflabel="librsvg-&librsvg-version;">
-  <?dbhtml filename="librsvg.html"?>
-
-
-  <title>librsvg-&librsvg-version;</title>
-
-  <indexterm zone="librsvg">
-    <primary sortas="a-librsvg">librsvg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to librsvg</title>
-
-    <para>
-      The <application>librsvg</application> package contains
-      a library and tools used to manipulate, convert and view
-      Scalable Vector Graphic (SVG) images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&librsvg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&librsvg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &librsvg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &librsvg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &librsvg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &librsvg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">librsvg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="pango"/>, and
-      <xref linkend="rust"/>
-    </para>
-
-    &build-use-internet;
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (for man pages),
-      <xref linkend="gi-docgen"/> (for documentation), and
-      <xref linkend="xorg7-font"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of librsvg</title>
-
-    <para>
-      Install <application>librsvg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-vala    \
-            --disable-static \
-            --docdir=/usr/share/doc/librsvg-&librsvg-version; &amp;&amp;
-make</userinput></screen>
-
-    <!-- With some locales (zh_CN.UTF-8) 31 tests fail.  With LC_ALL=C only
-         one failure.
-         https://gitlab.gnome.org/GNOME/librsvg/-/issues/1021 -->
-    <para>
-      To test the results, issue: <command>LC_ALL=C make -k check</command>.
-      <!-- https://gitlab.gnome.org/GNOME/librsvg/-/issues/1063
-           The test is broken due to missing font, but it's only revealed
-           after a pango update.  -->
-      One test named <literal>tests::rtl_tspan_svg</literal> is known to
-      fail with pango 1.52.1 or later.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make DOC_INSTALL_DIR='$(docdir)' install</userinput></screen>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        should be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-    </note>
-
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-vala</parameter>: This switch enables
-      building of the Vala bindings. Remove this switch if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>DOC_INSTALL_DIR='$(docdir)'</parameter>: This override
-      ensures installing the API documentation into the expected location
-      if <xref linkend='gi-docgen'/> is installed.
-    </para>
-
-    <para>
-      <option>--disable-introspection</option>: Use this switch if you have
-      not installed <application>Gobject Introspection</application>.
-    </para>
-
-    <para>
-      <option>--disable-gtk-doc</option>: This switch prevents building
-      the API documentation, even if <xref linkend="gi-docgen"/> (despite
-      the name of the option) is available.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rsvg-convert
-        </seg>
-        <seg>
-          librsvg-2.so and
-          libpixbufloader-svg.so (installed in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
-        </seg>
-        <seg>
-          /usr/include/librsvg-2.0 and
-          /usr/share/doc/librsvg-&librsvg-version;
-<!--      /usr/share/gtk-doc/html/rsvg-2.0 not built with
-               current instructions (needs gi-docgen)-->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsvg-convert">
-        <term><command>rsvg-convert</command></term>
-        <listitem>
-          <para>
-            is used to convert images into PNG, PDF, PS, SVG and other formats
-          </para>
-          <indexterm zone="librsvg rsvg-convert">
-            <primary sortas="b-rsvg-convert">rsvg-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librsvg-2">
-        <term><filename class="libraryfile">librsvg-2.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions to render Scalable Vector Graphics
-          </para>
-          <indexterm zone="librsvg librsvg-2">
-            <primary sortas="c-librsvg-2">librsvg-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpixbufloader-svg">
-        <term><filename class="libraryfile">libpixbufloader-svg.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Gdk Pixbuf</application> plugin that allows
-            <application>GTK+</application> applications to render Scalable
-            Vector Graphics images
-          </para>
-          <indexterm zone="librsvg libpixbufloader-svg">
-            <primary sortas="c-libpixbufloader-svg">libpixbufloader-svg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/libspiro.xml
===================================================================
--- general/graphlib/libspiro.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libspiro-download-http "https://github.com/fontforge/libspiro/releases/download/&libspiro-version;/libspiro-dist-&libspiro-version;.tar.gz">
-  <!ENTITY libspiro-download-ftp  " ">
-  <!ENTITY libspiro-md5sum        "c21f86e6c1ad65ed4cb1f754f6d7563c">
-  <!ENTITY libspiro-size          "428 KB">
-  <!ENTITY libspiro-buildsize     "5.1 MB (add 1.3 MB if running the tests)">
-  <!ENTITY libspiro-time          "0.1 SBU">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="libspiro" xreflabel="libspiro-&libspiro-version;">
-  <?dbhtml filename="libspiro.html"?>
-
-
-  <title>Libspiro-&libspiro-version;</title>
-
-  <indexterm zone="libspiro">
-    <primary sortas="a-libspiro">libspiro</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libspiro</title>
-
-    <para>
-      <application>Libspiro</application> will take an array of spiro control
-      points and convert them into a series of bezier splines which can then be
-      used in the myriad of ways the world has come to use beziers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libspiro-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libspiro-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libspiro-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libspiro-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libspiro-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libspiro-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libspiro</title>
-
-    <para>
-      Install <application>libspiro</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libspiro.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libspiro-lib">
-        <term><filename class="libraryfile">libspiro.so</filename></term>
-        <listitem>
-          <para>
-            is a shareable library that can be used by programs to do the Spiro
-            computations for you
-          </para>
-          <indexterm zone="libspiro libspiro-lib">
-            <primary sortas="c-libspiro">libspiro.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/libtiff.xml
===================================================================
--- general/graphlib/libtiff.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/graphlib/libtiff.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,266 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libtiff" xreflabel="libtiff-&libtiff-version;">
+<?dbhtml filename="libtiff.html" dir="general"?>
+<title>libtiff-&libtiff-version;</title>
 
-  <!ENTITY libtiff-download-http
-           "https://download.osgeo.org/libtiff/tiff-&libtiff-version;.tar.gz">
-  <!ENTITY libtiff-download-ftp  " ">
-  <!ENTITY libtiff-md5sum        "fc7d49a9348b890b29f91a4ecadd5b49">
-  <!ENTITY libtiff-size          "3.4 MB">
-  <!ENTITY libtiff-buildsize     "46 MB (with tests)">
-  <!ENTITY libtiff-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libtiff" xreflabel="libtiff-&libtiff-version;">
-  <?dbhtml filename="libtiff.html"?>
-
-
-  <title>libtiff-&libtiff-version;</title>
-
-  <indexterm zone="libtiff">
-    <primary sortas="a-libtiff">libtiff</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtiff</title>
-
-    <para>
-      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
-      used for general work with TIFF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtiff-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtiff-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtiff-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtiff-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtiff-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtiff-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/tiff-&libtiff-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">libtiff Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freeglut"/> (required for <command>tiffgt</command>),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="sphinx"/>,
-      <xref linkend="libwebp"/>,
-      <ulink url="https://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>, and
-      <ulink url="https://www.osgeo.org/projects/lerc-limited-error-raster-compression/">LERC</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtiff</title>
-
-<!--
-    <para>
-      First fix several security issues identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../tiff-&libtiff-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>libtiff</application> by running the following
-      commands:
-    </para>
-
-<!-- "build" exists in the source tree -->
-<screen><userinput>mkdir -p libtiff-build &amp;&amp;
-cd       libtiff-build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libtiff-&libtiff-version; \
-      -DCMAKE_INSTALL_PREFIX=/usr -G Ninja .. &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="content">
-    <title>Contents</title>
-
-<!-- libtiff-4.6.0 removed most of the programs that this package
-     previously installed due to lack of maintenance and security concerns. The
-     only ones remaining are tiffcp, tiffdump, tiffinfo, tiffset, and tiffsplit.
-     See Ticket #18550 for more details. -->
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          tiffcp,
-          tiffdump,
-          tiffinfo,
-          tiffset, and
-          tiffsplit
-        </seg>
-        <seg>
-          libtiff.so and libtiffxx.so
-        </seg>
-        <seg>
-          /usr/share/doc/tiff-&libtiff-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tiffcp">
-        <term><command>tiffcp</command></term>
-        <listitem>
-          <para>
-            copies (and possibly converts) a TIFF file
-          </para>
-          <indexterm zone="libtiff tiffcp">
-            <primary sortas="b-tiffcp">tiffcp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffdump">
-        <term><command>tiffdump</command></term>
-        <listitem>
-          <para>
-            prints verbatim information about TIFF files
-          </para>
-          <indexterm zone="libtiff tiffdump">
-            <primary sortas="b-tiffdump">tiffdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffinfo">
-        <term><command>tiffinfo</command></term>
-        <listitem>
-          <para>
-            prints information about TIFF files
-          </para>
-          <indexterm zone="libtiff tiffinfo">
-            <primary sortas="b-tiffinfo">tiffinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffset">
-        <term><command>tiffset</command></term>
-        <listitem>
-          <para>
-            sets the value of a TIFF header to a specified value
-          </para>
-          <indexterm zone="libtiff tiffset">
-            <primary sortas="b-tiffset">tiffset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffsplit">
-        <term><command>tiffsplit</command></term>
-        <listitem>
-          <para>
-            splits a multi-image TIFF into single-image TIFF files
-          </para>
-          <indexterm zone="libtiff tiffsplit">
-            <primary sortas="b-tiffsplit">tiffsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtiff-lib">
-        <term><filename class="libraryfile">libtiff.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the
-            <application>libtiff</application> programs as well as other
-            programs to read and write TIFF files
-          </para>
-          <indexterm zone="libtiff libtiff-lib">
-            <primary sortas="c-libtiff">libtiff.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtiffxx">
-        <term><filename class="libraryfile">libtiffxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the C++ API functions used
-            by programs to read and write TIFF files
-          </para>
-          <indexterm zone="libtiff libtiffxx">
-            <primary sortas="c-libtiffxx">libtiffxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libtiff-intro;
+&libtiff-inst;
+&libtiff-exp;
+&libtiff-config;
+&libtiff-desc;
 
 </sect1>
+
Index: general/graphlib/libtiff/libtiff-config.xml
===================================================================
--- general/graphlib/libtiff/libtiff-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libtiff</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-desc.xml
===================================================================
--- general/graphlib/libtiff/libtiff-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,80 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libtiff package contains <userinput>fax2ps, fax2tiff, gif2tiff, 
+pal2rgb, ppm2tiff, ras2tiff, rgb2ycbcr, thumbnail, tiff2bw, tiff2ps,
+tiff2rgba, tiffcmp, tiffcp, tiffdither, tiffdump, tiffinfo, tiffmedian,
+tiffsplit</userinput> and the <userinput>tiff libraries</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fax2ps</title>
+<para>fac2ps converts a TIFF facsimile to compressed postscript 
+file</para></sect3>
+
+<sect3><title>fax2tiff</title>
+<para>fax2tiff creates a TIFF Class F fax file from raw fax 
+data</para></sect3>
+
+<sect3><title>gif2tiff</title>
+<para>gif2tiff creates a TIFF file from a GIF87 format image 
+file</para></sect3>
+
+<sect3><title>pal2rgb</title>
+<para>pal2rgb converts a palette color TIFF image to a full 
+color image</para></sect3>
+
+<sect3><title>ppm2tiff</title>
+<para>ppm2tiff creates a TIFF file from a PPM image file</para></sect3>
+
+<sect3><title>ras2tiff</title>
+<para>ras2tiff creates a TIFF file from a Sun rasterfile</para></sect3>
+
+<sect3><title>rgb2ycbcr</title>
+<para>rgb2ycbcr converts non-YCbCr TIFF images to a YCbCr TIFF 
+image</para></sect3>
+
+<sect3><title>thumbnail</title>
+<para>thumbnail creates a TIFF file with thumbnail images</para></sect3>
+
+<sect3><title>tiff2bw</title>
+<para>tiff2bw converts a color TIFF image to greyscale</para></sect3>
+
+<sect3><title>tiff2ps</title>
+<para>tiff2ps converts a TIFF image to a postscript file</para></sect3>
+
+<sect3><title>tiff2rgba</title>
+<para>No description available</para></sect3>
+
+<sect3><title>tiffcmp</title>
+<para>tiffcmp compares two TIFF files</para></sect3>
+
+<sect3><title>tiffcp</title>
+<para>tiffcp copies (and possibly converts) a TIFF file</para></sect3>
+
+<sect3><title>tiffdither</title>
+<para>tiffdither converts a greyscale image to bilevel using 
+dithering</para></sect3>
+
+<sect3><title>tiffdump</title>
+<para>tiffdump prints verbatim information about TIFF files</para></sect3>
+
+<sect3><title>tiffinfo</title>
+<para>tiffinfo prints information about TIFF files</para></sect3>
+
+<sect3><title>tiffmedian</title>
+<para>tiffmedian applies the median cut algorithm to data in a 
+TIFF file</para></sect3>
+
+<sect3><title>tiffsplit</title>
+<para>tiffsplit splits a multi-image TIFF into single-image 
+TIFF files</para></sect3>
+
+<sect3><title>tiff libraries</title>
+<para>The tiff libraries are used by many programs to read and write
+tiff files</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-exp.xml
===================================================================
--- general/graphlib/libtiff/libtiff-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--noninteractive :</userinput> This switch is used to
+avoid the configuration routine asking for confirmation of the
+directories to install to (which we pass using switches to configure
+anyways).</para> 
+
+<para><userinput>--with-GCOPTS="$CFLAGS" :</userinput> This switch
+causes libtiff to be built using the options we have set in $CFLAGS
+(which most other packages handle automatically).</para>
+
+<para><userinput>--with-DIR_MAN=/usr/share/man :</userinput> This is
+used because despite the fact we pass --prefix=/usr, the configure
+routine tries to install the man-pages in /usr/local/man instead of the
+correct place.</para>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-inst.xml
===================================================================
--- general/graphlib/libtiff/libtiff-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of libtiff</title>
+
+<para>Install libtiff by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --noninteractive \
+   --with-GCOPTS="$CFLAGS" --with-DIR_MAN=/usr/share/man &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-intro.xml
===================================================================
--- general/graphlib/libtiff/libtiff-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to libtiff</title>
+
+<screen>Download location:              <ulink url="&libtiff-download;"/>
+Version used:                   &libtiff-version;
+Package size:                   &libtiff-size;
+Estimated Disk space required:  &libtiff-buildsize;</screen>
+
+<para>The libtiff 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 useful for general work with
+tiff files.</para>
+
+</sect2>
Index: general/graphlib/libtiff/libtiff.ent
===================================================================
--- general/graphlib/libtiff/libtiff.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libtiff SYSTEM "../libtiff.xml">
+<!ENTITY libtiff-intro SYSTEM "libtiff-intro.xml">
+<!ENTITY libtiff-inst SYSTEM "libtiff-inst.xml">
+<!ENTITY libtiff-exp SYSTEM "libtiff-exp.xml">
+<!ENTITY libtiff-desc SYSTEM "libtiff-desc.xml">
+<!ENTITY libtiff-config SYSTEM "libtiff-config.xml">
+<!ENTITY libtiff-buildsize "5.9 MB">
+<!ENTITY libtiff-version "3.5.7">
+<!ENTITY libtiff-download "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz">
+<!ENTITY libtiff-size "928 KB">
Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="libungif" xreflabel="libungif-&libungif-version;">
+<?dbhtml filename="libungif.html" dir="general"?>
+<title>libungif-&libungif-version;</title>
+
+&libungif-intro;
+&libungif-inst;
+&libungif-config;
+&libungif-desc;
+
+</sect1>
+
Index: general/graphlib/libungif/libungif-config.xml
===================================================================
--- general/graphlib/libungif/libungif-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Configuring libungif</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
Index: general/graphlib/libungif/libungif-desc.xml
===================================================================
--- general/graphlib/libungif/libungif-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,106 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libungif package contains <userinput>gif2epsn, gif2ps, gif2rgb, 
+gifasm, gifbg, gifburst, gifclip, gifclrmp, gifcolor, gifcomb, gifcompose, 
+giffiltr, giffix, gifflip, gifhisto, gifinfo, gifinter, gifinto, gifovly, 
+gifpos, gifrotat, gifrsize, gifspnge, giftext, gifwedge, icon2gif, raw2gif, 
+rgb2gif, text2gif</userinput> and the <userinput>ungif
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gif2epsn</title>
+<para>Dumps images saved as GIF files on Epson type printers.</para></sect3>
+
+<sect3><title>gif2ps</title>
+<para>Print GIF file on laser printers supporting PostScript.</para></sect3>
+
+<sect3><title>gif2rgb</title>
+<para>Convert images saved as GIF to 24-bit RGB image(s).</para></sect3>
+
+<sect3><title>gifasm</title>
+<para>assemble multiple GIFs into one, or burst a 
+multiple-image GIF.</para></sect3>
+
+<sect3><title>gifbg</title>
+<para>Generate a single-color test pattern GIF.</para></sect3>
+
+<sect3><title>gifburst</title>
+<para>Burst a GIF image into subrectangles.</para></sect3>
+
+<sect3><title>gifclip</title>
+<para>Clip or crop a GIF image.</para></sect3>
+
+<sect3><title>gifclrmp</title>
+<para>Modify GIF image colormaps.</para></sect3>
+
+<sect3><title>gifcolor</title>
+<para>Generate color test patterns.</para></sect3>
+
+<sect3><title>gifcomb</title>
+<para>Combine 2 GIF images of exactly the same size into one.</para></sect3>
+
+<sect3><title>gifcompose</title>
+<para>Use (un)giflib tools to compose images.</para></sect3>
+
+<sect3><title>giffiltr</title>
+<para>Template code for filtering a GIF sequentially.</para></sect3>
+
+<sect3><title>giffix</title>
+<para>Clumsily attempts to fix truncated GIF images.</para></sect3>
+
+<sect3><title>gifflip</title>
+<para>Flip GIF image along X or Y axis or rotate by 90 degrees.</para></sect3>
+
+<sect3><title>gifhisto</title>
+<para>Generate color-frequency histogram from a GIF.</para></sect3>
+
+<sect3><title>gifinfo</title>
+<para>Gives information on a GIF file.</para></sect3>
+
+<sect3><title>gifinter</title>
+<para>Convert between interlaced and non interlaced images.</para></sect3>
+
+<sect3><title>gifinto</title>
+<para>End-of-pipe fitting for GIF-processing pipelines.</para></sect3>
+
+<sect3><title>gifovly</title>
+<para>Generate one composite GIF from a multiple-image GIF.</para></sect3>
+
+<sect3><title>gifpos</title>
+<para>Change a GIF's screen size or recondition it.</para></sect3>
+
+<sect3><title>gifrotat</title>
+<para>Rotate a GIF through any desired angle.</para></sect3>
+
+<sect3><title>gifrsize</title>
+<para>Resize a GIF by deletion or duplication of bits.</para></sect3>
+
+<sect3><title>gifspnge</title>
+<para>Template code for filtering a GIF with in-core operations.</para></sect3>
+
+<sect3><title>giftext</title>
+<para>Print (text only) general information about a GIF</para></sect3>
+
+<sect3><title>gifwedge</title>
+<para>Create a test GIF image resembling a color monitor test
+pattern.</para></sect3>
+
+<sect3><title>icon2gif</title>
+<para>Converter/deconverter to/from an editable text format.</para></sect3>
+
+<sect3><title>raw2gif</title>
+<para>Convert raw 8-bit image data into GIF files.</para></sect3>
+
+<sect3><title>rgb2gif</title>
+<para>Convert 24 bit images to a GIF image using color 
+quantization.</para></sect3>
+
+<sect3><title>text2gif</title>
+<para>Generate GIF images out of regular text in 8x8 font.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libungif/libungif-inst.xml
===================================================================
--- general/graphlib/libungif/libungif-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Installation of libungif</title>
+
+<para>Install libungif by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<note><para>If you get an error during the make portion compiling lib/qprinf.c,
+edit the file and comment out or remove line 14: #include &lt;config.h&gt; 
+</para></note>
+
+</sect2>
+
Index: general/graphlib/libungif/libungif-intro.xml
===================================================================
--- general/graphlib/libungif/libungif-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Introduction to libungif</title>
+
+<screen>Download location:              <ulink url="&libungif-download;"/>
+Version used:                   &libungif-version;
+Package size:                   &libungif-size;
+Estimated Disk space required:  &libungif-buildsize;</screen>
+
+<para>The libungif package contains libraries for reading all gifs and
+writing uncompressed ones as well as programs for converting and working
+with gif files.  The libraries are useful for any graphics program
+wishing to deal with gif files while the programs are useful for
+conversion purposes as well as cleaning up images.</para>
+
+<para>The reason libungif only writes uncompressed gifs is due to a
+legal issue with LZW compression (which Unisys claims a patent on).
+Reading gifs is not a problem as the uncompression routines do not seem
+to be limited in this way.  Note that this has in the past been
+disputed.  The best way to avoid this whole mess is to simply use
+libungif for looking at gif images on the web, whilst in any pages which
+you design, use the open source png format instead (which uses, not
+surprisingly, the libpng library) which has no patent issues at
+all.</para>
+
+</sect2>
Index: general/graphlib/libungif/libungif.ent
===================================================================
--- general/graphlib/libungif/libungif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY libungif SYSTEM "../libungif.xml">
+<!ENTITY libungif-intro SYSTEM "libungif-intro.xml">
+<!ENTITY libungif-inst SYSTEM "libungif-inst.xml">
+<!ENTITY libungif-desc SYSTEM "libungif-desc.xml">
+<!ENTITY libungif-config SYSTEM "libungif-config.xml">
+<!ENTITY libungif-buildsize "3.1 MB">
+<!ENTITY libungif-version "4.1.0b1">
+<!ENTITY libungif-download "http://www.linuxpackages.net/packages/Slackware-8/robert/libungif-4.1.0b1/source/libungif-4.1.0b1.tar.gz">
+<!ENTITY libungif-size "343 KB">
Index: neral/graphlib/libwebp.xml
===================================================================
--- general/graphlib/libwebp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,285 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libwebp-download-http "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-&libwebp-version;.tar.gz">
-  <!ENTITY libwebp-download-ftp  " ">
-  <!ENTITY libwebp-md5sum        "07daaa13bef03b7be07f11977b159cb8">
-  <!ENTITY libwebp-size          "4.0 MB">
-  <!ENTITY libwebp-buildsize     "45 MB">
-  <!ENTITY libwebp-time          "0.1 SBU (with parallelism=4)">
-]>
-
-<sect1 id="libwebp" xreflabel="libwebp-&libwebp-version;">
-  <?dbhtml filename="libwebp.html"?>
-
-
-  <title>libwebp-&libwebp-version;</title>
-
-  <indexterm zone="libwebp">
-    <primary sortas="a-libwebp">libwebp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwebp</title>
-
-    <para>
-      The <application>libwebp</application> package contains a library
-      and support programs to encode and decode images in WebP format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwebp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwebp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwebp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwebp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwebp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwebp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!-- applied in 1.3.2
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libwebp-&libwebp-version;-security_update-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">libwebp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="sdl"/> (for improved 3D Acceleration)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freeglut"/> and
-      <xref linkend="giflib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwebp</title>
-<!-- applied in 1.3.2
-    <para>
-      Fix a security issue identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libwebp-&libwebp-version;-security_update-2.patch</userinput></screen>
--->
-    <para>
-      Install <application>libwebp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --enable-libwebpmux     \
-            --enable-libwebpdemux   \
-            --enable-libwebpdecoder \
-            --enable-libwebpextras  \
-            --enable-swap-16bit-csp \
-            --disable-static        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-
-    <para>
-      <parameter>--enable-swap-16bit-csp</parameter>: This switch enables byte
-      swap for 16 bit colorspaces.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          cwebp,
-          dwebp,
-          gif2webp,
-          img2webp,
-          vwebp,
-          webpinfo,
-          and webpmux
-        </seg>
-        <seg>
-          libsharpyuv.so,
-          libwebpdecoder.so,
-          libwebpdemux.so,
-          libwebpmux.so,
-          and libwebp.so
-        </seg>
-        <seg>
-          /usr/include/webp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cwebp">
-        <term><command>cwebp</command></term>
-        <listitem>
-          <para>
-            compresses an image using the WebP format
-          </para>
-          <indexterm zone="libwebp cwebp">
-            <primary sortas="b-cwebp">cwebp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dwebp">
-        <term><command>dwebp</command></term>
-        <listitem>
-          <para>
-            decompresses WebP files into PNG, PAM, PPM or PGM images
-          </para>
-          <indexterm zone="libwebp dwebp">
-            <primary sortas="b-dwebp">dwebp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gif2webp">
-        <term><command>gif2webp</command></term>
-        <listitem>
-          <para>
-            converts a GIF image to a WebP image
-          </para>
-          <indexterm zone="libwebp gif2webp">
-            <primary sortas="b-gif2webp">gif2webp</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="libwebp vwebp">
-            <primary sortas="b-vwebp">vwebp</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            creates animated WebP files from non-animated WebP images, extracts
-            frames from animated WebP images, and manages XMP/EXIF metadata and
-            the ICC profile
-          </para>
-          <indexterm zone="libwebp webpmux">
-            <primary sortas="b-webpmux">webpmux</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebp-lib">
-        <term><filename class="libraryfile">libwebp.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions for WebP encoding and decoding
-          </para>
-          <indexterm zone="libwebp libwebp-lib">
-            <primary sortas="c-libwebp">libwebp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/mypaint-brushes.xml
===================================================================
--- general/graphlib/mypaint-brushes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mypaint-brushes-download-http "https://github.com/mypaint/mypaint-brushes/releases/download/v&mypaint-brushes-version;/mypaint-brushes-&mypaint-brushes-version;.tar.xz">
-  <!ENTITY mypaint-brushes-download-ftp  " ">
-  <!ENTITY mypaint-brushes-md5sum        "7241032d814cb91d2baae7d009a2a2e0">
-  <!ENTITY mypaint-brushes-size          "1.3 MB">
-  <!ENTITY mypaint-brushes-buildsize     "3.4 MB">
-  <!ENTITY mypaint-brushes-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mypaint-brushes" xreflabel="mypaint-brushes-&mypaint-brushes-version;">
-  <?dbhtml filename="mypaint-brushes.html"?>
-
-
-  <title>mypaint-brushes-&mypaint-brushes-version;</title>
-
-  <indexterm zone="mypaint-brushes">
-    <primary sortas="a-mypaint-brushes">mypaint-brushes</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to mypaint-brushes</title>
-
-    <para>
-      The <application>mypaint-brushes</application> package contains brushes
-      used by packages which use libmypaint.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mypaint-brushes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mypaint-brushes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mypaint-brushes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mypaint-brushes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mypaint-brushes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mypaint-brushes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/mypaint-brushes-&mypaint-brushes-version;-automake_1.16-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">mypaint-brushes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="libmypaint"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mypaint-brushes</title>
-
-    <para>
-      Install <application>mypaint-brushes</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          /usr/share/mypaint-data.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/newt.xml
===================================================================
--- general/graphlib/newt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 newt-download-http "https://releases.pagure.org/newt/newt-&newt-version;.tar.gz">
-  <!ENTITY newt-download-ftp  " ">
-  <!ENTITY newt-md5sum        "9a0630e2f59eaa3037aec94989c36c4a">
-  <!ENTITY newt-size          "176 KB">
-  <!ENTITY newt-buildsize     "3.0 MB">
-  <!ENTITY newt-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="newt" xreflabel="newt-&newt-version;">
-  <?dbhtml filename="newt.html"?>
-
-
-  <title>newt-&newt-version;</title>
-
-  <indexterm zone="newt">
-    <primary sortas="a-newt">newt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to newt</title>
-
-    <para>
-      <application>Newt</application> is a programming library for color text
-      mode, widget based user interfaces.  It can be used to add stacked
-      windows, entry widgets, checkboxes, radio buttons, labels, plain text
-      fields, scrollbars, etc., to text mode user interfaces.
-      <application>Newt</application> is based on the S-Lang library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&newt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&newt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &newt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &newt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &newt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &newt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Newt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="popt"/> and
-      <xref linkend="slang"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- <xref linkend="tcl"/> and -->
-      <xref role="runtime" linkend="gpm"/> (runtime)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of newt</title>
-
-    <para>
-      Install <application>newt</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>sed -e '/install -m 644 $(LIBNEWT)/ s/^/#/' \
-    -e '/$(LIBNEWT):/,/rv/ s/^/#/'          \
-    -e 's/$(LIBNEWT)/$(LIBNEWTSH)/g'        \
-    -i Makefile.in                          &amp;&amp;
-
-./configure --prefix=/usr           \
-            --with-gpm-support      \
-            --with-python=python&python3-majorver; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -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.
-    </para>
-
-    <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.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg> whiptail </seg>
-        <seg> libnewt.so, whiptcl.so, and
-        /usr/lib/python&python3-majorver;/site-packages/_snack.so </seg>
-        <seg> None </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="whiptail-prog">
-        <term><command>whiptail</command></term>
-        <listitem>
-          <para>
-            displays dialog boxes from shell scripts
-          </para>
-          <indexterm zone="newt whiptail-prog">
-            <primary sortas="b-whiptail">whiptail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnewt-lib">
-        <term><filename class="libraryfile">libnewt.so</filename></term>
-        <listitem>
-          <para>
-            is the library for color text mode, widget based user interfaces
-          </para>
-          <indexterm zone="newt libnewt-lib">
-            <primary sortas="b-libnewt-lib">libnewt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
-  <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "153b4b8dd103b1bfe447f7dd1f22eac0">
-  <!ENTITY opencv-size              "88 MB">
-  <!ENTITY opencv-buildsize         "820 MB">
-  <!ENTITY opencv-time              "7.4 SBU (using parallelism=4)">
-
-  <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-contrib-version;.tar.gz">
-]>
-
-<sect1 id="opencv" xreflabel="opencv-&opencv-version;">
-  <?dbhtml filename="opencv.html"?>
-
-
-  <title>opencv-&opencv-version;</title>
-
-  <indexterm zone="opencv">
-    <primary sortas="a-opencv">opencv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to opencv</title>
-
-    <para>
-      The <application>opencv</application> package contains graphics libraries
-      mainly aimed at real-time computer vision.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opencv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opencv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opencv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opencv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opencv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opencv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional additional modules: <ulink
-          url="&opencv-contrib-download;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        One additional file that starts with "ippicv" (integrated
-        performance primitives) will be automatically downloaded during the
-        cmake portion of the build procedure. This download is specific to the
-        system architecture.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="unzip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="v4l-utils"/>, and
-      <xref linkend="xine-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache-ant"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="java"/>,
-      <xref linkend="numpy"/>,
-      <xref linkend="protobuf"/>,
-      <ulink url="https://math-atlas.sourceforge.net/">ATLAS</ulink>,
-      <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="https://www.openexr.com/">OpenEXR</ulink>,
-      <ulink url="https://www.gdal.org/">GDAL</ulink>,
-      <ulink url="https://www.netlib.org/lapack/">lapack</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
-<!--  <ulink url="https://www.numpy.org/">NumPy</ulink>, -->
-      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>, and
-      <ulink url="https://vtk.org/">VTK - The Visualization Toolkit</ulink>,
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of opencv</title>
-
-    <para>
-      If you downloaded the optional modules, unpack them now:
-    </para>
-
-<screen><userinput>tar -xf ../opencv_contrib-&opencv-contrib-version;.tar.gz</userinput></screen>
-
-    <para>
-      Install <application>opencv</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       \
-      -DENABLE_CXX11=ON                \
-      -DBUILD_PERF_TESTS=OFF           \
-      -DWITH_XINE=ON                   \
-      -DBUILD_TESTS=OFF                \
-      -DENABLE_PRECOMPILED_HEADERS=OFF \
-      -DCMAKE_SKIP_RPATH=ON            \
-      -DBUILD_WITH_DEBUG_INFO=OFF      \
-      -Wno-dev  ..                     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DWITH_XINE=ON</parameter>: This option instructs the make
-      procedure to use <xref linkend="xine-lib"/>.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_PRECOMPILED_HEADERS=OFF</parameter>: This option
-      is needed for compatibility with gcc-6.1 and later.
-    </para>
-
-    <para>
-      <option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
-      instructs the build system to build additional modules.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          opencv_annotation,
-          opencv_interactive-calibration,
-          opencv_model_diagnostics,
-          opencv_version,
-          opencv_visualisation, and
-          setup_vars_opencv4.sh
-        </seg>
-        <seg>
-          libopencv_calib3d.so,
-          libopencv_core.so,
-          libopencv_dnn.so,
-          libopencv_features2d.so,
-          libopencv_flann.so,
-          libopencv_gapi.so,
-          libopencv_highgui.so,
-          libopencv_imgcodecs.so,
-          libopencv_imgproc.so,
-          libopencv_ml.so,
-          libopencv_objdetect.so,
-          libopencv_photo.so,
-          libopencv_stitching.so,
-          libopencv_video.so, and
-          libopencv_videoio.so
-        </seg>
-        <seg>
-          /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
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="opencv_annotation">
-        <term><command>opencv_annotation</command></term>
-        <listitem>
-          <para>
-            ???
-          </para>
-          <indexterm zone="opencv opencv_annotation">
-            <primary sortas="b-opencv">opencv_annotation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: neral/graphlib/openjpeg2.xml
===================================================================
--- general/graphlib/openjpeg2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 openjpeg2-download-http "https://github.com/uclouvain/openjpeg/archive/v&openjpeg2-version;/openjpeg-&openjpeg2-version;.tar.gz">
-  <!ENTITY openjpeg2-download-ftp  " ">
-  <!ENTITY openjpeg2-md5sum        "f9ee64845881a15109ed0aa73a12202f">
-  <!ENTITY openjpeg2-size          "1.8 MB">
-  <!ENTITY openjpeg2-buildsize     "13 MB (add 1.7GB for tests)">
-  <!ENTITY openjpeg2-time          "0.2 SBU (add 0.8 SBU for tests)">
-]>
-
-<sect1 id="openjpeg2" xreflabel="OpenJPEG-&openjpeg2-version;">
-  <?dbhtml filename="openjpeg2.html"?>
-
-
-  <title>OpenJPEG-&openjpeg2-version;</title>
-
-  <indexterm zone="openjpeg2">
-    <primary sortas="a-openjpeg2">OpenJPEG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJPEG</title>
-
-    <para>
-      <application>OpenJPEG</application> is an open-source implementation of
-      the JPEG-2000 standard. OpenJPEG fully respects the JPEG-2000
-      specifications and can compress/decompress lossless 16-bit images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openjpeg2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openjpeg2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjpeg2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openjpeg2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjpeg2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openjpeg2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (for tests),
-      <xref linkend="lcms2"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="doxygen"/> (to build the API documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJPEG</title>
-
-    <para>
-      Install <application>OpenJPEG</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_STATIC_LIBS=OFF .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the tests, some additional files are required. Download
-      these files and run the tests using the following commands, but note that
-      8 tests are known to fail:
-    </para>
-
-<screen remap="test"><userinput>git clone https://github.com/uclouvain/openjpeg-data.git --depth 1 &amp;&amp;
-OPJ_DATA_ROOT=$PWD/openjpeg-data cmake -DBUILD_TESTING=ON ..       &amp;&amp;
-make                                                               &amp;&amp;
-make test</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-cp -rv ../doc/man -T /usr/share/man</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TESTING=ON</option>: This switch enables
-      building the test suite.
-    </para>
-
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>opj_compress, opj_decompress, and opj_dump</seg>
-        <seg>libopenjp2.so</seg>
-        <seg>/usr/include/openjpeg-&openjpeg2-majmin-version; and /usr/lib/openjpeg-&openjpeg2-majmin-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="opj_compress">
-        <term><command>opj_compress</command></term>
-        <listitem>
-          <para>
-            converts various image formats to the jpeg2000 format
-          </para>
-          <indexterm zone="openjpeg2 opj_compress">
-            <primary sortas="b-opj_compress">opj_compress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opj_decompress">
-        <term><command>opj_decompress</command></term>
-        <listitem>
-          <para>
-            converts jpeg2000 images to other image types
-          </para>
-          <indexterm zone="openjpeg2 opj_decompress">
-            <primary sortas="b-opj_decompress">opj_decompress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opj_dump">
-        <term><command>opj_dump</command></term>
-        <listitem>
-          <para>
-            reads in a jpeg2000 image and dumps the contents to stdout
-          </para>
-          <indexterm zone="openjpeg2 opj_dump">
-            <primary sortas="b-opj_dump">opj_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pixman-download-http "https://www.cairographics.org/releases/pixman-&pixman-version;.tar.gz">
-  <!ENTITY pixman-download-ftp  " ">
-  <!ENTITY pixman-md5sum        "21b18058dea39ad48f32d3199b8ffe40">
-  <!ENTITY pixman-size          "776 KB">
-  <!ENTITY pixman-buildsize     "27 MB (With tests)">
-  <!ENTITY pixman-time          "0.2 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="pixman" xreflabel="Pixman-&pixman-version;">
-  <?dbhtml filename="pixman.html"?>
-
-
-  <title>Pixman-&pixman-version;</title>
-
-  <indexterm zone="pixman">
-    <primary sortas="a-Pixman">Pixman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pixman</title>
-
-    <para>
-      The <application>Pixman</application> package contains a library that
-      provides low-level pixel manipulation features such as image
-      compositing and trapezoid rasterization.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pixman-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pixman-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pixman-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pixman-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pixman-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pixman-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pixman Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/> and
-      <xref linkend="libpng"/> (for tests and demos)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pixman</title>
-
-    <para>
-      Install <application>Pixman</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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 Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpixman-1.so
-        </seg>
-        <seg>
-          /usr/include/pixman-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpixman">
-        <term><filename class="libraryfile">libpixman-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide low-level pixel manipulation
-            features
-          </para>
-          <indexterm zone="pixman libpixman">
-            <primary sortas="c-libpixman">libpixman-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,542 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
-  <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "61ccc0892c0afe886ce31eae87bf8625">
-  <!ENTITY poppler-size          "1.8 MB">
-  <!ENTITY poppler-buildsize     "81 MB (with Qt6 library; add 13 MB for tests)">
-  <!ENTITY poppler-time          "0.9 SBU (with parallelism=4 and Qt5 library; add 2.7 SBU for tests)">
-  <!-- Time increase might be due to git.freedesktop.org -->
-
-  <!ENTITY poppler-data-version       "0.4.12">
-
-  <!ENTITY poppler-data-download-http "https://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
-  <!ENTITY poppler-data-md5sum        "67ee4a40aa830b1f6e2560ce5f6471ba">
-  <!ENTITY poppler-data-size          "4.3 MB">
-  <!ENTITY poppler-data-buildsize     "26 MB">
-  <!ENTITY poppler-data-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="poppler" xreflabel="Poppler-&poppler-version;">
-  <?dbhtml filename="poppler.html"?>
-
-
-  <title>Poppler-&poppler-version;</title>
-
-  <indexterm zone="poppler">
-    <primary sortas="a-Poppler">Poppler</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Poppler</title>
-
-    <para>
-      The <application>Poppler</application> package contains a PDF rendering
-      library and command line tools used to manipulate PDF files. This is
-      useful for providing PDF rendering functionality as a shared library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&poppler-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&poppler-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &poppler-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &poppler-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &poppler-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &poppler-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <title>Poppler Encoding Data</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&poppler-data-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &poppler-data-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &poppler-data-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &poppler-data-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &poppler-data-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The additional package consists of encoding files for use with
-      <application>Poppler</application>. The encoding files are optional and
-      <application>Poppler</application> will automatically read them if they
-      are present. When installed, they enable
-      <application>Poppler</application> to render CJK and Cyrillic properly.
-    </para>
-
-    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="fontconfig"/>, and
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/>,
-      <xref linkend="cairo"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="openjpeg2"/>, and
-      &qt5-deps;
-      (required for PDF support in <xref role="nodep" linkend="okular"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="git"/> (for downloading test files),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="qt6"/>
-      <!-- Nothing really uses this yet, but it will be used in KDE 6 -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Poppler</title>
-
-    <para>
-      Install <application>Poppler</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build                         &amp;&amp;
-cd    build                         &amp;&amp;
-
-cmake  -DCMAKE_BUILD_TYPE=Release   \
-       -DCMAKE_INSTALL_PREFIX=/usr  \
-       -DTESTDATADIR=$PWD/testfiles \
-       -DENABLE_QT6=OFF             \
-       -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-       ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      In order to run the test suite, some testcases are needed and can
-      be obtained only from a git repository. The command to download
-      them is:
-<command>git clone --depth 1 https://gitlab.freedesktop.org/poppler/test.git testfiles</command>.
-      Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>.
-      One test, check_qt5_signature_basics, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To install the documentation, run the following commands as
-      <systemitem class="username">root</systemitem>:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d           /usr/share/doc/poppler-&poppler-version; &amp;&amp;
-cp -vr ../glib/reference/html /usr/share/doc/poppler-&poppler-version;</userinput></screen>
-
-<!-- ==== Poppler Data ====== -->
-    <bridgehead renderas="sect3">Poppler Data</bridgehead>
-
-    <para>
-      If you downloaded the additional encoding data package, install it by
-      issuing the following commands:
-    </para>
-
-<screen><userinput>tar -xf ../../poppler-data-&poppler-data-version;.tar.gz &amp;&amp;
-cd poppler-data-&poppler-data-version;</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply a higher level of compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DTESTDATADIR=$PWD/testfiles</parameter>: Tells the test
-      programs where the auxiliary files are located.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_QT6=OFF</parameter>: This switch is needed to
-      prevent an error when Qt6 is not installed. Remove it if you
-      have installed <xref linkend="qt6" role="nodep"/>.
-    </para>
-
-    <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>).-->
-    </para>
-
-    <para>
-      <option>-DENABLE_GTK_DOC=ON</option>: Use this parameter if
-      GTK-Doc <!--and Pygments--> is installed and you wish to rebuild and
-      install the API documentation.
-    </para>
-
-    <para>
-      <option>-DENABLE_QT5=OFF</option>: Use this parameter if
-      &qt5-deps; is not installed. 
-    </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>
-
-    <para>
-      <option>-DENABLE_NSS3=OFF</option>: Use this parameter if you have
-      not installed <application>nss</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_GPGME=OFF</option>: Use this parameter if you have
-      not installed <application>gpgme</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_LIBTIFF=OFF</option>: Use this parameter if you have
-      not installed <application>libtiff</application>.
-    </para>
-
-    <para>
-      <command>LC_ALL=en_US.UTF-8 make test</command>: Runs the test suite.
-      The environment variable LC_ALL=en_US.UTF-8 is only needed if the
-      default locale does not include UTF-8.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pdfattach, pdfdetach, pdffonts, pdfimages, pdfinfo, pdfseparate,
-          pdfsig, pdftocairo, pdftohtml, pdftoppm, pdftops, pdftotext, and
-          pdfunite
-        </seg>
-        <seg>
-          libpoppler.so,
-          libpoppler-cpp.so,
-          libpoppler-glib.so,
-          libpoppler-qt5.so, and
-          (optionally) libpoppler-qt6.so
-        </seg>
-        <seg>
-          /usr/include/poppler,
-          /usr/share/poppler, and
-          /usr/share/doc/poppler-&poppler-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pdfattach">
-        <term><command>pdfattach</command></term>
-        <listitem>
-          <para>
-            adds a new embedded file to an existing PDF file
-          </para>
-          <indexterm zone="poppler pdfattach">
-            <primary sortas="b-pdfattach">pdfattach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfdetach">
-        <term><command>pdfdetach</command></term>
-        <listitem>
-          <para>
-            lists or extracts embedded files from PDF files
-          </para>
-          <indexterm zone="poppler pdfdetach">
-            <primary sortas="b-pdfdetach">pdfdetach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdffonts">
-        <term><command>pdffonts</command></term>
-        <listitem>
-          <para>
-            lists the fonts used in a PDF file along with various information
-            for each font
-          </para>
-          <indexterm zone="poppler pdffonts">
-            <primary sortas="b-pdffonts">pdffonts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfimages">
-        <term><command>pdfimages</command></term>
-        <listitem>
-          <para>
-            saves images from a PDF file as PPM, PBM, or JPEG files
-          </para>
-          <indexterm zone="poppler pdfimages">
-            <primary sortas="b-pdfimages">pdfimages</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfinfo">
-        <term><command>pdfinfo</command></term>
-        <listitem>
-          <para>
-            prints the contents of the 'Info' dictionary (plus some other useful
-            information) from a PDF file
-          </para>
-          <indexterm zone="poppler pdfinfo">
-            <primary sortas="b-pdfinfo">pdfinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfseparate">
-        <term><command>pdfseparate</command></term>
-        <listitem>
-          <para>
-            extracts single pages from a PDF file
-          </para>
-          <indexterm zone="poppler pdfseparate">
-            <primary sortas="b-pdseparate">pdfseparate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfsig">
-        <term><command>pdfsig</command></term>
-        <listitem>
-          <para>
-            verifies the digital signatures in a PDF document
-          </para>
-          <indexterm zone="poppler pdfsig">
-            <primary sortas="b-pdseparate">pdfsig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftocairo">
-        <term><command>pdftocairo</command></term>
-        <listitem>
-          <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
-          </para>
-          <indexterm zone="poppler pdftocairo">
-            <primary sortas="b-pdftocairo">pdftocairo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftohtml">
-        <term><command>pdftohtml</command></term>
-        <listitem>
-          <para>
-            converts a PDF file to HTML
-          </para>
-          <indexterm zone="poppler pdftohtml">
-            <primary sortas="b-pdftohtml">pdftohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftoppm">
-        <term><command>pdftoppm</command></term>
-        <listitem>
-          <para>
-            converts PDF files to PBM, PGM and PPM formats
-          </para>
-          <indexterm zone="poppler pdftoppm">
-            <primary sortas="b-pdftoppm">pdftoppm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftops">
-        <term><command>pdftops</command></term>
-        <listitem>
-          <para>
-            converts PDF files to Postscript format
-          </para>
-          <indexterm zone="poppler pdftops">
-            <primary sortas="b-pdftops">pdftops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftotext">
-        <term><command>pdftotext</command></term>
-        <listitem>
-          <para>
-            converts PDF files to plain text
-          </para>
-          <indexterm zone="poppler pdftotext">
-            <primary sortas="b-pdftotext">pdftotext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfunite">
-        <term><command>pdfunite</command></term>
-        <listitem>
-          <para>
-            merges several PDF files, in the order of their occurrence on the
-            command line, to one PDF output file
-          </para>
-          <indexterm zone="poppler pdfunite">
-            <primary sortas="b-pdfunite">pdfunite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler">
-        <term><filename class="libraryfile">libpoppler.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions to render PDF files
-          </para>
-          <indexterm zone="poppler libpoppler">
-            <primary sortas="c-libpoppler">libpoppler.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-cpp">
-        <term><filename class="libraryfile">libpoppler-cpp.so</filename></term>
-        <listitem>
-          <para>
-            is a C++ backend for rendering PDF files
-          </para>
-          <indexterm zone="poppler libpoppler-cpp">
-            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-glib">
-        <term><filename class="libraryfile">libpoppler-glib.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>GTK+</application>
-          </para>
-          <indexterm zone="poppler libpoppler-glib">
-            <primary sortas="c-libpoppler-glib">libpoppler-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-qt5">
-        <term><filename class="libraryfile">libpoppler-qt5.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>5
-          </para>
-          <indexterm zone="poppler libpoppler-qt5">
-            <primary sortas="c-libpoppler-qt5">libpoppler-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-qt6">
-        <term><filename class="libraryfile">libpoppler-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>6
-          </para>
-          <indexterm zone="poppler libpoppler-qt6">
-            <primary sortas="c-libpoppler-qt6">libpoppler-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/potrace.xml
===================================================================
--- general/graphlib/potrace.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 potrace-download-http "&sourceforge-dl;/potrace/potrace-&potrace-version;.tar.gz">
-  <!ENTITY potrace-download-ftp  " ">
-  <!ENTITY potrace-md5sum        "5f0bd87ddd9a620b0c4e65652ef93d69">
-  <!ENTITY potrace-size          "644 KB">
-  <!ENTITY potrace-buildsize     "7.1 MB (including tests)">
-  <!ENTITY potrace-time          "less than 0.1 SBU (including tests)">
-]>
-
-<sect1 id="potrace" xreflabel="Potrace-&potrace-version;">
-  <?dbhtml filename="potrace.html"?>
-
-
-  <title>Potrace-&potrace-version;</title>
-
-  <indexterm zone="potrace">
-    <primary sortas="a-Potrace">Potrace</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Potrace</title>
-
-    <para>
-      <!-- summarized from the home page, where Potrace(TM) is used -->
-      <application>Potrace™</application> is a tool for transforming a bitmap
-      (PBM, PGM, PPM, or BMP format) into one of several vector file formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&potrace-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&potrace-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &potrace-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &potrace-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &potrace-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &potrace-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Potrace Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="llvm"/> (including <command>clang</command>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Potrace</title>
-
-    <para>
-      Install <application>Potrace</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                        \
-            --disable-static                     \
-            --docdir=/usr/share/doc/potrace-&potrace-version; \
-            --enable-a4                          \
-            --enable-metric                      \
-            --with-libpotrace                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the test suite, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-a4</parameter>: Use A4 as the default paper size.
-    </para>
-
-    <para>
-      <!-- american spelling as in the configure script -->
-      <parameter>--enable-metric</parameter>: Use metric units (centimeters)
-      as default
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-libpotrace</parameter>: Install the library and headers.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mkbitmap, potrace
-        </seg>
-        <seg>
-          libpotrace.so
-        </seg>
-        <seg>
-          /usr/share/doc/potrace-&potrace-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mkbitmap">
-        <term><command>mkbitmap</command></term>
-        <listitem>
-          <para>
-            transforms images into bitmaps with scaling and filtering
-          </para>
-          <indexterm zone="potrace mkbitmap">
-            <primary sortas="b-mkbitmap">mkbitmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="potrace-prog">
-        <term><command>potrace</command></term>
-        <listitem>
-          <para>
-            transforms bitmaps into vector graphics
-          </para>
-          <indexterm zone="potrace potrace-prog">
-            <primary sortas="b-potrace-prog">potrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpotrace">
-        <term><filename class="libraryfile">libpotrace.so</filename></term>
-        <listitem>
-          <para>
-            is a library for transforming bitmaps into vector graphics
-          </para>
-          <indexterm zone="potrace libpotrace">
-            <primary sortas="c-libpotrace">libpotrace.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/qpdf.xml
===================================================================
--- general/graphlib/qpdf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qpdf-download-http "https://github.com/qpdf/qpdf/releases/download/v&qpdf-version;/qpdf-&qpdf-version;.tar.gz">
-  <!ENTITY qpdf-download-ftp  " ">
-  <!ENTITY qpdf-md5sum        "479befd15a61516ef3b2634f63ec684a">
-  <!ENTITY qpdf-size          "18 MB">
-  <!ENTITY qpdf-buildsize     "263 MB (add 1 MB for tests)">
-  <!ENTITY qpdf-time          "0.5 SBU (using parallelism=4; add 0.5 SBU for tests)">
-]>
-
-<sect1 id="qpdf" xreflabel="Qpdf-&qpdf-version;">
-  <?dbhtml filename="qpdf.html"?>
-
-
-  <title>Qpdf-&qpdf-version;</title>
-
-  <indexterm zone="qpdf">
-    <primary sortas="a-Qpdf">Qpdf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qpdf</title>
-
-    <para>
-      The <application>Qpdf</application> package contains command-line
-      programs and a library that does structural, content-preserving
-      transformations on PDF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qpdf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qpdf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qpdf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qpdf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qpdf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qpdf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qpdf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="sphinx"/> with <xref linkend="sphinx_rtd_theme"/>, and
-      <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qpdf</title>
-
-    <para>
-      Install <application>Qpdf</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  \
-      -DBUILD_STATIC_LIBS=OFF     \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/qpdf-&qpdf-version; \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ctest</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fix-qdf, qpdf, and zlib-flate
-        </seg>
-        <seg>
-          libqpdf.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/qpdf,
-          /usr/include/qpdf, and
-          /usr/share/doc/qpdf-&qpdf-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fix-qdf">
-        <term><command>fix-qdf</command></term>
-        <listitem>
-          <para>
-            is used to repair PDF files in QDF form after
-            editing
-          </para>
-          <indexterm zone="qpdf fix-qdf">
-            <primary sortas="b-fix-qdf">fix-qdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qpdf-prog">
-        <term><command>qpdf</command></term>
-        <listitem>
-          <para>
-            is used to convert one PDF file to another equivalent
-            PDF file
-          </para>
-          <indexterm zone="qpdf qpdf-prog">
-            <primary sortas="b-qpdf">qpdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zlib-flate">
-        <term><command>zlib-flate</command></term>
-        <listitem>
-          <para>
-            is a raw zlib compression program
-          </para>
-          <indexterm zone="qpdf zlib-flate">
-            <primary sortas="b-qpdf">zlib-flate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqpdf">
-        <term><filename class="libraryfile">libqpdf.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Qpdf</application> API functions
-          </para>
-          <indexterm zone="qpdf libqpdf">
-            <primary sortas="c-libqpdf">libqpdf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/qrencode.xml
===================================================================
--- general/graphlib/qrencode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qrencode-download-http "https://fukuchi.org/works/qrencode/qrencode-&qrencode-version;.tar.bz2">
-  <!ENTITY qrencode-download-ftp  " ">
-  <!ENTITY qrencode-md5sum        "de7185bcab635a34730e1b73d4efa705">
-  <!ENTITY qrencode-size          "451 KB">
-  <!ENTITY qrencode-buildsize     "5.0 MB (with documentation, add 5 MB for tests)">
-  <!ENTITY qrencode-time          "less than 0.1 SBU, add 0.1 SBU for tests">
-]>
-
-<sect1 id="qrencode" xreflabel="qrencode-&qrencode-version;">
-  <?dbhtml filename="qrencode.html"?>
-
-
-  <title>qrencode-&qrencode-version;</title>
-
-  <indexterm zone="qrencode">
-    <primary sortas="a-libqrencode">libqrencode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qrencode</title>
-
-    <para>
-      <application>Qrencode</application> is a fast and compact library
-      for encoding data in a QR Code symbol, a 2D symbology that can be
-      scanned by handheld terminals such as a mobile phone with a CCD sensor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qrencode-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qrencode-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qrencode-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qrencode-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qrencode-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qrencode-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qrencode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> for generating documentation, and
-      <xref linkend="sdl2"/> for tests
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qrencode</title>
-
-    <para>
-      Install <application>libqrencode</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="doxygen"/>, you can build
-      the documentation by issuing:
-    </para>
-
-<screen remap="doc"><userinput>doxygen</userinput></screen>
-
-    <para>
-      The tests must be run after installing the package.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the optional documentation, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm 755 /usr/share/doc/qrencode-&qrencode-version; &amp;&amp;
-mv html/* /usr/share/doc/qrencode-&qrencode-version;</userinput></screen>
-
-    <para>
-      To test the results, if you have passed the <option>--with-tests</option>
-      option to <command>configure</command>, issue:
-      <command>make check</command>.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-tests</option>: This option allows building the test
-      programs. It requires <xref linkend="sdl2"/>.
-    </para>
-
-    <para>
-      <option>--without-tools</option>: This option prevents building the
-      <command>qrencode</command> executable, removing the need for
-      <xref linkend="libpng"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          qrencode
-        </seg>
-        <seg>
-          libqrencode.so
-        </seg>
-        <seg>
-          /usr/share/doc/qrencode-&qrencode-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qrencode-prog">
-        <term><command>qrencode</command></term>
-        <listitem>
-          <para>
-            encodes input data in a QR Code and saves it as a PNG or EPS image
-          </para>
-          <indexterm zone="qrencode qrencode-prog">
-            <primary sortas="b-qrencode">qrencode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqrencode">
-        <term><filename class="libraryfile">libqrencode.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for encoding data in a QR code symbol
-          </para>
-          <indexterm zone="qrencode libqrencode">
-            <primary sortas="c-libqrencode">libqrencode.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/graphlib/sassc.xml
===================================================================
--- general/graphlib/sassc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sassc-download-http
-           "https://github.com/sass/sassc/archive/&sassc-version;/sassc-&sassc-version;.tar.gz">
-  <!ENTITY sassc-download-ftp  " ">
-  <!ENTITY sassc-md5sum        "4c3b06ce2979f2a9f0a35093e501d8bb">
-  <!ENTITY sassc-size          "28 KB">
-  <!ENTITY sassc-buildsize     "5.1 MB">
-  <!ENTITY sassc-time          "less than 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        "afda97284d75a030cabadf5b9f998a3b">
-  <!ENTITY libsass-size          "336 KB">
-  <!ENTITY libsass-buildsize     "135 MB">
-  <!ENTITY libsass-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="sassc" xreflabel="sassc-&sassc-version;">
-  <?dbhtml filename="sassc.html"?>
-
-
-  <title>sassc-&sassc-version;</title>
-
-  <indexterm zone="sassc">
-    <primary sortas="a-sassc">sassc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sassc</title>
-
-    <para>
-      SassC is a wrapper around libsass, a CSS pre-processor language.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sassc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sassc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sassc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sassc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sassc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sassc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsass-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsass-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsass-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsass-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsass-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsass-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sassc</title>
-
-    <para>
-      First, build the library:
-    </para>
-
-<screen><userinput>tar -xf ../libsass-&libsass-version;.tar.gz &amp;&amp;
-pushd libsass-&libsass-version; &amp;&amp;
-
-autoreconf -fi &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Build the command line wrapper:
-    </para>
-
-<screen><userinput>popd &amp;&amp;
-autoreconf -fi &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sassc
-        </seg>
-       <seg>
-          libsass.so
-        </seg>
-        <seg>
-          /usr/include/sass
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sassc-prog">
-        <term><command>sassc</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the libsass library
-          </para>
-          <indexterm zone="sassc sassc-prog">
-            <primary sortas="b-sassc">sassc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/graphlib/webp-pixbuf-loader.xml
===================================================================
--- general/graphlib/webp-pixbuf-loader.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 webp-pixbuf-loader-download-http "https://github.com/aruiz/webp-pixbuf-loader/archive/&webp-pixbuf-loader-version;/webp-pixbuf-loader-&webp-pixbuf-loader-version;.tar.gz">
-  <!ENTITY webp-pixbuf-loader-download-ftp  " ">
-  <!ENTITY webp-pixbuf-loader-md5sum        "e97025dc70178877dbd041776f151947">
-  <!ENTITY webp-pixbuf-loader-size          "8.8 MB">
-  <!ENTITY webp-pixbuf-loader-buildsize     "9.7 MB">
-  <!ENTITY webp-pixbuf-loader-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="webp-pixbuf-loader" xreflabel="webp-pixbuf-loader-&webp-pixbuf-loader-version;">
-  <?dbhtml filename="webp-pixbuf-loader.html"?>
-
-  <title>webp-pixbuf-loader-&webp-pixbuf-loader-version;</title>
-
-  <indexterm zone="webp-pixbuf-loader">
-    <primary sortas="a-webp-pixbuf-loader">webp-pixbuf-loader</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to webp-pixbuf-loader</title>
-
-    <para>
-      The <application>webp-pixbuf-loader</application> package contains a
-      library that allows gdk-pixbuf to load and process webp images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webp-pixbuf-loader-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webp-pixbuf-loader-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webp-pixbuf-loader-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webp-pixbuf-loader-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webp-pixbuf-loader-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webp-pixbuf-loader-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">webp-pixbuf-loader Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/> and
-      <xref linkend="libwebp"/>
-    </para>
-
-  </sect2>
-  
-  <sect2 role="installation">
-    <title>Installation of webp-pixbuf-loader</title>
-
-    <para>
-      Install <application>webp-pixbuf-loader</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <para>
-      The webp format needs to be added to the loaders cache:
-    </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</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>
-      <command>gdk-pixbuf-query-loaders --update-cache</command>: This command
-      updates the gdk-pixbuf loader cache so that it knows the webp loader has
-      been installed.
-    </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>
-          libpixbufloader-webp.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpixbufloader-webp">
-        <term><filename class="libraryfile">libpixbufloader-webp.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow gdk-pixbuf to load webp images
-          </para>
-          <indexterm zone="webp-pixbuf-loader libpixbufloader-webp">
-            <primary sortas="c-libpixbufloader-webp">libpixbufloader-webp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/graphlib/woff2.xml
===================================================================
--- general/graphlib/woff2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 woff2-download-http "https://github.com/google/woff2/archive/v&woff2-version;/woff2-&woff2-version;.tar.gz">
-  <!ENTITY woff2-download-ftp  " ">
-  <!ENTITY woff2-md5sum        "793c8844845351cb80730a74937e411b">
-  <!ENTITY woff2-size          "39 KB">
-  <!ENTITY woff2-buildsize     "1.6 MB">
-  <!ENTITY woff2-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="woff2" xreflabel="WOFF2-&woff2-version;">
-  <?dbhtml filename="woff2.html"?>
-
-
-  <title>woff2-&woff2-version;</title>
-
-  <indexterm zone="woff2">
-    <primary sortas="a-woff2">woff2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WOFF2</title>
-
-    <para>
-      <application>WOFF2</application> is a library for converting fonts from
-      the TTF format to the WOFF 2.0 format. It also allows decompression from
-      WOFF 2.0 to TTF. The WOFF 2.0 format uses the Brotli compression algorithm
-      to compress fonts suitable for downloading in CSS @font-face rules.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&woff2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&woff2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &woff2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &woff2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &woff2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &woff2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <note>
-      <para>
-        The <application>WOFF2</application> source tarball shown above
-        downloads with the correct name, woff2-&woff2-version;.tar.gz,
-        if using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain
-        v&woff2-version;.tar.gz. To obtain this package with the proper
-        filename, run:
-
-<screen><userinput>wget -c https://github.com/google/woff2/v&brotli-version;.tar.gz \
-     -O woff2-&woff2-version;.tar.gz</userinput></screen>.
-      </para>
-    </note>
--->
-    <bridgehead renderas="sect3">WOFF2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="brotli"/> and
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WOFF2</title>
-
-    <para>
-      Install <application>WOFF2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir out                           &amp;&amp;
-cd    out                           &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release .. &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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libwoff2common.so, libwoff2dec.so and libwoff2enc.so
-        </seg>
-        <seg>
-          /usr/include/woff2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libwoff2common">
-        <term><filename class="libraryfile">libwoff2common.so</filename></term>
-        <listitem>
-          <para>
-            provides shared data used by the libwoff2dec and libwoff2enc libraries
-          </para>
-          <indexterm zone="woff2 libwoff2common">
-            <primary sortas="c-libwoff2common">libwoff2common.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwoff2dec">
-        <term><filename class="libraryfile">libwoff2dec.so</filename></term>
-        <listitem>
-          <para>
-            is the WOFF2 decoder library
-          </para>
-          <indexterm zone="woff2 libwoff2dec">
-            <primary sortas="c-libwoff2dec">libwoff2dec.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwoff2enc">
-        <term><filename class="libraryfile">libwoff2enc.so</filename></term>
-        <listitem>
-          <para>
-            is the WOFF2 encoder library
-          </para>
-          <indexterm zone="woff2 libwoff2enc">
-            <primary sortas="c-libwoff2common">libwoff2enc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/prog/apache-ant.xml
===================================================================
--- general/prog/apache-ant.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,360 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "055843219f487edb3a6db554ad1355ef">
-  <!ENTITY apache-ant-size          "3.6 MB">
-  <!ENTITY apache-ant-buildsize     "195 MB">
-  <!ENTITY apache-ant-time          "0.3 SBU (excluding download time)">
-]>
-
-<sect1 id="apache-ant" xreflabel="apache-ant-&apache-ant-version;">
-  <?dbhtml filename="apache-ant.html"?>
-
-
-  <title>apache-ant-&apache-ant-version;</title>
-
-  <indexterm zone="apache-ant">
-   <primary sortas="a-Apache-Ant">Apache Ant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apache Ant</title>
-
-    <para>
-      The <application>Apache Ant</application> package is a
-      <application>Java</application>-based build tool. In theory, it is
-      like the <command>make</command> command, but without
-      <command>make</command>'s wrinkles. <application>Ant</application> is
-      different. Instead of a model that is extended with shell-based commands,
-      <application>Ant</application> is extended using
-      <application>Java</application> classes. Instead of writing shell
-      commands, the configuration files are XML-based, calling out a target
-      tree that executes various tasks. Each task is run by an object that
-      implements a particular task interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apache-ant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apache-ant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apache-ant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apache-ant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apache-ant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apache-ant-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/javax/media/jai-core/1.1.3/jai-core-1.1.3.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/com/sun/media/jai-codec/1.1.3/jai-codec-1.1.3.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="http://central.maven.org/maven2/org/tukaani/xz/1.0/xz-1.0.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="http://www.netrexx.org/files/NetRexx-3.06-GA.zip"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      A JDK (<xref linkend="java-bin"/> or <xref linkend="openjdk"/>) and
-      <xref linkend="glib2"/>
-    </para>
-
-    &build-use-internet;
-
-<!--    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="junit"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apache Ant</title>
-
-    <para>
-      Build a limited bootstrap version of <application>Apache
-      Ant</application> using the following command:
-    </para>
-
-<screen><userinput>./bootstrap.sh</userinput></screen>
-
-<!-- No longer needed in 1.10.14.
-    <para>
-      Now fix a problem when the next command tries to download a file from
-      a problem site:
-    </para>
-
-<screen><userinput>sed -e 's|ftp.software.ibm.com|anduin.linuxfromscratch.org|' \
-    -e 's|software/awdtools/netrexx|BLFS/apache-ant|'        \
-    -i fetch.xml </userinput></screen>
--->
-
-    <para>
-      Download the runtime dependencies using the
-      <filename>fetch.xml</filename> ant build script:
-    </para>
-
-<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=optional</userinput></screen>
-
-    <para>
-      Build <application>Apache Ant</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; dist</userinput></screen>
-
-    <para>
-      Install, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -rv ant-&apache-ant-version; /opt/            &amp;&amp;
-chown -R root:root /opt/ant-&apache-ant-version; &amp;&amp;
-ln -sfv ant-&apache-ant-version; /opt/ant</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-      directory, where <command>ant</command> picks them up at build time).
-    </para>
-
-    <para>
-      <command>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version;
-      dist</command>: This command builds, tests, then installs the package
-      into a temporary directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Apache Ant</title>
-
-    <sect3 id="apache-ant-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/ant/ant.conf</filename>,
-        <filename>~/.ant/ant.conf</filename>, and
-        <filename>~/.antrc</filename>
-      </para>
-
-      <indexterm zone="apache-ant apache-ant-config">
-        <primary sortas="e-AA.ant-ant.conf">~/.ant/ant.conf</primary>
-      </indexterm>
-
-      <indexterm zone="apache-ant apache-ant-config">
-        <primary sortas="e-AA.antrc">~/.antrc</primary>
-      </indexterm>
-
-      <indexterm zone="apache-ant apache-ant-config">
-        <primary sortas="e-etc-ant-ant.conf">/etc/ant/ant.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Some packages will require <command>ant</command> to be in the
-        search path and the <envar>ANT_HOME</envar> environment variable
-        defined. Satisfy these requirements by issuing, as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/ant.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/ant.sh
-
-pathappend /opt/ant/bin
-export ANT_HOME=/opt/ant
-
-# End /etc/profile.d/ant.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        The above instructions assume you have configured your system as
-        described in <xref linkend="postlfs-config-profile"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py         </seg>
-        <seg>
-          Numerous <filename>ant*.jar</filename>  and dependent libraries in
-          <envar>$ANT_HOME</envar><filename>/lib</filename>
-        </seg>
-        <seg>/opt/ant-&apache-ant-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ant">
-        <term><command>ant</command></term>
-        <listitem>
-          <para>
-            is a <application>Java</application> based build tool used by
-            many packages instead of the conventional <command>make</command>
-            program
-          </para>
-          <indexterm zone="apache-ant ant">
-            <primary sortas="b-ant">ant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="antRun">
-        <term><command>antRun</command></term>
-        <listitem>
-          <para>
-            is a support script used to start <command>ant</command>
-            build scripts in a given directory
-          </para>
-          <indexterm zone="apache-ant antRun">
-            <primary sortas="b-antRun">antRun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="antRun.pl">
-        <term><command>antRun.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that provides similar
-            functionality offered by the <command>antRun</command> script
-          </para>
-          <indexterm zone="apache-ant antRun.pl">
-            <primary sortas="b-antRun.pl">antRun.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="complete-ant-cmd.pl">
-        <term><command>complete-ant-cmd.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that allows
-            <application>Bash</application> to complete an
-            <command>ant</command> command-line
-          </para>
-          <indexterm zone="apache-ant complete-ant-cmd.pl">
-            <primary sortas="b-complete-ant-cmd.pl">complete-ant-cmd.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runant.pl">
-        <term><command>runant.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> wrapper script used to
-            invoke <command>ant</command>
-          </para>
-          <indexterm zone="apache-ant runant.pl">
-            <primary sortas="b-runant.pl">runant.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runant.py">
-        <term><command>runant.py</command></term>
-        <listitem>
-          <para>
-            is a <application>Python</application> wrapper script used to
-            invoke <command>ant</command>
-          </para>
-          <indexterm zone="apache-ant runant.py">
-            <primary sortas="b-runant.py">runant.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ant-star">
-        <term><filename class="libraryfile">ant*.jar</filename></term>
-        <listitem>
-          <para>
-            files are the <application>Apache Ant</application>
-            <application>Java</application> class libraries
-          </para>
-          <indexterm zone="apache-ant ant-star">
-            <primary sortas="c-ant-star">ant-*.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/cbindgen.xml
===================================================================
--- general/prog/cbindgen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cbindgen-download-http "https://github.com/mozilla/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
-  <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "f3ef70691bc4743b8f76ca6d27847ba4">
-  <!ENTITY cbindgen-size          "216 KB">
-  <!ENTITY cbindgen-buildsize     "121 MB (add 600 MB for tests)">
-  <!ENTITY cbindgen-time          "0.5 SBU (add 0.4 SBU for tests), both on a 4-core machine">
-]>
-
-<sect1 id="cbindgen" xreflabel="Cbindgen-&cbindgen-version;">
-  <?dbhtml filename="cbindgen.html"?>
-
-
-  <title>Cbindgen-&cbindgen-version;</title>
-
-  <indexterm zone="cbindgen">
-    <primary sortas="a-cbindgen">cbindgen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cbindgen</title>
-
-    <para>
-      <application>Cbindgen</application> can be used to generate C bindings for
-      <application>Rust</application> code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cbindgen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cbindgen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cbindgen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cbindgen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cbindgen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cbindgen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">cbindgen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="rust"/>
-    </para>
-
-    &build-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cbindgen</title>
-    <para>
-      Install <application>cbindgen</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cargo build --release</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>cargo test --release</command>.
-      Three tests in <filename>profile.rs</filename> are known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -Dm755 target/release/cbindgen /usr/bin/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          cbindgen
-        </seg>
-        <seg>
-          none
-        </seg>
-        <seg>
-          none
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cbindgen-prog">
-        <term><command>cbindgen</command></term>
-        <listitem>
-          <para>
-            generates C bindings for <application>Rust</application> code
-          </para>
-          <indexterm zone="cbindgen cbindgen-prog">
-            <primary sortas="b-cbindgen">cbindgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/clisp.xml
===================================================================
--- general/prog/clisp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,245 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 clisp-download-http "&gnu-http;/clisp/latest/clisp-&clisp-version;.tar.bz2">
-  <!ENTITY clisp-download-ftp  " ">
-  <!ENTITY clisp-md5sum        "1962b99d5e530390ec3829236d168649">
-  <!ENTITY clisp-size          "7.8 MB">
-  <!ENTITY clisp-buildsize     "163 MB (add 8 MB for tests)">
-  <!ENTITY clisp-time          "0.9 SBU (1.2 SBU with tests)">
-]>
-
-<sect1 id="clisp" xreflabel="Clisp-&clisp-version;">
-  <?dbhtml filename="clisp.html"?>
-
-
-  <title>Clisp-&clisp-version;</title>
-
-  <indexterm zone="clisp">
-    <primary sortas="a-Clisp">Clisp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Clisp</title>
-
-    <para>
-      <application>GNU Clisp</application> is a Common Lisp implementation
-      which includes an interpreter, compiler, debugger, and many extensions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clisp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clisp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clisp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clisp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clisp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clisp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Optional patch: <ulink
-          url="&patch-root;/clisp-&clisp-version;-readline7_fixes-1.patch"/>
-          (required if building against libffcall)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Clisp Dependencies</bridgehead>
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsigsegv"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/> and
-      <ulink url="https://www.gnu.org/software/libffcall/">libffcall</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Clisp</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      If you are building on a 32-bit system, work around a bug in GCC caused
-      by the latest version of binutils:
-    </para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-    i?86) export CFLAGS="${CFLAGS:--O2 -g} -falign-functions=4" ;;
-esac</userinput></screen>
-
-    <para>
-      Remove two tests, which fail for unknown reasons:
-    </para>
-
-<screen><userinput>sed -i -e '/socket/d' -e '/"streams"/d' tests/tests.lisp</userinput></screen>
-
-    <para>
-      Install <application>Clisp</application> by running the following
-      commands:
-    </para>
-
-    <para>
-      If you are building <application>clisp</application> against
-      <application>libffcall</application>, apply the patch to fix a build failure
-      with current <application>readline</application>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../clisp-&clisp-version;-readline7_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Clisp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --srcdir=../                       \
-             --prefix=/usr                      \
-             --docdir=/usr/share/doc/clisp-&clisp-version; \
-             --with-libsigsegv-prefix=/usr &amp;&amp;
-
-ulimit -s 16384 &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ulimit -s 16384</command>: this increases the maximum stack
-      size, as recommended by the <command>configure</command>.
-    </para>
-
-    <para>
-      <command>--docdir=/usr/share/doc/clisp-&clisp-version;</command>:
-      this ensures the html documentation will go into a versioned directory
-      instead of straight into <filename
-      class="directory">/usr/share/html/</filename>.
-    </para>
-
-    <para>
-      <command>--with-libsigsegv-prefix=/usr</command>: use this to tell
-      <command>configure</command> that you have installed
-      <package>libsigsegv</package> in /usr, otherwise it will not be
-      found.
-    </para>
-
-    <para>
-      <option>--with-libffcall-prefix=/usr</option>: use this to tell
-      <command>configure</command> that you have installed the optional
-      <package>libffcall</package> in /usr, otherwise like
-      <package>libsigsegv</package> it will not be found.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          clisp, clisp-link
-        </seg>
-        <seg>
-          various static libraries in
-          <filename class="directory">/usr/lib/clisp-&clisp-version;/base/</filename>
-        </seg>
-        <seg>
-          /usr/lib/clisp-&clisp-version;
-          /usr/share/doc/clisp-&clisp-version;
-          /usr/share/emacs/site-lisp;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="clisp-prog">
-        <term><command>clisp</command></term>
-        <listitem>
-          <para>
-            is an ANSI Common Lisp compiler, interpreter, and debugger
-          </para>
-          <indexterm zone="clisp clisp-prog">
-            <primary sortas="b-clisp">clisp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clisp-link">
-        <term><command>clisp-link</command></term>
-        <listitem>
-          <para>
-            is used to link an external module to clisp
-          </para>
-          <indexterm zone="clisp clisp-link">
-            <primary sortas="b-clisp-link">clisp-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,316 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
-  <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "0b31b30ea1357442a458a0dc6b1fc2e3">
-  <!ENTITY cmake-size          "10.7 MB">
-  <!ENTITY cmake-buildsize     "446 MB (add 1.2 GB for tests)">
-  <!ENTITY cmake-time          "2.8 SBU (add 3.9 SBU for tests, both using parallelism=4)">
-]>
-
-<sect1 id="cmake" xreflabel="CMake-&cmake-version;">
-  <?dbhtml filename="cmake.html"?>
-
-
-  <title>CMake-&cmake-version;</title>
-
-  <indexterm zone="cmake">
-    <primary sortas="a-CMake">CMake</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CMake</title>
-
-    <para>
-      The <application>CMake</application> package contains a modern
-      toolset used for generating Makefiles. It is a successor of the
-      auto-generated <command>configure</command> script and aims to
-      be platform- and compiler-independent. A significant user of
-      <application>CMake</application> is <application>KDE</application>
-      since version 4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cmake-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cmake-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cmake-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cmake-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cmake-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cmake-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cmake-&cmake-version;-upstream_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libuv"/>, and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <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),
-      <xref linkend="openjdk"/> (for use during tests),
-      <xref linkend="qt6"/> (for the Qt-based GUI),
-      <xref linkend="sphinx"/> (for building documents),
-      <xref linkend="subversion"/> (for testing),
-      <ulink url="https://github.com/google/cppdap/">cppdap</ulink>,
-      <ulink url="https://github.com/open-source-parsers/jsoncpp/">jsoncpp</ulink>, and
-      <ulink url="https://rhash.sourceforge.net/">rhash</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CMake</title>
-
- <!--
-    <para>
-      First, adapt the FindBoost module to use Boost-1.80.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-upstream_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>CMake</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake &amp;&amp;
-
-./bootstrap --prefix=/usr        \
-            --system-libs        \
-            --mandir=/share/man  \
-            --no-system-jsoncpp  \
-            --no-system-cppdap   \
-            --no-system-librhash \
-            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=en_US.UTF-8 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.FindBoost, is known to fail.
-        Now cmake-3.27.0.  All tests pass.
-      -->
-    </para>
-
-    <para>
-      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
-      used together:
-      <command>bin/ctest -R "problem1-test" -E "problem2-test"</command>.
-      Option <option>-N</option> can be used to display all
-      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 <option>--help</option> can be used to show all options.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... Modules/GNUInstallDirs.cmake</command>:
-      This command disables applications using cmake from attempting to
-      install files in /usr/lib64/.
-    </para>
-
-    <para>
-      <parameter>--system-libs</parameter>: This switch forces the build
-      system to link against the system installed version for all needed
-      libraries but those explicitly specified via a
-      <option>--no-system-*</option> option.
-    </para>
-
-    <para>
-      <parameter>--no-system-jsoncpp</parameter> and
-      <parameter>--no-system-cppdap</parameter>: These switches remove the
-      <application>JSON-C++</application> library from the list of system
-      libraries. A bundled version of that library is used instead.
-    </para>
-
-    <para>
-      <parameter>--no-system-librhash</parameter>: This switch removes the
-      <application>librhash</application> library from the list of system
-      libraries used. A bundled version of that library is used instead.
-    </para>
-
-    <para>
-      <option>--no-system-{curl,libarchive,libuv,nghttp2}</option>: Use
-      the corresponding option in the list for the
-      <command>bootstrap</command> if one of the recommended dependencies is
-      not installed. A bundled version of the dependency will be used instead.
-    </para>
-
-    <para>
-      <option>--qt-gui</option>: This switch enables building the
-      <application>Qt</application>-based  GUI for
-      <application>CMake</application>.
-    </para>
-
-    <para>
-      <option>--parallel=</option>: This switch enables performing the
-      <application>CMake</application> bootstrap with multiple jobs
-      at one time.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ccmake, cmake, cmake-gui (optional), cpack, and ctest
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/cmake-&cmake-major-version; and
-          /usr/share/doc/cmake-&cmake-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ccmake">
-        <term><command>ccmake</command></term>
-        <listitem>
-          <para>
-            is a curses based interactive frontend to
-            <command>cmake</command>
-          </para>
-          <indexterm zone="cmake ccmake">
-            <primary sortas="b-ccmake">ccmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cmake-prog">
-        <term><command>cmake</command></term>
-        <listitem>
-          <para>
-            is the makefile generator
-          </para>
-          <indexterm zone="cmake cmake-prog">
-            <primary sortas="b-cmake">cmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cmake-gui">
-        <term><command>cmake-gui</command></term>
-        <listitem>
-          <para>
-            (optional) is the <application>Qt</application>-based frontend to
-            <command>cmake</command>
-          </para>
-          <indexterm zone="cmake cmake-gui">
-            <primary sortas="b-cmake-gui">cmake-gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpack">
-        <term><command>cpack</command></term>
-        <listitem>
-          <para>
-            is the <application>CMake</application> packaging program
-          </para>
-          <indexterm zone="cmake cpack">
-            <primary sortas="b-cpack">cpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctest">
-        <term><command>ctest</command></term>
-        <listitem>
-          <para>
-            is a testing utility for cmake-generated build trees
-          </para>
-          <indexterm zone="cmake ctest">
-            <primary sortas="b-ctest">ctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 doxygen-download-http "https://doxygen.nl/files/doxygen-&doxygen-version;.src.tar.gz">
-  <!ENTITY doxygen-download-ftp  " ">
-  <!ENTITY doxygen-md5sum        "c7455e9961c3491479929935c5087bf6">
-  <!ENTITY doxygen-size          "8.0 MB">
-  <!ENTITY doxygen-buildsize     "253 MB (with tests)">
-  <!ENTITY doxygen-time          "2.1 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
-  <?dbhtml filename="doxygen.html"?>
-
-
-  <title>Doxygen-&doxygen-version;</title>
-
-  <indexterm zone="doxygen">
-    <primary sortas="a-Doxygen">Doxygen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Doxygen</title>
-
-    <para>
-      The <application>Doxygen</application> package contains a documentation
-      system for C++, C, Java, Objective-C, Corba IDL and to some extent PHP,
-      C# and D. It is useful for generating HTML documentation and/or an
-      off-line reference manual from a set of documented source files. There
-      is also support for generating output in RTF, PostScript, hyperlinked
-      PDF, compressed HTML, and Unix man pages. The documentation is extracted
-      directly from the sources, which makes it much easier to keep the
-      documentation consistent with the source code.
-    </para>
-
-    <para>
-      You can also configure <application>Doxygen</application> to extract
-      the code structure from undocumented source files. This is very useful
-      to quickly find your way in large source distributions. Used along with
-      <application>Graphviz</application>, you can also visualize the relations
-      between the various elements by means of include dependency graphs,
-      inheritance diagrams, and collaboration diagrams, which are all generated
-      automatically.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&doxygen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&doxygen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &doxygen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &doxygen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &doxygen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &doxygen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/doxygen-&doxygen-version;-flex_2_6_0_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">Doxygen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="git"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="graphviz"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="libxml2"/> (required for the tests),
-      <xref linkend="llvm"/> (with clang),
-      <!-- Can someone check this? With LLVM7, it fails to build. -->
-      &qt5-deps; (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>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Doxygen</title>
-
-    <note>
-      <para>
-        When untarring this package, you may see messages such as
-        <quote>Ignoring unknown extended header keyword 'LIBARCHIVE.xattr.com.apple.TextEncoding'</quote>.
-        These messages are harmless, and can be safely ignored.
-      </para>
-    </note>
-
-    <para>
-      First, fix up some python scripts:
-    </para>
-
-<screen><userinput>grep -rl '^#!.*python$' | xargs sed -i '1s/python/&amp;3/'</userinput></screen>
-
-    <para>
-      Install <application>Doxygen</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -Wno-dev .. &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make tests</command>.
-      <!--One test, 012_cite.dox, is known to fail.-->
-    </para>
-
-    <para>
-      If you wish to generate the package documentation, you must have
-      <application>Python</application>, <application>TeX Live</application>
-      (for HTML docs) and <application>Ghostscript</application> (for PDF docs)
-      installed, then issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
-
-make docs</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -vm644 ../doc/*.1 /usr/share/man/man1</userinput></screen>
-
-    <para>
-      If you have generated the package documentation, then the man pages are
-      automatically installed, and you do not need to run the last
-      <command>install ...</command> command.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dbuild_wizard=ON</option>: Use this switch if
-      <application>Qt5</application> is installed and you wish to build the GUI
-      front-end.
-    </para>
-
-    <para>
-      <option>-Dbuild_search=ON</option>: Use this switch if
-      <application>xapian</application> is installed and you wish to build
-      external search tools (<command>doxysearch.cgi</command> and
-      <command>doxyindexer)</command>.
-    </para>
-<!--
-    <para>
-      <option>-Dforce_qt4=ON</option>: Use this switch to build
-      <command>doxywizard</command> with Qt4 even if Qt5 is installed.
-    </para>-->
-
-    <para>
-      <option>-Duse_libclang=ON</option>: Use this switch if
-      <application>llvm</application> with <application>clang</application> are
-      installed, to add support for libclang parsing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Doxygen</title>
-
-    <para>
-      There is no real configuration necessary for the
-      <application>Doxygen</application> package although three additional
-      packages are required if you wish to use extended capabilities.
-      If you require formulas to create PDF
-      documentation, then you must have <xref linkend="texlive"/> installed.
-      If you require formulas to convert PostScript files to bitmaps, then
-      you must have <xref linkend="gs"/> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          doxygen and optionally,
-          doxywizard, doxyindexer and doxysearch.cgi
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/doxygen-&doxygen-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="doxygen-prog">
-        <term><command>doxygen</command></term>
-        <listitem>
-          <para>
-            is a command-line based utility used to generate template
-            configuration files and then generate documentation from these
-            templates. Use <command>doxygen --help</command> for an
-            explanation of the command-line parameters
-          </para>
-          <indexterm zone="doxygen doxygen-prog">
-            <primary sortas="b-doxygen">doxygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doxywizard">
-        <term><command>doxywizard</command></term>
-        <listitem>
-          <para>
-            is a GUI front-end for configuring and
-            running <command>doxygen</command>
-          </para>
-          <indexterm zone="doxygen doxywizard">
-            <primary sortas="b-doxywizard">doxywizard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doxyindexer">
-        <term><command>doxyindexer</command></term>
-        <listitem>
-          <para>
-            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/"/>
-          </para>
-          <indexterm zone="doxygen doxyindexer">
-            <primary sortas="b-doxyindexer">doxyindexer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doxysearch.cgi">
-        <term><command>doxysearch.cgi</command></term>
-        <listitem>
-          <para>
-            is a CGI program to search the data indexed by
-            <command>doxyindexer</command>
-          </para>
-          <indexterm zone="doxygen doxysearch.cgi">
-            <primary sortas="b-doxysearch.cgi">doxysearch.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/dtc.xml
===================================================================
--- general/prog/dtc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,293 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dtc-download-http "https://kernel.org/pub/software/utils/dtc/dtc-&dtc-version;.tar.xz">
-  <!ENTITY dtc-md5sum        "228576aceed3aa89f54283aa0f1eb820">
-  <!ENTITY dtc-size          "164 KB">
-  <!ENTITY dtc-buildsize     "14 MB">
-  <!ENTITY dtc-time          "less than 0.1 SBU">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="dtc" xreflabel="dtc-&dtc-version;">
-  <?dbhtml filename="dtc.html"?>
-
-  <title>Dtc-&dtc-version;</title>
-
-  <indexterm zone="dtc">
-    <primary sortas="a-dtc">dtc</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to Dtc</title>
-
-    <para>
-      The <application>dtc</application> package contains the Device Tree
-      Compiler for working with device tree source and binary files and also
-      libfdt, a utility library for reading and manipulating device trees
-      in the binary format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dtc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dtc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dtc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dtc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dtc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Dtc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend='libyaml'/>,
-      <xref linkend='setuptools_scm'/>,
-      <xref linkend='swig'/>, and
-      <xref linkend='texlive'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dtc</title>
-
-    <para>
-      Install <application>dtc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr        \
-            --buildtype=release  \
-            -Dpython=disabled .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>meson test -v</command>.
-      <!-- https://github.com/dgibson/dtc/commit/32174a66efa4 -->
-      Two tests named <filename>cell-overflow.dts</filename> and
-      <filename>cell-overflow-results.dts</filename> are known to fail.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-    <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Still as the &root; user, remove the useless static library:
-    </para>
-
-    <screen role="root"><userinput>rm /usr/lib/libfdt.a</userinput></screen>
-
-    <para>
-      If you have <xref linkend='texlive'/> installed, you can build the PDF
-      format of the documentation by issuing the following command:
-    </para>
-
-    <screen remap="doc"><userinput>pushd ../Documentation
-  latexmk -bibtex --pdf dtc-paper &amp;&amp;
-  latexmk -bibtex --pdf dtc-paper -c
-popd</userinput></screen>
-
-    <para>
-      To install the documentation, as the &root; user issue the following
-      command:
-    </para>
-
-    <screen role="root"><userinput>cp -R ../Documentation -T /usr/share/doc/dtc-&dtc-version;</userinput></screen>
-
-    <para>
-      If you have installed both <xref linkend='setuptools_scm'/> and
-      <xref linkend='swig'/> and you wish to install the Python 3 binding
-      of this package, build the Python 3 module:
-    </para>
- 
-    <screen role="nodump"><userinput>sed -i '/use_scm_version/a "fallback_version": "1.7.0",' ../setup.py &amp;&amp;
-&build-wheel-cmd; ..</userinput></screen>
-
-    <para>
-      As the &root; user, install the Python 3 module:
-    </para>
-
-    <screen role="nodump"><userinput>&install-wheel;</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>-Dpython=disabled</parameter>: This switch prevents
-      building the Python 3 binding with the deprecated method
-      (running <command>setup.py</command> directly).  We will build the
-      Python 3 binding with the <command>pip3 wheel</command> command
-      separately if wanted.
-    </para>
-
-    <para>
-      <command>sed ... ../setup.py</command>: This command allows building
-      the Python 3 binding from a release tarball (instead of a Git
-      checkout).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          convert-dtsv0, dtc, dtdiff, fdtdump, fdtget, fdtoverlay,
-          and fdtput
-        </seg>
-        <seg>
-          libfdt.so
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/libfdt-&dtc-version;.dist-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="convert-dtsv0">
-        <term><command>convert-dtsv0</command></term>
-        <listitem>
-          <para>
-            converts device tree v0 source to device tree v1
-          </para>
-          <indexterm zone="dtc convert-dtsv0">
-            <primary sortas="b-convert-dtsv0">convert-dtsv0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dtc-prog">
-        <term><command>dtc</command></term>
-        <listitem>
-          <para>
-            compiles device tree source (dts) to device tree binary blob
-            (dtb), or de-compiles dtb to dts
-          </para>
-          <indexterm zone="dtc dtc-prog">
-            <primary sortas="b-dtc">dtc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dtdiff">
-        <term><command>dtdiff</command></term>
-        <listitem>
-          <para>
-            compares two different device tree
-          </para>
-          <indexterm zone="dtc dtdiff">
-            <primary sortas="b-dtdiff">dtdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtdump">
-        <term><command>fdtdump</command></term>
-        <listitem>
-          <para>
-            prints a readable version of a flat device-tree file
-          </para>
-          <indexterm zone="dtc fdtdump">
-            <primary sortas="b-fdtdump">fdtdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtget">
-        <term><command>fdtget</command></term>
-        <listitem>
-          <para>
-            reads values from device-tree
-          </para>
-          <indexterm zone="dtc fdtget">
-            <primary sortas="b-fdtget">fdtget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtoverlay">
-        <term><command>fdtoverlay</command></term>
-        <listitem>
-          <para>
-            applies a number of overlays to a base device tree blob
-          </para>
-          <indexterm zone="dtc fdtoverlay">
-            <primary sortas="b-fdtoverlay">fdtoverlay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtput">
-        <term><command>fdtput</command></term>
-        <listitem>
-          <para>
-            writes a property value to a device tree
-          </para>
-          <indexterm zone="dtc fdtput">
-            <primary sortas="b-fdtput">fdtput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfdt">
-        <term><filename class="libraryfile">libfdt.so</filename></term>
-        <listitem>
-          <para>
-            is a utility library for reading and manipulating device trees
-            in the binary format
-          </para>
-          <indexterm zone="dtc libfdt">
-            <primary sortas="c-libfdt">libfdt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/prog/dummy-java.xml
===================================================================
--- general/prog/dummy-java.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>Java</title>
-  <para/>
-</sect1>
-
Index: neral/prog/gc.xml
===================================================================
--- general/prog/gc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gc-download-http "https://github.com/ivmai/bdwgc/releases/download/v&gc-version;/gc-&gc-version;.tar.gz">
-  <!ENTITY gc-download-ftp  " ">
-  <!ENTITY gc-md5sum        "fc5351214bc2e854070ee3319181a467">
-  <!ENTITY gc-size          "1.2 MB">
-  <!ENTITY gc-buildsize     "11 MB (with tests)">
-  <!ENTITY gc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="gc" xreflabel="GC-&gc-version;">
-  <?dbhtml filename="gc.html"?>
-
-
-  <title>GC-&gc-version;</title>
-
-  <indexterm zone="gc">
-    <primary sortas="a-GC">GC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GC</title>
-
-    <para>
-      The <application>GC</application> package contains the Boehm-Demers-Weiser
-      conservative garbage collector, which can be used as a garbage collecting
-      replacement for the C malloc function or C++ new operator. It allows you
-      to allocate memory basically as you normally would, without explicitly
-      deallocating memory that is no longer useful. The collector automatically
-      recycles memory when it determines that it can no longer be otherwise
-      accessed. The collector is also used by a number of programming language
-      implementations that either use C as intermediate code, want to facilitate
-      easier interoperation with C libraries, or just prefer the simple
-      collector interface. Alternatively, the garbage collector may be used as a
-      leak detector for C or C++ programs, though that is not its primary goal.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libatomic_ops"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GC</title>
-
-    <para>
-      Install <application>GC</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --enable-cplusplus \
-            --disable-static   \
-            --docdir=/usr/share/doc/gc-&gc-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 doc/gc.man /usr/share/man/man3/gc_malloc.3</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--docdir=/usr/share/doc/gc-&gc-version;</parameter>:
-      This option is used so the package will install the
-      documentation in a versioned directory.
-    </para>
-
-    <para>
-      <parameter>--enable-cplusplus</parameter>: This parameter enables the
-      building and installing of the C++ library along with the standard
-      C library.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libcord.so,
-          libgc.so,
-          libgccpp.so, and
-          libgctba.so
-        </seg>
-        <seg>
-          /usr/include/gc and
-          /usr/share/doc/gc-&gc-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcord">
-        <term><filename class="libraryfile">libcord.so</filename></term>
-        <listitem>
-          <para>
-            contains a tree-based string library
-          </para>
-          <indexterm zone="gc libcord">
-            <primary sortas="c-libcord">libcord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgc">
-        <term><filename class="libraryfile">libgc.so</filename></term>
-        <listitem>
-          <para>
-            contains a C interface to the conservative garbage collector,
-            primarily designed to replace the C malloc function
-          </para>
-          <indexterm zone="gc libgc">
-            <primary sortas="c-libgc">libgc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgccpp">
-        <term><filename class="libraryfile">libgccpp.so</filename></term>
-        <listitem>
-          <para>
-            contains a C++ interface to the conservative garbage collector
-          </para>
-          <indexterm zone="gc libgccpp">
-            <primary sortas="c-libgccpp">libgccpp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgctba">
-        <term><filename class="libraryfile">libgctba.so</filename></term>
-        <listitem>
-          <para>
-            contains a C++ interface to throw bad allocations
-          </para>
-          <indexterm zone="gc libgctba">
-            <primary sortas="c-libgctba">libgctba.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,430 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gcc-download-http  "&gnu-http;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-  <!ENTITY gcc-download-ftp   " ">
-  <!-- Update this also on the grub-uefi page -->
-  <!ENTITY gcc-md5sum         "e0e48554cc6e4f261d55ddee9ab69075">
-  <!ENTITY gcc-size           "84 MB">
-  <!ENTITY gcc-buildsize      "13 GB (2.9 GB installed with all listed languages; add 1.5 GB for tests)">
-  <!ENTITY gcc-time           "13 SBU (add 29 SBU for tests; both with parallelism=8)">
-]>
-
-<sect1 id="gcc" xreflabel="GCC-&gcc-version;">
-  <?dbhtml filename="gcc.html" ?>
-
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="gcc">
-    <primary sortas="a-gcc-5-0">GCC-&gcc-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GCC</title>
-
-    <para>
-      The <application>GCC</application> package contains the GNU Compiler
-      Collection. This page describes the installation of compilers for the
-      following languages: C, C++, Fortran, Objective C, Objective C++, Go, and Modula2.
-      Since C and C++ are installed in LFS, this page is either for upgrading
-      C and C++, or for installing additional compilers.
-    </para>
-
-    <note>
-      <para>
-        Additional languages, among which D and Ada, are available in the
-        collection. D and Ada have a binary bootstrap requirement for the first
-        installation, so their installation is not described here. To install
-        them, you can proceed along the same lines as below after installing
-        the corresponding compiler from a binary package, adding
-        <option>ada</option> or <option>d</option> to the
-        <parameter>--enable-languages</parameter> line.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <caution>
-      <para>
-        If you are upgrading <application>GCC</application> from any other
-        version prior to &gcc-version;, then you must be careful compiling 3rd
-        party kernel modules. You should ensure that the kernel and all its
-        native modules are also compiled using the same version of
-        <application>GCC</application> that you use to build the 3rd party module.
-        This issue does not affect native kernel (and kernel modules) updates,
-        as the instructions below are a complete reinstallation of
-        <application>GCC</application>. If you have existing 3rd party modules
-        installed, ensure they are recompiled using the updated version of
-        <application>GCC</application>.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch when adding Go to the desired language list:
-          <ulink url="&patch-root;/gcc-&gcc-version;-fix_go_version-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/>,
-      <xref linkend="valgrind"/> (for tests), and
-      <ulink url="https://repo.or.cz/isl.git">ISL</ulink> (to enable graphite optimization)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <important>
-      <para>
-        Even if you specify only languages other than C and C++ to the
-        <command>./configure</command> command below, the
-        installation process will overwrite your existing
-        <application>GCC</application> C and C++ compilers and libraries.
-        Running the full suite of tests is recommended.
-      </para>
-
-      <para>
-        Do not continue with the <command>make install</command> command
-        until you are confident the build was successful. You can compare your
-        test results with those found at <ulink
-        url="https://gcc.gnu.org/ml/gcc-testresults/"/>. You may also want to
-        refer to the information found in the <application>GCC</application>
-        section of Chapter 8 in the LFS book (<ulink
-        url="&lfs-root;/chapter08/gcc.html"/>).
-      </para>
-    </important>
-
-    <para>
-      The instructions below are intentionally performing a
-      <quote>bootstrap</quote> process. Bootstrapping is needed for robustness
-      and is highly recommended when upgrading the compilers version. To disable
-      bootstrap anyway, add <parameter>--disable-bootstrap</parameter> to the
-      <command>./configure</command> options below.
-    </para>
-
-    <para>
-      Install <application>GCC</application> by running the following commands:
-    </para>
-
-<screen><userinput>case $(uname -m) in
-  x86_64)
-    sed -i.orig '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-  ;;
-esac
-
-mkdir build               &amp;&amp;
-cd    build               &amp;&amp;
-
-../configure              \
-    --prefix=/usr         \
-    --disable-multilib    \
-    --with-system-zlib    \
-    --enable-default-pie  \
-    --enable-default-ssp  \
-    --disable-fixincludes \
-    --enable-languages=c,c++,fortran,go,objc,obj-c++,m2 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed additional packages such as
-      <application>valgrind</application> and <application>gdb</application>,
-      the <application>gcc</application> part of the test suite will run more
-      tests than in LFS. Some of those will report FAIL and others XPASS
-      (pass when expected to FAIL). As of gcc-13.2.0, about 65 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 a little over 80
-      unexpected failures out of over 546,000 tests. To run the tests, issue:
-    </para>
-
-<screen><userinput>ulimit -s 32768 &amp;&amp;
-make -k check</userinput></screen>
-<!-- The command above may error out, so using && may prevent the summary
-to be run. -->
-
-    <para>
-      The tests are very long, and the results may be hard to find in the
-      logs, specially if you use parallel jobs with make. You can get a summary
-      of the tests with:
-    </para>
-
-<screen><userinput>../contrib/test_summary</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-mkdir -pv /usr/share/gdb/auto-load/usr/lib              &amp;&amp;
-mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-
-chown -v -R root:root \
-    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mkdir build; cd build</command>: The
-      <application>GCC</application> documentation recommends
-      building the package in a dedicated build directory.
-    </para>
-
-    <para>
-      <parameter>--disable-multilib</parameter>: This parameter ensures
-      that files are created for the specific architecture of your computer.
-    </para>
-
-    <para>
-      <parameter>--with-system-zlib</parameter>: Uses the system
-      <application>zlib</application> instead of the bundled one.
-      <application>zlib</application> is used for compressing
-      and decompressing <application>GCC</application>'s intermediate
-      language in LTO (Link Time Optimization) object files.
-    </para>
-
-    <para>
-      <parameter>--enable-default-pie</parameter>: Makes the
-      <option>-fpie</option> option the default when compiling programs.
-      Together with the <xref linkend="gASLR"/> feature enabled in the kernel,
-      this defeats some kind of attacks based on known memory layouts.
-    </para>
-
-    <para>
-      <parameter>--enable-default-ssp</parameter>: Makes the
-      <option>-fstack-protector-strong</option> option the default when
-      compiling programs. <xref linkend="gSSP"/> is a technique preventing
-      alteration of the program flow by corrupting the parameter stack.
-    </para>
-
-    <para>
-      <parameter>--enable-languages=c,c++,fortran,go,objc,obj-c++,m2</parameter>:
-      This command identifies which languages to build. You may modify
-      this command to remove undesired languages.  GCC also supports Ada
-      and D, but building GCC with Ada (or D) support needs an existing
-      Ada (or D) compiler.  So they are not enabled here.
-    </para>
-
-    <para>
-      <command>ulimit -s 32768</command>: This command prevents several
-      tests from running out of stack space.
-    </para>
-
-    <para>
-      <command>make -k check</command>: This command runs the test suite
-      without stopping if any errors are encountered.
-    </para>
-
-    <para>
-      <command>../contrib/test_summary</command>: This command will produce
-      a summary of the test suite results. You can append <command>| grep
-      -A7 Summ</command> to the command to produce an even more condensed
-      version of the summary. You may also wish to redirect the output
-      to a file for review and comparison later on.
-    </para>
-
-    <para>
-      <command>mv -v /usr/lib/*gdb.py ...</command>: The installation
-      stage puts some files used by <application>gdb</application> under the
-      <filename class="directory">/usr/lib</filename> directory. This generates
-      spurious error messages when performing <command>ldconfig</command>. This
-      command moves the files to another location.
-    </para>
-
-    <para>
-      <command>chown -v -R root:root /usr/lib/gcc/*linux-gnu/...</command>:
-      If the package is built by a user other than root, the ownership of the
-      installed <filename class="directory">include</filename> directory (and
-      its content) will be incorrect. This command changes the ownership to the
-      <systemitem class="username">root</systemitem> user and group.
-    </para>
-
-    <para>
-      <option>--enable-host-shared --enable-languages=jit</option>:
-      Build <systemitem class="library">libgccjit</systemitem>, a library
-      for embedding GCC inside programs and libraries for generating machine
-      code.  Despite <quote>JIT</quote> (just-in-time) in the name, the
-      library can be used for AOT (ahead-of-time) compilation as well.
-      <option>--enable-host-shared</option> is needed for building
-      <systemitem class="library">libgccjit</systemitem>, but it
-      significantly slows down GCC.  So
-      <systemitem class="library">libgccjit</systemitem> should be built and
-      installed separately, not as a part of the <quote>main</quote> GCC
-      installation.  If you need this library, configure GCC with
-      these two options and install the library by running
-      <!-- from Arch, not tested -->
-      <command>make -C gcc jit.install-common jit.install-info</command>
-      as the &root; user.  This library is not used by any BLFS package,
-      nor tested by the BLFS developers.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>
-      Some program and library names and descriptions are not listed here,
-      but can be found at
-      <ulink url="&lfs-root;/chapter08/gcc.html#contents-gcc">LFS section
-      for GCC</ulink> as they were
-      initially installed during the building of LFS.
-    </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gccgo, gfortran, gm2, go, and gofmt, hard-linked to architecture
-          specific names
-        </seg>
-        <seg>
-          libgfortran.{so,a}, libgm2.{so,a}
-          libgo.{so,a}, libgobegin.a, libgolibbegin.a,
-          libobjc.{so,a}, and numerous other run-time libraries and executables
-        </seg>
-        <seg>
-          /usr/lib/go
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gccgo">
-        <term><command>gccgo</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the <application>Go</application>
-            language
-          </para>
-          <indexterm zone="gcc gccgo">
-            <primary sortas="b-gccgo">gccgo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gm2">
-        <term><command>gm2</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the
-            <application>Modula-2</application> language
-          </para>
-          <indexterm zone="gcc gm2">
-            <primary sortas="b-gm2">gm2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="go">
-        <term><command>go</command></term>
-        <listitem>
-          <para>
-            is a tool for managing <application>Go</application> source code
-          </para>
-          <indexterm zone="gcc go">
-            <primary sortas="b-go">go</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gofmt">
-        <term><command>gofmt</command></term>
-        <listitem>
-          <para>
-            is a tool for formatting <application>Go</application> source code
-          </para>
-          <indexterm zone="gcc gofmt">
-            <primary sortas="b-gofmt">gofmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="gdc">
-        <term><command>gdc</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the <application>D</application>
-            language
-          </para>
-          <indexterm zone="gcc gdc">
-            <primary sortas="b-gdc">gdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="gfortran">
-        <term><command>gfortran</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the <application>Fortran</application>
-            language
-          </para>
-          <indexterm zone="gcc gfortran">
-            <primary sortas="b-gfortran">gfortran</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,369 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gdb-download-http "&gnu-http;/gdb/gdb-&gdb-version;.tar.xz">
-  <!ENTITY gdb-download-ftp  " ">
-  <!ENTITY gdb-md5sum        "4452f575d09f94276cb0a1e95ecff856">
-  <!ENTITY gdb-size          "23 MB">
-  <!ENTITY gdb-buildsize     "964 MB (add 805 MB for docs; add 654 MB for tests)">
-  <!ENTITY gdb-time          "1.8 SBU (add 0.4 SBU for docs; add 15 SBU for tests; all using parallelism=4)">
-]>
-
-<sect1 id="gdb" xreflabel="GDB-&gdb-version;">
-  <?dbhtml filename="gdb.html"?>
-
-
-  <title>GDB-&gdb-version;</title>
-
-  <indexterm zone="gdb">
-    <primary sortas="a-GDB">GDB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GDB</title>
-
-    <para>
-      <application>GDB</application>, the GNU Project debugger, allows you
-      to see what is going on <quote>inside</quote> another program while it
-      executes -- or what another program was doing at the moment it crashed.
-      Note that <application>GDB</application> is most effective when tracing
-      programs and libraries that were built with debugging symbols and not
-      stripped.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gdb-&gdb-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">GDB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended Runtime Dependency</bridgehead>
-    <para role="recommended">
-      <xref linkend="six"/> (Python 3 module, required at run-time to
-      use GDB scripts from various LFS/BLFS packages with Python 3
-      installed in LFS)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="gcc"/> (ada, gfortran, and go are used for tests),
-      <xref linkend="guile"/>,
-      <xref linkend="rust"/> (used for some tests),
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://sourceware.org/systemtap/">SystemTap</ulink>
-      (run-time, used for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GDB</title>
-    <!--
-    <para>
-      First, apply a patch that fixes problems when debugging programs compiled
-      with <xref linkend="rust" role="nodep"/>:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gdb-&gdb-version;-upstream_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>GDB</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --prefix=/usr          \
-             --with-system-readline \
-             --with-python=/usr/bin/python3 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Optionally, to build the API documentation using
-      <xref linkend="doxygen"/>, run:
-    </para>
-
-<screen remap="doc"><userinput>make -C gdb/doc doxy</userinput></screen>
-
-    <para>
-      To test the results, issue:
-    </para>
-
-<screen remap="test"><userinput>pushd gdb/testsuite &amp;&amp;
-make  site.exp      &amp;&amp;
-echo  "set gdb_test_timeout 120" &gt;&gt; site.exp &amp;&amp;
-runtest
-popd</userinput></screen>
-
-    <para>
-      See <emphasis>gdb/testsuite/README</emphasis> and <ulink
-      url="https://sourceware.org/gdb/wiki/TestingGDB">TestingGDB</ulink>.
-      There are many problems with the test suite:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          Clean directories are needed if re-running the tests.  For that
-          reason, make a copy of the compiled source code
-          directory before the tests in case you need to run the tests again.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Results depend on installed compilers.
-        </para>
-      </listitem>
-<!-- I did not see this
-      <listitem>
-        <para>
-          There are a large number of timeouts (there is a variable
-          that can be set to increase time for timeout, but
-          changing it will result in a different number of tests being
-          run).
-        </para>
-      </listitem>
-or this
-      <listitem>
-        <para>
-          There are failures associated with system readline 6.x.
-        </para>
-      </listitem>
--->
-<!--
-      <listitem>
-        <para>
-          A few tests assume that the header file
-          <filename>&lt;sys/sdt.h&gt;</filename>, part of <ulink
-          url="https://sourceware.org/systemtap/">SystemTap</ulink>, is
-          present.
-        </para>
-      </listitem>
--->
-<!-- I don't know if this is true or not.  I tested on a Haswell.
-      <listitem>
-        <para>
-          If the test suite is run on a Skylake-based Intel CPU or newer,
-          many tests will fail due to the removal of the deprecated/problematic
-          libmpx library in GCC.
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-<!-- for gdb-11.1, gcc-11.2 - pierre
-          A test run of the test suite had about 1700 unexpected failures
-          (out of over 80000 tests). Over 1370 of the failures were related
-          to FORTRAN tests. -->
-<!-- for gdb-12.1, gcc-11.3.0 - bdubbs
-          A test run of the test suite had a little over 200 unexpected failures
-          out of over 94000 tests.-->
-<!-- for gdb-13.0, gcc-12.2.0 - bdubbs
-          A test run of the test suite had 33 unexpected failures
-          out of over 106000 tests. -->
-<!-- for gdb-13.2, gcc-13.1.0 - pierre
-          A test run of the test suite had 183 unexpected failures
-          out of over 105000 tests. -->
-<!-- for gdb-14.1, gcc 13.2.0 - rahul -->
-          A test run of the test suite had 51 unexpected failures
-          out of the over 106000 tests.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          On some systems, the gdb.tui test suite will fail if running over
-          SSH.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          On some AMD-based systems, over 200 additional tests
-          may fail due to a difference in the threading implementation
-          on those CPUs.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C gdb install &amp;&amp;
-make -C gdbserver install</userinput></screen>
-
-    <para>
-      If you have built the API documentation, it is now in gdb/doc/doxy.
-      You can install it (as the <systemitem class="username">root</systemitem>
-      user):
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
-rm -rf gdb/doc/doxy/xml &amp;&amp;
-cp -Rv gdb/doc/doxy /usr/share/doc/gdb-&gdb-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-system-readline</parameter>: This switch forces
-      <application>GDB</application> to use the copy of
-      <application>Readline</application> installed in LFS.
-    </para>
-
-    <para>
-      <parameter>--with-python=/usr/bin/python3</parameter>: This switch
-      forces <application>GDB</application> to use Python 3.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcore, gdb, gdbserver, and gdb-add-index
-        </seg>
-        <seg>
-          libinproctrace.so
-        </seg>
-        <seg>
-          /usr/{include,share}/gdb and /usr/share/doc/gdb-&gdb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcore">
-        <term><command>gcore</command></term>
-        <listitem>
-          <para>
-            generates a core dump of a running program
-          </para>
-          <indexterm zone="gdb gcore">
-            <primary sortas="b-gcore">gcore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdb-prog">
-        <term><command>gdb</command></term>
-        <listitem>
-          <para>
-            is the GNU Debugger
-          </para>
-          <indexterm zone="gdb gdb-prog">
-            <primary sortas="b-gdb-prog">gdb-prog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbserver">
-        <term><command>gdbserver</command></term>
-        <listitem>
-          <para>
-            is a remote server for the GNU debugger (it allows programs
-            to be debugged from a different machine)
-          </para>
-          <indexterm zone="gdb gdbserver">
-            <primary sortas="b-gdbserver">gdbserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdb-add-index">
-        <term><command>gdb-add-index</command></term>
-        <listitem>
-          <para>
-            Allows adding index files to ELF binaries. This speeds up
-            <command>gdb</command> start on large programs.
-          </para>
-          <indexterm zone="gdb gdb-add-index">
-            <primary sortas="b-gdb-add-index">gdb-add-index</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libinproctrace">
-        <term><filename class="libraryfile">libinproctrace.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for the in-process tracing agent. The agent
-            allows for installing fast tracepoints, listing static tracepoint
-            markers, probing static tracepoints markers, and starting trace
-            monitoring.
-          </para>
-          <indexterm zone="gdb libinproctrace">
-            <primary sortas="c-libinproctrace">libinproctrace.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,486 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 git-root "&kernel-dl;/software/scm/git" >
-
-  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
-  <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "7e4eb7c45e9ba7c90fa51deeea49732f">
-
-  <!ENTITY git-size          "7.1 MB">
-  <!-- but people keep forgetting that an install not only needs the net build
-       space, it also needs the install space (or DESTDIR) -->
-  <!ENTITY git-buildsize     "307 MB (with downloaded documentation; add 18 MB for building docs)">
-  <!-- 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.3 SBU (with parallelism=4; add 0.4 SBU for building doc, and up to 5 SBU (disk speed dependent) for tests)">
-]>
-
-<sect1 id="git" xreflabel="git-&git-version;">
-  <?dbhtml filename="git.html"?>
-
-
-  <title>Git-&git-version;</title>
-
-  <indexterm zone="git">
-    <primary sortas="a-Git">Git</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Git</title>
-
-    <para>
-      <application>Git</application> is a free and open source, distributed
-      version control system designed to handle everything from small to very
-      large projects with speed and efficiency. Every
-      <application>Git</application> clone is a full-fledged repository with
-      complete history and full revision tracking capabilities, not dependent
-      on network access or a central server. Branching and merging are fast and
-      easy to do. <application>Git</application> is used for version control of
-      files, much like tools such as <xref linkend="mercurial"/>,
-      <application>Bazaar</application>, <xref linkend="subversion"/>,
-      <ulink url="https://www.nongnu.org/cvs/">CVS</ulink>,
-      <application>Perforce</application>, and
-      <application>Team Foundation Server</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&git-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&git-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &git-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &git-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &git-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &git-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <ulink url="&git-root;/git-manpages-&git-version;.tar.xz">
-          &git-root;/git-manpages-&git-version;.tar.xz</ulink>
-          (not needed if you've installed <xref linkend="asciidoc"/>,
-          <xref linkend="xmlto"/>, and prefer to rebuild them)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <ulink url="&git-root;/git-htmldocs-&git-version;.tar.xz">
-          &git-root;/git-htmldocs-&git-version;.tar.xz</ulink>
-          and other docs (not needed if you've installed
-          <xref linkend="asciidoc"/> and want to rebuild the documentation).
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Git Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/> (needed to use <application>Git</application> over
-      http, https, ftp or ftps)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/> (for some tests),
-      <xref role='runtime' linkend='fcron'/> (runtime, for scheduling
-      <command>git maintenance</command> jobs),
-      <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"/>,
-      <xref role="runtime" linkend="subversion"/> with Perl bindings
-         (runtime, 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>),
-      <phrase revision='sysv'>and </phrase><xref
-      linkend='perl-io-socket-ssl'/> (runtime, for
-      <command>git send-email</command> to connect to a SMTP server with
-      SSL encryption)<phrase revision='systemd'>, and
-      <xref role='runtime' linkend='systemd'/>
-      (runtime, rebuilt with <xref role='nodep' linkend='linux-pam'/>, for
-      scheduling <command>git maintenance</command> jobs)</phrase>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to create the man pages, html docs
-    and other docs)</bridgehead>
-    <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
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink>
-      (for the PDF version of the user manual), and
-      <ulink url="https://docbook2x.sourceforge.net/">docbook2x</ulink> to
-      create info pages
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Git</title>
-
-    <para>
-      Install <application>Git</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-gitconfig=/etc/gitconfig \
-            --with-python=python3 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      You can build the man pages and/or html docs, or
-      use downloaded ones. If you choose to build them, use the next two
-      instructions.
-    </para>
-
-    <para>
-      If you have installed <xref linkend="asciidoc"/> you can
-      create the html version of the man pages and other docs:
-    </para>
-
-<screen remap="doc"><userinput>make html</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="asciidoc"/>  and
-      <xref linkend="xmlto"/> you can create the man pages:
-    </para>
-
-<screen remap="doc"><userinput>make man</userinput></screen>
-
-    <para>
-      The test suite can be run in parallel mode. To run the test suite, issue:
-      <command>make test -k |&amp; tee test.log</command>.  If some test
-      fails, the list of failed tests can be shown via
-      <command>grep '^not ok' test.log | grep -v TODO</command>.
-      <!-- It looks like I'd misdiagnosed the issue.  -->
-      <!--phrase revision='systemd'>One test named <literal>start and stop
-      Linux/systemd maintenance</literal> is known to fail if the current
-      login session is not started after rebuilding
-      <xref linkend='systemd'/> with <xref linkend='linux-pam'/>
-      support, or it's a SSH session but the SSH server is not configured
-      with <option>UsePAM</option> enabled.</phrase-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make perllibdir=/usr/lib/perl5/&lfs-perl-version;/site_perl install</userinput></screen>
-
-<!-- ==== Method 1 for docs ====== -->
-    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
-
-    <para>
-      Install the man pages as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make install-man</userinput></screen>
-
-    <para>
-      Install the html docs as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
-
-<!-- ==== Method 2 for docs ====== -->
-    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
-
-    <para>
-      If you downloaded the man pages untar them as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>tar -xf ../git-manpages-&git-version;.tar.xz \
-    -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput></screen>
-
-    <para>
-      If you downloaded the html docs untar them as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -vp   /usr/share/doc/git-&git-version; &amp;&amp;
-tar   -xf   ../git-htmldocs-&git-version;.tar.xz \
-      -C    /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &amp;&amp;
-
-find        /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \; &amp;&amp;
-find        /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
-
-<!-- ==== Reorganize docs ====== -->
-    <bridgehead renderas="sect3">Reorganize text and html in the html-docs (both methods)</bridgehead>
-
-    <para>
-      For both methods, the html-docs include a lot of plain text files.
-      Reorganize the files as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -vp /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
-
-mkdir -vp /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
-
-mkdir -vp /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/howto/{*.,}html               &amp;&amp;
-
-sed -i '/^&lt;a href=/s|howto/|&amp;html/|' /usr/share/doc/git-&git-version;/howto-index.html &amp;&amp;
-sed -i '/^\* link:/s|howto/|&amp;html/|' /usr/share/doc/git-&git-version;/howto-index.txt</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gitconfig=/etc/gitconfig</parameter>: This sets
-      <filename>/etc/gitconfig</filename> as the file that stores
-      the default, system wide, <application>Git</application>
-      settings.
-    </para>
-
-    <para>
-      <parameter>--with-python=python3</parameter>: Use this switch to use
-      <application>Python 3</application>, instead of the EOL'ed
-      <application>Python 2</application>. Python is used for the
-      <command>git p4</command> interface to Perforce repositories,
-      and also used in some tests.
-    </para>
-
-    <para>
-      <option>--with-libpcre2</option>: Use this switch if
-      <application>PCRE2</application> is installed.
-    </para>
-
-    <para>
-      <command>tar -xf ../git-manpages-&git-version;.tar.gz -C
-      /usr/share/man --no-same-owner</command>: This untars
-      <filename>git-manpages-&git-version;.tar.gz</filename>. The
-      <option>-C</option> option makes tar change directory to
-      <filename class="directory">/usr/share/man</filename> before
-      it starts to decompress the docs. The <option>--no-same-owner</option>
-      option stops tar from preserving the user and group details of the
-      files. This is useful as that user or group may not exist on your
-      system; this could (potentially) be a security risk.
-    </para>
-
-    <para>
-      <command>mv /usr/share/doc/git-&git-version; ...</command>: These
-      commands move some of the files into subfolders to make it easier to sort
-      through the docs and find what you're looking for.
-    </para>
-
-    <para>
-      <command>find ... chmod ...</command>: These commands correct the
-      permissions in the shipped documentation tar file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Git</title>
-
-    <sect3 id="git-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.gitconfig</filename> and
-        <filename>/etc/gitconfig</filename>
-      </para>
-
-      <indexterm zone="git git-config">
-        <primary sortas="e-AA.gitconfig">~/.gitconfig</primary>
-      </indexterm>
-
-      <indexterm zone="git git-config">
-        <primary sortas="e-etc-gitconfig">/etc/gitconfig</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          git, git-receive-pack, git-upload-archive, and
-          git-upload-pack (hardlinked to each
-          other), git-cvsserver, git-shell, gitk, and scalar
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/libexec/git-core,
-          /usr/lib/perl5/&lfs-perl-version;/site_perl/Git, and
-          /usr/share/{doc/git-&git-version;,git-core,git-gui,gitk,gitweb}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="git-prog">
-        <term><command>git</command></term>
-        <listitem>
-          <para>
-            is the stupid content tracker
-          </para>
-          <indexterm zone="git git-prog">
-            <primary sortas="b-git">git</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-cvsserver">
-        <term><command>git-cvsserver</command></term>
-        <listitem>
-          <para>
-            is a CVS server emulator for <application>Git</application>
-          </para>
-          <indexterm zone="git git-cvsserver">
-            <primary sortas="b-git-cvsserver">git-cvsserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gitk">
-        <term><command>gitk</command></term>
-        <listitem>
-          <para>
-            is a graphical <application>Git</application> repository browser
-            (needs <xref linkend="tk"/>)
-          </para>
-          <indexterm zone="git gitk">
-            <primary sortas="b-gitk">gitk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-receive-pack">
-        <term><command>git-receive-pack</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>git send-pack</command> and updates the
-            repository with the information fed from the remote end
-          </para>
-          <indexterm zone="git git-receive-pack">
-            <primary sortas="b-git-receive-pack">git-receive-pack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-shell">
-        <term><command>git-shell</command></term>
-        <listitem>
-          <para>
-            is a login shell for SSH accounts to provide restricted Git
-            access
-          </para>
-          <indexterm zone="git git-shell">
-            <primary sortas="b-git-shell">git-shell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-upload-archive">
-        <term><command>git-upload-archive</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>git archive --remote</command> and sends
-            a generated archive to the other end over the git protocol
-          </para>
-          <indexterm zone="git git-upload-archive">
-            <primary sortas="b-git-upload-archive">git-upload-archive</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-upload-pack">
-        <term><command>git-upload-pack</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>git fetch-pack</command>, it discovers
-            what objects the other side is missing, and sends them after
-            packing
-          </para>
-          <indexterm zone="git git-upload-pack">
-            <primary sortas="b-git-upload-pack">git-upload-pack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scalar">
-        <term><command>scalar</command></term>
-        <listitem>
-          <para>
-            is a repository management tool that optimizes Git for use in
-            large repositories
-          </para>
-          <indexterm zone="git scalar">
-            <primary sortas="b-scalar">scalar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/gitserver.xml
===================================================================
--- general/prog/gitserver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,392 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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"?>
-
-
-  <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. Set Up 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 unusable 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, set up 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 committing can be
-          distinguished 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 existence 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: neral/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,245 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 guile-download-http "&gnu-http;/guile/guile-&guile-version;.tar.xz">
-  <!ENTITY guile-download-ftp  " ">
-  <!ENTITY guile-md5sum        "258983e0156c2bc66539dcbcb96f2bd2">
-  <!ENTITY guile-size          "5.5 MB">
-  <!ENTITY guile-buildsize     "221 MB (add 4 MB for tests)">
-  <!ENTITY guile-time          "5.9 SBU (Using parallelism=4; add 0.3 SBU for tests)">
-]>
-
-<sect1 id="guile" xreflabel="Guile-&guile-version;">
-<?dbhtml filename="guile.html"?>
-
-
-  <title>Guile-&guile-version;</title>
-
-  <indexterm zone="guile">
-    <primary sortas="a-Guile">Guile</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Guile</title>
-
-    <para>
-      The <application>Guile</application> package contains the GNU Project's
-      extension language library. <application>Guile</application> also
-      contains a stand alone <application>Scheme</application> interpreter.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&guile-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&guile-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &guile-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &guile-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &guile-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &guile-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Guile Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gc"/> and
-      <xref linkend="libunistring"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/> and
-      <xref linkend="gdb"/> (run-time only dependencies).
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Guile</title>
-
-    <para>
-      Install <application>Guile</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/guile-&guile-version; &amp;&amp;
-make      &amp;&amp;
-make html &amp;&amp;
-
-makeinfo --plaintext -o doc/r5rs/r5rs.txt doc/r5rs/r5rs.texi &amp;&amp;
-makeinfo --plaintext -o doc/ref/guile.txt doc/ref/guile.texi</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>./check-guile</command>.
-      On an i686 system, as many as 10 tests will fail in the
-      <filename>numbers.test</filename> test suite due to minor floating-point
-      rounding errors.
-    </para>
-    <!-- 10 of the numbers tests fail on i686. This should probably be looked
-         into at a later point in time. -renodr -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install      &amp;&amp;
-make install-html &amp;&amp;
-
-mkdir -p                       /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-mv /usr/lib/libguile-*-gdb.scm /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-mv /usr/share/doc/guile-&guile-version;/{guile.html,ref} &amp;&amp;
-mv /usr/share/doc/guile-&guile-version;/r5rs{.html,}     &amp;&amp;
-
-find examples -name "Makefile*" -delete         &amp;&amp;
-cp -vR examples   /usr/share/doc/guile-&guile-version;   &amp;&amp;
-
-for DIRNAME in r5rs ref; do
-  install -v -m644  doc/${DIRNAME}/*.txt \
-                    /usr/share/doc/guile-&guile-version;/${DIRNAME}
-done &amp;&amp;
-unset DIRNAME</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          guild, guile, guile-config, guile-snarf and guile-tools
-        </seg>
-        <seg>
-          libguile-3.0.so and guile-readline.so
-        </seg>
-        <seg>
-          /usr/include/guile,
-          /usr/lib/guile,
-          /usr/share/doc/guile-&guile-version; and
-          /usr/share/guile
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="guile-prog">
-        <term><command>guile</command></term>
-        <listitem>
-          <para>
-            is a stand-alone Scheme interpreter for
-            <application>Guile</application>
-          </para>
-          <indexterm zone="guile guile-prog">
-            <primary sortas="b-guile">guile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guile-config">
-        <term><command>guile-config</command></term>
-        <listitem>
-          <para>
-            is a <application>Guile</application> script which provides the
-            information necessary to link your programs against the
-            <application>Guile</application> library, in much the same way
-            PkgConfig does
-          </para>
-          <indexterm zone="guile guile-config">
-            <primary sortas="b-guile-config">guile-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guile-snarf">
-        <term><command>guile-snarf</command></term>
-        <listitem>
-          <para>
-            is a script to parse declarations in your
-            <application>C</application> code for
-            <application>Scheme</application> visible
-            <application>C</application> functions
-          </para>
-          <indexterm zone="guile guile-snarf">
-            <primary sortas="b-guile-snarf">guile-snarf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guild">
-        <term><command>guild</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="guile guild">
-            <primary sortas="b-guild">guild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guile-tools">
-        <term><command>guile-tools</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>guild</command>
-          </para>
-          <indexterm zone="guile guile-tools">
-            <primary sortas="b-guile-tools">guile-tools</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- Maintainer: before making the tarball, remove all .debuginfo files from
-    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-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "a08524784f41d0ccb80c1484b99bde3a">
-  <!ENTITY openjdk-bin-size-x86        "161 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "314 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;+&openjdk-build;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "ff5cab3d4e6c571996911a6cd47023eb">
-  <!ENTITY openjdk-bin-size-x64        "169 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "343 MB">
-]>
-
-<sect1 id="java" xreflabel="Java-&openjdk-version;">
-  <?dbhtml filename="java.html"?>
-
-
-  <title>Java-&openjdk-version;</title>
-
-  <indexterm zone="java">
-    <primary sortas="a-java">JDK Binary</primary>
-  </indexterm>
-
-
-  <sect2>
-    <title>About Java</title>
-    <para>
-      Java is different from most of the packages in LFS and BLFS. It
-      is a programming language that works with files of bytecode to obtain
-      instructions and executes them in a Java Virtual Machine (JVM). An
-      introductory java program looks like:
-    </para>
-
-<screen><literal>public class HelloWorld
-{
-    public static void main(String[] args)
-    {
-        System.out.println("Hello, World");
-    }
-}</literal></screen>
-
-    <para>
-      This program is saved as <filename>HelloWorld.java</filename>. The
-      file name, <emphasis>HelloWorld</emphasis>, must match the class name.
-      It is then converted into byte code with
-      <command>javac HelloWorld.java</command>. The output file is
-      <filename>HelloWorld.class</filename>.  The program is executed with
-      <command>java HelloWorld</command>.  This creates a JVM and runs the
-      code.  The 'class' extension must not be specified.
-    </para>
-
-    <para>
-      Several class files can be combined into one file with the
-      <command>jar</command> command. This is similar to the standard
-      <command>tar</command> command. For instance, the command
-      <command>jar cf myjar.jar *.class</command> will combine all class files
-      in a directory into one jar file. These act as library files.
-    </para>
-
-    <para>
-      The JVM can search for and use classes in jar files automatically.
-      It uses the <envar>CLASSPATH</envar> environment variable to search for
-      jar files. This is a standard list of colon-separated directory names
-      similar to the <envar>PATH</envar> environment variable.
-    </para>
-
-  </sect2>
-
-  <sect2 id="java-bin" xreflabel="Java Binary" role="package">
-    <title>Binary JDK Information</title>
-
-    <para>
-      Creating a JVM from source requires a set of circular dependencies.
-      The first thing that's needed is a set of programs called a Java
-      Development Kit (JDK).  This set of programs includes
-      <command>java</command>, <command>javac</command>,
-      <command>jar</command>, and several others. It also includes several
-      base <emphasis>jar</emphasis> files.
-    </para>
-
-    <para>
-      To start, we set up a binary installation of the JDK created
-      by the BLFS editors.  It is installed in the <filename>/opt</filename>
-      directory to allow for multiple installations, including a source based
-      version.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Binary download (x86): <ulink url="&openjdk-download-binary-x86;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjdk-bin-md5sum-x86;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size (binary): &openjdk-bin-size-x86;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjdk-bin-buildsize-x86;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Binary download (x86_64): <ulink url="&openjdk-download-binary-x64;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjdk-bin-md5sum-x64;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size (binary): &openjdk-bin-size-x64;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjdk-bin-buildsize-x64;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Java Binary Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="alsa-lib"/>,
-      <xref role="runtime" linkend="cups"/>,
-      <xref role="runtime" linkend="giflib"/>, and
-      <xref role="runtime" linkend="xorg7-lib"/>
-    </para>
-
-  </sect2>
-
-  <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
-      architecture and changing to the extracted directory. Install the binary
-      <application>OpenJDK</application> with the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </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>
-
-    <para>
-      The binary version is now installed. You may create a symlink to that
-      version by issuing, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>ln -sfn OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
-
-    <para>
-      You may now proceed to <xref linkend="ojdk-conf"/>, where the
-      instructions assume that the above link exists.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/prog/jdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="jdk" xreflabel="jdk">
+<?dbhtml filename="jdk.html" dir="general"?>
+<title>jdk</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: neral/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1826 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 llvm-url "https://github.com/llvm/llvm-project/releases/download/llvmorg-&llvm-version;">
-
-  <!ENTITY llvm-download-http "&llvm-url;/llvm-&llvm-version;.src.tar.xz">
-  <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "5d9201e7c9a494ce8325cf365b6529a2">
-  <!ENTITY llvm-size          "60 MB">
-  <!ENTITY llvm-buildsize     "4.2 GB (964 MB installed; add 20 GB for tests and 308 MB for documentation)">
-  <!ENTITY llvm-time          "13 SBU (Add 8 SBU for tests; both using parallelism=8)">
-
-  <!ENTITY clang-download-http "&llvm-url;/clang-&llvm-version;.src.tar.xz">
-  <!ENTITY clang-md5sum        "4b3713a71f1442097ba2e881d74b679f">
-  <!ENTITY clang-size          "22 MB">
-
-  <!ENTITY compiler-rt-download-http "&llvm-url;/compiler-rt-&llvm-version;.src.tar.xz">
-  <!ENTITY compiler-rt-md5sum        "616ffb64d92162f1e5fdc7016bb1012e">
-  <!ENTITY compiler-rt-size          "2.4 MB">
-
-  <!-- CMake modules and third party dependencies renamed and uploaded
-       onto anduin to avoid stupid file names.  -->
-
-  <!ENTITY cmake-llvm-download-http "&sources-anduin-http;/llvm/llvm-cmake-&llvm-maj-version;.src.tar.xz">
-  <!ENTITY cmake-llvm-md5sum         "bf2ad617d47ce40fe77c0e5c26b1fe43">
-  <!ENTITY cmake-llvm-size           "12 KB">
-
-  <!ENTITY llvm-3rdparty-download-http "&sources-anduin-http;/llvm/llvm-third-party-&llvm-maj-version;.src.tar.xz">
-  <!ENTITY llvm-3rdparty-md5sum        "5ebac19868c66cdac8b87077faefd38c">
-  <!ENTITY llvm-3rdparty-size          "396 KB">
-]>
-
-<sect1 id="llvm" xreflabel="LLVM-&llvm-version;">
-  <?dbhtml filename="llvm.html" ?>
-
-
-  <title>LLVM-&llvm-version;</title>
-
-  <indexterm zone="llvm">
-    <primary sortas="a-LLVM">LLVM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LLVM</title>
-
-    <para>
-      The <application>LLVM</application> package contains a collection of
-      modular and reusable compiler and toolchain technologies. The Low Level
-      Virtual Machine (LLVM) Core libraries provide a modern source and
-      target-independent optimizer, along with code generation support for many
-      popular CPUs (as well as some less common ones!). These libraries are
-      built around a well specified code representation known as the LLVM
-      intermediate representation ("LLVM IR").
-    </para>
-
-    <para>
-      <application>Clang</application> provides new C, C++, Objective C
-      and Objective C++ front-ends for <application>LLVM</application> and is
-      required by some desktop packages such as <application>firefox</application>
-      and for <application>rust</application> if that is built using the system
-      <application>LLVM</application>.
-    </para>
-
-    <para>
-      The <application>Compiler RT</application> package provides
-      runtime sanitizer and profiling libraries for developers who use
-      <application>Clang</application> and <application>LLVM</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&llvm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&llvm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &llvm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &llvm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &llvm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &llvm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <para>
-      <emphasis role="strong">Cmake modules for LLVM</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&cmake-llvm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cmake-llvm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cmake-llvm-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      <emphasis role="strong">Third-party dependencies for LLVM build system</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&llvm-3rdparty-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &llvm-3rdparty-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &llvm-3rdparty-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Recommended Download</bridgehead>
-    <para>
-      <emphasis role="strong">Clang</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&clang-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clang-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clang-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Optional Download</bridgehead>
-    <para>
-      <emphasis role="strong">Compiler RT</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&compiler-rt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &compiler-rt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &compiler-rt-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">LLVM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="git"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="psutil"/> (for tests),
-      <xref linkend="pygments"/>,
-      <xref linkend="rsync"/> (for tests),
-      <xref linkend="recommonmark"/> (for building documentation),
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="valgrind"/>,
-      <xref linkend="PyYAML"/>, <!-- for yaml2obj -->
-      <xref linkend="zip"/>,
-      <ulink url="https://ocaml.org/">OCaml</ulink>,
-      and <ulink url="https://github.com/Z3Prover/z3">Z3</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LLVM</title>
-
-    <para>
-      Two additional tarballs
-      <filename>llvm-cmake-&llvm-maj-version;.src.tar.xz</filename> and
-      <filename>llvm-third-party-&llvm-maj-version;.src.tar.xz</filename> are
-      needed by LLVM building system.  The upstream expects them extracted
-      at the same level as the
-      <filename>llvm-&llvm-version;.src.tar.xz</filename> tarball,
-      and the extracted directories renamed to
-      <filename class="directory">cmake</filename> and
-      <filename class="directory">third-party</filename>.  Extract them and
-      modify the build system to avoid creating ambiguously-named
-      directories outside the
-      <filename>llvm-&llvm-version;.src</filename> hierarchy:
-    </para>
-
-<screen><userinput>tar -xf ../llvm-cmake-&llvm-maj-version;.src.tar.xz                                   &amp;&amp;
-tar -xf ../llvm-third-party-&llvm-maj-version;.src.tar.xz                             &amp;&amp;
-sed '/LLVM_COMMON_CMAKE_UTILS/s@../cmake@llvm-cmake-&llvm-maj-version;.src@'          \
-    -i CMakeLists.txt                                                 &amp;&amp;
-sed '/LLVM_THIRD_PARTY_DIR/s@../third-party@llvm-third-party-&llvm-maj-version;.src@' \
-    -i cmake/modules/HandleLLVMOptions.cmake</userinput></screen>
-
-    <para>
-      Install <application>clang</application> into
-      the source tree by running the following commands:
-    </para>
-
-<screen><userinput>tar -xf ../clang-&llvm-version;.src.tar.xz -C tools &amp;&amp;
-mv tools/clang-&llvm-version;.src tools/clang</userinput></screen>
-
-    <para>
-      If you have downloaded <application>compiler-rt</application>,
-      install it into the source tree by running the following commands:
-    </para>
-
-<screen><userinput>tar -xf ../compiler-rt-&llvm-version;.src.tar.xz -C projects    &amp;&amp;
-mv projects/compiler-rt-&llvm-version;.src projects/compiler-rt</userinput></screen>
-
-    <para>
-     There are many Python scripts in this package which use
-     <command>/usr/bin/env python</command> to access the system Python
-     which on LFS is <xref linkend="python3"/>. Use the following command
-     to fix these scripts:
-    </para>
-
-<screen><userinput>grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'</userinput></screen>
-
-    <para>
-      Install <application>LLVM</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-CC=gcc CXX=g++                              \
-cmake -DCMAKE_INSTALL_PREFIX=/usr           \
-      -DLLVM_ENABLE_FFI=ON                  \
-      -DCMAKE_BUILD_TYPE=Release            \
-      -DLLVM_BUILD_LLVM_DYLIB=ON            \
-      -DLLVM_LINK_LLVM_DYLIB=ON             \
-      -DLLVM_ENABLE_RTTI=ON                 \
-      -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
-      -DLLVM_BINUTILS_INCDIR=/usr/include   \
-      -DLLVM_INCLUDE_BENCHMARKS=OFF         \
-      -DCLANG_DEFAULT_PIE_ON_LINUX=ON       \
-      -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang \
-      -Wno-dev -G Ninja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="recommonmark"/> and its
-      dependencies, you can generate the html documentation and manual
-      pages with the following commands:
-    </para>
-
-<screen remap="doc"><userinput>cmake -DLLVM_BUILD_DOCS=ON            \
-      -DLLVM_ENABLE_SPHINX=ON         \
-      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
-      -Wno-dev -G Ninja ..            &amp;&amp;
-ninja docs-llvm-html  docs-llvm-man</userinput></screen>
-
-    <para>
-      The clang documentation can be built too:
-    </para>
-
-<screen remap="doc"><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
-
-    <!-- https://github.com/llvm/llvm-project/issues/39012 -->
-    <para>
-      If you wish to run the tests, remove a test case known to hang
-      indefinitely on some systems:
-    </para>
-
-    <screen remap='test'><userinput>rm -f ../projects/compiler-rt/test/tsan/getline_nohang.cpp</userinput></screen>
-
-    <!-- The excessive core dump made my system irresponsive.  -->
-    <para>
-      LLVM test suite can produce many core dump files.  They will occupy
-      a large amount of disk space, and the core dump process can
-      significantly slow down the testing.  To test the results with core
-      dump disabled, <phrase revision='systemd'>ensure
-      <xref linkend='systemd'/> and <xref linkend='shadow'/> have
-      been rebuilt with <xref linkend='linux-pam'/> support (if you are
-      interacting via a SSH or graphical session, also ensure the
-      <xref linkend='openssh'/> server or the desktop manager has been
-      built with <xref linkend='linux-pam'/>) and the current login session
-      is started after updating the
-      <filename>/etc/pam.d/system-session</filename> file to include
-      <filename class='libraryfile'>pam_systemd.so</filename>,
-      then </phrase>issue:
-    </para>
-
-    <screen remap="test" revision="sysv"><userinput>sh -c 'ulimit -c 0 &amp;&amp; ninja check-all'</userinput></screen>
-
-    <!-- From core(5): "RLIMIT_CORE will be ignored if the system is
-         configured to pipe core dumps to a program".  Here "the program"
-         is systemd-coredumpd.  So we need some fancy systemd setting.
-         -&ndash;user: Run it under per-user systemd manager, avoiding
-                       the necessity of root priviledge.
-         -&nash;pty: Run it in a pseudo-terminal, so we can monitor the
-                     process or interrupt it with Ctrl-C if we want.
-         -d: Run it with $PWD as the working directory.
-         -G: Delete the transient service unit even if the command fails,
-             to prevent "systemctl -&ndash;user status" from reporting
-             "degraded".
-         -p LimitCORE=0: Disable core dump.
-    -->
-
-<screen remap="test" revision="systemd"><userinput>systemctl   --user start dbus &amp;&amp;
-systemd-run --user --pty -d -G -p LimitCORE=0 ninja check-all</userinput></screen>
-
-    <para>
-      <!-- EDITORS - if you have more than 4 cores, use a cgroup to measure
-      the elapsed time for the tests.  Also, libstdc++.a and perhaps libstdc++fs.a
-      are used by a couple of the link-static tests. -->
-      If <option>-jN</option> (N replaced with a number) is passed to
-      <command>ninja</command>, the tests will be built with N logical
-      cores, but run using all available logical cores.
-      Run the test command in a cgroup (<phrase revision='systemd'>pass
-        the <option>-p AllowedCPUs=...</option> option to the
-        <command>systemd-run</command> command,
-      </phrase>
-      read <xref linkend='build-in-cgroup'/> for details) to limit the
-      number of logical cores for running the tests.
-      One test named <filename>Linux/clone_setns.cpp</filename> will fail
-      if <option>CONFIG_USER_NS</option> is not enabled in kernel
-      configuration.
-      <!-- 18.1.2: 71626 Passed, 27447 Unsupported, 339 Skipped,
-                   133 Expectedly Failed -->
-
-      <!-- To editors: it seems there is a more thorough test suite named
-           "test-suite-x.y.z.src.tar.xz" on the GitHub release download
-           page.  The usage of it is on
-           https://llvm.org/docs/TestSuiteGuide.html.  It looks like we've
-           never mentioned it in BLFS.
-
-           Let's let it go.  llvm is complex enough as it is.  Adding
-           the additional testsuite is IMO overkill.  - bdubbs -->
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-cp bin/FileCheck /usr/bin</userinput></screen>
-<!-- as of version 13.0.0, the install process seems to install the html
-     documentation and the manual pages. The llvm html documentation
-     is installed into /usr/share/doc/LLVM/llvm, while the clang html
-     documentation is installed into /usr/share/doc/LLVM/clang. So we have
-     just to move it. -->
-    <para>
-      If you have built the llvm documentation, it has been installed
-      by the above command, but it needs to be moved. As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/llvm-&llvm-version;            &amp;&amp;
-mv -v /usr/share/doc/LLVM/llvm /usr/share/doc/llvm-&llvm-version; &amp;&amp;
-rmdir -v --ignore-fail-on-non-empty /usr/share/doc/LLVM</userinput></screen>
-
-    <para>
-      If you have built the clang documentation, it has been installed, but
-      needs to be moved too.  Again as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/llvm-&llvm-version;             &amp;&amp;
-mv -v /usr/share/doc/LLVM/clang /usr/share/doc/llvm-&llvm-version; &amp;&amp;
-rmdir -v --ignore-fail-on-non-empty /usr/share/doc/LLVM</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DLLVM_ENABLE_FFI=ON</parameter>: This switch allows
-      <application>LLVM</application> to use
-      <application>libffi</application>.
-    </para>
-
-    <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.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch enables
-      compiler optimizations in order to speed up the code and reduce its size.
-      It also disables some compile checks which are not necessary on a
-      production system.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_TARGETS_TO_BUILD="host;AMDGPU"</parameter>: This
-      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 default is
-      all of the targets. You can use a semicolon separated list. Valid targets
-      are: host, AArch64, AMDGPU, ARM, AVR, BPF, Hexagon, Lanai, LoongArch,
-      Mips, MSP430, NVPTX, PowerPC, RISCV, Sparc, SystemZ, SystemZ, VE,
-      WebAssembly, X86, XCore, or all.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_LINK_LLVM_DYLIB=ON</parameter>: Used in conjunction with
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>, this switch enables
-      linking the tools against the shared library instead of the static ones.
-      It slightly reduces their size and also ensures that llvm-config
-      will correctly use libLLVM-&llvm-maj-version;.so.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_ENABLE_RTTI=ON</parameter>: This switch is 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>
-
-    <para>
-      <parameter>-DLLVM_INCLUDE_BENCHMARKS=OFF</parameter>:
-      is used to disable generation build targets for the LLVM
-      benchmarks. This option requires additional code that
-      is not currently available.
-    </para>
-
-    <para>
-      <parameter>-DCLANG_DEFAULT_PIE_ON_LINUX=ON</parameter>: makes
-      <option>-fpie</option> option the default when compiling programs.
-      Together with the <xref linkend="gASLR"/> feature enabled in the kernel,
-      this defeats some kind of attacks based on known memory layouts.
-    </para>
-
-    <para>
-      <parameter>-DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang</parameter>:
-      makes <command>clang</command> and <command>clang++</command>
-      search <filename class='directory'>/etc/clang</filename> for
-      configuration files.
-    </para>
-
-    <para>
-      <option>-DBUILD_SHARED_LIBS=ON</option>: if used instead of
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter> and
-      <parameter>-DLLVM_LINK_LLVM_DYLIB=ON</parameter>, builds all the
-      <application>LLVM</application> libraries (about 60) as shared
-      libraries instead of static.
-    </para>
-
-    <para>
-      <option>-DLLVM_ENABLE_DOXYGEN</option>: Enables the generation of
-      browsable HTML documentation if you have installed <xref
-      linkend="doxygen"/>. You should run <command>make doxygen-html</command>
-      afterwards, and install the generated documentation manually.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LLVM</title>
-
-    <sect3 id="llvm-config-info">
-      <title>Configuration Information</title>
-
-      <para>
-        If you've built Clang, as the &root; user create two configuration
-        files to make <xref linkend='gSSP'/> enabled by default for
-        <command>clang</command> and <command>clang++</command>, so
-        the default configuration of their SSP feature will be consistent
-        with <xref linkend='gcc'/>:
-      </para>
-
-<screen role='root'><userinput>mkdir -pv /etc/clang &amp;&amp;
-for i in clang clang++; do
-  echo -fstack-protector-strong &gt; /etc/clang/$i.cfg
-done</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>
-          amdgpu-arch,
-          analyze-build, bugpoint, c-index-test, clang, clang++ (symlinks to
-          clang-&llvm-maj-version;), clang-&llvm-maj-version;, clang-check, clang-cl,
-          clang-cpp (last two symlinks to clang), clang-extdef-mapping, clang-format,
-          clang-linker-wrapper,
-          clang-offload-bundler, clang-offload-packager,
-          clang-refactor, clang-rename, clang-repl, clang-scan-deps,
-          clang-tblgen,
-          diagtool, dsymutil, FileCheck, git-clang-format, hmaptool, intercept-build, llc, lli,
-          llvm-addr2line (symlink to llvm-symbolizer),
-          llvm-ar, llvm-as, llvm-bcanalyzer,
-          llvm-bitcode-strip (symlink to llvm-objcopy), llvm-cat,
-          llvm-cfi-verify, llvm-config, llvm-cov, llvm-c-test, llvm-cvtres,
-          llvm-cxxdump, llvm-cxxfilt, llvm-cxxmap, llvm-debuginfo-analyzer,
-          llvm-debuginfod, llvm-debuginfod-find,
-          llvm-diff, llvm-dis, llvm-dlltool (symlink to llvm-ar),
-          llvm-dwarfdump, llvm-dwarfutil,
-          llvm-dwp, llvm-exegesis, 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-otool (symlink to llv-objdump),
-          llvm-pdbutil, llvm-profdata, llvm-profgen,
-          llvm-ranlib (symlink to llvm-ar), llvm-rc,
-          llvm-readelf (symlink to llvm-readobj), llvm-readobj,
-          llvm-readtapi, llvm-reduce,
-          llvm-remarkutil,
-          llvm-rtdyld, llvm-sim, llvm-size, llvm-split, llvm-stress,
-          llvm-strings, llvm-strip (symlink to llvm-objcopy), llvm-symbolizer,
-          llvm-tblgen, llvm-tli-checker, llvm-undname, llvm-windres (symlink to
-          llvm-rc), llvm-xray, nvptx-arch, opt, sancov, sanstats, scan-build,
-          scan-build-py, scan-view, and verify-uselistorder
-        </seg>
-        <seg>
-          libLLVM.so,
-          libLLVM*.a (100 libraries),
-          libLTO.so,
-          libRemarks.so,
-          libclang.so,
-          libclang-cpp.so,
-          libclang*.a (42 libraries),
-          and LLVMgold.so
-        </seg>
-        <seg>
-          /usr/include/{clang,clang-c,llvm,llvm-c},
-          /usr/lib/{clang,cmake/{clang,llvm},libear,libscanbuild},
-          /usr/share/{clang,opt-viewer,scan-build,scan-view},
-          /usr/share/doc/llvm-&llvm-version;, and
-          /etc/clang
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="amdgpu-arch">
-        <term><command>amdgpu-arch</command></term>
-        <listitem>
-          <para>
-            lists AMD GPUs installed; at runtime it needs
-            <filename class='libraryfile'>libhsa-runtime64.so</filename>
-            which is not a part of BLFS
-          </para>
-          <indexterm zone="llvm amdgpu-arch">
-            <primary sortas="b-amdgpu-arch">amdgpu-arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="analyze-build">
-        <term><command>analyze-build</command></term>
-        <listitem>
-          <para>
-            is a static analysis tool
-          </para>
-          <indexterm zone="llvm analyze-build">
-            <primary sortas="b-analyze-build">analyze-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bugpoint">
-        <term><command>bugpoint</command></term>
-        <listitem>
-          <para>
-            is the automatic test case reduction tool
-          </para>
-          <indexterm zone="llvm bugpoint">
-            <primary sortas="b-bugpoint">bugpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-index-test">
-        <term><command>c-index-test</command></term>
-        <listitem>
-          <para>
-            is used to test the libclang API and demonstrate its usage
-          </para>
-          <indexterm zone="llvm c-index-test">
-            <primary sortas="b-c-index-test">c-index-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang">
-        <term><command>clang</command></term>
-        <listitem>
-          <para>
-            is the <application>Clang</application> C, C++,
-            and Objective-C compiler
-          </para>
-          <indexterm zone="llvm clang">
-            <primary sortas="b-clang">clang</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-check">
-        <term><command>clang-check</command></term>
-        <listitem>
-          <para>
-            is a tool to perform static code analysis and display Abstract
-            Syntax Trees (AST)
-          </para>
-          <indexterm zone="llvm clang-check">
-            <primary sortas="b-clang-check">clang-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-extdef-mapping">
-        <term><command>clang-extdef-mapping</command></term>
-        <listitem>
-          <para>
-            is a tool to collect the USR name and location of external
-            definitions in a source file
-          </para>
-          <indexterm zone="llvm clang-extdef-mapping">
-            <primary sortas="b-clang-extdef-mapping">clang-extdef-mapping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-format">
-        <term><command>clang-format</command></term>
-        <listitem>
-          <para>
-            is a tool to format C/C++/Java/JavaScript/Objective-C/Protobuf
-            code
-          </para>
-          <indexterm zone="llvm clang-format">
-            <primary sortas="b-clang-format">clang-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-linker-wrapper">
-        <term><command>clang-linker-wrapper</command></term>
-        <listitem>
-          <para>
-            is a wrapper utility over the host linker
-          </para>
-          <indexterm zone="llvm clang-linker-wrapper">
-            <primary sortas="b-clang-linker-wrapper">clang-linker-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-offload-bundler">
-        <term><command>clang-offload-bundler</command></term>
-        <listitem>
-          <para>
-            is a tool to bundle/unbundle OpenMP offloaded files associated with
-            a common source file
-          </para>
-          <indexterm zone="llvm clang-offload-bundler">
-            <primary sortas="b-clang-offload-bundler">clang-offload-bundler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-offload-packager">
-        <term><command>clang-offload-packager</command></term>
-        <listitem>
-          <para>
-            is a tool to bundle several object files into a single binary,
-            which can then be used to create a fatbinary containing offloading
-            code
-          </para>
-          <indexterm zone="llvm clang-offload-packager">
-            <primary sortas="b-clang-offload-packager">clang-offload-packager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-refactor">
-        <term><command>clang-refactor</command></term>
-        <listitem>
-          <para>
-            is a Clang-based refactoring tool for C, C++ and Objective-C
-          </para>
-          <indexterm zone="llvm clang-refactor">
-            <primary sortas="b-clang-refactor">clang-refactor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-rename">
-        <term><command>clang-rename</command></term>
-        <listitem>
-          <para>
-            is a tool to rename symbols in C/C++ programs
-          </para>
-          <indexterm zone="llvm clang-rename">
-            <primary sortas="b-clang-rename">clang-rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-scan-deps">
-        <term><command>clang-scan-deps</command></term>
-        <listitem>
-          <para>
-            is a tool to scan for dependencies in a source file
-          </para>
-          <indexterm zone="llvm clang-scan-deps">
-            <primary sortas="b-clang-scan-deps">clang-scan-deps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-tblgen">
-        <term><command>clang-tblgen</command></term>
-        <listitem>
-          <para>
-            is a program that translates compiler-related target
-            description (<filename class='extension'>.td</filename>) files
-            into C++ code and other output formats
-          </para>
-          <indexterm zone="llvm clang-tblgen">
-            <primary sortas="b-clang-tblgen">clang-tblgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diagtool">
-        <term><command>diagtool</command></term>
-        <listitem>
-          <para>
-            is a combination of tools for dealing with diagnostics in clang
-          </para>
-          <indexterm zone="llvm diagtool">
-            <primary sortas="b-diagtool">diagtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="FileCheck">
-        <term><command>FileCheck</command></term>
-        <listitem>
-          <para>
-            is a tool that reads two files (one from standard input,
-            and one specified on the command line) and uses one to verify the other.
-          </para>
-          <indexterm zone="llvm FileCheck">
-            <primary sortas="b-FileCheck">FileCheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dsymutil">
-        <term><command>dsymutil</command></term>
-        <listitem>
-          <para>
-            is a tool used to manipulate archived DWARF debug symbol files,
-            compatible with the Darwin command <command>dsymutil</command>
-          </para>
-          <indexterm zone="llvm dsymutil">
-            <primary sortas="b-dsymutil">dsymutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-clang-format">
-        <term><command>git-clang-format</command></term>
-        <listitem>
-          <para>
-            runs clang-format on git generated patches (requires
-            <xref linkend="git"/>)
-          </para>
-          <indexterm zone="llvm git-clang-format">
-            <primary sortas="b-git-clang-format">git-clang-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmaptool">
-        <term><command>hmaptool</command></term>
-        <listitem>
-          <para>
-            is a Python tool to dump and construct header maps
-          </para>
-          <indexterm zone="llvm hmaptool">
-            <primary sortas="b-hmaptool">hmaptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intercept-build">
-        <term><command>intercept-build</command></term>
-        <listitem>
-          <para>
-            generates a database of build commands for a project
-          </para>
-          <indexterm zone="llvm intercept-build">
-            <primary sortas="b-intercept-build">intercept-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llc">
-        <term><command>llc</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> static compiler
-          </para>
-          <indexterm zone="llvm llc">
-            <primary sortas="b-llc">llc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lli">
-        <term><command>lli</command></term>
-        <listitem>
-          <para>
-            is used to directly execute programs from
-            <application>LLVM</application> bitcode
-          </para>
-          <indexterm zone="llvm lli">
-            <primary sortas="b-lli">lli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-addr2line">
-        <term><command>llvm-addr2line</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert addresses into file names and line
-            numbers
-          </para>
-          <indexterm zone="llvm llvm-addr2line">
-            <primary sortas="b-llvm-addr2line">llvm-addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-ar">
-        <term><command>llvm-ar</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> archiver
-          </para>
-          <indexterm zone="llvm llvm-ar">
-            <primary sortas="b-llvm-ar">llvm-ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-as">
-        <term><command>llvm-as</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> assembler
-          </para>
-          <indexterm zone="llvm llvm-as">
-            <primary sortas="b-llvm-as">llvm-as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-bcanalyzer">
-        <term><command>llvm-bcanalyzer</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> bitcode analyzer
-          </para>
-          <indexterm zone="llvm llvm-bcanalyzer">
-            <primary sortas="b-llvm-bcanalyzer">llvm-bcanalyzer</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="llvm llvm-cat">
-            <primary sortas="b-llvm-cat">llvm-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cfi-verify">
-        <term><command>llvm-cfi-verify</command></term>
-        <listitem>
-          <para>
-            identifies whether Control Flow Integrity protects all indirect
-            control flow instructions in the provided object file, DSO, or
-            binary
-          </para>
-          <indexterm zone="llvm llvm-cfi-verify">
-            <primary sortas="b-llvm-cfi-verify">llvm-cfi-verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-config">
-        <term><command>llvm-config</command></term>
-        <listitem>
-          <para>
-            Prints <application>LLVM</application> compilation options
-          </para>
-          <indexterm zone="llvm llvm-config">
-            <primary sortas="b-llvm-config">llvm-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cov">
-        <term><command>llvm-cov</command></term>
-        <listitem>
-          <para>
-            is used to emit coverage information
-          </para>
-          <indexterm zone="llvm llvm-cov">
-            <primary sortas="b-llvm-cov">llvm-cov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-c-test">
-        <term><command>llvm-c-test</command></term>
-        <listitem>
-          <para>
-            is a bytecode disassembler
-          </para>
-          <indexterm zone="llvm llvm-c-test">
-            <primary sortas="b-llvm-c-test">llvm-c-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cvtres">
-        <term><command>llvm-cvtres</command></term>
-        <listitem>
-          <para>
-            is a tool to convert Microsoft resource files to COFF
-          </para>
-          <indexterm zone="llvm llvm-cvtres">
-            <primary sortas="b-llvm-cvtres">llvm-cvtres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cxxdump">
-        <term><command>llvm-cxxdump</command></term>
-        <listitem>
-          <para>
-            is used as a C++ ABI Data Dumper
-          </para>
-          <indexterm zone="llvm llvm-cxxdump">
-            <primary sortas="b-llvm-cxxdump">llvm-cxxdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cxxfilt">
-        <term><command>llvm-cxxfilt</command></term>
-        <listitem>
-          <para>
-            is used to demangle C++ symbols in llvm code
-          </para>
-          <indexterm zone="llvm llvm-cxxfilt">
-            <primary sortas="b-llvm-cxxfilt">llvm-cxxfilt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cxxmap">
-        <term><command>llvm-cxxmap</command></term>
-        <listitem>
-          <para>
-            is used to remap C++ mangled symbols
-          </para>
-          <indexterm zone="llvm llvm-cxxmap">
-            <primary sortas="b-llvm-cxxmap">llvm-cxxmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-debuginfo-analyzer">
-        <term><command>llvm-debuginfo-analyzer</command></term>
-        <listitem>
-          <para>
-            prints a logical representation of low-level debug information
-          </para>
-          <indexterm zone="llvm llvm-debuginfo-analyzer">
-            <primary sortas="b-llvm-debuginfo-analyzer">llvm-debuginfo-analyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-debuginfod">
-        <term><command>llvm-debuginfod</command></term>
-        <listitem>
-          <para>
-            is a service providing debug information over an HTTP API for
-            analyzing stripped binaries
-          </para>
-          <indexterm zone="llvm llvm-debuginfod">
-            <primary sortas="b-llvm-debuginfod">llvm-debuginfod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-debuginfod-find">
-        <term><command>llvm-debuginfod-find</command></term>
-        <listitem>
-          <para>
-            is an interface to the <command>llvm-debuginfod</command> daemon
-            for finding debuginfod artifacts
-          </para>
-          <indexterm zone="llvm llvm-debuginfod-find">
-            <primary sortas="b-llvm-debuginfod-find">llvm-debuginfod-find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-diff">
-        <term><command>llvm-diff</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> structural
-            '<command>diff</command>'
-          </para>
-          <indexterm zone="llvm llvm-diff">
-            <primary sortas="b-llvm-diff">llvm-diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dis">
-        <term><command>llvm-dis</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> disassembler
-          </para>
-          <indexterm zone="llvm llvm-dis">
-            <primary sortas="b-llvm-dis">llvm-dis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dwarfdump">
-        <term><command>llvm-dwarfdump</command></term>
-        <listitem>
-          <para>
-            prints the content of DWARF sections in object files
-          </para>
-          <indexterm zone="llvm llvm-dwarfdump">
-            <primary sortas="b-llvm-dwarfdump">llvm-dwarfdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dwarfutil">
-        <term><command>llvm-dwarfutil</command></term>
-        <listitem>
-          <para>
-            is a tool to copy and manipulate debug info
-          </para>
-          <indexterm zone="llvm llvm-dwarfutil">
-            <primary sortas="b-llvm-dwarfutil">llvm-dwarfutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dwp">
-        <term><command>llvm-dwp</command></term>
-        <listitem>
-          <para>
-            merges split DWARF files
-          </para>
-          <indexterm zone="llvm llvm-dwp">
-            <primary sortas="b-llvm-dwp">llvm-dwp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-elfabi">
-        <term><command>llvm-elfabi</command></term>
-        <listitem>
-          <para>
-            is used to read information about an ELF binary's ABI
-          </para>
-          <indexterm zone="llvm llvm-elfabi">
-            <primary sortas="b-llvm-elfabi">llvm-elfabi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-exegesis">
-        <term><command>llvm-exegesis</command></term>
-        <listitem>
-          <para>
-            is a benchmarking tool that uses information available in LLVM to
-            measure host machine instruction characteristics like latency or
-            port decomposition
-          </para>
-          <indexterm zone="llvm llvm-exegesis">
-            <primary sortas="b-llvm-exegesis">llvm-exegesis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-extract">
-        <term><command>llvm-extract</command></term>
-        <listitem>
-          <para>
-            is used to extract a function from an
-            <application>LLVM</application> module
-          </para>
-          <indexterm zone="llvm llvm-extract">
-            <primary sortas="b-llvm-extract">llvm-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-gsymutil">
-        <term><command>llvm-gsymutil</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="llvm llvm-gsymutil">
-            <primary sortas="b-llvm-gsymutil">llvm-gsymutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-ifs">
-        <term><command>llvm-ifs</command></term>
-        <listitem>
-          <para>
-            is used to merge interface stubs with object files
-          </para>
-          <indexterm zone="llvm llvm-ifs">
-            <primary sortas="b-llvm-ifs">llvm-ifs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-install-name-tool">
-        <term><command>llvm-install-name-tool</command></term>
-        <listitem>
-          <para>
-            is used to rewrite load commands into MachO binary format
-          </para>
-          <indexterm zone="llvm llvm-install-name-tool">
-            <primary sortas="b-llvm-install-name-tool">llvm-install-name-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-jitlink">
-        <term><command>llvm-jitlink</command></term>
-        <listitem>
-          <para>
-            is used to parse relocatable object files to make their contents
-            executable in a target process
-          </para>
-          <indexterm zone="llvm llvm-jitlink">
-            <primary sortas="b-llvm-jitlink">llvm-jitlink</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="llvm llvm-link">
-            <primary sortas="b-llvm-link">llvm-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-lipo">
-        <term><command>llvm-lipo</command></term>
-        <listitem>
-          <para>
-            is used to create universal binaries from MachO files
-          </para>
-          <indexterm zone="llvm llvm-lipo">
-            <primary sortas="b-llvm-lipo">llvm-lipo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-lto">
-        <term><command>llvm-lto</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> LTO (link time optimization)
-            linker
-          </para>
-          <indexterm zone="llvm llvm-lto">
-            <primary sortas="b-llvm-lto">llvm-lto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-lto2">
-        <term><command>llvm-lto2</command></term>
-        <listitem>
-          <para>
-            is a test harness for the resolution based LTO interface
-          </para>
-          <indexterm zone="llvm llvm-lto2">
-            <primary sortas="b-llvm-lto2">llvm-lto2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-mc">
-        <term><command>llvm-mc</command></term>
-        <listitem>
-          <para>
-            is a standalone machine code assembler/disassembler
-          </para>
-          <indexterm zone="llvm llvm-mc">
-            <primary sortas="b-llvm-mc">llvm-mc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-mca">
-        <term><command>llvm-mca</command></term>
-        <listitem>
-          <para>
-            is a performance analysis tool to statically measure the
-            performance of machine code
-          </para>
-          <indexterm zone="llvm llvm-mca">
-            <primary sortas="b-llvm-mca">llvm-mca</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="llvm-mcmarkup">
-        <term><command>llvm-mcmarkup</command></term>
-        <listitem>
-          <para>
-            is a parser for machine code markup.
-          </para>
-          <indexterm zone="llvm llvm-mcmarkup">
-            <primary sortas="b-llvm-mcmarkup">llvm-mcmarkup</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="llvm llvm-modextract">
-            <primary sortas="b-llvm-modextract">llvm-modextract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-mt">
-        <term><command>llvm-mt</command></term>
-        <listitem>
-          <para>
-            is a tool to generate signed files and catalogs from a
-            side-by-side assembly manifest (used for Microsoft SDK)
-          </para>
-          <indexterm zone="llvm llvm-mt">
-            <primary sortas="b-llvm-mt">llvm-mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-nm">
-        <term><command>llvm-nm</command></term>
-        <listitem>
-          <para>
-            is used to list <application>LLVM</application> bitcode
-            and object file's symbol table
-          </para>
-          <indexterm zone="llvm llvm-nm">
-            <primary sortas="b-llvm-nm">llvm-nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-objcopy">
-        <term><command>llvm-objcopy</command></term>
-        <listitem>
-          <para>
-            is LLVM's version of an objcopy tool
-          </para>
-          <indexterm zone="llvm llvm-objcopy">
-            <primary sortas="b-llvm-objcopy">llvm-objcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-objdump">
-        <term><command>llvm-objdump</command></term>
-        <listitem>
-          <para>
-            is an <application>LLVM</application> object file dumper
-          </para>
-          <indexterm zone="llvm llvm-objdump">
-            <primary sortas="b-llvm-objdump">llvm-objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-opt-report">
-        <term><command>llvm-opt-report</command></term>
-        <listitem>
-          <para>
-            is a tool to generate an optimization report from YAML optimization
-            record files
-          </para>
-          <indexterm zone="llvm llvm-opt-report">
-            <primary sortas="b-llvm-opt-report">llvm-opt-report</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-pdbutil">
-        <term><command>llvm-pdbutil</command></term>
-        <listitem>
-          <para>
-            is a PDB (Program Database) dumper. PDB is a Microsoft format
-          </para>
-          <indexterm zone="llvm llvm-pdbutil">
-            <primary sortas="b-llvm-pdbutil">llvm-pdbutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-profdata">
-        <term><command>llvm-profdata</command></term>
-        <listitem>
-          <para>
-            is a small tool to manipulate and print profile data files
-          </para>
-          <indexterm zone="llvm llvm-profdata">
-            <primary sortas="b-llvm-profdata">llvm-profdata</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            is used to generate an index for a <application>LLVM</application>
-            archive
-          </para>
-          <indexterm zone="llvm llvm-ranlib">
-            <primary sortas="b-llvm-ranlib">llvm-ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-rc">
-        <term><command>llvm-rc</command></term>
-        <listitem>
-          <para>
-            is a platform-independent tool to compile resource scripts
-            into binary resource files
-          </para>
-          <indexterm zone="llvm llvm-rc">
-            <primary sortas="b-llvm-rc">llvm-rc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-readobj">
-        <term><command>llvm-readobj</command></term>
-        <listitem>
-          <para>
-            displays low-level format-specific information about object files
-          </para>
-          <indexterm zone="llvm llvm-readobj">
-            <primary sortas="b-llvm-readobj">llvm-readobj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-readtapi">
-        <term><command>llvm-readtapi</command></term>
-        <listitem>
-          <para>
-            is the LLVM TAPI file reader and transformer
-          </para>
-          <indexterm zone="llvm llvm-readtapi">
-            <primary sortas="b-llvm-readtapi">llvm-readtapi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-reduce">
-        <term><command>llvm-reduce</command></term>
-        <listitem>
-          <para>
-            is used to automatically reduce testcases
-            when running a test suite
-          </para>
-          <indexterm zone="llvm llvm-reduce">
-            <primary sortas="b-llvm-reduce">llvm-reduce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-remarkutil">
-        <term><command>llvm-remarkutil</command></term>
-        <listitem>
-          <para>
-            converts remark files between bitstream and YAML; or prints
-            function instruction count information in remark files
-          </para>
-          <indexterm zone="llvm llvm-remarkutil">
-            <primary sortas="b-llvm-remarkutil">llvm-remarkutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-rtdyld">
-        <term><command>llvm-rtdyld</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> MC-JIT tool
-          </para>
-          <indexterm zone="llvm llvm-rtdyld">
-            <primary sortas="b-llvm-rtdyld">llvm-rtdyld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-size">
-        <term><command>llvm-size</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> object size dumper
-          </para>
-          <indexterm zone="llvm llvm-size">
-            <primary sortas="b-llvm-size">llvm-size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-split">
-        <term><command>llvm-split</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> module splitter
-          </para>
-          <indexterm zone="llvm llvm-split">
-            <primary sortas="b-llvm-split">llvm-split</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-stress">
-        <term><command>llvm-stress</command></term>
-        <listitem>
-          <para>
-            is used to generate random
-            <filename class="extension">.ll</filename> files
-          </para>
-          <indexterm zone="llvm llvm-stress">
-            <primary sortas="b-llvm-stress">llvm-stress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-strings">
-        <term><command>llvm-strings</command></term>
-        <listitem>
-          <para>
-            print strings found in a binary (object file, executable, or
-            archive library)
-          </para>
-          <indexterm zone="llvm llvm-strings">
-            <primary sortas="b-llvm-strings">llvm-strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-symbolizer">
-        <term><command>llvm-symbolizer</command></term>
-        <listitem>
-          <para>
-            converts addresses into source code locations
-          </para>
-          <indexterm zone="llvm llvm-symbolizer">
-            <primary sortas="b-llvm-symbolizer">llvm-symbolizer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-tblgen">
-        <term><command>llvm-tblgen</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> Target Description
-            To C++ Code Generator
-          </para>
-          <indexterm zone="llvm llvm-tblgen">
-            <primary sortas="b-llvm-tblgen">llvm-tblgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-tli-checker">
-        <term><command>llvm-tli-checker</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> TargetLibraryInfo
-            versus SDK checker
-          </para>
-          <indexterm zone="llvm llvm-tli-checker">
-            <primary sortas="b-llvm-tli-checker">llvm-tli-checker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-undname">
-        <term><command>llvm-undname</command></term>
-        <listitem>
-          <para>
-            is a tool to demangle names
-          </para>
-          <indexterm zone="llvm llvm-undname">
-            <primary sortas="b-llvm-undname">llvm-undname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-xray">
-        <term><command>llvm-xray</command></term>
-        <listitem>
-          <para>
-            is an implementation of Google's XRay function call tracing system
-          </para>
-          <indexterm zone="llvm llvm-xray">
-            <primary sortas="b-llvm-xray">llvm-xray</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nvptx-arch">
-        <term><command>nvptx-arch</command></term>
-        <listitem>
-          <para>
-            lists NVIDIA GPUs installed; at runtime it needs
-            <filename class='libraryfile'>libcuda.so</filename>
-            which is not a part of BLFS
-          </para>
-          <indexterm zone="llvm nvptx-arch">
-            <primary sortas="b-nvptx-arch">nvptx-arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opt">
-        <term><command>opt</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> optimizer
-          </para>
-          <indexterm zone="llvm opt">
-            <primary sortas="b-opt">opt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sancov">
-        <term><command>sancov</command></term>
-        <listitem>
-          <para>
-            is the sanitizer coverage processing tool
-          </para>
-          <indexterm zone="llvm sancov">
-            <primary sortas="b-sancov">sancov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sanstats">
-        <term><command>sanstats</command></term>
-        <listitem>
-          <para>
-            is the sanitizer statistics processing tool
-          </para>
-          <indexterm zone="llvm sanstats">
-            <primary sortas="b-sanstats">sanstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan-build">
-        <term><command>scan-build</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that invokes the
-            <application>Clang</application> static analyzer
-          </para>
-          <indexterm zone="llvm scan-build">
-            <primary sortas="b-scan-build">scan-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan-build-py">
-        <term><command>scan-build-py</command></term>
-        <listitem>
-          <para>
-            is a <application>Python</application> script that invokes the
-            <application>Clang</application> static analyzer
-          </para>
-          <indexterm zone="llvm scan-build-py">
-            <primary sortas="b-scan-build-py">scan-build-py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan-view">
-        <term><command>scan-view</command></term>
-        <listitem>
-          <para>
-            is a viewer for <application>Clang</application> static analyzer
-            results
-          </para>
-          <indexterm zone="llvm scan-view">
-            <primary sortas="b-scan-view">scan-view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="verify-uselistorder">
-        <term><command>verify-uselistorder</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> tool to verify use-list
-            order
-          </para>
-          <indexterm zone="llvm verify-uselistorder">
-            <primary sortas="b-verify-uselistorder">verify-uselistorder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Removed in 12.0.0
-      <varlistentry id="yaml2obj">
-        <term><command>yaml2obj</command></term>
-        <listitem>
-          <para>
-            takes a YAML representation of an object file and converts it
-            to a binary file
-          </para>
-          <indexterm zone="llvm yaml2obj">
-            <primary sortas="b-yaml2obj">yaml2obj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-<!--
-      <varlistentry id="libllvm">
-        <term><filename class="libraryfile">libLLVM-&llvm-version;.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>LLVM</application> API functions.
-          </para>
-          <indexterm zone="llvm libllvm">
-            <primary sortas="c-libllvm">libLLVM-&llvm-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprofile_rt">
-        <term><filename class="libraryfile">libprofile_rt.so</filename></term>
-        <listitem>
-          <para>
-            is the C, C++ and Objective-C runtime library for
-            <application>Clang</application>.
-          </para>
-          <indexterm zone="llvm libprofile_rt">
-            <primary sortas="c-libprofile_rt">libprofile_rt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lua-download-http "https://www.lua.org/ftp/lua-&lua-version;.tar.gz">
-  <!ENTITY lua-download-ftp  " ">
-  <!ENTITY lua-md5sum        "25a429319dff20dfbfb9956c2b5be911">
-  <!ENTITY lua-size          "356 KB">
-  <!ENTITY lua-buildsize     "3.8 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-ftp  " ">
-  <!ENTITY lua-tests-md5sum        "e10a3da28b05d0e8d25ad08b7820c213">
-  <!ENTITY lua-tests-size          "134 KB">
-]>
-
-<sect1 id="lua" xreflabel="Lua-&lua-version;">
-  <?dbhtml filename="lua.html"?>
-
-
-  <title>Lua-&lua-version;</title>
-
-  <indexterm zone="lua">
-    <primary sortas="a-Lua">Lua</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lua</title>
-
-    <para>
-      <application>Lua</application> is a powerful light-weight programming
-      language designed for extending applications. It is also frequently used
-      as a general-purpose, stand-alone language. <application>Lua</application>
-      is implemented as a small library of C functions, written in ANSI C, and
-      compiles unmodified in all known platforms. The implementation goals are
-      simplicity, efficiency, portability, and low embedding cost. The result is
-      a fast language engine with small footprint, making it ideal in embedded
-      systems too.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lua-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lua-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lua-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lua-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lua-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lua-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lua-&lua-version;-shared_library-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download (HTTP): <ulink url="&lua-tests-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download (FTP): <ulink url="&lua-tests-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download MD5 sum: &lua-tests-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download size: &lua-tests-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lua</title>
-
-    <para>
-      Some packages check for the <application>pkg-config</application> file
-      for <application>Lua</application>, which is created with:
-    </para>
-
-<screen><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
-<literal>V=5.4
-R=&lua-version;
-
-prefix=/usr
-INSTALL_BIN=${prefix}/bin
-INSTALL_INC=${prefix}/include
-INSTALL_LIB=${prefix}/lib
-INSTALL_MAN=${prefix}/share/man/man1
-INSTALL_LMOD=${prefix}/share/lua/${V}
-INSTALL_CMOD=${prefix}/lib/lua/${V}
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua -lm -ldl
-Cflags: -I${includedir}</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>Lua</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
-make linux</userinput></screen>
-<!-- make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux
-     The MYCFLAGS="" part was brought into the patch since optimization had to
-     be turned off.
-     The LUA_ROOT change also has been merged into the patch.-->
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <quote>This will run the interpreter and print its version</quote>.
-      More comprehensive tests can be performed if you downloaded the "Test
-      suite" tarball. Those tests need to be executed after the package is
-      installed, thus we defer to the description below.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make INSTALL_TOP=/usr                \
-     INSTALL_DATA="cp -d"            \
-     INSTALL_MAN=/usr/share/man/man1 \
-     TO_LIB="liblua.so liblua.so.5.4 liblua.so.&lua-version;" \
-     install &amp;&amp;
-
-mkdir -pv                      /usr/share/doc/lua-&lua-version; &amp;&amp;
-cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &amp;&amp;
-
-install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc</userinput></screen>
-
-    <para>
-      Here we describe only the "Basic tests". Untar the tarball and
-      change to the
-      <filename class="directory">lua-&lua-version;-tests</filename> directory,
-      then issue
-      <command>lua -e "_U=true" all.lua</command>. If the tests finish without
-      error, you will see a message containing the string "final OK".
-    </para>
-
-    <!-- The optimization problem fixed in the patch was identified by running
-         the test suite, and ultimately culminated in a SIGBUS error. -->
-  </sect2>
-
-  <!-- Brought into the patch, unneeded
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... src/luaconf.h</command>: This command changes the
-      <application>Lua</application> search path to match the install path.
-    </para>
-
-    <para>
-      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
-      environment variable includes compatibility layers with Lua 5.1 and 5.2
-      in the build.
-    </para>
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lua and luac
-        </seg>
-        <seg>
-          liblua.so
-        </seg>
-        <seg>
-          /usr/{lib,share}/lua and
-          /usr/share/doc/lua-&lua-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lua-prog">
-        <term><command>lua</command></term>
-        <listitem>
-          <para>
-            is the standalone Lua interpreter
-          </para>
-          <indexterm zone="lua lua-prog">
-            <primary sortas="b-lua">lua</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="luac">
-        <term><command>luac</command></term>
-        <listitem>
-          <para>
-            is the Lua compiler
-          </para>
-          <indexterm zone="lua luac">
-            <primary sortas="b-luac">luac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblua">
-        <term><filename class="libraryfile">liblua.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Lua</application> API functions
-          </para>
-          <indexterm zone="lua liblua">
-            <primary sortas="c-liblua">liblua.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/lua52.xml
===================================================================
--- general/prog/lua52.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lua-download-http "https://www.lua.org/ftp/lua-&lua52-version;.tar.gz">
-  <!ENTITY lua-download-ftp  " ">
-  <!ENTITY lua-md5sum        "913fdb32207046b273fdb17aad70be13">
-  <!ENTITY lua-size          "248 KB">
-  <!ENTITY lua-buildsize     "3.6  MB">
-  <!ENTITY lua-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lua52" xreflabel="Lua-&lua52-version;">
-  <?dbhtml filename="lua52.html"?>
-
-
-  <title>Lua-&lua52-version;</title>
-
-  <indexterm zone="lua52">
-    <primary sortas="a-Lua">Lua</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lua 5.2</title>
-
-    <para>
-      <application>Lua</application> is a powerful light-weight programming
-      language designed for extending applications. It is also frequently used
-      as a general-purpose, stand-alone language. <application>Lua</application>
-      is implemented as a small library of C functions, written in ANSI C, and
-      compiles unmodified in all known platforms. The implementation goals are
-      simplicity, efficiency, portability, and low embedding cost. The result is
-      a fast language engine with small footprint, making it ideal in embedded
-      systems too.
-    </para>
-
-    <para>
-      This is an older version of <application>Lua</application> needed only
-      for compatibility with other programs such as <xref linkend='wireshark'/>
-      and <xref linkend="vlc"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lua-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lua-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lua-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lua-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lua-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lua-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lua-&lua52-version;-shared_library-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lua 5.2</title>
-
-    <para>
-      Some packages check for the <application>pkg-config</application> file
-      for <application>Lua</application>, which is created with:
-    </para>
-
-<screen><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
-<literal>V=5.2
-R=&lua52-version;
-
-prefix=/usr
-INSTALL_BIN=${prefix}/bin
-INSTALL_INC=${prefix}/include/lua5.2
-INSTALL_LIB=${prefix}/lib
-INSTALL_MAN=${prefix}/share/man/man1
-INSTALL_LMOD=${prefix}/share/lua/${V}
-INSTALL_CMOD=${prefix}/lib/lua/${V}
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/lua5.2
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua5.2 -lm -ldl
-Cflags: -I${includedir}</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>Lua</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lua-&lua52-version;-shared_library-1.patch &amp;&amp;
-
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
-
-sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.2/' \
-       -e '/^LUAC_T=/ s/luac/luac5.2/'     \
-       -i src/Makefile &amp;&amp;
-
-make MYCFLAGS="-fPIC" linux</userinput></screen>
-<!--
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <quote>This will run the interpreter and print its version.</quote>.
-      More comprehensive tests can be performed if you downloaded the "Test
-      suite" tarball. Those tests need to be executed after the package is
-      installed, thus we defer to the description below.
-    </para>
--->
-    <para>
-      The installation of this package is complex, so we will use
-      the DESTDIR method of installation:
-    </para>
-
-<screen><userinput>make TO_BIN='lua5.2 luac5.2'                     \
-     TO_LIB="liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.&lua52-version;" \
-     INSTALL_DATA="cp -d"                        \
-     INSTALL_TOP=$PWD/install/usr                \
-     INSTALL_INC=$PWD/install/usr/include/lua5.2 \
-     INSTALL_MAN=$PWD/install/usr/share/man/man1 \
-     install &amp;&amp;
-
-install -Dm644 lua.pc install/usr/lib/pkgconfig/lua52.pc &amp;&amp;
-
-mkdir -pv install/usr/share/doc/lua-&lua52-version; &amp;&amp;
-cp -v doc/*.{html,css,gif,png} install/usr/share/doc/lua-&lua52-version; &amp;&amp;
-
-ln -s liblua5.2.so install/usr/lib/liblua.so.5.2   &amp;&amp;
-ln -s liblua5.2.so install/usr/lib/liblua.so.&lua52-version; &amp;&amp;
-
-mv install/usr/share/man/man1/{lua.1,lua5.2.1} &amp;&amp;
-mv install/usr/share/man/man1/{luac.1,luac5.2.1}</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>chown -R root:root install  &amp;&amp;
-cp -a install/* /</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... src/luaconf.h</command>: This command changes the
-      <application>Lua</application> search path to match the install path.
-    </para>
-
-    <para>
-      <command>sed -i ... src/Makefile</command>: This command deconflicts
-      this installation with the latest version of lua.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lua5.2 and luac5.2
-        </seg>
-        <seg>
-          liblua5.2.so
-        </seg>
-        <seg>
-          /usr/include/lua5.2,
-          /usr/lib/lua/5.2,
-          /usr/share/doc/lua-&lua52-version;, and
-          /usr/share/lua/5.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lua52-prog">
-        <term><command>lua5.2</command></term>
-        <listitem>
-          <para>
-            is the standalone Lua version 5.2 interpreter
-          </para>
-          <indexterm zone="lua52 lua-prog">
-            <primary sortas="b-lua52">lua5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="luac52">
-        <term><command>luac5.2</command></term>
-        <listitem>
-          <para>
-            is the Lua version 5.2 compiler
-          </para>
-          <indexterm zone="lua52 luac52">
-            <primary sortas="b-luac52">luac5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblua52">
-        <term><filename class="libraryfile">liblua5.2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Lua</application> version 5.2 API functions
-          </para>
-          <indexterm zone="lua52 liblua52">
-            <primary sortas="c-liblua52">liblua5.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,320 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
-  <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "55a079ac42931797d87fabe45018f758">
-  <!ENTITY mercurial-size          "7.9 MB">
-  <!ENTITY mercurial-buildsize     "80 MB (with docs, add 1.6 GB for tests)">
-  <!ENTITY mercurial-time          "0.4 SBU (with docs; add 12 SBU for tests; both using parallelism=8)">
-]>
-
-<sect1 id="mercurial" xreflabel="Mercurial-&mercurial-version;">
-  <?dbhtml filename="mercurial.html"?>
-
-
-  <title>Mercurial-&mercurial-version;</title>
-
-  <indexterm zone="mercurial">
-    <primary sortas="a-mercurial">mercurial</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mercurial</title>
-
-    <para>
-      <application>Mercurial</application> is a distributed source control
-      management tool similar to <application>Git</application> and
-      <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>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mercurial-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mercurial-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mercurial-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mercurial-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mercurial-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mercurial-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mercurial Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/>
-        (required to build the documentation),
-      <xref linkend="git"/>,
-      <xref linkend="gpgme"/> (with Python bindings),
-      <xref role="runtime" linkend="openssh"/>
-        (runtime, to access ssh://... repositories),
-      <xref linkend="pygments"/>,
-      <xref linkend="rust"/> (see <filename>rust/README.rst</filename> and <filename>rust/rhg/README.md</filename>),
-      <xref linkend="subversion"/> (with Python bindings),
-      <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
-      <ulink url="https://www.nongnu.org/cvs/">CVS</ulink>,
-      <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
-      <ulink url="https://www.pyopenssl.org/en/stable/">pyOpenSSL</ulink>, and
-      <ulink url="https://github.com/google/re2/">re2</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mercurial</title>
-    <!-- Rust port is now part of the standard tests -->
-
-    <para>
-      Build <application>Mercurial</application> by issuing the following
-      command:
-    </para>
-
-<screen><userinput>make build</userinput></screen>
-
-    <para>
-      To build the documentation (requires <xref linkend="docutils"/>), issue:
-    </para>
-
-<screen remap="doc"><userinput>make doc</userinput></screen>
-<!--
-    The tests do not hang.  Better to just report what failed.
-    <para>
-      If you wish to run the tests, the rust tests must be removed as they are
-      currently broken due to syntax errors. To do this, issue:
-    </para>
-
-<screen><userinput>sed -i '138,142d' Makefile</userinput></screen>
--->
-    <para>
-      To run the test suite, issue:
-    </para>
-<screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp" make check</userinput></screen>
-<!-- The blacklists have to be checked every release of Mercurial, do a listing
-     of tests/blacklists, but do not include the README.
-     For 6.4.1 removing the -blacklist entries did not affect the test results
-     although blacklists/fsmonitor and blacklists/linux-vfat still exist. -->
-
-    <para>
-      where <replaceable>&lt;N&gt;</replaceable> is an integer between one
-      and the number of ( processor X threads ), inclusive. Tests may
-      fail because some error messages have changed in Python or
-      some deprecation warnings are printed that were not present when the
-      test was designed.  Two tests are known to fail: test-duplicateoptions.py
-      and test-profile.t.
-    </para>
-      <!--
-      # Ran 908 tests, 65 skipped, 4 failed.  real  10m37.422s -bdubbs  6 Sep 22.
-      # Ran 881 tests,102 skipped, 23 failed.                  -plabs  17 Nov 22.
-      # Ran 919 tests, 64 skipped, 23 failed. real  10m25.285s -bdubbs 10 Jan 23.
-      # Ran 893 tests,101 skipped,  9 failed. real  29m03.014s -bdubbs  5 Mar 23.
-      # Ran 938 tests, 64 skipped,  8 failed. real  32m13.014s -bdubbs 17 Apr 23.
-      # Ran 935 tests, 69 skipped,  8 failed. real  26m15.875s -bdubbs 10 Jun 23.
-      # Ran 940 tests, 64 skipped,  8 failed. real  omitted    -bdubbs 26 Jun 23.
-      # Ran 948 tests, 66 skipped, 0 failed. -pierre 12 Jul 23 (mercurial-6.5).
-      # Ran 950 tests, 65 skipped, 1 failed. -pierre 8  Nov 23 (mercurial-6.5.3).
-      # Ran 948 tests, 66 skipped, 0 failed. -renodr 22 Nov 23 (mercurial-6.6).
-      # Ran 946 tests, 71 skipped, 2 failed. -bdubbs 20 Mar 24 (mercurial-6.7).
-      -->
-    <para>
-      In order to
-      investigate any apparently failing tests, you may use the
-      <command>run-tests.py</command> script. To see the almost forty switches,
-      some of them very useful, issue <command>tests/run-tests.py
-      --help</command>.  Running the following commands, you will execute only
-      the tests that failed before:
-    </para>
-
-<screen remap="test"><userinput>pushd tests  &amp;&amp;
-  rm -rf tmp &amp;&amp;
-  ./run-tests.py --tmpdir tmp test-gpg.t
-popd</userinput></screen>
-
-    <para>
-      Normally, the previous failures will be reproducible. However, if
-      you add the switch <option>--debug</option> before
-      <option>--tmpdir</option>, and run the tests again, some failures may
-      disappear, which is a problem with the test suite. If this happens,
-      there will be no more of these failures even if you do not pass the
-      --debug switch again.
-    </para>
-
-    <para>
-      An interesting switch is <option>--time</option>, which will generate a
-      table of all the executed tests and their respective start, end, user,
-      system and real times once the tests are complete. Note that these
-      switches may be used with <command>make check</command> by including
-      them in the <envar>TESTFLAGS</envar> environment variable.
-    </para>
-
-    <para>
-      Install <application>Mercurial</application> by running the following
-      command (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr install-bin</userinput></screen>
-
-    <para>
-      If you built the documentation, install it by running the following
-      command (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
-
-    <para>
-      After installation, two very quick and simple tests should run
-      correctly. The first one needs some configuration:
-    </para>
-
-<screen><userinput>cat &gt;&gt; ~/.hgrc &lt;&lt; "EOF"
-<literal>[ui]
-username = <replaceable>&lt;user_name&gt; &lt;user@mail&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-    <para>
-      where you must replace &lt;user_name&gt; and &lt;your@mail&gt; (mail
-      is optional and can be omitted). With the user identity defined, run
-      <command>hg debuginstall</command> and several lines will be displayed,
-      the last one reading "no problems detected". Another quick and simple
-      test is just <command>hg</command>, which should output basic commands
-      that can be used with <command>hg</command>.
-    </para>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <command>2to3 -w doc/hgmanpage.py</command>: Since <application>
-        Python 3</application> is used with docutils, one file needs to be
-        converted in order to be compatible.
-      </para>
-
-   </sect2>
--->
-
-  <sect2 role="configuration">
-    <title>Configuring Mercurial</title>
-
-    <sect3 id="mercurial-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mercurial/hgrc</filename> and
-        <filename>~/.hgrc</filename>
-      </para>
-
-      <indexterm zone="mercurial mercurial-config">
-        <primary sortas="e-etc-mercurial-hgrc">/etc/mercurial/hgrc</primary>
-      </indexterm>
-
-      <indexterm zone="mercurial mercurial-config">
-        <primary sortas="e-AA.hgrc">~/.hgrc</primary>
-      </indexterm>
-
-      <para>
-        The great majority of extensions are disabled by default. Run
-        <command>hg help extensions</command> if you need to enable any, e.g.
-        when investigating test failures. This will output a list of enabled
-        and disabled extensions, as well as more information such as how to
-        enable or disable extensions using configuration files.
-      </para>
-
-      <para>
-        If you have installed <xref linkend="make-ca"/> and want
-        <application>Mercurial</application> to use the certificates,
-        as the <systemitem class="username">root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>install -v -d -m755 /etc/mercurial &amp;&amp;
-cat &gt; /etc/mercurial/hgrc &lt;&lt; "EOF"
-<literal>[web]
-cacerts = /etc/pki/tls/certs/ca-bundle.crt</literal>
-EOF</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>
-          hg
-        </seg>
-        <seg>
-          several internal modules under
-          /usr/lib/python&python3-majorver;/site-packages/mercurial
-        </seg>
-        <seg>
-          /etc/mercurial,
-          /usr/lib/python&python3-majorver;/site-packages/hgdemandimport,
-          /usr/lib/python&python3-majorver;/site-packages/hgext,
-          /usr/lib/python&python3-majorver;/site-packages/hgext3rd,
-          /usr/lib/python&python3-majorver;/site-packages/mercurial, and
-          /usr/lib/python&python3-majorver;/site-packages/mercurial-&mercurial-version;-py&python3-majorver;.egg-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hg">
-        <term><command>hg</command></term>
-        <listitem>
-          <para>
-            is the mercurial version control system
-          </para>
-          <indexterm zone="mercurial hg">
-            <primary sortas="b-hg">hg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nasm-download-http "https://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz">
-  <!ENTITY nasm-download-ftp  " ">
-  <!ENTITY nasm-md5sum        "2b8c72c52eee4f20085065e68ac83b55">
-  <!ENTITY nasm-size          "1008.1 KB">
-  <!ENTITY nasm-buildsize     "41 MB" >
-  <!ENTITY nasm-time          "0.2 SBU">
-]>
-
-<sect1 id="nasm" xreflabel="NASM-&nasm-version;">
-  <?dbhtml filename="nasm.html" ?>
-
-
-  <title>NASM-&nasm-version;</title>
-
-  <indexterm zone="nasm">
-    <primary sortas="a-NASM">NASM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NASM</title>
-
-    <para>
-      <application>NASM</application> (Netwide Assembler) is an 80x86
-      assembler designed for portability and modularity. It includes a
-      disassembler as well.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nasm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nasm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nasm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nasm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nasm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nasm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional documentation: <ulink
-          url="https://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;-xdoc.tar.xz"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NASM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (for generating documentation):</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NASM</title>
-
-    <para>
-      If you downloaded the optional documentation, put it into the
-      source tree:
-    </para>
-
-<screen><userinput>tar -xf ../nasm-&nasm-version;-xdoc.tar.xz --strip-components=1</userinput></screen>
-
-    <para>
-      Install <application>NASM</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>
-
-    <para>
-      If you downloaded the optional documentation, install it with the
-      following instructions as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -m755 -d         /usr/share/doc/nasm-&nasm-version;/html  &amp;&amp;
-cp -v doc/html/*.html    /usr/share/doc/nasm-&nasm-version;/html  &amp;&amp;
-cp -v doc/*.{txt,ps,pdf} /usr/share/doc/nasm-&nasm-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>nasm and ndisasm</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/nasm-&nasm-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nasm-prog">
-        <term><command>nasm</command></term>
-        <listitem>
-          <para>
-            is a portable 80x86 assembler
-          </para>
-          <indexterm zone="nasm nasm-prog">
-            <primary sortas="b-nasm">nasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ndisasm">
-        <term><command>ndisasm</command></term>
-        <listitem>
-          <para>
-            is an 80x86 binary file disassembler
-          </para>
-          <indexterm zone="nasm ndisasm">
-            <primary sortas="b-ndisasm">ndisasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/ojdk-conf.xml
===================================================================
--- general/prog/ojdk-conf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="ojdk-conf" xreflabel="Configuring the Java environment">
-  <?dbhtml filename="ojdk-conf.html"?>
-
-
-  <title>Configuring the Java environment</title>
-
-  <sect2 id="java-profile">
-    <title>Setting up the environment</title>
-
-    <para>
-      After the package installation is complete, the next step is to make sure
-      that the system can properly find the files.  If you set up your login
-      scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
-      the environment by creating the <filename>openjdk.sh</filename> script,
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/openjdk.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk
-
-# Adjust PATH
-pathappend $JAVA_HOME/bin
-
-# Auto Java CLASSPATH: Copy jar files to, or create symlinks in, the
-# /usr/share/java directory.
-
-AUTO_CLASSPATH_DIR=/usr/share/java
-
-pathprepend . CLASSPATH
-
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
-    pathappend $jar CLASSPATH
-done
-
-export JAVA_HOME
-
-# By default, Java creates several files in a directory named
-# /tmp/hsperfdata_[username]. This directory contains files that are used for
-# performance monitoring and profiling, but aren't normally needed on a BLFS
-# system. This environment variable disables that feature.
-_JAVA_OPTIONS="-XX:-UsePerfData"
-
-export _JAVA_OPTIONS
-
-unset AUTO_CLASSPATH_DIR dir jar _JAVA_OPTIONS
-
-# End /etc/profile.d/openjdk.sh</literal>
-EOF</userinput></screen>
-
-    <para>
-      If <xref linkend="sudo"/> is installed, the super user should have
-      access to the above variables. Execute the following commands as the
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/java &lt;&lt; "EOF"
-<literal>Defaults env_keep += JAVA_HOME
-Defaults env_keep += CLASSPATH
-Defaults env_keep += _JAVA_OPTIONS</literal>
-EOF</userinput></screen>
-
-    <para>
-      To use <command>mandb</command> to include the OpenJDK man pages
-      in its database, issue, as the <systemitem class="username">root
-      </systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin Java addition
-MANDATORY_MANPATH     /opt/jdk/man
-MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
-MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
-# End Java addition</literal>
-EOF
-
-mkdir -p /var/cache/man &amp;&amp;
-mandb -c /opt/jdk/man</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="ojdk-certs" xreflabel="installing the JVM Certificate Authority Certificates">
-
-    <title>Setting up the Certificate Authority Certificates for Java</title>
-
-    <para>
-      <application>OpenJDK</application> uses its own format for the
-      CA certificates. The Java security modules use
-      <envar>$JAVA_HOME</envar><filename>/lib/security/cacerts</filename> by
-      default. In order to keep all the certificates in one place, we use
-      <filename>/etc/ssl/java/cacerts</filename>. The instructions
-      on the <xref linkend="make-ca"/> page previously created the file
-      located in <filename class="directory">/etc/ssl/java</filename>.
-      Set up a symlink in the default location as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ln -sfv /etc/pki/tls/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
-
-    <para>
-      Use the following command to check if the <filename>cacerts</filename>
-      file has been successfully installed:
-    </para>
-
-<screen role="root"><userinput>/opt/jdk/bin/keytool -list -cacerts</userinput></screen>
-
-    <para>
-      At the prompt <computeroutput>Enter keystore password:</computeroutput>,
-      enter <userinput>changeit</userinput> (the default) or just press the
-      <quote>Enter</quote> key. If the <filename>cacerts</filename> file was
-      installed correctly, you will see a list of the certificates with
-      related information for each one. If not, you need to reinstall them.
-    </para>
-
-    <para>
-      If you later install a new JVM, you just have to create the symlink in
-      the default location to be able to use the cacerts.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,936 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
-  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk21u">
-  <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
-
-  <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
-
-  <!ENTITY ojdk-md5sum               "6b714196cac31ebf31a0fc1a910ccb87">
-  <!ENTITY ojdk-size                 "107 MB">
-
-  <!ENTITY jtreg-version             "7.3.1+1">
-  <!ENTITY jtreg-download            "&anduin-download;/jtreg-&jtreg-version;.tar.gz">
-  <!ENTITY jtreg-md5sum              "0038551ecaf37d0cd99832217f79e56d">
-  <!ENTITY jtreg-size                "9.0 MB">
-
-  <!ENTITY ojdk-bdsize               "3.7 GB (add 557 MB for tests)">
-  <!ENTITY ojdk-time                 "5.2 SBU with 4 jobs (add 32 SBU for tests with 4 jobs)">
-]>
-
-<sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;">
-  <?dbhtml filename="openjdk.html" ?>
-
-
-  <title>OpenJDK-&openjdk-version;</title>
-
-  <indexterm zone="openjdk">
-    <primary sortas="a-OpenJDK">OpenJDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJDK</title>
-
-    <para>
-      <application>OpenJDK</application> is an open-source implementation
-      of Oracle's Java Standard Edition platform.
-      <application>OpenJDK</application> is useful for developing
-      <application>Java</application> programs, and provides a complete
-      runtime environment to run <application>Java</application> programs.
-    </para>
-
-    &lfs121_checked;
-
-    <para>
-      OpenJDK is GPL'd code, with a special exception made for non-free
-      projects to use these classes in their proprietary products.
-      In similar fashion to the LGPL, which allows non-free programs to link
-      to libraries provided by free software, the
-      <ulink url="https://openjdk.org/legal/gplv2+ce.html">GNU
-      General Public License, version 2, with the Classpath Exception</ulink>
-      allows third party programs to use classes provided by free software
-      without the requirement that the third party software also be free. As
-      with the LGPL, any modifications made to the free software portions of a
-      third party application, must also be made freely available.
-    </para>
-
-    <note>
-      <para>
-        The <application>OpenJDK</application> source includes a very
-        thorough, open source test suite using the
-        <application>JTreg</application> test harness. The testing instructions
-        below allow testing the just built JDK for reasonable compatibility
-        with the proprietary Oracle JDK. However, in order for an independent
-        implementation to claim compatibility, it must pass a proprietary
-        <application>JCK/TCK</application> test suite. No claims of
-        compatibility, or even partial compatibility, may be made without passing
-        an approved test suite.
-      </para>
-
-      <para>
-        Oracle does provide free community access, on a case-by-case basis, to
-        a closed toolkit to ensure 100% compatibility with its proprietary JDK.
-        Neither the binary version provided on the <xref linkend="java"/> page
-        nor the JVM built with the instructions below have been tested against
-        the <ulink
-  url="https://openjdk.java.net/groups/conformance/JckAccess/jck-access.html">
-        TCK</ulink>. Any version that is built using the instructions given,
-        cannot claim to be compatible with the proprietary JDK, without the
-        user applying for, and completing the compatibility tests themselves.
-      </para>
-
-      <para>
-        With that in mind, the binaries produced using this build method are
-        regularly tested against the TCK by the members listed on the site
-        above. In addition to the community license above, an educational,
-        non-commercial license for the TCK can be obtained <ulink
-        url="https://www.oracle.com/java/scholarship-program.html">
-        here</ulink>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ojdk-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url=" "/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ojdk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download Size: &ojdk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ojdk-bdsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ojdk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <para>
-      <emphasis role="strong">Optional test harness</emphasis>
-    </para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          <ulink url="&jtreg-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jtreg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download Size: &jtreg-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect4">Required patch</bridgehead>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          <ulink url="&patch-root;/openjdk-&openjdk-version;-make_4.3_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required Dependencies</bridgehead>
-    <para role="required">
-      An existing binary (<xref linkend="java"/> or an earlier built
-      version of this package. The instructions below assume that
-      you are using <xref linkend="ojdk-conf"/>),
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="cpio"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="unzip"/>,
-      <xref linkend="which"/>,
-      <xref linkend="xorg7-lib"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="make-ca"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="wget"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/>,
-      <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://ccache.dev/">ccache</ulink>,
-      <ulink url="https://pandoc.org/">pandoc</ulink>, and
-      <ulink url="https://zlib.net/pigz">pigz</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJDK</title>
-
-    <para>
-      If you have downloaded the optional test harness, unpack it now:
-    </para>
-
-<screen><userinput>tar -xf ../jtreg-&jtreg-version;.tar.gz</userinput></screen>
-<!--
-    <para>
-      Apply a patch to allow building with make-4.3:
-    </para>
-
-<screen><userinput>patch -p1 -i ../openjdk-&openjdk-version;-make_4.3_fix-1.patch</userinput></screen>
-
-    <para>
-      Fix an issue coming from a removed header in glibc-2.32:
-    </para>
-
-<screen><userinput>sed -i /sysctl/d \
-    src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp</userinput></screen>
--->
-    <note>
-      <para>
-        Before proceeding, you should ensure that your environment
-        <envar>PATH</envar> variable contains the location of the Java
-        compiler used for bootstrapping <application>OpenJDK</application>.
-        This is the only requirement for the environment. Modern Java
-        installations do not need <envar>JAVA_HOME</envar> and
-        <envar>CLASSPATH</envar> is not used here. Furthermore, OpenJDK
-        developers recommend unsetting <envar>JAVA_HOME</envar>.
-      </para>
-
-      <para>
-        The build system does not allow the <option>-j</option> switch in
-        <envar>MAKEFLAGS</envar>. See the command explanation for
-        <option>--with-jobs=</option>
-        for more information on customizing parallelization.
-      </para>
-    </note>
-
-    <para>
-      Configure and build the package with the following commands:
-    </para>
-
-<screen><userinput>unset JAVA_HOME                             &amp;&amp;
-bash configure --enable-unlimited-crypto    \
-               --disable-warnings-as-errors \
-               --with-stdc++lib=dynamic     \
-               --with-giflib=system         \
-               --with-harfbuzz=system       \
-               --with-jtreg=$PWD/jtreg      \
-               --with-lcms=system           \
-               --with-libjpeg=system        \
-               --with-libpng=system         \
-               --with-zlib=system           \
-               --with-version-build="&openjdk-build;"    \
-               --with-version-pre=""        \
-               --with-version-opt=""        \
-               --with-cacerts-file=/etc/pki/tls/java/cacerts &amp;&amp;
-make images</userinput></screen>
-
-    <para>
-      To test the results, you will need to execute the jtreg program.
-      You can set the number of concurrent tests by adding the
-      <parameter>-conc:<replaceable>&lt;X&gt;</replaceable></parameter>
-      value in the below command (tests will run sequentially otherwise):
-    </para>
-
-<screen remap="test"><userinput>export JT_JAVA=$(echo $PWD/build/*/jdk) &amp;&amp;
-jtreg/bin/jtreg -jdk:$JT_JAVA -automatic -ignore:quiet -v1 \
-    test/jdk:tier1 test/langtools:tier1 &amp;&amp;
-unset JT_JAVA</userinput></screen>
-
-    <para>
-      For more control over the test suite, review the documentation
-      available in <filename>jtreg/doc/jtreg/usage.txt</filename>. To review
-      the results, see the files
-      <filename>JTreport/test_{jdk,langtools}/text/stats.txt</filename> and
-      <filename>JTreport/test_{jdk,langtools}/text/summary.txt</filename>.
-      You should expect to see around 60 failures and 10 errors.
-    </para>
-    <!--
-         14.0.1+7:
-         for x86_64: passed: 5,836; failed: 42; error: 50
-         17.0.2+8:
-         for x86_64: passed: 6,238; failed: 48; error: 13
-         for i686:   passed: 6,208; failed: 29; error: 6
-         18.0.1+10:
-         for x86_64: passed: 6,323; failed: 53; error: 14
-         for i686:   passed: 6,290; failed: 29; error: 11
-         18.0.1.1+2:
-         for x86_64: passed: 6,323; failed: 53; error: 14
-         for i686:   passed: 6,290; failed: 29; error: 11
-         18.0.2+8:
-         for x86_64: passed: 6,329; failed: 50; error: 14
-         for i686:   passed: 6,289; failed: 31; error: 13
-         19.0.1+10:
-         for x86_64: passed: 6,423; failed: 58; error: 15
-         for i686:   passed: 6,376; failed: 31; error: 12
-         19.0.2+7:
-         for x86_64: passed: 6,426; failed: 61; error: 14
-         for i686:   passed: 6,377; failed: 34; error: 11
-         20.0.1+9:
-         for x86_64: passed: 6,515; failed: 65; error: 13
-         for i686:   passed: 6,520; failed: 60; error: 13
-         20.0.2+9:
-         for x86_64: passed: 6,515; failed: 65; error: 14
-         for i686:   passed: 6,446; failed: 33; error: 12
-         21+35:
-         for x86_64: passed: 6,699; failed: 72; error: 13
-         for i686:   passed: 6,627; failed: 30; error: 10
-         21.0.1+12:
-         for x86_64: passed: 6,706; failed: 72; error: 14
-         for i686:   passed: 6,636; failed: 29; error: 11
-         21.0.2+13:
-         for x86_64: passed: 6,698; failed: 71; error: 13
-         for i686:   passed: 6,606; failed: 30; error: 34
-    -->
-
-    <para>
-      Install the package with the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /opt/jdk-&openjdk-version;+&openjdk-build;             &amp;&amp;
-cp -Rv build/*/images/jdk/* /opt/jdk-&openjdk-version;+&openjdk-build; &amp;&amp;
-chown -R root:root /opt/jdk-&openjdk-version;+&openjdk-build;          &amp;&amp;
-for s in 16 24 32 48; do
-  install -vDm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
-                  /usr/share/icons/hicolor/${s}x${s}/apps/java.png
-done</userinput></screen>
-
-    <note>
-      <para>
-        If you only wish to install the Java Runtime Environment, you can
-        substitute <filename>build/*/images/jre</filename> in the above
-        <command>cp</command> command.
-      </para>
-    </note>
-
-    <para>
-      There are now two <application>OpenJDK</application> SDKs installed
-      in <filename class="directory">/opt</filename>. You should decide on
-      which one you would like to use as the default. Normally, you would opt
-      for the just installed <application>OpenJDK</application>. If so, do
-      the following as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>ln -v -nsf jdk-&openjdk-version;+&openjdk-build; /opt/jdk</userinput></screen>
-
-    <para>
-      If desired, you can create .desktop files to add entries
-      in the menu for <command>java</command>
-      and <command>jconsole</command>. The needed icons have already been
-      installed. As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/openjdk-java.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Name=OpenJDK Java &openjdk-version; Runtime
-Comment=OpenJDK Java &openjdk-version; Runtime
-Exec=/opt/jdk/bin/java -jar
-Terminal=false
-Type=Application
-Icon=java
-MimeType=application/x-java-archive;application/java-archive;application/x-jar;
-NoDisplay=true</literal>
-EOF
-cat &gt; /usr/share/applications/openjdk-jconsole.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Name=OpenJDK Java &openjdk-version; Console
-Comment=OpenJDK Java &openjdk-version; Console
-Keywords=java;console;monitoring
-Exec=/opt/jdk/bin/jconsole
-Terminal=false
-Type=Application
-Icon=java
-Categories=Application;System;</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>bash configure...</command>: the top level
-      <filename>configure</filename> is a wrapper around the autotools one.
-      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
-      with GCC 10.
-    </para>
--->
-    <para>
-      <parameter>--enable-unlimited-crypto</parameter>: Because of limitations
-      on the usage of cryptography in some countries, there is the possibility
-      to limit the size of encryption keys and the use of some algorithms in a
-      policy file. This switch allows to ship a policy file with no
-      restriction. It is the responsibility of the user to ensure proper
-      adherence to the law.
-    </para>
-
-    <para>
-      <parameter>--disable-warnings-as-errors</parameter>: This switch disables
-      use of <envar>-Werror</envar> in the build.
-    </para>
-
-    <para>
-      <parameter>--with-stdc++lib=dynamic</parameter>: This switch forces the
-      build system to link to <filename>libstdc++.so</filename> (dynamic)
-      instead of <filename>libstdc++.a</filename> (static).
-    </para>
-
-    <para>
-      <option>--with-jobs=<replaceable>&lt;X&gt;</replaceable></option>:
-      The <parameter>-j</parameter> passed to make does not work with make as
-      invoked here. By default, the build system will use the number of
-      CPUs - 1.
-    </para>
-
-    <para>
-      <parameter>--with-jtreg=$PWD/jtreg</parameter>: This switch tells
-      configure where to find jtreg. Omit if you have not downloaded the
-      optional test suite.
-    </para>
-
-    <para>
-      <parameter>--with-{giflib,harfbuzz,lcms,libjpeg,libpng,zlib}=system</parameter>:
-      These switches force the build system to use the system libraries instead
-      of the bundled versions.
-    </para>
-
-    <para>
-      <parameter>--with-version-build</parameter>: Currently, the build
-      system does not include the build number in the version string. It has
-      to be specified here.
-    </para>
-
-    <para>
-      <parameter>--with-version-pre</parameter>: This switch allows you to
-      prefix the version string with a custom string.
-    </para>
-
-    <para>
-      <parameter>--with-version-opt</parameter>: This switch allows you to add
-      an optional build description to the version string.
-    </para>
-
-    <para>
-      <parameter>--with-cacerts-file=/etc/pki/tls/java/cacerts</parameter>:
-      Specifies where to find a <filename>cacerts</filename> file,
-      <filename>/etc/pki/tls/java/</filename> on a BLFS system. Otherwise, an
-      empty one is created. You can use the
-      <command>/usr/sbin/make-ca --force</command> command to generate it, once
-      you have installed the Java binaries.
-    </para>
-
-    <para>
-      <option>--with-boot-jdk</option>: This switch provides the
-      location of the temporary <application>JDK</application>. It is normally
-      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>
-
-  <sect2 role="configuration"
-         id="openjdk-config"
-         xreflabel="Configuring OpenJDK">
-    <title>Configuring OpenJDK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Normally, the Java environment has been configured after installing
-        the binary version, and can be used with the just built package as well.
-        Review <xref linkend="ojdk-conf"/> in case you want to modify
-        something.
-      </para>
-
-      <para>
-        To test if the man pages are correctly installed, issue
-        <command>source /etc/profile</command> and <command>man java</command>
-        to display the respective man page.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>
-        Setting up the JRE Certificate Authority Certificates (cacerts) file
-      </title>
-
-      <para>
-        If you have run the instructions on the <xref linkend="make-ca"/> page,
-        you only need to create a symlink in the default location for the
-        <filename>cacerts</filename> file. As user <systemitem
-        class="username">root</systemitem>:
-      </para>
-
-<screen role="root"><userinput>ln -sfv /etc/pki/tls/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
-
-      <para>
-        To check the installation, issue:
-      </para>
-
-<screen role="root"><userinput>cd /opt/jdk
-bin/keytool -list -cacerts</userinput></screen>
-
-    <para>
-      At the prompt <computeroutput>Enter keystore password:</computeroutput>,
-      enter <userinput>changeit</userinput> (the default) or just press the
-      <quote>Enter</quote> key. If the <filename>cacerts</filename> file was
-      installed correctly, you will see a list of the certificates with
-      related information for each one. If not, you need to reinstall them.
-    </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>jar, jarsigner, java, javac, javadoc, javap, jcmd,
-        jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo,
-        jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
-        jstat, jstatd, jwebserver, keytool, rmiregistry, and serialver</seg>
-        <seg>37 libraries in /opt/jdk-&openjdk-version;+&openjdk-build;/lib/</seg>
-        <seg>/opt/jdk-&openjdk-version;+&openjdk-build;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jar">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>
-            combines multiple files into a single jar archive
-          </para>
-          <indexterm zone="openjdk jar">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>
-            signs jar files and verifies the signatures and integrity
-            of a signed jar file
-          </para>
-          <indexterm zone="openjdk jarsigner">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-prog">
-        <term><command>java</command></term>
-        <listitem>
-          <para>
-            launches a Java application by starting a Java runtime
-            environment, loading a specified class and invoking its main
-            method
-          </para>
-          <indexterm zone="openjdk java-prog">
-            <primary sortas="b-java-prog">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>
-            reads class and interface definitions, written in the
-            Java programming language, and compiles them into bytecode
-            class files
-          </para>
-          <indexterm zone="openjdk javac">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>
-            parses the declarations and documentation comments in a
-            set of Java source files and produces a corresponding set of
-            HTML pages describing the classes, interfaces, constructors,
-            methods, and fields
-          </para>
-          <indexterm zone="openjdk javadoc">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>
-            disassembles a Java class file
-          </para>
-          <indexterm zone="openjdk javap">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jcmd">
-        <term><command>jcmd</command></term>
-        <listitem>
-          <para>
-            is a utility to send diagnostic command requests to a running
-            Java Virtual Machine
-          </para>
-          <indexterm zone="openjdk jcmd">
-            <primary sortas="b-jcmd">jcmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>
-            is a graphical console tool to monitor and manage both
-            local and remote Java applications and virtual machines
-          </para>
-          <indexterm zone="openjdk jconsole">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>
-            is a simple command-line debugger for Java classes
-          </para>
-          <indexterm zone="openjdk jdb">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdeprscan">
-        <term><command>jdeprscan</command></term>
-        <listitem>
-          <para>
-            scans class or jar files for uses of deprecated API elements
-          </para>
-          <indexterm zone="openjdk jdeprscan">
-            <primary sortas="b-jdeprscan">jdeprscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdeps">
-        <term><command>jdeps</command></term>
-        <listitem>
-          <para>
-            shows the package-level or class-level dependencies of
-            Java class files
-          </para>
-          <indexterm zone="openjdk jdeps">
-            <primary sortas="b-jdeps">jdeps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfr">
-        <term><command>jfr</command></term>
-        <listitem>
-          <para>
-            is a tool for working with <quote>Flight Recorder</quote> files
-          </para>
-          <indexterm zone="openjdk jfr">
-            <primary sortas="b-jfr">jfr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhsdb">
-        <term><command>jhsdb</command></term>
-        <listitem>
-          <para>
-            is a tool to analyze the content of a core dump from a
-            crashed Java Virtual Machine (JVM)
-          </para>
-          <indexterm zone="openjdk jhsdb">
-            <primary sortas="b-jhsdb">jhsdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jimage">
-        <term><command>jimage</command></term>
-        <listitem>
-          <para>
-            is used to list, extract, verify, or get information about
-            modules in <emphasis>jimage</emphasis> format
-          </para>
-          <indexterm zone="openjdk jimage">
-            <primary sortas="b-jimage">jimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>
-            prints Java configuration information for a given Java
-            process, core file, or a remote debug server
-          </para>
-          <indexterm zone="openjdk jinfo">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jlink">
-        <term><command>jlink</command></term>
-        <listitem>
-          <para>
-            is used to assemble and optimize a set of modules and their
-            dependencies into a custom runtime image
-          </para>
-          <indexterm zone="openjdk jlink">
-            <primary sortas="b-jlink">jlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>
-            prints shared object memory maps or heap memory details
-            of a given process, core file, or a remote debug server
-          </para>
-          <indexterm zone="openjdk jmap">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmod">
-        <term><command>jmod</command></term>
-        <listitem>
-          <para>
-            creates JMOD files and lists the content of existing JMOD files
-          </para>
-          <indexterm zone="openjdk jmod">
-            <primary sortas="b-jmod">jmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpackage">
-        <term><command>jpackage</command></term>
-        <listitem>
-          <para>
-            generates java application packages and images
-          </para>
-          <indexterm zone="openjdk jpackage">
-            <primary sortas="b-jpackage">jpackage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>
-            lists the instrumented JVMs on the target system
-          </para>
-          <indexterm zone="openjdk jps">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>
-            is a command line script shell
-          </para>
-          <indexterm zone="openjdk jrunscript">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jshell">
-        <term><command>jshell</command></term>
-        <listitem>
-          <para>
-            is an interactive tool for learning the Java programming
-            language and prototyping Java code
-          </para>
-          <indexterm zone="openjdk jshell">
-            <primary sortas="b-jshell">jshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>
-            prints Java stack traces of Java threads for a given
-            Java process, core file, or a remote debug server
-          </para>
-          <indexterm zone="openjdk jstack">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>
-            displays performance statistics for an instrumented JVM
-          </para>
-          <indexterm zone="openjdk jstat">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>
-            is an RMI server application that monitors for the creation
-            and termination of instrumented JVMs
-          </para>
-          <indexterm zone="openjdk jstatd">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jwebserver">
-        <term><command>jwebserver</command></term>
-        <listitem>
-          <para>
-            provides a minimal HTTP server, designed to be used for
-            prototyping, testing, and debugging
-          </para>
-          <indexterm zone="openjdk jwebserver">
-            <primary sortas="b-jwebserver">jwebserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>
-            is a key and certificate management utility
-          </para>
-          <indexterm zone="openjdk keytool">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>
-            creates and starts a remote object registry on the specified
-            port on the current host
-          </para>
-          <indexterm zone="openjdk rmiregistry">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>
-            returns the serialVersionUID for one or more classes in a
-            form suitable for copying into an evolving class
-          </para>
-          <indexterm zone="openjdk serialver">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/patchelf.xml
===================================================================
--- general/prog/patchelf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 patchelf-download-http "https://github.com/NixOS/patchelf/releases/download/&patchelf-version;/patchelf-&patchelf-version;.tar.gz">
-  <!ENTITY patchelf-download-ftp  " ">
-  <!ENTITY patchelf-md5sum        "b02099b0d63f06b3fe370f4edfc0c085">
-  <!ENTITY patchelf-size          "448 KB">
-  <!ENTITY patchelf-buildsize     "20 MB (with tests)">
-  <!ENTITY patchelf-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="patchelf" xreflabel="patchelf-&patchelf-version;">
-  <?dbhtml filename="patchelf.html"?>
-
-
-  <title>Patchelf-&patchelf-version;</title>
-
-  <indexterm zone="patchelf">
-    <primary sortas="a-patchelf">patchelf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Patchelf</title>
-
-    <para>
-      The <application>patchelf</application> package contains a small
-      utility to modify the dynamic linker and RPATH of ELF executables.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&patchelf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&patchelf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &patchelf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &patchelf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &patchelf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &patchelf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Patchelf</title>
-
-    <para>
-      Install <application>patchelf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/patchelf-&patchelf-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-
-      <seglistitem>
-        <seg>
-          patchelf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="patchelf-prog">
-        <term><command>patchelf</command></term>
-        <listitem>
-          <para>
-            is a simple utility for modifying existing ELF executables and
-            libraries; it can change the dynamic loader ("ELF interpreter")
-            of executables and change the RPATH of executables and
-            libraries.
-          </para>
-          <indexterm zone="patchelf patchelf-prog">
-            <primary sortas="b-patchelf">patchelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/prog/perl-alternatives.xml
===================================================================
--- general/prog/perl-alternatives.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- it seems at least one entity is needed -->
-  <!ENTITY perl-alternatives-dummy      "42">
-]>
-  <!-- Begin perl alternatives -->
-  <sect2 id="perl-alternatives" xreflabel="CPAN automated install of perl modules">
-
-    <title>CPAN automated install of perl modules</title>
-
-    <indexterm zone="perl-alternatives">
-      <primary sortas="a-cpan-install-of-perl-modules">CPAN automated install of perl modules</primary>
-    </indexterm>
-
-    <sect3 role="installation" id="perl-auto-install"
-    xreflabel="automatic installation of perl modules">
-      <title> Automatic Installation of Perl Modules.</title>
-
-      <para>
-        There is an alternate way of installing the modules using the
-        <command>cpan</command> shell <command>install</command> command. The
-        command automatically downloads the latest source from the CPAN archive
-        for the module and any missing prerequisite modules listed by upstream.
-        Then for each module it extracts it, runs the compilation, the tests and
-        installs it.
-      </para>
-
-      <para>
-        You still need to install any non-perl dependencies before running
-        the automated installation method.  You may wish to clean out the
-        <filename class="directory">build/</filename> directory after
-        installing, to free up the space. If any post-install actions such
-        as creating a symlink are mentioned, you should also do those.
-      </para>
-
-      <para>
-        The first time you run <command>cpan</command>, you'll be prompted
-        to enter some information regarding download locations and methods. This
-        information is retained in files located in
-        <filename class='directory'>~/.cpan</filename>.
-      </para>
-
-      <para>
-        In particular, you may wish to configure it so that <xref linkend="sudo"/>
-        is used for the installs, allowing you to build and test as a regular user.
-        The following examples have not used that approach.
-      </para>
-
-      <para>
-        Start the
-        <command>cpan</command> shell by issuing '<command>cpan</command>' as the
-        <systemitem class="username">root</systemitem> user. Any module may now be
-        installed from the
-        <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
-        prompt with the command:
-      </para>
-
-<screen role="root"><userinput>install <replaceable>&lt;Module::Name&gt;</replaceable></userinput></screen>
-
-      <para>
-        For additional commands and help, issue '<command>help</command>'
-        from the
-        <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
-        prompt.
-      </para>
-
-      <para>
-        Alternatively, for scripted or non-interactive installations, use the
-        following syntax as the <systemitem class="username">root</systemitem>
-        user to install one or more modules:
-      </para>
-
-<screen role="root"><userinput>cpan -i <replaceable>&lt;Module1::Name&gt; &lt;Module2::Name&gt;</replaceable></userinput></screen>
-
-      <para>
-        Review the <filename>cpan.1</filename> man page for additional
-        parameters you can pass to <command>cpan</command> on the command line.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-core-modules.txt
===================================================================
--- general/prog/perl-core-modules.txt	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,110 +1,0 @@
-This is an attempt to make it easier to determine dependencies for perl modules
-by reading Makefile.PL or Build.PL and (sometimes) by reading the testscripts.
-
-It is a list of modules in core perl-5.24.0 which are deps for modules I have
-looked at.  Occasionally, a module might need a newer version than what is in
-the current perl release.  Usually, that only affects modules used by
-biblatex-biber.
-
-The '::' translates to '/' when looking at a log of what got installed,
-but some are slightly different (library, not pm ?) and some of the
-modules are in the Arch-OS (x86_64-linux-thread-multi) directory.
-
-If you see 'eval' in a Makefile.PL or in a test, it implies that the module
-may be optional.  There are one or two exceptions in Makefile.PLs where a
-module is only needed with certain versions of another module
-
-This list is in alphabetical order, with digits and '::' after letters,
-NOT ASCII order
-
-B
-B::Deparse
-base
-blib
-bytes
-Carp
-Compress::Raw::Bzip2
-Compress::Raw::Zlib
-Config
-constant
-CPAN::Meta
-CPAN::Meta::Prereqs
-CPAN::Meta::Requirements
-Cwd
-Data::Dumper
-Devel::Peek
-Dynaloader
-Encode
-Env
-Exporter
-ExtUtils::CBuilder
-ExtUtils::MakeMaker
-ExtUtils::MM_Unix
-Fcntl
-File::Basename
-File::Compare
-File::Copy
-File::Find
-File::Glob
-File::Path
-File::Spec
-File::Spec::Functions
-File::Temp
-File::Which
-FileHandle
-FindBin
-Getopt::Long
-Hash::Util
-if
-Importer
-integer
-IO::File
-IO::Handle
-IO::Select
-IO::Socket::IP
-IPC::Cmd
-IPC::Open2
-IPC::Open3
-JSON::PP
-lib
-List::Util
-Math::BigInt
-Module::Metadata
-open
-overload
-parent
-PerlIO
-Pod::Simple
-POSIX
-re
-Scalar::Util
-Storable
-strict
-Sub::Util
-Symbol
-Sys::Hostname
-Test
-Test::Builder
-Test::Builder::Module
-Test::Builder::Tester
-Test::Harness
-Test::More
-Test::Tester
-Text::Balanced
-Text::ParseWords
-Tie::Array
-Tie::Hash
-Time::HighRes
-Time::Local
-Unicode::Collate
-Unicode::Normalize
-utf8
-vars
-version
-warnings
-warnings::register
-XSLoader
-
-Any reference to inc:: in the Makefile.PL means that a module used
-during the build or install is shipped within the tarball.
-
Index: neral/prog/perl-deps.xml
===================================================================
--- general/prog/perl-deps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,849 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="perl-deps" xreflabel="Perl Module Dependencies">
-  <?dbhtml filename="perl-deps.html" ?>
-
-
-  <title>Perl Module Dependencies</title>
-
-  <indexterm zone="perl-deps">
-    <primary sortas="a-perl-module-dependencies">Perl Module Dependencies</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Perl Modules which are only required by other modules</title>
-
-    <para>
-      The modules on the previous page are referenced from other pages in BLFS,
-      but these modules are only in the book as dependencies of those modules.
-      If you use the CPAN install method, you do not need to read this page.
-   </para>
-
-    <para>
-      The BLFS editors pay much less attention to these modules, and the
-      versions will not be regularly reviewed. In all cases, only the required or
-      recommended dependencies are listed - there might be other modules which
-      allow more tests to be run, but omitting them will still allow the tests to
-      <literal>PASS</literal>.
-    </para>
-
-    <note>
-      <para>
-        The links on this page (to metacpan.org) should go to "known good"
-        versions, for which their dependencies are correct. If you wish to use a
-        later version, please check the Changes file at https://metacpan.org -
-        sometimes added dependencies are listed, other times not. Some of these
-        modules have very frequent updates, often bringing different dependencies.
-        <!-- FIXME - change or comment this when necessary -->
-        The linked metacpan.org versions below were known to work with the
-        module versions in BLFS when last reviewed.
-      </para>
-
-      <para>
-        However, if you notice that the Changes file for a newer version than is
-        in the current development book reports a fix for a security issue, please
-        report this to either the blfs-dev or the blfs-support list.
-      </para>
-
-      <para>
-        Similarly, if you discover that an updated module on the previous page
-        needs an extra dependency, please report this.
-      </para>
-    </note>
-
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="perl-algorithm-diff"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-alien-build"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-alien-build-plugin-download-gitlab"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-alien-libxml2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-b-cow"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-b-hooks-endofscope"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-isbn-data"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-capture-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-data-inheritable"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-inspector"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-singleton"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-clone"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-config-autoconf"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-cpan-meta-check"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-format-strptime"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-locale"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-timezone"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-devel-stacktrace"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-dist-checkconflicts"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-locale"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-eval-closure"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-exception-class"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-exporter-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-extutils-libbuilder"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-ffi-checklib"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-chdir"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-copy-recursive"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-find-rule"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-listing"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-sharedir"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-sharedir-install"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-html-tagset"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-cookiejar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-cookies"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-date"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-message"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-negotiate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-io-html"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-ipc-system-simple"/>
-        </para>
-      </listitem>
-<!--  <listitem> moved to perl-modules, for install-tl_unx
-        <para>
-          <xref linkend="perl-libwww-perl"/>
-        </para>
-      </listitem>-->
-      <listitem>
-        <para>
-          <xref linkend="perl-list-moreutils-xs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-someutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-someutils-xs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-utilsby"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-lwp-mediatypes"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-mime-charset"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-module-implementation"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-module-runtime"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-mro-compat"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-namespace-autoclean"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-namespace-clean"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-net-http"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-net-ssleay"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-number-compare"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-package-stash"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-params-validate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-params-validationcompiler"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-path-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-role-tiny"/>
-        </para>
-      </listitem>
-<!--  <listitem> in core modules of perl-5.36, with same version as cpan
-        <para>
-          <xref linkend="perl-scalar-list-utils"/>
-        </para>
-      </listitem>-->
-      <listitem>
-        <para>
-          <xref linkend="perl-scope-guard"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-specio"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-exporter-progressive"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-identify"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-quote"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-uplevel"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          <xref linkend="perl-super"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="perl-term-table"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-deep"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-exception"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-fatal"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-file"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-file-sharedir"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-leaktrace"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          <xref linkend="perl-test-mockmodule"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="perl-test-needs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-requires"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-requiresinternet"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-utf8"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-warnings"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-without-module"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test2-plugin-nowarnings"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test2-suite"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-csv_xs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-diff"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-glob"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-tie-cycle"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-timedate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-try-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-variable-magic"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-www-robotrules"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-libxml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-namespacesupport"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-sax"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-sax-base"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-algorithm-diff.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-alien-build.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-alien-build-plugin-download-gitlab.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-alien-libxml2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-b-cow.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-b-hooks-endofscope.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-business-isbn-data.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-capture-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-data-inheritable.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-inspector.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-singleton.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-clone.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-config-autoconf.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-cpan-meta-check.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime-format-strptime.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime-locale.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime-timezone.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-devel-stacktrace.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-dist-checkconflicts.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-encode-locale.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-eval-closure.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-exception-class.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-exporter-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-extutils-libbuilder.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-ffi-checklib.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-chdir.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-copy-recursive.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-find-rule.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-listing.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-sharedir.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-sharedir-install.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-html-tagset.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-cookiejar.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-cookies.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-date.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-message.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-negotiate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-io-html.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-ipc-system-simple.xml"/>
-
-<!-- moved to perl-modules for install-tl_unx
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-libwww-perl.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-moreutils-xs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-someutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-someutils-xs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-utilsby.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-lwp-mediatypes.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-mime-charset.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-module-implementation.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-module-runtime.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-mro-compat.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-namespace-autoclean.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-namespace-clean.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-net-http.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-net-ssleay.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-number-compare.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-package-stash.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-params-validate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-params-validationcompiler.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-path-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-role-tiny.xml"/>
-  <!-- in core modules of perl-5.36, with same version as cpan
-  <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"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-specio.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-exporter-progressive.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-identify.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-quote.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-uplevel.xml"/>
-
-<!-- Only used in Test::MockModule, which was archived since Archive::Zip no
-     longer uses it.
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-super.xml"/>
--->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-term-table.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-deep.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-exception.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-fatal.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-file.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-file-sharedir.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-leaktrace.xml"/>
-
-<!-- Only referenced in Archive::Zip, and no longer used there.
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-mockmodule.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-needs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-requires.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-requiresinternet.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-utf8.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-warnings.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-without-module.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test2-plugin-nowarnings.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test2-suite.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-text-csv_xs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-text-diff.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-text-glob.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-tie-cycle.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-timedate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-try-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-variable-magic.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-www-robotrules.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-libxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-namespacesupport.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-sax.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-sax-base.xml"/>
-
-</sect1>
Index: neral/prog/perl-deps/perl-algorithm-diff.xml
===================================================================
--- general/prog/perl-deps/perl-algorithm-diff.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RJ/RJBS//Algorithm-Diff-&Algorithm-Diff-version;.tar.gz">
-  <!ENTITY my-md5sum "2eaae910f5220261ee2bbdfc4a8df2c2">
-
-]>
-
-  <!-- Begin Algorithm::Diff -->
-  <sect2 id="perl-algorithm-diff" xreflabel="Algorithm-Diff-&Algorithm-Diff-version;">
-
-    <title>Algorithm::Diff-&Algorithm-Diff-version;</title>
-
-    <indexterm zone="perl-algorithm-diff">
-      <primary sortas="a-Algorithm-Diff">Algorithm::Diff</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Algorithm::Diff</title>
-
-      <para>
-        Algorithm::Diff computes 'intelligent' differences between two files or
-        lists.
-      </para>
-
-      &lfs121_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 Algorithm::Diff</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-alien-build-plugin-download-gitlab.xml
===================================================================
--- general/prog/perl-deps/perl-alien-build-plugin-download-gitlab.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PL/PLICEASE/Alien-Build-Plugin-Download-GitLab-&Alien-Build-Plugin-Download-GitLab-version;.tar.gz">
-  <!ENTITY my-md5sum "ad1d815262ad7dd98b0a9b35ba2f05ef">
-
-]>
-
-  <!-- Begin Alien::Build -->
-  <sect2 id="perl-alien-build-plugin-download-gitlab" xreflabel="Alien-Build-Plugin-Download-GitLab-&Alien-Build-Plugin-Download-GitLab-version;">
-
-    <title>Alien::Build::Plugin::Download::GitLab-&Alien-Build-Plugin-Download-GitLab-version;</title>
-
-    <indexterm zone="perl-alien-build-plugin-download-gitlab">
-      <primary sortas="a-Alien-Build-Plugin-Download-GitLab">Alien::Build::Plugin::Download::GitLab</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alien::Build::Plugin::Download::GitLab</title>
-
-      <para>
-        Alien::Build::Plugin::Download::GitLab allows Alien::Build to download
-        from GitLab (in practice, this does not download if the required library
-        is already installed on the system).
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Alien::Build::Plugin::Download::GitLab Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-alien-build"/> and
-        <xref linkend="perl-uri"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alien::Build::Plugin::Download::GitLab</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-alien-build.xml
===================================================================
--- general/prog/perl-deps/perl-alien-build.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PL/PLICEASE/Alien-Build-&Alien-Build-version;.tar.gz">
-  <!ENTITY my-md5sum "f60fe0bb8e96ad328e712675fd7f2d72">
-
-]>
-
-  <!-- Begin Alien::Build -->
-  <sect2 id="perl-alien-build" xreflabel="Alien-Build-&Alien-Build-version;">
-
-    <title>Alien::Build-&Alien-Build-version;</title>
-
-    <indexterm zone="perl-alien-build">
-      <primary sortas="a-Alien-Build">Alien::Build</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alien::Build</title>
-
-      <para>
-        Alien::Build provides tools for building external (non-CPAN) dependencies
-        for CPAN.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Alien::Build Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-capture-tiny"/>,
-        <xref linkend="perl-file-which"/>,
-        <xref linkend="perl-ffi-checklib"/> and
-        <xref linkend="perl-file-chdir"/>
-      </para>
-
-      <!-- the direct test dependencies are also needed at runtime
-           when Alien-Build is used to build Alien-Libxml2
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-      </para>-->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alien::Build</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-alien-libxml2.xml
===================================================================
--- general/prog/perl-deps/perl-alien-libxml2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PL/PLICEASE/Alien-Libxml2-&Alien-Libxml2-version;.tar.gz">
-  <!ENTITY my-md5sum "54ef82ddf7641279a72f216e405f9a5e">
-
-]>
-
-  <!-- Begin Alien::Libxml2 -->
-  <sect2 id="perl-alien-libxml2" xreflabel="Alien-Libxml2-&Alien-Libxml2-version;">
-
-    <title>Alien::Libxml2-&Alien-Libxml2-version;</title>
-
-    <indexterm zone="perl-alien-libxml2">
-      <primary sortas="a-Alien-Libxml2">Alien::Libxml2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alien::Libxml2</title>
-
-      <para>
-        Alien::Libxml2 is designed to allow modules to install the C libxml2
-        library on your system. In BLFS, it uses <command>pkg-config</command>
-        to find how to link to the installed <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Alien::Libxml2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-alien-build-plugin-download-gitlab"/>,
-        <xref linkend="libxml2"/>,
-        <xref linkend="perl-path-tiny"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test2-suite"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alien::Libxml2</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-b-cow.xml
===================================================================
--- general/prog/perl-deps/perl-b-cow.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/A/AT/ATOOMIC/B-COW-&B-COW-version;.tar.gz">
-  <!ENTITY my-md5sum "7afc46f19e6f906e2ba5769b21fca5ff">
-
-]>
-
-  <!-- Begin B::COW -->
-  <sect2 id="perl-b-cow" xreflabel="B-COW-&B-COW-version;">
-
-    <title>B::COW-&B-COW-version;</title>
-
-    <indexterm zone="perl-b-cow">
-      <primary sortas="a-B-COW">B::COW</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to B::COW</title>
-
-      <para>
-        B::COW provides additional helpers for the B core module to check
-        Copy On Write.
-      </para>
-
-      &lfs121_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 B::COW</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-b-hooks-endofscope.xml
===================================================================
--- general/prog/perl-deps/perl-b-hooks-endofscope.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/ET/ETHER/B-Hooks-EndOfScope-&B-Hooks-EndOfScope-version;.tar.gz">
-  <!ENTITY my-md5sum "d738ba65539d4acd601d47cc3e2cbb3a">
-
-]>
-
-  <!-- Begin B::Hooks::EndOfScope -->
-  <sect2 id="perl-b-hooks-endofscope" xreflabel="B-Hooks-EndOfScope-&B-Hooks-EndOfScope-version;">
-
-    <title>B::Hooks::EndOfScope-&B-Hooks-EndOfScope-version;</title>
-
-    <indexterm zone="perl-b-hooks-endofscope">
-      <primary sortas="a-B-Hooks-EndOfScope">B::Hooks::EndOfScope</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to B::Hooks::EndOfScope</title>
-
-      <para>
-        B::Hooks::EndOfScope allows you to execute code when perl finished
-        compiling the surrounding scope.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">B::Hooks::EndOfScope Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-implementation"/>,
-        <xref linkend="perl-sub-exporter-progressive"/> and
-        <xref linkend="perl-variable-magic"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of B::Hooks::EndOfScope</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-business-isbn-data.xml
===================================================================
--- general/prog/perl-deps/perl-business-isbn-data.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/B/BD/BDFOY/Business-ISBN-Data-&Business-ISBN-Data-version;.tar.gz">
-  <!ENTITY my-md5sum "9eecef0abe410be4c41a74adafdca230">
-]>
-
-  <!-- Begin Business-ISBN-Data -->
-  <sect2 id="perl-business-isbn-data" xreflabel="Business-ISBN-Data-&Business-ISBN-Data-version;">
-
-    <title>Business::ISBN::Data-&Business-ISBN-Data-version;</title>
-
-    <indexterm zone="perl-business-isbn-data">
-      <primary sortas="a-Business-ISBN-Data">Business-ISBN-Data</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Business-ISBN-Data</title>
-
-      <para>
-        Business-ISBN-Data is a data pack for Business::ISBN.
-      </para>
-
-      &lfs121_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 Business-ISBN-Data</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-capture-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-capture-tiny.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DA/DAGOLDEN/Capture-Tiny-&Capture-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "f5d24083ad270f8326dd659dd83eeb54">
-
-]>
-
-  <!-- Begin Capture::Tiny -->
-  <sect2 id="perl-capture-tiny" xreflabel="Capture-Tiny-&Capture-Tiny-version;">
-
-    <title>Capture::Tiny-&Capture-Tiny-version;</title>
-
-    <indexterm zone="perl-capture-tiny">
-      <primary sortas="a-Capture-Tiny">Capture::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Capture::Tiny</title>
-
-      <para>
-        The Capture::Tiny module captures STDOUT and STDERR from Perl, XS
-        (eXternal Subroutine, i.e. written in C or C++) or external programs.
-      </para>
-
-      &lfs121_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 Capture::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-class-data-inheritable.xml
===================================================================
--- general/prog/perl-deps/perl-class-data-inheritable.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RS/RSHERER/Class-Data-Inheritable-&Class-Data-Inheritable-version;.tar.gz">
-  <!ENTITY my-md5sum "bd25ecd6e5d528fbc3783edf1b8facef">
-
-]>
-
-  <!-- Begin Class::Data::Inheritable -->
-  <sect2 id="perl-class-data-inheritable" xreflabel="Class-Data-Inheritable-&Class-Data-Inheritable-version;">
-
-    <title>Class::Data::Inheritable-&Class-Data-Inheritable-version;</title>
-
-    <indexterm zone="perl-class-data-inheritable">
-      <primary sortas="a-Class-Data-Inheritable">Class::Data::Inheritable</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Data::Inheritable</title>
-
-      <para>
-        Class::Data::Inheritable is for creating accessor/mutators to class data.
-        That is, if you want to store something about your class as a whole
-        (instead of about a single object).
-      </para>
-
-      &lfs121_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 Class::Data::Inheritable</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-class-inspector.xml
===================================================================
--- general/prog/perl-deps/perl-class-inspector.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PL/PLICEASE/Class-Inspector-&Class-Inspector-version;.tar.gz">
-  <!ENTITY my-md5sum "084c3aeec023639d21ecbaf7d4460b21">
-
-]>
-
-  <!-- Begin Class::Inspector -->
-  <sect2 id="perl-class-inspector" xreflabel="Class-Inspector-&Class-Inspector-version;">
-
-    <title>Class::Inspector-&Class-Inspector-version;</title>
-
-    <indexterm zone="perl-class-inspector">
-      <primary sortas="a-Class-Inspector">Class::Inspector</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Inspector</title>
-
-      <para>
-        Class::Inspector allows you to get information about a loaded class.
-      </para>
-
-      &lfs121_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 Class::Inspector</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-class-singleton.xml
===================================================================
--- general/prog/perl-deps/perl-class-singleton.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/S/SH/SHAY/Class-Singleton-&Class-Singleton-version;.tar.gz">
-  <!ENTITY my-md5sum "d9c84a7b8d1c490c38e88ed1f9faae47">
-
-]>
-
-  <!-- Begin Class::Singleton -->
-  <sect2 id="perl-class-singleton" xreflabel="Class-Singleton-&Class-Singleton-version;">
-
-    <title>Class::Singleton-&Class-Singleton-version;</title>
-
-    <indexterm zone="perl-class-singleton">
-      <primary sortas="a-Class-Singleton">Class::Singleton</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Singleton</title>
-
-      <para>
-        A Singleton describes an object class that can have only one instance in
-        any system, such as a print spooler. This module implements a Singleton
-        class from which other classes can be derived.
-      </para>
-
-      &lfs121_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 Class::Singleton</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-class-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-class-tiny.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-<!-- 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">
-
-]>
-
-  <!-- Begin Class:Tiny -->
-  <sect2 id="perl-class-tiny" xreflabel="Class-Tiny-&Class-Tiny-version;">
-
-    <title>Class:Tiny-&Class-Tiny-version;</title>
-
-    <indexterm zone="perl-class-tiny">
-      <primary sortas="a-Class-Tiny">Class:Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class:Tiny</title>
-
-      <para>
-        Class:Tiny offers a minimalist class construction kit.
-      </para>
-
-      &lfs121_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 Class:Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-clone.xml
===================================================================
--- general/prog/perl-deps/perl-clone.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
- <!-- but for modules which are only dependencies of other modules, put them in
-   general/pprog/perl-deps with a link to &metacpan_authors; that includes the /id part -->
-  <!ENTITY my-download-http "&metacpan_authors;/G/GA/GARU/Clone-&Clone-version;.tar.gz">
- <!-- only one of the above choices -->
-  <!ENTITY my-md5sum "cafa8984a2c2e005e54b27dd1e3f0afe">
-
-]>
-
-  <!-- Begin Clone -->
-  <sect2 id="perl-clone" xreflabel="Clone-&Clone-version;">
-
-    <title>Clone-&Clone-version;</title>
-
-    <indexterm zone="perl-clone">
-      <primary sortas="a-Clone">Clone</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Clone</title>
-
-      <para>
-        Clone recursively copies perl datatypes.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Clone Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-b-cow"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Clone</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-config-autoconf.xml
===================================================================
--- general/prog/perl-deps/perl-config-autoconf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/A/AM/AMBS/Config-AutoConf-&Config-AutoConf-version;.tar.gz">
-  <!ENTITY my-md5sum "71664b2864232e265179ac29298e0916">
-
-]>
-
-  <!-- Begin Config::AutoConf -->
-  <sect2 id="perl-config-autoconf" xreflabel="Config-AutoConf-&Config-AutoConf-version;">
-
-    <title>Config::AutoConf-&Config-AutoConf-version;</title>
-
-    <indexterm zone="perl-config-autoconf">
-      <primary sortas="a-Config-AutoConf">Config::AutoConf</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Config::AutoConf</title>
-
-      <para>
-        The Config::AutoConf module implements some of the AutoConf macros
-        (detecting a command, detecting a library, etc.) in pure perl.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Config::AutoConf Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-capture-tiny"/>,
-        <xref linkend="perl-file-slurper"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Config::AutoConf</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-cpan-meta-check.xml
===================================================================
--- general/prog/perl-deps/perl-cpan-meta-check.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/L/LE/LEONT/CPAN-Meta-Check-&CPAN-Meta-Check-version;.tar.gz">
-  <!ENTITY my-md5sum "d1c2190e8bc1c176b9ee9cba3ac403ad">
-
-]>
-
-  <!-- Begin CPAN::Meta::Check -->
-  <sect2 id="perl-cpan-meta-check" xreflabel="CPAN-Meta-Check-&CPAN-Meta-Check-version;">
-
-    <title>CPAN::Meta::Check-&CPAN-Meta-Check-version;</title>
-
-    <indexterm zone="perl-cpan-meta-check">
-      <primary sortas="a-CPAN-Meta-Check">CPAN::Meta::Check</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to CPAN::Meta::Check</title>
-
-      <para>
-        CPAN::Meta::Check verifies if requirements described in a CPAN::Meta
-        object are present.
-      </para>
-
-      &lfs121_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 CPAN::Meta::Check</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-datetime-format-strptime.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-format-strptime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/DateTime-Format-Strptime-&DateTime-Format-Strptime-version;.tar.gz">
-  <!ENTITY my-md5sum "441cfec62b0b8a1b4c05cbe5ef73fbf4">
-
-]>
-
-  <!-- Begin DateTime::Format::Strptime -->
-  <sect2 id="perl-datetime-format-strptime" xreflabel="DateTime-Format-Strptime-&DateTime-Format-Strptime-version;">
-
-    <title>DateTime::Format::Strptime-&DateTime-Format-Strptime-version;</title>
-
-    <indexterm zone="perl-datetime-format-strptime">
-      <primary sortas="a-DateTime-Format-Strptime">DateTime::Format::Strptime</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Format::Strptime</title>
-
-      <para>
-        DateTime::Format::Strptime implements most of <ulink role='man'
-        url='&man;strptime.3'>strptime(3)</ulink>, i.e. it takes a string
-        and a pattern and returns a DateTime object.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">DateTime::Format::Strptime Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime"/>
-        <!-- This pulls in perl-datetime-locale, perl-datetime-timezone,
-             perl-params-validationcompiler, perl-specio and perl-try-tiny -->
-      </para>
-      <!-- the changes claim it needs FindBin for testing,
-           but it is fine without that and does not seem to reference it -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Format::Strptime</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-datetime-locale.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-locale.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/DateTime-Locale-&DateTime-Locale-version;.tar.gz">
-  <!ENTITY my-md5sum "cf78f7fe66326ccc447e718a20b6361c">
-
-]>
-
-  <!-- Begin DateTime::Locale -->
-  <sect2 id="perl-datetime-locale" xreflabel="DateTime-Locale-&DateTime-Locale-version;">
-
-    <title>DateTime::Locale-&DateTime-Locale-version;</title>
-
-    <indexterm zone="perl-datetime-locale">
-      <primary sortas="a-DateTime-Locale">DateTime::Locale</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Locale</title>
-
-      <para>
-        DateTime::Locale provides localization support for <xref
-        linkend="perl-datetime"/>.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">DateTime::Locale Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-dist-checkconflicts"/>,
-        <xref linkend="perl-file-sharedir"/>,
-        <!-- perl-file-sharedir pulls in perl-file-sharedir-install -->
-        <xref linkend="perl-namespace-autoclean"/> and
-        <xref linkend="perl-params-validationcompiler"/>
-        <!-- perl-params-validationcompiler pulls in perl-specio -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-ipc-system-simple"/> and
-        <xref linkend="perl-test-file-sharedir"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Locale</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-datetime-timezone.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-timezone.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/DateTime-TimeZone-&DateTime-TimeZone-version;.tar.gz">
-  <!ENTITY my-md5sum "e11bb3a07c4f3d156f7dc356816f3962">
-
-]>
-
-  <!-- Begin DateTime::TimeZone -->
-  <sect2 id="perl-datetime-timezone" xreflabel="DateTime-TimeZone-&DateTime-TimeZone-version;">
-
-    <title>DateTime::TimeZone-&DateTime-TimeZone-version;</title>
-
-    <indexterm zone="perl-datetime-timezone">
-      <primary sortas="a-DateTime-TimeZone">DateTime::TimeZone</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::TimeZone</title>
-
-      <para>
-        This class is the base class for all time zone objects. A time zone is
-        represented internally as a set of observances, each of which describes
-        the offset from GMT for a given time period.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">DateTime::TimeZone Dependencies</bridgehead>
-
-      <!-- the Changes file suggeests it needs File-Slurp-Tiny but it is fine
-           without it and does not seem to reference it. -->
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-singleton"/>,
-        <xref linkend="perl-module-runtime"/>, and
-        <xref linkend="perl-params-validationcompiler"/>, also
-        <!-- perl-params-validationcompiler pulls in perl-specio -->
-        <!-- perl-specio pulls in perl-try-tiny -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        Both <xref linkend="perl-test-fatal"/> and
-        <xref linkend="perl-test-requires"/>,
-        but only if a copy of <xref role="nodep" linkend="perl-datetime"/>
-        (for which this is a dependency) has already been installed
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::TimeZone</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-datetime.xml
===================================================================
--- general/prog/perl-deps/perl-datetime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/DateTime-&DateTime-version;.tar.gz">
-  <!ENTITY my-md5sum "6f60018500f8f20c5fd3d34495eae1eb">
-
-]>
-
-  <!-- Begin DateTime -->
-  <sect2 id="perl-datetime" xreflabel="DateTime-&DateTime-version;">
-
-    <title>DateTime-&DateTime-version;</title>
-
-    <indexterm zone="perl-datetime">
-      <primary sortas="a-DateTime">DateTime</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime</title>
-
-      <para>
-        DateTime is a date and time object for perl.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">DateTime Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime-locale"/>,
-        <!-- perl-datetime-locale pulls in perl-namespace-autoclean -->
-        <xref linkend="perl-datetime-timezone"/>
-        <!-- perl-params-validation-compiler is pulled in by both
-             perl-datetime-locale and perl-datetime-timezone -->
-        <!-- perl-params-validationcompiler pulls in perl-specio -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-warnings"/> and
-        <xref linkend="perl-test-without-module"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-devel-stacktrace.xml
===================================================================
--- general/prog/perl-deps/perl-devel-stacktrace.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Devel-StackTrace-&Devel-StackTrace-version;.tar.gz">
-  <!ENTITY my-md5sum "b8ca19bb4c76e98a04373618db9c7c3c">
-
-]>
-
-  <!-- Begin Devel::StackTrace -->
-  <sect2 id="perl-devel-stacktrace" xreflabel="Devel-StackTrace-&Devel-StackTrace-version;">
-
-    <title>Devel::StackTrace-&Devel-StackTrace-version;</title>
-
-    <indexterm zone="perl-devel-stacktrace">
-      <primary sortas="a-Devel-StackTrace">Devel::StackTrace</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Devel::StackTrace</title>
-
-      <para>
-        Devel::StackTrace provides an object representing a stack trace.
-      </para>
-
-      &lfs121_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 Devel::StackTrace</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-dist-checkconflicts.xml
===================================================================
--- general/prog/perl-deps/perl-dist-checkconflicts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DO/DOY/Dist-CheckConflicts-&Dist-CheckConflicts-version;.tar.gz">
-  <!ENTITY my-md5sum "c8725a92b9169708b0f63036812070f2">
-
-]>
-
-  <!-- Begin Dist::CheckConflicts -->
-  <sect2 id="perl-dist-checkconflicts" xreflabel="Dist-CheckConflicts-&Dist-CheckConflicts-version;">
-
-    <title>Dist::CheckConflicts-&Dist-CheckConflicts-version;</title>
-
-    <indexterm zone="perl-dist-checkconflicts">
-      <primary sortas="a-Dist-CheckConflicts">Dist::CheckConflicts</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Dist::CheckConflicts</title>
-
-      <para>
-        Dist::CheckConflicts declares version conflicts for a distribution,
-        to support post-install updates of dependent distributions.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Dist::CheckConflicts Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-runtime"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Dist::CheckConflicts</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-encode-locale.xml
===================================================================
--- general/prog/perl-deps/perl-encode-locale.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/G/GA/GAAS/Encode-Locale-&Encode-Locale-version;.tar.gz">
-  <!ENTITY my-md5sum "fcfdb8e4ee34bcf62aed429b4a23db27">
-
-]>
-
-  <!-- Begin Encode::Locale -->
-  <sect2 id="perl-encode-locale" xreflabel="Encode-Locale-&Encode-Locale-version;">
-
-    <title>Encode::Locale-&Encode-Locale-version;</title>
-
-    <indexterm zone="perl-encode-locale">
-      <primary sortas="a-Encode-Locale">Encode::Locale</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::Locale</title>
-
-      <para>
-        Encode::Locale determines the locale encoding.
-      </para>
-
-      &lfs121_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 Encode::Locale</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-eval-closure.xml
===================================================================
--- general/prog/perl-deps/perl-eval-closure.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DO/DOY/Eval-Closure-&Eval-Closure-version;.tar.gz">
-  <!ENTITY my-md5sum "ceeb1fc579ac9af981fa6b600538c285">
-
-]>
-
-  <!-- Begin Eval::Closure -->
-  <sect2 id="perl-eval-closure" xreflabel="Eval-Closure-&Eval-Closure-version;">
-
-    <title>Eval::Closure-&Eval-Closure-version;</title>
-
-    <indexterm zone="perl-eval-closure">
-      <primary sortas="a-Eval-Closure">Eval::Closure</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Eval::Closure</title>
-
-      <para>
-        Eval::Closure safely and cleanly creates closures via string eval.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Eval::Closure Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-requires"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Eval::Closure</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-exception-class.xml
===================================================================
--- general/prog/perl-deps/perl-exception-class.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Exception-Class-&Exception-Class-version;.tar.gz">
-  <!ENTITY my-md5sum "1e564d20b374a99fdf660ba3f36b0098">
-
-]>
-
-  <!-- Begin Exception::Class -->
-  <sect2 id="perl-exception-class" xreflabel="Exception-Class-&Exception-Class-version;">
-
-    <title>Exception::Class-&Exception-Class-version;</title>
-
-    <indexterm zone="perl-exception-class">
-      <primary sortas="a-Exception-Class">Exception::Class</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Exception::Class</title>
-
-      <para>
-        Exception::Class allows you to declare real exception classes in <application>Perl</application>.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Exception::Class Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-data-inheritable"/>,
-        <xref linkend="perl-devel-stacktrace"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Exception::Class</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-exporter-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-exporter-tiny.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/T/TO/TOBYINK/Exporter-Tiny-&Exporter-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "0545ee8f4edcb9dc5a87b21ed25edd74">
-
-]>
-
-  <!-- Begin Exporter::Tiny -->
-  <sect2 id="perl-exporter-tiny" xreflabel="Exporter-Tiny-&Exporter-Tiny-version;">
-
-    <title>Exporter::Tiny-&Exporter-Tiny-version;</title>
-
-    <indexterm zone="perl-exporter-tiny">
-      <primary sortas="a-Exporter-Tiny">Exporter::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Exporter::Tiny</title>
-
-      <para>
-        Exporter::Tiny is an exporter with the features of Sub::Exporter but
-        only core dependencies.
-      </para>
-
-      &lfs121_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 Exporter::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-extutils-libbuilder.xml
===================================================================
--- general/prog/perl-deps/perl-extutils-libbuilder.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/A/AM/AMBS/ExtUtils-LibBuilder-&ExtUtils-LibBuilder-version;.tar.gz">
-  <!ENTITY my-md5sum "8ffe9e9a3c2f916f40dc4f6aed237d33">
-
-]>
-
-  <!-- Begin ExtUtils::LibBuilder -->
-  <sect2 id="perl-extutils-libbuilder" xreflabel="ExtUtils-LibBuilder-&ExtUtils-LibBuilder-version;">
-
-    <title>ExtUtils::LibBuilder-&ExtUtils-LibBuilder-version;</title>
-
-    <indexterm zone="perl-extutils-libbuilder">
-      <primary sortas="a-ExtUtils-LibBuilder">ExtUtils::LibBuilder</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to ExtUtils::LibBuilder</title>
-
-      <para>
-        ExtUtils::LibBuilder is a tool to build C libraries.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">ExtUtils::LibBuilder Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-build"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of ExtUtils::LibBuilder</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-ffi-checklib.xml
===================================================================
--- general/prog/perl-deps/perl-ffi-checklib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PL/PLICEASE/FFI-CheckLib-&FFI-CheckLib-version;.tar.gz">
-  <!ENTITY my-md5sum "ffc8e61bb686dd631bed3ddf102af41c">
-
-]>
-
-  <!-- Begin FFI::CheckLib -->
-  <sect2 id="perl-ffi-checklib" xreflabel="FFI-CheckLib-&FFI-CheckLib-version;">
-
-    <title>FFI::CheckLib-&FFI-CheckLib-version;</title>
-
-    <indexterm zone="perl-ffi-checklib">
-      <primary sortas="a-FFI-CheckLib">FFI::CheckLib</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to FFI::CheckLib</title>
-
-      <para>
-        FFI::CheckLib checks whether a particular dynamic library is available
-        for FFI (Foreign Function Interface) to use.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">FFI::CheckLib Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-capture-tiny"/>,
-        <xref linkend="perl-file-which"/>,
-        <xref linkend="perl-path-tiny"/>,
-        <xref linkend="perl-test2-suite"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of FFI::CheckLib</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-file-chdir.xml
===================================================================
--- general/prog/perl-deps/perl-file-chdir.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DA/DAGOLDEN/File-chdir-&File-chdir-version;.tar.gz">
-  <!ENTITY my-md5sum "932090f6c5f602301ae66c259de23ebb">
-
-]>
-
-  <!-- Begin File::chdir -->
-  <sect2 id="perl-file-chdir" xreflabel="File-chdir-&File-chdir-version;">
-
-    <title>File::chdir-&File-chdir-version;</title>
-
-    <indexterm zone="perl-file-chdir">
-      <primary sortas="a-File-chdir">File::chdir</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::chdir</title>
-
-      <para>
-        File::chdir provides a more sensible way to change directories.
-      </para>
-
-      <para>
-        Perl's chdir() has the unfortunate problem of being very, very, very
-        global. If any part of your program calls chdir() or if any library you
-        use calls chdir(), it changes the current working directory for the
-        *whole* program. File::chdir gives you an alternative, $CWD and @CWD.
-      </para>
-
-      &lfs121_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 File::chdir</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-file-copy-recursive.xml
===================================================================
--- general/prog/perl-deps/perl-file-copy-recursive.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DM/DMUEY/File-Copy-Recursive-&File-Copy-Recursive-version;.tar.gz">
-  <!ENTITY my-md5sum "e5eee1a3f8ae3aebbac063ea54870e54">
-
-]>
-
-  <!-- Begin File::Copy::Recursive -->
-  <sect2 id="perl-file-copy-recursive" xreflabel="File-Copy-Recursive-&File-Copy-Recursive-version;">
-
-    <title>File::Copy::Recursive-&File-Copy-Recursive-version;</title>
-
-    <indexterm zone="perl-file-copy-recursive">
-      <primary sortas="a-File-Copy-Recursive">File::Copy::Recursive</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Copy::Recursive</title>
-
-      <para>
-        This module copies and moves directories recursively (or single files),
-        to an optional depth and attempts to preserve each file or directory's
-        mode.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">File::Copy::Recursive Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-path-tiny"/>,
-        <xref linkend="perl-test-deep"/>,
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-file"/> and
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Copy::Recursive</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-file-find-rule.xml
===================================================================
--- general/prog/perl-deps/perl-file-find-rule.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RC/RCLAMP/File-Find-Rule-&File-Find-Rule-version;.tar.gz">
-  <!ENTITY my-md5sum "a7aa9ad4d8ee87b2a77b8e3722768712">
-
-]>
-
-  <!-- Begin File::Find::Rule -->
-  <sect2 id="perl-file-find-rule" xreflabel="File-Find-Rule-&File-Find-Rule-version;">
-
-    <title>File::Find::Rule-&File-Find-Rule-version;</title>
-
-    <indexterm zone="perl-file-find-rule">
-      <primary sortas="a-File-Find-Rule">File::Find::Rule</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Find::Rule</title>
-
-      <para>
-        File::Find::Rule is a friendlier interface to File::Find. It allows you
-        to build rules which specify the desired files and directories.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">File::Find::Rule Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-number-compare"/>,
-        <xref linkend="perl-text-glob"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Find::Rule</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            findrule
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="findrule-prog">
-          <term><command>findrule</command></term>
-          <listitem>
-            <para>
-              is a command line wrapper to File::Find::Rule
-            </para>
-            <indexterm zone="perl-file-find-rule findrule-prog">
-              <primary sortas="b-findrule">findrule</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-file-listing.xml
===================================================================
--- general/prog/perl-deps/perl-file-listing.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PL/PLICEASE/File-Listing-&File-Listing-version;.tar.gz">
-  <!ENTITY my-md5sum "d4fc8b0c86633d1fa5bf75323720eadc">
-
-]>
-
-  <!-- Begin File::Listing -->
-  <sect2 id="perl-file-listing" xreflabel="File-Listing-&File-Listing-version;">
-
-    <title>File::Listing-&File-Listing-version;</title>
-
-    <indexterm zone="perl-file-listing">
-      <primary sortas="a-File-Listing">File::Listing</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Listing</title>
-
-      <para>
-        File::Listing parses a directory listing.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">File::Listing Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-date"/>,
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Listing</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-file-sharedir-install.xml
===================================================================
--- general/prog/perl-deps/perl-file-sharedir-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/ET/ETHER/File-ShareDir-Install-&File-ShareDir-Install-version;.tar.gz">
-  <!ENTITY my-md5sum "bac4d924f3d863b00648ab56ec0dcbdc">
-
-]>
-
-  <!-- Begin File::ShareDir::Install -->
-  <sect2 id="perl-file-sharedir-install" xreflabel="File-ShareDir-Install-&File-ShareDir-Install-version;">
-
-    <title>File::ShareDir::Install-&File-ShareDir-Install-version;</title>
-
-    <indexterm zone="perl-file-sharedir-install">
-      <primary sortas="a-File-ShareDir-Install">File::ShareDir::Install</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::ShareDir::Install</title>
-
-      <para>
-        File::ShareDir::Install allows you to install read-only data files from
-        a distribution.
-      </para>
-
-      &lfs121_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 File::ShareDir::Install</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-file-sharedir.xml
===================================================================
--- general/prog/perl-deps/perl-file-sharedir.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RE/REHSACK/File-ShareDir-&File-ShareDir-version;.tar.gz">
-  <!ENTITY my-md5sum "0084f730f4e3d4d89703d92b3ea82f54">
-
-]>
-
-  <!-- Begin File::ShareDir -->
-  <sect2 id="perl-file-sharedir" xreflabel="File-ShareDir-&File-ShareDir-version;">
-
-    <title>File::ShareDir-&File-ShareDir-version;</title>
-
-    <indexterm zone="perl-file-sharedir">
-      <primary sortas="a-File-ShareDir">File::ShareDir</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::ShareDir</title>
-
-      <para>
-        File::ShareDir allows you to access data files which have been
-        installed by File::ShareDir::Install.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">File::ShareDir Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-inspector"/>,
-        <xref linkend="perl-file-sharedir-install"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::ShareDir</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-html-tagset.xml
===================================================================
--- general/prog/perl-deps/perl-html-tagset.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PETDANCE/HTML-Tagset-&HTML-Tagset-version;.tar.gz">
-  <!ENTITY my-md5sum "f8db8974f5e7fe7df2a58263a7b00552">
-
-]>
-
-  <!-- Begin HTML::Tagset -->
-  <sect2 id="perl-html-tagset" xreflabel="HTML-Tagset-&HTML-Tagset-version;">
-
-    <title>HTML::Tagset-&HTML-Tagset-version;</title>
-
-    <indexterm zone="perl-html-tagset">
-      <primary sortas="a-HTML-Tagset">HTML::Tagset</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTML::Tagset</title>
-
-      <para>
-        HTML::Tagset provides several data tables useful in parsing HTML.
-      </para>
-
-      &lfs121_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 HTML::Tagset</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-http-cookiejar.xml
===================================================================
--- general/prog/perl-deps/perl-http-cookiejar.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DA/DAGOLDEN/HTTP-CookieJar-&HTTP-CookieJar-version;.tar.gz">
-  <!ENTITY my-md5sum "a1d891ce0046f1a2c19e2c617d624d0d">
-
-]>
-
-  <!-- Begin HTTP::CookieJar -->
-  <sect2 id="perl-http-cookiejar" xreflabel="HTTP-CookieJar-&HTTP-CookieJar-version;">
-
-    <title>HTTP::CookieJar-&HTTP-CookieJar-version;</title>
-
-    <indexterm zone="perl-http-cookiejar">
-      <primary sortas="a-HTTP-CookieJar">HTTP::CookieJar</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::CookieJar</title>
-
-      <para>
-        HTTP::CookieJar provides a minimalist HTTP user agent cookie jar.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTTP::CookieJar Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-date"/>
-        <!-- perl-http-date pulls in perl-timedate -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-deep"/>,
-        <xref linkend="perl-test-requires"/>,
-        <xref linkend="perl-uri"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::CookieJar</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-http-cookies.xml
===================================================================
--- general/prog/perl-deps/perl-http-cookies.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/O/OA/OALDERS/HTTP-Cookies-&HTTP-Cookies-version;.tar.gz">
-  <!ENTITY my-md5sum "80017e7e56bdc8ba16dea75789748829">
-
-]>
-
-  <!-- Begin HTTP::Cookies -->
-  <sect2 id="perl-http-cookies" xreflabel="HTTP-Cookies-&HTTP-Cookies-version;">
-
-    <title>HTTP::Cookies-&HTTP-Cookies-version;</title>
-
-    <indexterm zone="perl-http-cookies">
-      <primary sortas="a-HTTP-Cookies">HTTP::Cookies</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Cookies</title>
-
-      <para>
-        HTTP::Cookies provides a class for objects that represent a "cookie jar"
-        -- that is, a database of all the HTTP cookies that a given
-        LWP::UserAgent (from <xref linkend="perl-libwww-perl"/>) object
-        knows about.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTTP::Cookies Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-message"/>
-        <!-- perl-http-message pulls in perl-http-date and perl-uri -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Cookies</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-http-date.xml
===================================================================
--- general/prog/perl-deps/perl-http-date.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/O/OA/OALDERS/HTTP-Date-&HTTP-Date-version;.tar.gz">
-  <!ENTITY my-md5sum "60462359bfeb1e6d14602508cfd07885">
-
-]>
-
-  <!-- Begin HTTP::Date -->
-  <sect2 id="perl-http-date" xreflabel="HTTP-Date-&HTTP-Date-version;">
-
-    <title>HTTP::Date-&HTTP-Date-version;</title>
-
-    <indexterm zone="perl-http-date">
-      <primary sortas="a-HTTP-Date">HTTP::Date</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Date</title>
-
-      <para>
-        HTTP::Date provides functions to deal with the date formats used by the
-        HTTP protocol and also with some other date formats.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTTP::Date Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <!-- Time::Zone is part of TimeDate -->
-        <xref linkend="perl-timedate"/> (to allow it to recognize zones other
-        than GMT and numeric)
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Date</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-http-message.xml
===================================================================
--- general/prog/perl-deps/perl-http-message.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/O/OA/OALDERS/HTTP-Message-&HTTP-Message-version;.tar.gz">
-  <!ENTITY my-md5sum "86c386bcc85a63c8908e6ae9967b34ee">
-
-]>
-
-  <!-- Begin HTTP::Message -->
-  <sect2 id="perl-http-message" xreflabel="HTTP-Message-&HTTP-Message-version;">
-
-    <title>HTTP::Message-&HTTP-Message-version;</title>
-
-    <indexterm zone="perl-http-message">
-      <primary sortas="a-HTTP-Message">HTTP::Message</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Message</title>
-
-      <para>
-        HTTP::Message provides a base class for HTTP style message objects.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTTP::Message Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-clone"/>,
-        <xref linkend="perl-encode-locale"/>,
-        <xref linkend="perl-http-date"/>,
-        <xref linkend="perl-io-html"/>,
-        <xref linkend="perl-lwp-mediatypes"/>, and
-        <xref linkend="perl-uri"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-needs"/> and
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Message</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-http-negotiate.xml
===================================================================
--- general/prog/perl-deps/perl-http-negotiate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/G/GA/GAAS/HTTP-Negotiate-&HTTP-Negotiate-version;.tar.gz">
-  <!ENTITY my-md5sum "1236195250e264d7436e7bb02031671b">
-
-]>
-
-  <!-- Begin HTTP::Negotiate -->
-  <sect2 id="perl-http-negotiate" xreflabel="HTTP-Negotiate-&HTTP-Negotiate-version;">
-
-    <title>HTTP::Negotiate-&HTTP-Negotiate-version;</title>
-
-    <indexterm zone="perl-http-negotiate">
-      <primary sortas="a-HTTP-Negotiate">HTTP::Negotiate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Negotiate</title>
-
-      <para>
-        HTTP::Negotiate provides a complete implementation of the HTTP content
-        negotiation algorithm.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTTP::Negotiate Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <!-- The required HTTP~::Headers is part of HTTP::Message -->
-        <xref linkend="perl-http-message"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Negotiate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-io-html.xml
===================================================================
--- general/prog/perl-deps/perl-io-html.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/C/CJ/CJM/IO-HTML-&IO-HTML-version;.tar.gz">
-  <!ENTITY my-md5sum "04bbe363686fd19bfb4cc0ed775e3d03">
-
-]>
-
-  <!-- Begin IO::HTML -->
-  <sect2 id="perl-io-html" xreflabel="IO-HTML-&IO-HTML-version;">
-
-    <title>IO::HTML-&IO-HTML-version;</title>
-
-    <indexterm zone="perl-io-html">
-      <primary sortas="a-IO-HTML">IO::HTML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IO::HTML</title>
-
-      <para>
-        IO::HTML opens an HTML file with automatic character set detection.
-      </para>
-
-      &lfs121_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 IO::HTML</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-ipc-system-simple.xml
===================================================================
--- general/prog/perl-deps/perl-ipc-system-simple.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/J/JK/JKEENAN/IPC-System-Simple-&IPC-System-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "e68341fd958fd013b3521d909904f675">
-
-]>
-
-  <!-- Begin IPC::System::Simple -->
-  <sect2 id="perl-ipc-system-simple" xreflabel="IPC-System-Simple-&IPC-System-Simple-version;">
-
-    <title>IPC::System::Simple-&IPC-System-Simple-version;</title>
-
-    <indexterm zone="perl-ipc-system-simple">
-      <primary sortas="a-IPC-System-Simple">IPC::System::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IPC::System::Simple</title>
-
-      <para>
-        IPC::System::Simple takes the hard work out of calling external commands
-        and producing detailed diagnostics.
-      </para>
-
-      &lfs121_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 IPC::System::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-list-moreutils-xs.xml
===================================================================
--- general/prog/perl-deps/perl-list-moreutils-xs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RE/REHSACK/List-MoreUtils-XS-&List-MoreUtils-XS-version;.tar.gz">
-  <!ENTITY my-md5sum "e77113e55b046906aecfb4ddb4f0c662">
-
-]>
-
-  <!-- Begin List::MoreUtils::XS -->
-  <sect2 id="perl-list-moreutils-xs" xreflabel="List-MoreUtils-XS-&List-MoreUtils-XS-version;">
-
-    <title>List::MoreUtils::XS-&List-MoreUtils-XS-version;</title>
-
-    <indexterm zone="perl-list-moreutils-xs">
-      <primary sortas="a-List-MoreUtils-XS">List::MoreUtils::XS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::MoreUtils::XS</title>
-
-      <para>
-        List::MoreUtils::XS is a compiled backend for List::MoreUtils
-      </para>
-
-      &lfs121_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 List::MoreUtils::XS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-list-someutils-xs.xml
===================================================================
--- general/prog/perl-deps/perl-list-someutils-xs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/List-SomeUtils-XS-&List-SomeUtils-XS-version;.tar.gz">
-  <!ENTITY my-md5sum "396eabe83a75fcb8d7542d95812469d1">
-
-]>
-
-  <!-- Begin List::SomeUtils::XS -->
-  <sect2 id="perl-list-someutils-xs" xreflabel="List-SomeUtils-XS-&List-SomeUtils-XS-version;">
-
-    <title>List::SomeUtils::XS-&List-SomeUtils-XS-version;</title>
-
-    <indexterm zone="perl-list-someutils-xs">
-      <primary sortas="a-List-SomeUtils-XS">List::SomeUtils::XS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::SomeUtils::XS</title>
-
-      <para>
-        List::SomeUtils::XS is a (faster) XS (eXternal Subroutine)
-        implementation for List::SomeUtils.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">List::SomeUtils::XS Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-leaktrace"/>,
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::SomeUtils::XS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-list-someutils.xml
===================================================================
--- general/prog/perl-deps/perl-list-someutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/List-SomeUtils-&List-SomeUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "333b4adb2907deff2be8da5899881453">
-
-]>
-
-  <!-- Begin List::SomeUtils -->
-  <sect2 id="perl-list-someutils" xreflabel="List-SomeUtils-&List-SomeUtils-version;">
-
-    <title>List::SomeUtils-&List-SomeUtils-version;</title>
-
-    <indexterm zone="perl-list-someutils">
-      <primary sortas="a-List-SomeUtils">List::SomeUtils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::SomeUtils</title>
-
-      <para>
-        List::SomeUtils provides the stuff missing in List::Util.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">List::SomeUtils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-implementation"/>,
-        <xref linkend="perl-list-someutils-xs"/>
-        <!-- perl-test-leaktrace is pulled in by perl-list-someutils-xs -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::SomeUtils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-list-utilsby.xml
===================================================================
--- general/prog/perl-deps/perl-list-utilsby.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/List-UtilsBy-&List-UtilsBy-version;.tar.gz">
-  <!ENTITY my-md5sum "54a8c7092bc02f29ea6c5ae215eea385">
-
-]>
-
-  <!-- Begin List::UtilsBy -->
-  <sect2 id="perl-list-utilsby" xreflabel="List-UtilsBy-&List-UtilsBy-version;">
-
-    <title>List::UtilsBy-&List-UtilsBy-version;</title>
-
-    <indexterm zone="perl-list-utilsby">
-      <primary sortas="a-List-UtilsBy">List::UtilsBy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::UtilsBy</title>
-
-      <para>
-        List::UtilsBy provides a number of higher-order list utility functions.
-      </para>
-
-      &lfs121_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 List::UtilsBy</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-lwp-mediatypes.xml
===================================================================
--- general/prog/perl-deps/perl-lwp-mediatypes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/O/OA/OALDERS/LWP-MediaTypes-&LWP-MediaTypes-version;.tar.gz">
-  <!ENTITY my-md5sum "84b799a90c0d2ce52897a7cb4c0478d0">
-
-]>
-
-  <!-- Begin LWP::MediaTypes -->
-  <sect2 id="perl-lwp-mediatypes" xreflabel="LWP-MediaTypes-&LWP-MediaTypes-version;">
-
-    <title>LWP::MediaTypes-&LWP-MediaTypes-version;</title>
-
-    <indexterm zone="perl-lwp-mediatypes">
-      <primary sortas="a-LWP-MediaTypes">LWP::MediaTypes</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to LWP::MediaTypes</title>
-
-      <para>
-        LWP::MediaTypes guesses the media type (i.e. the MIME Type) for a file
-        or URL.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">LWP::MediaTypes Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of LWP::MediaTypes</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-mime-charset.xml
===================================================================
--- general/prog/perl-deps/perl-mime-charset.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/N/NE/NEZUMI/MIME-Charset-&MIME-Charset-version;.tar.gz">
-  <!ENTITY my-md5sum "b1932cfc806c8deb1b4a20d6afbfa8ac">
-
-]>
-
-  <!-- Begin MIME::Charset -->
-  <sect2 id="perl-mime-charset" xreflabel="MIME-Charset-&MIME-Charset-version;">
-
-    <title>MIME::Charset-&MIME-Charset-version;</title>
-
-    <indexterm zone="perl-mime-charset">
-      <primary sortas="a-MIME-Charset">MIME::Charset</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MIME::Charset</title>
-
-      <para>
-        MIME::Charset provides information about character sets used for MIME
-        messages o nthe internet, such as their encodings.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">MIME::Charset Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-encode-eucjpascii"/>,
-        <xref linkend="perl-encode-hanextra"/> and
-        <xref linkend="perl-encode-jis2k"/> (because all are required
-        by <xref role="nodep" linkend="biber"/>)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MIME::Charset</title>
-
-      <para>
-        This module uses a variant of the standard build and installation
-        instructions:
-
-<screen><userinput>yes '' | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes |</command>: Perl will ask if you wish to install
-        a further module for handling legacy Japanese encodings, and another
-        which it would use for translating documentation to Japanese. The
-        default option is 'n', using 'yes' allows you to script the build.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-module-implementation.xml
===================================================================
--- general/prog/perl-deps/perl-module-implementation.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Module-Implementation-&Module-Implementation-version;.tar.gz">
-  <!ENTITY my-md5sum "52e3fe0ca6b1eff0488d59b7aacc0667">
-
-]>
-
-  <!-- Begin Module::Implementation -->
-  <sect2 id="perl-module-implementation" xreflabel="Module-Implementation-&Module-Implementation-version;">
-
-    <title>Module::Implementation-&Module-Implementation-version;</title>
-
-    <indexterm zone="perl-module-implementation">
-      <primary sortas="a-Module-Implementation">Module::Implementation</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Module::Implementation</title>
-
-      <para>
-        Module::Implementation loads one of several alternate underlying
-        implementations of a module (e.g. eXternal Subroutine or pure Perl, or
-        an implementation for a given OS).
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Module::Implementation Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-runtime"/>,
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-requires"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Module::Implementation</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-module-runtime.xml
===================================================================
--- general/prog/perl-deps/perl-module-runtime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/Z/ZE/ZEFRAM/Module-Runtime-&Module-Runtime-version;.tar.gz">
-  <!ENTITY my-md5sum "d3d47222fa2e3dfcb4526f6cc8437b20">
-
-]>
-
-  <!-- Begin Module::Runtime -->
-  <sect2 id="perl-module-runtime" xreflabel="Module-Runtime-&Module-Runtime-version;">
-
-    <title>Module::Runtime-&Module-Runtime-version;</title>
-
-    <indexterm zone="perl-module-runtime">
-      <primary sortas="a-Module-Runtime">Module::Runtime</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Module::Runtime</title>
-
-      <para>
-        Module::Runtime provides functions to deal with runtime handling of
-        <application>Perl</application> modules.
-      </para>
-
-      &lfs121_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 Module::Runtime</title>
-
-      <para>
-        Although Module::Build is still listed as a prerequisite, it is
-        no-longer necessary on systems with a working <command>make</command>.
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-mro-compat.xml
===================================================================
--- general/prog/perl-deps/perl-mro-compat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/H/HA/HAARG/MRO-Compat-&MRO-Compat-version;.tar.gz">
-  <!ENTITY my-md5sum "f644dafe901214cedfa7ed8b43b56df1">
-
-]>
-
-  <!-- Begin MRO::Compat -->
-  <sect2 id="perl-mro-compat" xreflabel="MRO-Compat-&MRO-Compat-version;">
-
-    <title>MRO::Compat-&MRO-Compat-version;</title>
-
-    <indexterm zone="perl-mro-compat">
-      <primary sortas="a-MRO-Compat">MRO::Compat</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MRO::Compat</title>
-
-      <para>
-        The "mro" namespace provides several utilities for dealing with method
-        resolution order and method caching in general in Perl 5.9.5 and higher.
-        This module provides those interfaces for earlier versions of Perl.
-      </para>
-
-      &lfs121_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 MRO::Compat</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-namespace-autoclean.xml
===================================================================
--- general/prog/perl-deps/perl-namespace-autoclean.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/ET/ETHER/namespace-autoclean-&namespace-autoclean-version;.tar.gz">
-  <!ENTITY my-md5sum "39b38c776cd1f0ee03cc70781a2f2798">
-
-]>
-
-  <!-- Begin namespace::autoclean -->
-  <sect2 id="perl-namespace-autoclean" xreflabel="namespace-autoclean-&namespace-autoclean-version;">
-
-    <title>namespace::autoclean-&namespace-autoclean-version;</title>
-
-    <indexterm zone="perl-namespace-autoclean">
-      <primary sortas="a-namespace-autoclean">namespace::autoclean</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to namespace::autoclean</title>
-
-      <para>
-        This module is very similar to namespace::clean, except it will clean
-        all imported functions, no matter if you imported them before or after
-        you used the pragma. It will also not touch anything that looks like a
-        method.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">namespace::autoclean Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-namespace-clean"/>,
-        <!-- namespace-clean pulls in b-hooks-endofscope which this requires -->
-        <xref linkend="perl-sub-identify"/>
-
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-needs"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of namespace::autoclean</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-namespace-clean.xml
===================================================================
--- general/prog/perl-deps/perl-namespace-clean.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RI/RIBASUSHI/namespace-clean-&namespace-clean-version;.tar.gz">
-  <!ENTITY my-md5sum "cba97f39ef7e594bd8489b4fdcddb662">
-
-]>
-
-  <!-- Begin namespace::clean -->
-  <sect2 id="perl-namespace-clean" xreflabel="namespace-clean-&namespace-clean-version;">
-
-    <title>namespace::clean-&namespace-clean-version;</title>
-
-    <indexterm zone="perl-namespace-clean">
-      <primary sortas="a-namespace-clean">namespace::clean</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to namespace::clean</title>
-
-      <para>
-        This package allows you to keep imports and functions out of your
-        namespace.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">namespace::clean Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-b-hooks-endofscope"/>,
-        <!-- This package pulls in b-hooks-endofscope for namespace-autoclean -->
-        <xref linkend="perl-package-stash"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of namespace::clean</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-net-http.xml
===================================================================
--- general/prog/perl-deps/perl-net-http.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/O/OA/OALDERS/Net-HTTP-&Net-HTTP-version;.tar.gz">
-  <!ENTITY my-md5sum "1682735ddd1c059864ca5c1bbf15ab95">
-
-]>
-
-  <!-- Begin Net::HTTP -->
-  <sect2 id="perl-net-http" xreflabel="Net-HTTP-&Net-HTTP-version;">
-
-    <title>Net::HTTP-&Net-HTTP-version;</title>
-
-    <indexterm zone="perl-net-http">
-      <primary sortas="a-Net-HTTP">Net::HTTP</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Net::HTTP</title>
-
-      <para>
-        The Net::HTTP class is a low level HTTP client. An instance of the class
-        represents a connection to an HTTP server.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Net::HTTP Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-uri"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Net::HTTP</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-net-ssleay.xml
===================================================================
--- general/prog/perl-deps/perl-net-ssleay.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/C/CH/CHRISN/Net-SSLeay-&Net-SSLeay-version;.tar.gz">
-  <!ENTITY my-md5sum "1b22c764e5a094c6261e37a4b1f148ce">
-
-]>
-
-  <!-- Begin Net::SSLeay -->
-  <sect2 id="perl-net-ssleay" xreflabel="Net-SSLeay-&Net-SSLeay-version;">
-
-    <title>Net::SSLeay-&Net-SSLeay-version;</title>
-
-    <indexterm zone="perl-net-ssleay">
-      <primary sortas="a-Net-SSLeay">Net::SSLeay</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Net::SSLeay</title>
-
-      <para>
-        Net::SSLeay is a Perl extension for using OpenSSL.
-      </para>
-
-      <!--
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch (for openssl-1.1.1):
-            <ulink url="&patch-root;/Net-SSLeay-&Net-SSLeay-version;-openssl_1.1.1-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>-->
-
-      &lfs121_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 Net::SSLeay</title>
-
-      <note>
-        <para>
-          If enabling the external tests, one test in t/external/15_altnames.t
-          may fail. <!-- https://rt.cpan.org/Public/Bug/Display.html?id=12954 -->
-        </para>
-      </note>
-
-      <para>
-        This module uses a variant of the standard build and installation
-        instructions:
-
-<screen><userinput>yes '' | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes ''</command>: Perl will ask if you wish to run external
-        tests, which will fail if you do not have network connectivity. The
-        default is 'n', specifying this allows you to script the build.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-number-compare.xml
===================================================================
--- general/prog/perl-deps/perl-number-compare.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RC/RCLAMP/Number-Compare-&Number-Compare-version;.tar.gz">
-  <!ENTITY my-md5sum "ded4085a8fc96328742785574ca65208">
-
-]>
-
-  <!-- Begin Number::Compare -->
-  <sect2 id="perl-number-compare" xreflabel="Number-Compare-&Number-Compare-version;">
-
-    <title>Number::Compare-&Number-Compare-version;</title>
-
-    <indexterm zone="perl-number-compare">
-      <primary sortas="a-Number-Compare">Number::Compare</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Number::Compare</title>
-
-      <para>
-        Number::Compare compiles a simple comparison to an anonymous subroutine,
-        which you can call with a value to be tested against. It understands IEC
-        standard magnitudes (k, ki, m, mi, g, gi).
-      </para>
-
-      &lfs121_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 Number::Compare</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-package-stash.xml
===================================================================
--- general/prog/perl-deps/perl-package-stash.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/ET/ETHER/Package-Stash-&Package-Stash-version;.tar.gz">
-  <!ENTITY my-md5sum "7a2922941cc2aad6a52642e4fb13d07b">
-
-]>
-
-  <!-- Begin Package::Stash -->
-  <sect2 id="perl-package-stash" xreflabel="Package-Stash-&Package-Stash-version;">
-
-    <title>Package::Stash-&Package-Stash-version;</title>
-
-    <indexterm zone="perl-package-stash">
-      <primary sortas="a-Package-Stash">Package::Stash</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Package::Stash</title>
-
-      <para>
-        Manipulating stashes (Perl's symbol tables) is occasionally necessary,
-        but incredibly messy, and easy to get wrong. This module hides all of
-        that behind a simple API.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Package::Stash Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-dist-checkconflicts"/>,
-        <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 test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Package::Stash</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-params-validate.xml
===================================================================
--- general/prog/perl-deps/perl-params-validate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Params-Validate-&Params-Validate-version;.tar.gz">
-  <!ENTITY my-md5sum "ef5f57387c2c9032b59fb23023cf5b25">
-
-]>
-
-  <!-- Begin Params::Validate -->
-  <sect2 id="perl-params-validate" xreflabel="Params-Validate-&Params-Validate-version;">
-
-    <title>Params::Validate-&Params-Validate-version;</title>
-
-    <indexterm zone="perl-params-validate">
-      <primary sortas="a-Params-Validate">Params::Validate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Params::Validate</title>
-
-      <para>
-        Params::Validate allows you to validate method or function call
-        parameters to an arbitrary level of specificity.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Params::Validate Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-build"/>,
-        <xref linkend="perl-module-implementation"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-requires"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Params::Validate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-params-validationcompiler.xml
===================================================================
--- general/prog/perl-deps/perl-params-validationcompiler.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Params-ValidationCompiler-&Params-ValidationCompiler-version;.tar.gz">
-  <!ENTITY my-md5sum "15528055f3f53c8cfebbee1f928dec07">
-
-]>
-
-  <!-- Begin Params::ValidationCompiler -->
-  <sect2 id="perl-params-validationcompiler" xreflabel="Params-ValidationCompiler-&Params-ValidationCompiler-version;">
-
-    <title>Params::ValidationCompiler-&Params-ValidationCompiler-version;</title>
-
-    <indexterm zone="perl-params-validationcompiler">
-      <primary sortas="a-Params-ValidationCompiler">Params::ValidationCompiler</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Params::ValidationCompiler</title>
-
-      <para>
-        Params::ValidationCompiler builds an optimized subroutine parameter
-        validator.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Params::ValidationCompiler Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <!-- eval-closure is pulled in by specio -->
-        <xref linkend="perl-exception-class"/>,
-        <xref linkend="perl-specio"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-without-module"/>,
-        <xref linkend="perl-test2-plugin-nowarnings"/>
-        <!-- test2-suite provides Test2::Vo and is pulled in by test2-plugin-nowarnings -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Params::ValidationCompiler</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-path-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-path-tiny.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DA/DAGOLDEN/Path-Tiny-&Path-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "7b2fc4f5edfd29b88d2cc3b96830e7d1">
-
-]>
-
-  <!-- Begin Path::Tiny -->
-  <sect2 id="perl-path-tiny" xreflabel="Path-Tiny-&Path-Tiny-version;">
-
-    <title>Path::Tiny-&Path-Tiny-version;</title>
-
-    <indexterm zone="perl-path-tiny">
-      <primary sortas="a-Path-Tiny">Path::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Path::Tiny</title>
-
-      <para>
-        Path::Tiny provides a small fast utility for working with file paths.
-      </para>
-
-      &lfs121_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 Path::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-role-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-role-tiny.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/H/HA/HAARG/Role-Tiny-&Role-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "9ee45591befa3d0b1094ac75d282b6ba">
-
-]>
-
-  <!-- Begin Role::Tiny -->
-  <sect2 id="perl-role-tiny" xreflabel="Role-Tiny-&Role-Tiny-version;">
-
-    <title>Role::Tiny-&Role-Tiny-version;</title>
-
-    <indexterm zone="perl-role-tiny">
-      <primary sortas="a-Role-Tiny">Role::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Role::Tiny</title>
-
-      <para>
-        Role::Tiny is a minimalist role composition tool.
-      </para>
-
-      &lfs121_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 Role::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-scope-guard.xml
===================================================================
--- general/prog/perl-deps/perl-scope-guard.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/C/CH/CHOCOLATE/Scope-Guard-&Scope-Guard-version;.tar.gz">
-  <!ENTITY my-md5sum "be57b915d23ddac7677ef2ad9e52b92a">
-
-]>
-
-  <!-- Begin Scope::Guard -->
-  <sect2 id="perl-scope-guard" xreflabel="Scope-Guard-&Scope-Guard-version;">
-
-    <title>Scope::Guard-&Scope-Guard-version;</title>
-
-    <indexterm zone="perl-scope-guard">
-      <primary sortas="a-Scope-Guard">Scope::Guard</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Scope::Guard</title>
-
-      <para>
-        Scope::Guard provides a convenient way to perform cleanup or other forms
-        of resource management at the end of a scope.
-      </para>
-
-      &lfs121_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 Scope::Guard</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-specio.xml
===================================================================
--- general/prog/perl-deps/perl-specio.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Specio-&Specio-version;.tar.gz">
-  <!ENTITY my-md5sum "96cf1ae4e2e205986e03672071116b16">
-
-]>
-
-  <!-- Begin Specio -->
-  <sect2 id="perl-specio" xreflabel="Specio-&Specio-version;">
-
-    <title>Specio-&Specio-version;</title>
-
-    <indexterm zone="perl-specio">
-      <primary sortas="a-Specio">Specio</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Specio</title>
-
-      <para>
-        Specio provides classes for representing type constraints and coercion,
-        along with syntax sugar for declaring them.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Specio Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-devel-stacktrace"/>,
-        <xref linkend="perl-eval-closure"/>,
-        <xref linkend="perl-module-runtime"/>,
-        <xref linkend="perl-role-tiny"/>,
-        <xref linkend="perl-sub-quote"/> and
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <!-- This claims to need XString, and will use it for memory
-         efficiency if present, but runs fine without it. It also
-         shows Ref-Util in 'Runtime Recommends' but the only reference
-         to that seems to be in the prereqs. -->
-        <xref linkend="perl-mro-compat"/>,
-        <xref linkend="perl-test-fatal"/> and
-        <xref linkend="perl-test-needs"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <!-- this adds little, but it gets pulled in anyway for DateTime,
-             of which Specio is a dependency -->
-        <xref linkend="perl-namespace-autoclean"/> (for the test suite)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Specio</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-sub-exporter-progressive.xml
===================================================================
--- general/prog/perl-deps/perl-sub-exporter-progressive.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/F/FR/FREW/Sub-Exporter-Progressive-&Sub-Exporter-Progressive-version;.tar.gz">
-  <!ENTITY my-md5sum "72cf6acdd2a0a8b105821a4db98e4ebe">
-
-]>
-
-  <!-- Begin Sub::Exporter::Progressive -->
-  <sect2 id="perl-sub-exporter-progressive" xreflabel="Sub-Exporter-Progressive-&Sub-Exporter-Progressive-version;">
-
-    <title>Sub::Exporter::Progressive-&Sub-Exporter-Progressive-version;</title>
-
-    <indexterm zone="perl-sub-exporter-progressive">
-      <primary sortas="a-Sub-Exporter-Progressive">Sub::Exporter::Progressive</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Exporter::Progressive</title>
-
-      <para>
-        Sub::Exporter::Progressive is a wrapper for Sub::Exporter.
-      </para>
-
-      &lfs121_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 Sub::Exporter::Progressive</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-sub-identify.xml
===================================================================
--- general/prog/perl-deps/perl-sub-identify.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RG/RGARCIA/Sub-Identify-&Sub-Identify-version;.tar.gz">
-  <!ENTITY my-md5sum "014f19e72698b6a2cbcb54adc9691825">
-
-]>
-
-  <!-- Begin Sub::Identify -->
-  <sect2 id="perl-sub-identify" xreflabel="Sub-Identify-&Sub-Identify-version;">
-
-    <title>Sub::Identify-&Sub-Identify-version;</title>
-
-    <indexterm zone="perl-sub-identify">
-      <primary sortas="a-Sub-Identify">Sub::Identify</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Identify</title>
-
-      <para>
-        Sub::Identify allows you to retrieve the real name of code references.
-        It is encouraged to migrate to Sub::Util (a core module) when possible.
-      </para>
-
-      &lfs121_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 Sub::Identify</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-sub-quote.xml
===================================================================
--- general/prog/perl-deps/perl-sub-quote.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/H/HA/HAARG/Sub-Quote-&Sub-Quote-version;.tar.gz">
-  <!ENTITY my-md5sum "f19c60039ba87f69f7f9357fc0a03e07">
-
-]>
-
-  <!-- Begin Sub::Quote -->
-  <sect2 id="perl-sub-quote" xreflabel="Sub-Quote-&Sub-Quote-version;">
-
-    <title>Sub::Quote-&Sub-Quote-version;</title>
-
-    <indexterm zone="perl-sub-quote">
-      <primary sortas="a-Sub-Quote">Sub::Quote</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Quote</title>
-
-      <para>
-        Sub::Quote provides ways to generate subroutines from strings.
-      </para>
-
-      &lfs121_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 Sub::Quote</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-sub-uplevel.xml
===================================================================
--- general/prog/perl-deps/perl-sub-uplevel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DA/DAGOLDEN/Sub-Uplevel-&Sub-Uplevel-version;.tar.gz">
-  <!ENTITY my-md5sum "6c6a174861fd160e8d5871a86df00baf">
-
-]>
-
-  <!-- Begin Sub::Uplevel -->
-  <sect2 id="perl-sub-uplevel" xreflabel="Sub-Uplevel-&Sub-Uplevel-version;">
-
-    <title>Sub::Uplevel-&Sub-Uplevel-version;</title>
-
-    <indexterm zone="perl-sub-uplevel">
-      <primary sortas="a-Sub-Uplevel">Sub::Uplevel</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Uplevel</title>
-
-      <para>
-        Sub::Uplevel allows you to fool a caller that it is running in a
-        higher stack frame.
-      </para>
-
-      &lfs121_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 Sub::Uplevel</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-term-table.xml
===================================================================
--- general/prog/perl-deps/perl-term-table.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/EX/EXODIST/Term-Table-&Term-Table-version;.tar.gz">
-  <!ENTITY my-md5sum "7022839afa343ce81c92645acb21c22d">
-
-]>
-
-  <!-- Begin Term::Table -->
-  <sect2 id="perl-term-table" xreflabel="Term-Table-&Term-Table-version;">
-
-    <title>Term::Table-&Term-Table-version;</title>
-
-    <indexterm zone="perl-term-table">
-      <primary sortas="a-Term-Table">Term::Table</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Term::Table</title>
-
-      <para>
-        Term::Table formats a header and rows into a table. This is used by some
-        failing tests to provide diagnostics about what has gone wrong.
-      </para>
-
-      &lfs121_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 Term::Table</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-deep.xml
===================================================================
--- general/prog/perl-deps/perl-test-deep.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RJ/RJBS/Test-Deep-&Test-Deep-version;.tar.gz">
-  <!ENTITY my-md5sum "fcff296434cd92538ae9de9d1744705f">
-
-]>
-
-  <!-- Begin Test::Deep -->
-  <sect2 id="perl-test-deep" xreflabel="Test-Deep-&Test-Deep-version;">
-
-    <title>Test::Deep-&Test-Deep-version;</title>
-
-    <indexterm zone="perl-test-deep">
-      <primary sortas="a-Test-Deep">Test::Deep</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Deep</title>
-
-      <para>
-        Test::Deep gives you very flexible ways to check that the result you got
-        is the result you were expecting.
-      </para>
-
-      &lfs121_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 Test::Deep</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-exception.xml
===================================================================
--- general/prog/perl-deps/perl-test-exception.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/EX/EXODIST/Test-Exception-&Test-Exception-version;.tar.gz">
-  <!ENTITY my-md5sum "572d355026fb0b87fc2b8c64b83cada0">
-
-]>
-
-  <!-- Begin Test::Exception -->
-  <sect2 id="perl-test-exception" xreflabel="Test-Exception-&Test-Exception-version;">
-
-    <title>Test::Exception-&Test-Exception-version;</title>
-
-    <indexterm zone="perl-test-exception">
-      <primary sortas="a-Test-Exception">Test::Exception</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Exception</title>
-
-      <para>
-        Test::Exception provides convenience methods for testing exception
-        based code.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test::Exception Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-sub-uplevel"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Exception</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-fatal.xml
===================================================================
--- general/prog/perl-deps/perl-test-fatal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RJ/RJBS/Test-Fatal-&Test-Fatal-version;.tar.gz">
-  <!ENTITY my-md5sum "2f160c31e1848536e3b82112d573bb76">
-
-]>
-
-  <!-- Begin Test::Fatal -->
-  <sect2 id="perl-test-fatal" xreflabel="Test-Fatal-&Test-Fatal-version;">
-
-    <title>Test::Fatal-&Test-Fatal-version;</title>
-
-    <indexterm zone="perl-test-fatal">
-      <primary sortas="a-Test-Fatal">Test::Fatal</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Fatal</title>
-
-      <para>
-        The Test::Fatal module provides simple helpers for testing code which
-        throws exceptions.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test::Fatal Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-
-      <title>Installation of Test::Fatal</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-file-sharedir.xml
===================================================================
--- general/prog/perl-deps/perl-test-file-sharedir.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/K/KE/KENTNL/Test-File-ShareDir-&Test-File-ShareDir-version;.tar.gz">
-  <!ENTITY my-md5sum "ec31466aa44c1cd56c6cb51d7ec3a5de">
-
-]>
-
-  <!-- Begin Test::File::ShareDir -->
-  <sect2 id="perl-test-file-sharedir" xreflabel="Test-File-ShareDir-&Test-File-ShareDir-version;">
-
-    <title>Test::File::ShareDir-&Test-File-ShareDir-version;</title>
-
-    <indexterm zone="perl-test-file-sharedir">
-      <primary sortas="a-Test-File-ShareDir">Test::File::ShareDir</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::File::ShareDir</title>
-
-      <para>
-        Test::File::ShareDir is some low level plumbing to enable a distribution
-        to perform tests while consuming its own share directories in a manner
-        similar to how they will be once installed. This allows <xref
-        linkend="perl-file-sharedir"/> to see the latest version of content
-        instead of whatever is installed on the target system where you are
-        testing.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test::File::ShareDir Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-tiny"/>,
-        <xref linkend="perl-file-copy-recursive"/>,
-        <xref linkend="perl-file-sharedir"/>,
-        <xref linkend="perl-path-tiny"/> and
-        <xref linkend="perl-scope-guard"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::File::ShareDir</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-file.xml
===================================================================
--- general/prog/perl-deps/perl-test-file.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/B/BD/BDFOY/Test-File-&Test-File-version;.tar.gz">
-  <!ENTITY my-md5sum "dccb988191187261ce3a2a10af939625">
-
-]>
-
-  <!-- Begin Test::File -->
-  <sect2 id="perl-test-file" xreflabel="Test-File-&Test-File-version;">
-
-    <title>Test::File-&Test-File-version;</title>
-
-    <indexterm zone="perl-test-file">
-      <primary sortas="a-Test-File">Test::File</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::File</title>
-
-      <para>
-        Test::File provides a collection of test utilities for file attributes.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test::File Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-utf8"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::File</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-leaktrace.xml
===================================================================
--- general/prog/perl-deps/perl-test-leaktrace.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/L/LE/LEEJO/Test-LeakTrace-&Test-LeakTrace-version;.tar.gz">
-  <!ENTITY my-md5sum "afdb2cc6be0807cb635fb601a004d522">
-
-]>
-
-  <!-- Begin Test::LeakTrace -->
-  <sect2 id="perl-test-leaktrace" xreflabel="Test-LeakTrace-&Test-LeakTrace-version;">
-
-    <title>Test::LeakTrace-&Test-LeakTrace-version;</title>
-
-    <indexterm zone="perl-test-leaktrace">
-      <primary sortas="a-Test-LeakTrace">Test::LeakTrace</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::LeakTrace</title>
-
-      <para>
-        Test::LeakTrace traces memory leaks.
-      </para>
-
-      &lfs121_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 Test::LeakTrace</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-needs.xml
===================================================================
--- general/prog/perl-deps/perl-test-needs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/H/HA/HAARG/Test-Needs-&Test-Needs-version;.tar.gz">
-  <!ENTITY my-md5sum "2b3d10946001561297624e7668f09c26">
-
-]>
-
-  <!-- Begin Test::Needs -->
-  <sect2 id="perl-test-needs" xreflabel="Test-Needs-&Test-Needs-version;">
-
-    <title>Test::Needs-&Test-Needs-version;</title>
-
-    <indexterm zone="perl-test-needs">
-      <primary sortas="a-Test-Needs">Test::Needs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Needs</title>
-
-      <para>
-        Test::Needs skips tests if a requested module is not present.
-      </para>
-
-      &lfs121_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 Test::Needs</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-requires.xml
===================================================================
--- general/prog/perl-deps/perl-test-requires.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/T/TO/TOKUHIROM/Test-Requires-&Test-Requires-version;.tar.gz">
-  <!ENTITY my-md5sum "999d6c4e46ea7baae7a5113292e02ed8">
-
-]>
-
-  <!-- Begin Test::Requires -->
-  <sect2 id="perl-test-requires" xreflabel="Test-Requires-&Test-Requires-version;">
-
-    <title>Test::Requires-&Test-Requires-version;</title>
-
-    <indexterm zone="perl-test-requires">
-      <primary sortas="a-Test-Requires">Test::Requires</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Requires</title>
-
-      <para>
-        The Test::Requires module checks if another (optional) module
-        can be loaded, and if not it skips all the current tests.
-      </para>
-
-      &lfs121_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 Test::Requires</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-requiresinternet.xml
===================================================================
--- general/prog/perl-deps/perl-test-requiresinternet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/M/MA/MALLEN/Test-RequiresInternet-&Test-RequiresInternet-version;.tar.gz">
-  <!ENTITY my-md5sum "0ba9f1cff4cf90ed2618c2eddfd525d8">
-
-]>
-
-  <!-- Begin Test::RequiresInternet -->
-  <sect2 id="perl-test-requiresinternet" xreflabel="Test-RequiresInternet-&Test-RequiresInternet-version;">
-
-    <title>Test::RequiresInternet-&Test-RequiresInternet-version;</title>
-
-    <indexterm zone="perl-test-requiresinternet">
-      <primary sortas="a-Test-RequiresInternet">Test::RequiresInternet</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::RequiresInternet</title>
-
-      <para>
-        Test::RequiresInternet is intended to easily test network connectivity
-        before functional tests begin to non-local Internet resources.
-      </para>
-
-      &lfs121_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 Test::RequiresInternet</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-utf8.xml
===================================================================
--- general/prog/perl-deps/perl-test-utf8.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/M/MA/MARKF/Test-utf8-&Test-utf8-version;.tar.gz">
-  <!ENTITY my-md5sum "71d187539c76ac1ed9a0242ff208796d">
-
-]>
-
-  <!-- Begin Test::utf8 -->
-  <sect2 id="perl-test-utf8" xreflabel="Test-utf8-&Test-utf8-version;">
-
-    <title>Test::utf8-&Test-utf8-version;</title>
-
-    <indexterm zone="perl-test-utf8">
-      <primary sortas="a-Test-utf8">Test::utf8</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::utf8</title>
-
-      <para>
-        Test::utf8 is a collection of tests useful for dealing with utf8 strings
-        in <application>Perl</application>.
-      </para>
-
-      &lfs121_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 Test::utf8</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-warnings.xml
===================================================================
--- general/prog/perl-deps/perl-test-warnings.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/ET/ETHER/Test-Warnings-&Test-Warnings-version;.tar.gz">
-  <!ENTITY my-md5sum "a936461688611bd85258c09e4bf6de68">
-
-]>
-
-  <!-- Begin Test::Warnings -->
-  <sect2 id="perl-test-warnings" xreflabel="Test-Warnings-&Test-Warnings-version;">
-
-    <title>Test::Warnings-&Test-Warnings-version;</title>
-
-    <indexterm zone="perl-test-warnings">
-      <primary sortas="a-Test-Warnings">Test::Warnings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Warnings</title>
-
-      <para>
-        Test::Warnings tests for warnings and the lack of them.
-      </para>
-
-      &lfs121_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 Test::Warnings</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test-without-module.xml
===================================================================
--- general/prog/perl-deps/perl-test-without-module.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/C/CO/CORION/Test-Without-Module-&Test-Without-Module-version;.tar.gz">
-  <!ENTITY my-md5sum "d6fdc73b60d197a8098fd41a81c92630">
-
-]>
-
-  <!-- Begin Test::Without::Module -->
-  <sect2 id="perl-test-without-module" xreflabel="Test-Without-Module-&Test-Without-Module-version;">
-
-    <title>Test::Without::Module-&Test-Without-Module-version;</title>
-
-    <indexterm zone="perl-test-without-module">
-      <primary sortas="a-Test-Without-Module">Test::Without::Module</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Without::Module</title>
-
-      <para>
-        This module allows you to deliberately hide modules from a program even
-        though they are installed. This is mostly useful for testing modules
-        that have a fallback when a certain dependency module is not installed.
-      </para>
-
-      &lfs121_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 Test::Without::Module</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test2-plugin-nowarnings.xml
===================================================================
--- general/prog/perl-deps/perl-test2-plugin-nowarnings.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/D/DR/DROLSKY/Test2-Plugin-NoWarnings-&Test2-Plugin-NoWarnings-version;.tar.gz">
-  <!ENTITY my-md5sum "efcddec6cda66260ae14206e28f7feeb">
-
-]>
-
-  <!-- Begin Test2::Plugin::NoWarnings -->
-  <sect2 id="perl-test2-plugin-nowarnings" xreflabel="Test2-Plugin-NoWarnings-&Test2-Plugin-NoWarnings-version;">
-
-    <title>Test2::Plugin::NoWarnings-&Test2-Plugin-NoWarnings-version;</title>
-
-    <indexterm zone="perl-test2-plugin-nowarnings">
-      <primary sortas="a-Test2-Plugin-NoWarnings">Test2::Plugin::NoWarnings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test2::Plugin::NoWarnings</title>
-
-      <para>
-        Test2::Plugin::NoWarnings causes tests to fail if there are any warnings
-        while they run.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test2::Plugin::NoWarnings Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-test2-suite"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-ipc-run3"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test2::Plugin::NoWarnings</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-test2-suite.xml
===================================================================
--- general/prog/perl-deps/perl-test2-suite.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/EX/EXODIST/Test2-Suite-&Test2-Suite-version;.tar.gz">
-  <!ENTITY my-md5sum "b5958ed274ab778fe5681f0c520d05f7">
-
-]>
-
-  <!-- Begin Test2::Suite -->
-  <sect2 id="perl-test2-suite" xreflabel="Test2-Suite-&Test2-Suite-version;">
-
-    <title>Test2::Suite-&Test2-Suite-version;</title>
-
-    <indexterm zone="perl-test2-suite">
-      <primary sortas="a-Test2-Suite">Test2::Suite</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test2::Suite</title>
-
-      <para>
-        Test2::Suite is a distribution with a rich set of tools built upon the
-        Test2 framework.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test2::Suite Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-term-table"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test2::Suite</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-text-csv_xs.xml
===================================================================
--- general/prog/perl-deps/perl-text-csv_xs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
- <!-- .tgz -->
-  <!ENTITY my-download-http "&metacpan_authors;/H/HM/HMBRAND/Text-CSV_XS-&Text-CSV_XS-version;.tgz">
-  <!ENTITY my-md5sum "d6af5f1aec99e5a5392ae3175de9a7ae">
-
-]>
-
-  <!-- Begin Text::CSV_XS -->
-  <sect2 id="perl-text-csv_xs" xreflabel="Text-CSV_XS-&Text-CSV_XS-version;">
-
-    <title>Text::CSV_XS-&Text-CSV_XS-version;</title>
-
-    <indexterm zone="perl-text-csv_xs">
-      <primary sortas="a-Text-CSV_XS">Text::CSV_XS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::CSV_XS</title>
-
-      <para>
-        Text::CSV_XS provides facilities for the composition and decomposition
-        of comma-separated values.
-      </para>
-
-      &lfs121_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 Text::CSV_XS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-text-diff.xml
===================================================================
--- general/prog/perl-deps/perl-text-diff.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/N/NE/NEILB/Text-Diff-&Text-Diff-version;.tar.gz">
-  <!ENTITY my-md5sum "edf57b6189f7651a6be454062a4e6d9c">
-
-]>
-
-  <!-- Begin Text::Diff -->
-  <sect2 id="perl-text-diff" xreflabel="Text-Diff-&Text-Diff-version;">
-
-    <title>Text::Diff-&Text-Diff-version;</title>
-
-    <indexterm zone="perl-text-diff">
-      <primary sortas="a-Text-Diff">Text::Diff</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::Diff</title>
-
-      <para>
-        Text::Diff performs diffs on files and record sets.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Text::Diff Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-algorithm-diff"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::Diff</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-text-glob.xml
===================================================================
--- general/prog/perl-deps/perl-text-glob.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/R/RC/RCLAMP/Text-Glob-&Text-Glob-version;.tar.gz">
-  <!ENTITY my-md5sum "d001559c504a2625dd117bd1558f07f7">
-
-]>
-
-  <!-- Begin Text::Glob -->
-  <sect2 id="perl-text-glob" xreflabel="Text-Glob-&Text-Glob-version;">
-
-    <title>Text::Glob-&Text-Glob-version;</title>
-
-    <indexterm zone="perl-text-glob">
-      <primary sortas="a-Text-Glob">Text::Glob</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::Glob</title>
-
-      <para>
-        Text::Glob implements <ulink role='man'
-        url='&man;glob.3'>glob(3)</ulink> style matching that can be used to
-        match against text, rather than fetching names from a filesystem.
-      </para>
-
-      &lfs121_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 Text::Glob</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-tie-cycle.xml
===================================================================
--- general/prog/perl-deps/perl-tie-cycle.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/B/BD/BDFOY/Tie-Cycle-&Tie-Cycle-version;.tar.gz">
-  <!ENTITY my-md5sum "2c99b09532d80599f4b041f3ecae7af8">
-
-]>
-
-  <!-- Begin Tie::Cycle -->
-  <sect2 id="perl-tie-cycle" xreflabel="Tie-Cycle-&Tie-Cycle-version;">
-
-    <title>Tie::Cycle-&Tie-Cycle-version;</title>
-
-    <indexterm zone="perl-tie-cycle">
-      <primary sortas="a-Tie-Cycle">Tie::Cycle</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Tie::Cycle</title>
-
-      <para>
-        You use Tie::Cycle to go through a list over and over again. Once you
-        get to the end of the list, you go back to the beginning. You don't have
-        to worry about any of this since the magic of tie does that for you.
-      </para>
-
-      &lfs121_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 Tie::Cycle</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-timedate.xml
===================================================================
--- general/prog/perl-deps/perl-timedate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/A/AT/ATOOMIC/TimeDate-&TimeDate-version;.tar.gz">
-  <!ENTITY my-md5sum "5e5afe22c8d417417283d1f7f4572a57">
-
-]>
-
-  <!-- Begin TimeDate -->
-  <sect2 id="perl-timedate" xreflabel="TimeDate-&TimeDate-version;">
-
-    <title>TimeDate-&TimeDate-version;</title>
-
-    <indexterm zone="perl-timedate">
-      <primary sortas="a-TimeDate">TimeDate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to TimeDate</title>
-
-      <para>
-        TimeDate provides miscellaneous timezone manipulation routines.
-      </para>
-
-      &lfs121_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 TimeDate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-try-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-try-tiny.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/E/ET/ETHER/Try-Tiny-&Try-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "993a29ee8a03c9bd9c2f7c53d1082a03">
-
-]>
-
-  <!-- Begin Try::Tiny -->
-  <sect2 id="perl-try-tiny" xreflabel="Try-Tiny-&Try-Tiny-version;">
-
-    <title>Try::Tiny-&Try-Tiny-version;</title>
-
-    <indexterm zone="perl-try-tiny">
-      <primary sortas="a-Try-Tiny">Try::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Try::Tiny</title>
-
-      <para>
-        Try::Tiny provides <command>try</command> and <command>catch</command>
-        to expect and handle exceptional conditions, avoiding quirks in
-        <application>Perl</application> and common mistakes.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Try::Tiny Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (can be used by the test suite)</bridgehead>
-      <para role="optional">
-        <!-- runs one more test if this is present -->
-        <xref linkend="perl-capture-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Try::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-variable-magic.xml
===================================================================
--- general/prog/perl-deps/perl-variable-magic.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/V/VP/VPIT/Variable-Magic-&Variable-Magic-version;.tar.gz">
-  <!ENTITY my-md5sum "957d53fc6614deb593aa6d7cf96d713a">
-
-]>
-
-  <!-- Begin Variable::Magic -->
-  <sect2 id="perl-variable-magic" xreflabel="Variable-Magic-&Variable-Magic-version;">
-
-    <title>Variable::Magic-&Variable-Magic-version;</title>
-
-    <indexterm zone="perl-variable-magic">
-      <primary sortas="a-Variable-Magic">Variable::Magic</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Variable::Magic</title>
-
-      <para>
-        Magic is Perl's way of enhancing variables. With this module, you can
-        add your own magic to any variable.
-      </para>
-
-      &lfs121_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 Variable::Magic</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-www-robotrules.xml
===================================================================
--- general/prog/perl-deps/perl-www-robotrules.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/G/GA/GAAS/WWW-RobotRules-&WWW-RobotRules-version;.tar.gz">
-  <!ENTITY my-md5sum "b7186e8b8b3701e70c22abf430742403">
-
-]>
-
-  <!-- Begin WWW::RobotRules -->
-  <sect2 id="perl-www-robotrules" xreflabel="WWW-RobotRules-&WWW-RobotRules-version;">
-
-    <title>WWW::RobotRules-&WWW-RobotRules-version;</title>
-
-    <indexterm zone="perl-www-robotrules">
-      <primary sortas="a-WWW-RobotRules">WWW::RobotRules</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to WWW::RobotRules</title>
-
-      <para>
-        WWW::RobotRules parses <filename>robots.txt</filename> files,
-        creating a WWW::RobotRules object with methods to check if access
-        to a given URL is prohibited.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">WWW::RobotRules Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required (runtime)</bridgehead>
-      <para role="required">
-        <!-- LWP~::Simple comes from libwww-perl -->
-        <xref role="runtime" linkend="perl-libwww-perl"/> (install this
-        module first and install that later)
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of WWW::RobotRules</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-xml-libxml.xml
===================================================================
--- general/prog/perl-deps/perl-xml-libxml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/S/SH/SHLOMIF/XML-LibXML-&XML-LibXML-version;.tar.gz">
-  <!ENTITY my-md5sum "d2bad7f395716a6f57abde538d47008c">
-]>
-
-  <!-- Begin XML::LibXML -->
-  <sect2 id="perl-xml-libxml" xreflabel="XML-LibXML-&XML-LibXML-version;">
-
-    <title>XML::LibXML-&XML-LibXML-version;</title>
-
-    <indexterm zone="perl-xml-libxml">
-      <primary sortas="a-XML-LibXML">XML::LibXML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::LibXML</title>
-
-      <para>
-        XML::LibXML is a perl binding for <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">XML::LibXML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-alien-libxml2"/>,
-        <xref linkend="perl-xml-sax"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::LibXML</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-xml-namespacesupport.xml
===================================================================
--- general/prog/perl-deps/perl-xml-namespacesupport.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/PERIGRIN/XML-NamespaceSupport-&XML-NamespaceSupport-version;.tar.gz">
-  <!ENTITY my-md5sum "a8916c6d095bcf073e1108af02e78c97">
-
-]>
-
-  <!-- Begin XML::NamespaceSupport -->
-  <sect2 id="perl-xml-namespacesupport" xreflabel="XML-NamespaceSupport-&XML-NamespaceSupport-version;">
-
-    <title>XML::NamespaceSupport-&XML-NamespaceSupport-version;</title>
-
-    <indexterm zone="perl-xml-namespacesupport">
-      <primary sortas="a-XML-NamespaceSupport">XML::NamespaceSupport</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::NamespaceSupport</title>
-
-      <para>
-        XML::NamespaceSupport offers a simple way to process namespaced XML names
-        from within any application that may need them.
-      </para>
-
-      &lfs121_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 XML::NamespaceSupport</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-xml-sax-base.xml
===================================================================
--- general/prog/perl-deps/perl-xml-sax-base.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/G/GR/GRANTM/XML-SAX-Base-&XML-SAX-Base-version;.tar.gz">
-  <!ENTITY my-md5sum "ec347a14065dd7aec7d9fb181b2d7946">
-
-]>
-
-  <!-- Begin XML::SAX::Base -->
-  <sect2 id="perl-xml-sax-base" xreflabel="XML-SAX-Base-&XML-SAX-Base-version;">
-
-    <title>XML::SAX::Base-&XML-SAX-Base-version;</title>
-
-    <indexterm zone="perl-xml-sax-base">
-      <primary sortas="a-XML-SAX-Base">XML::SAX::Base</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::SAX::Base</title>
-
-      <para>
-        This module has a very simple task - to be a base class for PerlSAX
-        drivers and filters.
-      </para>
-
-      &lfs121_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 XML::SAX-Base</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-deps/perl-xml-sax.xml
===================================================================
--- general/prog/perl-deps/perl-xml-sax.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/G/GR/GRANTM/XML-SAX-&XML-SAX-version;.tar.gz">
-  <!ENTITY my-md5sum "b62e3754523695c7f5bbcafa3676a38d">
-
-]>
-
-  <!-- Begin XML::SAX -->
-  <sect2 id="perl-xml-sax" xreflabel="XML-SAX-&XML-SAX-version;">
-
-    <title>XML::SAX-&XML-SAX-version;</title>
-
-    <indexterm zone="perl-xml-sax">
-      <primary sortas="a-XML-SAX">XML::SAX</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::SAX</title>
-
-      <para>
-        XML::SAX is a SAX parser access API for Perl. It includes classes and
-        APIs required for implementing SAX drivers, along with a factory class
-        for returning any SAX parser installed on the user's system.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">XML::SAX Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxml2"/>,
-        <xref linkend="perl-xml-namespacesupport"/> and
-        <xref linkend="perl-xml-sax-base"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::SAX</title>
-
-        <!-- claimed to not support parallel building, but all it does is
-         copy a few files, works with -j4 although running parallel builds
-         on modules is usually not beneficial : Ken -->
-
-      <para>
-        This module uses a variant of the standard build and installation
-         instructions:
-
-<screen><userinput>yes | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes</command>: Perl will ask if you want it to alter
-        ParserDetails.ini and then wait for a response. The default is
-        'y'. Using 'yes' allows you to script this.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,511 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="perl-modules" xreflabel="Perl Modules">
-  <?dbhtml filename="perl-modules.html" ?>
-
-
-  <title>Perl Modules</title>
-
-  <indexterm zone="perl-modules">
-    <primary sortas="a-perl-Modules">Perl Modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Perl Modules</title>
-
- <!-- note for editors:
-      When testing the dependencies for a new/updated module, it is possible
-      to build the dependencies in a directory, then do DESTDIR installs.
-      For packages using Module::Build, supply \-\-destdir= (lower case!)
-      AFTER the command.  Repeat as necessary.  At any one time, ALL deps for
-      the module being tested need to be in the same DESTDIR - it may be
-      convenient to copy the contents, e.g.
- cp -av MODULEA/usr/lib/perl5/site_perl/5.xx.y/* BATCH1/usr/lib/perl5/site_perl/5.xx.y/
-
-      And then to use these deps (plus what is already installed),
-      export PERL5LIB=/ab/path/to/BATCH1/usr/lib/perl5/site_perl/5.xx.y
-
-      Please be aware that not all non-core prerequisite deps are necessarily
-      needed.  If 'use Foo::Bar' appears in one of the main files in lib/ or blib/
-      it is assumed to be needed.  But if it only gets used in tests (t/) then
-      please try without it to see if the tests can still pass. -->
-
-    <para>
-      The <application>Perl</application> module packages (also referred to as
-      Distributions, because each can contain multiple modules) add useful
-      objects to the <application>Perl</application> language. The packages
-      listed on this page are required or recommended for other packages in
-      the book. If they have dependent modules, those are either on this page
-      or else on the next page (<xref linkend="perl-deps"/>).
-   </para>
-
-    <para>
-      In many cases, only the required or recommended dependencies are listed -
-      there might be other modules which allow more tests to be run, but
-      omitting them will still allow the tests to <literal>PASS</literal>.
-    </para>
-
-    <para>
-      For a few modules, the BLFS editors have determined that other modules
-      still listed as prerequisites are not required, and omitted them.
-    </para>
-
-    <para>
-      Where an alphabetically-earlier dependency of the same module pulls in a
-      dependency, it is not mentioned for the later dependencies of the same
-      module. You should build the listed dependencies in order.
-    </para>
-
-    <para>
-      It is generally worth running the tests for perl modules, they often
-      can show problems such as missing dependencies which are required to
-      use the module.  Here, the editors have attempted to separate those
-      dependencies which are only required for running test suites, but they
-      will not be mentioned for a module where one of its dependencies uses
-      that module for its own test suite.  That is to say, if you intend to
-      run the test suites, please run them for each dependency of the module.
-    </para>
-
-    <para>
-      It is possible to automatically install the current versions of a module
-      and <emphasis>all</emphasis> missing or too-old dependencies
-      <emphasis>recommended by upstream</emphasis> using CPAN. See
-      <xref linkend="perl-alternatives"/> at the end of this page.
-    </para>
-
-    <para>
-      Most of these modules only install files below <filename
-      class="directory">/usr/lib/perl5/site_perl/5.xx.y</filename> and those will
-      not be documented. One or two install programs (mostly, perl scripts), or
-      a library, into <filename class="directory">/usr/bin/</filename> or
-      <filename class="directory">/usr/lib/</filename> and these
-      <emphasis>are</emphasis> documented.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/perl-modules"/>
-    </para>
-
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="perl-archive-zip"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-autovivification"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-isbn"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-ismn"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-issn"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-accessor"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-data-compare"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-data-dump"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-data-uniqid"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-calendar-julian"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-format-builder"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-eucjpascii"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-hanextra"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-jis2k"/>
-        </para>
-      </listitem>
-      <!--<listitem>
-        <para>
-          <xref linkend="perl-error"/>
-        </para>
-      </listitem>-->
-      <listitem>
-        <para>
-          <xref linkend="perl-file-fcntllock"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-slurper"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-which"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-html-parser"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-daemon"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-io-socket-ssl"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-io-string"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-ipc-run3"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          <xref linkend="perl-json"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="perl-libwww-perl"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-lingua-translit"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-allutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-moreutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-log-log4perl"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-lwp-protocol-https"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-module-build"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-net-dns"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-parse-recdescent"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-parse-yapp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-perlio-utf8_strict"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-regexp-common"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sgmlspm"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sort-key"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-command"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-differences"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-bibtex"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-csv"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-roman"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-unicode-collate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-unicode-linebreak"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-uri"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-libxml-simple"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-libxslt"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-simple"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-writer"/>
-        </para>
-      </listitem>
-      <!-- alternative cpan installation stays at the end -->
-      <listitem>
-        <para>
-          <xref linkend="perl-alternatives"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <!-- and keep these in the same order as above -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-archive-zip.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-autovivification.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-business-isbn.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-business-ismn.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-business-issn.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-class-accessor.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-data-compare.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-data-dump.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-data-uniqid.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-datetime-calendar-julian.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-datetime-format-builder.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-encode-eucjpascii.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-encode-hanextra.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-encode-jis2k.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-error.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-file-fcntllock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-file-slurper.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-file-which.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-html-parser.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-http-daemon.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-io-socket-ssl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-io-string.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-ipc-run3.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-json.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-lingua-translit.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-libwww-perl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-list-allutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-list-moreutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-log-log4perl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-lwp-protocol-https.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-module-build.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-net-dns.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-parse-recdescent.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-parse-yapp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-perlio-utf8_strict.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-regexp-common.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-sgmlspm.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-sort-key.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-test-command.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-test-differences.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-text-bibtex.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-text-csv.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-text-roman.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-unicode-collate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-unicode-linebreak.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-uri.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-libxml-simple.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-libxslt.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-simple.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-writer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-alternatives.xml"/>
-
-</sect1>
Index: neral/prog/perl-modules/perl-archive-zip.xml
===================================================================
--- general/prog/perl-modules/perl-archive-zip.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
-  <!ENTITY my-md5sum "a33993309322164867c99e04a4000ee3">
-]>
-
-  <!-- Begin Archive::Zip -->
-  <sect2 id="perl-archive-zip" xreflabel="Archive-Zip-&Archive-Zip-version;">
-
-    <title>Archive::Zip-&Archive-Zip-version;</title>
-
-    <indexterm zone="perl-archive-zip">
-      <primary sortas="a-Archive-Zip">Archive::Zip</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Archive::Zip</title>
-
-      <para>
-        The Archive::Zip module allows a Perl program to create, manipulate,
-        read, and write Zip archive files.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Archive::Zip Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (for the test suite)</bridgehead>
-      <para role="required">
-        <xref linkend="unzip"/> (with its patch)
-      </para>
-
-<!-- Removed in 1.68, see the Changes file
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="perl-test-mockmodule"/>
-      </para>
--->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Archive::Zip</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            crc32
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="crc32-prog">
-          <term><command>crc32</command></term>
-          <listitem>
-            <para>
-              computes and prints to stdout the CRC-32 values of the given
-              files
-            </para>
-            <indexterm zone="perl-archive-zip crc32-prog">
-              <primary sortas="b-crc32">crc32</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-autovivification.xml
===================================================================
--- general/prog/perl-modules/perl-autovivification.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">
-  <!ENTITY my-md5sum "8dec994e1e7d368e055f21a5777385a0">
-
-]>
-
-  <!-- Begin Autovivification -->
-  <sect2 id="perl-autovivification" xreflabel="autovivification-&autovivification-version;">
-
-    <title>autovivification-&autovivification-version;</title>
-
-    <indexterm zone="perl-autovivification">
-      <primary sortas="a-autovivification">autovivification</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the autovivification module</title>
-
-      <para>
-        This module allows you disable autovivification (the automatic creation
-        and population of new arrays and hashes whenever undefined variables are
-        dereferenced), and optionally throw a warning or an error when it would
-        have occurred.
-      </para>
-
-      &lfs121_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 autovivification</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-business-isbn.xml
===================================================================
--- general/prog/perl-modules/perl-business-isbn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/B/BR/BRIANDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
-  <!ENTITY my-md5sum "e906867846f4d1fa57366aa519da5846">
-]>
-
-  <!-- Begin Business::ISBN -->
-  <sect2 id="perl-business-isbn" xreflabel="Business-ISBN-&Business-ISBN-version;">
-
-    <title>Business::ISBN-&Business-ISBN-version;</title>
-
-    <indexterm zone="perl-business-isbn">
-      <primary sortas="a-Business-ISBN">Business::ISBN</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Business::ISBN</title>
-
-      <para>
-        The Business::ISBN module provides functions for working with
-        International Standard Book Numbers.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Business::ISBN Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-business-isbn-data"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Business::ISBN</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-business-ismn.xml
===================================================================
--- general/prog/perl-modules/perl-business-ismn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/B/BR/BRIANDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">
-  <!ENTITY my-md5sum "dbc9023703262ee29d1b9e9a8294106c">
-]>
-
-  <!-- Begin Business::ISMN -->
-  <sect2 id="perl-business-ismn" xreflabel="Business-ISMN-&Business-ISMN-version;">
-
-    <title>Business::ISMN-&Business-ISMN-version;</title>
-
-    <indexterm zone="perl-business-ismn">
-      <primary sortas="a-Business-ISMN">Business::ISMN</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Business::ISMN</title>
-
-      <para>
-        The Business::ISMN module is for work with International Standard Music
-        Numbers.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Business::ISMN Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-tie-cycle"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Business::ISMN</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-business-issn.xml
===================================================================
--- general/prog/perl-modules/perl-business-issn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz">
-  <!ENTITY my-md5sum "f46bf5585d6c3aa9fb32127edb13151a">
-
-]>
-
-  <!-- Begin Business::ISSN -->
-  <sect2 id="perl-business-issn" xreflabel="Business-ISSN-&Business-ISSN-version;">
-
-    <title>Business::ISSN-&Business-ISSN-version;</title>
-
-    <indexterm zone="perl-business-issn">
-      <primary sortas="a-Business-ISSN">Business::ISSN</primary>
-    </indexterm>
-
-
-    <sect3 role="package">
-      <title>Introduction to Business::ISSN</title>
-
-      <para>
-        The Business::ISSN module is for work with International Standard
-        Serial Numbers.
-      </para>
-
-      &lfs121_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 Business::ISSN</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-class-accessor.xml
===================================================================
--- general/prog/perl-modules/perl-class-accessor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/K/KA/KASEI/Class-Accessor-&Class-Accessor-version;.tar.gz">
-  <!ENTITY my-md5sum "1f1e5990f87cad7659b292fed7dc0407">
-
-]>
-
-  <!-- Begin Class::Accessor -->
-  <sect2 id="perl-class-accessor" xreflabel="Class-Accessor-&Class-Accessor-version;">
-
-    <title>Class::Accessor-&Class-Accessor-version;</title>
-
-    <indexterm zone="perl-class-accessor">
-      <primary sortas="a-Class-Accessor">Class::Accessor</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Accessor</title>
-
-      <para>
-        Class::Accessor generates accessors/mutators for your class.
-      </para>
-
-      &lfs121_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 Class::Accessor</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-data-compare.xml
===================================================================
--- general/prog/perl-modules/perl-data-compare.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz">
-  <!ENTITY my-md5sum "ce9cb42ba6af634f5ab51f13f37e2ddb">
-]>
-
-  <!-- Begin Data::Compare -->
-  <sect2 id="perl-data-compare" xreflabel="Data-Compare-&Data-Compare-version;">
-
-    <title>Data::Compare-&Data-Compare-version;</title>
-
-    <indexterm zone="perl-data-compare">
-      <primary sortas="a-Data-Compare">Data::Compare</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Data::Compare</title>
-
-      <para>
-        The Data::Compare module compares two <application>perl</application>
-        data structures.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Data::Compare Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-clone"/>,
-        <xref linkend="perl-file-find-rule"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Data::Compare</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-data-dump.xml
===================================================================
--- general/prog/perl-modules/perl-data-dump.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/G/GA/GARU/Data-Dump-&Data-Dump-version;.tar.gz">
-  <!ENTITY my-md5sum "9bd7131ef0441e1e0e001bf85e9fae31">
-
-]>
-
-  <!-- Begin Data::Dump -->
-  <sect2 id="perl-data-dump" xreflabel="Data-Dump-&Data-Dump-version;">
-
-    <title>Data::Dump-&Data-Dump-version;</title>
-
-    <indexterm zone="perl-data-dump">
-      <primary sortas="a-Data-Dump">Data::Dump</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Data::Dump</title>
-
-      <para>
-        Data::Dump provides pretty printing of data structures.
-      </para>
-
-      &lfs121_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 Data::Dump</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-data-uniqid.xml
===================================================================
--- general/prog/perl-modules/perl-data-uniqid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/M/MW/MWX/Data-Uniqid-&Data-Uniqid-version;.tar.gz">
-  <!ENTITY my-md5sum "6bab3b5da09fedfdf60ce2629a7367db">
-
-]>
-
-  <!-- Begin Data::Uniqid -->
-  <sect2 id="perl-data-uniqid" xreflabel="Data-Uniqid-&Data-Uniqid-version;">
-
-    <title>Data::Uniqid-&Data-Uniqid-version;</title>
-
-    <indexterm zone="perl-data-uniqid">
-      <primary sortas="a-Data-Uniqid">Data::Uniqid</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Data::Uniqid</title>
-
-      <para>
-        Data::Uniqid provides three simple routines for generating unique IDs.
-      </para>
-
-      &lfs121_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 Data::Uniqid</title>
-
-      <para>
-        Although the final test fails and reports an Error, the test suite
-        returns a status of 0. The error can safely be ignored.
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-datetime-calendar-julian.xml
===================================================================
--- general/prog/perl-modules/perl-datetime-calendar-julian.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/W/WY/WYANT/DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;.tar.gz">
-  <!ENTITY my-md5sum "abd775d1d82f0f45d4fd6214cf7bbed8">
-
-]>
-
-  <!-- Begin DateTime::Calendar::Julian -->
-  <sect2 id="perl-datetime-calendar-julian" xreflabel="DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;">
-
-    <title>DateTime::Calendar::Julian-&DateTime-Calendar-Julian-version;</title>
-
-    <indexterm zone="perl-datetime-calendar-julian">
-      <primary sortas="a-DateTime-Calendar-Julian">DateTime::Calendar::Julian</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Calendar::Julian</title>
-
-      <para>
-        DateTime::Calendar::Julian implements the Julian Calendar.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">DateTime::Calendar::Julian Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Calendar::Julian</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-datetime-format-builder.xml
===================================================================
--- general/prog/perl-modules/perl-datetime-format-builder.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/D/DR/DROLSKY/DateTime-Format-Builder-&DateTime-Format-Builder-version;.tar.gz">
-  <!ENTITY my-md5sum "aa41917ca9ad69b3898728ce9c2fb477">
-
-]>
-
-  <!-- Begin DateTime::Format::Builder -->
-  <sect2 id="perl-datetime-format-builder" xreflabel="DateTime-Format-Builder-&DateTime-Format-Builder-version;">
-
-    <title>DateTime::Format::Builder-&DateTime-Format-Builder-version;</title>
-
-    <indexterm zone="perl-datetime-format-builder">
-      <primary sortas="a-DateTime-Format-Builder">DateTime::Format::Builder</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Format::Builder</title>
-
-      <para>
-        DateTime::Format::Builder created DateTime parser classes and objects.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">DateTime::Format::Builder Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime-format-strptime"/> and
-        <!-- perl-datetime-format-strptime fulls in perl-datetime -->
-        <xref linkend="perl-params-validate"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Format::Builder</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-encode-eucjpascii.xml
===================================================================
--- general/prog/perl-modules/perl-encode-eucjpascii.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz">
-  <!ENTITY my-md5sum "5daa65f55b7c2050bb0713d9e95f239d">
-
-]>
-
-  <!-- Begin Encode::EUCJPASCII -->
-  <sect2 id="perl-encode-eucjpascii" xreflabel="Encode-EUCJPASCII-&Encode-EUCJPASCII-version;">
-
-    <title>Encode::EUCJPASCII-&Encode-EUCJPASCII-version;</title>
-
-    <indexterm zone="perl-encode-eucjpascii">
-      <primary sortas="a-Encode-EUCJPASCII">Encode::EUCJPASCII</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::EUCJPASCII</title>
-
-      <para>
-        Encode::EUCJPASCII provides an eucJP-open (Extended Unix Code, Japanese)
-        mapping.
-      </para>
-
-      &lfs121_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 Encode::EUCJPASCII</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-encode-hanextra.xml
===================================================================
--- general/prog/perl-modules/perl-encode-hanextra.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
-  <!ENTITY my-md5sum "e1d3bc32c1c8ee304235a06fbcd5d5a4">
-
-  <!ENTITY Encode-HanExtra-download-http "&perl_authors;/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
-  <!ENTITY Encode-HanExtra-md5sum "e1d3bc32c1c8ee304235a06fbcd5d5a4">
-]>
-
-  <!-- Begin Encode::HanExtra -->
-  <sect2 id="perl-encode-hanextra" xreflabel="Encode-HanExtra-&Encode-HanExtra-version;">
-
-    <title>Encode::HanExtra-&Encode-HanExtra-version;</title>
-
-    <indexterm zone="perl-encode-hanextra">
-      <primary sortas="a-Encode-HanExtra">Encode::HanExtra</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::HanExtra</title>
-
-      <para>
-        The Encode::HanExtra module provides extra sets of Chinese Encodings
-        which are not included in the core Encode module because of size
-        issues.
-      </para>
-
-      &lfs121_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 Encode::HanExtra</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-unsafe-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-encode-jis2k.xml
===================================================================
--- general/prog/perl-modules/perl-encode-jis2k.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/D/DA/DANKOGAI/Encode-JIS2K-&Encode-JIS2K-version;.tar.gz">
-  <!ENTITY my-md5sum "06acd9e878d41ffc354258e265db2875">
-
-]>
-
-  <!-- Begin Encode::JIS2K -->
-  <sect2 id="perl-encode-jis2k" xreflabel="Encode-JIS2K-&Encode-JIS2K-version;">
-
-    <title>Encode::JIS2K-&Encode-JIS2K-version;</title>
-
-    <indexterm zone="perl-encode-jis2k">
-      <primary sortas="a-Encode-JIS2K">Encode::JIS2K</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::JIS2K</title>
-
-      <para>
-        The Encode::JIS2K module provides JIS X 0212 (aka JIS 2000) Encodings.
-      </para>
-
-      &lfs121_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 Encode::JIS2K</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-file-fcntllock.xml
===================================================================
--- general/prog/perl-modules/perl-file-fcntllock.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/J/JT/JTT/File-FcntlLock-0.22.tar.gz">
-  <!ENTITY my-md5sum "579698d735d864ee403674f1175f789d">
-]>
-
-  <!-- Begin File::FcntlLock -->
-  <sect2 id="perl-file-fcntllock" xreflabel="File-FcntlLock-&File-FcntlLock-version;">
-
-    <title>File::FcntlLock-&File-FcntlLock-version;</title>
-
-    <indexterm zone="perl-file-fcntllock">
-      <primary sortas="a-File-FcntlLock">File::FcntlLock</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::FcntlLock</title>
-
-      <para>
-        File::FcntlLock is a module to do file locking in an object oriented
-        fashion using the <ulink role='man'
-        url='&man;fcntl.2'>fcntl(2)</ulink> system call. This allows locks
-        on parts of a file as well as on the whole file and overcomes some
-        known problems with
-        <ulink role='man' url='&man;flock.2'>flock(2)</ulink>, on which
-        which Perl's <function>flock()</function> function is based per
-        default.
-      </para>
-
-      &lfs121_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>
-<!-- None that I can find.  bdubbs 11-17-23
-      <bridgehead renderas="sect4">File::FcntlLock Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-warnings"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::FcntlLock</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-file-slurper.xml
===================================================================
--- general/prog/perl-modules/perl-file-slurper.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/L/LE/LEONT/File-Slurper-&File-Slurper-version;.tar.gz">
-  <!ENTITY my-md5sum "d43bc5f069035eff3b6b7c418b4cedc4">
-
-]>
-
-  <!-- Begin File::Slurper -->
-  <sect2 id="perl-file-slurper" xreflabel="File-Slurper-&File-Slurper-version;">
-
-    <title>File::Slurper-&File-Slurper-version;</title>
-
-    <indexterm zone="perl-file-slurper">
-      <primary sortas="a-File-Slurper">File::Slurper</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Slurper</title>
-
-      <para>
-        File::Slurper is a simple, sane and efficient module to slurp a file.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">File::Slurper Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Slurper</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-file-which.xml
===================================================================
--- general/prog/perl-modules/perl-file-which.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/P/PL/PLICEASE/File-Which-&File-Which-version;.tar.gz">
-  <!ENTITY my-md5sum "d5c9154262b93398f0750ec364207639">
-
-]>
-
-  <!-- Begin File::Which -->
-  <sect2 id="perl-file-which" xreflabel="File-Which-&File-Which-version;">
-
-    <title>File::Which-&File-Which-version;</title>
-
-    <indexterm zone="perl-file-which">
-      <primary sortas="a-File-Which">File::Which</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Which</title>
-
-      <para>
-        File::Which provides a portable implementation of the
-        &apos;which&apos; utility.
-      </para>
-
-      &lfs121_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 File::Which</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-html-parser.xml
===================================================================
--- general/prog/perl-modules/perl-html-parser.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/O/OA/OALDERS/HTML-Parser-&HTML-Parser-version;.tar.gz">
-  <!ENTITY my-md5sum "b9f5dd3b14632f7a60541a2b61389c06">
-]>
-
-  <!-- Begin HTML::Parser -->
-  <sect2 id="perl-html-parser" xreflabel="HTML-Parser-&HTML-Parser-version;">
-
-    <title>HTML::Parser-&HTML-Parser-version;</title>
-
-    <indexterm zone="perl-html-parser">
-      <primary sortas="a-HTML-Parser">HTML::Parser</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTML::Parser</title>
-
-      <para>
-        The HTML::Parser distribution is a collection of modules that parse and
-        extract information from HTML documents.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTML::Parser Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-html-tagset"/>
-        <xref linkend="perl-http-message"/> (stritly speaking, not required
-        for building, but its module HTTP::Headers is required for tests and
-        a run-time requirement for HTML::HeadParser from this distribution).
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTML::Parser</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-http-daemon.xml
===================================================================
--- general/prog/perl-modules/perl-http-daemon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/O/OA/OALDERS/HTTP-Daemon-&HTTP-Daemon-version;.tar.gz">
-  <!ENTITY my-md5sum "51425462790165aeafc2819a7359706f">
-]>
-
-  <!-- Begin HTTP::Daemon -->
-  <sect2 id="perl-http-daemon" xreflabel="HTTP-Daemon-&HTTP-Daemon-version;">
-
-    <title>HTTP::Daemon-&HTTP-Daemon-version;</title>
-
-    <indexterm zone="perl-http-daemon">
-      <primary sortas="a-HTTP-Daemon">HTTP::Daemon</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Daemon</title>
-
-      <para>
-        Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on
-        a socket for incoming requests. The HTTP::Daemon is a subclass of
-        IO::Socket::INET, so you can perform socket operations directly on it too.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">HTTP::Daemon Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-message"/>
-        <!-- the listed deps are HTTP::Request, HTTP::Response, HTTP::Status
-         which are all submodules from perl-http-message, and also
-         HTTP::Date (perl-http-date) and LWP::MediaTypes (perl-lwp-mediatypes)
-         which are dependencies of perl-http-message, as well as URI (perl-uri)
-         in a test - that too is a dependency of perl-http-message. It claims
-         to want Module::Build::Tiny but that is only for the old ./Build.PL -->
-      </para>
-
-      <note>
-        <para>
-          Makefile.PL and running the tests will complain that Module::Build::Tiny
-          is missing, but that is only needed for <filename>Build.PL</filename>
-          which is used if the system lacks a C compiler.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Daemon</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-io-socket-ssl.xml
===================================================================
--- general/prog/perl-modules/perl-io-socket-ssl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
-  <!ENTITY my-md5sum "7a13ba92cdbad523f1a489c03b151569">
-
-  <!ENTITY IO-Socket-SSL-download-http "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
-]>
-
-  <!-- Begin IO::Socket::SSL -->
-  <sect2 id="perl-io-socket-ssl" xreflabel="IO-Socket-SSL-&IO-Socket-SSL-version;">
-
-    <title>IO::Socket::SSL-&IO-Socket-SSL-version;</title>
-
-    <indexterm zone="perl-io-socket-ssl">
-      <primary sortas="a-IO-Socket-SSL">IO::Socket::SSL</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IO::Socket::SSL</title>
-
-      <para>
-        IO::Socket::SSL makes using SSL/TLS much easier by wrapping the necessary
-        functionality into the familiar IO::Socket interface and providing secure
-        defaults whenever possible.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">IO::Socket::SSL Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="make-ca"/> and
-        <xref linkend="perl-net-ssleay"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-uri"/> (to access international domain names)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of IO::Socket::SSL</title>
-
-      <para>
-        This module uses a variant of the standard build and installation
-        instructions:
-
-<screen><userinput>yes | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes</command>: Perl will ask if you wish to run external
-        tests, which will 'fail soft' if there are network problems. The
-        default is 'y', this allows you to script the build.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-io-string.xml
===================================================================
--- general/prog/perl-modules/perl-io-string.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/G/GA/GAAS/IO-String-&IO-String-version;.tar.gz">
-  <!ENTITY my-md5sum "250e5424f290299fc3d6b5d1e9da3835">
-
-  <!ENTITY IO-String-download-http "&perl_authors;/id/S/SU/SULLR/IO-String-&IO-String-version;.tar.gz">
-]>
-
-  <!-- Begin IO::String -->
-  <sect2 id="perl-io-string" xreflabel="IO-String-&IO-String-version;">
-
-    <title>IO::String-&IO-String-version;</title>
-
-    <indexterm zone="perl-io-string">
-      <primary sortas="a-IO-String">IO::String</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IO::String</title>
-
-      <para>
-        IO::String - Emulate file interface for in-core strings.
-      </para>
-
-      &lfs121_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 IO::String</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-ipc-run3.xml
===================================================================
--- general/prog/perl-modules/perl-ipc-run3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/R/RJ/RJBS/IPC-Run3-&IPC-Run3-version;.tar.gz">
-  <!ENTITY my-md5sum "569393ca56dfb78dedd79e93c0439159">
-
-]>
-
-  <!-- Begin IPC::Run3 -->
-  <sect2 id="perl-ipc-run3" xreflabel="IPC-Run3-&IPC-Run3-version;">
-
-    <title>IPC::Run3-&IPC-Run3-version;</title>
-
-    <indexterm zone="perl-ipc-run3">
-      <primary sortas="a-IPC-Run3">IPC::Run3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IPC::Run3</title>
-
-      <para>
-        IPC::Run3 is used to run a subprocess with input/output redirection.
-      </para>
-
-      &lfs121_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 IPC::Run3</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-libwww-perl.xml
===================================================================
--- general/prog/perl-modules/perl-libwww-perl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/O/OA/OALDERS/libwww-perl-&libwww-perl-version;.tar.gz">
-  <!ENTITY my-md5sum "e70e2f41a97b8d97608569d10b75b931">
-]>
-
-  <!-- Begin libwww-perl -->
-  <sect2 id="perl-libwww-perl" xreflabel="libwww-perl-&libwww-perl-version;">
-
-    <title>LWP (libwww-perl-&libwww-perl-version;)</title>
-
-    <indexterm zone="perl-libwww-perl">
-      <primary sortas="a-libwww-perl">libwww-perl</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to LWP - The World-wide Web library for
-      <application>Perl</application></title>
-
-      <para>
-        The libwww-perl collection is a set of Perl modules which provides a
-        simple and consistent application programming interface (API) to the
-        World-Wide Web. The main focus of the library is to provide classes and
-        functions that allow you to write WWW clients. The library also contains
-        modules that are of more general use and even classes that help you
-        implement simple HTTP servers.
-      </para>
-
-      <!-- For CPAN, this may be pulled in with 'cpan -i Bundle::LWP'   or just LWP-->
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">libwww-perl Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-file-listing"/>,
-        <xref linkend="perl-http-cookiejar"/>,
-        <xref linkend="perl-http-cookies"/>,
-        <xref linkend="perl-http-daemon"/>,
-        <!-- perl-http-daemon pulls in perl-http-message
-          for HTTP::Request, HTTP::Response, HTTP::Status -->
-        <!-- perl-http-message pulls in perl-encode-locale,
-          perl-http-date, perl-lwp-mediatypes and perl-uri -->
-        <xref linkend="perl-http-negotiate"/>,
-        <xref linkend="perl-html-parser"/>,
-        <xref linkend="perl-net-http"/>,
-        <xref linkend="perl-try-tiny"/> and
-        <xref linkend="perl-www-robotrules"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/> and
-        <xref linkend="perl-test-requiresinternet"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libwww-perl</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        After installing this package, if you want HTTPS protocol support
-        install <xref linkend="perl-lwp-protocol-https"/>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            lwp-download, lwp-dump, lwp-mirror, lwp-request
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="lwp-download-prog">
-          <term><command>lwp-download</command></term>
-          <listitem>
-            <para>
-              is a script to fetch a large file from the web
-            </para>
-            <!-- the -prog is for while (old) and new- perl module pages
-             are both in the book, without it the link to the package is
-             correct, but the link to the prog goes to the progs in old
-             perl-modules.xml -->
-            <indexterm zone="perl-libwww-perl lwp-download-prog">
-              <primary sortas="b-lwp-download">lwp-download</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="lwp-dump-prog">
-          <term><command>lwp-dump</command></term>
-          <listitem>
-            <para>
-              is used to see what headers and content is returned for a URL
-            </para>
-            <indexterm zone="perl-libwww-perl lwp-dump-prog">
-              <primary sortas="b-lwp-dump">lwp-dump</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="lwp-mirror-prog">
-          <term><command>lwp-mirror</command></term>
-          <listitem>
-            <para>
-              is a simple mirror utility
-            </para>
-            <indexterm zone="perl-libwww-perl lwp-mirror-prog">
-              <primary sortas="b-lwp-mirror">lwp-mirror</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="lwp-request-prog">
-          <term><command>lwp-request</command></term>
-          <listitem>
-            <para>
-              is a simple command line user agent
-            </para>
-            <indexterm zone="perl-libwww-perl lwp-request-prog">
-              <primary sortas="b-lwp-request">lwp-request</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-lingua-translit.xml
===================================================================
--- general/prog/perl-modules/perl-lingua-translit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/A/AL/ALINKE/Lingua-Translit-&Lingua-Translit-version;.tar.gz">
-  <!ENTITY my-md5sum "605a82f06b05fef4fc18bf069b1be511">
-
-]>
-
-  <!-- Begin Lingua::Translit -->
-  <sect2 id="perl-lingua-translit" xreflabel="Lingua-Translit-&Lingua-Translit-version;">
-
-    <title>Lingua::Translit-&Lingua-Translit-version;</title>
-
-    <indexterm zone="perl-lingua-translit">
-      <primary sortas="a-Lingua-Translit">Lingua::Translit</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Lingua::Translit</title>
-
-      <para>
-        Lingua::Translit and its <command>translit</command> program
-        transliterate text between writing systems.
-      </para>
-
-      &lfs121_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 Lingua::Translit</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            translit
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="translit-prog">
-          <term><command>translit</command></term>
-          <listitem>
-            <para>
-              transliterates text between writing systems using various
-              standards
-            </para>
-            <indexterm zone="perl-lingua-translit translit-prog">
-              <primary sortas="b-translit">translit</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-list-allutils.xml
===================================================================
--- general/prog/perl-modules/perl-list-allutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "86469b1f6819ba181a8471eb932965f2">
-
-]>
-
-  <!-- Begin List::AllUtils -->
-  <sect2 id="perl-list-allutils" xreflabel="List-AllUtils-&List-AllUtils-version;">
-
-    <title>List::AllUtils-&List-AllUtils-version;</title>
-
-    <indexterm zone="perl-list-allutils">
-      <primary sortas="a-List-AllUtils">List::AllUtils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::AllUtils</title>
-
-      <para>
-        The List::Allutils module combines List::Util and List::MoreUtils in one
-        bite-sized package.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">List::AllUtils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-list-someutils"/>,
-        <xref linkend="perl-list-utilsby"/>
-<!-- core module        <xref linkend="perl-scalar-list-utils"/>-->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::AllUtils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-list-moreutils.xml
===================================================================
--- general/prog/perl-modules/perl-list-moreutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "daccd6310021231b827dcc943ff1c6b7">
-
-]>
-
-  <!-- Begin List::MoreUtils -->
-  <sect2 id="perl-list-moreutils" xreflabel="List-MoreUtils-&List-MoreUtils-version;">
-
-    <title>List::MoreUtils-&List-MoreUtils-version;</title>
-
-    <indexterm zone="perl-list-moreutils">
-      <primary sortas="a-List-MoreUtils">List::MoreUtils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::MoreUtils</title>
-
-      <para>
-        List::MoreUtils provides the stuff missing in List::Util.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">List::MoreUtils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-exporter-tiny"/> and
-        <xref linkend="perl-list-moreutils-xs"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::MoreUtils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-log-log4perl.xml
===================================================================
--- general/prog/perl-modules/perl-log-log4perl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/E/ET/ETJ/Log-Log4perl-&Log-Log4perl-version;.tar.gz">
-  <!ENTITY my-md5sum "acbe29cbaf03f4478a13579a275b0011">
-]>
-
-  <!-- Begin Log::Log4perl -->
-  <sect2 id="perl-log-log4perl" xreflabel="Log-Log4perl-&Log-Log4perl-version;">
-
-    <title>Log::Log4perl-&Log-Log4perl-version;</title>
-
-    <indexterm zone="perl-log-log4perl">
-      <primary sortas="a-Log-Log4perl">Log::Log4perl</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Log::Log4perl</title>
-
-      <para>
-        Log::Log4perl provides a Log4j implementation for
-        <application>perl</application>.
-      </para>
-
-      &lfs121_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 Log::Log4perl</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            l4p-templ
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="l4p-templ-prog">
-          <term><command>l4p-templ</command></term>
-          <listitem>
-            <para>
-              prints out the text of a template Log4perl configuration for
-              starting a new Log4perl configuration file
-            </para>
-            <indexterm zone="perl-log-log4perl l4p-templ-prog">
-              <primary sortas="b-l4p-templ">l4p-templ</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-lwp-protocol-https.xml
===================================================================
--- general/prog/perl-modules/perl-lwp-protocol-https.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
-  <!ENTITY my-md5sum "65401e3e34be653c9e3b31f798ed5454">
-
-]>
-
-  <!-- Begin LWP::Protocol::https -->
-  <sect2 id="perl-lwp-protocol-https" xreflabel="LWP-Protocol-https-&LWP-Protocol-https-version;">
-
-    <title>LWP::Protocol::https-&LWP-Protocol-https-version;</title>
-
-    <indexterm zone="perl-lwp-protocol-https">
-      <primary sortas="a-LWP-Protocol-https">LWP::Protocol::https</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to LWP::Protocol::https</title>
-
-      <para>
-        LWP::Protocol::https provides https support for LWP::UserAgent (i.e.
-        <xref linkend="perl-libwww-perl"/>). Once the module is installed
-        LWP is able to access sites using HTTP over SSL/TLS.
-      </para>
-
-      &lfs121_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>
-
-<!--
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/LWP-Protocol-https-&LWP-Protocol-https-version;-system_certs-2.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
--->
-
-      <bridgehead renderas="sect4">LWP::Protocol::https Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-io-socket-ssl"/>,
-        <!-- perl-io-socket-ssl pulls in perl-net-ssleay -->
-        <xref linkend="perl-libwww-perl"/> and
-        <!-- perl-libwww-perl pulls in perl-net-https -->
-        <xref linkend="make-ca"/> with
-        <literal>/etc/pki/tls/certs/ca-bundle.crt</literal>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of LWP::Protocol::https</title>
-
-<!-- Applied upstream in 6.11
-      <para>
-        First, apply a patch to use the system certificates (using the CPAN
-        automated install will instead use <ulink
-        url="https://metacpan.org/pod/Mozilla::CA">Mozilla::CA</ulink> which
-        is usually not up to date and does not use local certificates).
-      </para>
-
-<screen><userinput>patch -Np1 -i ../LWP-Protocol-https-&LWP-Protocol-https-version;-system_certs-2.patch</userinput></screen>
--->
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-module-build.xml
===================================================================
--- general/prog/perl-modules/perl-module-build.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,101 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;/L/LE/LEONT/Module-Build-&Module-Build-version;.tar.gz">
-  <!ENTITY my-md5sum "0032d0c0bc36a3b68ef41c947829d5e3">
-
-]>
-
-  <!-- Begin Module::Build -->
-  <sect2 id="perl-module-build" xreflabel="Module-Build-&Module-Build-version;">
-
-    <title>Module::Build-&Module-Build-version;</title>
-
-    <indexterm zone="perl-module-build">
-      <primary sortas="a-Module-Build">Module::Build</primary>
-    </indexterm>
-
-
-    <sect3 role="package">
-      <title>Introduction to Module::Build</title>
-
-      <para>
-        Module::Build allows perl modules to be built without a
-        <command>make</command> command being present.
-      </para>
-
-      &lfs121_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>
-
-    <!-- Dependencies: It warns that the optional fetature inc_bundling_support
-        is disabled because inc::latest is not installed : that is experimental
-        (originally part of Module::Build itself) and is not useful except for
-        people who create CPAN distributions. -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Module::Build</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        Note that this module can also be built using
-        <filename>Build.PL</filename>
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            config_data
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="config-data-prog">
-          <term><command>config_data</command></term>
-          <listitem>
-            <para>
-              is used to query or change the configuration of perl modules
-            </para>
-            <indexterm zone="perl-module-build config-data-prog">
-              <primary sortas="b-config-data">config_data</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-net-dns.xml
===================================================================
--- general/prog/perl-modules/perl-net-dns.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
-  <!ENTITY my-md5sum "e4694815daeeb6f7ac80e0a1fec6839b">
-]>
-
-  <!-- Begin Net::DNS -->
-  <sect2 id="perl-net-dns" xreflabel="Net-DNS-&Net-DNS-version;">
-
-    <title>Net::DNS-&Net-DNS-version;</title>
-
-    <indexterm zone="perl-net-dns">
-      <primary sortas="a-Net-DNS">Net::DNS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Net::DNS</title>
-
-      <para>
-        Net::DNS is a DNS resolver implemented in <application>Perl</application>.
-        It can be used to perform nearly any type of DNS query from a
-        <application>Perl</application> script.
-      </para>
-
-      &lfs121_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 Net::DNS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-parse-recdescent.xml
===================================================================
--- general/prog/perl-modules/perl-parse-recdescent.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/J/JT/JTBRAUN/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">
-  <!ENTITY my-md5sum "7a36d45d62a9b68603edcdbd276006cc">
-
-]>
-
-  <!-- Begin Parse::RecDescent -->
-  <sect2 id="perl-parse-recdescent" xreflabel="Parse-RecDescent-&Parse-RecDescent-version;">
-
-    <title>Parse::RecDescent-&Parse-RecDescent-version;</title>
-
-    <indexterm zone="perl-parse-recdescent">
-      <primary sortas="a-Parse-RecDescent">Parse::RecDescent</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Parse::RecDescent</title>
-
-      <para>
-        Parse::RecDescent incrementally generates top-down recursive-descent text
-        parsers from simple yacc-like grammar specifications.
-      </para>
-
-      &lfs121_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 Parse::RecDescent</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-parse-yapp.xml
===================================================================
--- general/prog/perl-modules/perl-parse-yapp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
-  <!ENTITY my-md5sum "69584d5b0f0304bb2a23cffcd982c5de">
-
-  <!ENTITY Parse-Yapp-download-http "&perl_authors;/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
-  <!ENTITY Parse-Yapp-md5sum "69584d5b0f0304bb2a23cffcd982c5de">
-]>
-
-  <!-- Begin Parse::Yapp -->
-  <sect2 id="perl-parse-yapp" xreflabel="Parse-Yapp-&Parse-Yapp-version;">
-
-    <title>Parse::Yapp-&Parse-Yapp-version;</title>
-
-    <indexterm zone="perl-parse-yapp">
-      <primary sortas="a-Parse-Yapp">Parse::Yapp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Parse::Yapp</title>
-
-      <para>
-        Parse::Yapp is a Perl extension for generating and using LALR parsers.
-      </para>
-
-      &lfs121_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 Parse::Yapp</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            yapp
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="yapp-prog">
-          <term><command>yapp</command></term>
-          <listitem>
-            <para>
-              is a frontend to the Parse::Yapp module, which lets you create
-              a Perl OO parser from an input grammar file
-            </para>
-            <indexterm zone="perl-parse-yapp yapp-prog">
-              <primary sortas="b-yapp">yapp</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-perlio-utf8_strict.xml
===================================================================
--- general/prog/perl-modules/perl-perlio-utf8_strict.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/L/LE/LEONT/PerlIO-utf8_strict-&PerlIO-utf8_strict-version;.tar.gz">
-  <!ENTITY my-md5sum "d90ca967f66e05ad9221c79060868346">
-]>
-
-  <!-- Begin PerlIO::utf8_strict -->
-  <sect2 id="perl-perlio-utf8_strict" xreflabel="PerlIO-utf8_strict-&PerlIO-utf8_strict-version;">
-
-    <title>PerlIO::utf8_strict-&PerlIO-utf8_strict-version;</title>
-
-    <indexterm zone="perl-perlio-utf8_strict">
-      <primary sortas="a-PerlIO-utf8_strict">PerlIO::utf8_strict</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PerlIO::utf8_strict</title>
-
-      <para>
-        PerlIO::utf8_strict provides a fast and correct UTF-8 PerlIO layer.
-        Unlike Perl's default :utf8 layer it checks the input for correctness.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">PerlIO::utf8_strict Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-exception"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PerlIO::utf8_strict</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-regexp-common.xml
===================================================================
--- general/prog/perl-modules/perl-regexp-common.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz">
-  <!ENTITY my-md5sum "b1bb40759b84154990f36a160160fb94">
-
-]>
-
-  <!-- Begin Regexp::Common -->
-  <sect2 id="perl-regexp-common" xreflabel="Regexp-Common-&Regexp-Common-version;">
-
-    <title>Regexp::Common-&Regexp-Common-version;</title>
-
-    <indexterm zone="perl-regexp-common">
-      <primary sortas="a-Regexp-Common">Regexp::Common</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Regexp::Common</title>
-
-      <para>
-        Regexp::Common provides commonly requested regular expressions.
-      </para>
-
-      &lfs121_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 Regexp::Common</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-sgmlspm.xml
===================================================================
--- general/prog/perl-modules/perl-sgmlspm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/R/RA/RAAB/SGMLSpm-&SGMLSpm-version;.tar.gz">
-  <!ENTITY my-md5sum "746c74ae969992cedb1a2879b4168090">
-
-]>
-
-  <!-- Begin SGMLSpm -->
-  <sect2 id="perl-sgmlspm" xreflabel="SGMLSpm-&SGMLSpm-version;">
-
-    <title>SGMLSpm-&SGMLSpm-version;</title>
-
-    <indexterm zone="perl-sgmlspm">
-      <primary sortas="a-SGMLSpm">SGMLSpm</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to SGMLSpm</title>
-
-      <para>
-        The SGMLSpm module is a <application>Perl</application> library
-        used for parsing the output from James Clark's SGMLS and NSGMLS
-        parsers.
-      </para>
-
-      &lfs121_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 SGMLSpm</title>
-
-      <para>
-        Before beginning the build, issue
-        the following command to prevent an error:
-      </para>
-
-<screen><userinput>chmod -v 644 MYMETA.yml</userinput></screen>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        After the package has been installed, run the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-
-        <seglistitem>
-          <seg>
-            sgmlspl.pl, sgmlspl
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="sgmlspl.pl">
-          <term><command>sgmlspl.pl</command></term>
-          <listitem>
-            <para>
-              is an SGML processor
-            </para>
-            <indexterm zone="perl-sgmlspm sgmlspl.pl">
-              <primary sortas="b-sgmlspl.pl">sgmlspl.pl</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sgmlspl-prog">
-          <term><command>sgmlspl</command></term>
-          <listitem>
-            <para>
-              is a symbolic link used during the install of
-              <xref linkend="docbook-utils"/>
-            </para>
-            <indexterm zone="perl-sgmlspm sgmlspl-prog">
-              <primary sortas="b-sgmlspl">sgmlspl</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-sort-key.xml
===================================================================
--- general/prog/perl-modules/perl-sort-key.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/S/SA/SALVA/Sort-Key-&Sort-Key-version;.tar.gz">
-  <!ENTITY my-md5sum "a37ab0da0cfdc26e57b4c79e39f6d98f">
-
-]>
-
-  <!-- Begin Sort::Key -->
-  <sect2 id="perl-sort-key" xreflabel="Sort-Key-&Sort-Key-version;">
-
-    <title>Sort::Key-&Sort-Key-version;</title>
-
-    <indexterm zone="perl-sort-key">
-      <primary sortas="a-Sort-Key">Sort::Key</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sort::Key</title>
-
-      <para>
-        Sort::Key provides a set of functions to sort lists of values by some
-        calculated key value.
-      </para>
-
-      &lfs121_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 Sort::Key</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-test-command.xml
===================================================================
--- general/prog/perl-modules/perl-test-command.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/D/DA/DANBOO/Test-Command-&Test-Command-version;.tar.gz">
-  <!ENTITY my-md5sum "9ab83c4695961dbe92cd86efe08f0634">
-
-]>
-
-  <!-- Begin Test::Command -->
-  <sect2 id="perl-test-command" xreflabel="Test-Command-&Test-Command-version;">
-
-    <title>Test::Command-&Test-Command-version;</title>
-
-    <indexterm zone="perl-test-command">
-      <primary sortas="a-Test-Command">Test::Command</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Command</title>
-
-      <para>
-        Test::Command tests the exit status, STDOUT, or STDERR, of an external
-        command.
-      </para>
-
-      &lfs121_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 Test::Command</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-test-differences.xml
===================================================================
--- general/prog/perl-modules/perl-test-differences.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/D/DC/DCANTRELL/Test-Differences-&Test-Differences-version;.tar.gz">
-  <!ENTITY my-md5sum "23a54d5ada6ffe0850f42cd768b4b3c1">
-]>
-
-  <!-- Begin Test::Differences -->
-  <sect2 id="perl-test-differences" xreflabel="Test-Differences-&Test-Differences-version;">
-
-    <title>Test::Differences-&Test-Differences-version;</title>
-
-    <indexterm zone="perl-test-differences">
-      <primary sortas="a-Test-Differences">Test::Differences</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Differences</title>
-
-      <para>
-        Test::Differences tests strings and data structures and shows the
-        differences if they do not match.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Test::Differences Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-text-diff"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-capture-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Differences</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-text-bibtex.xml
===================================================================
--- general/prog/perl-modules/perl-text-bibtex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/A/AM/AMBS/Text-BibTeX-&Text-BibTeX-version;.tar.gz">
-  <!ENTITY my-md5sum "67fa6d9c03c659627d9fd58bb380c1fe">
-]>
-
-  <!-- Begin Text::BibTeX -->
-  <sect2 id="perl-text-bibtex" xreflabel="Text-BibTeX-&Text-BibTeX-version;">
-
-    <title>Text::BibTeX-&Text-BibTeX-version;</title>
-
-    <indexterm zone="perl-text-bibtex">
-      <primary sortas="a-Text-BibTeX">Text::BibTeX</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::BibTeX</title>
-
-      <para>
-        Text::BibTeX provides an interface to read and parse
-        <application>BibTeX</application> files.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Text::BibTeX Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-config-autoconf"/>,
-        <xref linkend="perl-extutils-libbuilder"/>
-        <!-- perl-module-build is pulled in by perl-extutils-libbuilder -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::BibTeX</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-
-        <seglistitem>
-          <seg>
-            biblex, libparse, dumpnames
-          </seg>
-          <seg>
-            libtparse.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="biblex-prog">
-          <term><command>biblex</command></term>
-          <listitem>
-            <para>
-              performs lexical analysis on a BibTeX file
-            </para>
-            <indexterm zone="perl-text-bibtex biblex-prog">
-              <primary sortas="b-biblex">biblex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="bibparse-prog">
-          <term><command>bibparse</command></term>
-          <listitem>
-            <para>
-              parses a series of BibTeX files with command line options to
-              control the string post-processing behavior
-            </para>
-            <indexterm zone="perl-text-bibtex bibparse-prog">
-              <primary sortas="b-bibparse">bibparse</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="dumpnames-prog">
-          <term><command>dumpnames</command></term>
-          <listitem>
-            <para>
-              parses a BibTeX file, splitting 'author' and 'editor' fields
-              into lists of names, and then dumps everything to stdout
-            </para>
-            <indexterm zone="perl-text-bibtex dumpnames-prog">
-              <primary sortas="b-dumpnames">dumpnames</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libbtparse-lib">
-          <term><filename class="libraryfile">libbtparse.so</filename></term>
-          <listitem>
-            <para>
-              is a library for parsing and processing BibTeX data files
-            </para>
-            <indexterm zone="perl-text-bibtex libbtparse-lib">
-              <primary sortas="c-libbtparse">libbtparse.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-text-csv.xml
===================================================================
--- general/prog/perl-modules/perl-text-csv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/I/IS/ISHIGAKI/Text-CSV-&Text-CSV-version;.tar.gz">
-  <!ENTITY my-md5sum "500b1cd1349e2186877c39aa404230dc">
-
-]>
-
-  <!-- Begin Text::CSV -->
-  <sect2 id="perl-text-csv" xreflabel="Text-CSV-&Text-CSV-version;">
-
-    <title>Text::CSV-&Text-CSV-version;</title>
-
-    <indexterm zone="perl-text-csv">
-      <primary sortas="a-Text-CSV">Text::CSV</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::CSV</title>
-
-      <para>
-        Text::CSV is a comma-separated values manipulator, using XS
-        (eXternal Subroutine - for subroutines written in C or C++)
-        or pure perl.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Text::CSV Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-text-csv_xs"/>
-          (required by <xref role="nodep" linkend="biber"/>)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::CSV</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-text-roman.xml
===================================================================
--- general/prog/perl-modules/perl-text-roman.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/S/SY/SYP/Text-Roman-&Text-Roman-version;.tar.gz">
-  <!ENTITY my-md5sum "1f6b09c0cc1f4425b565ff787a39fd83">
-
-]>
-
-  <!-- Begin Text::Roman -->
-  <sect2 id="perl-text-roman" xreflabel="Text-Roman-&Text-Roman-version;">
-
-    <title>Text::Roman-&Text-Roman-version;</title>
-
-    <indexterm zone="perl-text-roman">
-      <primary sortas="a-Text-Roman">Text::Roman</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::Roman</title>
-
-      <para>
-        Text::Roman allows conversion between Roman and Arabic algorisms (number
-        systems, e.g. MCMXLV and 1945).
-      </para>
-
-      &lfs121_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 Text::Roman</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-unicode-collate.xml
===================================================================
--- general/prog/perl-modules/perl-unicode-collate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">
-  <!ENTITY my-md5sum "ee4d960d057c5e5b02ebb49d0286db8f">
-]>
-
-  <!-- Begin Unicode::Collate -->
-  <sect2 id="perl-unicode-collate" xreflabel="Unicode-Collate-&Unicode-Collate-version;">
-
-    <title>Unicode::Collate-&Unicode-Collate-version;</title>
-
-    <indexterm zone="perl-unicode-collate">
-      <primary sortas="a-Unicode-Collate">Unicode::Collate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Unicode::Collate</title>
-
-      <para>
-        Unicode::Collate provides a Unicode collation algorithm.
-      </para>
-
-      <note>
-        <para>
-          This is a core module. If you are using
-          <application>perl-5.28.0</application> or later, its version is good
-          enough for <xref linkend="biber"/> and you do not need to reinstall
-          this module.
-        </para>
-      </note>
-
-      &lfs121_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 Unicode::Collate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-unicode-linebreak.xml
===================================================================
--- general/prog/perl-modules/perl-unicode-linebreak.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz">
-  <!ENTITY my-md5sum "003d6da7a13700e069afed9238c864b9">
-
-]>
-
-  <!-- Begin Unicode::LineBreak -->
-  <sect2 id="perl-unicode-linebreak" xreflabel="Unicode-LineBreak-&Unicode-LineBreak-version;">
-
-    <title>Unicode::LineBreak-&Unicode-LineBreak-version;</title>
-
-    <indexterm zone="perl-unicode-linebreak">
-      <primary sortas="a-Unicode-LineBreak">Unicode::LineBreak</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Unicode::LineBreak</title>
-
-      <para>
-        Unicode::LineBreak provides a UAX #14 Unicode Line Breaking Algorithm.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">Unicode::LineBreak Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-mime-charset"/>, also
-        <xref linkend="wget"/> (to download two files from unicode.org in the
-        test suite)
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="recommended">
-        <ulink url="https://linux.thai.net/projects/libthai/">libthai</ulink>
-        (to break Thai words into segments)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Unicode::LineBreak</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-uri.xml
===================================================================
--- general/prog/perl-modules/perl-uri.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/O/OA/OALDERS/URI-&URI-version;.tar.gz">
-  <!ENTITY my-md5sum "82aaecd8861f31444338231801ba01ca">
-]>
-
-  <!-- Begin URI -->
-  <sect2 id="perl-uri" xreflabel="URI-&URI-version;">
-
-    <title>URI-&URI-version;</title>
-
-    <indexterm zone="perl-uri">
-      <primary sortas="a-URI">URI</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to URI</title>
-
-      <para>
-        This module implements the URI class. Objects of this class represent
-        "Uniform Resource Identifier references" as specified in RFC 2396 (and
-        updated by RFC 2732). A Uniform Resource Identifier is a compact string
-        of characters that identifies an abstract or physical resource. A
-        Uniform Resource Identifier can be further classified as either a
-        Uniform Resource Locator (URL) or a Uniform Resource Name (URN). The
-        distinction between URL and URN does not matter to the URI class
-        interface. A "URI-reference" is a URI that may have additional
-        information attached in the form of a fragment identifier.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">URI Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/>, and
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="perl-business-isbn"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of URI</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-xml-libxml-simple.xml
===================================================================
--- general/prog/perl-modules/perl-xml-libxml-simple.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/M/MA/MARKOV/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "faad5ed26cd83998f6514be199c56c38">
-
-]>
-
-  <!-- Begin XML::LibXML::Simple -->
-  <sect2 id="perl-xml-libxml-simple" xreflabel="XML-LibXML-Simple-&XML-LibXML-Simple-version;">
-
-    <title>XML::LibXML::Simple-&XML-LibXML-Simple-version;</title>
-
-    <indexterm zone="perl-xml-libxml-simple">
-      <primary sortas="a-XML-LibXML-Simple">XML::LibXML::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::LibXML::Simple</title>
-
-      <para>
-        The XML::LibXML::Simple module is a rewrite of XML::Simple to use the
-        XML::LibXML parser for XML structures, instead of the plain
-        <application>Perl</application> or SAX parsers.
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">XML::LibXML::Simple Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-xml-libxml"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::LibXML::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-xml-libxslt.xml
===================================================================
--- general/prog/perl-modules/perl-xml-libxslt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">
-  <!ENTITY my-md5sum "b47ac3a69b58fa43386c4f39be5d7bd5">
-
-]>
-
-  <!-- Begin XML-LibXSLT -->
-  <sect2 id="perl-xml-libxslt" xreflabel="XML-LibXSLT-&XML-LibXSLT-version;">
-
-    <title>XML::LibXSLT-&XML-LibXSLT-version;</title>
-
-    <indexterm zone="perl-xml-libxslt">
-      <primary sortas="a-XML-LibXSLT">XML-LibXSLT</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::LibXSLT</title>
-
-      <para>
-        XML-LibXSLT provides an interface to <xref linkend="libxslt"/>
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">XML::LibXSLT Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxslt"/>,
-        <xref linkend="perl-xml-libxml"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::LibXSLT</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-xml-simple.xml
===================================================================
--- general/prog/perl-modules/perl-xml-simple.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "bb841dce889a26c89a1c2739970e9fbc">
-
-]>
-
-  <!-- Begin XML::Simple -->
-  <sect2 id="perl-xml-simple" xreflabel="XML-Simple-&XML-Simple-version;">
-
-    <title>XML::Simple-&XML-Simple-version;</title>
-
-    <indexterm zone="perl-xml-simple">
-      <primary sortas="a-XML-Simple">XML::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::Simple</title>
-
-      <para>
-        XML::Simple provides an easy API to read and write XML (especially config
-        files). It is deprecated and its use is discouraged.
-         <!-- per https://metacpan.org/pod/XML::Simple :-
-        The use of this module in new code is strongly discouraged. (explanations
-        are given there) -->
-      </para>
-
-      &lfs121_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>
-
-      <bridgehead renderas="sect4">XML::Simple Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="perl-xml-sax"/> (for an alternative parser which
-        will be used if available, otherwise <application>XML::Parser</application>
-        which was installed in LFS will be used),
-        <!-- perl-xml-sax pulls in perl-xml-namespacesupport and
-             perl-xml-sax-base -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/perl-modules/perl-xml-writer.xml
===================================================================
--- general/prog/perl-modules/perl-xml-writer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&perl_authors;/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">
-  <!ENTITY my-md5sum "2457214360cefda445742a608dd6195e">
-
-]>
-
-  <!-- Begin XML::Writer -->
-  <sect2 id="perl-xml-writer" xreflabel="XML-Writer-&XML-Writer-version;">
-
-    <title>XML::Writer-&XML-Writer-version;</title>
-
-    <indexterm zone="perl-xml-writer">
-      <primary sortas="a-XML-Writer">XML::Writer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::Writer</title>
-
-      <para>
-        XML::Writer provides a <application>Perl</application> extension for
-        writing XML documents.
-      </para>
-
-      &lfs121_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 XML::Writer</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,780 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
-  <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "0b8809e3bbb7f00b90f775d28846197d">
-  <!ENTITY php-size          "12 MB">
-  <!ENTITY php-buildsize     "526 MB (with documentation and tests)">
-  <!ENTITY php-time          "1.9 SBU (with parallelism=4; add 1.8 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
-       No timeouts on 8.0.11 - thomas
-
-TEST RESULT SUMMARY 8.1.0
-
-Exts skipped    :   36
-Exts tested     :   36
-
-Number of tests : 17060             12551
-Tests skipped   : 4509 ( 26.4%)
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :    4 (  0.0%) (  0.0%)
-Expected fail   :   28 (  0.2%) (  0.2%)
-Tests passed    : 12517 ( 73.4%) ( 99.7%)
-
-Time taken      :  165 seconds
-
-Stats for tests changed slightly for 8.1.1, but not significantly.
-Stats for tests changed slightly for 8.1.2, but not significantly.
-  Tests failed    :    1
-For 8.1.4, ran tests at -j4. One test still fails.
-For 8.1.5, ran tests at -j4. One test still fails.
-
-Running tests at -j4 does nothing.  The jobs cound is not passed to the
-actual routine running the tests.
-
-For 8.1.7:
-Number of tests : 17250             12714
-Tests skipped   : 4536 ( 26.3%)
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :    1 (  0.0%) (  0.0%)
-Expected fail   :   27 (  0.2%) (  0.2%)
-Tests passed    : 12684 ( 73.5%) ( 99.8%)
-
-Time taken      :  162 seconds
-
-The warnings are really XFAIL.  The FAIL is ext/phar/tests/bug69958.phpt.
-It appears to be mission a test file.
-
-For 8.1.10:
-Number of tests : 17315             12768
-Tests skipped   : 4547 ( 26.3%) - - - - - - - -
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :    5 (  0.0%) (  0.0%)
-Expected fail   :   27 (  0.2%) (  0.2%)
-Tests passed    : 12734 ( 73.5%) ( 99.7%)
-
-Time taken      :  162 seconds
-
-For 8.2.0:
-Number of tests : 17768             13167
-Tests skipped   : 4601 ( 25.9%) - - - - - - - -
-Tests warned    :    3 (  0.0%) (  0.0%)
-Tests failed    :    1 (  0.0%) (  0.0%)
-Expected fail   :   25 (  0.1%) (  0.2%)
-Tests passed    : 13138 ( 73.9%) ( 99.8%)
-
-Time taken      :  166 seconds
-
-For 8.3.0:
-Number of tests : 18682             13904
-Tests skipped   :  4778 ( 25.6%) - - - - - - - -
-Tests warned    :     1 (  0.0%) (  0.0%)
-Tests failed    :     8 (  0.0%) (  0.1%)
-Expected fail   :     9 (  0.0%) (  0.1%)
-Tests passed    : 13886 ( 74.3%) ( 99.9%)
-
-Time taken      :   183 seconds
-
-For 8.3.1: [rahul] (Ryzen 7 1700)
-
-Number of tests : 18706             13767
-Tests skipped   :  4939 ( 26.4%) 
-Tests warned    :     0 (  0.0%) (  0.0%)
-Tests failed    :     1 (  0.0%) (  0.0%)
-Expected fail   :     9 (  0.0%) (  0.1%)
-Tests passed    : 13757 ( 73.5%) ( 99.9%)
-
-Time taken      :   301 seconds
-
-For 8.3.6: [bdubbs] (AMD 3900)
-
-Number of tests : 18777             13968
-Tests skipped   :  4809 ( 25.6%) 
-Tests warned    :     1 (  0.0%) (  0.0%)
-Tests failed    :     2 (  0.0%) (  0.0%)
-Expected fail   :     9 (  0.0%) (  0.1%)
-Tests passed    : 13956 ( 74.3%) ( 99.9%)
-
-Time taken      :   189 seconds
-
--->
-
-]>
-
-<sect1 id="php" xreflabel="PHP-&php-version;">
-  <?dbhtml filename="php.html"?>
-
-
-  <title>PHP-&php-version;</title>
-
-  <indexterm zone="php">
-    <primary sortas="a-PHP">PHP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PHP</title>
-
-    <para>
-      <application>PHP</application> is the PHP Hypertext Preprocessor.
-      Primarily used in dynamic web sites, it allows for programming code to be
-      directly embedded into the HTML markup.  It is also useful as a
-      general purpose scripting language.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&php-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&php-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &php-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &php-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &php-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &php-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional pre-built documentation (single file html): <ulink
-          url="https://www.php.net/distributions/manual/php_manual_en.html.gz"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional pre-built documentation (chunked html): <ulink
-          url="https://www.php.net/distributions/manual/php_manual_en.tar.gz"/>.
-          Note that the documentation can be found in languages other than
-          English at <ulink url="https://www.php.net/download-docs.php"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PHP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="apache"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="libxslt"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command),
-      <xref linkend="pcre2"/>,
-      <ulink url="https://wiki.ubuntu.com/AppArmor">AppArmor</ulink>,
-      <ulink url="https://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-      <ulink url="https://github.com/kkos/oniguruma">oniguruma</ulink>,
-      <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
-      <ulink url="https://re2c.org/">re2c</ulink>, and
-      <ulink url="https://xmlrpc-epi.sourceforge.net/main.php?t=php_about">XMLRPC-EPI</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="freetype2"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <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-->
-      <ulink url="https://opensource.adobe.com/dc-acrobat-sdk-docs/acrobatsdk/">FDF Toolkit</ulink>,
-      <ulink url="https://github.com/libgd/libgd">GD</ulink>, and
-      <ulink url="https://www.t1lib.org/">t1lib</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Web Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="tidy-html5"/>,
-      <ulink url="https://sourceforge.net/projects/caudium/">Caudium</ulink>,
-      <ulink url="https://www.hyperwave.com/en/">Hyperwave</ulink>,
-      <ulink url="https://download.roxen.com/6.1/">Roxen WebServer</ulink>, and
-      <ulink url="https://github.com/Bilal-S/WDDX.net">WDDX</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="libiodbc"/>,
-      <xref linkend="lmdb"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unixodbc"/>,
-      &berkeley-db;
-      <ulink url="https://www.softwareag.com/en_corporate/platform/adabas-natural.html">Adabas</ulink>,
-      <ulink url="https://raima.com/product-overview/">Birdstep</ulink>,
-      <ulink url="https://cr.yp.to/cdb.html">cdb</ulink>,
-      <ulink url="https://www.dbmaker.com/">DBMaker</ulink>,
-      <ulink url="http://www.empress.com/">Empress</ulink>,
-      <ulink url="http://www.frontbase.com/cgi-bin/WebObjects/FBWebSite">FrontBase</ulink>,
-      <ulink url="https://www.ibm.com/analytics/us/en/db2/">IBM DB2</ulink>,
-      <ulink url="https://hughestech.com.au/products/msql/">Mini SQL</ulink>,
-      <ulink url="https://www.monetra.com/">Monetra</ulink>, and
-      <ulink url="https://sourceforge.net/projects/qdbm">QDBM</ulink>
-    </para>
-
-    <para>
-      <application>PHP</application> also provides support for many
-      commercial database tools such as <application>Oracle</application>,
-      <application>SAP</application> and
-      <application>ODBC Router</application>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="mitkrb"/>,
-      <ulink url="https://mcrypt.sourceforge.net/">libmcrypt</ulink>, and
-      <ulink url="https://mhash.sourceforge.net/">mhash</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/php"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PHP</title>
-
-    <para>
-      You can use <application>PHP</application> for server-side
-      scripting, command-line scripting or client-side GUI applications. This
-      book provides instructions for setting up <application>PHP</application>
-      for server-side scripting as it is the most common form.
-    </para>
-
-    <note>
-      <para>
-        <application>PHP</application> has many more
-        <command>configure</command> options that will enable support for
-        various things. You can use <command>./configure --help</command> to
-        see a full list of the available options. Also, use of the
-        <ulink url="https://www.php.net/">PHP web site</ulink>
-        is highly recommended, as their online docs are very good. An example
-        of a <command>configure</command> command that utilizes many of the
-        most common dependencies can be found at <ulink
-        url="&sources-anduin-http;/files/php_configure.txt"/>.
-      </para>
-
-      <para>
-        If, for whatever reason, you don't have <xref linkend="libxml2"/>
-        installed, you need to add <option>--disable-libxml</option> to the
-        <command>configure</command> command in the instructions below. Note
-        that this will prevent the <command>pear</command> command from being
-        built.
-      </para>
-    </note>
-
-    <para>
-      Install <application>PHP</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --datadir=/usr/share/php     \
-            --mandir=/usr/share/man      \
-            --without-pear               \
-            --enable-fpm                 \
-            --with-fpm-user=apache       \
-            --with-fpm-group=apache      \
-            --with-config-file-path=/etc \
-            --with-zlib                  \
-            --enable-bcmath              \
-            --with-bz2                   \
-            --enable-calendar            \
-            --enable-dba=shared          \
-            --with-gdbm                  \
-            --with-gmp                   \
-            --enable-ftp                 \
-            --with-gettext               \
-            --enable-mbstring            \
-            --disable-mbregex            \
-            --with-readline              &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --datadir=/usr/share/php     \
-            --mandir=/usr/share/man      \
-            --enable-fpm                 \
-            --without-pear               \
-            --with-fpm-user=apache       \
-            --with-fpm-group=apache      \
-            --with-fpm-systemd           \
-            --with-config-file-path=/etc \
-            --with-zlib                  \
-            --enable-bcmath              \
-            --with-bz2                   \
-            --enable-calendar            \
-            --enable-dba=shared          \
-            --with-gdbm                  \
-            --with-gmp                   \
-            --enable-ftp                 \
-            --with-gettext               \
-            --enable-mbstring            \
-            --disable-mbregex            \
-            --with-readline              &amp;&amp;
-make</userinput></screen>
-    <para>
-      To test the results, issue: <command>make test</command>. Several
-      tests (out of over 18000) 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
-      <command>yes "n" | </command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make INSTALL_ROOT=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install                                     &amp;&amp;
-install -v -m644 php.ini-production /etc/php.ini &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/php-&php-version; &amp;&amp;
-install -v -m644    CODING_STANDARDS* EXTENSIONS NEWS README* UPGRADING* \
-                    /usr/share/doc/php-&php-version;</userinput></screen>
-
-    <para>
-      The default configuration files for the fastCGI process manager are
-      installed only if they do not already exist on the system. If this is
-      the first installation, they should be renamed, as the
-      <systemitem class='username'>root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>if [ -f /etc/php-fpm.conf.default ]; then
-  mv -v /etc/php-fpm.conf{.default,} &amp;&amp;
-  mv -v /etc/php-fpm.d/www.conf{.default,}
-fi</userinput></screen>
-
-    <para>
-      The pre-built HTML documentation is packaged in two forms: a tarball
-      containing many individual files, useful for quick loading into your
-      browser, and one large individual file, which is useful for using the
-      search utility of your browser. If you downloaded either, or both, of the
-      documentation files, issue the following commands as the
-      <systemitem class='username'>root</systemitem> user to install them (note
-      these instructions assume English docs, modify the tarball names below if
-      necessary).
-    </para>
-
-    <para>
-      For the <quote>Single HTML</quote> file:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 ../php_manual_en.html.gz \
-    /usr/share/doc/php-&php-version; &amp;&amp;
-gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput></screen>
-
-    <para>
-      For the <quote>Many HTML files</quote> tarball:
-    </para>
-
-<screen role="root"><userinput>tar -xvf ../php_manual_en.tar.gz \
-    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput></screen>
-
-    <para>
-      The bundled pear is not installed because of a bug which might
-      pollute the filesystem with several hidden files and directories.
-      If pear is needed, execute the following commands to install it:
-    </para>
-
-<screen role="nodump"><userinput>wget https://pear.php.net/go-pear.phar
-php ./go-pear.phar</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <parameter>--datadir=/usr/share/php</parameter>: This works
-        around a bug in the build machinery, which installs some data to a
-        wrong location.
-      </para>
-
-      <para>
-        <parameter>--enable-fpm</parameter>: This parameter allows
-        building the fastCGI Process Manager.
-      </para>
-
-      <para revision="systemd">
-        <parameter>--with-fpm-systemd</parameter>: This parameter allows
-        the FastCGI Process Manager to integrate with systemd.
-      </para>
-
-      <para>
-        <parameter>--without-pear</parameter>: This switch disables
-        installation of bundled pear software.
-      </para>
-
-      <para>
-        <parameter>--with-config-file-path=/etc</parameter>: This parameter
-        makes <application>PHP</application> look for the
-        <filename>php.ini</filename> configuration file in
-        <filename class='directory'>/etc</filename>.
-      </para>
-
-      <para>
-        <parameter>--with-zlib</parameter>: This parameter adds
-        support for <application>Zlib</application> compression.
-      </para>
-
-      <para>
-        <parameter>--enable-bcmath</parameter>: Enables
-        <command>bc</command> style precision math functions.
-      </para>
-
-      <para>
-        <parameter>--with-bz2</parameter>: Adds support for
-        <application>Bzip2</application> compression functions.
-      </para>
-
-      <para>
-        <parameter>--enable-calendar</parameter>: This parameter
-        provides support for calendar conversion.
-      </para>
-
-      <para>
-        <parameter>--enable-dba=shared</parameter>: This parameter enables
-        support for database (dbm-style) abstraction layer functions.
-      </para>
-
-      <para>
-        <parameter>--enable-ftp</parameter>: This parameter
-        enables FTP functions.
-      </para>
-
-      <para>
-        <parameter>--with-gettext</parameter>: Enables functions
-        that use <application>Gettext</application> text translation.
-      </para>
-
-      <para>
-        <parameter>--enable-mbstring</parameter>: This parameter
-        enables multibyte string support.
-      </para>
-
-<!--
-      <para>
-        <parameter>- -disable-mbstring</parameter>: This parameter
-        disables multibyte string regular expression support.  It
-        requires the external
-        <ulink url="https://github.com/kkos/oniguruma">oniguruma</ulink>
-        library.
-      </para>
--->
-      <para>
-        <parameter>--with-readline</parameter>: This parameter
-        enables command line <application>Readline</application> support.
-      </para>
-
-      <para>
-        <option>--disable-libxml</option>: This option
-        allows building PHP without <application>libxml2</application>
-        installed.
-      </para>
-
-      <para>
-        <option>--with-apxs2</option>: Instead of building the fastCGI process
-        manager, it is possible to build an <application>apache</application>
-        module.  This has some performance penalty for heavy loaded servers,
-        but may be easier to set up. This switch is incompatible with the
-        <parameter>--enable-fpm</parameter> and
-        <parameter>--with-fpm-...</parameter> switches.
-      </para>
-
-      <para>
-        <option>--with-mysqli=shared</option>: This option includes MySQLi
-        support.
-      </para>
-
-      <para>
-        <option>--with-mysql-sock=/run/mysqld/mysqld.sock</option>: Location of
-        the MySQL unix socket pointer.
-      </para>
-
-      <para>
-        <option>--with-pdo-mysql=shared</option>: This option includes PDO:
-        MySQL support.
-      </para>
-
-      <para>
-        <option>--with-tidy=shared</option>: This option includes tidy library
-        support.
-      </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PHP</title>
-
-    <sect3 id="php-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/php.ini</filename>,
-        <filename>/etc/pear.conf</filename>,
-        <filename>/etc/php-fpm.conf</filename>, and
-        <filename>/etc/php-fpm.d/www.conf</filename>
-      </para>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php.ini">/etc/php.ini</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-pear.conf">/etc/pear.conf</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php-fpm.d-www.conf">
-        /etc/php-fpm.d/www.conf</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php-fpm.conf">/etc/php-fpm.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The file used as the default <filename>/etc/php.ini</filename>
-        configuration file is recommended by the <application>PHP</application>
-        development team. This file modifies the default behavior of
-        <application>PHP</application>.  If no <filename>/etc/php.ini</filename>
-        is used, all configuration settings fall to the defaults. You should
-        review the comments in this file and ensure the changes are acceptable
-        in your particular environment.
-      </para>
-
-      <para>
-       The fastCGI process manager uses the configuration file
-       <filename>/etc/php-fpm.conf</filename>. The default file shipped with
-       PHP includes all the <filename>/etc/php-fpm.d/*.conf</filename> in turn.
-       There is a shipped <filename>/etc/php-fpm.d/www.conf</filename> file,
-       that contains the parameters related to the interaction with the Apache
-       Web server.
-      </para>
-
-      <para>
-        You may have noticed the following from the output of the
-        <command>make install</command> command:
-     </para>
-
-<screen><computeroutput>You may want to add: /usr/lib/php to your php.ini include_path</computeroutput></screen>
-
-      <para>
-        If desired, add the entry using the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i 's@php/includes"@&amp;\ninclude_path = ".:/usr/lib/php"@' \
-    /etc/php.ini</userinput></screen>
-
-      <para>
-        To enable fastCGI support in the <application>Apache</application>
-        web server, two LoadModule directives must be added to the
-        <filename>httpd.conf</filename> file. They are commented out, so just
-        issue the following command as
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i -e '/proxy_module/s/^#//'      \
-       -e '/proxy_fcgi_module/s/^#//' \
-       /etc/httpd/httpd.conf</userinput></screen>
-
-      <para>
-        Those modules accept various <command>ProxyPass</command>
-        directives. One possibility is (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>echo \
-'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/srv/www/$1' >> \
-/etc/httpd/httpd.conf</userinput></screen>
-
-      <para>
-        Additionally, it may be useful to add an entry for
-        <filename>index.php</filename> to the DirectoryIndex directive of the
-        <filename>httpd.conf</filename> file. Lastly, adding a line to set up the
-        <filename class='extension'>.phps</filename> extension to show
-        highlighted <application>PHP</application> source may be
-        desirable:
-      </para>
-
-<screen><literal>AddType application/x-httpd-php-source .phps</literal></screen>
-
-      <para>
-        You'll need to restart the <application>Apache</application> web server
-        after making any modifications to the <filename>httpd.conf</filename>
-        file.
-      </para>
-
-    </sect3>
-
-    <sect3  id="php-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To automatically start the <command>php-fpm</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/php</filename> bootscript from the
-        <xref linkend="bootscripts"/> package as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <para revision="systemd">
-        To start the <command>php-fpm</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-
-      <indexterm zone="php php-init">
-        <primary sortas="f-php">php</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-php</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>make install-php-fpm</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><!-- not built anymore pear, peardev, pecl,-->
-        phar (symlink), phar.phar, php,
-        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-20220829</seg>
-
-        <seg>/etc/php-fpm.d, /usr/{include,lib,share}/php, and
-        /usr/share/doc/php-&php-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="php-prog">
-        <term><command>php</command></term>
-        <listitem>
-          <para>
-            is a command line interface that enables you to parse and
-            execute PHP code
-          </para>
-          <indexterm zone="php php-prog">
-            <primary sortas="b-php">php</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pear">
-        <term><command>pear</command></term>
-        <listitem>
-          <para>
-            is the PHP Extension and Application Repository (PEAR) package
-            manager. This isn't installed by default
-          </para>
-          <indexterm zone="php pear">
-            <primary sortas="b-pear">pear</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="php-fpm">
-        <term><command>php-fpm</command></term>
-        <listitem>
-          <para>
-            is the fastCGI process manager for PHP
-          </para>
-          <indexterm zone="php php-fpm">
-            <primary sortas="b-php-fpm">php-fpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="phpdbg">
-        <term><command>phpdbg</command></term>
-        <listitem>
-          <para>
-            is the interactive PHP debugger
-          </para>
-          <indexterm zone="php phpdbg">
-            <primary sortas="b-phpdbg">phpdbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/prog/prog.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,75 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-prog">
+<?dbhtml filename="prog.html" dir="general"?>
+<title>Programming</title>
 
-<chapter id="general-prog">
-  <?dbhtml filename="prog.html" ?>
-
-  <title>Programming</title>
-
-  <para>
-    A base LFS system can be used as a development
-    platform, however the base system only includes language support for
-    <application>C</application>, <application>C++</application>,
-    <application>Perl</application>, and <application>Python</application>.
-    This chapter provides instructions to build many popular programming
-    environments to greatly expand your system's development capabilities.
-  </para>
-
-  <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf213.xml"/-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/> -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cbindgen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dtc.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-ada.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gc.xml"/>
-  <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"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="llvm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua52.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mercurial.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nasm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patchelf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-deps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python311.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-dependencies.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ruby.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rust.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysprof.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unifdef.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vala.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="valgrind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yasm.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-tools.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-java.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ojdk-conf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
+&python;
+&jdk;
 
 </chapter>
Index: neral/prog/python-dependencies.xml
===================================================================
--- general/prog/python-dependencies.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,337 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="python-dependencies" xreflabel="Python Dependencies">
-  <?dbhtml filename="python-dependencies.html" ?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Python Dependencies</title>
-
-  <indexterm zone="python-dependencies">
-    <primary sortas="a-Python-Dependencies">Python Dependencies</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python Dependencies</title>
-
-    <para>
-      Python modules listed in <xref linkend="python-modules"/> have
-      dependencies that are not referenced by other packages in BLFS.
-      These dependencies are listed here. They will not get updated on
-      regular basis, unless a more recent version is needed.
-    </para>
-
-    <important>
-      <para>
-        In BLFS, we normally build and install Python 3 modules with
-        <command>pip3</command>.  Please take care that the
-        <command>pip3 install</command> commands in the book should be
-        run as &root; unless it's for a Python virtual environment.  Running
-        <command>pip3 install</command> as a non-&root; user may seem to
-        work fine, but it will cause the installed module to be inaccessible by
-        other users.
-      </para>
-      <para>
-        <command>pip3 install</command> will not reinstall an already
-        installed module by default.  For using the
-        <command>pip3 install</command> command to upgrade a module (for
-        example, from meson-0.61.3 to meson-0.62.0), insert
-        <parameter>--upgrade</parameter> into the command line.  If it's really
-        necessary to downgrade a module or reinstall the same version for
-        some reason, insert <parameter>--force-reinstall</parameter> into
-        the command line.
-      </para>
-    </important>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="alabaster"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="attrs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="babel"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="certifi"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="chardet"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="charset-normalizer"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="commonmark"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="editables"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="hatchling"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="hatch-vcs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="idna"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="imagesize"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="iniconfig"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="markdown"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="meson_python"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="msgpack"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pathspec"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pluggy"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="py"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyproject-metadata"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pytz"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="setuptools_scm"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="smartypants"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="snowballstemmer"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-applehelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-devhelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-htmlhelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-jquery"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-jsmath"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-qthelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-serializinghtml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="typing_extensions"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="typogrify"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="urllib3"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="webencodings"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/alabaster.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/attrs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/Babel.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/certifi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/chardet.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/charset-normalizer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/commonmark.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/editables.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/hatchling.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/hatch-vcs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/idna.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/imagesize.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/iniconfig.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/markdown.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/meson_python.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/msgpack.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pathspec.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pluggy.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/py.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pyproject-metadata.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pytz.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/setuptools_scm.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/smartypants.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/snowballstemmer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-applehelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-devhelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-htmlhelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-jquery.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-jsmath.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-qthelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-serializinghtml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/typing_extensions.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/typogrify.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/urllib3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/webencodings.xml"/>
-
-</sect1>
Index: neral/prog/python-dependencies/Babel.xml
===================================================================
--- general/prog/python-dependencies/Babel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 babel-download-http "https://files.pythonhosted.org/packages/source/B/Babel/Babel-&babel-version;.tar.gz">
-  <!ENTITY babel-download-ftp  " ">
-  <!ENTITY babel-md5sum        "&babel-md5sum;">
-  <!ENTITY babel-size          "8.9 MB">
-  <!ENTITY babel-buildsize     "103 MB (add 30 MB for tests)">
-  <!ENTITY babel-time          "less than 0.1 SBU (0.1 SBU for tests)">
-]>
-
-  <sect2 id="babel" xreflabel="Babel-&babel-version;">
-
-    <title>Babel-&babel-version;</title>
-
-    <indexterm zone="babel">
-      <primary sortas="a-Babel">Babel</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Babel Module</title>
-
-      <para>
-        The <application>Babel</application> package is an integrated
-        collection of utilities that assist in internationalizing and
-        localizing Python applications, with an emphasis on web-based
-        applications.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&babel-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&babel-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &babel-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &babel-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &babel-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &babel-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Babel Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pytz"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="python3"/> (with the sqlite module),
-        <ulink url="https://pypi.org/project/freezegun/">freezegun</ulink>==0.3.12, and
-        <ulink url="https://pypi.org/project/pytest-cov/">pytest-cov</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Babel</title>
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Babel</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest-cov freezegun==0.3.12      &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of the error -->
-deactivate</userinput></screen>
-<!--
-    <para>
-      One test involving zh_TW locale is known to fail.
-    </para>
-    -->
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pybabel
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/babel and
-            /usr/lib/python&python3-majorver;/site-packages/Babel-&babel-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pybabel">
-          <term><command>pybabel</command></term>
-          <listitem>
-            <para>
-              is a command-line interface for working with message
-              catalogs
-            </para>
-            <indexterm zone="babel pybabel">
-              <primary sortas="b-pybabel">pybabel</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/alabaster.xml
===================================================================
--- general/prog/python-dependencies/alabaster.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 alabaster-download-http "https://files.pythonhosted.org/packages/source/a/alabaster/alabaster-&alabaster-version;.tar.gz">
-  <!ENTITY alabaster-download-ftp  " ">
-  <!ENTITY alabaster-md5sum        "&alabaster-md5sum;">
-  <!ENTITY alabaster-size          "11 KB">
-  <!ENTITY alabaster-buildsize     "360 KB">
-  <!ENTITY alabaster-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="alabaster" xreflabel="alabaster-&alabaster-version;">
-
-    <title>Alabaster-&alabaster-version;</title>
-
-    <indexterm zone="alabaster">
-      <primary sortas="a-alabaster">alabaster</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alabaster Module</title>
-
-      <para>
-        The <application>Alabaster</application> package is a theme for
-        the <application>sphinx</application> documentation system. Although
-        developed separately, it is the default theme for sphinx.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&alabaster-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&alabaster-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &alabaster-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &alabaster-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &alabaster-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &alabaster-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alabaster</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; alabaster</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/alabaster and
-            /usr/lib/python&python3-majorver;/site-packages/alabaster-&alabaster-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/attrs.xml
===================================================================
--- general/prog/python-dependencies/attrs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 attrs-download-http "https://files.pythonhosted.org/packages/source/a/attrs/attrs-&attrs-version;.tar.gz">
-  <!ENTITY attrs-download-ftp  " ">
-  <!ENTITY attrs-md5sum        "eff16b3bbd0d9b72e118cca83a19d380">
-  <!ENTITY attrs-size          "211 KB">
-  <!ENTITY attrs-buildsize     "2 MB (add 53 MB for tests)">
-  <!ENTITY attrs-time          "less than 0.1 SBU (0.2 SBU for tests)">
-]>
-
-  <sect2 id="attrs" xreflabel="attrs-&attrs-version;">
-
-    <title>Attrs-&attrs-version;</title>
-
-    <indexterm zone="attrs">
-      <primary sortas="a-attrs">attrs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Attrs Module</title>
-
-      <para>
-        The <application>Attrs</application> package is a theme for
-        the <application>sphinx</application> documentation system. Although
-        developed separately, it is the default theme for sphinx.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&attrs-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&attrs-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &attrs-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &attrs-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &attrs-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &attrs-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/coverage/">coverage[toml]</ulink>,
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>,
-        <ulink url="https://pypi.org/project/Pympler/">Pympler</ulink>,
-        <ulink url="https://pypi.org/project/mypy/">mypy</ulink>,
-        <ulink url="https://pypi.org/project/pytest-mypy-plugins/">pytest-mypy-plugins</ulink>,
-        <ulink url="https://pypi.org/project/zope.interface/">zope.interface</ulink>, and
-        <ulink url="https://pypi.org/project/cloudpickle/">cloudpickle</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Attrs</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; attrs</userinput></screen>
-
-    <para>
-      To test the installation, run:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install attrs[tests]                      &amp;&amp;
-python3 /usr/bin/pytest                        &amp;&amp;
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/attr,
-            /usr/lib/python&python3-majorver;/site-packages/attrs, and
-            /usr/lib/python&python3-majorver;/site-packages/attrs-&attrs-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/certifi.xml
===================================================================
--- general/prog/python-dependencies/certifi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 certifi-download-http "https://files.pythonhosted.org/packages/source/c/certifi/certifi-&certifi-version;.tar.gz">
-  <!ENTITY certifi-download-ftp  " ">
-  <!ENTITY certifi-md5sum        "&certifi-md5sum;">
-  <!ENTITY certifi-size          "164 KB">
-  <!ENTITY certifi-buildsize     "844 KB">
-  <!ENTITY certifi-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="certifi" xreflabel="certifi-&certifi-version;">
-
-    <title>certifi-&certifi-version;</title>
-
-    <indexterm zone="certifi">
-      <primary sortas="a-certifi">certifi</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Certifi Module</title>
-
-      <para>
-        The <application>certifi</application> module provides Mozilla’s 
-        carefully curated collection of Root Certificates for validating 
-        the trustworthiness of SSL certificates while verifying the 
-        identity of TLS hosts. 
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&certifi-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&certifi-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &certifi-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &certifi-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &certifi-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &certifi-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of certifi</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; certifi</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/certifi and
-            /usr/lib/python&python3-majorver;/site-packages/certifi-&certifi-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/chardet.xml
===================================================================
--- general/prog/python-dependencies/chardet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 chardet-download-http "https://files.pythonhosted.org/packages/source/c/chardet/chardet-&chardet-version;.tar.gz">
-  <!ENTITY chardet-download-ftp  " ">
-  <!ENTITY chardet-md5sum        "&chardet-md5sum;">
-  <!ENTITY chardet-size          "2 MB">
-  <!ENTITY chardet-buildsize     "13 MB (add 1.1 MB for tests)">
-  <!ENTITY chardet-time          "less than 0.1 SBU (0.3 SBU for tests)">
-]>
-
-  <sect2 id="chardet" xreflabel="chardet-&chardet-version;">
-
-    <title>Chardet-&chardet-version;</title>
-
-    <indexterm zone="chardet">
-      <primary sortas="a-chardet">chardet</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to chardet Module</title>
-
-      <para>
-        <application>Chardet</application> is a universal character
-        encoding detector.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&chardet-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&chardet-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &chardet-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &chardet-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &chardet-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &chardet-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Chardet Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Chardet</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; chardet</userinput></screen>
-
-    <para>
-      To test the installation issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>chardetect</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/chardet and
-            /usr/lib/python&python3-majorver;/site-packages/chardet-&chardet-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="chardetect">
-          <term><command>chardetect</command></term>
-          <listitem>
-            <para>
-              is a Universal Character Encoding Detector
-            </para>
-            <indexterm zone="chardet chardetect">
-              <primary sortas="b-chardetect">chardetect</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/charset-normalizer.xml
===================================================================
--- general/prog/python-dependencies/charset-normalizer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 charset-normalizer-download-http "https://files.pythonhosted.org/packages/source/c/charset-normalizer/charset-normalizer-&charset-normalizer-version;.tar.gz">
-  <!ENTITY charset-normalizer-download-ftp  " ">
-  <!ENTITY charset-normalizer-md5sum        "&charset-normalizer-md5sum;">
-  <!ENTITY charset-normalizer-size          "91 KB">
-  <!ENTITY charset-normalizer-buildsize     "1.1 MB (add 27 MB for tests)">
-  <!ENTITY charset-normalizer-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="charset-normalizer" xreflabel="charset-normalizer-&charset-normalizer-version;">
-
-    <title>Charset-normalizer-&charset-normalizer-version;</title>
-
-    <indexterm zone="charset-normalizer">
-      <primary sortas="a-charset-normalizer">charset-normalizer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to charset-normalizer Module</title>
-
-      <para>
-        The <application>charset-normalizer</application> library helps
-        reading text from an unknown character encoding.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&charset-normalizer-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&charset-normalizer-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &charset-normalizer-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &charset-normalizer-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &charset-normalizer-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &charset-normalizer-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Charset-normalizer Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="python3"/> (rebuilt after installing
-          <xref role="nodep" linkend="sqlite"/>), and
-        <ulink url="https://pypi.org/project/pytest-cov/">pytest-cov</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Charset-normalizer</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; charset-normalizer</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest-cov                        &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>normalizer</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/charset_normalizer and
-            /usr/lib/python&python3-majorver;/site-packages/charset_normalizer-&charset-normalizer-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="normalizer">
-          <term><command>normalizer</command></term>
-          <listitem>
-            <para>
-              is a Universal Charset Detector (discovers originating encoding
-              and normalizes text to unicode)
-            </para>
-            <indexterm zone="charset-normalizer normalizer">
-              <primary sortas="b-normalizer">normalizer</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/commonmark.xml
===================================================================
--- general/prog/python-dependencies/commonmark.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 commonmark-download-http "https://files.pythonhosted.org/packages/source/c/commonmark/commonmark-&commonmark-version;.tar.gz">
-  <!ENTITY commonmark-download-ftp  " ">
-  <!ENTITY commonmark-md5sum        "&commonmark-md5sum;">
-  <!ENTITY commonmark-size          "94 KB">
-  <!ENTITY commonmark-buildsize     "1.3 MB (add 30 MB for tests)">
-  <!ENTITY commonmark-time          "less than 0.1 SBU (0.1 SBU for tests)">
-]>
-
-  <sect2 id="commonmark" xreflabel="commonmark-&commonmark-version;">
-
-    <title>Commonmark-&commonmark-version;</title>
-
-    <indexterm zone="commonmark">
-      <primary sortas="a-commonmark">commonmark</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Commonmark Module</title>
-
-      <para>
-        <application>Commonmark</application> Python parser for the CommonMark
-        Markdown specification.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&commonmark-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&commonmark-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &commonmark-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &commonmark-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &commonmark-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &commonmark-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Commonmark Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/flake8/">flake8</ulink>, and
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Commonmark</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; commonmark</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed and the other optional
-      dependency is not, the installation can be tested with:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install hypothesis                        &amp;&amp;
-python3 /usr/bin/pytest commonmark/tests/unit_tests.py<!-- no && because of a possible error -->
-python3 commonmark/tests/run_spec_tests.py
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>cmark</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/commonmark and
-            /usr/lib/python&python3-majorver;/site-packages/commonmark-&commonmark-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cmark">
-          <term><command>cmark</command></term>
-          <listitem>
-            <para>
-              processes Markdown according to the CommonMark specification
-            </para>
-            <indexterm zone="commonmark cmark">
-              <primary sortas="b-cmark">cmark</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/editables.xml
===================================================================
--- general/prog/python-dependencies/editables.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 editables-download-http "https://files.pythonhosted.org/packages/source/e/editables/editables-&editables-version;.tar.gz">
-  <!ENTITY editables-download-ftp  " ">
-  <!ENTITY editables-md5sum        "&editables-md5sum;">
-  <!ENTITY editables-size          "4.6 KB">
-  <!ENTITY editables-buildsize     "180 KB">
-  <!ENTITY editables-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="editables" xreflabel="editables-&editables-version;">
-
-    <title>Editables-&editables-version;</title>
-
-    <indexterm zone="editables">
-      <primary sortas="a-editables">editables</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Editables Module</title>
-
-      <para>
-        <application>Editables</application> is python library for creating
-        <quote>editable wheels</quote>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&editables-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&editables-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &editables-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &editables-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &editables-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &editables-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Editables</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; editables</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/editables and
-            /usr/lib/python&python3-majorver;/site-packages/editables-&editables-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/hatch-vcs.xml
===================================================================
--- general/prog/python-dependencies/hatch-vcs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 hatch-vcs-download-http "https://files.pythonhosted.org/packages/source/h/hatch-vcs/hatch_vcs-&hatch-vcs-version;.tar.gz">
-  <!ENTITY hatch-vcs-download-ftp  " ">
-  <!ENTITY hatch-vcs-md5sum        "&hatch-vcs-md5sum;">
-  <!ENTITY hatch-vcs-size          "9.9 KB">
-  <!ENTITY hatch-vcs-buildsize     "436 KB (with tests)">
-  <!ENTITY hatch-vcs-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="hatch-vcs" xreflabel="hatch_vcs-&hatch-vcs-version;">
-
-    <title>Hatch_vcs-&hatch-vcs-version;</title>
-
-    <indexterm zone="hatch-vcs">
-      <primary sortas="a-hatch_vcs">hatch_vcs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Hatch-vcs Module</title>
-
-      <para>
-        <application>Hatch_vcs</application> is a Hatch plugin for versioning
-        with several <xref linkend="gVCS"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&hatch-vcs-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&hatch-vcs-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &hatch-vcs-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &hatch-vcs-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &hatch-vcs-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &hatch-vcs-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Hatch_vcs Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatchling"/> and
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Hatch_vcs</title>
-
-      <para>Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; hatch_vcs</userinput></screen>
-
-      <para>
-        To test the installation, issue <command>pytest</command>. One test,
-        <application>tests/test_build.py::test_write</application>, is known
-        to fail.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/hatch_vcs and
-            /usr/lib/python&python3-majorver;/site-packages/hatch_vcs-&hatch-vcs-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/hatchling.xml
===================================================================
--- general/prog/python-dependencies/hatchling.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 hatchling-download-http "https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-&hatchling-version;.tar.gz">
-  <!ENTITY hatchling-download-ftp  " ">
-  <!ENTITY hatchling-md5sum        "&hatchling-md5sum;">
-  <!ENTITY hatchling-size          "60 KB">
-  <!ENTITY hatchling-buildsize     "2.3 MB">
-  <!ENTITY hatchling-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="hatchling" xreflabel="hatchling-&hatchling-version;">
-
-    <title>Hatchling-&hatchling-version;</title>
-
-    <indexterm zone="hatchling">
-      <primary sortas="a-hatchling">hatchling</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Hatchling Module</title>
-
-      <para>
-        <application>Hatchling</application> is an extensible, standards
-        compliant build backend for python modules.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&hatchling-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&hatchling-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &hatchling-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &hatchling-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &hatchling-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &hatchling-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Hatchling Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="editables"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pathspec"/>, and
-        <xref linkend="pluggy"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Hatchling</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; hatchling</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>hatchling</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/hatchling and
-            /usr/lib/python&python3-majorver;/site-packages/hatchling-&hatchling-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts with (is the same as) the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-        <varlistentry id="hatchling-prog">
-          <term><command>hatchling</command></term>
-          <listitem>
-            <para>
-              is a python module builder
-            </para>
-            <indexterm zone="hatchling hatchling-prog">
-              <primary sortas="b-hatchling">hatchling</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/idna.xml
===================================================================
--- general/prog/python-dependencies/idna.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 idna-download-http "https://files.pythonhosted.org/packages/source/i/idna/idna-&idna-version;.tar.gz">
-  <!ENTITY idna-download-ftp  " ">
-  <!ENTITY idna-md5sum        "&idna-md5sum;">
-  <!ENTITY idna-size          "179 KB">
-  <!ENTITY idna-buildsize     "2.1 MB (with test)">
-  <!ENTITY idna-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="idna" xreflabel="idna-&idna-version;">
-
-    <title>Idna-&idna-version;</title>
-
-    <indexterm zone="idna">
-      <primary sortas="a-idna">idna</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Idna Module</title>
-
-      <para>
-        The <application>Idna</application> module provides support
-        for the Internationalized Domain Names in Applications (IDNA) protocol
-        as specified in RFC 5891.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&idna-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&idna-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &idna-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &idna-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &idna-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &idna-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Idna Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Idna</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; idna</userinput></screen>
-
-    <para>
-      To test the installation, run <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/idna and
-            /usr/lib/python&python3-majorver;/site-packages/idna-&idna-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/imagesize.xml
===================================================================
--- general/prog/python-dependencies/imagesize.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 imagesize-download-http "https://files.pythonhosted.org/packages/source/i/imagesize/imagesize-&imagesize-version;.tar.gz">
-  <!ENTITY imagesize-download-ftp  " ">
-  <!ENTITY imagesize-md5sum        "&imagesize-md5sum;">
-  <!ENTITY imagesize-size          "1.2 MB">
-  <!ENTITY imagesize-buildsize     "1.8 MB (with tests)">
-  <!ENTITY imagesize-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="imagesize" xreflabel="imagesize-&imagesize-version;">
-
-    <title>Imagesize-&imagesize-version;</title>
-
-    <indexterm zone="imagesize">
-      <primary sortas="a-imagesize">imagesize</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Imagesize Module</title>
-
-      <para>
-        The <application>imagesize</application> package analyzes image file
-        headers and returns the image size and DPI. It works with
-        JPEG/JPEG 2000/PNG/GIF/TIFF/SVG/Netpbm/WebP formats.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&imagesize-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&imagesize-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &imagesize-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &imagesize-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &imagesize-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &imagesize-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Imagesize Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="requests"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Imagesize</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; imagesize</userinput></screen>
-
-    <para>
-      The tests for this package are known to be broken.
-      To test the installation anyway, run <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/imagesize and
-            /usr/lib/python&python3-majorver;/site-packages/imagesize-&imagesize-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/iniconfig.xml
===================================================================
--- general/prog/python-dependencies/iniconfig.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 iniconfig-download-http "https://files.pythonhosted.org/packages/source/i/iniconfig/iniconfig-&iniconfig-version;.tar.gz">
-  <!ENTITY iniconfig-download-ftp  " ">
-  <!ENTITY iniconfig-md5sum        "&iniconfig-md5sum;">
-  <!ENTITY iniconfig-size          "4.5 KB">
-  <!ENTITY iniconfig-buildsize     "168 KB">
-  <!ENTITY iniconfig-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="iniconfig" xreflabel="iniconfig-&iniconfig-version;">
-
-    <title>Iniconfig-&iniconfig-version;</title>
-
-    <indexterm zone="iniconfig">
-      <primary sortas="a-iniconfig">iniconfig</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Iniconfig Module</title>
-
-      <para>
-        <application>Iniconfig</application> is a small and simple
-        INI-file parser module.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&iniconfig-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&iniconfig-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &iniconfig-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &iniconfig-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &iniconfig-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &iniconfig-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Iniconfig Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatch-vcs"/>
-      </para>
-      <!-- No test in 2.0.0
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-      -->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Iniconfig</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; iniconfig</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/iniconfig and
-            /usr/lib/python&python3-majorver;/site-packages/iniconfig-&iniconfig-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/markdown.xml
===================================================================
--- general/prog/python-dependencies/markdown.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 markdown-download-http "https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-&markdown-version;.tar.gz">
-  <!ENTITY markdown-download-ftp  " ">
-  <!ENTITY markdown-md5sum        "&markdown-md5sum;">
-  <!ENTITY markdown-size          "315 KB">
-  <!ENTITY markdown-buildsize     "4.1 MB (add 27 MB for tests)">
-  <!ENTITY markdown-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="markdown" xreflabel="Markdown-&markdown-version;">
-
-    <title>Markdown-&markdown-version;</title>
-
-    <indexterm zone="markdown">
-      <primary sortas="a-Markdown">Markdown</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Markdown Module</title>
-
-      <para>
-        <application>Markdown</application> is a Python parser for
-        John Gruber's Markdown specification.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&markdown-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&markdown-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &markdown-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &markdown-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &markdown-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &markdown-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Markdown Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="PyYAML"/>, and
-        <ulink url="https://pypi.org/project/coverage/">coverage</ulink>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Markdown</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Markdown</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> and <xref linkend="PyYAML"/> are
-      installed and the other optional dependency is not, the installation
-      can be tested with:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install coverage                          &amp;&amp;
-python3 /usr/bin/pytest --ignore=tests/test_syntax/extensions/test_md_in_html.py<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>markdown_py</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/markdown and
-            /usr/lib/python&python3-majorver;/site-packages/Markdown-&markdown-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="markdown_py">
-          <term><command>markdown_py</command></term>
-          <listitem>
-            <para>
-              converts markdown files to (x)html
-            </para>
-            <indexterm zone="markdown markdown_py">
-              <primary sortas="b-markdown_py">markdown_py</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/meson_python.xml
===================================================================
--- general/prog/python-dependencies/meson_python.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 meson_python-download-http "https://files.pythonhosted.org/packages/source/m/meson_python/meson_python-&meson_python-version;.tar.gz">
-  <!ENTITY meson_python-download-ftp  " ">
-  <!ENTITY meson_python-md5sum        "&meson_python-md5sum;">
-  <!ENTITY meson_python-size          "80 KB">
-  <!ENTITY meson_python-buildsize     "1.3 MB">
-  <!ENTITY meson_python-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="meson_python" xreflabel="meson_python-&meson_python-version;">
-
-    <title>Meson_python-&meson_python-version;</title>
-
-    <indexterm zone="meson_python">
-      <primary sortas="a-meson_python">meson_python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Meson_python Module</title>
-
-      <para>
-        The <application>Meson_python</application> module contains
-        a Python build backend (PEP 517) for Meson projects.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&meson_python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&meson_python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &meson_python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &meson_python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &meson_python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &meson_python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Meson_python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pyproject-metadata"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (Runtime)</bridgehead>
-      <para role="runtime">
-        <xref linkend="patchelf"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Meson_python</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; meson_python</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/meson_python and
-            /usr/lib/python&python3-majorver;/site-packages/meson_python-&meson_python-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/msgpack.xml
===================================================================
--- general/prog/python-dependencies/msgpack.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 msgpack-download-http "https://files.pythonhosted.org/packages/source/m/msgpack/msgpack-&msgpack-version;.tar.gz">
-  <!ENTITY msgpack-download-ftp  " ">
-  <!ENTITY msgpack-md5sum        "&msgpack-md5sum;">
-  <!ENTITY msgpack-size          "126 KB">
-  <!ENTITY msgpack-buildsize     "1.9 MB (add 0.3 MB for tests)">
-  <!ENTITY msgpack-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="msgpack" xreflabel="msgpack-&msgpack-version;">
-
-    <title>Msgpack-&msgpack-version;</title>
-
-    <indexterm zone="msgpack">
-      <primary sortas="a-msgpack">msgpack</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Msgpack Module</title>
-
-      <para>
-        <application>Msgpack</application> is an efficient binary
-        serialization format. It lets you exchange data among multiple
-        languages like JSON. But it's faster and smaller. This package
-        provides CPython bindings for reading and writing Msgpack data.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&msgpack-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&msgpack-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &msgpack-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &msgpack-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &msgpack-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &msgpack-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Msgpack Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/> and
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Msgpack</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; msgpack</userinput></screen>
-
-      <para>
-        To test the installation issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/msgpack-&msgpack-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/msgpack
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/pathspec.xml
===================================================================
--- general/prog/python-dependencies/pathspec.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pathspec-download-http "https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-&pathspec-version;.tar.gz">
-  <!ENTITY pathspec-download-ftp  " ">
-  <!ENTITY pathspec-md5sum        "&pathspec-md5sum;">
-  <!ENTITY pathspec-size          "45 KB">
-  <!ENTITY pathspec-buildsize     "912 KB (with tests)">
-  <!ENTITY pathspec-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="pathspec" xreflabel="pathspec-&pathspec-version;">
-
-    <title>Pathspec-&pathspec-version;</title>
-
-    <indexterm zone="pathspec">
-      <primary sortas="a-pathspec">pathspec</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pathspec Module</title>
-
-      <para>
-        <application>Pathspec</application> is a utility library for pattern
-        matching of file paths.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pathspec-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pathspec-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pathspec-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pathspec-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pathspec-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pathspec-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pathspec Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pathspec</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pathspec</userinput></screen>
-
-    <para>
-      To test the installation, issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pathspec and
-            /usr/lib/python&python3-majorver;/site-packages/pathspec-&pathspec-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/pluggy.xml
===================================================================
--- general/prog/python-dependencies/pluggy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pluggy-download-http "https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-&pluggy-version;.tar.gz">
-  <!ENTITY pluggy-download-ftp  " ">
-  <!ENTITY pluggy-md5sum        "&pluggy-md5sum;">
-  <!ENTITY pluggy-size          "68 KB">
-  <!ENTITY pluggy-buildsize     "588 KB (add 18 MB for tests)">
-  <!ENTITY pluggy-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="pluggy" xreflabel="pluggy-&pluggy-version;">
-
-    <title>Pluggy-&pluggy-version;</title>
-
-    <indexterm zone="pluggy">
-      <primary sortas="a-pluggy">pluggy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pluggy Module</title>
-
-      <para>
-        The <application>Pluggy</application> package gives users the ability
-        to extend or modify the behaviour of a host program by installing a
-        plugin for that program. The plugin code will run as part of normal
-        program execution, changing or enhancing certain aspects of it. In
-        essence, <application>pluggy</application> enables function hooking
-        so a user can build <quote>pluggable</quote> systems.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pluggy-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pluggy-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pluggy-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pluggy-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pluggy-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pluggy-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pluggy Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/pytest-benchmark/">pytest-benchmark</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pluggy</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pluggy</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest-benchmark                  &amp;&amp;
-python3 /usr/bin/pytest<!-- no && in case there is an error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pluggy and
-            /usr/lib/python&python3-majorver;/site-packages/pluggy-&pluggy-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/py.xml
===================================================================
--- general/prog/python-dependencies/py.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 py-download-http "https://files.pythonhosted.org/packages/source/p/py/py-&py-version;.tar.gz">
-  <!ENTITY py-download-ftp  " ">
-  <!ENTITY py-md5sum        "&py-md5sum;">
-  <!ENTITY py-size          "203 KB">
-  <!ENTITY py-buildsize     "2.8 MB">
-  <!ENTITY py-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="py" xreflabel="py-&py-version;">
-
-    <title>Py-&py-version;</title>
-
-    <indexterm zone="py">
-      <primary sortas="a-py">py</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Py Module</title>
-
-      <para>
-        The <application>Py</application> library is a Python development
-        support library used in <application>Pytest</application>. It is
-        deprecated and should be removed at some point in time, but part of
-        it is still used in <application>Pytest</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&py-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&py-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &py-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &py-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &py-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &py-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Py Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Py</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; py</userinput></screen>
-
-    <para>
-      Due to the deprecation of this package, the test suite is not maintained
-      and cannot be run.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/py and
-            /usr/lib/python&python3-majorver;/site-packages/py-&py-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/pyproject-metadata.xml
===================================================================
--- general/prog/python-dependencies/pyproject-metadata.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pyproject-metadata-download-http "https://files.pythonhosted.org/packages/source/p/pyproject-metadata/pyproject-metadata-&pyproject-metadata-version;.tar.gz">
-  <!ENTITY pyproject-metadata-download-ftp  " ">
-  <!ENTITY pyproject-metadata-md5sum        "&pyproject-metadata-md5sum;">
-  <!ENTITY pyproject-metadata-size          "8 KB">
-  <!ENTITY pyproject-metadata-buildsize     "124 KB">
-  <!ENTITY pyproject-metadata-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="pyproject-metadata" xreflabel="pyproject-metadata-&pyproject-metadata-version;">
-
-    <title>Pyproject-Metadata-&pyproject-metadata-version;</title>
-
-    <indexterm zone="pyproject-metadata">
-      <primary sortas="a-pyproject-metadata">pyproject-metadata</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pyproject-Metadata Module</title>
-
-      <para>
-        The <application>Pyproject-Metadata</application> module contains
-        a data class for PEP 621 metadata with support for
-        <quote>core metadata</quote> (PEP 643) generation.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyproject-metadata-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyproject-metadata-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyproject-metadata-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyproject-metadata-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyproject-metadata-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyproject-metadata-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pyproject-Metadata Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="packaging"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pyproject-Metadata</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; pyproject-metadata</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyproject_metadata and
-            /usr/lib/python&python3-majorver;/site-packages/pyproject_metadata-&pyproject-metadata-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/pytz.xml
===================================================================
--- general/prog/python-dependencies/pytz.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pytz-download-http "https://files.pythonhosted.org/packages/source/p/pytz/pytz-&pytz-version;.tar.gz">
-  <!ENTITY pytz-download-ftp  " ">
-  <!ENTITY pytz-md5sum        "&pytz-md5sum;">
-  <!ENTITY pytz-size          "312 KB">
-  <!ENTITY pytz-buildsize     "6.1 MB (with tests)">
-  <!ENTITY pytz-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="pytz" xreflabel="pytz-&pytz-version;">
-
-    <title>Pytz-&pytz-version;</title>
-
-    <indexterm zone="pytz">
-      <primary sortas="a-pytz">pytz</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pytz Module</title>
-
-      <para>
-        The <application>Pytz</application> library brings the IANA tz database
-        into Python. It allows accurate and cross-platform timezone
-        calculations.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pytz-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pytz-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pytz-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pytz-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pytz-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pytz-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pytz dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pytz</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pytz</userinput></screen>
-
-      <para>
-        To test the installation, run <command>pytest</command>. A few warnings
-        are issued.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pytz and
-            /usr/lib/python&python3-majorver;/site-packages/pytz-&pytz-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/setuptools_scm.xml
===================================================================
--- general/prog/python-dependencies/setuptools_scm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 setuptools_scm-download-http "https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-&setuptools_scm-version;.tar.gz">
-  <!ENTITY setuptools_scm-download-ftp  " ">
-  <!ENTITY setuptools_scm-md5sum        "&setuptools_scm-md5sum;">
-  <!ENTITY setuptools_scm-size          "70 KB">
-  <!ENTITY setuptools_scm-buildsize     "1.6 MB (with tests)">
-  <!ENTITY setuptools_scm-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
-]>
-
-  <sect2 id="setuptools_scm" xreflabel="setuptools_scm-&setuptools_scm-version;">
-
-    <title>Setuptools_scm-&setuptools_scm-version;</title>
-
-    <indexterm zone="setuptools_scm">
-      <primary sortas="a-setuptools_scm">setuptools_scm</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Setuptools_scm Module</title>
-
-      <para>
-        The <application>Setuptools_scm</application> package is used to
-        extract Python package versions from git or hg metadata instead
-        of declaring them.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&setuptools_scm-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&setuptools_scm-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &setuptools_scm-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &setuptools_scm-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &setuptools_scm-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &setuptools_scm-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Setuptools_scm Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="packaging"/> and
-        <xref linkend="typing_extensions"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="git"/>,
-        <xref linkend="mercurial"/>, and
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Setuptools_scm</title>
-
-    <para>Build the module: </para>
-
-&build-wheel; 
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; setuptools_scm</userinput></screen>
-
-    <para>
-      The installation can be tested with <command>pytest</command>. A few
-      tests may fail if your <application>git</application> configuration
-      is not the one expected by the test suite.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/setuptools_scm and
-            /usr/lib/python&python3-majorver;/site-packages/setuptools_scm-&setuptools_scm-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/smartypants.xml
===================================================================
--- general/prog/python-dependencies/smartypants.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 smartypants-download-http "https://github.com/leohemsted/smartypants.py/archive/v&smartypants-version;/smartypants-&smartypants-version;.tar.gz">
-  <!ENTITY smartypants-download-ftp  " ">
-  <!ENTITY smartypants-md5sum        "27957540f4718e892039b2ed208c78f3">
-  <!ENTITY smartypants-size          "24 KB">
-  <!ENTITY smartypants-buildsize     "344 KB">
-  <!ENTITY smartypants-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="smartypants" xreflabel="smartypants-&smartypants-version;">
-
-    <title>Smartypants-&smartypants-version;</title>
-
-    <indexterm zone="smartypants">
-      <primary sortas="a-smartypants">smartypants</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Smartypants Module</title>
-
-      <para>
-        <application>Smartypants</application> translates plain ASCII
-        punctuation characters into <quote>smart</quote> typographic
-        punctuation HTML entities.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&smartypants-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&smartypants-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &smartypants-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &smartypants-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &smartypants-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &smartypants-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-      <!-- The test suite seems to be broken
-      <bridgehead renderas="sect4">Smartypants Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-      -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Smartypants</title>
-
-      <note>
-        <para>
-          The tarball extracts into the
-          <filename class='directory'>smartypants.py-&smartypants-version;</filename>
-          directory.
-        </para>
-      </note>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; smartypants</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>smartypants</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/smartypants-&smartypants-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="smartypants-prog">
-          <term><command>smartypants</command></term>
-          <listitem>
-            <para>
-              translates ASCII punctuation to HTML punctuation.
-            </para>
-            <indexterm zone="smartypants smartypants-prog">
-              <primary sortas="b-smartypants-prog">smartypants</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/snowballstemmer.xml
===================================================================
--- general/prog/python-dependencies/snowballstemmer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 snowballstemmer-download-http "https://files.pythonhosted.org/packages/source/s/snowballstemmer/snowballstemmer-&snowballstemmer-version;.tar.gz">
-  <!ENTITY snowballstemmer-download-ftp  " ">
-  <!ENTITY snowballstemmer-md5sum        "&snowballstemmer-md5sum;">
-  <!ENTITY snowballstemmer-size          "85 KB">
-  <!ENTITY snowballstemmer-buildsize     "3.8 MB">
-  <!ENTITY snowballstemmer-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="snowballstemmer" xreflabel="snowballstemmer-&snowballstemmer-version;">
-
-    <title>Snowballstemmer-&snowballstemmer-version;</title>
-
-    <indexterm zone="snowballstemmer">
-      <primary sortas="a-snowballstemmer">snowballstemmer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Snowballstemmer Module</title>
-
-      <para>
-        The <application>Snowballstemmer</application> package is a small
-        string processing language for creating stemming algorithms for use
-        in Information Retrieval, plus a collection of stemming algorithms
-        implemented using it. Stemming maps different forms of the same word
-        to a common <quote>stem</quote> &mdash; for example, the English
-        stemmer maps <emphasis>connection</emphasis>,
-        <emphasis>connections</emphasis>, <emphasis>connective</emphasis>,
-        <emphasis>connected</emphasis>, and <emphasis>connecting</emphasis>
-        to <emphasis>connect</emphasis>. Running a search for
-        <emphasis>connected</emphasis> would also find documents which only
-        have the other forms.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&snowballstemmer-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&snowballstemmer-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &snowballstemmer-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &snowballstemmer-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &snowballstemmer-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &snowballstemmer-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Snowballstemmer</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; snowballstemmer</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/snowballstemmer and
-            /usr/lib/python&python3-majorver;/site-packages/snowballstemmer-&snowballstemmer-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-applehelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-applehelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-applehelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-&sc-applehelp-version;.tar.gz">
-  <!ENTITY sc-applehelp-download-ftp  " ">
-  <!ENTITY sc-applehelp-md5sum        "&sc-applehelp-md5sum;">
-  <!ENTITY sc-applehelp-size          "28 KB">
-  <!ENTITY sc-applehelp-buildsize     "2.0 MB (with tests)">
-  <!ENTITY sc-applehelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-applehelp" xreflabel="sphinxcontrib-applehelp-&sc-applehelp-version;">
-
-    <title>Sphinxcontrib-applehelp-&sc-applehelp-version;</title>
-
-    <indexterm zone="sc-applehelp">
-      <primary sortas="a-sphinxcontrib-applehelp">sphinxcontrib-applehelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-applehelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-applehelp</application> package is a
-        <application>Sphinx</application> extension which outputs Apple
-        help books.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-applehelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-applehelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-applehelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-applehelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-applehelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-applehelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-applehelp Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-applehelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-applehelp</userinput></screen>
-
-      <para>
-        To test the installation, run <command>pytest</command>. Several
-        warnings may be issued, due to the use of deprecated functions.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_applehelp-&sc-applehelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-devhelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-devhelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-devhelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-&sc-devhelp-version;.tar.gz">
-  <!ENTITY sc-devhelp-download-ftp  " ">
-  <!ENTITY sc-devhelp-md5sum        "&sc-devhelp-md5sum;">
-  <!ENTITY sc-devhelp-size          "17 KB">
-  <!ENTITY sc-devhelp-buildsize     "2.7 MB (with tests)">
-  <!ENTITY sc-devhelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-devhelp" xreflabel="sphinxcontrib-devhelp-&sc-devhelp-version;">
-
-    <title>Sphinxcontrib-devhelp-&sc-devhelp-version;</title>
-
-    <indexterm zone="sc-devhelp">
-      <primary sortas="a-sphinxcontrib-devhelp">sphinxcontrib-devhelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-devhelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-devhelp</application> package is a
-        <application>Sphinx</application> extension which outputs
-        <ulink url="https://wiki.gnome.org/Apps/Devhelp">Devhelp</ulink>
-        documents.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-devhelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-devhelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-devhelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-devhelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-devhelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-devhelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-devhelp Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-devhelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-devhelp</userinput></screen>
-
-      <para>
-        To test the installation, run <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_devhelp-&sc-devhelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-htmlhelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-htmlhelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-htmlhelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-&sc-htmlhelp-version;.tar.gz">
-  <!ENTITY sc-htmlhelp-download-ftp  " ">
-  <!ENTITY sc-htmlhelp-md5sum        "&sc-htmlhelp-md5sum;">
-  <!ENTITY sc-htmlhelp-size          "28 KB">
-  <!ENTITY sc-htmlhelp-buildsize     "3.2 MB (add 26 MB for tests)">
-  <!ENTITY sc-htmlhelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-htmlhelp" xreflabel="sphinxcontrib-htmlhelp-&sc-htmlhelp-version;">
-
-    <title>Sphinxcontrib-htmlhelp-&sc-htmlhelp-version;</title>
-
-    <indexterm zone="sc-htmlhelp">
-      <primary sortas="a-sphinxcontrib-htmlhelp">sphinxcontrib-htmlhelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-htmlhelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-htmlhelp</application> package is a
-        <application>Sphinx</application> extension which renders HTML
-        help files.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-htmlhelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-htmlhelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-htmlhelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-htmlhelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-htmlhelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-htmlhelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-htmlhelp Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="sphinx"/> (circular dependency), and
-        <xref linkend="html5lib"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-htmlhelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-htmlhelp</userinput></screen>
-
-    <para>
-      If the optional dependencies are installed, the package can be tested with:
-    </para>
-
-<screen remap="test"><userinput>pytest</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_htmlhelp-&sc-htmlhelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-jquery.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-jquery.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-jquery-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jquery/sphinxcontrib-jquery-&sc-jquery-version;.tar.gz">
-  <!ENTITY sc-jquery-download-ftp  " ">
-  <!ENTITY sc-jquery-md5sum        "&sc-jquery-md5sum;">
-  <!ENTITY sc-jquery-size          "120 KB">
-  <!ENTITY sc-jquery-buildsize     "552 KB">
-  <!ENTITY sc-jquery-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="sc-jquery" xreflabel="sphinxcontrib-jquery-&sc-jquery-version;">
-
-    <title>Sphinxcontrib-jquery-&sc-jquery-version;</title>
-
-    <indexterm zone="sc-jquery">
-      <primary sortas="a-sphinxcontrib-jquery">sphinxcontrib-jquery</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-jquery Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-jquery</application> package is a
-        <application>Sphinx</application> extension which includes jQuery
-        on newer Sphinx releases.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-jquery-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-jquery-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-jquery-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-jquery-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-jquery-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-jquery-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-jquery Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="sphinx"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-jquery</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; sphinxcontrib-jquery</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_jquery-&sc-jquery-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-jsmath.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-jsmath.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-jsmath-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-&sc-jsmath-version;.tar.gz">
-  <!ENTITY sc-jsmath-download-ftp  " ">
-  <!ENTITY sc-jsmath-md5sum        "&sc-jsmath-md5sum;">
-  <!ENTITY sc-jsmath-size          "5.7 KB">
-  <!ENTITY sc-jsmath-buildsize     "324 KB (with tests)">
-  <!ENTITY sc-jsmath-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-jsmath" xreflabel="sphinxcontrib-jsmath-&sc-jsmath-version;">
-
-    <title>Sphinxcontrib-jsmath-&sc-jsmath-version;</title>
-
-    <indexterm zone="sc-jsmath">
-      <primary sortas="a-sphinxcontrib-jsmath">sphinxcontrib-jsmath</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-jsmath Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-jsmath</application> package is a
-        <application>Sphinx</application> extension which renders display
-        math in HTML via JavaScript.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-jsmath-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-jsmath-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-jsmath-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-jsmath-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-jsmath-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-jsmath-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-jsmath Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-jsmath</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-jsmath</userinput></screen>
-
-    <para>
-      The installation can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>sed -i 's/text()/read_&amp;/' tests/test_jsmath.py &amp;&amp;
-pytest</userinput></screen>
-
-    <para>
-      the <command>sed ...</command> command is needed because of a change
-      in <application>Sphinx</application> API for versions greater than
-      5.0.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_jsmath-&sc-jsmath-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-qthelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-qthelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-qthelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-&sc-qthelp-version;.tar.gz">
-  <!ENTITY sc-qthelp-download-ftp  " ">
-  <!ENTITY sc-qthelp-md5sum        "&sc-qthelp-md5sum;">
-  <!ENTITY sc-qthelp-size          "21 KB">
-  <!ENTITY sc-qthelp-buildsize     "2.8 MB (with tests)">
-  <!ENTITY sc-qthelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-qthelp" xreflabel="sphinxcontrib-qthelp-&sc-qthelp-version;">
-
-    <title>Sphinxcontrib-qthelp-&sc-qthelp-version;</title>
-
-    <indexterm zone="sc-qthelp">
-      <primary sortas="a-sphinxcontrib-qthelp">sphinxcontrib-qthelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-qthelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-qthelp</application> package is a
-        <application>Sphinx</application> extension which outputs QtHelp
-        documents.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-qthelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-qthelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-qthelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-qthelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-qthelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-qthelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-qthelp Dependencies</bridgehead>
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-qthelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel; 
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-qthelp</userinput></screen>
-
-    <para>
-      The installation can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>sed -i 's/text()/read_&amp;/' tests/test_qthelp.py &amp;&amp;
-pytest</userinput></screen>
-
-    <para>
-      The <command>sed ...</command> command is needed because of a change
-      in <application>Sphinx</application> API for versions greater than
-      5.0.
-    </para>
-
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_qthelp-&sc-qthelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/sphinxcontrib-serializinghtml.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-serializinghtml-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib_serializinghtml/sphinxcontrib_serializinghtml-&sc-serializinghtml-version;.tar.gz">
-  <!ENTITY sc-serializinghtml-download-ftp  " ">
-  <!ENTITY sc-serializinghtml-md5sum        "&sc-serializinghtml-md5sum;">
-  <!ENTITY sc-serializinghtml-size          "15 KB">
-  <!ENTITY sc-serializinghtml-buildsize     "2.0 MB (with tests)">
-  <!ENTITY sc-serializinghtml-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-serializinghtml" xreflabel="sphinxcontrib-serializinghtml-&sc-serializinghtml-version;">
-
-    <title>Sphinxcontrib-serializinghtml-&sc-serializinghtml-version;</title>
-
-    <indexterm zone="sc-serializinghtml">
-      <primary sortas="a-sphinxcontrib-serializinghtml">sphinxcontrib-serializinghtml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-serializinghtml Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-serializinghtml</application> package is a
-        <application>Sphinx</application> extension which outputs
-        <quote>serialized</quote> HTML files (json and pickle).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-serializinghtml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-serializinghtml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-serializinghtml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-serializinghtml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-serializinghtml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-serializinghtml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-serializinghtml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-serializinghtml</title>
-
-      <para>
-        First remove a spurious circular dependency:
-      </para>
-
-<screen><userinput>sed /^dependencies/,+2d -i pyproject.toml</userinput></screen>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-serializinghtml</userinput></screen>
-
-      <para>
-        To test the installation, first install <xref linkend="sphinx"/>, then
-        run <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_serializinghtml-&sc-serializinghtml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/typing_extensions.xml
===================================================================
--- general/prog/python-dependencies/typing_extensions.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 typing_extensions-download-http "https://files.pythonhosted.org/packages/source/t/typing_extensions/typing_extensions-&typing_extensions-version;.tar.gz">
-  <!ENTITY typing_extensions-download-ftp  " ">
-  <!ENTITY typing_extensions-md5sum        "&typing_extensions-md5sum;">
-  <!ENTITY typing_extensions-size          "47 KB">
-  <!ENTITY typing_extensions-buildsize     "528 KB">
-  <!ENTITY typing_extensions-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="typing_extensions" xreflabel="typing_extensions-&typing_extensions-version;">
-
-    <title>Typing_extensions-&typing_extensions-version;</title>
-
-    <indexterm zone="typing_extensions">
-      <primary sortas="a-typing_extensions">typing_extensions</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Typing_extensions Module</title>
-
-      <para>
-        The <application>Typing_extensions</application> module allows
-        using new type system features not yet defined on the Python
-        version in use on the system.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&typing_extensions-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&typing_extensions-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &typing_extensions-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &typing_extensions-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &typing_extensions-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &typing_extensions-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Typing_extensions</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; typing_extensions</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/typing_extensions-&typing_extensions-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/typogrify.xml
===================================================================
--- general/prog/python-dependencies/typogrify.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 typogrify-download-http "https://files.pythonhosted.org/packages/source/t/typogrify/typogrify-&typogrify-version;.tar.gz">
-  <!ENTITY typogrify-download-ftp  " ">
-  <!ENTITY typogrify-md5sum        "&typogrify-md5sum;">
-  <!ENTITY typogrify-size          "13 KB">
-  <!ENTITY typogrify-buildsize     "404 KB">
-  <!ENTITY typogrify-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="typogrify" xreflabel="typogrify-&typogrify-version;">
-
-    <title>Typogrify-&typogrify-version;</title>
-
-    <indexterm zone="typogrify">
-      <primary sortas="a-typogrify">typogrify</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Typogrify Module</title>
-
-      <para>
-        <application>Typogrify</application> provides filters to enhance
-        web typography, including support for Django and Jinja templates.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&typogrify-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&typogrify-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &typogrify-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &typogrify-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &typogrify-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &typogrify-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Typogrify Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="smartypants"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Typogrify</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <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>&install-wheel; typogrify</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/typogrify and
-            /usr/lib/python&python3-majorver;/site-packages/typogrify-&typogrify-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/urllib3.xml
===================================================================
--- general/prog/python-dependencies/urllib3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 urllib3-download-http "https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-&urllib3-version;.tar.gz">
-  <!ENTITY urllib3-download-ftp  " ">
-  <!ENTITY urllib3-md5sum        "&urllib3-md5sum;">
-  <!ENTITY urllib3-size          "272 KB">
-  <!ENTITY urllib3-buildsize     "3.2 MB (add 49 MB for tests)">
-  <!ENTITY urllib3-time          "less than 0.1 SBU (1.6 SBU for tests)">
-]>
-
-  <sect2 id="urllib3" xreflabel="urllib3-&urllib3-version;">
-
-    <title>Urllib3-&urllib3-version;</title>
-
-    <indexterm zone="urllib3">
-      <primary sortas="a-urllib3">urllib3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Urllib3 Module</title>
-
-      <para>
-        The <application>Urllib3</application> module is a powerful,
-        user-friendly HTTP client for Python. It brings many critical
-        features that are missing from the Python standard libraries.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&urllib3-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&urllib3-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &urllib3-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &urllib3-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &urllib3-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &urllib3-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Urllib3 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatchling"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/mock/">mock</ulink>,
-        <ulink url="https://pypi.org/project/PySocks/">PySocks</ulink>,
-       <!-- <ulink url="https://pypi.org/project/pytest-freezegun/">pytest-freezegun</ulink>,-->
-        <ulink url="https://pypi.org/project/pytest-timeout/">pytest-timeout</ulink>,
-        <ulink url="https://pypi.org/project/python-dateutil/">python-dateutil</ulink>,
-        <ulink url="https://pypi.org/project/tornado/">tornado</ulink>, and
-        <ulink url="https://pypi.org/project/trustme/">trustme</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Urllib3</title>
-
-    <para> If you want to run the tests, remove some that may hang: </para>
-
-<screen><userinput>rm -v test/test_retry.py \
-      test/contrib/test_pyopenssl.py \
-      test/contrib/test_securetransport.py \
-      test/with_dummyserver/test_socketlevel.py</userinput></screen>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; urllib3</userinput></screen>
-
-    <note>
-      <para>
-        Running the tests may result in the procedure below hanging and are
-        not recommended.
-      </para>
-    </note>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install trustme         \
-             tornado         \
-             python-dateutil \
-             mock            \
-             pysocks         \
-             pytest-timeout  &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    <para>
-      A few errors are known to occur.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/urllib3 and
-            /usr/lib/python&python3-majorver;/site-packages/urllib3-&urllib3-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-dependencies/webencodings.xml
===================================================================
--- general/prog/python-dependencies/webencodings.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 webencodings-download-http "https://files.pythonhosted.org/packages/source/w/webencodings/webencodings-&webencodings-version;.tar.gz">
-  <!ENTITY webencodings-download-ftp  " ">
-  <!ENTITY webencodings-md5sum        "&webencodings-md5sum;">
-  <!ENTITY webencodings-size          "12 KB">
-  <!ENTITY webencodings-buildsize     "164 KB">
-  <!ENTITY webencodings-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="webencodings" xreflabel="webencodings-&webencodings-version;">
-
-    <title>webencodings-&webencodings-version;</title>
-
-    <indexterm zone="webencodings">
-      <primary sortas="a-webencodings">webencodings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Webencodings Module</title>
-
-      <para>
-        The <application>webencodings</application> module is a Python 
-        implementation of the 
-        <ulink url="https://encoding.spec.whatwg.org/">WHATWG Encoding standard</ulink>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&webencodings-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&webencodings-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &webencodings-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &webencodings-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &webencodings-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &webencodings-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of webencodings</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; webencodings</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/webencodings and
-            /usr/lib/python&python3-majorver;/site-packages/webencodings-&webencodings-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,370 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="python-modules" xreflabel="Python Modules">
-  <?dbhtml filename="python-modules.html" ?>
-
-
-  <title>Python Modules</title>
-
-  <indexterm zone="python-modules">
-    <primary sortas="a-Python-Modules">Python Modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python Modules</title>
-
-    <para>
-      The <application>Python</application> module packages add useful objects
-      to the <application>Python</application> language. Modules utilized by
-      packages throughout BLFS are listed here, along with their dependencies.
-    </para>
-
-    <note>
-      <para>
-        If you want to run tests, several of the following modules depend on
-        the <option>sqlite3</option> core python module that has not been
-        built in LFS. It is therefore recommended to rebuild Python after
-        installing the recommended dependency listed in
-        <xref linkend="python3"/>.
-      </para>
-    </note>
-
-    <important>
-      <para>
-        In BLFS, we normally build and install Python 3 modules with
-        <command>pip3</command>.  Please take care that the
-        <command>pip3 install</command> commands in the book should be
-        run as &root; unless it's for a Python virtual environment.  Running
-        <command>pip3 install</command> as a non-&root; user may seem to
-        work fine, but it will cause the installed module to be inaccessible by
-        other users.
-      </para>
-      <para>
-        <command>pip3 install</command> will not reinstall an already
-        installed module by default.  For using the
-        <command>pip3 install</command> command to upgrade a module (for
-        example, from meson-0.61.3 to meson-0.62.0), insert
-        <parameter>--upgrade</parameter> into the command line.  If it's really
-        necessary to downgrade a module or reinstall the same version for
-        some reason, insert <parameter>--force-reinstall</parameter> into
-        the command line.
-      </para>
-    </important>
-
-    <itemizedlist spacing="compact">
-<!--
-      <listitem>
-        <para>
-          <xref linkend="pythonhosted"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="asciidoc"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="cachecontrol"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="cssselect"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="cython"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="python-dbusmock"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="dbus-python"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="docutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="doxypypy"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="doxyqml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="gi-docgen"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="html5lib"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="lxml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="Mako"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="numpy"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="packaging"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="psutil"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="py3c"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyatspi2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pycairo2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pycairo"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygdbmi"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygments"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygobject2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygobject3"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygtk"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyparsing"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyserial"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pytest"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyxdg"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="PyYAML"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="recommonmark"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="requests"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sentry-sdk"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="scour"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="six"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sphinx"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sphinx_rtd_theme"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pythonhosted.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/asciidoc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/cssselect.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/cachecontrol.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/cython.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/python-dbusmock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/dbus-python.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/docutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/doxypypy.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/doxyqml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/gi-docgen.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/html5lib.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/lxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/mako.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/numpy.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/packaging.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/psutil.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/py3c.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyatspi2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pycairo2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pycairo.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygdbmi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygments.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygobject2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygobject3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygtk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyparsing.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyserial.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pytest.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyxdg.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyyaml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/recommonmark.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/requests.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/scour.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/sentry-sdk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/six.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/sphinx.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/sphinx_rtd_theme.xml"/>
-
-</sect1>
Index: neral/prog/python-modules/asciidoc.xml
===================================================================
--- general/prog/python-modules/asciidoc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "&asciidoc-md5sum;">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "4.3 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
-
-    <title>Asciidoc-&asciidoc-version;</title>
-
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
-
-      <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &asciidoc-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &asciidoc-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &asciidoc-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &asciidoc-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
-      <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-
-      <!-- https://github.com/asciidoc-py/asciidoc-py/pull/267 -->
-      <para>
-        Fix an issue causing thousands of lines of
-        <quote><computeroutput>invalid escape sequence</computeroutput></quote>
-        warnings outputted when generating the documentation of some
-        packages with Asciidoc and Python 3.12 or later:
-      </para>
-
-<screen><userinput>sed '/self.separator =/s/"/r"/' -i asciidoc/asciidoc.py</userinput></screen>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <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>&install-wheel; asciidoc</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/cachecontrol.xml
===================================================================
--- general/prog/python-modules/cachecontrol.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 cachecontrol-download-http "https://github.com/psf/cachecontrol/archive/v&cachecontrol-version;/cachecontrol-&cachecontrol-version;.tar.gz">
-  <!ENTITY cachecontrol-download-ftp  " ">
-  <!ENTITY cachecontrol-md5sum        "&cachecontrol-md5sum;">
-  <!ENTITY cachecontrol-size          "44 KB">
-  <!ENTITY cachecontrol-buildsize     "344 KB">
-  <!ENTITY cachecontrol-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="cachecontrol" xreflabel="CacheControl-&cachecontrol-version;">
-
-    <title>CacheControl-&cachecontrol-version;</title>
-
-    <indexterm zone="cachecontrol">
-      <primary sortas="a-cachecontrol">cachecontrol</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to CacheControl Module</title>
-
-      <para>
-        <application>CacheControl</application> is a port of the caching
-        algorithms in httplib2 for use with requests session object. It was
-        written because httplib2's better support for caching is often
-        mitigated by its lack of thread safety. The same is true of requests
-        in terms of caching.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cachecontrol-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cachecontrol-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cachecontrol-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cachecontrol-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cachecontrol-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cachecontrol-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">CacheControl Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="msgpack"/> and
-        <xref linkend="requests"/>
-      </para>
-
-      <!-- commented in case fixed in newer version
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pluggy"/>,
-        <xref linkend="pytests"/>
-      </para> -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of CacheControl</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; cachecontrol</userinput></screen>
-
-      <para>
-        <!-- tests run with plain 'pytest', but 0 items are selected,
-             resulting in non-zero status -->
-        This module does not have a working test suite.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            doesitcache
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/CacheControl-&cachecontrol-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/cachecontrol
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="doesitcache">
-          <term><command>doesitcache</command></term>
-          <listitem>
-            <para>
-              is an undocumented command line script.
-              <!-- debian patch this out as undocumented and unnecessary -->
-            </para>
-            <indexterm zone="cachecontrol">
-              <primary sortas="b-cachecontrol">doesitcache</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/cssselect.xml
===================================================================
--- general/prog/python-modules/cssselect.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 cssselect-download-http "https://files.pythonhosted.org/packages/source/c/cssselect/cssselect-&cssselect-version;.tar.gz">
-  <!ENTITY cssselect-download-ftp  " ">
-  <!ENTITY cssselect-md5sum        "&cssselect-md5sum;">
-  <!ENTITY cssselect-size          "1.2 MB">
-  <!ENTITY cssselect-buildsize     "512 KB (add 488 KB for tests)">
-  <!ENTITY cssselect-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="cssselect" xreflabel="cssselect-&cssselect-version;">
-
-    <title>CSSSelect-&cssselect-version;</title>
-
-    <indexterm zone="cssselect">
-      <primary sortas="a-cssselect">cssselect</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to CSSSelect Module</title>
-
-      <para>
-        <application>CSSSelect</application> provides CSS selectors
-        for Python.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cssselect-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cssselect-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cssselect-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cssselect-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cssselect-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cssselect-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">CSSSelect Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="lxml"/> and
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of CSSSelect</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; cssselect</userinput></screen>
-
-      <para>
-        To test the installation issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/cssselect
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/cython.xml
===================================================================
--- general/prog/python-modules/cython.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 cython-download-http "https://github.com/cython/cython/releases/download/&cython-version;/Cython-&cython-version;.tar.gz">
-  <!ENTITY cython-download-ftp  " ">
-  <!ENTITY cython-md5sum        "&cython-md5sum;">
-  <!ENTITY cython-size          "2.1 MB">
-  <!ENTITY cython-buildsize     "67 MB">
-  <!ENTITY cython-time          "0.5 SBU">
-]>
-
-  <sect2 id="cython" xreflabel="cython-&cython-version;">
-
-    <title>Cython-&cython-version;</title>
-
-    <indexterm zone="cython">
-      <primary sortas="a-cython">cython</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Cython Module</title>
-
-      <para>
-        The <application>Cython</application> package provides a
-         compiler for writing C extensions for the Python language.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cython-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cython-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cython-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cython-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cython-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cython-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Cython</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <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>&install-wheel; Cython</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            cygdb,
-            cython, and
-            cythonize
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/Cython,
-            /usr/lib/python&python3-majorver;/site-packages/Cython-&cython-version;.dist-info, and
-            /usr/lib/python&python3-majorver;/site-packages/pyximport
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cygdb">
-          <term><command>cygdb</command></term>
-          <listitem>
-            <para>
-              is the Cython debugger
-            </para>
-            <indexterm zone="cython cygdb">
-              <primary sortas="b-cygdb">cygdb</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cython-prog">
-          <term><command>cython</command></term>
-          <listitem>
-            <para>
-              is a compiler for code written in the Cython language. It outputs
-              a C/C++ program which can be compiled with a C/C++ compiler
-            </para>
-            <indexterm zone="cython cython-prog">
-              <primary sortas="b-cython-prog">cython</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cythonize">
-          <term><command>cythonize</command></term>
-          <listitem>
-            <para>
-              is a compiler for code written in the Cython language. It outputs
-              an extension module which is directly importable from Python
-            </para>
-            <indexterm zone="cython cythonize">
-              <primary sortas="b-cythonize">cythonize</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/dbus-python.xml
===================================================================
--- general/prog/python-modules/dbus-python.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "33be8a4a766e1c7c9a377b8f934ce21a">
-  <!ENTITY dbus-python-size          "592 KB">
-  <!ENTITY dbus-python-buildsize     "4.0 MB" >
-  <!ENTITY dbus-python-time          "less than 0.1 SBU">
-  <!ENTITY dbus-python-egg-info      "&python3-site;/dbus_python-&dbus-python-version;.egg-info">
-]>
-
-  <!-- Begin D-Bus Python -->
-  <sect2 id="dbus-python" xreflabel="D-Bus Python-&dbus-python-version;">
-    <title>D-Bus Python-&dbus-python-version;</title>
-
-    <indexterm zone="dbus-python">
-      <primary sortas="a-dbus-python">dbus-python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to D-Bus Python Module</title>
-
-      <para>
-        <application>D-Bus Python</application> provides
-        <application>Python</application> bindings to the
-        <application>D-Bus</application> API interface.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbus-python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbus-python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &dbus-python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbus-python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbus-python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbus-python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">D-Bus Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus"/>,
-        <xref linkend="glib2"/>,
-        <xref linkend="meson_python"/>, and
-        <xref linkend="patchelf"/>
-      </para>
-<!--  no tests available yet
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="pygobject3"/> and
-        <ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
-        (required for some tests)
-      </para>
--->
-<!--  how to build the doc?
-      <bridgehead renderas="sect5">
-       Optional (Required to build the API and HTML Documentation)</bridgehead>
-      <para role="optional">
-        <xref linkend="sphinx_rtd_theme"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of D-Bus Python</title>
-
-      <para>
-        Build the D-Bus Python module by running the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; dbus-python</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            &python3-site;/dbus and &dbus-python-egg-info;
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/docutils.xml
===================================================================
--- general/prog/python-modules/docutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,323 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 docutils-download-http "https://files.pythonhosted.org/packages/source/d/docutils/docutils-&docutils-version;.tar.gz">
-  <!ENTITY docutils-download-ftp  " ">
-  <!ENTITY docutils-md5sum        "5cdc4aee7a8a11fb0d5ce8039a37c809">
-  <!ENTITY docutils-size          "2.1 MB">
-  <!ENTITY docutils-buildsize     "10 MB">
-  <!ENTITY docutils-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin docutils -->
-  <sect2 id="docutils" xreflabel="docutils-&docutils-version;">
-
-    <title>docutils-&docutils-version;</title>
-
-    <indexterm zone="docutils">
-      <primary sortas="a-docutils">docutils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to docutils</title>
-
-      <para>
-        <application>docutils</application> is a set of
-        <application>Python</application> modules and programs
-        for processing plaintext docs into formats such as HTML, XML, or LaTeX.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&docutils-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&docutils-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &docutils-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &docutils-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &docutils-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &docutils-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of docutils</title>
-
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
-      <para>
-        First, remove some files installed in a previous version
-        that are no longer valid. As the &root; user:
-      </para>
-
-<screen role="root"><userinput>for f in /usr/bin/rst*.py; do
-  sudo rm -fv /usr/bin/$(basename $f .py)
-done</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> applications,
-        run the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the <application>Python</application> applications
-        run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; docutils</userinput></screen>
-
-      <!-- FHS 3.0 section 4.4.2:
-           "There must be no subdirectories in /usr/bin."
-           But pip maintainers closed this as WONTFIX:
-           https://github.com/pypa/pip/issues/6906 -->
-      <para>
-        To reduce the time needed for loading Python scripts,
-        <command>pip3 install</command> will compile the scripts with
-        extension <filename class='extension'>.py</filename> into byte code
-        and save the result into
-        <filename class='extension'>.pyc</filename> files in the directory
-        <filename class='directory'>__pycache__</filename>.
-        But this package installs <filename class='extension'>.py</filename>
-        scripts into <filename class='directory'>/usr/bin</filename>.
-        So the byte code files for them will be installed into
-        <filename class='directory'>/usr/bin/__pycache__</filename>, which
-        is not allowed by FHS.  Still as the &root; user, remove this
-        directory:
-      </para>
-
-<screen role="root"><userinput>rm -rfv /usr/bin/__pycache__</userinput></screen>
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            docutils, rst2html4, rst2html5, rst2html, rst2latex, rst2man,
-            rst2odt_prepstyles, rst2odt, rst2pseudoxml, rst2s5,
-            rst2xetex, rst2xml, and rstpep2html
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/docutils{,-&docutils-version;.dist-info}
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="docutils-prog">
-          <term><command>docutils</command></term>
-          <listitem>
-            <para>
-              converts documents into various formats
-            </para>
-            <indexterm zone="docutils docutils-prog">
-              <primary sortas="b-docutils-prog">docutils</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2html">
-          <term><command>rst2html</command></term>
-          <listitem>
-            <para>
-              generates (X)HTML documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2html">
-              <primary sortas="b-rst2html">rst2html</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2html4">
-          <term><command>rst2html4</command></term>
-          <listitem>
-            <para>
-              generates (X)HTML documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2html4">
-              <primary sortas="b-rst2html4">rst2html4</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2html5">
-          <term><command>rst2html5</command></term>
-          <listitem>
-            <para>
-              generates HTML5 documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2html5">
-              <primary sortas="b-rst2html5">rst2html5</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2latex">
-          <term><command>rst2latex</command></term>
-          <listitem>
-            <para>
-              generates LaTeX documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2latex">
-              <primary sortas="b-rst2latex">rst2latex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2man">
-          <term><command>rst2man</command></term>
-          <listitem>
-            <para>
-              generates plain unix manual documents from standalone
-              reStructuredText sources
-            </para>
-            <indexterm zone="docutils rst2man">
-              <primary sortas="b-rst2man">rst2man</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2odt">
-          <term><command>rst2odt</command></term>
-          <listitem>
-            <para>
-              generates OpenDocument/OpenOffice/ODF documents from standalone
-              reStructuredText sources
-            </para>
-            <indexterm zone="docutils rst2odt">
-              <primary sortas="b-rst2odt">rst2odt</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2odt_prepstyles">
-          <term><command>rst2odt_prepstyles</command></term>
-          <listitem>
-            <para>
-              Fix a word-processor-generated styles.odt for odtwriter use
-            </para>
-            <indexterm zone="docutils rst2odt_prepstyles">
-              <primary sortas="b-rst2odt_prepstyles">rst2odt_prepstyles</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2pseudoxml">
-          <term><command>rst2pseudoxml</command></term>
-          <listitem>
-            <para>
-              generates pseudo-XML from standalone reStructuredText sources
-              (for testing purposes)
-            </para>
-            <indexterm zone="docutils rst2pseudoxml">
-              <primary sortas="b-rst2pseudoxml">rst2pseudoxml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2s5">
-          <term><command>rst2s5</command></term>
-          <listitem>
-            <para>
-              generates S5 (X)HTML slideshow from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2s5">
-              <primary sortas="b-rst2s5">rst2s5</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2xetex">
-          <term><command>rst2xetex</command></term>
-          <listitem>
-            <para>
-              generates LaTeX documents  from standalone reStructuredText
-              sources for compilation with the Unicode-aware TeX variants
-              XeLaTeX or LuaLaTeX
-            </para>
-            <indexterm zone="docutils rst2xetex">
-              <primary sortas="b-rst2xetex">rst2xetex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2xml">
-          <term><command>rst2xml</command></term>
-          <listitem>
-            <para>
-              generates Docutils-native XML from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2xml">
-              <primary sortas="b-rst2xml">rst2xml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rstpep2html">
-          <term><command>rstpep2html</command></term>
-          <listitem>
-            <para>
-              generates (X)HTML from reStructuredText-format PEP files
-            </para>
-            <indexterm zone="docutils rstpep2html">
-              <primary sortas="b-rstpep2html">rstpep2html</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/doxypypy.xml
===================================================================
--- general/prog/python-modules/doxypypy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 doxypypy-download-http "https://files.pythonhosted.org/packages/source/d/doxypypy/doxypypy-&doxypypy-version;.tar.gz">
-  <!ENTITY doxypypy-download-ftp  " ">
-  <!ENTITY doxypypy-md5sum        "&doxypypy-md5sum;">
-  <!ENTITY doxypypy-size          "45 KB">
-  <!ENTITY doxypypy-buildsize     "2.1 MB">
-  <!ENTITY doxypypy-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="doxypypy" xreflabel="doxypypy-&doxypypy-version;">
-
-    <title>Doxypypy-&doxypypy-version;</title>
-
-    <indexterm zone="doxypypy">
-      <primary sortas="a-doxypypy">doxypypy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Doxypypy Module</title>
-
-      <para>
-        The <application>Doxypypy</application> package is a doxygen filter
-        for python.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&doxypypy-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&doxypypy-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &doxypypy-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &doxypypy-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &doxypypy-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &doxypypy-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Doxypypy Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="chardet"/> and
-        <xref role="runtime" linkend="doxygen"/> (at run time)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Doxypypy</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; doxypypy</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>doxypypy</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/doxypypy and
-            /usr/lib/python&python3-majorver;/site-packages/doxypypy-&doxypypy-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="doxypypy-prog">
-          <term><command>doxypypy</command></term>
-          <listitem>
-            <para>
-              filters Python code for use with Doxygen, using a syntax-aware
-              approach.
-            </para>
-            <indexterm zone="doxypypy doxypypy-prog">
-              <primary sortas="b-doxypypy-prog">doxypypy</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/doxyqml.xml
===================================================================
--- general/prog/python-modules/doxyqml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 doxyqml-download-http "https://files.pythonhosted.org/packages/source/d/doxyqml/doxyqml-&doxyqml-version;.tar.gz">
-  <!ENTITY doxyqml-download-ftp  " ">
-  <!ENTITY doxyqml-md5sum        "&doxyqml-md5sum;">
-  <!ENTITY doxyqml-size          "28 KB">
-  <!ENTITY doxyqml-buildsize     "652 KB (with tests)">
-  <!ENTITY doxyqml-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="doxyqml" xreflabel="doxyqml-&doxyqml-version;">
-
-    <title>Doxyqml-&doxyqml-version;</title>
-
-    <indexterm zone="doxyqml">
-      <primary sortas="a-doxyqml">doxyqml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Doxyqml Module</title>
-
-      <para>
-        The <application>Doxyqml</application> package allows using Doxygen
-        to document QML classes.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&doxyqml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&doxyqml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &doxyqml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &doxyqml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &doxyqml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &doxyqml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Doxyqml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required (Run Time)</bridgehead>
-      <para role="required">
-        <xref role="runtime" linkend="doxygen"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Doxyqml</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; doxyqml</userinput></screen>
-
-    <para>
-      To test the installation, run:
-    </para>
-
-<screen remap="test"><userinput>pytest</userinput></screen>
-
-    <para>
-      The <emphasis>test_qmlclass.py</emphasis> test is known to fail.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>doxyqml</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/doxyqml and
-            /usr/lib/python&python3-majorver;/site-packages/doxyqml-&doxyqml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="doxyqml-prog">
-          <term><command>doxyqml</command></term>
-          <listitem>
-            <para>
-              is a Doxygen input filter for QML files.
-            </para>
-            <indexterm zone="doxyqml doxyqml-prog">
-              <primary sortas="b-doxyqml-prog">doxyqml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/gi-docgen.xml
===================================================================
--- general/prog/python-modules/gi-docgen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 gi-docgen-download-http "https://files.pythonhosted.org/packages/source/g/gi-docgen/gi-docgen-&gi-docgen-version;.tar.gz">
-  <!ENTITY gi-docgen-download-ftp  " ">
-  <!ENTITY gi-docgen-md5sum        "&gi-docgen-md5sum;">
-  <!ENTITY gi-docgen-size          "2.4 MB">
-  <!ENTITY gi-docgen-buildsize     "18 MB (with tests)">
-  <!ENTITY gi-docgen-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="gi-docgen" xreflabel="Gi-DocGen-&gi-docgen-version;">
-
-    <title>Gi-DocGen-&gi-docgen-version;</title>
-
-    <indexterm zone="gi-docgen">
-      <primary sortas="a-gi-docgen">gi-docgen</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Gi-DocGen Module</title>
-
-      <para>
-        <application>Gi-DocGen</application> is a document generator for
-        GObject-based libraries. GObject is the base type system of the GNOME
-        project. GI-Docgen reuses the introspection data generated by
-        GObject-based libraries to generate the API reference of these
-        libraries, as well as other ancillary documentation.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&gi-docgen-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&gi-docgen-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &gi-docgen-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &gi-docgen-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &gi-docgen-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &gi-docgen-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Gi-DocGen Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="markdown"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pygments"/>,
-        and <xref linkend="typogrify"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref role='runtime' linkend='graphviz'/> (runtime, for visualizing
-        class hierarchy graphs) and
-        <xref linkend="pytest"/> (for testing)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of gi-docgen</title>
-
-    <!-- https://gitlab.gnome.org/GNOME/gi-docgen/-/issues/188 -->
-    <para>
-      Silence a warning from the Graphviz <command>dot</command> utility
-      which will cause documentation of various packages fail to build
-      if Graphviz is installed but built without Pango, and
-      <command>gi-docgen</command> is invoked with the
-      <option>--fatal-warnings</option> option:
-    </para>
-
-    <screen><userinput>sed '/if err:/s/err/proc.returncode/' \
-    -i gidocgen/utils.py</userinput></screen>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; gi-docgen</userinput></screen>
-
-    <para>
-      To test the installation, issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>gi-docgen</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/gidocgen and
-            /usr/lib/python&python3-majorver;/site-packages/gi_docgen-&gi-docgen-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="gi-docgen-prog">
-          <term><command>gi-docgen</command></term>
-          <listitem>
-            <para>
-              manages documentation for libgobject based libraries.
-            </para>
-            <indexterm zone="gi-docgen gi-docgen-prog">
-              <primary sortas="b-gi-docgen">gi-docgen</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/html5lib.xml
===================================================================
--- general/prog/python-modules/html5lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 html5lib-download-http "&pymodules-dl;/h/html5lib/html5lib-&html5lib-version;.tar.gz">
-  <!ENTITY html5lib-download-ftp  " ">
-  <!ENTITY html5lib-md5sum        "&html5lib-md5sum;">
-  <!ENTITY html5lib-size          "268 KB">
-  <!ENTITY html5lib-buildsize     "3.9 MB">
-  <!ENTITY html5lib-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin html5lib -->
-  <sect2 id="html5lib" xreflabel="html5lib-&html5lib-version;">
-
-    <title>html5lib-&html5lib-version;</title>
-
-    <indexterm zone="html5lib">
-      <primary sortas="a-html5lib">html5lib</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to html5lib Module</title>
-
-      <para>
-        <application>html5lib</application> provides a pure-python library for
-        parsing HTML. It is designed to conform to the WHATWG HTML
-        specification.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&html5lib-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&html5lib-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &html5lib-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &html5lib-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &html5lib-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &html5lib-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">html5lib Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="six"/> and
-        <xref linkend="webencodings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of html5lib</title>
-
-      <para>
-        To build the <application>Python 3</application> module, run:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, issue the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; html5lib</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/html5lib and
-            /usr/lib/python&python3-majorver;/site-packages/html5lib-&html5lib-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/lxml.xml
===================================================================
--- general/prog/python-modules/lxml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
-  <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "&lxml-md5sum;">
-  <!ENTITY lxml-size          "3.4 MB">
-  <!ENTITY lxml-buildsize     "89 MB">
-  <!ENTITY lxml-time          "1.0 SBU">
-]>
-
-  <!-- Begin lxml -->
-  <sect2 id="lxml" xreflabel="lxml-&lxml-version;">
-
-    <title>lxml-&lxml-version;</title>
-
-    <indexterm zone="lxml">
-      <primary sortas="a-lxml">lxml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to lxml Module</title>
-
-      <para>
-        <application>lxml</application> provides
-        <application>Python</application> bindings for
-        <xref linkend="libxslt"/> and <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&lxml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&lxml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &lxml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &lxml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &lxml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &lxml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">lxml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxslt"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of lxml</title>
-
-      <para>
-        To build the <application>Python 3</application> module, run:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, issue the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; lxml</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/lxml and
-            /usr/lib/python&python3-majorver;/site-packages/lxml-&lxml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/mako.xml
===================================================================
--- general/prog/python-modules/mako.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 Mako-download-http "&pymodules-dl;/M/Mako/Mako-&mako-version;.tar.gz">
-  <!ENTITY Mako-download-ftp  " ">
-  <!ENTITY Mako-md5sum        "&mako-md5sum;">
-  <!ENTITY Mako-size          "384 KB">
-  <!ENTITY Mako-buildsize     "2.9 MB (add 1.2 MB for tests)">
-  <!ENTITY Mako-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <!-- Begin Mako -->
-  <sect2 id="Mako" xreflabel="Mako-&mako-version;">
-
-    <title>Mako-&mako-version;</title>
-
-    <indexterm zone="Mako">
-      <primary sortas="a-Mako">Mako</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Mako Module</title>
-
-      <para>
-        <application>Mako</application> is a <application>Python</application>
-        module that implements hyperfast and lightweight templating for the
-        <application>Python</application> platform.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Mako-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Mako-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Mako-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Mako-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Mako-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Mako-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Mako Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for Testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Mako</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        Install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; Mako</userinput></screen>
-
-    <para>
-      To test the installation, issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            mako-render
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/mako and
-            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="mako-render">
-          <term><command>mako-render</command></term>
-          <listitem>
-            <para>
-             renders a template
-            </para>
-            <indexterm zone="Mako mako-render">
-              <primary sortas="b-mako-render">mako-render</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/numpy.xml
===================================================================
--- general/prog/python-modules/numpy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 numpy-download-http "https://files.pythonhosted.org/packages/source/n/numpy/numpy-&numpy-version;.tar.gz">
-  <!ENTITY numpy-download-ftp  " ">
-  <!ENTITY numpy-md5sum        "&numpy-md5sum;">
-  <!ENTITY numpy-size          "15 MB">
-  <!ENTITY numpy-buildsize     "91 MB (add 333 MB for tests)">
-  <!ENTITY numpy-time          "0.4 SBU (add 2.8 SBU for tests)">
-]>
-
-  <sect2 id="numpy" xreflabel="NumPy-&numpy-version;">
-
-    <title>NumPy-&numpy-version;</title>
-
-    <indexterm zone="numpy">
-      <primary sortas="a-numpy">numpy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to NumPy Module</title>
-
-      <para>
-        <application>NumPy</application> is the fundamental package for
-        scientific computing with Python.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&numpy-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&numpy-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &numpy-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &numpy-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &numpy-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &numpy-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">NumPy Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/>,
-        <xref linkend="meson_python"/>, and
-        <xref linkend="pyproject-metadata"/>
-      </para>
-
-<!--  <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>-->
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        fortran from <xref linkend="gcc"/>,
-        <ulink url="https://www.netlib.org/lapack/">lapack and cblas</ulink>, and
-        <ulink url="https://www.openblas.net/">openblas</ulink>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="attrs"/>,
-        <xref linkend="pytest"/>,
-        <xref linkend="pytz"/>, and
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of NumPy</title>
-
-      <para> Build the module: </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps --no-cache-dir -Csetup-args=-Dallow-noblas=true $PWD</userinput></screen>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; numpy</userinput></screen>
-
-      <para>
-        The installation can be tested with the following commands:
-      </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install hypothesis                        &amp;&amp;
-python3 runtests.py<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-      <para>
-        Three tests, out of over 35000 tests, are known to fail.
-        <!-- test_f2py2e.py::test_untitled_cli, 
-             test_f2py2e.py::test_no_py312_distutils_fcompiler
-             test_public_api.py::test_all_modules_are_expected
-             3 failed, 35182 passed, 1835 skipped, 1306 deselected, 
-                          32 xfailed, 2 xpassed -->
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            f2py, f2py3 and f2py&python3-majorver; (3 copies of the same script)
-          </seg>
-          <!-- we seem not to record the solibs, see e.g. lxml, cairo
-           actually, this one has a lot, all with awkward
-           * .cpython-311-x86_64-linux-gnu.so names -->
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/numpy
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="f2py">
-          <term><command>f2py</command></term>
-          <listitem>
-            <para>
-              is the Fortran to Python interface generator utility.
-            </para>
-            <indexterm zone="numpy f2py">
-              <primary sortas="b-f2py">f2py</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/packaging.xml
===================================================================
--- general/prog/python-modules/packaging.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 packaging-download-http "https://files.pythonhosted.org/packages/source/p/packaging/packaging-&packaging-version;.tar.gz">
-  <!ENTITY packaging-download-ftp  " ">
-  <!ENTITY packaging-md5sum        "&packaging-md5sum;">
-  <!ENTITY packaging-size          "148 KB">
-  <!ENTITY packaging-buildsize     "2.6 MB (add 20 MB for tests)">
-  <!ENTITY packaging-time          "less than 0.1 SBU (0.2 SBU for tests)">
-]>
-
-  <sect2 id="packaging" xreflabel="packaging-&packaging-version;">
-
-    <title>Packaging-&packaging-version;</title>
-
-    <indexterm zone="packaging">
-      <primary sortas="a-packaging">packaging</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Packaging Module</title>
-
-      <para>
-        The <application>Packaging</application> library provides utilities
-        that implement the interoperability specifications which have clearly
-        one correct behaviour or benefit greatly from having a single shared
-        implementation.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&packaging-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&packaging-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &packaging-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &packaging-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &packaging-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &packaging-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/pretend/">pretend</ulink>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Packaging</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; packaging</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependency is not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pretend                           &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/packaging and
-            /usr/lib/python&python3-majorver;/site-packages/packaging-&packaging-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/psutil.xml
===================================================================
--- general/prog/python-modules/psutil.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 psutil-download-http "&pymodules-dl;/p/psutil/psutil-&psutil-version;.tar.gz">
-  <!ENTITY psutil-download-ftp  " ">
-  <!ENTITY psutil-md5sum        "&psutil-md5sum;">
-  <!ENTITY psutil-size          "492 KB">
-  <!ENTITY psutil-buildsize     "4.3 MB">
-  <!ENTITY psutil-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin psutil -->
-  <sect2 id="psutil" xreflabel="psutil-&psutil-version;">
-
-    <title>psutil-&psutil-version;</title>
-
-    <indexterm zone="psutil">
-      <primary sortas="a-psutil">psutil</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to psutil Module</title>
-
-      <para>
-        psutil (process and system utilities) is a cross-platform library 
-        for retrieving information on running processes and system utilization 
-        (CPU, memory, disks, network, sensors) in Python. It is useful mainly 
-        for system monitoring, profiling and limiting process resources and 
-        management of running processes. It implements many functionalities offered 
-        by classic UNIX command line tools such as ps, top, iotop, lsof, netstat, 
-        ifconfig, free and others.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&psutil-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&psutil-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &psutil-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &psutil-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &psutil-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &psutil-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of psutil</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; psutil</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/psutil-&psutil-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/py3c.xml
===================================================================
--- general/prog/python-modules/py3c.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,132 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 py3c-download-http
-           "https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
-  <!ENTITY py3c-md5sum        "53029afde7e0cf8672a2d69d378a0cfc">
-  <!ENTITY py3c-size          "47 KB">
-  <!ENTITY py3c-buildsize     "608 KB (with tests)">
-  <!ENTITY py3c-time          "less than 0.1 SBU (with tests)">
-]>
-
-   <!-- Begin Py3c -->
-  <sect2 id="py3c" xreflabel="Py3c-&py3c-version;">
-
-    <title>Py3c-&py3c-version;</title>
-
-    <indexterm zone="py3c">
-      <primary sortas="a-Py3c">Py3c</primary>
-   </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Py3c</title>
-
-      <para>
-        <application>Py3c</application> helps you port C extensions to
-        Python 3. It provides a detailed guide, and a set of macros to
-        make porting easy and reduce boilerplate.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&py3c-download-http;"/>
-          </para>
-        </listitem>
-<!--
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&py3c-download-ftp;"/>
-          </para>
-        </listitem>
--->
-        <listitem>
-          <para>
-            Download MD5 sum: &py3c-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &py3c-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &py3c-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &py3c-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Py3c Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
--->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Py3c</title>
-
-      <para>
-        The <application>Py3c</application> package is a headers-only package
-        and because of that, no configuration and compilation is
-        required.
-      </para>
-
-      <para>
-        To test the package, issue:
-      </para>
-
-<screen remap="test"><userinput>make test-python3 &amp;&amp;
-make test-python3-cpp</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<!-- Note:
-  Now, doing a DESTDIR install is just
-    "make prefix=/usr DESTDIR=<dest> install"
--->
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/include/py3c
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pyatspi2.xml
===================================================================
--- general/prog/python-modules/pyatspi2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pyatspi2-download-http
-           "&gnome-download-http;/pyatspi/2.46/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-download-ftp  " ">
-  <!ENTITY pyatspi2-md5sum        "0f2bfade055457cb0c2389fd46d1ad70">
-  <!ENTITY pyatspi2-size          "316 KB">
-  <!ENTITY pyatspi2-buildsize     "3.9 MB">
-  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyAtSpi2 -->
-  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
-
-    <title>PyAtSpi2-&pyatspi2-version;</title>
-
-    <indexterm zone="pyatspi2">
-      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
-   </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyAtSpi2</title>
-
-      <para>
-        The <application>PyAtSpi2</application> package contains
-        <application>Python</application> bindings for the core
-        components of the <application>GNOME</application>
-        Accessibility.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyatspi2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyatspi2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyatspi2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyatspi2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyAtSpi2</title>
-
-      <para>
-        To build <application>PyAtSpi2</application> as a
-        <application>Python 3</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr --with-python=/usr/bin/python3</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <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>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyatspi
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pycairo.xml
===================================================================
--- general/prog/python-modules/pycairo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "395b9eb21bb2d18801ebe26501ff2b8e">
-  <!ENTITY pycairo-size          "340 KB">
-  <!ENTITY pycairo-buildsize     "3.1 MB">
-  <!ENTITY pycairo-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyCairo -->
-  <sect2 id="pycairo" xreflabel="PyCairo-&pycairo-version;">
-
-    <title>PyCairo-&pycairo-version;</title>
-
-    <indexterm zone="pycairo">
-      <primary sortas="a-PyCairo">PyCairo</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyCairo Module</title>
-
-      <para>
-        PyCairo provides <application>Python</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycairo-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycairo-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycairo-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycairo-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycairo-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycairo-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cairo"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink> and
-        <xref linkend="pytest"/> (for tests)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCairo</title>
-
-      <note>
-        <para>
-           The current version of pycairo no longer builds the Python2 module.
-           If you need that module for packages such as <xref linkend="gimp"/>, use
-           <xref linkend="pycairo2"/>
-        </para>
-      </note>
-
-      <para>
-        Install <application>PyCairo</application> for Python3 by
-        running the following commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-      <para>
-        To run the tests, this package requires the optional pytest module. If
-        it is installed, run the tests by running <command>ninja test</command>.
-        <!--The <emphasis>test_surface.py</emphasis> test has a failure.-->
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/include/pycairo,
-            /usr/lib/python&python3-majorver;/site-packages/cairo, and
-            /usr/lib/python&python3-majorver;/site-packages/pycairo-&pycairo-version;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pycairo2.xml
===================================================================
--- general/prog/python-modules/pycairo2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pycairo2-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo2-version;/pycairo-&pycairo2-version;.tar.gz">
-  <!ENTITY pycairo2-download-ftp  " ">
-  <!ENTITY pycairo2-md5sum        "be2ba51f234270dec340f28f1695a95e">
-  <!ENTITY pycairo2-size          "196 KB">
-  <!ENTITY pycairo2-buildsize     "2.3 MB">
-  <!ENTITY pycairo2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyCairo -->
-  <sect2 id="pycairo2" xreflabel="PyCairo-&pycairo2-version;">
-
-    <title>PyCairo-&pycairo2-version;</title>
-
-    <indexterm zone="pycairo2">
-      <primary sortas="a-PyCairo2">PyCairo2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyCairo for Python2 Module</title>
-
-      <para>
-        This version of
-        PyCairo provides <application>Python2</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycairo2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycairo2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycairo2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycairo2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycairo2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycairo2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cairo"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink>
-          (for tests)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCairo</title>
-
-      <note>
-        <para>
-           This version of PyCairo is only retained for packages such as <xref
-           linkend="gimp"/> which is stuck on Python2 until Gimp-3 is released.
-        </para>
-      </note>
-
-      <para>
-        Install <application>PyCairo</application> for Python2 by
-        running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build</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>python2 setup.py install --optimize=1   &amp;&amp;
-python2 setup.py install_pycairo_header &amp;&amp;
-python2 setup.py install_pkgconfig</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            <!--_cairo.so (python2) and -->
-            _cairo.so
-          </seg>
-          <seg>
-            /usr/include/pycairo,
-            /usr/lib/python&python2-majorver;/site-packages/cairo,
-            /usr/lib/python&python2-majorver;/site-packages/pycairo-&pycairo2-version;-py&python2-majorver;.egg,
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pygdbmi.xml
===================================================================
--- general/prog/python-modules/pygdbmi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygdbmi-download-http "&pymodules-dl;/p/pygdbmi/pygdbmi-&pygdbmi-version;.tar.gz">
-  <!ENTITY pygdbmi-download-ftp  " ">
-  <!ENTITY pygdbmi-md5sum        "&pygdbmi-md5sum;">
-  <!ENTITY pygdbmi-size          "28 KB">
-  <!ENTITY pygdbmi-buildsize     "280 MB">
-  <!ENTITY pygdbmi-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin pygdbmi -->
-  <sect2 id="pygdbmi" xreflabel="pygdbmi-&pygdbmi-version;">
-
-    <title>pygdbmi-&pygdbmi-version;</title>
-
-    <indexterm zone="pygdbmi">
-      <primary sortas="a-pygdbmi">pygdbmi</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to pygdbmi Module</title>
-
-      <para>
-        GDB/MI is a line based machine oriented text interface to GDB and is
-        activated by specifying using the --interpreter command line option
-        (see Mode Options). It is specifically intended to support the
-        development of systems which use the debugger as just one small
-        component of a larger system.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygdbmi-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygdbmi-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygdbmi-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygdbmi-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygdbmi-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygdbmi-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of pygdbmi</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pygdbmi</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pygdbmi-&pygdbmi-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pygments.xml
===================================================================
--- general/prog/python-modules/pygments.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygments-download-http
-           "https://files.pythonhosted.org/packages/source/P/Pygments/pygments-&pygments-version;.tar.gz">
-  <!ENTITY pygments-download-ftp " ">
-  <!ENTITY pygments-md5sum        "&pygments-md5sum;">
-  <!ENTITY pygments-size          "4.7 MB">
-  <!ENTITY pygments-buildsize     "52 MB">
-  <!ENTITY pygments-time          "less than 0.1 SBU">
-]>
-
- <!-- Begin Pygments -->
-  <sect2 id="pygments" xreflabel="Pygments-&pygments-version;">
-
-    <title>Pygments-&pygments-version;</title>
-
-    <indexterm zone="pygments">
-      <primary sortas="a-Pygments">Pygments</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pygments Module</title>
-
-      <para>
-        <application>Pygments</application> is a general syntax highlighter
-        written in <application>Python</application>, for more than 300
-        languages.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygments-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygments-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygments-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygments-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygments-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygments-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect3">Pygments Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatchling"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pygments</title>
-
-      <para>
-        Build the <application>Python 3</application> module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the package run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; Pygments</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pygmentize
-           </seg>
-          <seg>
-            None
-           </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pygments and
-            /usr/lib/python&python3-majorver;/site-packages/Pygments-&pygments-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pygmentize">
-          <term><command>pygmentize</command></term>
-          <listitem>
-            <para>
-              highlights an input file and writes the result to an output file
-            </para>
-            <indexterm zone="pygments pygmentize">
-              <primary sortas="b-pygmentize">pygmentize</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pygobject2.xml
===================================================================
--- general/prog/python-modules/pygobject2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygobject2-download-http
-           "&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
-  <!ENTITY pygobject2-download-ftp  " ">
-  <!ENTITY pygobject2-md5sum        "ae48b60c690c4aa894e69e0c97802745">
-  <!ENTITY pygobject2-size          "728 KB">
-  <!ENTITY pygobject2-buildsize     "17 MB">
-  <!ENTITY pygobject2-time          "0.1 SBU">
-]>
-
-   <!-- Begin PyGObject2 -->
-  <sect2 id="pygobject2" xreflabel="PyGObject-&pygobject2-version;">
-
-    <title>PyGObject-&pygobject2-version;</title>
-
-    <indexterm zone="pygobject2">
-      <primary sortas="a-PyGObject">PyGObject</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGObject Module</title>
-
-      <para>
-        PyGObject-&pygobject2-version; provides
-        <application>Python 2</application> bindings to the GObject class from
-        <application>GLib</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygobject2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygobject2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygobject2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygobject2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygobject2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygobject2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-    <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/pygobject-&pygobject2-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-      <bridgehead renderas="sect4">PyGObject Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="glib2"/>,
-        <xref linkend="pycairo2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="libxslt"/> (to Build Documentation)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGObject</title>
-
-      <para>
-        Install <application>PyGObject</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not have a working 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="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <option>--disable-introspection</option>: Add this switch if you have
-        installed <xref linkend='glib2'/> without GObject Introspection.
-        Note that it conflicts with <xref linkend="pygobject3"/>.
-      </para>
-
-      <para>
-        <option>--disable-docs</option>: This option disables the rebuilding of
-        the html documentation if <xref linkend="libxslt"/> is installed.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>pygobject-codegen-2.0</seg>
-          <seg>
-            libpyglib-2.0-python.so,
-            _gio.so,
-            unix.so,
-            _glib.so and
-            _gobject.so.
-          </seg>
-          <seg>
-            /usr/include/pygtk-2.0,
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
-            /usr/share/gtk-doc/html/pygobject and
-            /usr/share/pygobject/2.0
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pygobject3.xml
===================================================================
--- general/prog/python-modules/pygobject3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygobject3-download-http
-           "&gnome-download-http;/pygobject/&gnome-minor-48;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-download-ftp  " ">
-  <!ENTITY pygobject3-md5sum        "fe1cb825adc8a49d1629b97b7d26dffc">
-  <!ENTITY pygobject3-size          "544 KB">
-  <!ENTITY pygobject3-buildsize     "7.0 MB (add 2.5 MB for tests)">
-  <!ENTITY pygobject3-time          "0.2 SBU (with tests)">
-]>
-
- <!-- Begin PyGObject3 -->
-  <sect2 id="pygobject3" xreflabel="PyGObject-&pygobject3-version;">
-
-    <title>PyGObject-&pygobject3-version;</title>
-
-    <indexterm zone="pygobject3">
-      <primary sortas="a-PyGObject3">PyGObject3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGObject3 Module</title>
-
-      <para>
-        <application>PyGObject3</application> provides
-        <application>Python</application> bindings to the GObject
-        class from <application>GLib</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygobject3-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygobject3-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygobject3-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygobject3-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygobject3-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygobject3-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyGObject3 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        &gobject-introspection; and
-        <xref linkend="pycairo"/>
-          (<application>Python 3</application> module)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for the tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="gtk4"/>,
-        <ulink url="https://pypi.python.org/pypi/pep8">pep8</ulink>,
-        <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGObject3</title>
-
-    <para>
-      First, remove two faulty tests:
-    </para>
-
-<screen><userinput remap="pre">mv -v tests/test_gdbus.py{,.nouse} &amp;&amp;
-mv -v tests/test_overrides_gtk.py{,.nouse}</userinput></screen>
-
-    <para>
-      Install <application>pygobject3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      An already active graphical session with a bus address is necessary
-      to run the tests. <!--One test, <filename>tests/test_gdbus.py</filename>,
-      is known to fail.--> Another round of tests may report ERROR if
-      <xref linkend="gtk4" role="nodep"/> is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-           </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.&python3-lib-suffix;.so
-           </seg>
-          <seg>
-            /usr/include/pygobject-3.0 and
-            /usr/lib/python&python3-majorver;/site-packages/{gi,pygtkcompat}
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pygtk.xml
===================================================================
--- general/prog/python-modules/pygtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygtk-download-http
-           "&gnome-download-http;/pygtk/2.24/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-download-ftp  " ">
-  <!ENTITY pygtk-md5sum        "a1051d5794fd7696d3c1af6422d17a49">
-  <!ENTITY pygtk-size          "2.2 MB">
-  <!ENTITY pygtk-buildsize     "83 MB">
-  <!ENTITY pygtk-time          "0.7 SBU">
-]>
-
-   <!-- Begin PyGTK -->
-  <sect2 id="pygtk" xreflabel="PyGTK-&pygtk-version;">
-
-    <title>PyGTK-&pygtk-version;</title>
-
-    <indexterm zone="pygtk">
-      <primary sortas="a-PyGTK">PyGTK</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGTK Module</title>
-
-      <para>
-        PyGTK lets you to easily create programs with a graphical user interface
-        using the <application>Python</application> programming language.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygtk-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygtk-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygtk-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygtk-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygtk-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygtk-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyGTK Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (atk module)</bridgehead>
-      <para role="required">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (pango module)</bridgehead>
-      <para role="required">
-        <xref linkend="pango"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="pango"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="gtk2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="libglade"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="numpy"/>
-        <!--<ulink url="https://www.numpy.org/">NumPy</ulink>-->
-      </para>
-
-      <bridgehead renderas="sect5">Optional (to Build Documentation)</bridgehead>
-      <para role="optional">
-        <xref linkend="libxslt"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGTK</title>
-
-      <para>
-         First, adapt PyGTK to changes in Pango by removing undefined
-         APIs:
-      </para>
-
-<screen><userinput remap="pre">sed -i '1394,1402 d' pango.defs</userinput></screen>
-
-      <para>
-        Install <application>PyGTK</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        The tests must be run from an active X display. If this is so, issue:
-        <command>make check</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-docs</parameter>: This option enables rebuilding the
-        html documentation if <xref linkend="libxslt"/> is installed.
-      </para>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>pygtk-codegen-2.0 and pygtk-demo.</seg>
-          <seg>
-            atk.so,
-            _gtk.so,
-            glade.so,
-            gtkunixprint.so,
-            pango.so and
-            pangocairo.so.
-          </seg>
-          <seg>
-            /usr/include/pygtk-2.0,
-            /usr/lib/pygtk,
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0,
-            /usr/share/gtk-doc/html/pygtk and
-            /usr/share/pygtk.
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pygtk-codegen-2.0">
-          <term><command>pygtk-codegen-2.0</command></term>
-          <listitem>
-            <para>
-              is a wrapper script to run the <application>PyGTK</application>
-              codegen module
-            </para>
-            <indexterm zone="pygtk pygtk-codegen-2.0">
-              <primary sortas="b-pygtk-codegen-2.0">pygtk-codegen-2.0</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="pygtk-demo">
-          <term><command>pygtk-demo</command></term>
-          <listitem>
-            <para>
-              is a Python wrapper to run the <application>PyGTK</application>
-              demo program
-            </para>
-            <indexterm zone="pygtk pygtk-demo">
-              <primary sortas="b-pygtk-demo">pygtk-demo</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pyparsing.xml
===================================================================
--- general/prog/python-modules/pyparsing.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pyparsing-download-http "https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-&pyparsing-version;.tar.gz">
-  <!ENTITY pyparsing-download-ftp  " ">
-  <!ENTITY pyparsing-md5sum        "&pyparsing-md5sum;">
-  <!ENTITY pyparsing-size          "872 KB">
-  <!ENTITY pyparsing-buildsize     "3.3 MB (add 27 MB for tests)">
-  <!ENTITY pyparsing-time          "less than 0.1 SBU (0.3 SBU for tests)">
-]>
-
-  <sect2 id="pyparsing" xreflabel="pyparsing-&pyparsing-version;">
-
-    <title>pyparsing-&pyparsing-version;</title>
-
-    <indexterm zone="pyparsing">
-      <primary sortas="a-pyparsing">pyparsing</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to pyparsing Module</title>
-
-      <para>
-        The <application>pyparsing</application> module is an alternative
-        approach to creating and executing simple grammars, vs. the
-        traditional lex/yacc approach, or the use of regular expressions.
-        It provides a library of classes that client code uses to construct
-        the grammar directly in Python code.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyparsing-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyparsing-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyparsing-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyparsing-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyparsing-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyparsing-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">pyparsing Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://pypi.org/project/railroad-diagrams/">
-          railroad-diagrams
-        </ulink> (also needed for tests)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of pyparsing</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pyparsing</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is
-      installed, but the other optional dependency is not, the installation
-      can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install railroad-diagrams                 &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyparsing and
-            /usr/lib/python&python3-majorver;/site-packages/pyparsing-&pyparsing-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pyserial.xml
===================================================================
--- general/prog/python-modules/pyserial.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pyserial-download-http "https://files.pythonhosted.org/packages/source/p/pyserial/pyserial-&pyserial-version;.tar.gz">
-  <!ENTITY pyserial-download-ftp  " ">
-  <!ENTITY pyserial-md5sum        "&pyserial-md5sum;">
-  <!ENTITY pyserial-size          "156 KB">
-  <!ENTITY pyserial-buildsize     "2.1 MB (add 0.2 MB for tests)">
-  <!ENTITY pyserial-time          "less than 0.1 SBU">
-]>
-
-  <!-- capitalization as in https://pythonhosted.org/pyserial/ -->
-  <sect2 id="pyserial" xreflabel="pySerial-&pyserial-version;">
-
-    <title>pySerial-&pyserial-version;</title>
-
-    <indexterm zone="pyserial">
-      <primary sortas="a-pyserial">pyserial</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to pySerial Module</title>
-
-      <para>
-        The <application>pySerial</application> module encapsulates
-        access to the serial port.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyserial-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyserial-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyserial-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyserial-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyserial-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyserial-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">pySerial Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of pySerial</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pyserial</userinput></screen>
-
-      <para>
-        To test the installation issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pyserial-miniterm and pyserial-ports
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyserial-&pyserial-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/serial
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-        <varlistentry id="pyserial-miniterm">
-          <term><command>pyserial-miniterm</command></term>
-          <listitem>
-            <para>
-              is a console application that provides a small terminal application.
-              It may inherit terminal features from the terminal in which it is
-              run.
-            </para>
-            <indexterm zone="pyserial pyserial-miniterm">
-              <primary sortas="b-pyserial-miniterm">pyserial-miniterm</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-        <varlistentry id="pyserial-ports">
-          <term><command>pyserial-ports</command></term>
-          <listitem>
-            <para>
-              lists available ports.
-            </para>
-            <indexterm zone="pyserial pyserial-ports">
-              <primary sortas="b-pyserial-ports">pyserial-ports</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pytest.xml
===================================================================
--- general/prog/python-modules/pytest.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pytest-download-http "https://files.pythonhosted.org/packages/source/p/pytest/pytest-&pytest-version;.tar.gz">
-  <!ENTITY pytest-download-ftp  " ">
-  <!ENTITY pytest-md5sum        "&pytest-md5sum;">
-  <!ENTITY pytest-size          "1.3 MB">
-  <!ENTITY pytest-buildsize     "42 MB (with tests)">
-  <!ENTITY pytest-time          "1.3 SBU (with tests)">
-]>
-
-  <sect2 id="pytest" xreflabel="pytest-&pytest-version;">
-
-    <title>Pytest-&pytest-version;</title>
-
-    <indexterm zone="pytest">
-      <primary sortas="a-pytest">pytest</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pytest Module</title>
-
-      <para>
-        The <application>Pytest</application> framework makes it easy to
-        write small, readable tests, and can scale to support complex
-        functional testing for applications and libraries.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pytest-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pytest-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pytest-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pytest-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pytest-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pytest-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pytest Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="iniconfig"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pluggy"/>, and
-        <xref linkend="py"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pygments"/>,
-        <xref linkend="requests"/>,
-        <ulink url="https://pypi.org/project/argcomplete/">argcomplete</ulink>,
-        <ulink url="https://pypi.org/project/elementpath/">elementpath</ulink>,
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>,
-        <ulink url="https://pypi.org/project/mock/">mock</ulink>,
-        <ulink url="https://pypi.org/project/nose/">nose</ulink>,
-        <ulink url="https://pypi.org/project/sortedcontainers/">sortedcontainers</ulink>, and
-        <ulink url="https://pypi.org/project/xmlschema/">xmlschema</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pytest</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pytest</userinput></screen>
-
-      <para>
-        The installation can be tested with the following commands:
-      </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest[testing]                   &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-<!-- With 7.4.0 and the toolchain from LFS 12.0, there are now 11 XFAILS
-      <para>
-        A few tests (11 of 3429) are known to fail.
-      </para>
--->
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pytest and py.test (different files but with same content)
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/_pytest,
-            /usr/lib/python&python3-majorver;/site-packages/pytest, and
-            /usr/lib/python&python3-majorver;/site-packages/pytest-&pytest-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pytest-prog">
-          <term><command>pytest</command></term>
-          <listitem>
-            <para>
-              sets up, manages, and/or runs test in python module source
-              directories
-            </para>
-            <indexterm zone="pytest pytest-prog">
-              <primary sortas="b-pytest-prog">pytest</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/python-dbusmock.xml
===================================================================
--- general/prog/python-modules/python-dbusmock.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbusmock-download-http "https://files.pythonhosted.org/packages/source/p/python-dbusmock/python-dbusmock-&dbusmock-version;.tar.gz">
-  <!ENTITY dbusmock-download-ftp  " ">
-  <!ENTITY dbusmock-md5sum        "3c2c46611ec87913d0426e197f76d96c">
-  <!ENTITY dbusmock-size          "100 KB">
-  <!ENTITY dbusmock-buildsize     "1.0 MB (with tests)">
-  <!ENTITY dbusmock-time          "less than 0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-  <!-- Begin dbusmock -->
-  <sect2 id="python-dbusmock" xreflabel="dbusmock-&dbusmock-version;">
-
-    <title>dbusmock-&dbusmock-version;</title>
-
-    <indexterm zone="python-dbusmock">
-      <primary sortas="a-dbusmock">dbusmock</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to dbusmock</title>
-
-      <para>
-        <application>dbusmock</application> is a Python library
-        useful for writing tests for software which talks to D-Bus services.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbusmock-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbusmock-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &dbusmock-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbusmock-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbusmock-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbusmock-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">dbusmock Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus-python"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> (required to run the test suite),
-        <xref linkend="pygobject3"/> (required to run the test suite),
-        <xref linkend="bluez"/> (optional for the test suite), and
-        <xref linkend="upower"/> (optional for the test suite; if not
-        installed one test will fail)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of dbusmock</title>
-
-      <para>
-        Build the package with:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the package run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; python-dbusmock</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>LC_ALL=C pytest</command>
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/dbusmock and
-            /usr/lib/python&python3-majorver;/site-packages/python_dbusmock-&dbusmock-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pyxdg.xml
===================================================================
--- general/prog/python-modules/pyxdg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pyxdg-download-http
-           "https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-&pyxdg-version;.tar.gz">
-  <!ENTITY pyxdg-download-ftp  " ">
-  <!ENTITY pyxdg-md5sum        "d9a1d04fe60c956f5e3b9de3b4ef4722">
-  <!ENTITY pyxdg-size          "76 KB">
-  <!ENTITY pyxdg-buildsize     "808 KB">
-  <!ENTITY pyxdg-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyXDG -->
-  <sect2 id="pyxdg" xreflabel="PyXDG-&pyxdg-version;">
-
-    <title>PyXDG-&pyxdg-version;</title>
-
-    <indexterm zone="pyxdg">
-      <primary sortas="a-PyXDG">PyXDG</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyXDG Module</title>
-
-      <para>
-        <application>PyXDG</application> is a <application>Python</application>
-        library to access freedesktop.org standards.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyxdg-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyxdg-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyxdg-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyxdg-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyxdg-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyxdg-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">PyXDG Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="python2"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyXDG</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-       <para>
-         Install the module as the &root; user:
-       </para>
-
-<screen role='root'><userinput>&install-wheel; pyxdg</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/xdg and
-            /usr/lib/python&python3-majorver;/site-packages/pyxdg-&pyxdg-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/pyyaml.xml
===================================================================
--- general/prog/python-modules/pyyaml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 PyYAML-download-http "https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-&PyYAML-version;.tar.gz">
-  <!ENTITY PyYAML-download-ftp  " ">
-  <!ENTITY PyYAML-md5sum        "&PyYAML-md5sum;">
-  <!ENTITY PyYAML-size          "124 KB">
-  <!ENTITY PyYAML-buildsize     "8.0 MB">
-  <!ENTITY PyYAML-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyYAML -->
-  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
-
-    <title>PyYAML-&PyYAML-version;</title>
-
-    <indexterm zone="PyYAML">
-      <primary sortas="a-PyYAML">PyYAML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyYAML Module</title>
-
-      <para>
-        <application>PyYAML</application> is a <application>Python</application>
-        module that implements the next generation YAML parser and emitter.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &PyYAML-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &PyYAML-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &PyYAML-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &PyYAML-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/> and
-        <xref linkend="libyaml"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyYAML</title>
-
-      <para>
-        Build PyYAML with the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        Now, install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; PyYAML</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/PyYAML-&yaml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/recommonmark.xml
===================================================================
--- general/prog/python-modules/recommonmark.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 recommonmark-download-http "https://files.pythonhosted.org/packages/source/r/recommonmark/recommonmark-&recommonmark-version;.tar.gz">
-  <!ENTITY recommonmark-download-ftp  " ">
-  <!ENTITY recommonmark-md5sum        "&recommonmark-md5sum;">
-  <!ENTITY recommonmark-size          "34 KB">
-  <!ENTITY recommonmark-buildsize     "680 KB (with tests)">
-  <!ENTITY recommonmark-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="recommonmark" xreflabel="recommonmark-&recommonmark-version;">
-
-    <title>Recommonmark-&recommonmark-version;</title>
-
-    <indexterm zone="recommonmark">
-      <primary sortas="a-recommonmark">recommonmark</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Recommonmark Module</title>
-
-      <para>
-        <application>Recommonmark</application> is a docutils-compatibility
-        bridge to CommonMark. It allows writing CommonMark inside of Docutils
-        and Sphinx projects. <application>Recommonmark</application> is now
-        deprecated in favor of
-        <ulink url="https://pypi.org/project/myst-parser/">MyST-Parser</ulink>.
-        Unfortunately, <xref linkend="llvm"/> still depends on this module.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&recommonmark-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&recommonmark-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &recommonmark-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &recommonmark-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &recommonmark-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &recommonmark-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Recommonmark Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="commonmark"/> and
-        <xref linkend="sphinx"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Recommonmark</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; recommonmark</userinput></screen>
-
-    <para>
-      <application>Recommonmark</application> is now deprecated in favor of
-      <ulink url="https://pypi.org/project/myst-parser/">MyST-Parser</ulink>.
-      For this reason, a lot of tests
-      have to be disabled because they do not pass with recent versions of
-      <application>Sphinx</application>. The installation can be partially
-      tested with the following command:
-    </para>
-
-    <screen remap="test"><userinput>pytest -k 'not (test_integration or test_code or test_headings or test_image or test_links or test_lists)'</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            cm2html, cm2latex, cm2man, cm2pseudoxml, cm2xetex, and cm2xml
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/recommonmark and
-            /usr/lib/python&python3-majorver;/site-packages/recommonmark-&recommonmark-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cm2html">
-          <term><command>cm2html</command></term>
-          <listitem>
-            <para>
-              generates a html document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2html">
-              <primary sortas="b-cm2html">cm2html</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2latex">
-          <term><command>cm2latex</command></term>
-          <listitem>
-            <para>
-              generates a latex document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2latex">
-              <primary sortas="b-cm2latex">cm2latex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2man">
-          <term><command>cm2man</command></term>
-          <listitem>
-            <para>
-              generates a manpage from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2man">
-              <primary sortas="b-cm2man">cm2man</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2pseudoxml">
-          <term><command>cm2pseudoxml</command></term>
-          <listitem>
-            <para>
-              generates a pseudo-XML document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2pseudoxml">
-              <primary sortas="b-cm2pseudoxml">cm2pseudoxml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2xetex">
-          <term><command>cm2xetex</command></term>
-          <listitem>
-            <para>
-              generates a xetex document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2xetex">
-              <primary sortas="b-cm2xetex">cm2xetex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2xml">
-          <term><command>cm2xml</command></term>
-          <listitem>
-            <para>
-              generates an XML document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2xml">
-              <primary sortas="b-cm2xml">cm2xml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/requests.xml
===================================================================
--- general/prog/python-modules/requests.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 requests-download-http "https://files.pythonhosted.org/packages/source/r/requests/requests-&requests-version;.tar.gz">
-  <!ENTITY requests-download-ftp  " ">
-  <!ENTITY requests-md5sum        "&requests-md5sum;">
-  <!ENTITY requests-size          "108 KB">
-  <!ENTITY requests-buildsize     "1.4 MB (add 127 MB for tests)">
-  <!ENTITY requests-time          "less than 0.1 SBU (0.7 SBU for tests)">
-]>
-
-  <sect2 id="requests" xreflabel="requests-&requests-version;">
-
-    <title>Requests-&requests-version;</title>
-
-    <indexterm zone="requests">
-      <primary sortas="a-requests">requests</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Requests Module</title>
-
-      <para>
-        The <application>Requests</application> package is an elegant and
-        simple HTTP library for Python, built for human beings. It allows
-        sending HTTP/1.1 requests extremely easily.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&requests-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&requests-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &requests-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &requests-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &requests-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &requests-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Recommended patch: <ulink
-            url="&patch-root;/requests-&requests-version;-use_system_certs-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Requests Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="charset-normalizer"/>,
-        <xref linkend="idna"/>, and
-        <xref linkend="urllib3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="make-ca"/>, with
-        <xref linkend="p11-kit"/> (both needed to use system https: certificates,
-        removing an unnecessary dependency on the <application>Certifi</application>
-        module).
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://pypi.org/project/PySocks/">PySocks</ulink> (also needed for testing)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/Flask/">Flask</ulink>&lt;2,
-        <ulink url="https://pypi.org/project/httpbin/">httpbin</ulink>,
-        <ulink url="https://pypi.org/project/MarkupSafe/">MarkupSafe</ulink>&lt;2.1,
-        <ulink url="https://pypi.org/project/pytest-mock/">pytest-mock</ulink>,
-        <ulink url="https://pypi.org/project/pytest-httpbin/">pytest-httpbin</ulink>,
-        <ulink url="https://pypi.org/project/sphinx/">sphinx</ulink>&lt;5,
-        <ulink url="https://pypi.org/project/trustme/">trustme</ulink>, and
-        <ulink url="https://pypi.org/project/Werkzeug/">Werkzeug</ulink>&lt;2
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Requests</title>
-
-    <para>
-      First apply a patch so that the same environment variable already used to
-      point to system certificates in <application>Python3</application> following
-      the installation of <application>make-ca</application> can also be used by
-      this module:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../requests-&requests-version;-use_system_certs-1.patch</userinput></screen>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; requests</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install --force-reinstall sphinx\&lt;5       &amp;&amp;
-pip3 install pytest-mock    \
-             werkzeug\&lt;2    \
-             flask\&lt;2       \
-             pytest-httpbin \
-             pysocks        \
-             trustme                           &amp;&amp;
-pip3 install --force-reinstall Markupsafe\&lt;2.1 &amp;&amp;
-python3 /usr/bin/pytest tests
-deactivate</userinput></screen>
-
-    <note>
-      <para>
-        See <xref linkend="make-ca"/> for how to set the environment variable,
-        and for how local copies of the Certifi and Requests modules installed
-        in a virtual environment <emphasis>will</emphasis> override the system
-        certificates.
-      </para>
-    </note>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/requests and
-            /usr/lib/python&python3-majorver;/site-packages/requests-&requests-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/scour.xml
===================================================================
--- general/prog/python-modules/scour.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 scour-download-http "https://github.com/scour-project/scour/archive/v0.38.2/scour-&scour-version;.tar.gz">
-  <!ENTITY scour-download-ftp  " ">
-  <!ENTITY scour-md5sum        "ae30f52602802f8c7df3a32e1f72b325">
-  <!ENTITY scour-size          "100 KB">
-  <!ENTITY scour-buildsize     "1.3 MB">
-  <!ENTITY scour-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin scour -->
-  <sect2 id="scour" xreflabel="Scour-&scour-version;">
-
-    <title>Scour-&scour-version;</title>
-
-    <indexterm zone="scour">
-      <primary sortas="a-scour">scour</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Scour Module</title>
-
-      <para>
-        <application>Scour</application> is an SVG (Scalable Vector Graphics)
-        optimizer/cleaner that reduces their size by optimizing structure and
-        removing unnecessary data.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&scour-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&scour-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &scour-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &scour-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &scour-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &scour-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="six"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of scour</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, run the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; scour</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            scour
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/scour and
-            /usr/lib/python&python3-majorver;/site-packages/scour-&scour-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scour-prog">
-        <term><command>scour</command></term>
-        <listitem>
-          <para>
-            is a program to optimize and clean SVG files
-          </para>
-          <indexterm zone="scour scour-prog">
-            <primary sortas="b-scour">scour</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/sentry-sdk.xml
===================================================================
--- general/prog/python-modules/sentry-sdk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sentry-sdk-download-http "https://files.pythonhosted.org/packages/source/s/sentry-sdk/sentry-sdk-&sentry-sdk-version;.tar.gz">
-  <!ENTITY sentry-sdk-download-ftp  " ">
-  <!ENTITY sentry-sdk-md5sum        "&sentry-sdk-md5sum;">
-  <!ENTITY sentry-sdk-size          "240 KB">
-  <!ENTITY sentry-sdk-buildsize     "2.8 KB">
-  <!ENTITY sentry-sdk-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="sentry-sdk" xreflabel="sentry-sdk-&sentry-sdk-version;">
-
-    <title>sentry-sdk-&sentry-sdk-version;</title>
-
-    <indexterm zone="sentry-sdk">
-      <primary sortas="a-sentry-sdk">sentry-sdk</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to sentry-sdk Module</title>
-
-      <para>
-        The <application>sentry-sdk</application> module is the official Python 
-        SDK for Sentry.io.  <!-- I know.  This doesn't say much, but I couldn't
-        find a better short description. - bdubbs -->
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sentry-sdk-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sentry-sdk-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sentry-sdk-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sentry-sdk-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sentry-sdk-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sentry-sdk-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">sentry-sdk Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="certifi"/> and
-        <xref linkend="urllib3"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of sentry-sdk</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; sentry-sdk</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sentry_sdk-&sentry-sdk-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/sentry_sdk
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/six.xml
===================================================================
--- general/prog/python-modules/six.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 six-download-http "&pymodules-dl;/s/six/six-&six-version;.tar.gz">
-  <!ENTITY six-download-ftp  " ">
-  <!ENTITY six-md5sum        "&six-md5sum;">
-  <!ENTITY six-size          "36 KB">
-  <!ENTITY six-buildsize     "376 KB">
-  <!ENTITY six-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin six -->
-  <sect2 id="six" xreflabel="six-&six-version;">
-
-    <title>six-&six-version;</title>
-
-    <indexterm zone="six">
-      <primary sortas="a-six">six</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Six Module</title>
-
-      <para>
-        Six is a Python 2 to 3 compatibility library.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&six-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&six-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &six-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &six-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &six-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &six-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Six Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended Dependencies</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Six</title>
-<!--
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        Install <application>six</application> for Python 2 and Python 3
-        by running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
--->
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <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>python2 setup.py install - -optimize=1 &amp;&amp;
-python3 setup.py install - -optimize=1</userinput></screen>
--->
-
-<screen role="root"><userinput>&install-wheel; six</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/six-&six-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/sphinx.xml
===================================================================
--- general/prog/python-modules/sphinx.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sphinx-download-http "https://files.pythonhosted.org/packages/source/s/sphinx/sphinx-&sphinx-version;.tar.gz">
-  <!ENTITY sphinx-download-ftp  " ">
-  <!ENTITY sphinx-md5sum        "18971ebdd6ec1b7788ff0898682fe0da">
-  <!ENTITY sphinx-size          "6.7 MB">
-  <!ENTITY sphinx-buildsize     "45 MB (add 35 MB for tests)">
-  <!ENTITY sphinx-time          "less than 0.1 SBU (1.3 SBU for tests)">
-]>
-
-  <sect2 id="sphinx" xreflabel="sphinx-&sphinx-version;">
-
-    <title>Sphinx-&sphinx-version;</title>
-
-    <indexterm zone="sphinx">
-      <primary sortas="a-sphinx">sphinx</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinx Module</title>
-
-      <para>
-        The <application>Sphinx</application> package is a set of tools
-        for translating some structured text formats into pretty documentation
-        in various formats.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sphinx-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sphinx-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sphinx-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sphinx-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sphinx-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sphinx-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinx Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="alabaster"/>,
-        <xref linkend="babel"/>,
-        <xref linkend="docutils"/>,
-        <xref linkend="imagesize"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pygments"/>,
-        <xref linkend="requests"/>,
-        <xref linkend="snowballstemmer"/>,
-        <xref linkend="sc-applehelp"/>,
-        <xref linkend="sc-devhelp"/>,
-        <xref linkend="sc-htmlhelp"/>,
-        <xref linkend="sc-jsmath"/>,
-        <xref linkend="sc-qthelp"/>, and
-        <xref linkend="sc-serializinghtml"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="cython"/>,
-        <xref linkend="html5lib"/>,
-        <xref linkend="pytest"/>,
-        <xref linkend="texlive"/>, and
-        <ulink url="https://pypi.org/project/filelock/">filelock</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinx</title>
-
-    <para>First fix a problem with docutils-0.21.1:</para>
-
-<screen><userinput>sed -i 's/0.21/0.22/' pyproject.toml</userinput></screen>
-
-    <para>Build the module:</para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinx</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="cython"/> and <xref linkend="pytest"/> are
-      installed, but the other optional dependencies are not, the installation
-      can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install filelock                          &amp;&amp;
-python3 -m pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-<!-- No failure in 7.0.1 [pierre]
-     7.1.0: 4 failed, 1896 passed, 10 skipped in 108.14s (0:01:48)
-     test_imgmath_png, test_imgmath_svg, test_imgmath_svg_embed, test_imgmath_numfig_html
-     7.2.5: 2051 passed, 11 skipped, 4 warnings [pierre]
-     7.2.6:i 2052 passed, 10 skipped, 6 warnings [pierre]
--->
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            sphinx-apidoc, sphinx-autogen, sphinx-build, and sphinx-quickstart
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinx and
-            /usr/lib/python&python3-majorver;/site-packages/sphinx-&sphinx-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="sphinx-apidoc">
-          <term><command>sphinx-apidoc</command></term>
-          <listitem>
-            <para>
-              creates an reST file from python modules and packages
-            </para>
-            <indexterm zone="sphinx sphinx-apidoc">
-              <primary sortas="b-sphinx-apidoc">sphinx-apidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sphinx-autogen">
-          <term><command>sphinx-autogen</command></term>
-          <listitem>
-            <para>
-              generates ReStructuredText from special directives contained
-              in given input files
-            </para>
-            <indexterm zone="sphinx sphinx-autogen">
-              <primary sortas="b-sphinx-autogen">sphinx-autogen</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sphinx-build">
-          <term><command>sphinx-build</command></term>
-          <listitem>
-            <para>
-              generates documentation in various formats from ReStructuredText
-              source files
-            </para>
-            <indexterm zone="sphinx sphinx-build">
-              <primary sortas="b-sphinx-build">sphinx-build</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sphinx-quickstart">
-          <term><command>sphinx-quickstart</command></term>
-          <listitem>
-            <para>
-              generates required files for a sphinx project
-            </para>
-            <indexterm zone="sphinx sphinx-quickstart">
-              <primary sortas="b-sphinx-quickstart">sphinx-quickstart</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: neral/prog/python-modules/sphinx_rtd_theme.xml
===================================================================
--- general/prog/python-modules/sphinx_rtd_theme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sphinx_rtd_theme-download-http "https://files.pythonhosted.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-&sphinx_rtd_theme-version;.tar.gz">
-  <!ENTITY sphinx_rtd_theme-download-ftp  " ">
-  <!ENTITY sphinx_rtd_theme-md5sum        "&sphinx_rtd_theme-md5sum;">
-  <!ENTITY sphinx_rtd_theme-size          "2.7 MB">
-  <!ENTITY sphinx_rtd_theme-buildsize     "36 MB (with tests)">
-  <!ENTITY sphinx_rtd_theme-time          "0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sphinx_rtd_theme" xreflabel="sphinx_rtd_theme-&sphinx_rtd_theme-version;">
-
-    <title>Sphinx_rtd_theme-&sphinx_rtd_theme-version;</title>
-
-    <indexterm zone="sphinx_rtd_theme">
-      <primary sortas="a-sphinx_rtd_theme">sphinx_rtd_theme</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinx_rtd_theme Module</title>
-
-      <para>
-        The <application>sphinx_rtd_theme</application> module is a Sphinx
-        theme designed to provide a great reader experience for documentation
-        users on both desktop and mobile devices. This theme is used primarily
-        on Read the Docs but can work with any Sphinx project.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sphinx_rtd_theme-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sphinx_rtd_theme-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sphinx_rtd_theme-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sphinx_rtd_theme-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sphinx_rtd_theme-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sphinx_rtd_theme-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinx_rtd_theme Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="sphinx"/> and
-        <xref linkend="sc-jquery"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/readthedocs-sphinx-ext">
-          readthedocs-sphinx-ext
-        </ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinx_rtd_theme</title>
-<!-- Upstream tentative fix: not completely tested, it seems
-     but otherwise we fall into dependency hell
-     Fixed in 2.0.0 -renodr
-      <para>
-        Fix wrong versions for dependencies:
-      </para>
-
-<screen><userinput>sed -e s/0.19/0.21/ \
-    -i setup.cfg</userinput></screen>
--->
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinx_rtd_theme</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is
-      installed, but the other optional dependency is not, the installation
-      can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install readthedocs-sphinx-ext            &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    <para>
-      Several tests return warnings because they use a deprecated sphinx API.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinx_rtd_theme and
-            /usr/lib/python&python3-majorver;/site-packages/sphinx_rtd_theme-&sphinx_rtd_theme-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/prog/python.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="python" xreflabel="python">
+<?dbhtml filename="python.html" dir="general"?>
+<title>python</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: neral/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,356 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 python2-download-http
-     "https://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz">
-  <!ENTITY python2-download-ftp  " ">
-  <!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 python2htmldoc-download-http
-     "https://www.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2">
-]>
-
-<sect1 id="python2" xreflabel="Python-&python2-version;">
-  <?dbhtml filename="python2.html" ?>
-
-
-  <title>Python-&python2-version;</title>
-
-  <indexterm zone="python2">
-    <primary sortas="a-Python2">Python2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python 2</title>
-
-    <para>
-      The <application>Python 2</application> package contains the
-      <application>Python</application> development environment. It is useful
-      for object-oriented programming, writing scripts, prototyping large
-      programs or developing entire applications. This version is for backward
-      compatibility with other dependent packages.
-    </para>
-
-    <note>
-      <para>
-        Python2 has been deprecated by the upstream developers.
-        Support for Python2 was discontinued on January 1st, 2020.
-      </para>
-
-      <para>
-        BLFS is attempting to use Python3 as much as possible, but some
-        packages have not been updated to support Python3.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&python2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &python2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &python2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &python2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <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;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Python 2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> (For an additional module)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (For more additional modules)</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/> and
-      <xref linkend="tk"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Python 2</title>
-
-    <para>
-      First, disable the installation of a script that overwrites a more
-      recent script:
-    </para>
-
-<screen><userinput>sed -i '/2to3/d' ./setup.py</userinput></screen>
-
-    <para>
-      Install <application>Python 2</application> by running the following
-      commands:
-    </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;
-make</userinput></screen>
-
-    <para>
-      If you invoke the tests, they will run through twice.
-      To test the results, issue: <command>make -k test</command>.
-      <!-- https://bugs.python.org/issue46811 -->
-      Several tests are known to fail, including
-      <literal>test_ftplib</literal>,
-      <literal>test_ssl</literal>,
-      <literal>test_urllib2_localnet</literal>,
-      <literal>test_xml_etree</literal>,
-      <literal>test_xml_etree_c</literal>, and
-      <literal>test_minidom</literal>. These failures are due to
-      OpenSSL-3 and Expat-2.4.6.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make altinstall                                &amp;&amp;
-ln -s python2.7        /usr/bin/python2        &amp;&amp;
-ln -s python2.7-config /usr/bin/python2-config &amp;&amp;
-chmod -v 755 /usr/lib/libpython&python2-majorver;.so.1.0</userinput></screen>
-
-    <para>
-      Since <application>Python 2</application> is in maintenance mode, and
-      <application>Python 3</application> is recommended by upstream for
-      development, you probably do not need to install the documentation.
-      However, if you still want to install documentation for both
-      <application>Python</application> versions, be sure to define the
-      <envar>PYTHONDOCS</envar>
-      variable for the version you want to use, each time you need to consult
-      the documentation. If you have downloaded the preformatted documentation
-      from <ulink url="https://docs.python.org/download.html"/>, install it
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python2-version; &amp;&amp;
-
-tar --strip-components=1                     \
-    --no-same-owner                          \
-    --directory /usr/share/doc/python-&python2-version; \
-    -xvf ../python-&python2-version;-docs-html.tar.bz2 &amp;&amp;
-
-find /usr/share/doc/python-&python2-version; -type d -exec chmod 0755 {} \; &amp;&amp;
-find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-system-expat</parameter>: This switch enables linking
-      against system version of <application>Expat</application>.
-    </para>
-
-    <para>
-      <parameter>--with-system-ffi</parameter>: This switch enables linking
-      against system version of <application>libffi</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-unicode=ucs4</parameter>: This switch enables
-      32-bit Unicode support in <application>Python</application>.
-    </para>
-
-    <para>
-      <option>--with-ensurepip=yes</option> : This switch enables building
-      <command>pip</command> and <command>setuptools</command> packaging programs.
-      <command>setuptools</command> is needed for building some Python modules.
-      This switch is not recommended because this version of Python is no longer
-      maintained.
-    </para>
-
-    <para>
-      <option>--with-dbmliborder=bdb:gdbm:ndbm</option>: Use this switch
-      if you want to build <application>Python</application> DBM Module
-      against <application>Berkeley DB</application> instead of
-      <application>GDBM</application>.
-    </para>
-
-    <para>
-      <command>make altinstall</command>: This make target omits some default
-      symbolic links that may interfere with Python 3.
-    </para>
-
-    <para>
-      <command>chmod ...</command>: Fix permissions for libraries to be
-      consistent with other libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Python 2</title>
-
-    <para>
-      In order for <command>python</command> to find the installed
-      documentation, you must add the following environment variable to
-      individual user's or the system's profile:
-    </para>
-
-<screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/python-&python2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pydoc,
-          python2 (symlink),
-          python2-config (symlink),
-          python&python2-majorver;,
-          python&python2-majorver;-config,
-          smtpd.py, and
-          idle
-        </seg>
-        <seg>
-          libpython&python2-majorver;.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/python&python2-majorver; and
-          /usr/share/doc/python-&python2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="idle">
-        <term><command>idle</command></term>
-        <listitem>
-          <para>
-            is a wrapper script that opens a <application>Python</application>
-            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
-          </para>
-          <indexterm zone="python2 idle">
-            <primary sortas="b-idle">idle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pydoc2">
-        <term><command>pydoc</command></term>
-        <listitem>
-          <para>
-            is the <application>Python</application> documentation tool
-          </para>
-          <indexterm zone="python2 pydoc2">
-            <primary sortas="b-pydoc2">pydoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python">
-        <term><command>python2</command></term>
-        <listitem>
-          <para>
-            is an interpreted, interactive, object-oriented programming
-            language
-          </para>
-          <indexterm zone="python2 python">
-            <primary sortas="b-python2">python</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python2-ver">
-        <term><command>python&python2-majorver;</command></term>
-        <listitem>
-          <para>
-            is a version-specific name for the <command>python</command>
-            program
-          </para>
-          <indexterm zone="python2 python2-ver">
-            <primary sortas="b-python&python2-majorver;">python&python2-majorver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smtpd.py">
-        <term><command>smtpd.py</command></term>
-        <listitem>
-          <para>
-            is an SMTP proxy implemented in <application>Python</application>
-          </para>
-          <indexterm zone="python2 smtpd.py">
-            <primary sortas="b-smtpd.py">smtpd.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,436 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 python3-download-http
-           "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
-  <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "8defb33f0c37aa4bdd3a38ba52abde4e">
-  <!ENTITY python3-size          "20 MB">
-  <!ENTITY python3-buildsize     "335 MB (add 57 MB for tests)">
-  <!ENTITY python3-time          "2.2 SBU (add 1.0 SBU for tests; both using parallelism=4)">
-  <!--
-  Note: Size does not reflect docs that were installed in LFS.
-  -->
-  <!ENTITY python3htmldoc-download-http
-  "https://www.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3-docs-md5sum "6025ee63c0ded34aac874f5da8f1a90c" >
-]>
-
-<sect1 id="python3" xreflabel="Python-&python3-version;">
-  <?dbhtml filename="python3.html" ?>
-
-
-  <title>Python-&python3-version;</title>
-
-  <indexterm zone="python3">
-    <primary sortas="a-Python3">Python3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python 3</title>
-
-    <para>
-      The <application>Python 3</application> package contains the
-      <application>Python</application> development environment.
-      This is useful for object-oriented programming, writing scripts,
-      prototyping large programs or developing entire applications.
-    </para>
-
-    <note>
-      <para>
-        <application>Python 3</application> was installed in LFS.
-        The only reason to rebuild it here is if optional modules
-        are needed, or to upgrade this package.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-         If upgrading to a new Python-3 minor version (for example,
-         from Python-3.11.x to Python-3.12.0), you will need to reinstall
-         any Python3 modules you have installed.  You should also
-         reinstall packages that generate Python3 modules
-         including
-         &gobject-introspection;,
-         <xref linkend="libxml2"/>,
-         <xref linkend="opencv"/>,
-         <xref linkend="fontforge"/>,
-         <xref linkend="gnome-tweaks"/>,
-         <xref linkend="samba"/>, and
-         <xref linkend="graphviz"/> (if swig is installed).
-      </para>
-
-      <para>Before you upgrade, you can get a list of modules installed
-        with <command>pip3 list</command>.  The list may be incomplete as
-        some Python modules are not installed with <command>pip3</command>,
-        for example the <literal>cracklib</literal> module installed by
-        <xref role='nodep' linkend='cracklib'/>.  Use <command>ls
-        /usr/lib/python3.<replaceable>minor</replaceable>/site-packages</command>
-        for a comprehensive list.
-      </para>
-
-      <para>
-         The Python modules from LFS will also have to be reinstalled:
-         <ulink url="&lfs-root;/chapter08/flit-core.html">flit-core</ulink>,
-         <ulink url="&lfs-root;/chapter08/wheel.html">wheel</ulink>,
-         <ulink url="&lfs-root;/chapter08/setuptools.html">setuptools</ulink>,
-         <ulink url="&lfs-root;/chapter08/meson.html">meson</ulink>,
-         <ulink url="&lfs-root;/chapter08/markupsafe.html">MarkupSafe</ulink>,
-         and <ulink url="&lfs-root;/chapter08/jinja2.html">Jinja2</ulink>.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&python3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &python3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &python3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &python3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Optional Download</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python3htmldoc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python3-docs-md5sum;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Python 3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> (required if building firefox or thunderbird)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="gdb"/> (required for some tests),
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://www.bytereef.org/mpdecimal/">libmpdec</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>, 
-      <xref linkend="tk"/>, and
-      &berkeley-db;
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/Python3"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Python 3</title>
-
-    <para>
-      Install <application>Python 3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>CXX="/usr/bin/g++"               \
-./configure --prefix=/usr        \
-            --enable-shared      \
-            --with-system-expat  \
-            --enable-optimizations &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!-- I'm getting a test failure with empty $LANG:
-           "test test_curses failed"
-           "_curses.error: inswstr() returned ERR"
-           not sure why, but let's just work around it with LC_ALL.  
-  
-           For Python-3.12.0 all tests pass with only LANG=en_US.utf8.
-           Total tests: run=41,505 skipped=1,199
-           Total test files: run=477/483 skipped=12 resource_denied=6
-
-           For Python-3.12.1 all tests pass
-           Total tests: run=40,624 skipped=1,136
-           Total test files: run=486/489 skipped=24 resource_denied=3
-
-           For Python-3.12.2 all tests pass
-           Total tests: run=41,580 skipped=1,144
-           Total test files: run=485/488 skipped=23 resource_denied=3
-
-           For Python-3.12.3 all tests pass
-           Total tests: run=41,778 skipped=1,155
-           Total test files: run=485/488 skipped=24 resource_denied=3
-      -->
-      To test the result, issue <command>LC_ALL=en_US.UTF-8
-      make test</command>.
-      Some tests may need an Internet connection.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If upgrading and the documentation has been downloaded, optionally install
-      it as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python3-version;/html
-
-tar --strip-components=1  \
-    --no-same-owner       \
-    --no-same-permissions \
-    -C /usr/share/doc/python-&python3-version;/html \
-    -xvf ../python-&python3-version;-docs-html.tar.bz2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command> CXX="/usr/bin/g++" ./configure ...</command>: Avoid an annoying
-      message during configuration.
-    </para>
-
-    <para>
-      <parameter>--with-system-expat</parameter>: This switch enables linking
-      against the system version of <application>Expat</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.
-    </para>
--->
-    <para>
-      <option>--with-dbmliborder=bdb:gdbm:ndbm</option>: Use this switch
-      if you want to build the <application>Python</application> DBM Module
-      against <application>Berkeley DB</application> instead of
-      <application>GDBM</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-optimizations</parameter>: This switch enables
-      stable, but expensive, optimizations.
-    </para>
-
-    <para>
-      <option>--with-lto</option>: This optional switch enables thick Link
-      Time Optimization. Unusually, it creates a much larger <filename
-      class="libraryfile">/usr/lib/python&python3-majorver;/config-&python3-majorver;-&lt;arch&gt;-linux-gnu/libpython&python3-majorver;.a</filename>
-      with a small increase in the time to compile
-      <application>Python</application>. Run-time results do not appear to show
-      any benefit from doing this.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Python 3</title>
-
-    <para>
-      In order for <command>python3</command> to find the installed
-      documentation, create the following version independent symlink:
-    </para>
-
-<screen role="root"><userinput>ln -svfn python-&python3-version; /usr/share/doc/python-3</userinput></screen>
-
-    <para>
-      and add the following environment variable to the individual user's or
-      system's profile:
-    </para>
-
-<screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/python-3/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          2to3 (symlink) and
-          2to3-&python3-majorver;,
-
-          <!--
-          easy_install-&python3-majorver;,
-          -->
-
-          idle3 (symlink) and
-          idle&python3-majorver;,
-
-          pip3 and
-          pip&python3-majorver;,
-
-          pydoc3 (symlink) and
-          pydoc&python3-majorver;,
-
-          python3 (symlink) and
-          python&python3-majorver;, and
-
-          python3-config (symlink) and
-          python&python3-majorver;-config
-        </seg>
-        <seg>
-          libpython&python3-majorver;.so and libpython3.so
-        </seg>
-        <seg>
-          /usr/include/python&python3-majorver;,
-          /usr/lib/python&python3-majorver;, and
-          /usr/share/doc/python-&python3-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-      <!--
-      <varlistentry id="2to3">
-        <term><command>2to3</command></term>
-        <listitem>
-          <para>
-            is designed to assist in the transition between python2 and python3
-            by automatically converting code to be Python3 compatible.
-          </para>
-          <indexterm zone="python3 2to3">
-            <primary sortas="b-2to3">2to3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      Put here for easy use when removing Python2 -->
-      <!--
-      <varlistentry id="easy_install">
-        <term><command>easy_install</command></term>
-        <listitem>
-          <para>
-            is a frontend to pip3 to make it easier to configure python modules
-            through the PIP package manager
-          </para>
-          <indexterm zone="python3 easy_install">
-            <primary sortas="python3 easy_install">easy_install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="idle3">
-        <term><command>idle3</command></term>
-        <listitem>
-          <para>
-            is a wrapper script that opens a <application>Python</application>
-            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
-          </para>
-          <indexterm zone="python3 idle3">
-            <primary sortas="b-idle3">idle3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pydoc3">
-        <term><command>pydoc3</command></term>
-        <listitem>
-          <para>
-            is the <application>Python</application> documentation
-            tool
-          </para>
-          <indexterm zone="python3 pydoc3">
-            <primary sortas="b-pydoc3">pydo3c</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python3-prog">
-        <term><command>python3</command></term>
-        <listitem>
-          <para>
-            is an interpreted, interactive, object-oriented programming
-            language
-          </para>
-          <indexterm zone="python3 python3-prog">
-            <primary sortas="b-python3">python3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python-ver">
-        <term><command>python&python3-majorver;</command></term>
-        <listitem>
-          <para>
-            is a version-specific name for the <command>python</command>
-            program
-          </para>
-          <indexterm zone="python3 python-ver">
-            <primary sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="pyvenv">
-        <term><command>pyvenv</command></term>
-        <listitem>
-          <para>
-            creates virtual <application>Python</application> environments in
-            one or more target directories.
-          </para>
-          <indexterm zone="python3 pyvenv">
-            <primary
-            sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/python311.xml
===================================================================
--- general/prog/python311.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-  <!-- Remove once mozilla programs can use python 3.12 -->
-  <!ENTITY python311-download-http
-           "https://www.python.org/ftp/python/&python311-version;/Python-&python311-version;.tar.xz">
-  <!ENTITY python311-md5sum        "4efe92adf28875c77d3b9b2e8d3bc44a">
-  <!ENTITY python311-size          "19 MB">
-  <!ENTITY python311-buildsize     "301 MB">
-  <!ENTITY python311-time          "1.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="python311" xreflabel="Python-&python311-version;">
-  <?dbhtml filename="python311.html" ?>
-
-  <title>Python-&python311-version;</title>
-
-  <indexterm zone="python311">
-    <primary sortas="a-Python3.11">Python3.11</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python 3.11</title>
-
-    <para>
-      The <application>Python 3.11</application> package contains an
-      older version of the <application>Python</application> development 
-      environment. This is <emphasis role="bold">only</emphasis> needed for 
-      building specific programs in BLFS
-      that have not updated their build systems to support 
-      <xref linkend="python3"/> (e.g <xref linkend="firefox"/>, and
-      <xref linkend="thunderbird"/>, <xref linkend="seamonkey"/>)
-    </para>
-
-    <note>
-      <para>
-        Do NOT install this package if you are not installing one of 
-        the above programs.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python311-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python311-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &python311-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &python311-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &python311-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Python 3.11 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> (required if building firefox or thunderbird)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Python 3.11</title>
-
-    <para>
-      Install <application>Python 3.11</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>CXX="/usr/bin/g++"                     \
-./configure --prefix=/opt/python3.11   \
-            --disable-shared           \
-            --with-system-expat        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Since this package is only used in very limited situations,
-      tests are not recommended.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command> CXX="/usr/bin/g++" ./configure ...</command>: Avoid an annoying
-      message during configuration.
-    </para>
-
-    <para>
-      <parameter>--prefix=/opt/python3.11</parameter>: This installs python
-      3.11 into /opt in order to avoid conflicts with the system version of
-      python, and allows for easy removal/isolation once programs update to
-      python3.12 or later.
-    </para>
-
-    <para>
-      <parameter>--disable-shared</parameter>: This switch disables building
-      shared libraries. Since all the packages that need python-3.11 have built
-      in modules and don't directly link to python, it is safe to turn off
-      shared library support.
-    </para>
-
-    <para>
-      <parameter>--with-system-expat</parameter>: This switch enables linking
-      against the system version of <application>Expat</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          python3.11
-        </seg>
-        <seg>
-          libpython3.11.a
-        </seg>
-        <seg>
-          /opt/python3.11/include/python3.11, and
-          /opt/python3.11/lib/python3.11,
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="python311-ver">
-        <term><command>python3.11</command></term>
-        <listitem>
-          <para>
-            is a version-specific name for the <command>python</command>
-            program
-          </para>
-          <indexterm zone="python311 python311-ver">
-            <primary sortas="b-python3.11">python3.11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,398 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ruby-download-http "https://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
-  <!ENTITY ruby-download-ftp  " ">
-  <!ENTITY ruby-md5sum        "0931370806081135e80f4be24d4b27ed">
-  <!ENTITY ruby-size          "16 MB">
-  <!ENTITY ruby-buildsize     "663 MB (with tests and C API docs)">
-  <!ENTITY ruby-time          "3.4 SBU (using parallelism=4; with tests and C API docs)">
-]>
-
-<sect1 id="ruby" xreflabel="Ruby-&ruby-version;">
-  <?dbhtml filename="ruby.html"?>
-
-
-  <title>Ruby-&ruby-version;</title>
-
-  <indexterm zone="ruby">
-    <primary sortas="a-Ruby">Ruby</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ruby</title>
-
-    <para>
-      The <application>Ruby</application> package contains the
-      <application>Ruby</application> development environment. This
-      is useful for object-oriented scripting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ruby-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ruby-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ruby-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ruby-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ruby-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ruby-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ruby Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libyaml"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="tk"/>,
-      <xref linkend="valgrind"/>, 
-      &berkeley-db; and 
-      <ulink url="https://dtrace.org/about/">DTrace</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ruby</title>
-
-    <para>
-      Install <application>Ruby</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr         \
-            --disable-rpath       \
-            --enable-shared       \
-            --without-valgrind    \
-            --without-baseruby    \
-            ac_cv_func_qsort_r=no \
-            --docdir=/usr/share/doc/ruby-&ruby-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Optionally, build the CAPI documents by running the following
-      commands:
-    </para>
-
-<screen><userinput>make capi</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 -k check</command>.
-      Note that running the test suite with parallel jobs may cause test
-      failures outputted as cryptic <computeroutput>unknown
-      object</computeroutput> messages, resulting a summary falsely claiming
-      <quote>all tests passed</quote>.  If the environment has variables
-      related to proxy settings (<envar>all_proxy</envar>,
-      <envar>ALL_PROXY</envar>, <envar>http_proxy</envar>, and etc.) set,
-      the test suite will bail out early with messages like
-      <computeroutput>net/ftp is not found</computeroutput>. Make sure that you
-      unset these variables for the test suite. There are over 26,000 tests.
-      <!-- https://bugs.ruby-lang.org/issues/20106 -->
-      12 tests are known to fail because of expired certificates in the
-      test data.
-      <!-- https://github.com/ruby/ruby/pull/10616
-           https://github.com/ruby/ruby/commit/dd5e625d7bcb -->
-      Three tests named
-      <literal>TestNetHTTPS#test_session_reuse_but_expire</literal>,
-      <literal>OpenSSL::TestASN1#test_utctime</literal>, and
-      <literal>OpenSSL::TestASN1#test_generalizedtime</literal> are known
-      to fail with OpenSSL-3.3.0 or later.
-      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.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note>
-      <para>
-        If you have Ruby-On-Rails applications installed and did an
-        upgrade of <application>Ruby</application> by installing this
-        package, you might need to run an update there, too
-        (as the &root; user):
-      </para>
-
-<screen role="nodump"><userinput>cd /path/to/web/app
-bundle update rake</userinput></screen>
-
-      <para>
-        and restart the webserver which serves the application.
-      </para>
-
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-rpath</parameter>: This switch disables embedding
-      <filename class='directory'>/usr/lib</filename> as a library search
-      path into the <command>ruby</command> program.  Doing so is not needed
-      (because <filename class='directory'>/usr/lib</filename> is a system
-      library path) and it may cause the test suite running with the system
-      <filename class='libraryfile'>libruby.so</filename> instead of the
-      just built one when Ruby has been installed.
-    </para>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch enables building
-      the <filename class="libraryfile">libruby</filename> shared library.
-    </para>
-
-    <para>
-      <parameter>--without-baseruby</parameter>: This switch prevents using the
-      system <command>ruby</command> if it is already installed. The build
-      system will use the newly built version instead.
-    </para>
-
-    <para>
-      <parameter>ac_cv_func_qsort_r=no</parameter>: This switch prevents
-      using the <function>qsort_r</function> function from Glibc.  Ruby
-      makes some aggressive optimization assuming some implementation
-      details of the sorting algorithm, but the assumption is not true with
-      the Glibc implementation.  With this switch Ruby will use its own sort
-      implementation instead.
-    </para>
-
-    <para>
-      <option>--disable-install-doc</option>: This switch disables building and
-      installing rdoc indexes and C API documents.
-    </para>
-
-    <para>
-      <option>--disable-install-rdoc</option>: This switch disables building
-      and installing rdoc indexes.
-    </para>
-
-    <para>
-      <option>--disable-install-capi</option>: This switch disables building
-      and installing C API documents.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bundle,
-          bundler,
-          erb,
-          gem,
-          irb,
-          racc,
-          rake,
-          rbs,
-          rdbg,
-          rdoc,
-          ri,
-          ruby, and
-          typeprof
-        </seg>
-        <seg>
-          libruby.so
-        </seg>
-        <seg>
-          /usr/include/ruby-&ruby-minor-version;.0,
-          /usr/lib/ruby,
-          /usr/share/doc/ruby-&ruby-version; and
-          /usr/share/ri
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bundle">
-        <term><command>bundle</command></term>
-        <listitem>
-          <para>
-            creates bundles of Ruby Gems
-          </para>
-          <indexterm zone="ruby bundle">
-            <primary sortas="b-bundle">bundle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bundler">
-        <term><command>bundler</command></term>
-        <listitem>
-          <para>
-            manages an application's dependencies throughout it's lifecycle
-          </para>
-          <indexterm zone="ruby bundler">
-            <primary sortas="b-bundler">bundler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="erb">
-        <term><command>erb</command></term>
-        <listitem>
-          <para>
-            is a command line front-end for eRuby, which provides a templating
-            system for <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby erb">
-            <primary sortas="b-erb">erb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gem">
-        <term><command>gem</command></term>
-        <listitem>
-          <para>
-            is the command for RubyGems, which is a sophisticated package
-            manager for <application>Ruby</application>. This is similar
-            to Python's 'pip' command
-          </para>
-          <indexterm zone="ruby gem">
-            <primary sortas="b-gem">gem</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="irb">
-        <term><command>irb</command></term>
-        <listitem>
-          <para>
-            is the interactive interface for
-            <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby irb">
-            <primary sortas="b-irb">irb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rake">
-        <term><command>rake</command></term>
-        <listitem>
-          <para>
-            is a make-like build utility for <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby rake">
-            <primary sortas="b-rake">rake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdbg">
-        <term><command>rdbg</command></term>
-        <listitem>
-          <para>
-            is an interactive debugger for <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby rdbg">
-            <primary sortas="b-rdbg">rdbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdoc">
-        <term><command>rdoc</command></term>
-        <listitem>
-          <para>
-            generates <application>Ruby</application> documentation
-          </para>
-          <indexterm zone="ruby rdoc">
-            <primary sortas="b-rdoc">rdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ri">
-        <term><command>ri</command></term>
-        <listitem>
-          <para>
-            displays documentation from a database on
-            <application>Ruby</application> classes, modules, and methods
-          </para>
-          <indexterm zone="ruby ri">
-            <primary sortas="b-ri">ri</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ruby-prog">
-        <term><command>ruby</command></term>
-        <listitem>
-          <para>
-            is an interpreted scripting language for quick
-            and easy object-oriented programming
-          </para>
-          <indexterm zone="ruby ruby-prog">
-            <primary sortas="b-ruby">ruby</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libruby">
-        <term><filename role="libraryfile">libruby.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby libruby">
-            <primary sortas="c-libruby">libruby.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,849 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.xz">
-  <!ENTITY rust-download-ftp  " ">
-  <!ENTITY rust-md5sum        "7df442945fb2e32cbccd45a7faa3a5e1">
-  <!ENTITY rust-size          "156 MB">
-  <!ENTITY rust-buildsize     "8.9 GB (298 MB installed); add 6.4 GB if running the tests">
-  <!ENTITY rust-time          "6.7 SBU (including download time; add 6.2 SBU for tests, both using parallelism=8)">
-]>
-
-<sect1 id="rust" xreflabel="rustc-&rust-version;">
-  <?dbhtml filename="rust.html"?>
-
-
-  <title>Rustc-&rust-version;</title>
-
-  <indexterm zone="rust">
-    <primary sortas="a-rust">Rust</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rust</title>
-    <para>
-      The <application>Rust</application> programming language is designed
-      to be a safe, concurrent, practical language.
-    </para>
-
-    <para>
-      This package is updated on a six-weekly release cycle. Because it is
-      such a large and slow package to build, is at the moment only required
-      by a few packages in this book, and particularly because newer versions
-      tend to break older mozilla packages, the BLFS editors take the view that
-      it should only be updated when that is necessary (either to fix problems,
-      or to allow a new version of a package to build).
-    </para>
-
-    <para>
-      As with many  other programming languages, rustc (the rust compiler)
-      needs a binary from which to bootstrap. It will download a stage0
-      binary at the start of the build, so you cannot compile it without an
-      Internet connection.
-    </para>
-
-    <note>
-      <para>
-        Although BLFS usually installs in <filename
-        class="directory">/usr</filename>, when you later upgrade to a newer
-        version of <application>rust</application> the old libraries in <filename
-        class="directory">/usr/lib/rustlib</filename> will remain, with various
-        hashes in their names, but will not be usable and will waste space. The
-        editors recommend placing the files in the <filename
-        class="directory">/opt</filename> directory.  In particular, if you
-        have reason to rebuild with a modified configuration (e.g. using the
-        shipped LLVM after building with shared LLVM, perhaps to compile crates
-        for architectures which the BLFS LLVM build does not support)
-        it is possible for the install to leave a broken
-        <command>cargo</command> program. In such a situation, either remove
-        the existing installation first, or use a different prefix such as
-        /opt/rustc-&rust-version;-build2.
-      </para>
-
-      <para>
-        If you prefer, you can of course change the prefix to <filename
-        class="directory">/usr</filename>.
-      </para>
-    </note>
-
-    <para>
-      The current <application>rustbuild</application> build-system will use
-      all processors, although it does not scale well and often falls
-      back to just using one core while waiting for a library to compile.
-      However it can be mostly limited to a specified number of processors by
-      a combination of adding the switch <literal>--jobs &lt;N&gt;</literal>
-      (e.g. '--jobs 4' to limit to 4 processors) on each invocation of
-      <command>python3 x.py</command> <emphasis>and</emphasis> using an
-      environment variable <envar>CARGO_BUILD_JOBS=&lt;N&gt;</envar>. At the
-      moment this is not effective when some of the rustc tests are run.
-    </para>
-
-    <para>
-      The current version of rust's num_cpus crate now recognizes that cgroups
-      can be used to restrict which processors it is allowed to use. So if your
-      machine lacks DRAM (typically, less than 2GB DRAM per core) that might be
-      an alternative to taking CPUs offline.
-      Read <xref linkend='build-in-cgroup'/> for how to use a cgroup.
-    </para>
-
-    <para>
-      At the moment <application>Rust</application> does not provide any
-      guarantees of a stable ABI.
-    </para>
-
-    <note>
-      <para>
-        Rustc defaults to building for ALL supported architectures, using a
-        shipped copy of LLVM. In BLFS the build is only for the X86
-        architecture.
-        If you intend to develop rust crates, this build may not be good
-        enough for your purposes.
-      </para>
-      <para>
-        The build times of this version when repeated on the same machine are
-        often reasonably consistent, but as with all compilations using
-        <command>rustc</command> there can be some very slow outliers.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rust-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rust-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rust-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rust-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rust-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rust-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!-- only keep this here for reuse in case we need a patch
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (recommended if running the test suite):
-          <ulink url="&patch-root;/rustc-&rust-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">Rust Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <!-- Required for downloading stage 0 binaries.
-           Otherwise it's recommended (if not installed, a vendored copy
-           will be built). -->
-      <xref linkend="curl"/>
-    </para>
-
-    &build-use-internet;
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libssh2"/>,
-      <xref linkend="llvm"/>
-      (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
-      system LLVM instead of building its shipped version), and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <note>
-      <para>
-        If a recommended dependency is not installed, a shipped copy in the
-        Rustc source tarball will be built and used.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/> (used by the test suite if it is present),
-      <xref linkend="git"/> (required by the test suite),
-      <ulink url="https://github.com/bytecodealliance/wasmtime/tree/main/cranelift">cranelift</ulink>,
-      <ulink url="https://jemalloc.net/">jemalloc</ulink>,
-      libgccjit (read command explanation in
-      <xref role="nodep" linkend="gcc"/>), and
-      <ulink url='https://libgit2.org/'>libgit2</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/rust"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rust</title>
-
-    <note>
-      <para>
-        Currently the rust compiler produces SSE2 instructions for 32-bit x86,
-        causing the generated code to be broken on 32-bit systems without a
-        SSE2-capable processor.  All x86 processor models released after
-        2004 should be SSE2-capable.  Run
-        <command>lscpu | grep sse2</command> as a test.  If it outputs
-        anything, your CPU is SSE2-capable and OK.  Otherwise you may try
-        to build this package <emphasis>on a SSE2-capable system</emphasis>
-        with the following fix applied:
-      </para>
-
-      <!-- computeroutput used deliberately to stop anyone from copying
-           blindly -->
-<screen role="nodump"><computeroutput>sed 's@pentium4@pentiumpro@' -i \
-    compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs</computeroutput></screen>
-
-      <para>
-        And copy the resulting
-        <filename class="directory">/opt/rustc-&rust-version;</filename>
-        to the system without SSE2 capability. But this change is still
-        under upstream review and not tested by BLFS editors.
-      </para>
-    </note>
-
-    <para>
-      To install into the
-      <filename class="directory">/opt</filename> directory, remove any
-      existing <filename>/opt/rustc</filename> symlink
-      and create a new directory (i.e. with a different name if trying a
-      modified build of the same version).
-      As the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/rustc-&rust-version;      &amp;&amp;
-ln -svfn rustc-&rust-version; /opt/rustc</userinput></screen>
-
-    <note>
-      <para>
-        If multiple versions of <application>Rust</application> are installed
-        in <filename class="directory">/opt</filename>, changing to another
-        version only requires changing the <filename> /opt/rustc</filename>
-        symbolic link and then running <command>ldconfig</command>.
-      </para>
-    </note>
-
-    <para>
-      Create a suitable <filename>config.toml</filename> file which will
-      configure the build.
-    </para>
-
-<screen><userinput>cat &lt;&lt; EOF &gt; config.toml
-<literal># see config.toml.example for more possible options
-# See the 8.4 book for an old example using shipped LLVM
-# e.g. if not installing clang, or using a version before 13.0
-
-# Tell x.py the editors have reviewed the content of this file
-# and updated it to follow the major changes of the building system,
-# so x.py will not warn us to do such a review.
-change-id = 102579
-
-[llvm]
-# by default, rust will build for a myriad of architectures
-targets = "X86"
-
-# When using system llvm prefer shared libraries
-link-shared = true
-
-[build]
-# omit docs to save time and space (default is to build them)
-docs = false
-
-# install extended tools: cargo, clippy, etc
-extended = true
-
-# Do not query new versions of dependencies online.
-locked-deps = true
-
-# Specify which extended tools (those from the default install).
-tools = ["cargo", "clippy", "rustdoc", "rustfmt"]
-
-# Use the source code shipped in the tarball for the dependencies.
-# The combination of this and the "locked-deps" entry avoids downloading
-# many crates from Internet, and makes the Rustc build more stable.
-vendor = true
-
-[install]
-prefix = "/opt/rustc-&rust-version;"
-docdir = "share/doc/rustc-&rust-version;"
-
-[rust]
-channel = "stable"
-description = "for BLFS &version;"
-
-# BLFS used to not install the FileCheck executable from llvm,
-# so disabled codegen tests.  The assembly tests rely on FileCheck
-# and cannot easily be disabled, so those will anyway fail if
-# FileCheck has not been installed.
-#codegen-tests = false
-
-# Enable the same optimizations as the official upstream build.
-lto = "thin"
-codegen-units = 1
-
-[target.x86_64-unknown-linux-gnu]
-# NB the output of llvm-config (i.e. help options) may be
-# dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"
-
-[target.i686-unknown-linux-gnu]
-# NB the output of llvm-config (i.e. help options) may be
-# dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>
-        The <command>python3 x.py</command> commands may output a warning
-        message complaining <quote><computeroutput>no codegen-backends
-        config matched the requested path to build a codegen
-        backend</computeroutput></quote>.  And the provided
-        <quote>suggestion</quote> (<computeroutput>add backend to
-        codegen-backends in config.toml</computeroutput>) will not silence
-        it.  This warning is <ulink
-        url='https://github.com/rust-lang/rust/issues/110692'>bogus</ulink>
-        and it should be ignored.
-      </para>
-    </note>
-
-    <para>
-      Compile <application>Rust</application> by running the following
-      commands:
-    </para>
-
-<!-- fixed in 1.58.0, retain as a reminder that fixed crates can be used
-<screen><userinput>sed -i -e '/^curl /s/0.4.38/0.4.40/' \
-       -e '/^curl-sys /s/0.4.48/0.4.50/' \
-       src/tools/cargo/Cargo.toml &amp;&amp; -->
-
-<screen><userinput>{ [ ! -e /usr/include/libssh2.h ] ||
-  export LIBSSH2_SYS_USE_PKG_CONFIG=1; }    &amp;&amp;
-{ [ ! -e /usr/include/sqlite3.h ] ||
-  export LIBSQLITE3_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
-python3 x.py build</userinput></screen>
-
-    <note>
-      <para>
-        The test suite will generate some messages in the
-        <phrase revision="sysv">system log</phrase>
-        <phrase revision="systemd">systemd journal</phrase>
-        for traps on invalid opcodes, and for segmentation faults.
-        In themselves these are nothing to worry about, just a way for the
-        test to be terminated.
-      </para>
-    </note>
-
-    <para>
-      To run the tests (again using all available CPUs) issue:
-    </para>
-
-<screen remap="test"><userinput>SSL_CERT_DIR=/etc/ssl/certs \
-python3 x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></screen>
-
-    <!-- https://github.com/rust-lang/rust/pull/115869 -->
-    <para>
-      Two tests, <filename>tests/ui/issues/issue-21763.rs</filename> and
-      <filename>tests/debuginfo/regression-bad-location-list-67992.rs</filename>,
-      are known to fail.
-    </para>
-
-    <!-- https://github.com/rust-lang/rust/pull/120529 -->
-    <para>
-      With LLVM-18, two <literal>[run-make]</literal> tests named
-      <filename>rustdoc-target-spec-json-path</filename> and
-      <filename>target-specs</filename> are known to fail.
-    </para>
-
-    <para>
-      If <command>FileCheck</command> from <application>LLVM</application> has
-      not been installed, all 47 tests from the <quote>assembly</quote> suite
-      will fail.
-    </para>
-
-    <para>
-      As with all large test suites, other tests might fail on some machines -
-      if the number of additional failures is low,
-      check the log for 'failures:' and review lines above that, particularly the
-      'stderr:' lines. Any mention of
-      SIGSEGV or signal 11 in a failing test is a cause for concern.
-    </para>
-
-    <para>
-      If you get any <emphasis>other</emphasis> failing test which reports an
-      issue number then you should search for that issue.  For example, when
-      rustc &gt;= 1.41.1 was built with a version of sysllvm before 10.0 the test
-      for issue 69225 failed <ulink
-      url="https://github.com/rust-lang/rust/issues/69225"/> and that should be
-      regarded as a critical failure (they released 1.41.1 because of it).
-      Most other failures will not be critical.
-    </para>
-
-    <para>
-      Therefore, you should determine the number of failures.
-    </para>
-
-    <para>
-      The number of tests which passed and failed can be found by running:
-    </para>
-
-<!-- split into two lines for narrower screen windows -->
-<screen remap="test"><userinput>grep '^test result:' rustc-testlog |
- awk '{sum1 += $4; sum2 += $6} END { print sum1 " passed; " sum2 " failed" }'</userinput></screen>
-
-    <para>
-      The other available fields are $8 for those which were ignored
-      (i.e. skipped),  $10 for 'measured' and $12 for 'filtered out' but both
-      those last two are probably zero.
-    </para>
-
-    <para>
-      Now, as the &root; user, install the package:
-    </para>
-
-    <note>
-      <para>
-        If <command>sudo</command> or <command>su</command> is invoked for
-        switching to the &root; user, ensure
-        <envar>LIBSSH2_SYS_USE_PKG_CONFIG</envar> and
-        <envar>LIBSQLITE3_SYS_USE_PKG_CONFIG</envar> are correctly passed or
-        the following command may rebuild <command>cargo</command> with
-        shipped copies of libssh2 and sqlite.  For <command>sudo</command>,
-        use the
-        <option>--preserve-env=LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</option>
-        option.  For <command>su</command>, do <emphasis>not</emphasis> use
-        the <option>-</option> or <option>--login</option> options.
-      </para>
-    </note>
-
-<screen role='root'><userinput>python3 x.py install rustc std &amp;&amp;
-python3 x.py install --stage=1 cargo clippy rustfmt</userinput></screen>
-
-    <para>
-      Still as the &root; user, fix the installation of documentations
-      and symlink a <application>Zsh</application>
-      completion file into the correct location:
-    </para>
-
-    <screen role='root'><userinput>rm -fv /opt/rustc-&rust-version;/share/doc/rustc-&rust-version;/*.old   &amp;&amp;
-install -vm644 README.md                                \
-               /opt/rustc-&rust-version;/share/doc/rustc-&rust-version; &amp;&amp;
-
-install -vdm755 /usr/share/zsh/site-functions      &amp;&amp;
-ln -sfv /opt/rustc/share/zsh/site-functions/_cargo \
-        /usr/share/zsh/site-functions</userinput></screen>
-
-    <para>
-      Finally, unset the exported environment variables:
-    </para>
-
-<screen><userinput>unset LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -svfn rustc-&rust-version; /opt/rustc</command>: if this is
-      not the first use of the <filename class="directory">/opt/rustc</filename>
-      symlink, overwrite it by forcing, and use the '-n' flag to avoid getting
-      confusing results from e.g. <command>ls -l</command>.
-    </para>
-
-    <para>
-      <literal>targets = "X86"</literal>: this avoids building all the available
-      linux cross-compilers (AArch64, MIPS, PowerPC, SystemZ, etc). Unfortunately,
-      rust insists on installing source files for these below
-      <filename class="directory">/opt/rustc/lib/src</filename>.
-    </para>
-
-    <para>
-      <literal>extended = true</literal>: this installs several tools
-      (specified by the <literal>tools</literal> entry) alongside
-      <command>rustc</command>.
-    </para>
-
-    <para>
-      <literal>tools = ["cargo", "clippy", "rustdoc", "rustfmt"]</literal>:
-      only build the tools from the 'default' profile in binary command
-      <command>rustup</command> which are recommended for most users.
-      The other tools are unlikely to be useful unless using (old) code
-      analyzers or editing the standard library.
-    </para>
-
-    <para>
-      <literal>channel = "stable"</literal>: this ensures only stable features
-      can be used, the default in <filename>config.toml</filename> is to use
-      development features, which is not appropriate for a released version.
-    </para>
-
-    <!-- comment while using shipped LLVM -->
-    <para>
-      <literal>[target.x86_64-unknown-linux-gnu]</literal>: the syntax of
-      <filename>config.toml</filename> requires an <literal>llvm-config</literal>
-      entry for each target for which system-llvm is to be used. Change the target
-      to <literal>[target.i686-unknown-linux-gnu]</literal> if you are building
-      on 32-bit x86. This whole section may be omitted if you wish to build
-      against the shipped llvm, or do not have clang, but the resulting build will
-      be larger and take longer.
-    </para>
-
-<!--<para>
-      <command>sed -i -e '/^curl /s/0.4.38/0.4.40/' ... </command>: two crates
-      normally downloaded for this release do not correctly initialise
-      <application>curl</application> if using
-      <application>openssl-3.0.0</application>. Upstream has fixed that for a
-      future release, this sed causes the fixed versions to be used.
-    </para>-->
-
-    <!-- https://github.com/alexcrichton/ssh2-rs/issues/173 -->
-    <para>
-      <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: Allow
-      <command>cargo</command> to link to system libssh2.
-    </para>
-
-    <!-- src/tools/cargo/Cargo.toml is specifying "bundled" as the
-         upstream is suggesting to avoid issues building for Windoge.
-         We don't care about Windoge so override this if we have
-         system sqlite3.  -->
-    <para>
-      <command>export LIBSQLITE3_SYS_USE_PKG_CONFIG=1</command>: Allow
-      <command>cargo</command> to link to system sqlite.
-    </para>
-
-<!--<para>
-      <command>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi"</command>:
-      This adds a link to libffi to any RUSTFLAGS you may already be passing
-      to the build. On some systems, linking fails to include libffi unless
-      this is used. The reason why this is needed is not clear.
-      2023-01-14 : assumed to be no longer needed, but it is some years
-      since one person reported needing this, keep it commented for the moment.
-    </para>-->
-
-    <!-- https://github.com/alexcrichton/openssl-probe/issues/25 -->
-    <para>
-      <envar>SSL_CERT_DIR=/etc/ssl/certs</envar>: Work around an issue
-      causing test failures with the CA certificate store layout used by
-      <xref linkend='make-ca'/>.
-    </para>
-
-    <para>
-      <parameter>--verbose</parameter>: this switch can sometimes provide more
-      information about a test which fails.
-    </para>
-
-    <para>
-      <parameter>--no-fail-fast</parameter>: this switch ensures that the test suite
-      will not stop at the first error.
-    </para>
-
-    <!-- https://github.com/rust-lang/rust/issues/94147 -->
-    <para>
-      <parameter>--stage=1</parameter>: this switch works around an issue
-      causing some Rustc components unnecessarily rebuilt running
-      <command>python3 x.py install</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Rust</title>
-
-    <sect3 id="rustc-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If you installed <application>rustc</application> in
-        <filename class="directory">/opt</filename>, you need to update the
-        following configuration files so that <application>rustc</application>
-        is correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/rustc.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/rustc.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/rustc.sh
-
-pathprepend /opt/rustc/bin           PATH
-
-# End /etc/profile.d/rustc.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        Immediately after installation, update the current PATH
-        for your current shell as a normal user:
-      </para>
-
-<screen><userinput>source /etc/profile.d/rustc.sh</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>
-          cargo-clippy, cargo-fmt, cargo, clippy-driver, rust-gdb,
-          rust-gdbgui, rust-lldb, rustc, rustdoc, and rustfmt
-        </seg>
-        <seg>
-          librustc-driver-&lt;16-byte-hash&gt;.so,
-          libstd-&lt;16-byte-hash&gt;.so, and
-          libtest-&lt;16-byte-hash&gt;.so
-        </seg>
-        <seg>
-          ~/.cargo,
-          /opt/rustc, symbolic link to
-          /opt/rustc-&rust-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cargo-clippy">
-        <term><command>cargo-clippy</command></term>
-        <listitem>
-          <para>
-            provides lint checks for a cargo package
-          </para>
-          <indexterm zone="rust cargo-clippy">
-            <primary sortas="b-cargo-clippy">cargo-clippy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cargo-fmt">
-        <term><command>cargo-fmt</command></term>
-        <listitem>
-          <para>
-            formats all bin and lib files of the current crate using
-            rustfmt
-          </para>
-          <indexterm zone="rust cargo-fmt">
-            <primary sortas="b-cargo-fmt">cargo-fmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="cargo-miri">
-        <term><command>cargo-miri</command></term>
-        <listitem>
-          <para>
-            is for use by Miri to interpret bin crates and tests. It is
-            not installed by default.
-          </para>
-          <indexterm zone="rust cargo-miri">
-            <primary sortas="b-cargo-miri">cargo-miri</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="cargo">
-        <term><command>cargo</command></term>
-        <listitem>
-          <para>
-            is the Package Manager for Rust
-          </para>
-          <indexterm zone="rust cargo">
-            <primary sortas="b-cargo">cargo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clippy-driver">
-        <term><command>clippy-driver</command></term>
-        <listitem>
-          <para>
-            provides lint checks for Rust
-          </para>
-          <indexterm zone="rust clippy-driver">
-            <primary sortas="b-clippy-driver">clippy-driver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="miri">
-        <term><command>miri</command></term>
-        <listitem>
-          <para>
-            is an interpreter for Rust's mid-level intermediate representation
-            (MIR). It is not installed by default.
-          </para>
-          <indexterm zone="rust miri">
-            <primary sortas="b-miri">miri</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rls">
-        <term><command>rls</command></term>
-        <listitem>
-          <para>
-            is the Rust Language Server. This can run in the background to
-            provide IDEs, editors, and other tools with information about Rust
-            programs
-          </para>
-          <indexterm zone="rust rls">
-            <primary sortas="b-rls">rls</primary>
-          </indexterm>
-        </listitem>
-      </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-demangler">
-        <term><command>rust-demangler</command></term>
-        <listitem>
-          <para>
-            converts a list of Rust mangled symbols into a
-            corresponding list of demangled symbols
-          </para>
-          <indexterm zone="rust rust-demangler">
-            <primary sortas="b-rust-demangler">rust-demangler</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>
-          </para>
-          <indexterm zone="rust rust-gdb">
-            <primary sortas="b-rust-gdb">rust-gdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rust-gdbgui">
-        <term><command>rust-gdbgui</command></term>
-        <listitem>
-          <para>
-            is a wrapper script for a graphical front end to gdb that runs in a
-            browser
-          </para>
-          <indexterm zone="rust rust-gdbgui">
-            <primary sortas="b-rust-gdbgui">rust-gdbgui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rust-lldb">
-        <term><command>rust-lldb</command></term>
-        <listitem>
-          <para>
-            is a wrapper script for LLDB (the LLVM debugger)
-            pulling in the Python pretty-printing modules
-          </para>
-          <indexterm zone="rust rust-lldb">
-            <primary sortas="b-rust-lldb">rust=lldb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rustc">
-        <term><command>rustc</command></term>
-        <listitem>
-          <para>
-            is the rust compiler
-          </para>
-          <indexterm zone="rust rustc">
-            <primary sortas="b-rustc">rustc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rustdoc">
-        <term><command>rustdoc</command></term>
-        <listitem>
-          <para>
-            generates documentation from rust source code
-          </para>
-          <indexterm zone="rust rustdoc">
-            <primary sortas="b-rustdoc">rustdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rustfmt">
-        <term><command>rustfmt</command></term>
-        <listitem>
-          <para>
-            formats rust code
-          </para>
-          <indexterm zone="rust rustfmt">
-            <primary sortas="b-rustfmt">rustfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstd">
-        <term><filename class="libraryfile">libstd-&lt;16-byte-hash&gt;.so</filename></term>
-        <listitem>
-          <para>
-            is the Rust Standard Library, the foundation of portable Rust software
-          </para>
-          <indexterm zone="rust libstd">
-            <primary sortas="c-libstd">libstd-&lt;16-byte-hash&gt;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/prog/scons.xml
===================================================================
--- general/prog/scons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 scons-download-http "&sourceforge-dl;/scons/SCons-&scons-version;.tar.gz">
-  <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "f931948234687b507e2c8ae6ec18fb1c">
-  <!ENTITY scons-size          "3.1 MB">
-  <!ENTITY scons-buildsize     "50 MB">
-  <!ENTITY scons-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="scons" xreflabel="SCons-&scons-version;">
-  <?dbhtml filename="scons.html"?>
-
-
-  <title>SCons-&scons-version;</title>
-
-  <indexterm zone="scons">
-    <primary sortas="a-SCons">SCons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SCons</title>
-
-    <para>
-      <application>SCons</application> is a tool for building software
-      (and other files) implemented in <application>Python</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&scons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&scons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &scons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &scons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &scons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &scons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SCons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-xsl"/> and
-      <xref role="runtime" linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SCons</title>
-
-    <!-- Commented out because I don't think it's still needed.  If
-         something bad happens please uncomment.
-    <screen><userinput>sed -i 's/env python/&amp;3/' SCons/Utilities/*.py &amp;&amp;</userinput></screen> -->
-
-    <para>
-      Fix the install location of the man pages:
-    </para>
-
-    <screen><userinput>sed -i '/scons.1/s@^.@share/man/man1@' -i setup.cfg</userinput></screen>
-
-    <para>
-      Build the package:
-    </para>
-
-    &build-wheel;
-
-    <para>
-      As the &root; user, install the package:
-    </para>
-
-    <screen role='root'><userinput>&install-wheel; SCons</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          scons, scons-configure-cache, and sconsign
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/SCons{,-&scons-version;.dist-info}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scons-prog">
-        <term><command>scons</command></term>
-        <listitem>
-          <para>
-            is a software construction tool
-          </para>
-          <indexterm zone="scons scons-prog">
-            <primary sortas="b-scons">scons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scons-configure-cache">
-        <term><command>scons-configure-cache</command></term>
-        <listitem>
-          <para>
-            shows or converts the configuration of an
-            <application>SCons</application> cache directory
-          </para>
-          <indexterm zone="scons scons-configure-cache">
-            <primary sortas="b-scons-configure-cache">scons-configure-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sconsign">
-        <term><command>sconsign</command></term>
-        <listitem>
-          <para>
-            prints <application>SCons</application>
-            <filename>.sconsign</filename> file information
-          </para>
-          <indexterm zone="scons sconsign">
-            <primary sortas="b-sconsign">sconsign</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!-- Removed in 4.0.0
-      <varlistentry id="scons-time">
-        <term><command>scons-time</command></term>
-        <listitem>
-          <para>
-            generates and displays <application>SCons</application>
-            timing information.
-          </para>
-          <indexterm zone="scons scons-time">
-            <primary sortas="b-scons-time">scons-time</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
--->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/slang.xml
===================================================================
--- general/prog/slang.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 slang-download-http "https://www.jedsoft.org/releases/slang/slang-&slang-version;.tar.bz2">
-  <!ENTITY slang-download-ftp  " ">
-  <!ENTITY slang-md5sum        "69015c8300088373eb65ffcc6ed4db8c">
-  <!ENTITY slang-size          "1.6 MB">
-  <!ENTITY slang-buildsize     "22 MB (add 15 MB for tests)">
-  <!ENTITY slang-time          "0.4 SBU (add 0.5 SBU for tests)">
-]>
-
-<sect1 id="slang" xreflabel="slang-&slang-version;">
-  <?dbhtml filename="slang.html"?>
-
-
-  <title>slang-&slang-version;</title>
-
-  <indexterm zone="slang">
-    <primary sortas="a-slang">slang</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to slang</title>
-
-    <para>
-      <application>S-Lang</application> (slang) is an interpreted language
-      that may be embedded into an application to make the application
-      extensible.  It provides facilities required by interactive applications
-      such as display/screen management, keyboard input and keymaps.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&slang-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&slang-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &slang-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &slang-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &slang-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &slang-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Slang Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libpng"/> and
-      <ulink url="https://github.com/kkos/oniguruma">Oniguruma</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Slang</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      Install <application>slang</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-readline=gnu &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>make install_doc_dir=/usr/share/doc/slang-&slang-version;   \
-     SLSH_DOC_DIR=/usr/share/doc/slang-&slang-version;/slsh \
-     install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-readline=gnu</parameter>: This parameter sets GNU
-      <application>Readline</application> to be used by the parser interface
-      instead of the <application>slang</application> internal version.
-    </para>
-
-    <para>
-      <command>make install_doc_dir=/usr/share/doc/slang-&slang-version;
-      SLSH_DOC_DIR=/usr/share/doc/slang-&slang-version;/slsh install</command>:
-      This command installs this package with a versioned documentation
-      installation directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring slang</title>
-
-    <sect3 id="slang-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.slshrc</filename> and
-        <filename>/etc/slsh.rc</filename>
-      </para>
-
-      <indexterm zone="slang slang-config">
-        <primary sortas="e-AA.slshrc">~/.slshrc</primary>
-      </indexterm>
-
-      <indexterm zone="slang slang-config">
-        <primary sortas="e-etc-slsh">/etc/slsh.rc</primary>
-      </indexterm>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>slsh</seg>
-        <seg>libslang.so and numerous support modules</seg>
-        <seg>/usr/lib/slang, /usr/share/doc/slang-&slang-version;
-        and /usr/share/slsh</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="slsh">
-        <term><command>slsh</command></term>
-        <listitem>
-          <para>
-            is a simple program for interpreting
-            <application>slang</application> scripts. It supports dynamic
-            loading of <application>slang</application> modules and includes a
-            <application>Readline</application> interface for interactive use
-          </para>
-          <indexterm zone="slang slsh">
-            <primary sortas="b-slsh">slsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,588 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 subversion-download-http "https://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
-  <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "19756a5ceb32a022698a66e48616ef6b">
-  <!ENTITY subversion-size          "8.2 MB">
-  <!-- for 1.12.0                    1.12.2         1.13.0
-       make javahl: 0.5 SBU  28 MB; not avail
-       swig-pl:     0.8      42 MB; 0.7 SBU  43 MB; 0.6 SBU 44 MB
-       swig-py:     0.6      26 MB; 0.5      28 MB; 0.5     28 MB
-       swig-rb:     0.4      22 MB; 0.4      21 MB; 0.3     21 MB
-       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     "193 MB (add 189 MB for bindings, 54 MB for docs, 1.3 GB for tests)">
-  <!ENTITY subversion-time          "0.5 SBU (Using parallelism=4; add 2.0 SBU for bindings, 30 SBU for tests)">
-]>
-
-<sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
-  <?dbhtml filename="subversion.html"?>
-
-
-  <title>Subversion-&subversion-version;</title>
-
-  <indexterm zone="subversion">
-    <primary sortas="a-Subversion">Subversion</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Subversion</title>
-
-    <para>
-      <application>Subversion</application> is a version control system that is
-      designed to be a compelling replacement for <application>CVS</application>
-      in the open source community. It extends and enhances
-      <application>CVS</application>' feature set, while maintaining a similar
-      interface for those already familiar with <application>CVS</application>.
-      These instructions install the client and server software used to
-      manipulate a <application>Subversion</application> repository. Creation of
-      a repository is covered at <xref linkend="svnserver"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&subversion-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&subversion-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &subversion-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &subversion-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &subversion-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &subversion-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch for building with <xref linkend="apr"/>:
-          <ulink url="&patch-root;/subversion-&subversion-version;-apr_1.7.0_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="serf"/> (for handling http:// and https:// URLs)
-    </para>
-
-<!-- support for berkeley db is deprecated since 1.8
-    <note>
-      <para>
-        If you require the <application>Berkeley DB</application> back-end hooks
-        in <application>Subversion</application> to build or support BDB based
-        repositories, you must have <application>APR-util</application> linked to
-        the <application>Berkeley DB</application> library.
-      </para>
-    </note>
--->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/> (for generating HTML documentation),
-      <xref linkend="gnome-keyring"/>,
-      <xref linkend="libsecret"/>,
-<!--      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support), -->
-      <xref linkend="py3c"/> (for the python bindings, and tests),
-      <xref linkend="python3"/> (with sqlite support for the tests),
-      <xref linkend="ruby"/>,
-      <xref linkend="swig"/> (for building Perl, Python and Ruby bindings),
-      and
-      <ulink url="https://git.netsurf-browser.org/libutf8proc.git/">UTF8proc</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for the Java Bindings)</bridgehead>
-    <para role="optional">
-      One of <xref linkend="openjdk"/>,
-      <ulink url="https://www.inet.no/dante/">Dante</ulink> or
-      <ulink url="https://jikes.sourceforge.net/">Jikes</ulink>,
-      <ulink url="https://junit.org/junit4/">JUnit 4</ulink> (to test the Java bindings) and
-      <xref linkend="apache-ant"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Subversion</title>
-<!--
-      <note>
-        <para>
-          This package may fail during the make phase when using multiple
-          processors.  If this occurs try continuing with
-          <emphasis>make -j1</emphasis> or redo the entire build process with
-          fresh sources using <emphasis>-j1</emphasis>.
-        </para>
-      </note>
--->
-
-    <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>
-      Next, adapt the Ruby bindings to ruby-3.2 and later:
-    </para>
-
-    <screen><userinput remap="pre">sed -e 's/File.exists?/File.exist?/'               \
-    -i subversion/bindings/swig/ruby/svn/util.rb   \
-       subversion/bindings/swig/ruby/test/test_wc.rb</userinput></screen>
-
-    <para>
-      Install <application>Subversion</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3                        \
-./configure --prefix=/usr             \
-            --disable-static          \
-            --with-apache-libexecdir  \
-            --with-utf8proc=internal &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and you wish to build the
-      API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
-
-    <para>
-      If you wish to build the Java bindings pass the <option>--enable-javahl</option>
-      parameter to the <command>configure</command> command. In addition, if
-      you want to run the Java test suite, you have to specify the location
-      of the <application>JUnit</application> file by adding
-      <option>--with-junit=&lt;path to junit jar&gt;</option> (for
-      instance <option>--with-junit=/usr/local/java/lib/junit-4.13.jar</option>)
-      to <command>configure</command>. The JUnit jar file is no longer
-      included in <xref linkend="apache-ant"/> and must be downloaded
-      separately. To build the Java bindings, issue the following command:
-    </para>
-    <para>
-      <screen><command>make -j1 javahl</command></screen>
-    </para>
-
-    <para>
-      If you want to compile <application>Perl</application>,
-      <application>Python</application>, or <application>Ruby</application>
-      bindings, issue any of the following command:
-    </para>
-    <para>
-      <screen><command>make swig-pl</command> # for <application>Perl</application>
-<command>make swig-py \
-     swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command> # for <application>Python</application>
-<command>make swig-rb</command> # for <application>Ruby</application></screen>
-    </para>
-
-    <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. Due to
-      changes in Python-3.12, you can expect to see around 200 Syntax Warnings
-      during the test suite due to invalid escape sequences.
-    </para>
-
-    <para>
-      To test the results of any of the <application>SWIG</application>
-      bindings, you can use any of the following commands:
-      <command>make check-swig-pl</command>,
-      <command>make check-swig-py</command>, or
-      <command>make check-swig-rb</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
-cp      -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></screen>
-
-    <para>
-      If you built the Java bindings, issue the following command as the
-      <systemitem class="username">root</systemitem> user to install them:
-    </para>
-    <para>
-<screen><command>make install-javahl</command></screen>
-    </para>
-
-    <para>
-      If you built the <application>Perl</application>,
-      <application>Python</application>, or
-      <application>Ruby</application> bindings, issue any of the following
-      commands as the <systemitem class="username">root</systemitem> user
-      to install them:
-    </para>
-    <para>
-<screen><command>make install-swig-pl</command>
-<command>make install-swig-py \
-      swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
-      swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command>
-<command>make install-swig-rb</command></screen>
-    </para>
-
-    <para>
-      The java bindings need to be installed in order for the tests to run,
-      since the tests attempt to look for them in CLASSPATH. To test the
-      results of the Java bindings build, issue
-      <command>LANG=C make check-javahl</command>.
-      <!-- ~~ This explanation is added to the configure above ~~
-      The <application>JUnit</application> testing framework must be installed,
-      and the location of the JUnit jar has to be specified by passing the
-      <option>- -with-junit=&lt;path to junit jar&gt;</option> parameter to
-      <command>configure</command>. Note that <application>JUnit</application>
-      is included in <xref linkend="apache-ant"/>, and can be accessed by
-      passing <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option>
-      to <command>configure</command>.
-      -->
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-apache-libexecdir</parameter>:
-      If <xref linkend="apache"/> is installed, the shared
-      <application>Apache</application> modules are
-      built. This switch allows to have those modules installed to
-      <application>Apache</application>'s configured module dir instead
-      of <filename class="directory">/usr/libexec</filename>. It has no effect
-      if <application>Apache</application> is not installed.
-    </para>
-
-    <para>
-      <parameter>--with-utf8proc=internal</parameter>:
-      Remove these switches if you have installed the optional dependencies.
-    </para>
-
-    <para>
-      <option>--enable-javahl</option>: enables compilation of Java high level
-      bindings. Running <command>make javahl</command> is necessary to do
-      the compilation.
-    </para>
-
-    <para>
-      <option>--with-junit=&lt;location of the junit jar file&gt;</option>:
-      gives the location of the junit jar, otherwise the javahl tests cannot
-      be run.
-    </para>
-
-    <para>
-      <option>--disable-gmock</option>: Do not use the Googlemock testing
-      framework.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Subversion</title>
-
-    <sect3 id="subversion-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.subversion/config</filename> and
-        <filename>/etc/subversion/config</filename>
-      </para>
-
-      <indexterm zone="subversion subversion-config">
-        <primary sortas="e-AA.subversion/config">~/.subversion/config</primary>
-      </indexterm>
-
-      <indexterm zone="subversion subversion-config">
-        <primary sortas="e-etc-subversion-config">/etc/subversion/config</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <filename>/etc/subversion/config</filename> is the
-        <application>Subversion</application> system-wide configuration file.
-        This file is used to specify defaults for different
-        <command>svn</command> commands.
-      </para>
-
-      <para>
-        <filename>~/.subversion/config</filename> is the user's personal
-        configuration file. It is used to override the system-wide defaults set
-        in <filename>/etc/subversion/config</filename>.
-      </para>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          svn, svnadmin, svnbench, svndumpfilter, svnfsfs, svnlook, svnmucc,
-          svnrdump, svnserve, svnsync, and svnversion
-        </seg>
-        <seg>
-          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
-          mod_authz_svn.so <application>Apache HTTP</application> DSO
-          modules and various <application>Perl</application>,
-          <application>Python</application> and
-          <application>Ruby</application> modules.
-        </seg>
-        <seg>
-          /usr/include/subversion-1,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto/}SVN,
-          /usr/lib/python&python3-majorver;/site-packages/{libsvn,svn},
-          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/{,&lt;arch-linux&gt;-linux/}svn,
-          /usr/lib/svn-javahl, and
-          /usr/share/doc/subversion-&subversion-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="svn">
-        <term><command>svn</command></term>
-        <listitem>
-          <para>
-            is a command-line client program used to access
-            <application>Subversion</application> repositories
-          </para>
-          <indexterm zone="subversion svn">
-            <primary sortas="b-svn">svn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnadmin">
-        <term><command>svnadmin</command></term>
-        <listitem>
-          <para>
-            is a tool for creating, tweaking or repairing a
-            <application>Subversion</application> repository
-          </para>
-          <indexterm zone="subversion svnadmin">
-            <primary sortas="b-svnadmin">svnadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnbench">
-        <term><command>svnbench</command></term>
-        <listitem>
-          <para>
-            is a benchmarking tool
-          </para>
-          <indexterm zone="subversion svnbench">
-            <primary sortas="b-svnbench">svnbench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svndumpfilter">
-        <term><command>svndumpfilter</command></term>
-        <listitem>
-          <para>
-            is a program for filtering <application>Subversion</application>
-            repository dumpfile format streams
-          </para>
-          <indexterm zone="subversion svndumpfilter">
-            <primary sortas="b-svndumpfilter">svndumpfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnfsfs">
-        <term><command>svnfsfs</command></term>
-        <listitem>
-          <para>
-            is the FSFS (FileSystem atop of the FileSystem -
-            <application>Subversion</application> filesystem implementation)
-            repository manipulation tool
-          </para>
-          <indexterm zone="subversion svnfsfs">
-            <primary sortas="b-svnfsfs">svnfsfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnlook">
-        <term><command>svnlook</command></term>
-        <listitem>
-          <para>
-            is a tool for inspecting a <application>Subversion</application>
-            repository
-          </para>
-          <indexterm zone="subversion svnlook">
-            <primary sortas="b-svnlook">svnlook</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnmucc">
-        <term><command>svnmucc</command></term>
-        <listitem>
-          <para>
-            is a Multiple URL Command Client for <application>Subversion</application>
-          </para>
-          <indexterm zone="subversion svnmucc">
-            <primary sortas="b-svnmucc">svnmucc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnrdump">
-        <term><command>svnrdump</command></term>
-        <listitem>
-          <para>
-            is a tool for dumping or loading a remote
-            <application>Subversion</application> repository
-          </para>
-          <indexterm zone="subversion svnrdump">
-            <primary sortas="b-svnrdump">svnrdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnserve">
-        <term><command>svnserve</command></term>
-        <listitem>
-          <para>
-            is a custom standalone server program, able to run as a daemon
-            process or invoked by SSH
-          </para>
-          <indexterm zone="subversion svnserve">
-           <primary sortas="b-svnserve">svnserve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnsync">
-        <term><command>svnsync</command></term>
-        <listitem>
-          <para>
-            is a <application>Subversion</application> repository
-            synchronisation tool
-          </para>
-          <indexterm zone="subversion svnsync">
-           <primary sortas="b-svnsync">svnsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnversion">
-        <term><command>svnversion</command></term>
-        <listitem>
-          <para>
-            is used to report the version number and state of a working
-            <application>Subversion</application> repository copy
-          </para>
-          <indexterm zone="subversion svnversion">
-            <primary sortas="b-svnversion">svnversion</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsvn_star-1">
-        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
-        <listitem>
-          <para>
-            are the support libraries used by the
-            <application>Subversion</application> programs
-          </para>
-          <indexterm zone="subversion libsvn_star-1">
-            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mod_authz_svn">
-        <term><filename class="libraryfile">mod_authz_svn.so</filename></term>
-        <listitem>
-          <para>
-            is a plug-in module for the <application>Apache</application> HTTP
-            server, used to authenticate users to a
-            <application>Subversion</application> repository over the Internet
-            or an intranet
-          </para>
-          <indexterm zone="subversion mod_authz_svn">
-            <primary sortas="c-mod_authz_svn">mod_authz_svn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mod_dav_svn">
-        <term><filename class="libraryfile">mod_dav_svn.so</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="subversion mod_dav_svn">
-            <primary sortas="c-mod_authz_svn">mod_dav_svn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/svnserver.xml
===================================================================
--- general/prog/svnserver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,289 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="svnserver" xreflabel="Running a Subversion Server">
-  <?dbhtml filename="svnserver.html"?>
-
-
-  <title>Running a Subversion Server</title>
-
-  <sect2 role="package">
-    <title>Running a Subversion Server</title>
-
-    <para>
-      This section will describe how to set up, administer and secure
-      a <application>Subversion</application> server.
-    </para>
-
-    <bridgehead renderas="sect3">Subversion Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="subversion"/> and
-      <xref linkend="openssh"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Setting up a Subversion Server.</title>
-
-    <para>
-      The following instructions will install a
-      <application>Subversion</application> server, which will be set up
-      to use <application>OpenSSH</application> as the secure remote access
-      method, with <command>svnserve</command> available for anonymous
-      access.
-    </para>
-
-    <para>
-      Configuration of the <application>Subversion</application> server
-      consists of the following steps:
-    </para>
-
-    <sect3>
-      <title>1. Set Uup Users, Groups, and Permissions</title>
-
-      <para>
-        You'll need to be user
-        <systemitem class='username'>root</systemitem> for the initial portion
-        of configuration. Create the <systemitem
-        class="username">svn</systemitem> user and group with the following
-        commands:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 56 svn &amp;&amp;
-useradd -c "SVN Owner" -d /home/svn -m -g svn -s /bin/false -u 56 svn</userinput></screen>
-
-      <para>
-        If you plan to have multiple repositories, you should have a
-        group dedicated to each repository for ease of administration. Create
-        the <systemitem class="groupname">svntest</systemitem> group for the
-        test repository and add the <systemitem
-        class="username">svn</systemitem> user to that group with the
-        following commands:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 57 svntest &amp;&amp;
-usermod -G svntest -a svn</userinput></screen>
-
-      <para>
-        Additionally you should set <command>umask 002</command> while
-        working with a repository so that all new files will be writable by
-        owner and group. This is made mandatory by creating a wrapper script
-        for <command>svn</command> and <command>svnserve</command>:
-      </para>
-
-<screen role="root"><userinput>mv /usr/bin/svn /usr/bin/svn.orig &amp;&amp;
-mv /usr/bin/svnserve /usr/bin/svnserve.orig &amp;&amp;
-cat &gt;&gt; /usr/bin/svn &lt;&lt; "EOF"
-<literal>#!/bin/sh
-umask 002
-/usr/bin/svn.orig "$@"</literal>
-EOF
-cat &gt;&gt; /usr/bin/svnserve &lt;&lt; "EOF"
-<literal>#!/bin/sh
-umask 002
-/usr/bin/svnserve.orig "$@"</literal>
-EOF
-chmod 0755 /usr/bin/svn{,serve}</userinput></screen>
-
-      <note>
-        <para>
-          If you use <application>Apache</application> for working with
-          the repository over HTTP, even for anonymous access, you should wrap
-          <command>/usr/sbin/httpd</command> in a similar script.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3>
-      <title>2. Create a Subversion repository.</title>
-
-      <para>
-        There are several ways to set up a subversion repository. It is
-        recommended to have a look at the <ulink
-        url="https://svnbook.red-bean.com/nightly/en/svn.reposadmin.html">SVN
-        Book</ulink> corresponding chapter. A basic repository can be set up
-        with the instructions below.
-      </para>
-
-      <para>
-        Create a new <application>Subversion</application> repository with
-        the following commands (as the <systemitem class="username">root
-        </systemitem> user):
-      </para>
-
-<screen role="root"><userinput>install -v -m 0755 -d /srv/svn &amp;&amp;
-install -v -m 0755 -o svn -g svn -d /srv/svn/repositories &amp;&amp;
-svnadmin create /srv/svn/repositories/svntest</userinput></screen>
-
-      <para>
-        Now that the repository is created, it should be populated with
-        something useful. You'll need to have a predefined directory
-        layout set up exactly as you want your repository to look. For
-        example, here is a sample BLFS layout setup with a root of
-        <filename>svntest/</filename>. You'll need to set up a directory
-        tree similar to the following:
-      </para>
-
-<screen><literal>svntest/            # The name of the repository
-   trunk/           # Contains the existing source tree
-      BOOK/
-      bootscripts/
-      edguide/
-      patches/
-      scripts/
-   branches/        # Needed for additional branches
-   tags/            # Needed for tagging release points</literal></screen>
-
-      <para>
-        Once you've created your directory layout as shown above, you
-        are ready to do the initial import:
-      </para>
-
-<screen role="root"><userinput>svn import -m "Initial import." \
-    <replaceable>&lt;/path/to/source/tree&gt;</replaceable>      \
-    file:///srv/svn/repositories/svntest</userinput></screen>
-
-      <para>
-        Now change owner and group information on the
-        repository, and add an unprivileged user to the
-        <systemitem class="groupname">svn</systemitem> and
-        <systemitem class="groupname">svntest</systemitem> groups:
-      </para>
-
-<screen role="root"><userinput>chown -R svn:svntest /srv/svn/repositories/svntest    &amp;&amp;
-chmod -R g+w         /srv/svn/repositories/svntest    &amp;&amp;
-chmod g+s            /srv/svn/repositories/svntest/db &amp;&amp;
-usermod -G svn,svntest -a <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <para>
-        <systemitem class="groupname">svntest</systemitem> is the group
-        assigned to the svntest repository. As mentioned earlier, this eases
-        administration of multiple repositories when using
-        <application>OpenSSH</application> for authentication. Going forward,
-        you'll need to add your unprivileged user, and any additional users
-        that you wish to have write access to the repository, to the
-        <systemitem class="groupname">svn</systemitem> and <systemitem
-        class="groupname">svntest</systemitem> groups.
-      </para>
-
-      <para>
-        In addition, you'll notice that the new repository's
-        <filename>db</filename> directory is set-groupID. If the reasoning is
-        not immediately obvious, when using any external authentication method
-        (such as <command>ssh</command>), the sticky bit is set so that all
-        new files will be owned by the user, but group of
-        <systemitem class="groupname">svntest</systemitem>. Anyone in the
-        <systemitem class="groupname">svntest</systemitem> group can create
-        files, but still give the entire group write access to those
-        files. This avoids locking out other users from the repository.
-      </para>
-
-      <para>
-        Now, return to an unprivileged user account, and take a
-        look at the new repository using <command>svnlook</command>:
-      </para>
-
-<screen><userinput>svnlook tree /srv/svn/repositories/svntest/</userinput></screen>
-
-      <note>
-        <para>
-          You may need to log out and back in again to refresh your group
-          memberships. <command>su
-          <replaceable>&lt;username&gt;</replaceable></command>
-          should work as well.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3>
-      <title>3. Configure the Server</title>
-
-      <para>
-        As mentioned previously, these instructions will configure the
-        server to use only <command>ssh</command> for write access to the
-        repository and to provide anonymous access using
-        <command>svnserve</command>. There are several other ways to provide
-        access to the repository. These additional configurations are best
-        explained at <ulink url="https://svnbook.red-bean.com/"/>.
-      </para>
-
-      <para>
-        Access configuration needs to be done for each repository.
-        Create the <filename>svnserve.conf</filename> file for the svntest
-        repository using the following commands:
-      </para>
-
-<screen role="root"><userinput>cp /srv/svn/repositories/svntest/conf/svnserve.conf \
-   /srv/svn/repositories/svntest/conf/svnserve.conf.default &amp;&amp;
-
-cat &gt; /srv/svn/repositories/svntest/conf/svnserve.conf &lt;&lt; "EOF"
-<literal>[general]
-anon-access = read
-auth-access = write</literal>
-EOF</userinput></screen>
-
-      <para>
-        There is not a lot to the configuration file at all. You'll notice
-        that only the general section is required. Take a look at the
-        <filename>svnserve.conf.default</filename> file for information on
-        using <command>svnserve</command>'s built-in authentication method.
-      </para>
-
-    </sect3>
-
-    <sect3 id="svnserver-init">
-      <title>4. Starting the Server</title>
-
-      <para revision="sysv">
-        To start the server at boot time, install the svn
-        bootscript included in the <xref linkend="bootscripts"/> package:
-      </para>
-
-      <para revision="systemd">
-        To start the server at boot time, install the
-        <filename>svnserve.service</filename> unit from the
-        <xref linkend="systemd-units"/> package:
-      </para>
-
-      <indexterm zone="svnserver svnserver-init" revision="sysv">
-        <primary sortas="f-svn">svn</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-svn</userinput></screen>
-
-      <indexterm zone="svnserver svnserver-init" revision="systemd">
-        <primary sortas="f-svnserve">svnserve</primary>
-      </indexterm>
-
-<screen role="root" revision="systemd"><userinput>make install-svnserve</userinput></screen>
-
-      <para revision="systemd">
-        Additionally, the instructions above require
-        that svn server uses <command>umask 002</command> so that all new files
-        will be writable by owner and group. This can be achieved by creating
-        a systemd unit override file by running the following command:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>mkdir -p /etc/systemd/system/svnserve.service.d
-echo "UMask=0002" > /etc/systemd/system/svnserve.service.d/99-user.conf</userinput></screen>
-
-      <para revision="systemd">
-        Options which are passed to
-        <command>svnserve</command> daemon can be changed in
-        <filename>/etc/default/svnserve</filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 swig-download-http "&sourceforge-dl;/swig/swig-&swig-version;.tar.gz">
-  <!ENTITY swig-download-ftp  " ">
-  <!ENTITY swig-md5sum        "7697b443d7845381d64c90ab54d244af">
-  <!ENTITY swig-size          "8.0 MB">
-  <!ENTITY swig-buildsize     "81 MB (1.8 GB with tests)">
-  <!ENTITY swig-time          "0.1 SBU (add 7.7 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="swig" xreflabel="SWIG-&swig-version;">
-  <?dbhtml filename="swig.html"?>
-
-
-  <title>SWIG-&swig-version;</title>
-
-  <indexterm zone="swig">
-    <primary sortas="a-swig">SWIG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SWIG</title>
-
-    <para>
-       <application>SWIG</application> (Simplified Wrapper and Interface
-       Generator) is a compiler that integrates <application>C</application>
-       and <application>C++</application> with languages including
-       <application>Perl</application>,
-       <application>Python</application>,
-       <application>Tcl</application>,
-       <application>Ruby</application>,
-       <application>PHP</application>,
-       <application>Java</application>,
-       <application>JavaScript</application>,
-       <application>C#</application>,
-       <application>D</application>,
-       <application>Go</application>,
-       <application>Lua</application>,
-       <application>Octave</application>,
-       <application>R</application>,
-       <application>Racket</application>,
-       <application>Scilab</application>,
-       <application>Scheme</application>, and
-       <application>Ocaml</application>.
-       <application>SWIG</application> can
-       also export its parse tree into <application>Lisp</application>
-       s-expressions and <application>XML</application>.
-    </para>
-    <para>
-       <application>SWIG</application> reads annotated
-       <application>C/C++</application> header files and creates wrapper
-       code (glue code) in order to make the corresponding
-       <application>C/C++</application> libraries available to the listed
-       languages, or to extend <application>C/C++</application> programs
-       with a scripting language.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&swig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&swig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &swig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &swig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &swig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &swig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SWIG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="boost"/> for tests, and any of the languages mentioned
-      in the introduction, as run-time dependencies
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SWIG</title>
-
-    <para>
-      Install <application>SWIG</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                      \
-            --without-javascript               \
-            --without-maximum-compile-warnings &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>PY3=1 make TCL_INCLUDE= -k check</command>.
-      The unsetting of the variable <envar>TCL_INCLUDE</envar> is
-      necessary since it is not correctly set by
-      <emphasis>configure</emphasis>. The tests are only executed for the
-      languages installed on your machine, so the disk space and SBU values
-      given for the tests may vary, and should be considered as mere orders of
-      magnitude. According to
-      <application>SWIG</application>'s documentation, the failure of some
-      tests should not be considered harmful. The go tests are buggy and may
-      generate a lot of meaningless output.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-cp -v -R Doc -T /usr/share/doc/swig-&swig-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-maximum-compile-warnings</parameter>: disables
-      compiler ansi conformance enforcement, which triggers errors in
-      the <application>Lua</application> headers (starting with Lua 5.3).
-    </para>
-
-    <para>
-      <option>--without-&lt;language&gt;</option>: allows disabling the
-      building of tests and examples for &lt;language&gt;, but all the
-      languages capabilities of <application>SWIG</application> are always
-      built. This switch is used for <application>JavaScript</application>
-      because the SWIG implementation is incomplete and a lot of tests fail
-      due to API changes in Node-20.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          swig and ccache-swig
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/swig-&swig-version; and
-          /usr/share/swig
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="swig-prog">
-        <term><command>swig</command></term>
-        <listitem>
-          <para>
-            takes an interface file containing C/C++ declarations and
-            SWIG special instructions, and generates the corresponding
-            wrapper code needed to build extension modules
-          </para>
-          <indexterm zone="swig swig-prog">
-            <primary sortas="b-swig">swig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ccache-swig">
-        <term><command>ccache-swig</command></term>
-        <listitem>
-          <para>
-            is a compiler cache, which speeds up re-compilation of
-            C/C++/SWIG code
-          </para>
-          <indexterm zone="swig ccache-swig">
-            <primary sortas="b-ccache-swig">ccache-swig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tk-download-http "&sourceforge-dl;/tcl/tk&tk-version;-src.tar.gz">
-  <!ENTITY tk-download-ftp  " ">
-  <!ENTITY tk-md5sum        "cf2aaac0478ef468b48e65c10e6b0d07">
-  <!ENTITY tk-size          "4.3 MB">
-  <!ENTITY tk-buildsize     "25 MB">
-  <!ENTITY tk-time          "0.3 SBU (add 2.0 SBU for tests)">
-
-  <!-- Ensure this is updated when Tk moves from the 8.6.x branch -->
-  <!ENTITY tk-ver           "8.6">
-]>
-
-<sect1 id="tk" xreflabel="Tk-&tk-version;">
-  <?dbhtml filename="tk.html"?>
-
-
-  <title>Tk-&tk-version;</title>
-
-  <indexterm zone="tk">
-    <primary sortas="a-Tk">Tk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tk</title>
-
-    <para>
-      The <application>Tk</application> package contains a
-      TCL GUI Toolkit.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- <xref linkend="tcl"/> and -->
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tk</title>
-
-    <para>
-      Install <application>Tk</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd unix &amp;&amp;
-./configure --prefix=/usr \
-            --mandir=/usr/share/man \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-
-make &amp;&amp;
-
-sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
-    -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    -i tkConfig.sh</userinput></screen>
-
-    <para>
-      Running the tests is not recommended. Failures will be reported during the
-      tests, depending on the screen resolution/capabilities, fonts installed
-      and other X related parameters, but the end report can show 0 failures.
-      Some tests will steal focus and some might crash your X Server. To test
-      the results anyway, issue: <command>make test</command>. Ensure you run
-      it from an X Window display device with the GLX extensions loaded, but
-      even so, tests might hang.
-      <!-- Test Statistics (tk8.6.9 - renodr):
-      Total: 466
-      Passed: 447
-      Skipped: 17
-      Failed: 2
-      The two tests that fail have to do with ttk.test
-
-      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>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-private-headers &amp;&amp;
-ln -v -sf wish&tk-ver; /usr/bin/wish &amp;&amp;
-chmod -v 755 /usr/lib/libtk&tk-ver;.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-64bit</parameter>: This switch is used to enable
-      64 bit support in <application>Tk</application> on 64 bit operating
-      systems.
-    </para>
-
-    <para>
-      <command>make install-private-headers</command>: This command is
-      used to install the <application>Tk</application> library interface
-      headers used by other packages if they link to the
-      <application>Tk</application> library.
-    </para>
-
-    <para>
-      <command>ln -v -sf wish&tk-ver; /usr/bin/wish</command>: This
-      command is used to create a compatibility symbolic link to the
-      <command>wish&tk-ver;</command> file as many packages expect a file
-      named <command>wish</command>.
-    </para>
-
-    <para>
-      <command>sed -e ... tkConfig.sh</command>: The
-      <application>Tk</application> package expects that its source tree is
-      preserved so that packages depending on it for their compilation
-      can utilize it. This <command>sed</command> removes the references to the
-      build directory and replaces them with saner system-wide locations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          wish and wish&tk-ver;
-        </seg>
-        <seg>
-          libtk&tk-ver;.so and libtkstub&tk-ver;.a
-        </seg>
-        <seg>
-          /usr/lib/tk&tk-ver;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wish">
-        <term><command>wish</command></term>
-        <listitem>
-          <para>
-            is a symlink to the <command>wish&tk-ver;</command> program
-          </para>
-          <indexterm zone="tk wish">
-            <primary sortas="b-wish">wish</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wish-eight">
-        <term><command>wish&tk-ver;</command></term>
-        <listitem>
-          <para>
-            is a simple shell containing the
-            <application>Tk</application> toolkit that creates a main window and
-            then processes <application>Tcl</application> commands
-          </para>
-          <indexterm zone="tk wish-eight">
-            <primary sortas="b-wish&tk-ver;">wish&tk-ver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtk">
-        <term><filename class="libraryfile">libtk&tk-ver;.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required
-            by <application>Tk</application>
-          </para>
-          <indexterm zone="tk libtk">
-            <primary sortas="c-libtk">libtk&tk-ver;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/unifdef.xml
===================================================================
--- general/prog/unifdef.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unifdef-download-http "https://dotat.at/prog/unifdef/unifdef-&unifdef-version;.tar.gz">
-  <!ENTITY unifdef-download-ftp  " ">
-  <!ENTITY unifdef-md5sum        "b225312c110cd2600ca7166bd0419751">
-  <!ENTITY unifdef-size          "88 KB">
-  <!ENTITY unifdef-buildsize     "1.9 MB">
-  <!ENTITY unifdef-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="unifdef" xreflabel="unifdef-&unifdef-version;">
-  <?dbhtml filename="unifdef.html"?>
-
-  <title>unifdef-&unifdef-version;</title>
-
-  <indexterm zone="unifdef">
-    <primary sortas="a-unifdef">unifdef</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to unifdef</title>
-
-    <para>
-      The <application>unifdef</application> package contains a utility that
-      is useful for removing preprocessor conditionals from code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unifdef-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unifdef-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unifdef-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unifdef-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unifdef-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unifdef-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of unifdef</title>
-
-    <para>
-      Install <application>unifdef</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          unifdef and unifdefall
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="unifdef-prog">
-        <term><command>unifdef</command></term>
-        <listitem>
-          <para>
-            removes preprocessor conditionals from code
-          </para>
-          <indexterm zone="unifdef unifdef-prog">
-            <primary sortas="b-unifdef">unifdef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unifdefall">
-        <term><command>unifdefall</command></term>
-        <listitem>
-          <para>
-            removes preprocessor conditionals from code across a whole tree
-          </para>
-          <indexterm zone="unifdef unifdefall">
-            <primary sortas="b-unifdefall">unifdefall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/prog/vala.xml
===================================================================
--- general/prog/vala.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,274 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vala-download-http "&gnome-download-http;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
-  <!ENTITY vala-download-ftp  " ">
-  <!ENTITY vala-md5sum        "134075855867fdd9c51ca7555c4951bb">
-  <!ENTITY vala-size          "3.8 MB">
-  <!ENTITY vala-buildsize     "160 MB (add 19 MB for tests)">
-  <!ENTITY vala-time          "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="vala" xreflabel="Vala-&vala-version;">
-  <?dbhtml filename="vala.html"?>
-
-  <title>Vala-&vala-version;</title>
-
-  <indexterm zone="vala">
-    <primary sortas="a-Vala">Vala</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vala</title>
-
-    <para>
-      <application>Vala</application> is a new programming language that
-      aims to bring modern programming language features to
-      <application>GNOME</application> developers without imposing any
-      additional runtime requirements and without using a different ABI
-      compared to applications and libraries written in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vala-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vala-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vala-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vala-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vala-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vala-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vala Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for the tests)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="graphviz"/> (Required for valadoc)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus"/> (Required for the tests),
-      <xref linkend="libxslt"/> (Required for generating the documentation),
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>,
-      <ulink url="https://github.com/relaxng/jing-trang">jing</ulink>, and
-      <ulink url="https://weasyprint.org/">weasyprint</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vala</title>
-
-    <!-- https://gitlab.gnome.org/GNOME/vala/-/issues/1485 -->
-    <!-- Fixed in vala-0.56.14 
-    <para>
-      At first, fix an issue causing <command>vapigen</command> to crash
-      building some packages (for example NetworkManager):
-    </para>
-
-<screen><userinput>sed -e "/next_pos =/s/$/ \
-        char buf[16]; \
-        Memory.copy (buf, next_pos, \
-        (end - next_pos >= buf.length ? buf.length - 1 : end - next_pos));/" \
-    -e 's/(string) next_pos/(string) buf/' \
-    -i vala/valamarkupreader.vala</userinput></screen>
-    -->
-
-    <!-- See Ticket #19283 and
-    https://gitlab.gnome.org/GNOME/vala/-/issues/1524
-    <para>
-      First, fix a build failure that occurs with graphviz-10.x:
-    </para>
-
-<screen><userinput>sed -i '/gvc.h/a#define TRUE 1' libvaladoc/gvc-compat.c</userinput></screen>
--->
-
-    <para>
-      Install <application>Vala</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>bootstrap</option>: This <command>make</command>
-      target forces the building system to build the package twice and use
-      the <command>vala</command> executable produced in the first build
-      to regenerate the <filename class="extension">.c</filename> files
-      from the <filename class="extension">.vala</filename> files if needed.
-      If a <command>vala</command> executable is not installed yet and
-      you've modified any <filename class="extension">.vala</filename> files
-      in the source tree, run <command>make bootstrap</command> instead of
-      <command>make</command>.
-    </para>
-
-    <para>
-      <option>--disable-valadoc</option>: This option is
-      required if <xref linkend="graphviz"/> is not installed.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          vala,
-          vala-&vala-major-version;,
-          valac,
-          valadoc,
-          vala-gen-introspect, and
-          vapigen (symlinks);
-
-          valac-&vala-major-version;,
-          valadoc-&vala-major-version;,
-          vala-gen-introspect-&vala-major-version;, and
-          vapigen-&vala-major-version;
-        </seg>
-        <seg>
-          libvala-&vala-major-version;.so and
-          libvaladoc-&vala-major-version;.so
-        </seg>
-        <seg>
-          /usr/include/vala-&vala-major-version;,
-          /usr/include/valadoc-&vala-major-version;,
-          /usr/lib/vala-&vala-major-version;,
-          /usr/lib/valadoc-&vala-major-version;,
-          /usr/share/vala,
-          /usr/share/vala-&vala-major-version;,
-          /usr/share/valadoc-&vala-major-version;, and
-          /usr/share/devhelp/books/vala-&vala-major-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="valac">
-        <term><command>valac</command></term>
-        <listitem>
-          <para>
-            is a compiler that translates <application>Vala</application>
-            source code into C source and header files
-          </para>
-          <indexterm zone="vala valac">
-            <primary sortas="b-valac">valac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="valadoc">
-        <term><command>valadoc</command></term>
-        <listitem>
-          <para>
-            is a documentation generator for generating API documentation
-            from <application>Vala</application> source code based on libvala
-          </para>
-          <indexterm zone="vala valadoc">
-            <primary sortas="b-valadoc">valadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vala-gen-introspect">
-        <term><command>vala-gen-introspect</command></term>
-        <listitem>
-          <para>
-            generates a GI file for GObject and
-            <application>GLib</application> based packages
-          </para>
-          <indexterm zone="vala vala-gen-introspect">
-            <primary sortas="b-vala-gen-introspect">vala-gen-introspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vapigen">
-        <term><command>vapigen</command></term>
-        <listitem>
-          <para>
-            is an utility which generates <application>Vala</application> API
-            (VAPI) files from GI files
-          </para>
-          <indexterm zone="vala vapigen">
-            <primary sortas="b-vapigen">vapigen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvala">
-        <term><filename class="libraryfile">libvala-&vala-major-version;.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Vala</application> API functions
-          </para>
-          <indexterm zone="vala libvala">
-            <primary sortas="c-libvala">libvala-&vala-major-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,366 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 valgrind-download-http "https://sourceware.org/pub/valgrind/valgrind-&valgrind-version;.tar.bz2">
-  <!ENTITY valgrind-download-ftp  " ">
-  <!ENTITY valgrind-md5sum        "38ea14f567efa09687a822b33b4d9d60">
-  <!ENTITY valgrind-size          "16 MB">
-  <!ENTITY valgrind-buildsize     "390 MB (add 66 MB for tests)">
-  <!ENTITY valgrind-time          "0.5 SBU (add 6.8 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="valgrind" xreflabel="Valgrind-&valgrind-version;">
-  <?dbhtml filename="valgrind.html"?>
-
-
-  <title>Valgrind-&valgrind-version;</title>
-
-  <indexterm zone="valgrind">
-    <primary sortas="a-Valgrind">Valgrind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Valgrind</title>
-
-    <para>
-      <application>Valgrind</application> is an instrumentation framework for
-      building dynamic analysis tools. There are Valgrind tools that can
-      automatically detect many memory management and threading bugs, and
-      profile programs in detail. Valgrind can also be used to build new
-      tools.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&valgrind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&valgrind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &valgrind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &valgrind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &valgrind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &valgrind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/valgrind-&valgrind-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Valgrind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/> (for tests),
-      <xref linkend="llvm"/> (with Clang), and
-      <xref linkend="which"/> (for tests)
-    </para>
-
-<!-- See "maintainer note", below
-    <bridgehead renderas="sect4">Optional for regenerating the documentation</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Valgrind</title>
-
-    <para>
-      First, make several changes that are required for Valgrind to function on
-      systems with glibc-2.39 and binutils-2.42 installed:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../valgrind-&valgrind-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Valgrind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
-
-./configure --prefix=/usr \
-            --datadir=/usr/share/doc/valgrind-&valgrind-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make regtest</command>. The tests
-      may hang forever if <xref linkend="gdb"/> is not installed. Some tests
-      are known to hang also, depending on the version of glibc. A few tests
-      can fail in various suites. Problematic
-      tests can be disabled by changing the <userinput>prereq:</userinput> line
-      in the corresponding <filename>.vgtest</filename> file to
-      <userinput>prereq: false</userinput>. For example:
-    </para>
-
-<screen role="nodump"><userinput>sed -e 's@prereq:.*@prereq: false@' \
-    -i {helgrind,drd}/tests/pth_cond_destroy_busy.vgtest</userinput></screen>
-
-    <!-- 731 tests, 6 stderr failures, 0 stdout failures, 1 stderrB failure,
-         0 stdoutB failures, 1 post failure -bdubbs Apr 13. 22
-         valgrind-3.19.0
-
-         732 tests, 4 stderr failures, 0 stdout failures, 1 stderrB failure,
-         0 stdoutB failures, 1 post failure - bdubbs Oct 26, 22
-           gdbserver_tests/hginfo                   (stderrB)
-           memcheck/tests/cdebug_zlib_gnu           (stderr)
-           memcheck/tests/overlap                   (stderr)
-           helgrind/tests/tls_threads               (stderr)
-           drd/tests/pth_mutex_signal               (stderr)
-
-         765 tests, 2 stderr failures, 0 stdout failures, 0 stderrB failure,
-         0 stdoutB failures, 0 post failure -bdubbs May 2, 23
-         valgrind-3.21.0
-           memcheck/tests/overlap                   (stderr)
-           helgrind/tests/pth_mempcpy_false_races   (stderr) 
-
-         792 tests, 1 stderr failure, 0 stdout failures, 0 stderrB failures, 
-         0 stdoutB failures, 0 post failures
-         valgrind-3.22.0
-           helgrind/tests/pth_mempcpy_false_races   (stderr)
-           -->
-
-    <note>
-      <para>
-        The <application>OpenMP</application> tests are skipped if libgomp
-        has been compiled with <option>--enable-linux-futex</option> (the
-        default). If needed, just recompile the libgomp library from
-        the gcc build tree, passing <option>--disable-linux-futex</option>
-        to configure, storing the library to some place and changing the link
-        from <filename>/usr/lib/libgomp.so.1</filename> to point to the new
-        library.
-      </para>
-    </note>
-
-<!--  Note to maintainer: there is a long thread in ticket #5882 explaining
-      why we do not provide instructions to rebuild the documentation.
-      (still broken with TeXLive 2016) -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... docs/Makefile.in </command>: This sed provides for
-      installing the documentation in a versioned directory.
-    </para>
-
-    <para>
-      <option>--enable-lto=yes</option>: This option allows building Valgrind
-      with LTO (link time optimization).  This produces a smaller/faster
-      Valgrind (up to 10%), but build time increases to about 5.5 SBU.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          callgrind_annotate,
-          callgrind_control,
-          cg_annotate,
-          cg_diff,
-          cg_merge,
-          ms_print,
-          valgrind,
-          valgrind-di-server,
-          valgrind-listener, and
-          vgdb
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/valgrind,
-          /usr/libexec/valgrind,
-          /usr/include/valgrind, and
-          /usr/share/doc/valgrind-&valgrind-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="valgrind-prog">
-        <term><command>valgrind</command></term>
-        <listitem>
-          <para>
-            is a program for debugging and profiling Linux executables
-          </para>
-          <indexterm zone="valgrind valgrind-prog">
-            <primary sortas="b-valgrind">valgrind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="callgrind_annotate">
-        <term><command>callgrind_annotate</command></term>
-        <listitem>
-          <para>
-            takes an output file produced by the
-            <application>Valgrind</application> tool Callgrind and prints the
-            information in an easy-to-read form
-          </para>
-          <indexterm zone="valgrind callgrind_annotate">
-            <primary sortas="b-callgrind_annotate">callgrind_annotate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="callgrind_control">
-        <term><command>callgrind_control</command></term>
-        <listitem>
-          <para>
-            controls programs being run by the <application>Valgrind</application>
-            tool Callgrind
-          </para>
-          <indexterm zone="valgrind callgrind_control">
-            <primary sortas="b-callgrind_control">callgrind_control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cg_annotate">
-        <term><command>cg_annotate</command></term>
-        <listitem>
-          <para>
-            is a post-processing tool for the <application>Valgrind</application>
-            tool Cachegrind
-          </para>
-          <indexterm zone="valgrind cg_annotate">
-            <primary sortas="b-cg_annotate">cg_annotate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cg_diff">
-        <term><command>cg_diff</command></term>
-        <listitem>
-          <para>
-            compares two Cachegrind output files
-          </para>
-          <indexterm zone="valgrind cg_diff">
-            <primary sortas="b-cg_diff">cg_diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cg_merge">
-        <term><command>cg_merge</command></term>
-        <listitem>
-          <para>
-            merges multiple Cachegrind output files into one
-          </para>
-          <indexterm zone="valgrind cg_merge">
-            <primary sortas="b-cg_merge">cg_merge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ms_print">
-        <term><command>ms_print</command></term>
-        <listitem>
-          <para>
-            takes an output file produced by the <application>Valgrind</application>
-            tool Massif and prints the information in an easy-to-read form
-          </para>
-          <indexterm zone="valgrind ms_print">
-            <primary sortas="b-ms_print">ms_print</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="valgrind-di-server">
-        <term><command>valgrind-di-server</command></term>
-        <listitem>
-          <para>
-            is a server that reads debuginfo from objects stored on a
-            different machine
-          </para>
-          <indexterm zone="valgrind valgrind-di-server">
-            <primary sortas="b-valgrind-di-server">valgrind-di-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="valgrind-listener">
-        <term><command>valgrind-listener</command></term>
-        <listitem>
-          <para>
-            listens on a socket for Valgrind commentary
-          </para>
-          <indexterm zone="valgrind valgrind-listener">
-            <primary sortas="b-valgrind-listener">valgrind-listener</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vgdb">
-        <term><command>vgdb</command></term>
-        <listitem>
-          <para>
-            is an intermediary between Valgrind and GDB or a shell
-          </para>
-          <indexterm zone="valgrind vgdb">
-            <primary sortas="b-vgdb">vgdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/yasm.xml
===================================================================
--- general/prog/yasm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yasm-download-http "https://www.tortall.net/projects/yasm/releases/yasm-&yasm-version;.tar.gz">
-  <!ENTITY yasm-download-ftp  " ">
-  <!ENTITY yasm-md5sum        "fc9e586751ff789b34b1f21d572d96af">
-  <!ENTITY yasm-size          "1.5 MB">
-  <!ENTITY yasm-buildsize     "27 MB (additional 12 MB for the tests)">
-  <!ENTITY yasm-time          "0.1 SBU (additional 0.1 SBU for the tests)">
-]>
-
-<sect1 id="yasm" xreflabel="yasm-&yasm-version;">
-  <?dbhtml filename="yasm.html"?>
-
-
-  <title>yasm-&yasm-version;</title>
-
-  <indexterm zone="yasm">
-    <primary sortas="a-yasm">yasm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to yasm</title>
-
-    <para>
-      <application>Yasm</application> is a complete rewrite of the
-      <xref linkend="nasm"/> assembler. It supports the x86 and AMD64
-      instruction sets, accepts NASM and GAS assembler syntaxes and outputs
-      binary, ELF32 and ELF64 object formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yasm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yasm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yasm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yasm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yasm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yasm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">yasm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/> and
-      <xref linkend="cython"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of yasm</title>
-
-    <para>
-      Install <application>yasm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's#) ytasm.*#)#' Makefile.in &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 check</command>.
-    </para>
-
-<!-- The tests seem to intermittently fail on nasmpp_test.sh and rawpp_test.sh.
-     When run at -j1, all of the tests pass, and those tests randomly fail if
-     they are run in parallel. -renodr -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#) ytasm.*#)#' Makefile.in</command>: This sed
-      prevents it compiling 2 programs (vsyasm and ytasm) that are only of use
-      on Microsoft Windows.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>yasm</seg>
-        <seg>libyasm.a</seg>
-        <seg>/usr/include/libyasm</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="yasm-prog">
-        <term><command>yasm</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="yasm yasm">
-            <primary sortas="b-yasm">yasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libyasm">
-        <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
-          </para>
-          <indexterm zone="yasm libyasm">
-            <primary sortas="c-libyasm">libyasm.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/accountsservice.xml
===================================================================
--- general/sysutils/accountsservice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,275 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 accountsservice-download-http
-           "https://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
-  <!ENTITY accountsservice-download-ftp  " ">
-  <!ENTITY accountsservice-md5sum        "03dccfe1b306b7ca19743e86d118e64d">
-  <!ENTITY accountsservice-size          "621 KB">
-  <!ENTITY accountsservice-buildsize     "9.8 MB (add 0.5 MB for tests)">
-  <!ENTITY accountsservice-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;">
-  <?dbhtml filename="accountsservice.html"?>
-
-
-  <title>AccountsService-&accountsservice-version;</title>
-
-  <indexterm zone="accountsservice">
-    <primary sortas="a-AccountsService">AccountsService</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AccountsService</title>
-
-    <para>
-      The <application>AccountsService</application> package provides a
-      set of <application>D-Bus</application> interfaces for querying
-      and manipulating user account information and an implementation
-      of those interfaces based on the
-      <ulink role='man' url='&man;usermod.8'>usermod(8)</ulink>,
-      <ulink role='man' url='&man;useradd.8'>useradd(8)</ulink>, and
-      <ulink role='man' url='&man;userdel.8'>userdel(8)</ulink> commands.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&accountsservice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&accountsservice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &accountsservice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &accountsservice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &accountsservice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &accountsservice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AccountsService Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!--<xref linkend="libgcrypt"/> and-->
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
-      <phrase revision="systemd"><xref role='runtime' linkend="systemd"/>
-        (runtime)</phrase>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="python-dbusmock"/> and
-      <xref linkend="pygobject3"/>
-      <!-- I did not have gtk-doc installed this time, and it worked fine. -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AccountsService</title>
-
-    <para>
-      First, rename a directory whose presence prevents the build system from
-      running if <xref linkend="python-dbusmock"/> is not installed:
-    </para>
-
-<screen><userinput>mv tests/dbusmock{,-tests}</userinput></screen>
-
-    <para>
-      Then fix a test script so that the new directory is found, and adapt
-      it for Python 3.12.0 or later:
-    </para>
-
-<screen><userinput>sed -e '/accounts_service\.py/s/dbusmock/dbusmock-tests/' \
-    -e 's/assertEquals/assertEqual/'                      \
-    -i tests/test-libaccountsservice.py</userinput></screen>
-
-    <para>
-      Fix one test that fails if the <option>en_IE.UTF-8</option> locale
-      is not installed:
-    </para>
-
-<screen><userinput>sed -i '/^SIMULATED_SYSTEM_LOCALE/s/en_IE.UTF-8/en_HK.iso88591/' tests/test-daemon.py</userinput></screen>
-
-    <para>
-      Install <application>AccountsService</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dadmin_group=adm   \
-      -Delogind=true      \
-      -Dsystemdsystemunitdir=no &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dadmin_group=adm   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the package, 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>
-
-    <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
-      the group for administrator accounts.
-    </para>
-
-    <para>
-      <option>-Ddocbook=true</option>: This switch enables building
-      the D-Bus interface API documentation (needs <xref linkend="xmlto"/>).
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: This switch enables building
-      the libaccountsservice API documentation (needs
-      <xref linkend="gtk-doc"/>).
-    </para>
-
-    <para>
-      <option>-Dvapi=false</option>: This switch disables building
-      the vala bindings. Use it if you have not installed
-      <xref linkend="vala"/>.
-    </para>
-
-  </sect2>
-
- <sect2 role="configuration">
-    <title>Configuring AccountsService</title>
-
-    <para>
-      To allow users in the adm group to be listed as Administrators,
-      execute the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/polkit-1/rules.d/40-adm.rules &lt;&lt; "EOF"
-<literal>polkit.addAdminRule(function(action, subject) {
-   return ["unix-group:adm"];
-   });</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accounts-daemon (in
-          <filename class="directory">/usr/libexec</filename>)
-        </seg>
-        <seg>
-          libaccountsservice.so
-        </seg>
-        <seg>
-          /usr/include/accountsservice-1.0,
-          /usr/share/accountsservice,
-          /usr/share/gtk-doc/html/libaccountsservice (optional), and
-          /var/lib/AccountsService
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accounts-daemon">
-        <term><command>accounts-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>AccountsService</application> daemon
-          </para>
-          <indexterm zone="accountsservice accounts-daemon">
-            <primary sortas="b-accounts-daemon">accounts-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaccountsservice">
-        <term><filename class="libraryfile">libaccountsservice.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>AccountsService</application> API functions
-          </para>
-          <indexterm zone="accountsservice libaccountsservice">
-            <primary sortas="c-libaccountsservice">libaccountsservice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/acpid.xml
===================================================================
--- general/sysutils/acpid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 acpid-download-http "&sourceforge-dl;/acpid2/acpid-&acpid-version;.tar.xz">
-  <!ENTITY acpid-download-ftp  " ">
-  <!ENTITY acpid-md5sum        "988c2e3fd5ba0ea4492d3ba7273af295">
-  <!ENTITY acpid-size          "160 KB">
-  <!ENTITY acpid-buildsize     "1.9 MB">
-  <!ENTITY acpid-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="acpid" xreflabel="acpid-&acpid-version;">
-  <?dbhtml filename="acpid.html"?>
-
-
-  <title>acpid-&acpid-version;</title>
-
-  <indexterm zone="acpid">
-    <primary sortas="a-acpid">acpid</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to acpid</title>
-
-    <para>
-      The <application>acpid</application> (Advanced Configuration and Power
-      Interface event daemon) is a completely flexible, totally extensible
-      daemon for delivering ACPI events. It listens on netlink interface and
-      when an event occurs, executes programs to handle the event. The programs
-      it executes are configured through a set of configuration files, which can
-      be dropped into place by packages or by the user.
-    </para>
-
-    <note>
-      <para>
-        Some other packages may handle some ACPI events as well and they
-        may conflict with this package.  For example, &logind;
-        (read the documentation for <option>Handle*=</option> in
-        <ulink role='man' url='&man;logind.conf.5'>logind.conf(5)</ulink>
-        for details) and
-        <xref linkend='upower'/> (used by many desktop environments such as
-        GNOME, KDE, and XFCE for handling ACPI events).  If you've installed
-        such a package and it's enough for your use case, this package is
-        probably not needed.  If you really need this package, you must be
-        careful configuring it and the other packages handling ACPI events
-        to avoid conflicts.  Notably, &logind; handles some ACPI events
-        by default, so the handling of these events by &logind; should be
-        disabled first if handling these events with acpid
-        (again, read <ulink role='man'
-        url='&man;logind.conf.5'>logind.conf(5)</ulink> for details).
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&acpid-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&acpid-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &acpid-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &acpid-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &acpid-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &acpid-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of acpid</title>
-
-    <para>
-      Install <application>acpid</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/acpid-&acpid-version; &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;
-install -v -m755 -d /etc/acpi/events &amp;&amp;
-cp -r samples /usr/share/doc/acpid-&acpid-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring acpid</title>
-
-    <para>
-      <application>acpid</application> is configured by user defined events.
-      Place event files under
-      <filename class="directory">/etc/acpi/events</filename> directory. If an
-      event occurs, <command>acpid</command> recurses through the event files in
-      order to see if the regex defined after "event" matches. If they do,
-      action is executed.
-    </para>
-
-    <para>
-      The following brief example will suspend the system when the laptop
-      lid is closed<phrase revision='sysv'> (it requires
-      <xref linkend="pm-utils"/>)</phrase>.  The example also disables
-      the default handling of the lid close event by &logind; when the
-      system is on battery and not connected to any external monitor,
-      in order to avoid a conflict:
-    </para>
-
-<screen revision='sysv' role="nodump"><userinput>cat &gt; /etc/acpi/events/lid &lt;&lt; "EOF"
-<literal>event=button/lid
-action=/etc/acpi/lid.sh</literal>
-EOF
-
-cat &gt; /etc/acpi/lid.sh &lt;&lt; "EOF"
-<literal>#!/bin/sh
-/bin/grep -q open /proc/acpi/button/lid/LID/state &amp;&amp; exit 0
-/usr/sbin/pm-suspend</literal>
-EOF
-chmod +x /etc/acpi/lid.sh
-
-mkdir -pv /etc/elogind/logind.conf.d
-echo <literal>HandleLidSwitch=ignore</literal> &gt; /etc/elogind/logind.conf.d/acpi.conf</userinput></screen>
-
-<screen revision='systemd' role="nodump"><userinput>cat &gt; /etc/acpi/events/lid &lt;&lt; "EOF"
-<literal>event=button/lid
-action=/etc/acpi/lid.sh</literal>
-EOF
-
-cat &gt; /etc/acpi/lid.sh &lt;&lt; "EOF"
-<literal>#!/bin/sh
-/bin/grep -q open /proc/acpi/button/lid/LID/state &amp;&amp; exit 0
-/usr/bin/systemctl suspend</literal>
-EOF
-chmod +x /etc/acpi/lid.sh
-
-mkdir -pv /etc/systemd/logind.conf.d
-echo <literal>HandleLidSwitch=ignore</literal> &gt; /etc/systemd/logind.conf.d/acpi.conf</userinput></screen>
-
-    <para>
-      Unfortunately, not every computer labels ACPI events in the same way
-      (for example, the lid may be recognized as <filename>LID0</filename>
-      instead of <filename>LID</filename>).
-      To determine how your buttons are recognized, use the
-      <command>acpi_listen</command> tool. Also, look in the <filename
-      class="directory">samples</filename> directory under <filename
-      class="directory">/usr/share/doc/acpid-&acpid-version;</filename>
-      for more examples.
-    </para>
-
-    <sect3  id="acpid-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Socket</phrase></title>
-
-      <para revision="sysv">
-        To automatically start <command>acpid</command> when the system is
-        rebooted, install the <filename>/etc/rc.d/init.d/acpid</filename>
-        boot script from the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>acpid</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="acpid acpid-init">
-        <primary sortas="f-acpid">acpid</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-acpid</userinput></screen>
-
-      <note revision="systemd">
-        <para>
-          This package uses socket based activation and will be started when
-          something needs it. No standalone unit file is provided for this
-          package.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          acpid, acpi_listen, and kacpimon
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/acpi and /usr/share/doc/acpid-&acpid-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acpid-prog">
-        <term><command>acpid</command></term>
-        <listitem>
-          <para>
-            is a program that listens for ACPI events and executes the rules
-            that match the received event
-          </para>
-          <indexterm zone="acpid acpid-prog">
-            <primary sortas="b-acpid">acpid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="acpi_listen">
-        <term><command>acpi_listen</command></term>
-        <listitem>
-          <para>
-            is a simple tool which connects to <command>acpid</command> and
-            listens for events
-          </para>
-          <indexterm zone="acpid acpi_listen">
-            <primary sortas="b-acpi_listen">acpi_listen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kacpimon">
-        <term><command>kacpimon</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="acpid kacpimon">
-            <primary sortas="b-kacpimon">kacpimon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/at.xml
===================================================================
--- general/sysutils/at.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 at-download-http "&sources-anduin-http;/at/at_&at-version;.orig.tar.gz">
-  <!ENTITY at-download-ftp  " ">
-  <!ENTITY at-md5sum        "ca3657a1c90d7c3d252e0bc17feddc6e">
-  <!ENTITY at-size          "130 KB">
-  <!ENTITY at-buildsize     "1.9 MB (including tests)">
-  <!ENTITY at-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="at" xreflabel="At-&at-version;">
-  <?dbhtml filename="at.html"?>
-
-
-  <title>at-&at-version;</title>
-
-  <indexterm zone="at">
-    <primary sortas="a-at">at</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to at</title>
-
-    <para>
-      The <application>at</application> package provides delayed job execution
-      and batch processing. It is required for Linux Standards Base (LSB)
-      conformance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&at-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&at-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &at-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &at-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &at-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &at-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">at Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      An <xref linkend="server-mail"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of at</title>
-
-    <para>
-      Before building <application>at</application>, as the
-      <systemitem class="username">root</systemitem> user you should create
-      the group and user <systemitem class="username">atd</systemitem> which
-      will run the <command>atd</command> daemon:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 17 atd                                                  &amp;&amp;
-useradd -d /dev/null -c "atd daemon" -g atd -s /bin/false -u 17 atd</userinput></screen>
-
-    <para>
-      Install <application>at</application> with the following
-      commands:
-    </para>
-
-    <screen revision="sysv"><userinput>./configure --with-daemon_username=atd        \
-            --with-daemon_groupname=atd       \
-            --with-jobdir=/var/spool/atjobs   \
-            --with-atspool=/var/spool/atspool \
-            SENDMAIL=/usr/sbin/sendmail       &amp;&amp;
-make -j1</userinput></screen>
-
-    <screen revision="systemd"><userinput>./configure --with-daemon_username=atd        \
-            --with-daemon_groupname=atd       \
-            SENDMAIL=/usr/sbin/sendmail       \
-            --with-jobdir=/var/spool/atjobs   \
-            --with-atspool=/var/spool/atspool \
-            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install docdir=/usr/share/doc/at-&at-version; \
-             atdocdir=/usr/share/doc/at-&at-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring at</title>
-
-    <sect3 id="at-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/at.allow</filename> and
-        <filename>/etc/at.deny</filename> determines who can submit jobs via at
-        or batch.
-      </para>
-
-      <indexterm zone="at at-config">
-        <primary sortas="e-etc-at.allow">/etc/at.allow</primary>
-      </indexterm>
-
-      <indexterm zone="at at-config">
-        <primary sortas="e-etc-at.deny">/etc/at.deny</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>At</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file, to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following commands as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/atd &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/atd
-
-auth     required pam_unix.so
-account  required pam_unix.so
-password required pam_unix.so
-session  required pam_unix.so
-
-# End /etc/pam.d/atd</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="at-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        Install the <filename>/etc/init.d/atd</filename>
-        init script from the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>atd</command> daemon at boot,
-        enable the previously installed systemd unit by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="at at-init">
-        <primary sortas="f-at">at</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-atd</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable atd</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>
-          at, atd, atq (symlink), atrm (symlink), atrun, and batch
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/at-&at-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="at-prog">
-        <term><command>at</command></term>
-        <listitem>
-          <para>
-            queues, examines or deletes jobs for later execution
-          </para>
-          <indexterm zone="at at-prog">
-            <primary sortas="b-at">at</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atd">
-        <term><command>atd</command></term>
-        <listitem>
-          <para>
-            is the daemon that runs jobs queued for later execution
-          </para>
-          <indexterm zone="at atd">
-            <primary sortas="b-atd">atd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atq">
-        <term><command>atq</command></term>
-        <listitem>
-          <para>
-            lists the user's pending jobs, or all jobs, if superuser
-          </para>
-          <indexterm zone="at atq">
-            <primary sortas="b-atq">atq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atrm">
-        <term><command>atrm</command></term>
-        <listitem>
-          <para>
-            deletes jobs, identified by their job number
-          </para>
-          <indexterm zone="at atrm">
-            <primary sortas="b-atrm">atrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atrun">
-        <term><command>atrun</command></term>
-        <listitem>
-          <para>
-            runs jobs queued for later execution
-          </para>
-          <indexterm zone="at atrun">
-            <primary sortas="b-atrun">atrun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="batch">
-        <term><command>batch</command></term>
-        <listitem>
-          <para>
-            is a script that executes commands when system load levels permit
-          </para>
-          <indexterm zone="at batch">
-            <primary sortas="b-batch">batch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/autofs-kernel.xml
===================================================================
--- general/sysutils/autofs-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>K</emphasis>ernel automounter support (supports v3, v4 and v5)          [AUTOFS_FS]</screen>
Index: neral/sysutils/autofs-optional-kernel.xml
===================================================================
--- general/sysutils/autofs-optional-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork File Systems ---&gt;                            [NETWORK_FILESYSTEMS]
-    &lt;*/M&gt; N<emphasis role='blue'>F</emphasis>S client support                                            [NFS_FS]
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>MB3 and CIFS support (advanced network filesystem)             [CIFS]</screen>
Index: neral/sysutils/autofs.xml
===================================================================
--- general/sysutils/autofs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,434 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 autofs-download-http "&kernel-dl;/linux/daemons/autofs/v5/autofs-&autofs-version;.tar.xz">
-  <!ENTITY autofs-download-ftp  " ">
-  <!ENTITY autofs-md5sum        "06fb59a03c82364a0d788435b6853d70">
-  <!ENTITY autofs-size          "328 KB">
-  <!ENTITY autofs-buildsize     "5.7 MB">
-  <!ENTITY autofs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="autofs" xreflabel="Autofs-&autofs-version;">
-  <?dbhtml filename="autofs.html"?>
-
-
-  <title>autofs-&autofs-version;</title>
-
-  <indexterm zone="autofs">
-    <primary sortas="a-Autofs">Autofs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Autofs</title>
-
-    <para>
-      <application>Autofs</application> controls the operation of the automount
-      daemons. The automount daemons automatically mount filesystems when they
-      are accessed and unmount them after a period of inactivity. This is done
-      based on a set of pre-configured maps.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&autofs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&autofs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &autofs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &autofs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &autofs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &autofs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Autofs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/> and
-      <xref linkend="rpcsvc-proto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nfs-utils"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/> (client only), and
-      <xref linkend="cyrus-sasl"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="autofs-kernel">
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="autofs autofs-kernel">
-      <primary sortas="d-Automounter">Automounter</primary>
-    </indexterm>
-
-    <para>
-      Verify that automounter kernel support has been enabled:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="autofs-kernel.xml"/>
-
-    <para>
-      Optionally, enable the following options in the kernel configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="autofs-optional-kernel.xml"/>
-
-    <para>
-      Recompile and install the new kernel, if necessary.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-
-    <title>Installation of Autofs</title>
-<!--
-    <para>
-      First fix an issue introduced by glibc-2.36:
-    </para>
-
-    <screen><userinput>grep -rl linux/fs modules | xargs sed -i "/linux\/fs/d"</userinput></screen>
--->
-    <para>
-      Install <application>Autofs</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr             \
-            --with-mapdir=/etc/autofs \
-            --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        \
-            --mandir=/usr/share/man   &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>
-
-<!-- As of version 5.1.5, the configuration files are not installed anymore -->
-    <caution>
-      <para>
-        If <application>autofs</application> is already installed on your
-        system, be sure to backup your configuration files. They'll be
-        overwritten by the following command.
-      </para>
-    </caution>
-
-    <para>
-      Install the default configuration files, still as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install_samples</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-libtirpc</parameter>: This switch forces the package to
-      use libtirpc for RPC functionality instead of relying on implementation
-      from Glibc, which was removed in LFS 8.1.
-    </para>
-
-    <para revision="systemd">
-      <parameter>--with-systemd</parameter>: This switch enables installation
-      of the bundled systemd units.
-    </para>
-
-    <para>
-      <parameter>--without-openldap</parameter>: This switch disables openldap
-      if found.  If openldap is desired, omit this switch.  Note that openldap
-      support in autofs requires <xref linkend="mitkrb"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Autofs</title>
-
-    <sect3 id="autofs-config">
-      <title>Config Files</title>
-
-      <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>
-      </para>
-
-      <indexterm zone="autofs autofs-config" >
-        <primary sortas="e-etc-sysconfig-autofs.conf">/etc/sysconfig/autofs.conf</primary>
-      </indexterm>
-
-      <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.master">/etc/autofs/auto.master</primary>
-      </indexterm>
-
-      <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.misc">/etc/autofs/auto.misc</primary>
-      </indexterm>
-
-      <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.net">/etc/autofs/auto.net</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The installation process creates <filename>auto.master</filename>,
-        <filename>auto.misc</filename>,  <filename>auto.smb</filename>, and
-        <filename>auto.net</filename>. Replace the
-        <filename>auto.master</filename> file with the following commands
-        as the <systemitem class="username">root</systemitem> user:
-      </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>
-EOF</userinput></screen>
-
-      <para>
-        This file creates a new media directory,
-        <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:
-      </para>
-
-<screen>cd   -fstype=iso9660,ro,nosuid,nodev :/dev/cdrom</screen>
-
-      <para>
-        that will mount a cdrom as <filename>/media/auto/cd</filename> if
-        that directory is accessed.  The <option>--ghost</option> option tells
-        the automounter to create <quote>ghost</quote> versions (i.e. empty
-        directories) of all the mount points listed in the configuration file
-        regardless whether any of the file systems are actually mounted or not.
-        This is very convenient and highly recommended, because it will show
-        you the available auto-mountable file systems as existing directories,
-        even when their file systems aren't currently mounted. Without the
-        <option>--ghost</option> option, you'll have to remember the names of
-        the directories. As soon as you try to access one of them, the
-        directory will be created and the file system will be mounted. When
-        the file system gets unmounted again, the directory is destroyed too,
-        unless the <option>--ghost</option> option was given.
-      </para>
-
-      <note>
-        <para>
-          An alternative method would be to specify another automount
-          location such as <filename
-          class='directory'>/var/lib/auto/cdrom</filename> and create a
-          symbolic link from <filename
-          class='directory'>/media/cdrom</filename> to the automount location.
-        </para>
-      </note>
-
-      <para>
-        The <filename>auto.misc</filename> file must be configured to your
-        working hardware. The loaded configuration file should load your cdrom
-        if <filename>/dev/cdrom</filename> is active or it can be edited to
-        match your device setup.  Examples for floppies are available in the
-        file and easily activated. Documentation for this file is available
-        using the <command>man 5 autofs</command> command.
-      </para>
-
-      <para>
-        In the second line, if enabled, a user's home directory would be
-        mounted via NFS upon login.  The <filename>/etc/home.auto</filename>
-        would need to exist and have an entry similar to:
-      </para>
-
-<screen>joe  example.org:/export/home/joe</screen>
-
-      <para>
-        where the directory <filename>/export/home/joe</filename> is
-        exported via NFS from the system example.org.  NFS shares
-        are covered on the next page.
-      </para>
-
-      <para>
-        This package could also be used to mount SMB shares, however that
-        feature is not configured in these instructions.  For additional
-        configuration information, see the man pages for
-        <ulink role='man' url='&man;auto.master.5'>auto.master(5)</ulink>.
-        There are also web resources such as this <ulink
-        url='https://wiki.gentoo.org/wiki/AutoFS'>AUTOFS
-        HOWTO</ulink> available.
-      </para>
-
-    </sect3>
-
-    <sect3  id="autofs-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        <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.
-      </para>
-
-      <para revision="sysv">
-        Install the <filename>/etc/init.d/autofs</filename>
-        mount script included with the <xref linkend="bootscripts"/>
-        package.
-      </para>
-
-      <para revision="systemd">
-        To start <application>Autofs</application> at boot, enable the
-        previously installed systemd unit by running the following command as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="autofs autofs-init">
-        <primary sortas="f-autofs-init">autofs</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-autofs</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable autofs</userinput></screen>
-
-      <para revision="sysv">
-        The time-out variable is set in
-        <filename>/etc/sysconfig/autofs.conf</filename>. The installed file sets
-        a default of 60 seconds of inactivity before unmounting the device.  A
-        much shorter time may be necessary to protect buffer writing to a floppy
-        if users tend to remove the media prior to the timeout setting.
-      </para>
-
-      <note revision="systemd">
-        <para>
-          You can also specify <envar>OPTIONS</envar> variable in the
-          <filename>/etc/sysconfig/autofs</filename> file with any additional
-          parameters that you might want to pass to the automount daemon.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>automount</seg>
-        <seg>
-          libautofs.so.
-          lookup_dir.so, 
-          lookup_file.so, 
-          lookup_files.so (symlink to lookup_file.so), 
-          lookup_hosts.so,
-          lookup_ldap.so (optional), 
-          lookup_multi.so, 
-          lookup_nis.so (symlink to lookup_yp.so),
-          lookup_program.so, 
-          lookup_userhome.so, 
-          lookup_yp.so, 
-          mount_afs.so,
-          mount_autofs.so, 
-          mount_bind.so, 
-          mount_changer.so, 
-          mount_ext2.so,
-          mount_ext3.so (symlink to mount_ext2.so), 
-          mount_ext4.so (symlink to mount_ext2.so), 
-          mount_generic.so, 
-          mount_nfs.so,
-          mount_nfs4.so (symlink to mount_nfs.so), 
-          parse_amd.so, and 
-          parse_sun.so
-        </seg>
-        <seg>
-          /usr/lib/autofs and 
-          /etc/autofs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="automount">
-        <term><command>automount</command></term>
-        <listitem>
-          <para>
-            is the daemon that performs the mounting when a request is
-            made for the device
-          </para>
-          <indexterm zone="autofs automount">
-            <primary sortas="b-automount">automount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/blocaled.xml
===================================================================
--- general/sysutils/blocaled.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,239 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 blocaled-download-http "https://github.com/lfs-book/blocaled/releases/download/v&blocaled-version;/blocaled-&blocaled-version;.tar.xz">
-  <!ENTITY blocaled-download-ftp  " ">
-  <!ENTITY blocaled-md5sum        "04d9833d0dfbf3609b0d8f6d276812ff">
-  <!ENTITY blocaled-size          "262 KB">
-  <!ENTITY blocaled-buildsize     "4.2 MB (with tests)">
-  <!ENTITY blocaled-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="blocaled" revision="sysv" xreflabel="blocaled-&blocaled-version;">
-  <?dbhtml filename="blocaled.html"?>
-
-
-  <title>blocaled-&blocaled-version;</title>
-
-  <indexterm zone="blocaled">
-    <primary sortas="a-blocaled">blocaled</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to blocaled</title>
-
-    <para>
-      <application>blocaled</application> is an implementation of the
-      <emphasis>org.freedesktop.locale1</emphasis> D-Bus protocol,
-      which normally comes with <application>systemd</application>. It is
-      needed by the <application>GNOME</application> desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&blocaled-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&blocaled-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &blocaled-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &blocaled-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &blocaled-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &blocaled-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">blocaled Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="polkit"/> and
-      <xref linkend="libdaemon"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of blocaled</title>
-
-    <para>
-      Install <application>blocaled</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring blocaled</title>
-
-    <sect3 id="blocaled-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/blocaled.conf</filename>
-      </para>
-
-      <indexterm zone="blocaled blocaled-config">
-        <primary
-        sortas="e-etc-blocaled.conf">/etc/blocaled.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <filename>/etc/blocaled.conf</filename> contains the location of
-        the settings files used by <application>blocaled</application>. The
-        defaults are suitable for BLFS. Information about the entries is
-        available as comments in the file.
-      </para>
-
-      <para>
-        The <emphasis>org.freedesktop.locale1</emphasis> protocol is
-        unable to export locale variables. Locale settings are stored
-        by default in <filename>/etc/locale.conf</filename>. We need to
-        retrieve them in the bash profile. As the <systemitem class="username">
-        root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/i18n.sh
-
-if [ -r /etc/locale.conf ]; then source /etc/locale.conf; fi
-
-if [ -n "$LANG" ];              then export LANG; fi
-if [ -n "$LC_TYPE" ];           then export LC_TYPE; fi
-if [ -n "$LC_NUMERIC" ];        then export LC_NUMERIC; fi
-if [ -n "$LC_TIME" ];           then export LC_TIME; fi
-if [ -n "$LC_COLLATE" ];        then export LC_COLLATE; fi
-if [ -n "$LC_MONETARY" ];       then export LC_MONETARY; fi
-if [ -n "$LC_MESSAGES" ];       then export LC_MESSAGES; fi
-if [ -n "$LC_PAPER" ];          then export LC_PAPER; fi
-if [ -n "$LC_NAME" ];           then export LC_NAME; fi
-if [ -n "$LC_ADDRESS" ];        then export LC_ADDRESS; fi
-if [ -n "$LC_TELEPHONE" ];      then export LC_TELEPHONE; fi
-if [ -n "$LC_MEASUREMENT" ];    then export LC_MEASUREMENT; fi
-if [ -n "$LC_IDENTIFICATION" ]; then export LC_IDENTIFICATION; fi
-
-# End /etc/profile.d/i18n.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        Then the <filename>/etc/locale</filename> file should be generated,
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/locale.conf &lt;&lt; EOF
-<literal># Begin /etc/locale.conf
-
-LANG=$LANG
-
-# End /etc/locale.conf</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you plan to run an X (or Wayland) Window system, you may want to
-        set up your X keyboard. The best way to do it is to retrieve the
-        settings from <filename>/etc/sysconfig/console</filename>, and feed
-        them to the <application>blocaled</application> daemon. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>source /etc/sysconfig/console &amp;&amp;
-KEYMAP=${KEYMAP:-us}          &amp;&amp;
-
-gdbus call --system                                             \
-           --dest org.freedesktop.locale1                       \
-           --object-path /org/freedesktop/locale1               \
-           --method org.freedesktop.locale1.SetVConsoleKeyboard \
-           "$KEYMAP" "$KEYMAP_CORRECTIONS" true true</userinput></screen>
-
-      <para>
-        This should create or modify the Xorg configuration file (default is
-        <filename>/etc/X11/xorg.conf.d/30-keyboard.conf</filename>) to match
-        the keyboard settings set in <envar>KEYMAP</envar>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          blocaled (in <filename class="directory">/usr/libexec</filename>)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/blocaled
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="blocaled-prog">
-        <term><command>blocaled</command></term>
-        <listitem>
-          <para>
-            is the daemon implementing the
-            <emphasis>org.freedesktop.locale1</emphasis> D-Bus protocol
-          </para>
-          <indexterm zone="blocaled blocaled-prog">
-            <primary sortas="b-blocaled">blocaled</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/sysutils/bluez-kernel.xml
===================================================================
--- general/sysutils/bluez-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  # If it is disabled, [TIMERFD] and [EVENTFD] will be hidden and
-  # enabled implicitly.  We DO NOT recommend to enable [EXPERT]
-  # unless you are really an expert user:
-  [ /*] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;          [EXPERT]
-    [*] <emphasis role='blue'>E</emphasis>nable timerfd() system call                                   [TIMERFD]
-    [*] <emphasis role='blue'>E</emphasis>nable eventfd() system call                                   [EVENTFD]
-
-[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  &lt;*/M&gt; <emphasis role='blue'>B</emphasis>luetooth subsystem support ---&gt;                                    [BT]
-    [*]   <emphasis role='blue'>B</emphasis>luetooth Classic (BR/EDR) features                         [BT_BREDR]
-    &lt;*/M&gt;   <emphasis role='blue'>R</emphasis>FCOMM protocol support                                  [BT_RFCOMM]
-    [*]       <emphasis role='blue'>R</emphasis>FCOMM TTY support                                 [BT_RFCOMM_TTY]
-    &lt;*/M&gt;   <emphasis role='blue'>B</emphasis>NEP protocol support                                      [BT_BNEP]
-    [*]       M<emphasis role='blue'>u</emphasis>lticast filter support                       [BT_BNEP_MC_FILTER]
-    [*]       <emphasis role='blue'>P</emphasis>rotocol filter support                     [BT_BNEP_PROTO_FILTER]
-    &lt;*/M&gt;   H<emphasis role='blue'>I</emphasis>DP protocol support                                      [BT_HIDP]
-    <emphasis role='blue'>B</emphasis>luetooth device drivers ---&gt;
-      # Select the appropriate drivers for your bluetooth hardware.
-      # There are more vendor-specific drivers not listed here:
-      &lt; /*/M&gt; H<emphasis role='blue'>C</emphasis>I USB driver                                       [BT_HCIBTUSB]
-      &lt; /*/M&gt; H<emphasis role='blue'>C</emphasis>I SDIO driver                                     [BT_HCIBTSDIO]
-      &lt; /*/M&gt; H<emphasis role='blue'>C</emphasis>I UART driver                                       [BT_HCIUART]
-  &lt;*/M&gt; <emphasis role='blue'>R</emphasis>F switch subsystem support ---&gt;                                [RFKILL]
-
--*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>C</emphasis>rypto core or helper ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>U</emphasis>serspace cryptographic algorithm configuration          [CRYPTO_USER]
-  <emphasis role='blue'>B</emphasis>lock ciphers ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>A</emphasis>ES (Advanced Encryption Standard)                        [CRYPTO_AES]
-  <emphasis role='blue'>A</emphasis>EAD (authenticated encryption with associated data) ciphers ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>C</emphasis>CM (Counter with Cipher Block Chaining-MAC)              [CRYPTO_CCM]
-  H<emphasis role='blue'>a</emphasis>shes, digests, and MACs ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>C</emphasis>MAC (Cipher-based MAC)                                  [CRYPTO_CMAC]
-  <emphasis role='blue'>U</emphasis>serspace interface ---&gt;
-    &lt;*/M&gt; H<emphasis role='blue'>a</emphasis>sh algorithms                                 [CRYPTO_USER_API_HASH]
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>ymmetric key cipher algorithms             [CRYPTO_USER_API_SKCIPHER]
-    &lt;*/M&gt; <emphasis role='blue'>A</emphasis>EAD cipher algorithms                          [CRYPTO_USER_API_AEAD]</screen>
Index: neral/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,468 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bluez-download-http "&kernel-dl;/linux/bluetooth/bluez-&bluez-version;.tar.xz">
-  <!ENTITY bluez-download-ftp  " ">
-  <!ENTITY bluez-md5sum        "e6a640a70a808a2dd46b9ad44a888602">
-  <!ENTITY bluez-size          "2.3 MB">
-  <!ENTITY bluez-buildsize     "167 MB (with tests)">
-  <!ENTITY bluez-time          "0.7 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="bluez" xreflabel="BlueZ-&bluez-version;">
-  <?dbhtml filename="bluez.html"?>
-
-
-  <title>BlueZ-&bluez-version;</title>
-
-  <indexterm zone="bluez">
-    <primary sortas="a-BlueZ">BlueZ</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to BlueZ</title>
-
-    <para>
-      The <application>BlueZ</application> package contains the
-      Bluetooth protocol stack for Linux.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bluez-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bluez-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bluez-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bluez-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bluez-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bluez-time;
-        </para>
-      </listitem>
-    </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">BlueZ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="libical"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (to generate man pages)
-    </para>
-
-  </sect2>
-
-
-  <sect2 role="kernel" id="bluez-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If you are building this package to use bluetooth devices (rather than as a
-      build dependency), enable the following options in the kernel configuration,
-      also the options in the <quote>Cryptographic API</quote> section if
-      you intend to run the tests, and recompile the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="bluez-kernel.xml"/>
-
-    <indexterm zone="bluez bluez-kernel">
-      <primary sortas="d-bluez">bluez</primary>
-    </indexterm>
-  </sect2>
-
-  <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>
-
-<screen revision="sysv"><userinput>patch -Np1 -i ../bluez-&bluez-version;-obexd_without_systemd-1.patch</userinput></screen>
-
--->
-    <para>
-      Install <application>BlueZ</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --enable-library      \
-            --disable-manpages    \
-            --disable-systemd     &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --disable-manpages    \
-            --enable-library      &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <userinput>make check</userinput>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svf ../libexec/bluetooth/bluetoothd /usr/sbin</userinput></screen>
-
-    <para>
-      Install the main configuration file as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /etc/bluetooth &amp;&amp;
-install -v -m644 src/main.conf /etc/bluetooth/main.conf</userinput></screen>
-
-    <para>
-      If desired, install the API documentation as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/bluez-&bluez-version; &amp;&amp;
-install -v -m644 doc/*.txt /usr/share/doc/bluez-&bluez-version;</userinput></screen>
-
-  </sect2>
-
-
-  <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>
-      <parameter>--enable-library</parameter>: This switch enables building the
-      <application>BlueZ</application> 4 compatibility library which is required by
-      some applications.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: This switch is needed because
-      <application>systemd</application> is not part of LFS/BLFS. If you are
-      using systemd, remove this switch.
-    </para>
-
-    <para>
-      <command>ln -svf ../libexec/bluetooth/bluetoothd /usr/sbin</command>:
-      This command makes access to the bluetooth daemon more convenient.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring BlueZ</title>
-
-    <sect3 id="bluez-config">
-      <title>Configuration Files</title>
-      <para revision="sysv">
-        <filename>/etc/bluetooth/main.conf</filename> is installed automatically
-        during the install.  Additionally, there are three supplementary
-        configuration files.  /etc/sysconfig/bluetooth is installed as a part
-        of the boot script below.  In addition, you optionally can install the
-        following, as the &root; user:
-      </para>
-
-      <para revision="systemd">
-        <filename>/etc/bluetooth/main.conf</filename> is installed automatically
-        during the installation. Additionally, there are two supplementary
-        configuration files. You can optionally install the following files
-        as the &root; user:
-     </para>
-
-<screen role="root"><userinput>cat > /etc/bluetooth/rfcomm.conf &lt;&lt; "EOF"</userinput>
-<literal># Start rfcomm.conf
-# Set up the RFCOMM configuration of the Bluetooth subsystem in the Linux kernel.
-# Use one line per command
-# See the rfcomm man page for options
-
-
-# End of rfcomm.conf</literal>
-EOF</screen>
-
-<screen role="root"><userinput>cat > /etc/bluetooth/uart.conf &lt;&lt; "EOF"</userinput>
-<literal># Start uart.conf
-# Attach serial devices via UART HCI to BlueZ stack
-# Use one line per device
-# See the hciattach man page for options
-
-# End of uart.conf</literal>
-EOF</screen>
-
-      <indexterm zone="bluez bluez-config">
-        <primary
-        sortas="e-etc-bluetooth-main.conf">/etc/bluetooth/main.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3  id="bluez-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Bluez Services</phrase></title>
-
-      <para revision="sysv">
-        To automatically start the <command>bluetoothd</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/bluetooth</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>bluetoothd</command> daemon at boot,
-        enable the previously installed systemd unit by
-        running the following command as the &root; user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable bluetooth</userinput></screen>
-
-      <para revision="systemd">
-         To start the <command>obexd</command> daemon for a user session (to
-         support some Bluetooth programs using it), enable the previously
-         installed systemd unit for all users by running the following command
-         as the &root; user:
-       </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable --global obex</userinput></screen>
-
-      <indexterm zone="bluez bluez-init">
-        <primary sortas="f-bluetooth">bluetooth</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-bluetooth</userinput></screen>
-
-
-      <note revision="systemd">
-        <para>
-          <application>Systemd</application> will start the Bluetooth daemon
-          only when a bluetooth device is detected on the system.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-      <!--bccmd, -->
-          bluemoon,
-          bluetoothctl,
-          bluetoothd (symlink),
-          btattach,
-          btmon,
-          hex2hcd,
-          l2ping,
-          l2test,
-          mpris-proxy, and
-          rctest
-        </seg>
-        <seg>
-          libbluetooth.so
-        </seg>
-        <seg>
-          /etc/bluetooth,
-          /usr/{include,libexec}/bluetooth, and
-          /usr/share/doc/bluez-&bluez-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!--
-      <varlistentry id="bccmd">
-        <term><command>bccmd</command></term>
-        <listitem>
-          <para>
-            is used to issue BlueCore commands to Cambridge Silicon
-            Radio devices
-          </para>
-          <indexterm zone="bluez bccmd">
-            <primary sortas="b-bccmd">bccmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="bluemoon">
-        <term><command>bluemoon</command></term>
-        <listitem>
-          <para>
-            is a Bluemoon configuration utility
-          </para>
-          <indexterm zone="bluez bluemoon">
-            <primary sortas="b-bluemoon">bluemoon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetoothctl">
-        <term><command>bluetoothctl</command></term>
-        <listitem>
-          <para>
-            is the interactive Bluetooth control program
-          </para>
-          <indexterm zone="bluez bluetoothctl">
-            <primary sortas="b-bluetoothctl">bluetoothctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetoothd">
-        <term><command>bluetoothd</command></term>
-        <listitem>
-          <para>
-            is the Bluetooth daemon
-          </para>
-          <indexterm zone="bluez bluetoothd">
-            <primary sortas="b-bluetoothd">bluetoothd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btmon">
-        <term><command>btmon</command></term>
-        <listitem>
-          <para>
-            provides access to the Bluetooth subsystem monitor
-            infrastructure for reading HCI traces
-          </para>
-          <indexterm zone="bluez btmon">
-            <primary sortas="b-btmon">btmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="hex2hcd">
-        <term><command>hex2hcd</command></term>
-        <listitem>
-          <para>
-            is used to convert a file needed by Broadcom devices
-            to hcd (Broadcom bluetooth firmware) format
-          </para>
-          <indexterm zone="bluez hex2hcd">
-            <primary sortas="b-hex2hcd">hex2hcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="l2ping">
-        <term><command>l2ping</command></term>
-        <listitem>
-          <para>
-            is used to send a L2CAP echo request to the Bluetooth MAC
-            address given in dotted hex notation
-          </para>
-          <indexterm zone="bluez l2ping">
-            <primary sortas="b-l2ping">l2ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="l2test">
-        <term><command>l2test</command></term>
-        <listitem>
-          <para>
-            is a L2CAP testing program
-          </para>
-          <indexterm zone="bluez l2test">
-            <primary sortas="b-l2test">l2test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rctest">
-        <term><command>rctest</command></term>
-        <listitem>
-          <para>
-            is used to test RFCOMM communications on the
-            Bluetooth stack
-          </para>
-          <indexterm zone="bluez rctest">
-            <primary sortas="b-rctest">rctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbluetooth">
-        <term><filename class="libraryfile">libbluetooth.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>BlueZ</application> 4 API functions
-          </para>
-          <indexterm zone="bluez libbluetooth">
-            <primary sortas="c-libbluetooth">libbluetooth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/bubblewrap-kernel.xml
===================================================================
--- general/sysutils/bubblewrap-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    [*] <emphasis role='blue'>U</emphasis>ser namespace                                                 [USER_NS]</screen>
Index: neral/sysutils/bubblewrap.xml
===================================================================
--- general/sysutils/bubblewrap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bubblewrap-download-http "https://github.com/containers/bubblewrap/releases/download/v&bubblewrap-version;/bubblewrap-&bubblewrap-version;.tar.xz">
-  <!ENTITY bubblewrap-download-ftp  " ">
-  <!ENTITY bubblewrap-md5sum        "adcbd7c08ac068a9328ec93cd83716e5">
-  <!ENTITY bubblewrap-size          "120 KB">
-  <!ENTITY bubblewrap-buildsize     "3.3 MB (with tests)">
-  <!ENTITY bubblewrap-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="bubblewrap" xreflabel="bubblewrap-&bubblewrap-version;">
-  <?dbhtml filename="bubblewrap.html"?>
-
-
-  <title>Bubblewrap-&bubblewrap-version;</title>
-
-  <indexterm zone="bubblewrap">
-    <primary sortas="a-bubblewrap">bubblewrap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Bubblewrap</title>
-
-    <para>
-      <application>Bubblewrap</application> is a setuid implementation of user
-      namespaces, or sandboxing, that provides access to a subset of kernel
-      user namespace features. Bubblewrap allows user owned processes to run in
-      an isolated environment with limited access to the underlying filesystem.
-      <!-- Thanks for the reword DJ -->
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bubblewrap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bubblewrap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bubblewrap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bubblewrap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bubblewrap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bubblewrap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bubblewrap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> (to generate manual pages) and
-      <xref linkend="libseccomp"/> (built with python bindings, for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="bubblewrap-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      When this package began, upstream expected it could be installed
-      suid-root. That was a long time ago, suid-root is generally considered
-      a bad idea. As well as the default namespaces, this package requires the
-      optional User namespace to be enabled. If that has not yet been enabled,
-      select the following option in the kernel configuration and recompile the
-      kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="bubblewrap-kernel.xml"/>
-
-    <indexterm zone="bubblewrap bubblewrap-kernel">
-      <primary sortas="d-bubblewrap">bubblewrap</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bubblewrap</title>
-
-    <para>
-      Install <application>Bubblewrap</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Next, if you desire to run the test suite, fix an issue caused by the
-      merged-/usr configuration in LFS:
-    </para>
-
-<screen remap="test"><userinput>sed 's@symlink usr/lib64@ro-bind-try /lib64@' -i ../tests/libtest.sh</userinput></screen>
-
-    <para>
-      To test the results, issue (as a user other than the
-      <systemitem class="username">root</systemitem> user):
-      <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>
-
-    <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 Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bwrap
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bwrap">
-        <term><command>bwrap</command></term>
-        <listitem>
-          <para>
-            generates a sandbox for a program to run in
-          </para>
-          <indexterm zone="bubblewrap bwrap">
-            <primary sortas="b-bwrap">bwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,387 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 colord-download-http "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
-  <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "94bd795efa1931a34990345e4ac439a8">
-  <!ENTITY colord-size          "1.7 MB">
-  <!ENTITY colord-buildsize     "18 MB (with tests)">
-  <!ENTITY colord-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="colord" xreflabel="colord-&colord-version;">
-  <?dbhtml filename="colord.html"?>
-
-
-  <title>Colord-&colord-version;</title>
-
-  <indexterm zone="colord">
-    <primary sortas="a-colord">Colord</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord</title>
-
-    <para>
-      <application>Colord</application> is a system service that makes it easy
-      to manage, install, and generate color profiles. It is used mainly by
-      <application>GNOME Color Manager</application> for system integration
-      and use when no users are logged in.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/> (GObject Introspection recommended),
-      <xref linkend="lcms2"/>,
-      <xref linkend="polkit"/>, and
-      <!-- Polkit now needed, see #11481 in Trac -->
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="libgudev"/>,
-      <xref linkend="libgusb"/>,
-      <phrase revision="systemd" role="runtime"><xref linkend="systemd"/>
-      (runtime),</phrase>
-      and <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <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"/>,
-      <ulink url="https://www.argyllcms.com/">ArgyllCMS</ulink>, and
-      <ulink url="https://github.com/scop/bash-completion/">Bash Completion</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord</title>
-
-    <para>
-      There should be a dedicated user and group to take control of the colord
-      daemon after it has started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 71 colord &amp;&amp;
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
-        -g colord -s /bin/false colord</userinput></screen>
-
-    <para>
-      Install <application>Colord</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Ddaemon_user=colord     \
-      -Dvapi=true              \
-      -Dsystemd=false          \
-      -Dlibcolordcompat=true   \
-      -Dargyllcms_sensor=false \
-      -Dbash_completion=false  \
-      -Ddocs=false             \
-      -Dman=false              &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Ddaemon_user=colord     \
-      -Dvapi=true              \
-      -Dsystemd=true           \
-      -Dlibcolordcompat=true   \
-      -Dargyllcms_sensor=false \
-      -Dbash_completion=false  \
-      -Ddocs=false             \
-      -Dman=false              &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      One test, <filename>colord-self-test-daemon</filename>, will fail if the
-      package is already installed. The test suite must be run with the
-      system-wide D-Bus Daemon running.
-    </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"/>
-
-    <para>
-      <parameter>-Ddaemon_user=colord</parameter>: This switch is used
-      so the colord daemon will run as an unprivileged user instead of the
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      <parameter>-Dvapi=true</parameter>: This switch enables building
-      the <application>Vala</application> bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemd=false</parameter>: This switch disables
-      support for <application>systemd</application> login in Colord
-      applications.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-Dsystemd=true</parameter>: This switch enables
-      installation of the <application>systemd</application> service.
-    </para>
-
-    <para>
-      <parameter>-Dlibcolordcompat=true</parameter>: This switch enables
-      building a compatibility library for older packages that use
-      <application>Colord</application>.
-    </para>
-
-    <para>
-      <parameter>-Dargyllcms_sensor=false</parameter>: This switch
-      disables the ArgLLCMS sensor driver. Omit if you have
-      <ulink url="https://www.argyllcms.com/">ArgyllCMS</ulink> installed
-      and wish to use it.
-    </para>
-
-    <para>
-      <parameter>-Dbash_completion=false</parameter>: This switch
-      disables Bash Completion support for Colord applications.
-    </para>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: This switch disables building
-      of documentation. Omit if you have <xref linkend="gtk-doc"/> available.
-    </para>
-
-    <para>
-      <parameter>-Dman=false</parameter>: This switch disables building
-      of man pages. Omit if you have <xref linkend="docbook-utils"/>
-      available. Namespaced versions of the docbook-xsl stylesheets
-      are also required.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cd-create-profile,
-          cd-fix-profile,
-          cd-iccdump,
-          cd-it8, and
-          colormgr
-        </seg>
-        <seg>
-          libcolord.so,
-          libcolordcompat.so,
-          libcolordprivate.so, and
-          libcolorhug.so
-        </seg>
-        <seg>
-          /usr/include/colord-1,
-          /usr/lib/colord-{plugins,sensors},
-          /usr/share/color{d},
-          /usr/share/gtk-doc/html/colord, and
-          /var/lib/colord
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="cd-create-profile">
-        <term><command>cd-create-profile</command></term>
-        <listitem>
-          <para>
-            is the Color Manager Profile Creation Tool
-          </para>
-          <indexterm zone="colord cd-create-profile">
-            <primary sortas="b-cd-create-profile">cd-create-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-fix-profile">
-        <term><command>cd-fix-profile</command></term>
-        <listitem>
-          <para>
-            is a tool used to fix metadata in ICC profiles
-          </para>
-          <indexterm zone="colord cd-fix-profile">
-            <primary sortas="b-cd-fix-profile">cd-fix-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-iccdump">
-        <term><command>cd-iccdump</command></term>
-        <listitem>
-          <para>
-            dumps the contents of an ICC profile as human readable text
-          </para>
-          <indexterm zone="colord cd-iccdump">
-            <primary sortas="b-cd-iccdump">cd-iccdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-it8">
-        <term><command>cd-it8</command></term>
-        <listitem>
-          <para>
-            is the Color Manager Testing Tool
-          </para>
-          <indexterm zone="colord cd-it8">
-            <primary sortas="b-cd-it8">cd-it8</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colormgr">
-        <term><command>colormgr</command></term>
-        <listitem>
-          <para>
-            is a text-mode program that allows you to interact with colord on
-            the command line
-          </para>
-          <indexterm zone="colord colormgr">
-            <primary sortas="b-colormgr">colormgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord.so">
-        <term><filename class="libraryfile">libcolord.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application> API functions
-          </para>
-          <indexterm zone="colord libcolord.so">
-            <primary sortas="c-libcolord.so">libcolord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolordcompat.so">
-        <term><filename class="libraryfile">libcolordcompat.so</filename></term>
-        <listitem>
-          <para>
-            contains legacy API functions for compatibility with older
-            applications
-          </para>
-          <indexterm zone="colord libcolordcompat.so">
-            <primary sortas="c-libcolordcompat.so">libcolordcompat.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolordprivate.so">
-        <term><filename class="libraryfile">libcolordprivate.so</filename></term>
-        <listitem>
-          <para>
-            contains internal API functions for the programs included with
-            <application>Colord</application>
-          </para>
-          <indexterm zone="colord libcolordprivate.so">
-            <primary sortas="c-libcolordprivate.so">libcolordprivate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolorhug.so">
-        <term><filename class="libraryfile">libcolorhug.so</filename></term>
-        <listitem>
-          <para>
-            contains a simple display hardware colorimiter
-          </para>
-          <indexterm zone="colord libcolorhug.so">
-            <primary sortas="c-libcolorhug.so">libcolorhug.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: neral/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cpio-download-http "&gnu-http;/cpio/cpio-&cpio-version;.tar.bz2">
-  <!ENTITY cpio-download-ftp  " ">
-  <!ENTITY cpio-md5sum        "3394d444ca1905ea56c94b628b706a0b">
-  <!ENTITY cpio-size          "1.6 MB">
-  <!ENTITY cpio-buildsize     "21 MB (with tests and docs)">
-  <!ENTITY cpio-time          "0.3 SBU (with tests and docs)">
-]>
-
-<sect1 id="cpio" xreflabel="cpio-&cpio-version;">
-  <?dbhtml filename="cpio.html"?>
-
-
-  <title>cpio-&cpio-version;</title>
-
-  <indexterm zone="cpio">
-    <primary sortas="a-Cpio">Cpio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cpio</title>
-
-    <para>
-      The <application>cpio</application> package contains
-      tools for archiving.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cpio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cpio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cpio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cpio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cpio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cpio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CPIO Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cpio</title>
-
-    <para>
-      Install <application>cpio</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-mt   \
-            --with-rmt=/usr/libexec/rmt &amp;&amp;
-make &amp;&amp;
-makeinfo --html            -o doc/html      doc/cpio.texi &amp;&amp;
-makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi &amp;&amp;
-makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/> installed and wish to create PDF
-      or Postscript documentation, issue one or both of the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf &amp;&amp;
-make -C doc ps</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/cpio-&cpio-version;/html &amp;&amp;
-install -v -m644    doc/html/* \
-                    /usr/share/doc/cpio-&cpio-version;/html &amp;&amp;
-install -v -m644    doc/cpio.{html,txt} \
-                    /usr/share/doc/cpio-&cpio-version;</userinput></screen>
-
-    <para>
-      If you built PDF or Postscript documentation, install it
-      by issuing the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/cpio.{pdf,ps,dvi} \
-                 /usr/share/doc/cpio-&cpio-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- FIXME: Removed due to merged-/usr transition
-    <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>
-      <parameter>--enable-mt</parameter>: This parameter forces the
-      building and installation of the <command>mt</command> program.
-    </para>
-
-    <para>
-      <parameter>--with-rmt=/usr/libexec/rmt</parameter>: This parameter
-      inhibits building the <command>rmt</command> program as it is already
-      installed by the <application>Tar</application> package in LFS.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cpio and mt</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/cpio-&cpio-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cpio-prog">
-        <term><command>cpio</command></term>
-        <listitem>
-          <para>
-            copies files to and from archives
-          </para>
-          <indexterm zone="cpio cpio-prog">
-            <primary sortas="b-cpio">cpio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mt">
-        <term><command>mt</command></term>
-        <listitem>
-          <para>
-            controls magnetic tape drive operations
-          </para>
-          <indexterm zone="cpio mt">
-            <primary sortas="b-mt">mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/cups-pk-helper.xml
===================================================================
--- general/sysutils/cups-pk-helper.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cups-pk-helper-download-http
-           "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-&cups-pk-helper-version;.tar.xz">
-  <!ENTITY cups-pk-helper-download-ftp  " ">
-  <!ENTITY cups-pk-helper-md5sum        "0cdadec9ea8f88b7fc7af8ca206da2bd">
-  <!ENTITY cups-pk-helper-size          "56 KB">
-  <!ENTITY cups-pk-helper-buildsize     "5.3 MB">
-  <!ENTITY cups-pk-helper-time          "0.1 SBU">
-]>
-
-<sect1 id="cups-pk-helper" xreflabel="cups-pk-helper-&cups-pk-helper-version;">
-  <?dbhtml filename="cups-pk-helper.html"?>
-
-
-  <title>cups-pk-helper-&cups-pk-helper-version;</title>
-
-  <indexterm zone="cups-pk-helper">
-    <primary sortas="a-cups-pk-helper">cups-pk-helper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cups-pk-helper</title>
-
-    <para>
-      The <application>cups-pk-helper</application> package contains a
-      <application>PolicyKit</application> helper used to configure
-      <application>Cups</application> with fine-grained privileges.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-pk-helper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-pk-helper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-pk-helper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-pk-helper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-pk-helper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-pk-helper-time;
-        </para>
-      </listitem>
-    </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>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cups"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/cups-pk-helper"/>
-    </para>
--->
-
-  </sect2>
-
-  <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>
-      Install <application>cups-pk-helper</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr .. &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cups-pk-helper-mechanism (library executable)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,717 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbus-download-http "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
-  <!ENTITY dbus-download-ftp  " ">
-  <!ENTITY dbus-md5sum        "46070a3487817ff690981f8cd2ba9376">
-  <!ENTITY dbus-size          "1.3 MB">
-  <!ENTITY dbus-buildsize     "23 MB (add 25 MB for tests)">
-  <!ENTITY dbus-time          "0.2 SBU (add 1.5 SBU for tests)">
-  <!-- The former value was 0.8 SBU, which was far more sensible. -->
-  <!-- I got 'real  0m14.355s' for make check at -j1; bdubbs dbus-1.14.2 -->
-  <!-- Now 'real 2m51.642ss' for make check at -j1; bdubbs dbus-1.14.6
-# TOTAL: 217
-# PASS:  217
-
-Sane test results for 1.14.8.  -bdubbs
-
-For 1.14.10:
-# TOTAL: 219
-# PASS:  218
-# FAIL:  1
-
-not ok 2 test-autolaunch
-  -->
-]>
-
-<sect1 id="dbus" xreflabel="dbus-&dbus-version;">
-  <?dbhtml filename="dbus.html"?>
-
-
-  <title>dbus-&dbus-version;</title>
-
-  <indexterm zone="dbus">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to D-Bus</title>
-
-    <para revision="sysv">
-      <application>D-Bus</application> is a message bus system, a simple way
-      for applications to talk to one another.
-      <application>D-Bus</application> supplies both a system daemon (for
-      events such as <quote>new hardware device added</quote> or <quote>printer
-      queue changed</quote>) and a per-user-login-session daemon (for general
-      IPC needs among user applications). Also, the message bus is built on top
-      of a general one-to-one message passing framework, which can be used by
-      any two applications to communicate directly (without going through the
-      message bus daemon).
-    </para>
-
-    <para revision="systemd">
-      Even though <application>D-Bus</application> was built in LFS, there are
-      some features provided by the package that other BLFS packages need, but
-      their dependencies didn't fit into LFS.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dbus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dbus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dbus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dbus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dbus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dbus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">D-Bus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/> (for <command>dbus-launch</command> program)
-      <!-- elogind cannot be used by dbus: dbus only uses the systemd service,
-      not the logind one
-      <phrase revision="sysv">and <xref linkend="elogind"/> (These are
-      circular dependencies. First build without them, and then again after
-      both packages are installed.)</phrase>-->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/>
-      (runtime, for registering services launched by D-Bus session daemon as
-      systemd user services);</phrase>
-      For the tests:
-      <xref linkend="dbus-python"/>,
-      <xref linkend="pygobject3"/>,
-      and <xref linkend="valgrind"/>;
-
-      for documentation:
-      <xref linkend="doxygen"/>,
-      <xref linkend="xmlto"/>,
-      <ulink url="https://pypi.python.org/pypi/mallard-ducktype">Ducktype</ulink>,
-      and
-      <ulink url="&gnome-download-http;/yelp-tools/">Yelp Tools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-    <!--
-    <para revision="sysv">
-      If they do not already exist,
-      as the <systemitem class="username">root</systemitem> user, create a
-      system user and group to handle the system message bus activity:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>groupadd -g 18 messagebus &amp;&amp;
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
-        -u 18 -g messagebus -s /bin/false messagebus</userinput></screen>
-    -->
-
-    <para>
-      Install <application>D-Bus</application> by running the following
-      commands (you may wish to review the output from <command>./configure
-      --help</command> first and add any desired parameters to the
-      <command>configure</command> command shown below):
-    </para>
-
-    <!-- Only usefull for systemd: it installs the services files in the
-    systemd/user
-    - -enable-user-session                \ -->
-<screen revision="sysv"><userinput>./configure --prefix=/usr                        \
-            --sysconfdir=/etc                    \
-            --localstatedir=/var                 \
-            --runstatedir=/run                   \
-            --disable-doxygen-docs               \
-            --disable-xml-docs                   \
-            --disable-static                     \
-            --with-systemduserunitdir=no         \
-            --with-systemdsystemunitdir=no       \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
-            --with-system-socket=/run/dbus/system_bus_socket &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                        \
-            --sysconfdir=/etc                    \
-            --localstatedir=/var                 \
-            --runstatedir=/run                   \
-            --enable-user-session                \
-            --disable-doxygen-docs               \
-            --disable-xml-docs                   \
-            --disable-static                     \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
-            --with-system-socket=/run/dbus/system_bus_socket &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      See below for test instructions.
-    </para>
-
-<!--
-    <warning revision="systemd">
-      <para>
-        Installing the package will override all files installed by
-        <application>D-Bus</application> in LFS. It is critical that
-        nothing uses <application>D-Bus</application> libraries or
-        programs during the installation. The best way to ensure that these
-        libraries are not being used is to run the installation in rescue mode.
-        To switch to rescue mode, run the following command as the
-        <systemitem class="username">root</systemitem> user (from a TTY):
-      </para>
-
-<screen role="root"><userinput>systemctl start rescue.target</userinput></screen>
-
-    </warning>
--->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!-- FIXME: No longer needed with usr merge
-    <para>
-      The shared library needs to be moved to
-      <filename class="directory">/lib</filename>, and as a result the
-      <filename class="extension">.so</filename> file in
-      <filename class="directory">/usr/lib</filename> will need to be
-      recreated. Run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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>
-      If you are using a DESTDIR install,
-      <command>dbus-daemon-launch-helper</command> needs to be fixed
-      afterwards. Issue, as <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>chown -v root:messagebus /usr/libexec/dbus-daemon-launch-helper &amp;&amp;
-chmod -v      4750       /usr/libexec/dbus-daemon-launch-helper</userinput></screen>
-
-    <para revision="sysv">
-      If you are still building your system in chroot or you did not start the
-      daemon yet, but you want to compile some packages that require
-      <application>D-Bus</application>, generate the
-      <application>D-Bus</application> UUID to avoid warnings when compiling
-      some packages with the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>dbus-uuidgen --ensure</userinput></screen>
-
-    <para revision="sysv">
-      If using <xref linkend="elogind"/>, create a symlink to the
-      <filename>/var/lib/dbus/machine-id</filename> file:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>ln -sfv /var/lib/dbus/machine-id /etc</userinput></screen>
-
-<!--
-    <para revision="systemd">
-      If not in chroot, at this point, you should reload the systemd daemon,
-      and reenter multi-user mode with the following commands (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl daemon-reload
-systemctl start multi-user.target</userinput></screen>
--->
-
-    <!-- Without dbus-python and pygobject3, only 39 tests are run and
-         11 out of 39 are skipped.  With dbus-python and pygobject3
-         installed, 238 tests are run and 37 out of 238 are skipped.  -->
-
-    <para>
-      Many tests are disabled unless both <xref linkend="dbus-python"/>
-      and <xref linkend="pygobject3"/> have been installed.  They must be
-      run as an unprivileged user from a local session with bus address.
-      To run the standard tests issue <command>make check</command>.
-    </para>
-
-    <!-- With dbus-python and pygobject3 installed and these additional
-         debug options, 347 tests are run and 21 out of 347 are skipped.
-         Additionally,  217 tests in the "name-test" directory are run
-         and none is skipped.  -->
-    <para>
-      If you want to run the unit regression tests, configure requires
-      additional parameters which expose additional functionality in the
-      binaries that are not intended to be used in a production build of
-      <application>D-Bus</application>.  If you would like to run the tests,
-      issue the following commands (for the tests, you don't need to build the
-      docs):
-    </para>
-
-<screen remap="test"><userinput>make distclean                                    &amp;&amp;
-PYTHON=python3 ./configure --enable-tests         \
-                           --enable-asserts       \
-                           --disable-doxygen-docs \
-                           --disable-xml-docs     &amp;&amp;
-make                                              &amp;&amp;
-make check</userinput></screen>
-
-    <para>
-      One test, test-autolaunch, is known to fail.
-      There have also been reports that the tests may fail if running inside a
-      Midnight Commander shell. You may get out-of-memory error messages when
-      running the tests. These are normal and can be safely ignored.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-doxygen-docs</parameter>: This switch disables
-      doxygen documentation build and install, if you have
-      <application>doxygen</application> installed. If
-      <application>doxygen</application> is installed, and you wish to build
-      them, remove this parameter.
-    </para>
-
-    <para>
-      <parameter>--disable-xml-docs</parameter>: This switch disables html
-      documentation build and install, if you have
-      <application>xmlto</application> installed. If
-      <application>xmlto</application> is installed, and you wish to build
-      them, remove this parameter.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para revision="systemd">
-      <parameter>--enable-user-session</parameter>: This parameter enables
-      per-user DBus sessions with
-      <application>systemd</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-systemd{user,system}unitdir=no</parameter>: These
-      switches disable installation of systemd units on elogind based systems.
-    </para>
-<!-- not in instructions anymore
-    <para>
-      <parameter>- -with-system-pid-file=/run/dbus/pid</parameter>: This
-      parameter specifies the location of the PID file.
-    </para>
--->
-    <para>
-      <parameter>--with-system-socket=/run/dbus/system_bus_socket</parameter>:
-      This parameter specifies the location of the system bus socket.
-    </para>
-
-    <para>
-      <parameter>--enable-tests</parameter>: Builds extra parts of the code to
-      support all tests. Do not use on a production build.
-    </para>
-
-    <para>
-      <option>--enable-embedded-tests</option>: Builds extra parts of the
-      code to support only unit tests. Do not use on a production build.
-    </para>
-
-    <para>
-      <parameter>--enable-asserts</parameter>: Enables debugging code to run
-      assertions for statements normally assumed to be true. This prevents a
-      warning that '<parameter>--enable-tests</parameter>' on its own is only
-      useful for profiling and might not give true results for all tests, but
-      adds its own NOTE that this should not be used in a production build.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring D-Bus</title>
-
-    <sect3 id="dbus-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/dbus-1/session.conf</filename>,
-        <filename>/etc/dbus-1/system.conf</filename> and
-        <filename>/etc/dbus-1/system.d/*</filename>
-      </para>
-
-      <indexterm zone="dbus dbus-config">
-        <primary sortas="e-etc-dbus-1-session.conf">/etc/dbus-1/session.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dbus dbus-config">
-        <primary sortas="e-etc-dbus-1/system.conf">/etc/dbus-1/system.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dbus dbus-config">
-        <primary sortas="e-etc-dbus-1-system.d-star">/etc/dbus-1/system.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="dbus-session-config" xreflabel="D-Bus custom services directory">
-      <title>Configuration Information</title>
-
-      <para>
-        The configuration files listed above should probably not be
-        modified. If changes are required, you should create
-        <filename>/etc/dbus-1/session-local.conf</filename> and/or
-        <filename>/etc/dbus-1/system-local.conf</filename> and make any
-        desired changes to these files.
-     </para>
-
-      <para>
-        If any packages install a
-        <application>D-Bus</application> <filename>.service</filename>
-        file outside of the standard <filename
-        class="directory">/usr/share/dbus-1/services</filename> directory,
-        that directory should be added to the local session configuration.
-        For instance, <filename
-        class="directory">/usr/local/share/dbus-1/services</filename> can
-        be added by performing the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/dbus-1/session-local.conf &lt;&lt; "EOF"
-<literal>&lt;!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-&lt;busconfig&gt;
-
-  &lt;!-- Search for .service files in /usr/local --&gt;
-  &lt;servicedir&gt;/usr/local/share/dbus-1/services&lt;/servicedir&gt;
-
-&lt;/busconfig&gt;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="dbus-session">
-      <title>D-Bus Session Daemon</title>
-
-      <para revision="sysv">
-        To automatically start <command>dbus-daemon</command> when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/dbus</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <indexterm zone="dbus dbus-session" revision="sysv">
-        <primary sortas="f-dbus">dbus</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-dbus</userinput></screen>
-
-      <para revision="sysv">
-        If this is the first time to install
-        <application>D-Bus</application> on the system and you are not
-        operating in a chroot environment, you can immediately start
-        <command>dbus-daemon</command> without rebooting the system:
-      </para>
-
-      <!-- nodump because maybe the user is building in chroot -->
-      <screen role="nodump" revision="sysv"><userinput>/etc/init.d/dbus start</userinput></screen>
-
-      <para revision="sysv">
-        Note that this boot script only starts the system-wide
-        <application>D-Bus</application> daemon. Each user requiring access to
-        <application>D-Bus</application> services will also need to run a
-        session daemon as well. There are many methods you can use to start a
-        session daemon using the <command>dbus-launch</command> command. Review
-        the <command>dbus-launch</command> man page for details about the
-        available parameters and options. Here are some suggestions and
-        examples:
-      </para>
-
-      <para revision="systemd">
-        There are many methods you can use to start a session daemon
-        using the <command>dbus-launch</command> command. Review the
-        <command>dbus-launch</command> man page for details about the
-        available parameters and options. Here are some suggestions and
-        examples:
-      </para>
-
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Add <command>dbus-launch</command> to the line in the
-            <filename>~/.xinitrc</filename> file that starts your graphical
-            desktop environment.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            If you use <command>gdm</command> or some other display manager
-            that calls the <filename>~/.xsession</filename> file, you can add
-            <command>dbus-launch</command> to the line in your
-            <filename>~/.xsession</filename> file that starts your graphical
-            desktop environment. The syntax would be similar to the example in
-            the <filename>~/.xinitrc</filename> file.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The examples shown previously use
-            <command>dbus-launch</command> to specify a program to be run. This
-            has the benefit (when also using the
-            <parameter>--exit-with-x11</parameter> parameter) of stopping the
-            session daemon when the specified program is stopped. You can also
-            start the session daemon in your system or personal startup scripts
-            by adding the following lines:
-          </para>
-
-<screen role="nodump"><userinput><literal># Start the D-Bus session daemon
-eval `dbus-launch`
-export DBUS_SESSION_BUS_ADDRESS</literal></userinput></screen>
-
-          <para>
-            This method will not stop the session daemon when you exit
-            your shell, therefore you should add the following line to your
-            <filename>~/.bash_logout</filename> file:
-          </para>
-
-<screen role="nodump"><userinput><literal># Kill the D-Bus session daemon
-kill $DBUS_SESSION_BUS_PID</literal></userinput></screen>
-        </listitem>
-
-        <!-- KDM is no longer usable, SDDM is it's replacement
-        <listitem>
-          <para>
-            A hint has been written that provides ways to start scripts
-            using the KDM session manager of KDE. The concepts in this hint could
-            possibly be used with other session managers as well. The hint is
-            located at <ulink
-            url="&hints-root;/downloads/files/execute-session-scripts-using-kdm.txt"/>.
-          </para>
-        </listitem>
-        -->
-
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content" revision="sysv">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
-          dbus-run-session, dbus-send, dbus-test-tool,
-          dbus-update-activation-environment, and dbus-uuidgen
-        </seg>
-        <seg>
-           libdbus-1.so
-        </seg>
-        <seg>
-          /etc/dbus-1,
-          /usr/{include,lib}/dbus-1.0,
-          /usr/lib/cmake/DBus1,
-          /usr/share/dbus-1,
-          /usr/share/xml/dbus-1,
-          /usr/share/doc/dbus-&dbus-version;, and
-          /var/{lib,run}/dbus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dbus-cleanup-sockets">
-        <term><command>dbus-cleanup-sockets</command></term>
-        <listitem>
-          <para>
-            is used to clean up leftover sockets in a directory
-          </para>
-          <indexterm zone="dbus dbus-cleanup-sockets">
-            <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-daemon">
-        <term><command>dbus-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>D-Bus</application> message bus daemon
-          </para>
-          <indexterm zone="dbus dbus-daemon">
-            <primary sortas="b-dbus-daemon">dbus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-launch">
-        <term><command>dbus-launch</command></term>
-        <listitem>
-          <para>
-            is used to start <command>dbus-daemon</command> from a shell
-            script. It  would  normally be called from a user's login
-            scripts
-          </para>
-          <indexterm zone="dbus dbus-launch">
-            <primary sortas="b-dbus-launch">dbus-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-monitor">
-        <term><command>dbus-monitor</command></term>
-        <listitem>
-          <para>
-            is used to monitor messages going through a
-            <application>D-Bus</application> message bus
-          </para>
-          <indexterm zone="dbus dbus-monitor">
-            <primary sortas="b-dbus-monitor">dbus-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-run-session">
-        <term><command>dbus-run-session</command></term>
-        <listitem>
-          <para>
-            starts a process as a new <application>D-Bus</application> session
-          </para>
-          <indexterm zone="dbus dbus-run-session">
-            <primary sortas="b-dbus-run-session">dbus-run-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-send">
-        <term><command>dbus-send</command></term>
-        <listitem>
-          <para>
-            is used to send a message to a <application>D-Bus</application>
-            message bus
-          </para>
-          <indexterm zone="dbus dbus-send">
-            <primary sortas="b-dbus-send">dbus-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-test-tool">
-        <term><command>dbus-test-tool</command></term>
-        <listitem>
-          <para>
-            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>
-          </para>
-          <indexterm zone="dbus dbus-test-tool">
-            <primary sortas="b-dbus-test-tool">dbus-test-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-update-activation-environment">
-        <term><command>dbus-update-activation-environment</command></term>
-        <listitem>
-          <para>
-            is used to update the environment used for
-            <application>D-Bus</application> session services;
-            it updates the list of environment variables used by
-            <command>dbus-daemon --session</command> when it activates session
-            services without using systemd
-          </para>
-          <indexterm zone="dbus dbus-update-activation-environment">
-            <primary sortas="b-dbus-update-activation-environment">
-            dbus-update-activation-environment</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-uuidgen">
-        <term><command>dbus-uuidgen</command></term>
-        <listitem>
-          <para>
-            is used to generate a universally unique ID
-          </para>
-          <indexterm zone="dbus dbus-uuidgen">
-            <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-1">
-        <term><filename class="libraryfile">libdbus-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the
-            <application>D-Bus</application> message daemon.
-            <application>D-Bus</application> is first a library that provides
-            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
-          </para>
-          <indexterm zone="dbus libdbus-1">
-            <primary sortas="c-libdbus-1">libdbus-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content" revision="systemd">
-    <title>Contents</title>
-
-      <para>
-        A list of the installed files, along with their short
-        descriptions can be found at
-        <ulink url="&lfs-root;/chapter08/dbus.html#contents-dbus"/>.
-      </para>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/elogind-kernel.xml
===================================================================
--- general/sysutils/elogind-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] <emphasis role='blue'>I</emphasis>notify support for userspace                               [INOTIFY_USER]
-  <emphasis role='blue'>P</emphasis>seudo filesystems ---&gt;
-    [*] <emphasis role='blue'>T</emphasis>mpfs virtual memory file system support (former shm fs)         [TMPFS]
-    [*]   <emphasis role='blue'>T</emphasis>mpfs POSIX Access Control Lists                     [TMPFS_POSIX_ACL]</screen>
Index: neral/sysutils/elogind-test-kernel.xml
===================================================================
--- general/sysutils/elogind-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>-*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>C</emphasis>rypto core or helper ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>U</emphasis>serspace cryptographic algorithm configuration          [CRYPTO_USER]
-  <emphasis role='blue'>U</emphasis>serspace interface ---&gt;
-    &lt;*/M&gt; H<emphasis role='blue'>a</emphasis>sh algorithms                                 [CRYPTO_USER_API_HASH]</screen>
Index: neral/sysutils/elogind.xml
===================================================================
--- general/sysutils/elogind.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,418 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">
-  <!ENTITY elogind-download-ftp  " ">
-  <!ENTITY elogind-md5sum        "864463a809190c724c11084f908db72c">
-  <!ENTITY elogind-size          "2.0 MB">
-  <!ENTITY elogind-buildsize     "48 MB (with tests)">
-  <!ENTITY elogind-time          "0.4 SBU (with parallelism=4; with tests)">
-]>
-
-<sect1 id="elogind" revision="sysv" xreflabel="elogind-&elogind-version;">
-  <?dbhtml filename="elogind.html"?>
-
-
-  <title>elogind-&elogind-version;</title>
-
-  <indexterm zone="elogind">
-    <primary sortas="a-elogind">elogind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to elogind</title>
-
-    <para>
-      <application>elogind</application> is the
-      <application>systemd</application> project's "logind", extracted to
-      be a standalone daemon.  It integrates with <xref linkend="linux-pam"/>
-      to track all the users logged in to a system, and whether they
-      are logged in graphically, on the console, or remotely.
-      <application>Elogind</application> exposes this information via the
-      standard org.freedesktop.login1 <application>D-Bus</application>
-      interface, and also through the file system using systemd's standard
-      <filename class="directory">/run/systemd</filename> layout.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&elogind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&elogind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &elogind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &elogind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &elogind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &elogind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">elogind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="dbus"/> (runtime),
-      <xref linkend="linux-pam"/> (required for Xorg),
-      <xref role="runtime" linkend="polkit"/> (runtime),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/> (all three to build the man pages)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lxml"/>,
-      <xref linkend="zsh"/>,
-      <xref linkend="valgrind"/> (needed for tests),
-      <ulink url="https://github.com/linux-audit/audit-userspace">
-      audit-userspace</ulink>,
-      <ulink url="https://github.com/scop/bash-completion">
-      bash-completion</ulink>,
-      <ulink url="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/">
-      kexec</ulink>, and
-      <ulink url="https://selinuxproject.org/page/Main_Page">
-      SELinux</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/Logind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="elogind-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="elogind-kernel.xml"/>
-
-    <para>
-      In addition, some tests need the userspace cryptographic kernel API, which
-      is enabled with:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="elogind-test-kernel.xml"/>
-
-    <indexterm zone="elogind elogind-kernel">
-      <primary sortas="d-elogind">elogind</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of elogind</title>
-
-    <para>
-      Install <application>elogind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                              \
-      --prefix=/usr                         \
-      --buildtype=release                   \
-      -Dman=auto                            \
-      -Ddocdir=/usr/share/doc/elogind-&elogind-version; \
-      -Dcgroup-controller=elogind           \
-      -Ddev-kvm-mode=0660                   \
-      -Ddbuspolicydir=/etc/dbus-1/system.d &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. A few tests
-      are skipped if not run with &root; privileges.  
-      Three tests, <filename>test-login</filename>, <filename>dbus-docs-fresh</filename>,
-      and <filename>check-version-history</filename>, are known to fail.
-      <!--
-      <filename>test-id128</filename> require the
-      <filename>/etc/machine-id</filename> symlink, so they will fail if
-      this symlink is not created following the instruction in
-      <xref linkend='dbus'/> yet.
-
-      I did have the symlink and test-fs-util still failed (the only
-      one).  The error was 
-         Assertion 'chase_symlinks(q, NULL, CHASE_SAFE, NULL, NULL) >= 0' 
-         failed at src/test/test-fs-util.c:303, function 
-         test_chase_symlinks(). Aborting.
-      Looking at teh code, I don't think that is related to the 
-      /etc/machine-id symlink. - bdubbs, version 252.23
-      -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install                                           &amp;&amp;
-ln -sfv  libelogind.pc /usr/lib/pkgconfig/libsystemd.pc &amp;&amp;
-ln -sfvn elogind /usr/include/systemd</userinput></screen>
-
-  </sect2>
-
-  <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>
-      <command>sed ... src/login/logind.c</command>: This change allows the
-      elogind daemon to exit when it is disconnected from dbus (for example
-      when dbus is killed).
-    </para>
-    -->
-    <para>
-      <parameter>-Ddocdir=/usr/share/doc/elogind-&elogind-version;</parameter>:
-      This is needed to install documentation in a versioned directory.
-    </para>
-
-    <para>
-      <parameter>-Dcgroup-controller=elogind</parameter>: This switch is
-      necessary to build this package when the kernel is not built with
-      <option>CONFIG_CGROUPS</option> enabled.  Note that
-      <application>elogind</application> strictly needs
-      a kernel with <option>CONFIG_CGROUPS</option> enabled at runtime,
-      but this switch will allow building the package first.
-    </para>
-
-    <para>
-      <parameter>-Ddbuspolicydir=/etc/dbus-1/system.d</parameter>: This switch
-      sets the location of the <application>D-Bus</application> policy
-      directory.
-    </para>
-
-    <para>
-      <parameter>-Ddev-kvm-mode=0660</parameter>: The LFS udev rule sets the
-      mode of <filename class='devicefile'>/dev/kvm</filename> to 0660.
-      This option ensures the elogind udev rules consistent with the LFS
-      configuration.
-    </para>
-
-    <para>
-      <parameter>-Dman=auto</parameter>: The default value of this switch is
-      <emphasis>false</emphasis>. Setting it to <emphasis>auto</emphasis>
-      allows building and installing the man pages if the recommended
-      dependencies are installed.
-    </para>
-
-    <para>
-      <option>-Dhtml=auto</option>: The default value of this switch is
-      <emphasis>false</emphasis>. Setting it to <emphasis>auto</emphasis>
-      allows building and installing the html documentation if the recommended
-      dependencies are installed.
-    </para>
-
-    <para>
-      <option>-Ddefault-kill-user-processes=false</option>: Determines whether
-      the processes of a user should be killed when the user logs out. The
-      default is <emphasis>true</emphasis>, but this defeats the traditional
-      use of <command>screen</command> or <command>tmux</command>. This can
-      also be changed in the configuration file (see below).
-    </para>
-
-    <para>
-      <command>ln -s ...</command>: These commands install symlinks so that
-      software packages can find the systemd-compatible library and headers.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-  <title>Configuring elogind</title>
-
-    <sect3 id="elogind-config">
-      <title>Config File</title>
-      <para>
-        <filename>/etc/elogind/logind.conf</filename>
-      </para>
-
-      <indexterm zone="elogind elogind-config">
-        <primary
-        sortas="e-etc-elogind-logind.conf">/etc/elogind/logind.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The installed file <filename>/etc/elogind/logind.conf</filename>
-        contains all the possible options with their defaults, commented
-        out. You may wish to disable automatically killing user processes when the user logs
-        out, by running, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="root"><userinput>sed -e '/\[Login\]/a KillUserProcesses=no' \
-    -i /etc/elogind/logind.conf</userinput></screen>
-
-      <para>
-        Each user will need to register a user session using
-        <application>Linux-PAM</application> at login. The
-        <filename>/etc/pam.d/system-session</filename> file needs to
-        be modified and a new file must be created in order for
-        <command>elogind</command> to work correctly. Run the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin elogind addition
-
-session  required    pam_loginuid.so
-session  optional    pam_elogind.so
-
-# End elogind addition</literal>
-EOF
-cat &gt; /etc/pam.d/elogind-user &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/elogind-user
-
-account  required    pam_access.so
-account  include     system-account
-
-session  required    pam_env.so
-session  required    pam_limits.so
-session  required    pam_unix.so
-session  required    pam_loginuid.so
-session  optional    pam_keyinit.so force revoke
-session  optional    pam_elogind.so
-
-auth     required    pam_deny.so
-password required    pam_deny.so
-
-# End /etc/pam.d/elogind-user</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>After completion of <application>elogind</application>, 
-      you should check that it functions properly.  First ensure that
-      <application>dbus</application> is running.  It may be easiest
-      to do this by rebooting the system.  After logging in again, run 
-      the command <command>loginctl</command>.  The result should indicate 
-      that a SESSION and a SEAT have been created.</para>
-    </note>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content" revision="sysv">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          busctl,
-          elogind-inhibit, and
-          loginctl
-        </seg>
-        <seg>
-           libelogind.so
-        </seg>
-        <seg>
-          /usr/lib/elogind,
-          /etc/elogind,
-          /usr/include/elogind, and
-          /usr/share/doc/elogind-&elogind-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="busctl">
-        <term><command>busctl</command></term>
-        <listitem>
-          <para>
-            is used to introspect and monitor the D-Bus bus
-          </para>
-          <indexterm zone="elogind busctl">
-            <primary sortas="b-busctl">busctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="elogind-inhibit">
-        <term><command>elogind-inhibit</command></term>
-        <listitem>
-          <para>
-            is used to execute a program with a shutdown, sleep or idle
-            inhibitor lock taken
-          </para>
-          <indexterm zone="elogind elogind-inhibit">
-            <primary sortas="b-elogind-inhibit">elogind-inhibit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loginctl">
-        <term><command>loginctl</command></term>
-        <listitem>
-          <para>
-            is used to introspect and control the state of the elogind Login
-            Manager
-          </para>
-          <indexterm zone="elogind loginctl">
-            <primary sortas="b-loginctl">loginctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libelogind">
-        <term><filename class="libraryfile">libelogind.so</filename></term>
-        <listitem>
-          <para>
-            is the main elogind utility library
-          </para>
-          <indexterm zone="elogind libelogind">
-            <primary sortas="c-libelogind">libelogind.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/fcron.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,485 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="fcron" xreflabel="fcron-&fcron-version;">
+<?dbhtml filename="fcron.html" dir="general"?>
+<title>fcron-&fcron-version;</title>
 
-  <!ENTITY fcron-download-http "http://fcron.free.fr/archives/fcron-&fcron-version;.src.tar.gz">
-  <!ENTITY fcron-download-ftp " ">
-  <!ENTITY fcron-md5sum "bd4996e941a40327d11efc5e3fd1f839">
-  <!ENTITY fcron-size "587 KB">
-  <!ENTITY fcron-buildsize "5.1 MB">
-  <!ENTITY fcron-time "0.1 SBU">
-]>
-
-<sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
-  <?dbhtml filename="fcron.html"?>
-
-
-  <title>Fcron-&fcron-version;</title>
-
-  <indexterm zone="fcron">
-    <primary sortas="a-Fcron">Fcron</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fcron</title>
-
-    <para>
-      The <application>Fcron</application> package contains a periodical
-      command scheduler which aims at replacing <application>Vixie
-      Cron</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fcron-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fcron-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fcron-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fcron-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fcron-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fcron-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fcron-&fcron-version;-sendmail_upstream-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Fcron Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      An <xref linkend="server-mail"/>,
-      <ulink url="../postlfs/editors.html">text editor</ulink> (default is
-      <command>vi</command> from the <xref linkend="vim"/> package),
-      <xref linkend="linux-pam"/>, and
-      <xref linkend="docbook-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fcron</title>
-
-    <para id="fcron-syslog" revision="sysv">
-      <application>Fcron</application>
-      uses the cron facility of <command>syslog</command> to log all messages.
-      Since LFS does not set up this facility in
-      <filename>/etc/syslog.conf</filename>, it needs to be done prior to
-      installing <application>Fcron</application>. This command will append the
-      necessary line to the current <filename>/etc/syslog.conf</filename>
-      (perform as the <systemitem class='username'>root</systemitem> user):
-    </para>
-
-    <indexterm zone="fcron fcron-syslog" revision="sysv">
-      <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
-    </indexterm>
-
-<screen role="root" revision="sysv"><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
-<literal># Begin fcron addition to /etc/syslog.conf
-
-cron.* -/var/log/cron.log
-
-# End fcron addition</literal>
-EOF</userinput></screen>
-
-    <para revision="sysv">
-      The configuration file has been modified, so reloading the
-      <command>sysklogd</command> daemon will activate the changes (again as
-      the <systemitem class='username'>root</systemitem> user).
-    </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen>
-
-    <para>
-      For security reasons, an unprivileged user and group for
-      <application>Fcron</application> should be created (perform as the
-      <systemitem class='username'>root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>groupadd -g 22 fcron &amp;&amp;
-useradd -d /dev/null -c "Fcron User" -g fcron -s /bin/false -u 22 fcron</userinput></screen>
-
-    <para>
-      Now fix some locations hard coded in the documentation:
-    </para>
-
-<screen><userinput>find doc -type f -exec sed -i 's:/usr/local::g' {} \;</userinput></screen>
-    <para>
-      Install <application>Fcron</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --without-sendmail     \
-            --with-boot-install=no \
-            --with-systemdsystemunitdir=no &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --without-sendmail     \
-            --with-piddir=/run     \
-            --with-boot-install=no &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>
-
-    <para>
-      DESTDIR install must be done as <systemitem
-      class="username">root</systemitem> user. Furthermore, if PAM
-      configuration files should be installed in <filename class="directory">
-      /etc/pam.d</filename>, you have to create this directory in the
-      DESTDIR before doing the install.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>autoconf</command>: This command is required to rebuild
-      <filename>configure</filename> using the fixed input file.
-    </para>-->
-
-    <para>
-      <parameter>--without-sendmail</parameter>: By default,
-      <application>Fcron</application> will attempt to use the
-      <command>sendmail</command> command from an <xref linkend="server-mail"/>
-      package to email you the results of the <command>fcron</command> script.
-      This switch is used to disable default email notification. Omit the
-      switch to enable the default. Alternatively, you can use the
-      <option>--with-sendmail=<replaceable>&lt;/path/to/MTA
-      command&gt;</replaceable></option> to use a different mailer command.
-    </para>
-
-    <para>
-      <parameter>--with-boot-install=no</parameter>: This prevents
-      installation of the bootscript included with the package.
-    </para>
-
-    <para revision="systemd">
-      <parameter>--with-piddir=/run</parameter>:
-      This fixes the systemd unit to use the proper directory for PID files so
-      that systemctl does not hang and the unit starts correctly.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-systemdsystemunitdir=no</parameter>:
-      This prevents building the <application>systemd</application> units,
-      which are not needed for a <application>SYS V</application> system.
-    </para>
-
-    <para>
-      <option>--with-editor=<replaceable>&lt;/path/to/editor&gt;</replaceable></option>:
-      This switch allows you to set the default text editor.
-    </para>
-
-    <para>
-      <option>--with-dsssl-dir=<replaceable>&lt;/path/to/dsssl-stylesheets&gt;</replaceable></option>:
-      May be used if you have <xref linkend="docbook-utils"/> installed.
-      Currently, the dsssl stylesheets are located at
-    <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Fcron</title>
-
-    <sect3 id="fcron-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/fcron.conf</filename>,
-        <filename>/etc/fcron.allow</filename>, and
-        <filename>/etc/fcron.deny</filename>
-      </para>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.conf">/etc/fcron.conf</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.allow">/etc/fcron.allow</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.deny">/etc/fcron.deny</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="run-parts" xreflabel="Fcron Configuration Information">
-      <title>Configuration Information</title>
-
-      <para>
-        There are no required changes in any of the config files.
-        Configuration information can be found in the man page for
-        <filename>fcron.conf</filename>.
-      </para>
-
-      <para>
-        <command>fcron</command> scripts are written using
-        <command>fcrontab</command>. Refer to the <command>fcrontab</command>
-        man page for proper parameters to address your situation.
-      </para>
-
-      <para id="fcron-pam">
-        If <application>Linux-PAM</application> is installed, two PAM
-        configuration files are installed in <filename class='directory'>
-        etc/pam.d</filename>. Alternatively if <filename class='directory'>
-        etc/pam.d</filename> is not used, the installation will append two
-        configuration sections to the existing <filename>/etc/pam.conf
-        </filename> file. You should ensure the files match your preferences.
-        Modify them as required to suit your needs.
-      </para>
-
-      <indexterm zone="fcron fcron-pam">
-        <primary sortas="e-etc-pam.d">/etc/pam.d/*</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-pam">
-        <primary sortas="e-etc-pam.conf">/etc/pam.conf</primary>
-      </indexterm>
-
-      <bridgehead renderas="sect4">Periodic Jobs</bridgehead>
-
-      <para>
-        If you would like to set up a periodic hierarchy for the root user,
-        first issue the following commands (as the
-        <systemitem class="username">root</systemitem> user) to create the
-        <filename>/usr/bin/run-parts</filename> script:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/run-parts &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/sh
-# run-parts:  Runs all the scripts found in a directory.
-# from Slackware, by Patrick J. Volkerding with ideas borrowed
-# from the Red Hat and Debian versions of this utility.
-
-# keep going when something fails
-set +e
-
-if [ $# -lt 1 ]; then
-  echo "Usage: run-parts &lt;directory&gt;"
-  exit 1
-fi
-
-if [ ! -d $1 ]; then
-  echo "Not a directory: $1"
-  echo "Usage: run-parts &lt;directory&gt;"
-  exit 1
-fi
-
-# There are several types of files that we would like to
-# ignore automatically, as they are likely to be backups
-# of other scripts:
-IGNORE_SUFFIXES="~ ^ , .bak .new .rpmsave .rpmorig .rpmnew .swp"
-
-# Main loop:
-for SCRIPT in $1/* ; do
-  # If this is not a regular file, skip it:
-  if [ ! -f $SCRIPT ]; then
-    continue
-  fi
-  # Determine if this file should be skipped by suffix:
-  SKIP=false
-  for SUFFIX in $IGNORE_SUFFIXES ; do
-    if [ ! "$(basename $SCRIPT $SUFFIX)" = "$(basename $SCRIPT)" ]; then
-      SKIP=true
-      break
-    fi
-  done
-  if [ "$SKIP" = "true" ]; then
-    continue
-  fi
-  # If we've made it this far, then run the script if it's executable:
-  if [ -x $SCRIPT ]; then
-    $SCRIPT || echo "$SCRIPT failed."
-  fi
-done
-
-exit 0</literal>
-EOF
-chmod -v 755 /usr/bin/run-parts</userinput></screen>
-
-      <para>
-        Next, create the directory layout for the periodic jobs (again as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>install -vdm754 /etc/cron.{hourly,daily,weekly,monthly}</userinput></screen>
-
-      <para>
-        Finally, add the <command>run-parts</command> to the system fcrontab
-        (while still the <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt; /var/spool/fcron/systab.orig &lt;&lt; "EOF"
-<literal>&amp;bootrun 01 * * * * root run-parts /etc/cron.hourly
-&amp;bootrun 02 4 * * * root run-parts /etc/cron.daily
-&amp;bootrun 22 4 * * 0 root run-parts /etc/cron.weekly
-&amp;bootrun 42 4 1 * * root run-parts /etc/cron.monthly</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="fcron-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        Install the
-        <filename>/etc/rc.d/init.d/fcron</filename> init script from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        Enable <application>fcron</application> to start
-        at boot using the previously installed systemd unit.
-      </para>
-
-      <indexterm zone="fcron fcron-init">
-        <primary sortas="f-fcron">fcron</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-fcron</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable fcron</userinput></screen>
-
-      <para>
-        Finally, again as the <systemitem class="username">root</systemitem>
-        user, start fcron and generate the
-        <filename>/var/spool/fcron/systab</filename> file:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/fcron start &amp;&amp;
-fcrontab -z -u systab</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl start fcron &amp;&amp;
-fcrontab -z -u systab</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>fcron, fcrondyn, fcronsighup, and fcrontab</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/fcron-&fcron-version; and /var/spool/fcron</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fcron-prog">
-        <term><command>fcron</command></term>
-        <listitem>
-          <para>
-            is the scheduling daemon
-          </para>
-          <indexterm zone="fcron fcron-prog">
-            <primary sortas="b-fcron">fcron</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcrondyn">
-        <term><command>fcrondyn</command></term>
-        <listitem>
-          <para>
-            is a user tool intended to interact with a running
-            <command>fcron</command> daemon
-          </para>
-          <indexterm zone="fcron fcrondyn">
-            <primary sortas="b-fcrondyn">fcrondyn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcronsighup">
-        <term><command>fcronsighup</command></term>
-        <listitem>
-          <para>
-            instructs <command>fcron</command> to reread the
-            <application>Fcron</application> tables
-          </para>
-          <indexterm zone="fcron fcronsighup">
-            <primary sortas="b-fcronsighup">fcronsighup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcrontab">
-        <term><command>fcrontab</command></term>
-        <listitem>
-          <para>
-            is a program used to install, edit, list and remove the
-            tables used by <command>fcron</command>
-          </para>
-          <indexterm zone="fcron fcrontab">
-            <primary sortas="b-fcrontab">fcrontab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&fcron-intro;
+&fcron-inst;
+&fcron-exp;
+&fcron-config;
+&fcron-desc;
 
 </sect1>
+
Index: general/sysutils/fcron/fcron-config.xml
===================================================================
--- general/sysutils/fcron/fcron-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,74 @@
+<sect2>
+<title>Configuring fcron</title>
+
+<sect3><title>make install script</title>
+
+<para>After the files are installed, the make install script enters into a
+configuration routine.  The first test will be for a group named fcron.  If
+it does not exist, you will be given the command line that the script proposes
+to run and a prompt for a 'y' or 'n'.  This is repeated to create a user named
+fcron and to install a script in the init.d directory with the appropriate
+symbolic links in runlevels 2, 3, 4, and 5.  The final configuation step is to
+stop any current fcron processes and start the new fcron.  A yes here will stop
+current fcron processes but will fail to start new fcron.  The following
+commands will correct this:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/fcron &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/fcron
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+        start)
+                echo "Starting fcron..."
+                loadproc fcron
+                ;;
+
+        stop)
+                echo "Stopping fcron..."
+                killproc fcron
+                ;;
+
+        restart)
+                $0 stop
+                sleep 1
+                $0 start
+                ;;
+
+        status)
+                statusproc fcron
+                ;;
+
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
+esac
+
+# End $rc_base/init.d/fcron
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/fcron &amp;&amp;
+/etc/rc.d/init.d/fcron start &amp;&amp;
+mv /etc/rc.d/rc0.d/K60fcron /etc/rc.d/rc0.d/K08fcron &amp;&amp;
+mv /etc/rc.d/rc6.d/K60fcron /etc/rc.d/rc6.d/K08fcron</userinput></screen></para>
+</sect3>
+
+<sect3><title>Config files</title>
+
+<para><userinput>/etc/fcron.conf, /etc/fcron.allow,
+/etc/fcron.deny</userinput></para>
+
+<para>There are no required changes in any of these files.
+Configuration information can be found in the man page for
+fcron.conf.</para>
+
+<para>fcron scripts are written using fcrontab.  Refer to the man page
+for fcrontab for proper parameters for your situation.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-desc.xml
===================================================================
--- general/sysutils/fcron/fcron-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Contents</title>
+
+<para>The fcron package contains <userinput>fcron, fcrontab,
+fcronsighup</userinput> and <userinput>fcrondyn.</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fcron</title>
+<para>fcron is the scheduling daemon.
+</para></sect3>
+
+<sect3><title>fcrontab</title>
+<para>fcrontab is the program used to install, edit, list and remove the
+tables used by fcron.</para></sect3>
+
+<sect3><title>fcronsighup</title>
+<para>fcronsighup instructs fcron to reread the fcron tables.
+</para></sect3>
+
+<sect3><title>fcrondyn</title>
+<para>fcrondyn is a user tool intended to interact with a running fcron
+daemon.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-exp.xml
===================================================================
--- general/sysutils/fcron/fcron-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>make CC="gcc $CFLAGS":</userinput> This makes fcron
+compile using our CFLAGS for optimizations.</para>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-inst.xml
===================================================================
--- general/sysutils/fcron/fcron-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,43 @@
+<sect2>
+<title>Installation of fcron</title>
+
+<para>Fcron uses the cron facility of syslog to log all messages.  Since LFS 
+does not set up this facility in /etc/syslog.conf, it needs to be done prior 
+to installing fcron.  This command will append the necessary line to the 
+current <filename>/etc/syslog.conf</filename>.</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"</userinput>
+# Begin fcron addition to /etc/syslog.conf
+
+cron.* -/var/log/cron.log
+
+# End fcron addition
+<userinput>EOF</userinput></screen></para>
+
+<para>The configuration file has been modified, so reloading the sysklogd 
+daemon will activate the changes.</para>
+
+<para><screen><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen></para>
+
+<para>Install fcron by running the following commands:</para>
+
+<para><screen><userinput>./configure &amp;&amp;
+make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
+<sect2>
+
+<title>Install fcron without MTA </title>
+
+<para>Fcron does not require a mail transfer agent (MTA) to run, but will 
+use one if it is installed to email you the results of the fcron script.  If 
+you wish to install without a MTA, run the following commands:</para>
+
+<para><screen><userinput>./configure --without-sendmail &amp;&amp;
+make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-intro.xml
===================================================================
--- general/sysutils/fcron/fcron-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to fcron</title>
+
+<screen>Download location:              <ulink url="&fcron-download;"/>
+Version used:                   &fcron-version;
+Package size:                   &fcron-size;
+Estimated Disk space required:  &fcron-buildsize;</screen>
+
+<para>The fcron package contains the fcron daemon. &quot;It
+is a periodical command scheduler which aims at replacing Vixie
+Cron.&quot; </para>
+
+<screen>fcron requires a running syslog (part of the base LFS system).
+fcron recommends a local mail system (sendmail or <xref
+linkend="postfix"></xref>, for example).
+fcron will utilize PAM if it is installed prior to fcron.</screen>
+
+</sect2>
Index: general/sysutils/fcron/fcron.ent
===================================================================
--- general/sysutils/fcron/fcron.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY fcron SYSTEM "../fcron.xml">
+<!ENTITY fcron-intro SYSTEM "fcron-intro.xml">
+<!ENTITY fcron-inst SYSTEM "fcron-inst.xml">
+<!ENTITY fcron-exp SYSTEM "fcron-exp.xml">
+<!ENTITY fcron-desc SYSTEM "fcron-desc.xml">
+<!ENTITY fcron-config SYSTEM "fcron-config.xml">
+<!ENTITY fcron-buildsize "2.3 MB">
+<!ENTITY fcron-version "2.9.0">
+<!ENTITY fcron-download "http://fcron.free.fr/fcron-2.9.0.src.tar.gz">
+<!ENTITY fcron-size "324 KB">
Index: neral/sysutils/gpm-kernel.xml
===================================================================
--- general/sysutils/gpm-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>I</emphasis>nput device support ---&gt;
-    -*-   <emphasis role='blue'>G</emphasis>eneric input layer (needed for keyboard, mouse, ...)          [INPUT]
-    &lt;*/M&gt;   M<emphasis role='blue'>o</emphasis>use interface                                     [INPUT_MOUSEDEV]</screen>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/gpm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,459 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="gpm" xreflabel="gpm-&gpm-version;">
+<title>gpm-&gpm-version;</title>
 
-  <!ENTITY gpm-download-http "&sources-anduin-http;/gpm/gpm-&gpm-version;.tar.bz2">
-  <!ENTITY gpm-download-ftp  " ">
-  <!ENTITY gpm-md5sum        "bf84143905a6a903dbd4d4b911a2a2b8">
-  <!ENTITY gpm-size          "820 KB">
-  <!ENTITY gpm-buildsize     "7.4 MB">
-  <!ENTITY gpm-time          "0.1 SBU">
-]>
+<para>Gpm (the general purpose mouse daemon) is a mouse server for
+applications running in the console.  It not only provides cut and paste
+support generally, but its library component is used by various software
+such as links to provide mouse support to the application generally.  It
+is useful on desktops, especially if following (Beyond)LinuxFromScratch
+instructions - it's often much easier (and less error prone) to cut and
+paste between two console windows than to type everything by
+hand!</para>
 
-<sect1 id="gpm" xreflabel="GPM-&gpm-version;">
-  <?dbhtml filename="gpm.html"?>
-
-
-  <title>GPM-&gpm-version;</title>
-
-  <indexterm zone="gpm">
-    <primary sortas="a-GPM">GPM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GPM</title>
-
-    <para>
-      The <application>GPM</application> (General Purpose Mouse daemon)
-      package contains a mouse server for the console and
-      <command>xterm</command>. It not only provides cut and paste support
-      generally, but its library component is used by various software such as
-      <application>Links</application> to provide mouse support to the
-      application.  It is useful on desktops, especially if following (Beyond)
-      Linux From Scratch instructions; it's often much easier (and less error
-      prone) to cut and paste between two console windows than to type
-      everything by hand!
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gpm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gpm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gpm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gpm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gpm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gpm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gpm-&gpm-version;-consolidated-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GPM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (for documentation)
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id='gpm-kernel'>
-    <title>Kernel Configuration</title>
-
-     <para>
-      Enable the following option in the kernel configuration and recompile the
-      kernel if necessary:
-     </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="gpm-kernel.xml"/>
-
-     <indexterm zone="gpm gpm-kernel">
-        <primary sortas="d-gpm">gpm</primary>
-     </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GPM</title>
-
-    <para>
-      Install <application>GPM</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gpm-&gpm-version;-consolidated-1.patch                &amp;&amp;
-./autogen.sh                                                    &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc ac_cv_path_emacs=no &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If <xref linkend='texlive'/> is installed, build the GPM manual as
-      dvi, ps, and pdf formats:
-    </para>
-
-<screen remap='doc'><userinput>make -C doc gpm.{dvi,ps} &amp;&amp;
-dvipdfm doc/gpm.dvi -o doc/gpm.pdf</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;
-
-install-info --dir-file=/usr/share/info/dir           \
-             /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;
-
-install -v -m755 -d /usr/share/doc/gpm-&gpm-version;/support &amp;&amp;
-install -v -m644    doc/support/*                     \
-                    /usr/share/doc/gpm-&gpm-version;/support &amp;&amp;
-install -v -m644    doc/{FAQ,HACK_GPM,README*}        \
-                    /usr/share/doc/gpm-&gpm-version;</userinput></screen>
-
-    <para>
-      If <xref linkend='texlive'/> is installed and you've built GPM
-      manual as dvi, ps, and pdf formats, install them as the &root; user:
-    </para>
-
-<screen role='root' remap='doc'><userinput>install -vm644 doc/gpm.{dvi,ps,pdf} /usr/share/doc/gpm-&gpm-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>./autogen.sh</command>: This command creates the missing
-      <command>configure</command> script.
-    </para>
-
-    <para>
-      <parameter>ac_cv_path_emacs=no</parameter>: This variable works around
-      an issue causing the package fail to build with
-      <xref linkend='emacs'/> installed.  It also suppresses the
-      installations of some <quote>Emacs support files</quote> shipped with
-      GPM.  These files are quite outdated and they should be superseded
-      with <xref linkend='emacs'/> built-in GPM support.  If you need to use
-      <xref linkend='emacs'/> in Linux console with mouse support, you
-      should install (or reinstall) <xref linkend='emacs'/>
-      <emphasis role='bold'>after</emphasis> GPM.
-    </para>
-
-    <para>
-      <command>install-info ...</command>: This package installs a
-      <filename class="extension">.info</filename> file, but does not update
-      the system <filename>dir</filename> file. This command makes the update.
-    </para>
-
-    <para>
-      <command>ln -v -sfn libgpm.so.2.1.0 /usr/lib/libgpm.so</command>: This
-      command is used to create (or update) the <filename
-      class="extension">.so</filename> symlink to the library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GPM</title>
-
-    <sect3 id="gpm-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <indexterm zone="gpm gpm-init">
-        <primary sortas="f-gpm-init">gpm</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        Install the
-        <filename>/etc/rc.d/init.d/gpm</filename> init script included in the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>gpm</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install-gpm</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="gpm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gpm-root.conf</filename> and
-        <filename>~/.gpm-root</filename>: The default and individual user
-        <command>gpm-root</command> configuration files.
-      </para>
-
-      <para revision="sysv">
-        <filename>/etc/sysconfig/mouse</filename>:
-        This file contains the name of your mouse device and the protocol
-        it uses.  To create this file, run the following as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/mouse
-
-MDEVICE="<replaceable>&lt;yourdevice&gt;</replaceable>"
-PROTOCOL="<replaceable>&lt;yourprotocol&gt;</replaceable>"
-GPMOPTS="<replaceable>&lt;additional options&gt;</replaceable>"
-
-# End /etc/sysconfig/mouse</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="gpm gpm-config">
-        <primary sortas="e-AA.gpm-root">~/.gpm-root</primary>
-      </indexterm>
-
-      <indexterm zone="gpm gpm-config">
-        <primary sortas="e-etc-gpm-root.conf">/etc/gpm-root.conf</primary>
-      </indexterm>
-
-      <indexterm zone="gpm gpm-config" revision="sysv">
-        <primary sortas="e-etc-sysconfig-mouse">/etc/sysconfig/mouse</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para revision="sysv">
-        Examples of values to set <envar>MDEVICE</envar>,
-        <envar>PROTOCOL</envar>, and <envar>GPMOPTS</envar> to are:
-      </para>
-
-<screen revision="sysv"><literal>MDEVICE="/dev/input/mice"
-PROTOCOL="imps2"
-GPMOPTS=""</literal></screen>
-
-      <para revision="sysv">
-        A list of which protocol values are known can be found by running
-        <command>gpm -m <replaceable>[device]</replaceable> -t -help</command>.
-        The <envar>MDEVICE</envar> setting depends on which type of mouse you
-        have.  For example, <filename>/dev/ttyS0</filename> for a serial mouse
-        (on Windows this is COM1), <filename>/dev/input/mice</filename> is
-        often used for USB mice and <filename>/dev/psaux</filename> for PS2
-        mice. <envar>GPMOPTS</envar> is the 'catch all' for any additional
-        options that are needed for your hardware.
-      </para>
-
-      <para revision="systemd">
-        <application>GPM</application> is by default started with
-        the following parameters:
-        <parameter>-m /dev/input/mice -t imps2</parameter>. If the
-        mentioned parameters don't suit your needs, you can override
-        them by running the following commands as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump" revision="systemd"><userinput>install -v -dm755 /etc/systemd/system/gpm.service.d &amp;&amp;
-cat &gt; /etc/systemd/system/gpm.service.d/99-user.conf &lt;&lt; EOF
-<literal>[Service]
-ExecStart=/usr/sbin/gpm <replaceable>&lt;list of parameters&gt;</replaceable>
-</literal>EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>disable-paste, display-buttons, display-coords, get-versions, gpm,
-        gpm-root, hltest, mev, and mouse-test</seg>
-        <seg>libgpm.so</seg>
-        <seg>/usr/share/doc/gpm-&gpm-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="disable-paste">
-        <term><command>disable-paste</command></term>
-        <listitem>
-          <para>
-            is a security mechanism used to disable the paste buffer
-          </para>
-          <indexterm zone="gpm disable-paste">
-            <primary sortas="b-disable-paste">disable-paste</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="display-buttons">
-        <term><command>display-buttons</command></term>
-        <listitem>
-          <para>
-            is a simple program that reports the mouse buttons being
-            pressed and released
-          </para>
-          <indexterm zone="gpm display-buttons">
-            <primary sortas="b-display-buttons">display-buttons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="display-coords">
-        <term><command>display-coords</command></term>
-        <listitem>
-          <para>
-            is a simple program that reports the mouse coordinates
-          </para>
-          <indexterm zone="gpm display-coords">
-            <primary sortas="b-display-coords">display-coords</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="get-versions">
-        <term><command>get-versions</command></term>
-        <listitem>
-          <para>
-            is used to report the <application>GPM</application> library
-            and server versions
-          </para>
-          <indexterm zone="gpm get-versions">
-            <primary sortas="b-get-versions">get-versions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpm-prog">
-        <term><command>gpm</command></term>
-        <listitem>
-          <para>
-            is a cut and paste utility and mouse server for virtual consoles
-          </para>
-          <indexterm zone="gpm gpm-prog">
-            <primary sortas="b-gpm">gpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpm-root">
-        <term><command>gpm-root</command></term>
-        <listitem>
-          <para>
-            is a default handler for <command>gpm</command>. It is used to
-            draw menus on the root window
-          </para>
-          <indexterm zone="gpm gpm-root">
-            <primary sortas="b-gpm-root">gpm-root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hltest">
-        <term><command>hltest</command></term>
-        <listitem>
-          <para>
-            is a simple sample application using the high-level library, meant
-            to be read by programmers trying to use the high-level library
-          </para>
-          <indexterm zone="gpm hltest">
-            <primary sortas="b-hltest">hltest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mev">
-        <term><command>mev</command></term>
-        <listitem>
-          <para>
-            is a program to report mouse events
-          </para>
-          <indexterm zone="gpm mev">
-            <primary sortas="b-mev">mev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mouse-test">
-        <term><command>mouse-test</command></term>
-        <listitem>
-          <para>
-            is a tool for determining the mouse type and device it's
-            attached to
-          </para>
-          <indexterm zone="gpm mouse-test">
-            <primary sortas="b-mouse-test">mouse-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgpm">
-        <term><filename class="libraryfile">libgpm.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions to access the
-            <application>GPM</application> daemon
-          </para>
-          <indexterm zone="gpm libgpm">
-            <primary sortas="c-libgpm">libgpm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&gpm-intro;
+&gpm-inst;
+&gpm-config;
+&gpm-desc;
 
 </sect1>
+
Index: general/sysutils/gpm/gpm-config.xml
===================================================================
--- general/sysutils/gpm/gpm-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,106 @@
+<sect2>
+<title>Configuring gpm</title>
+
+<sect3><title>gpm init.d script</title>
+<para>The gpm init.d script can be created using the following
+commands:  (This assumes that you have followed the LFS default of
+having your $rc_base set to <filename
+class="directory">/etc/rc.d</filename>)</para>
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/gpm &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/gpm
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+# GPM specific parts by Mark Hymers - markh@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+if [ -f /etc/sysconfig/mouse ]
+	then
+        source /etc/sysconfig/mouse
+fi
+
+if [ -z "$MDEVICE" ] || [ -z "$PROTOCOL" ]
+	then
+	echo "Please create an /etc/sysconfig/mouse file containing"
+	echo "MDEVICE and PROTOCOL values"
+	exit 1;
+fi
+
+case "$1" in
+        start)
+                echo "Starting gpm..."
+                loadproc gpm -m $MDEVICE -t $PROTOCOL
+                ;;
+
+        stop)
+                echo "Stopping gpm..."
+                killproc gpm
+                ;;
+
+        restart)
+                $0 stop
+                sleep 1
+                $0 start
+                ;;
+
+        status)
+                statusproc gpm
+                ;;
+
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
+esac
+
+# End $rc_base/init.d/gpm
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/gpm</userinput></screen></para>
+
+<para>You then need to create symbolic links to this file in the relevant rc.d
+directories.  For example:
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/gpm ../rc0.d/K10gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc1.d/K10gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc2.d/K10gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc3.d/S70gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc4.d/S70gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc5.d/S70gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc6.d/K10gpm</userinput></screen></para></sect3>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/sysconfig/mouse</userinput>
+This file contains the name of your mouse device and the protocol which
+it uses.  To create this file, run the following:</para>
+
+<para><screen><userinput>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"</userinput> 
+# start /etc/sysconfig/mouse
+MDEVICE=yourdevice
+PROTOCOL=yourprotocol
+# end /etc/sysconfig/mouse
+<userinput>EOF</userinput></screen></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Examples of values to set MDEVICE and PROTOCOL to are</para>
+
+<para><screen>MDEVICE=/dev/psaux
+PROTOCOL=imps2</screen></para>
+
+<para>A list of which protocol values are known can be found by running
+<userinput>gpm -t -help</userinput>.  Your MDEVICE setting depends on
+which type of mouse you have.  For example,
+<userinput>/dev/ttyS0</userinput> for a serial mouse (on Windows this is
+COM1), <userinput>/dev/input/mice</userinput> is often used for USB mice
+and <userinput>/dev/psaux</userinput> for PS2 mice.  It is normally
+thought not a good idea to link /dev/mouse to the relevant device, but
+instead to reference it directly.</para>
+
+</sect3>
+
+</sect2>
+
Index: general/sysutils/gpm/gpm-desc.xml
===================================================================
--- general/sysutils/gpm/gpm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Contents</title>
+
+<para>The gpm package contains <userinput>gpm, gpm-root, disable-paste
+and mev</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gpm</title>
+<para>gpm is a cut and paste utility and mouse server for virtual
+consoles</para></sect3>
+
+<sect3><title>gpm-root</title>
+<para>gpm-root is a default handler for gpm.  It is used to draw menus on the
+root window</para></sect3>
+
+<sect3><title>disable-paste</title>
+<para>No description available</para></sect3>
+
+<sect3><title>mev</title>
+<para>mev is a program to report mouse events</para></sect3>
+
+</sect2>
+
Index: general/sysutils/gpm/gpm-inst.xml
===================================================================
--- general/sysutils/gpm/gpm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of gpm</title>
+
+<para>Install gpm by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+</sect2>
+
Index: general/sysutils/gpm/gpm-intro.xml
===================================================================
--- general/sysutils/gpm/gpm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to gpm</title>
+
+<screen>Download location:              &gpm-download;
+Version used:                   &gpm-version;
+Package size:                   &gpm-size;
+Estimated Disk space required:  &gpm-buildsize;</screen>
+
+<para>The gpm package contains a mouse server for the console and xterm.
+This is is useful for cutting and pasting text in console mode, and also
+because many console-based programs need it to compile mouse support
+into themselves.</para>
+
+</sect2>
Index: general/sysutils/gpm/gpm.ent
===================================================================
--- general/sysutils/gpm/gpm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY gpm SYSTEM "../gpm.xml">
+<!ENTITY gpm-intro SYSTEM "gpm-intro.xml">
+<!ENTITY gpm-inst SYSTEM "gpm-inst.xml">
+<!ENTITY gpm-desc SYSTEM "gpm-desc.xml">
+<!ENTITY gpm-config SYSTEM "gpm-config.xml">
+<!ENTITY gpm-buildsize "3.2 MB">
+<!ENTITY gpm-version "1.20.0">
+<!ENTITY gpm-download "ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2">
+<!ENTITY gpm-size "382 KB">
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/hdparm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,161 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="hdparm" xreflabel="hdparm-&hdparm-version;">
+<?dbhtml filename="hdparm.html" dir="general"?>
+<title>hdparm-&hdparm-version;</title>
 
-  <!ENTITY hdparm-download-http "&sourceforge-dl;/hdparm/hdparm-&hdparm-version;.tar.gz">
-  <!ENTITY hdparm-download-ftp  " ">
-  <!ENTITY hdparm-md5sum        "6d6d039d61ec995b1ec72ddce0b1853b">
-  <!ENTITY hdparm-size          "140 KB">
-  <!ENTITY hdparm-buildsize     "1.0 MB">
-  <!ENTITY hdparm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hdparm" xreflabel="Hdparm-&hdparm-version;">
-  <?dbhtml filename="hdparm.html"?>
-
-
-  <title>Hdparm-&hdparm-version;</title>
-
-  <indexterm zone="hdparm">
-    <primary sortas="a-Hdparm">Hdparm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Hdparm</title>
-
-    <para>
-      The <application>Hdparm</application> package contains a utility that
-      is useful for obtaining information about, and controlling ATA/IDE
-      controllers and hard drives. It allows to
-      increase performance and sometimes to increase stability.
-    </para>
-
-    &lfs121_checked;
-
-    <warning>
-      <para>
-        As well as being useful, incorrect usage of
-        <application>Hdparm</application> can destroy your information and in
-        rare cases, drives. Use with caution and make sure you know what you
-        are doing. If in doubt, it is recommended that you leave the default
-        kernel parameters alone.
-      </para>
-    </warning>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hdparm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hdparm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hdparm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hdparm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hdparm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hdparm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Hdparm</title>
-
-    <para>
-      Build <application>Hdparm</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>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 binprefix=/usr install</userinput></screen>
-
-<!-- no longer relevant with merged-/usr
-    <note><para>
-      Note that by default, <command>hdparm</command> is installed in
-      <filename class="directory">/sbin</filename> as some systems may require it
-      during the boot process before <filename class="directory">/usr</filename>
-      is mounted.  If you wish to install <command>hdparm</command> under the
-      <filename class="directory">/usr</filename> hierarchy, then replace the above
-      command with the following:
-    </para>
-
-<screen role="nodump"><userinput>make binprefix=/usr install</userinput></screen></note>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          hdparm
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hdparm-prog">
-        <term><command>hdparm</command></term>
-        <listitem>
-          <para>
-            provides a command-line interface to various hard disk ioctls
-            supported by the stock Linux ATA/IDE device driver subsystem
-          </para>
-          <indexterm zone="hdparm hdparm-prog">
-            <primary sortas="b-hdparm">hdparm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&hdparm-intro;
+&hdparm-inst;
+&hdparm-desc;
 
 </sect1>
+
Index: general/sysutils/hdparm/hdparm-desc.xml
===================================================================
--- general/sysutils/hdparm/hdparm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The hdparm package contains <userinput>hdparm</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>hdparm</title>
+<para>hdparm provides a command line interface to various hard disk
+ioctls supported by the stock Linux ATA/IDE device driver 
+subsystem.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/hdparm/hdparm-inst.xml
===================================================================
--- general/sysutils/hdparm/hdparm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Installation of hdparm</title>
+
+<para>Install hdparm by running the following commands:</para>
+
+<para><screen><userinput>make &amp;&amp; </userinput>
+<userinput>make install</userinput></screen></para>
+
+<para>Note that by default, hdparm is installed in
+<filename>/sbin</filename> as some systems may require it on bootup
+before <filename>/usr</filename> is mounted.  If you wish to install
+hdparm under the <filename>/usr</filename> hierarchy, then replace the
+above commands with the following:</para>
+
+<para><screen><userinput>make &amp;&amp; </userinput>
+<userinput>make binprefix=/usr install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/hdparm/hdparm-intro.xml
===================================================================
--- general/sysutils/hdparm/hdparm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Introduction to hdparm</title>
+
+<screen>Download location:              &hdparm-download;
+Version used:                   &hdparm-version;
+Package size:                   &hdparm-size;
+Estimated Disk space required:  &hdparm-buildsize;</screen>
+
+<para>The hdparm package contains the hdparm utility.  This is useful
+for controlling ATA/IDE controllers and hard drives both to increase
+performance and sometimes to increase stability.</para>
+
+<para><emphasis>WARNING!</emphasis> As well as being useful, incorrect
+usage of hdparm can destroy your information and in rare cases, drives.
+Use with caution and make sure you know what you are doing.  If in
+doubt, we recommend you leave the default kernel parameters
+alone.</para>
+
+</sect2>
Index: general/sysutils/hdparm/hdparm.ent
===================================================================
--- general/sysutils/hdparm/hdparm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY hdparm SYSTEM "../hdparm.xml">
+<!ENTITY hdparm-intro SYSTEM "hdparm-intro.xml">
+<!ENTITY hdparm-inst SYSTEM "hdparm-inst.xml">
+<!ENTITY hdparm-desc SYSTEM "hdparm-desc.xml">
+<!ENTITY hdparm-buildsize "257 KB">
+<!ENTITY hdparm-version "5.2">
+<!ENTITY hdparm-download "ftp://ftp.ibiblio.org/pub/Linux/system/hardware/hdparm-5.2.tar.gz">
+<!ENTITY hdparm-size "36 KB">
Index: neral/sysutils/hwdata.xml
===================================================================
--- general/sysutils/hwdata.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 hwdata-download-http "https://github.com/vcrhonek/hwdata/archive/v&hwdata-version;/hwdata-&hwdata-version;.tar.gz">
-  <!ENTITY hwdata-download-ftp  " ">
-  <!ENTITY hwdata-md5sum        "9db68f209f3393aa5bfa3217d7c890c5">
-  <!ENTITY hwdata-size          "2.3 MB">
-  <!ENTITY hwdata-buildsize     "18 MB">
-  <!ENTITY hwdata-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hwdata" xreflabel="hwdata-&hwdata-version;">
-  <?dbhtml filename="hwdata.html"?>
-
-
-  <title>hwdata-&hwdata-version;</title>
-
-  <indexterm zone="hwdata">
-    <primary sortas="g-hwdata">hwdata</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to hwdata</title>
-
-    <para>
-      The <application>hwdata</application> package contains
-      current PCI and vendor id data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hwdata-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hwdata-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hwdata-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hwdata-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hwdata-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hwdata-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of hwdata</title>
-
-    <para>
-      Install <application>hwdata</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-blacklist</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          /usr/share/hwdata
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: neral/sysutils/lm_sensors-kernel.xml
===================================================================
--- general/sysutils/lm_sensors-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>ower management and ACPI options ---&gt;
-  [*] <emphasis role='blue'>A</emphasis>CPI (Advanced Configuration and Power Interface) Support ---&gt;      [ACPI]
-    &lt; /*/M&gt; <emphasis role='blue'>B</emphasis>attery                                               [ACPI_BATTERY]
-    &lt; /*/M&gt; <emphasis role='blue'>T</emphasis>hermal Zone                                          [ACPI_THERMAL]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  N<emphasis role='blue'>V</emphasis>ME Support ---&gt;
-    &lt; /*&gt; N<emphasis role='blue'>V</emphasis>M Express block device                                [BLK_DEV_NVME]
-    # Set [HWMON] to &lt;*&gt; (not &lt;M&gt;!) or it will not show up:
-    [ /*] N<emphasis role='blue'>V</emphasis>Me hardware monitoring                                  [NVME_HWMON]
-  &lt;*/M&gt; H<emphasis role='blue'>a</emphasis>rdware Monitoring support ---&gt;                                 [HWMON]
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD Athlon64/FX or Opteron temperature sensor       [SENSORS_K8TEMP]
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD Family 10h+ temperature sensor                 [SENSORS_K10TEMP]
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD Family 15h processor power                [SENSORS_FAM15H_POWER]
-    &lt; /*/M&gt; <emphasis role='blue'>I</emphasis>ntel Core/Core2/Atom temperature sensor          [SENSORS_CORETEMP]</screen>
Index: neral/sysutils/lm_sensors.xml
===================================================================
--- general/sysutils/lm_sensors.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,373 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lm_sensors-download-http "https://github.com/lm-sensors/lm-sensors/archive/V&lm-sensors-version;/lm-sensors-&lm-sensors-version;.tar.gz">
-  <!ENTITY lm_sensors-download-ftp  " ">
-  <!ENTITY lm_sensors-md5sum        "f60e47b5eb50bbeed48a9f43bb08dd5e">
-  <!ENTITY lm_sensors-size          "268 KB">
-  <!ENTITY lm_sensors-buildsize     "2.6 MB">
-  <!ENTITY lm_sensors-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lm_sensors" xreflabel="lm-sensors-&lm-sensors-version;">
-  <?dbhtml filename="lm_sensors.html"?>
-
-
-  <title>Lm-sensors-&lm-sensors-version;</title>
-
-  <indexterm zone="lm_sensors">
-    <primary sortas="a-lm_sensors">lm_sensors</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lm_sensors</title>
-
-    <para>
-      The <application>lm_sensors</application> package provides userspace
-      support for the hardware monitoring drivers in the Linux kernel.
-      This is useful for monitoring the temperature of the CPU and adjusting the
-      performance of some hardware (such as cooling fans).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lm_sensors-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lm_sensors-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lm_sensors-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lm_sensors-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lm_sensors-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lm_sensors-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lm_sensors-&lm_sensors-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist> -->
-
-    <bridgehead renderas="sect3">lm_sensors Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://oss.oetiker.ch/rrdtool/">RRDtool</ulink> (required to
-      build the <command>sensord</command> program) and
-      <ulink role="runtime"
-             url="https://www.nongnu.org/dmidecode/">dmidecode</ulink>
-      (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="lm_sensors-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      The following configuration options attempt to cover the most common
-      hardware monitoring devices in a typical desktop or laptop system.
-      View the help of each (by pressing the <keycap>H</keycap> button
-      with the option focused in the <command>make menuconfig</command>)
-      to know if you need it.  There are many platform-specific hardware
-      monitoring devices so it's impossible to list the configuration for
-      all of them here.  You may investigate the content of
-      <filename class='directory'>/sys/class/hwmon</filename> within a
-      <quote>mainstream</quote> distro running on the system to know which
-      drivers you need.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="lm_sensors-kernel.xml"/>
-
-    <para>
-      Recompile your kernel and reboot into the new kernel.
-    </para>
-
-    <indexterm zone="lm_sensors lm_sensors-kernel">
-      <primary sortas="d-lm_sensors">lm_sensors</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lm_sensors</title>
-
-    <para>
-      Install <application>Lm_sensors</application> by running the following
-      commands:
-    </para>
-
-<!-- <screen><userinput>patch -Np1 -i ../lm_sensors-&lm_sensors-version;-upstream_fixes-1.patch &amp;&amp; -->
-<screen><userinput>make PREFIX=/usr        \
-     BUILD_STATIC_LIB=0 \
-     MANDIR=/usr/share/man</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 PREFIX=/usr        \
-     BUILD_STATIC_LIB=0 \
-     MANDIR=/usr/share/man install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/lm_sensors-&lm-sensors-version; &amp;&amp;
-cp -rv              README INSTALL doc/* \
-                    /usr/share/doc/lm_sensors-&lm-sensors-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>BUILD_STATIC_LIB=0</parameter>: This parameter disables
-      compiling and installing the static version of
-      <filename class="libraryfile">libsensors</filename>.
-    </para>
-
-    <para>
-      <option>PROG_EXTRA=sensord</option>: This parameter enables
-      compiling <command>sensord</command>, a daemon that can monitor your
-      system at regular intervals. Compiling <command>sensord</command> requires
-      <ulink url="https://oss.oetiker.ch/rrdtool/">RRDtool</ulink>. Be sure
-      to install RRDtool in <filename class="directory">/usr</filename>
-      by running <command>make prefix=/usr</command> when building it.
-      Otherwise, Lm_sensors will not find it easily.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Lm_sensors</title>
-
-    <sect3 id="lm_sensors-config">
-      <title>Config File</title>
-
-      <para>
-        <filename>/etc/sensors3.conf</filename>
-      </para>
-
-      <indexterm zone="lm_sensors lm_sensors-config">
-        <primary
-        sortas="e-etc-path-Configfilename2">/etc/sensors3.conf</primary>
-      </indexterm>
-
-    </sect3>
-    <!-- Completely outdated.  It only sets a list of kernel modules which
-         should be loaded by lm_sensors.  But today udev will load them
-         once the sensor device is detected by the kernel.
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        To find out what hardware sensors your system has, issue the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sensors-detect</userinput></screen>
-
-      <para>
-        The appropriate modules should have been loaded and a summary is
-        displayed at the end. Now you know what is needed and you can recompile
-        your kernel to enable just the options you need (i.e., don't enable the
-        modules you cannot use).
-      </para>
-
-    </sect3>
-    -->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fancontrol, isadump, isaset, pwmconfig, sensors, sensors-conf-convert,
-          sensors-detect, and optionally, sensord
-        </seg>
-        <seg>
-          libsensors.so
-        </seg>
-        <seg>
-          /etc/sensors.d,
-          /usr/include/sensors and
-          /usr/share/doc/lm_sensors-&lm-sensors-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fancontrol">
-        <term><command>fancontrol</command></term>
-        <listitem>
-          <para>
-            is a shell script for use with <application>lm_sensors</application>.
-            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
-          </para>
-          <indexterm zone="lm_sensors fancontrol">
-            <primary sortas="b-fancontrol">fancontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isadump">
-        <term><command>isadump</command></term>
-        <listitem>
-          <para>
-            is a small helper program to examine registers visible through the
-            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)
-          </para>
-          <indexterm zone="lm_sensors isadump">
-            <primary sortas="b-isadump">isadump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isaset">
-        <term><command>isaset</command></term>
-        <listitem>
-          <para>
-            is a small helper program to set registers visible through the ISA
-            bus
-          </para>
-          <indexterm zone="lm_sensors isaset">
-            <primary sortas="b-isaset">isaset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwmconfig">
-        <term><command>pwmconfig</command></term>
-        <listitem>
-          <para>
-            tests the pulse width modulation (PWM) outputs of sensors and
-            configures fancontrol
-          </para>
-          <indexterm zone="lm_sensors pwmconfig">
-            <primary sortas="b-pwmconfig">pwmconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensors">
-        <term><command>sensors</command></term>
-        <listitem>
-          <para>
-            prints the current readings of all sensor chips
-          </para>
-          <indexterm zone="lm_sensors sensors">
-            <primary sortas="b-sensors">sensors</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensors-conf-convert">
-        <term><command>sensors-conf-convert</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script to convert
-            <application>lm-sensors</application> version 2 configuration files
-            to work with version 3
-          </para>
-          <indexterm zone="lm_sensors sensors-conf-convert">
-            <primary sortas="b-sensors-conf-convert">sensors-conf-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensors-detect">
-        <term><command>sensors-detect</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that will walk you
-            through the process of scanning your system for various hardware
-            monitoring chips (sensors) supported by
-            <filename class="libraryfile">libsensors</filename>, or more
-            generally by the <application>lm_sensors</application> tool suite
-          </para>
-          <indexterm zone="lm_sensors sensors-detect">
-            <primary sortas="b-sensors-detect">sensors-detect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensord">
-        <term><command>sensord</command></term>
-        <listitem>
-          <para>
-            (optional) is a daemon that can be used to periodically log sensor
-            readings
-          </para>
-          <indexterm zone="lm_sensors sensord">
-            <primary sortas="b-sensord">sensord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsensors">
-        <term><filename class="libraryfile">libsensors.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>lm_sensors</application> API functions
-          </para>
-          <indexterm zone="lm_sensors libsensors">
-            <primary sortas="c-libsensors">libsensors.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/logrotate.xml
===================================================================
--- general/sysutils/logrotate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,313 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 logrotate-download-http "https://github.com/logrotate/logrotate/releases/download/&logrotate-version;/logrotate-&logrotate-version;.tar.xz">
-  <!ENTITY logrotate-download-ftp  " ">
-  <!ENTITY logrotate-md5sum        "6c15f45efc3475a576c4f7e6cc481b2c">
-  <!ENTITY logrotate-size          "164.5 KB">
-  <!ENTITY logrotate-buildsize     "2.9 MB (add 38 MB for tests)">
-  <!ENTITY logrotate-time          "less than 0.1 SBU (add 0.2 SBU for tests)">
-]>
-
-<sect1 id="logrotate" xreflabel="logrotate-&logrotate-version;">
-  <?dbhtml filename="logrotate.html"?>
-
-
-  <title>Logrotate-&logrotate-version;</title>
-
-  <indexterm zone="logrotate">
-    <primary sortas="a-logrotate">logrotate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Logrotate</title>
-
-    <para>
-      The <application>logrotate</application> package allows automatic
-      rotation, compression, removal, and mailing of log files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&logrotate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&logrotate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &logrotate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &logrotate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &logrotate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &logrotate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Logrotate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4" revision="sysv">Recommended</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref role="runtime" linkend="fcron"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      An <xref role="runtime" linkend="server-mail"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Logrotate</title>
-
-    <para>
-      Install <application>logrotate</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.  One test
-      fails because the very old <command>compress</command> is not
-      present and two tests fail if an MTA is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Logrotate</title>
-
-    <para>
-      <application>Logrotate</application> needs a configuration file,
-      which must be passed as an argument to the command when executed.  Create
-      the file as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/logrotate.conf &lt;&lt; EOF
-<literal># Begin /etc/logrotate.conf
-
-# Rotate log files weekly
-weekly
-
-# Don't mail logs to anybody
-nomail
-
-# If the log file is empty, it will not be rotated
-notifempty
-
-# Number of backups that will be kept
-# This will keep the 2 newest backups only
-rotate 2
-
-# Create new empty files after rotating old ones
-# This will create empty log files, with owner
-# set to root, group set to sys, and permissions 664
-create 0664 root sys
-
-# Compress the backups with gzip
-compress
-
-# No packages own lastlog or wtmp -- rotate them here
-/var/log/wtmp {
-    monthly
-    create 0664 root utmp
-    rotate 1
-}
-
-/var/log/lastlog {
-    monthly
-    rotate 1
-}
-
-# Some packages drop log rotation info in this directory
-# so we include any file in it.
-include /etc/logrotate.d
-
-# End /etc/logrotate.conf</literal>
-EOF
-
-chmod -v 0644 /etc/logrotate.conf</userinput></screen>
-
-    <para>
-      Now create the <filename class='directory'>/etc/logrotate.d</filename>
-      directory as the  <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p /etc/logrotate.d</userinput></screen>
-
-    <para>
-      At this point additional log rotation commands can be entered, typically
-      in the <filename class='directory'>/etc/logrotate.d</filename> directory.
-      For example:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/logrotate.d/sys.log &lt;&lt; EOF
-<literal>/var/log/sys.log {
-   # If the log file is larger than 100kb, rotate it
-   size   100k
-   rotate 5
-   weekly
-   postrotate
-      /bin/killall -HUP syslogd
-   endscript
-}</literal>
-EOF
-
-chmod -v 0644 /etc/logrotate.d/sys.log</userinput></screen>
-
-    <para>
-      You can designate multiple files in one entry:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/logrotate.d/example.log &lt;&lt; EOF
-<literal>file1
-file2
-file3 {
-   ...
-   postrotate
-    ...
-   endscript
-}</literal>
-EOF
-
-chmod -v 0644 /etc/logrotate.d/example.log</userinput></screen>
-
-    <para>
-      You can use in the same line the list of files: file1 file2 file3.
-      See the logrotate man page or <ulink
-      url='https://www.techrepublic.com/article/manage-linux-log-files-with-logrotate/'/>
-      for more examples.
-    </para>
-
-    <para>
-      The command <command>logrotate /etc/logrotate.conf</command> can be
-      run manually, however, the command should be run daily.
-      Other useful commands are <command>logrotate -d
-      /etc/logrotate.conf</command> for debugging purposes and
-      <command>logrotate -f /etc/logrotate.conf</command> forcing the
-      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.
-    </para>
-
-    <para>
-      To run the <command>logrotate</command> command daily,
-      <phrase revision="sysv">if you've installed
-      <xref linkend="fcron"/> and completed the section on periodic jobs,
-      execute</phrase><phrase revision="systemd">execute</phrase> the following
-      commands, as the  <systemitem class="username">root</systemitem> user,
-      to create a <phrase revision="sysv">daily cron job:</phrase>
-      <phrase revision="systemd">systemd timer to run daily at 3:00 A.M.
-     (local time):</phrase>
-    </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/cron.daily/logrotate.sh &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/bash
-/usr/sbin/logrotate /etc/logrotate.conf</literal>
-EOF
-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;
-<literal>[Unit]
-Description=Runs the logrotate command
-Documentation=man:logrotate(8)
-DefaultDependencies=no
-After=local-fs.target
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/logrotate /etc/logrotate.conf</literal>
-EOF
-cat &gt; /usr/lib/systemd/system/logrotate.timer &lt;&lt; "EOF" &amp;&amp;
-<literal>[Unit]
-Description=Runs the logrotate command daily at 3:00 AM
-
-[Timer]
-OnCalendar=*-*-* 3:00:00
-Persistent=true
-
-[Install]
-WantedBy=timers.target</literal>
-EOF
-systemctl enable logrotate.timer</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg> logrotate </seg>
-        <seg> None </seg>
-        <seg> None </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="logrotate-prog">
-        <term><command>logrotate</command></term>
-        <listitem>
-          <para>
-            performs the log maintenance functions defined in the
-            configuration files
-          </para>
-          <indexterm zone="logrotate logrotate-prog">
-            <primary sortas="b-logrotate-prog">logrotate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/lsb-tools.xml
===================================================================
--- general/sysutils/lsb-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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">
-
-  <!ENTITY lsb-tools-download-http "https://github.com/lfs-book/LSB-Tools/releases/download/v&lsb-tools-version;/LSB-Tools-&lsb-tools-version;.tar.gz">
-  <!ENTITY lsb-tools-download-ftp  " ">
-  <!ENTITY lsb-tools-md5sum        "1e6ef8cdfddb55035a6c36757e6313f9">
-  <!ENTITY lsb-tools-size          "20 KB">
-  <!ENTITY lsb-tools-buildsize     "412 KB">
-  <!ENTITY lsb-tools-time          "less than 0.1 SBU">
-
-  %general-entities;
-]>
-
-<sect1 id="lsb-tools" xreflabel="lsb-tools-&lsb-tools-version;">
-  <?dbhtml filename="lsb-tools.html"?>
-
-
-  <title>LSB-Tools-&lsb-tools-version;</title>
-
-  <indexterm zone="lsb-tools">
-    <primary sortas="a-lsb-tools">LSB-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LSB-Tools</title>
-
-    <para>
-      The <application>LSB-Tools</application> package includes tools
-      for Linux Standards Base (LSB) conformance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lsb-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lsb-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lsb-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lsb-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lsb-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lsb-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LSB-Tools</title>
-
-    <para>
-      Install <application>LSB-Tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!-- fixed upstream: should be ok for release 0.13+ -->
-    <para>
-      Remove a file that should not be installed as the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm /usr/sbin/lsbinstall</userinput></screen>
-
-    <para revision="systemd">
-      Remove two scripts that serve no purpose on a systemd system:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>rm /usr/sbin/{install,remove}_initd</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-      <title>Configuration Information</title>
-
-      <para>
-        The configuration for this package was done in
-        <ulink url='&lfs-root;/chapter11/theend.html'>LFS</ulink>.
-        The file <filename>/etc/lsb-release</filename> should already exist.
-        Be sure that the DISTRIB_CODENAME entry has been set properly.
-      </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lsb_release <phrase revision="sysv">,
-          install_initd, and
-          remove_initd</phrase>
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          <phrase revision="systemd">/usr/lib/lsb and</phrase>
-          /usr/lib/python&python3-majorver;/site-packages/lsbtools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsb_release">
-        <term><command>lsb_release</command></term>
-        <listitem>
-          <para>
-            is a script to give LSB data
-          </para>
-          <indexterm zone="lsb-tools lsb_release">
-            <primary sortas="b-lsb_release">lsb_release</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install_initd" revision="sysv">
-        <term><command>install_initd</command></term>
-        <listitem>
-          <para>
-            is a script to activate SysV startup scripts
-          </para>
-          <indexterm zone="lsb-tools install_initd">
-            <primary sortas="b-install_initd">install_initd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="remove_initd" revision="sysv">
-        <term><command>remove_initd</command></term>
-        <listitem>
-          <para>
-            is a script to deactivate SysV startup scripts
-          </para>
-          <indexterm zone="lsb-tools remove_initd">
-            <primary sortas="b-remove_initd">remove_initd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,268 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mc-download-http "http://ftp.midnight-commander.org/mc-&mc-version;.tar.xz">
-  <!ENTITY mc-download-ftp  " ">
-  <!ENTITY mc-md5sum        "2c3dd9af66e4cfef5a7a460df1cdf868">
-  <!ENTITY mc-size          "2.3 MB">
-  <!ENTITY mc-buildsize     "71 MB (add 96 MB for tests)">
-  <!ENTITY mc-time          "0.3 SBU (using parallelism=4; add 0.2 SBU for tests)">
-]>
-
-<sect1 id="mc" xreflabel="MC-&mc-version;">
-  <?dbhtml filename="mc.html"?>
-
-
-  <title>MC-&mc-version;</title>
-
-  <indexterm zone="mc">
-    <primary sortas="a-MC">MC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MC</title>
-
-    <para>
-      <application>MC</application> (Midnight Commander) is a text-mode
-      full-screen file manager and visual shell. It provides a clear,
-      user-friendly, and somewhat protected interface to a Unix system while
-      making many frequent file operations more efficient and preserving the
-      full power of the command prompt.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="slang"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="gpm"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="ruby"/>,
-      <!--<xref linkend="samba"/>,-->
-      <xref linkend="unzip"/>,
-      <xref linkend="x-window-system"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MC</title>
-
-    <para>
-      Install <application>MC</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-charset &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This switch places the
-      global configuration directory in <filename
-      class="directory">/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-charset</parameter>: This switch adds support
-      to <command>mcedit</command> for editing files in encodings different
-      from the one implied by the current locale.
-    </para>
-
-    <para>
-      <option>--with-search-engine=pcre2</option>: Use this switch if you would
-      prefer to use <xref linkend="pcre2" role="nodep"/> instead of GLib for
-      the built-in search engine.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MC</title>
-
-    <sect3 id="mc-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.config/mc/*</filename>
-      </para>
-
-      <indexterm zone="mc mc-config">
-        <primary sortas="e-AA.config/.mc/*">~/.config/.mc/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <filename class="directory">~/.config/mc</filename> directory and
-        its contents are created when you start <command>mc</command> for the
-        first time. Then you can edit the main <filename>~/.config/mc/ini
-        </filename> configuration file manually or through the <application>
-        MC</application> shell. Consult the <ulink role='man'
-        url='&man;mc.1'>mc(1)</ulink> man page for details.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>mc and the symlinks mcdiff, mcedit and mcview</seg>
-        <seg>None</seg>
-        <seg>/etc/mc and /usr/{libexec,share}/mc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- This program is installed in /usr/libexec
-      <varlistentry id="conssaver">
-        <term><command>cons.saver</command></term>
-        <listitem>
-          <para>
-            is used internally by <command>mc</command> for saving and
-            restoring the text behind the panels on Linux text console
-          </para>
-          <indexterm zone="mc conssaver">
-            <primary sortas="b-conssaver">cons.saver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="mc-prog">
-        <term><command>mc</command></term>
-        <listitem>
-          <para>
-            is a visual shell
-          </para>
-          <indexterm zone="mc mc-prog">
-            <primary sortas="b-mc">mc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcdiff">
-        <term><command>mcdiff</command></term>
-        <listitem>
-          <para>
-            is an internal visual diff tool
-          </para>
-          <indexterm zone="mc mcdiff">
-            <primary sortas="b-mcdiff">mcdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcedit">
-        <term><command>mcedit</command></term>
-        <listitem>
-          <para>
-            is an internal file editor
-          </para>
-          <indexterm zone="mc mcedit">
-            <primary sortas="b-mcedit">mcedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcview">
-        <term><command>mcview</command></term>
-        <listitem>
-          <para>
-            is an internal file viewer
-          </para>
-          <indexterm zone="mc mcview">
-            <primary sortas="b-mcview">mcview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/modemmanager.xml
===================================================================
--- general/sysutils/modemmanager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ModemManager-download-http "https://www.freedesktop.org/software/ModemManager/ModemManager-&ModemManager-version;.tar.xz">
-  <!ENTITY ModemManager-download-ftp  " ">
-  <!ENTITY ModemManager-md5sum        "9f014dfc59f1bd8bc230bb2c2974d104">
-  <!ENTITY ModemManager-size          "2.5 MB">
-  <!ENTITY ModemManager-buildsize     "155 MB (with tests)">
-  <!ENTITY ModemManager-time          "0.7 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="ModemManager" xreflabel="ModemManager-&ModemManager-version;">
-  <?dbhtml filename="ModemManager.html"?>
-
-
-  <title>ModemManager-&ModemManager-version;</title>
-
-  <indexterm zone="ModemManager">
-    <primary sortas="a-ModemManager">ModemManager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ModemManager</title>
-
-    <para>
-      <application>ModemManager</application> provides a unified high level
-      API for communicating with mobile broadband modems, regardless of the
-      protocol used to communicate with the actual device.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ModemManager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ModemManager-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ModemManager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ModemManager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ModemManager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ModemManager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ModemManager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      &gobject-introspection;,
-      <xref linkend="libmbim"/>,
-      <xref linkend="libqmi"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/ModemManager"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ModemManager</title>
-
-    <para>
-      Install <application>ModemManager</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                 \
-            --sysconfdir=/etc             \
-            --localstatedir=/var          \
-            --disable-static              \
-            --disable-maintainer-mode     \
-            --with-systemd-journal=no     \
-            --with-systemd-suspend-resume &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                 \
-            --sysconfdir=/etc             \
-            --localstatedir=/var          \
-            --disable-static              \
-            --disable-maintainer-mode     \
-            --with-systemd-journal        \
-            --with-systemd-suspend-resume &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-systemd-suspend-resume</parameter>: This
-      switch forces <application>ModemManager</application> to use the
-      <phrase revision="sysv"><application>elogind</application></phrase>
-      <phrase revision="systemd"><application>systemd</application></phrase>
-      power management facilities.
-    </para>
-
-    <para>
-      <phrase revision="systemd"><parameter>--with-systemd-journal</parameter></phrase>
-      <phrase revision="sysv"><parameter>--with-systemd-journal=no</parameter></phrase>
-      : This switch forces <application>ModemManager</application>
-      <phrase revision="sysv">not</phrase> to use the systemd journal for
-      logging.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-  <sect2 role="configuration" revision="systemd">
-    <title>Configuring ModemManager</title>
-
-    <sect3 id="ModemManager-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>ModemManager</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="ModemManager ModemManager-init">
-        <primary sortas="f-ModemManager">ModemManager</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable ModemManager</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>
-          mmcli and ModemManager
-        </seg>
-        <seg>
-          libmm-glib.so
-        </seg>
-        <seg>
-          /etc/ModemManager,
-          /usr/include/libmm-glib,
-          /usr/include/ModemManager,
-          /usr/lib/ModemManager,
-          /usr/share/ModemManager,
-          /usr/share/gtk-doc/html/libmm-glib (optional), and
-          /usr/share/gtk-doc/html/ModemManager (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mmcli">
-        <term><command>mmcli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control and monitor the
-            <application>ModemManager</application>
-          </para>
-          <indexterm zone="ModemManager mmcli">
-            <primary sortas="b-mmcli">mmcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ModemManager-prog">
-        <term><command>ModemManager</command></term>
-        <listitem>
-          <para>
-            is a <application>D-Bus</application> service used
-            to communicate with modems
-          </para>
-          <indexterm zone="ModemManager ModemManager-prog">
-            <primary sortas="b-ModemManager">ModemManager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmm-glib">
-        <term><filename class="libraryfile">libmm-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for communicating with mobile broadband
-            modems, regardless of the  protocol used to communicate with
-            the actual device
-          </para>
-          <indexterm zone="ModemManager libmm-glib">
-            <primary sortas="c-libmm-glib">libmm-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/notification-daemon.xml
===================================================================
--- general/sysutils/notification-daemon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 notification-daemon-download-http
-           "&gnome-download-http;/notification-daemon/&gnome-minor-20;/notification-daemon-&notification-daemon-version;.tar.xz">
-  <!ENTITY notification-daemon-download-ftp  " ">
-  <!ENTITY notification-daemon-md5sum        "2de7f4075352831f1d98d8851b642124">
-  <!ENTITY notification-daemon-size          "336 KB">
-  <!ENTITY notification-daemon-buildsize     "4.1 MB">
-  <!ENTITY notification-daemon-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="notification-daemon" xreflabel="notification-daemon-&notification-daemon-version;">
-  <?dbhtml filename="notification-daemon.html"?>
-
-
-  <title>notification-daemon-&notification-daemon-version;</title>
-
-  <indexterm zone="notification-daemon">
-    <primary sortas="a-notification-daemon">notification-daemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Notification Daemon</title>
-
-    <para>
-      The <application>Notification Daemon</application> package contains a daemon
-      that displays passive pop-up notifications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&notification-daemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&notification-daemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &notification-daemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &notification-daemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &notification-daemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &notification-daemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Notification Daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libcanberra"/> (Built with <xref linkend="gtk3"/> support).
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Notification Daemon</title>
-
-    <para>
-      Install <application>Notification Daemon</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      You can test the notification daemon with the command
-      <command>notify-send</command>:
-    </para>
-
-<screen><userinput>pgrep -l notification-da &amp;&amp;
-notify-send -i info Information "Hi ${USER}, This is a Test"</userinput></screen>
-    <para>
-      The command <command>pgrep -l notification-da</command> is added to assure
-      that it is the daemon of this package that is running, not another one,
-      e.g. the daemon from <xref linkend="xfce4-notifyd"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          none
-        </seg>
-        <seg>
-          none
-        </seg>
-        <seg>
-          none
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/p7zip.xml
===================================================================
--- general/sysutils/p7zip.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 p7zip-download-http "https://github.com/p7zip-project/p7zip/archive/v&p7zip-version;/p7zip-&p7zip-version;.tar.gz">
-  <!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)">
-]>
-
-<sect1 id="p7zip" xreflabel="p7zip-&p7zip-version;">
-  <?dbhtml filename="p7zip.html"?>
-
-
-  <title>p7zip-&p7zip-version;</title>
-
-  <indexterm zone="p7zip">
-    <primary sortas="a-p7zip">p7zip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to p7zip</title>
-
-    <para>
-      <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>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&p7zip-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&p7zip-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &p7zip-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &p7zip-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &p7zip-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &p7zip-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Applied in 17.03
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/p7zip-&p7zip-version;-consolidated_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">p7zip Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.wxwidgets.org/">wxWidgets</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of p7zip</title>
-
-<!-- Applied in 17.03
-    <para>
-      First, update the package for gcc10 and some security issues:
-    </para>
-
-<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>
-      Install <application>p7zip</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make all3</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make DEST_DIR=<DESTDIR> install -->
-
-<screen role="root"><userinput>make DEST_HOME=/usr \
-     DEST_MAN=/usr/share/man \
-     DEST_SHARE_DOC=/usr/share/doc/p7zip-&p7zip-version; install</userinput></screen>
-
-    <note>
-      <para>
-        If using DESTDIR techniques, use DEST_DIR instead.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          7z, 7za, and 7zr
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/p7zip and /usr/share/doc/p7zip-&p7zip-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="Sevenz">
-        <term><command>7z</command></term>
-        <listitem>
-          <para>
-            is a file archiver utility
-          </para>
-          <indexterm zone="p7zip Sevenz">
-            <primary sortas="b-7z">7z</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Sevenza">
-        <term><command>7za</command></term>
-        <listitem>
-          <para>
-            is a stand-alone executable handling less archive formats than
-            <command>7z</command>
-          </para>
-          <indexterm zone="p7zip Sevenza">
-            <primary sortas="b-7za">7za</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Sevenzr">
-        <term><command>7zr</command></term>
-        <listitem>
-          <para>
-            is a minimal version of <command>7za</command> that handles only
-            7z archives
-          </para>
-          <indexterm zone="p7zip Sevenzr">
-            <primary sortas="b-7zr">7zr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/pax.xml
===================================================================
--- general/sysutils/pax.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- https does not work for mirbsd site with recent OpenSSL (note: we are
-       using OpenSSL for wget and curl).  Don't change it to https when you
-       see https://www.mirbsd.org/ "works" in a browser.  Seems it uses a
-       too old version of tls. -->
-  <!ENTITY pax-download-http "http://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-&pax-version;.tgz">
-  <!ENTITY pax-download-ftp  " ">
-  <!ENTITY pax-md5sum        "87a0a3870ec437c41eb1b406334fe2c5">
-  <!ENTITY pax-size          "172 KB">
-  <!ENTITY pax-buildsize     "1.2 MB">
-  <!ENTITY pax-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="pax" xreflabel="Pax-&pax-version;">
-  <?dbhtml filename="pax.html"?>
-
-
-  <title>Pax-&pax-version;</title>
-
-  <indexterm zone="pax">
-    <primary sortas="a-pax">pax</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pax</title>
-
-    <para>
-      <application>pax</application> is an archiving utility created by POSIX
-      and defined by the POSIX.1-2001 standard. Rather than sort out the
-      incompatible options that have crept up between
-      <application>tar</application> and <application>cpio</application>,
-      along with their implementations across various versions of UNIX, the
-      IEEE designed a new archive utility. The name <quote>pax</quote> is
-      an acronym for portable archive exchange. Furthermore,
-      <quote>pax</quote> means <quote>peace</quote> in Latin, so its name
-      implies that it shall create peace between the
-      <application>tar</application> and <application>cpio</application>
-      format supporters. The command invocation and command structure is
-      somewhat a unification of both <application>tar</application> and
-      <application>cpio</application>.
-    </para>
-    <para>
-      <application>pax</application> has been required to be present in LSB
-      conformant systems since LSB version 3.0.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pax-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pax-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pax-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pax-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pax-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pax-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Pax Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cpio"/></para>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pax</title>
-
-    <para>Install pax by running the following commands:.</para>
-
-    <note>
-      <para>This package expands to the directory <emphasis>pax</emphasis>.</para>
-    </note>
-
-<screen><userinput>bash Build.sh</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <note>
-      <para>This package also creates hard links from <command>pax</command>
-      to the programs <command>cpio</command> and <command>tar</command> in
-      the build directory.  The LFS editors do not recommend that they be
-      installed as they will overwrite the GNU versions of these programs.</para>
-    </note>
-
-<screen role="root"><userinput>install -v pax /usr/bin &amp;&amp;
-install -v -m644 pax.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-
-      <seglistitem>
-        <seg>
-          pax
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pax-prog">
-        <term><command>pax</command></term>
-        <listitem>
-          <para>
-            copies files to and from archives in several formats
-          </para>
-          <indexterm zone="pax pax-prog">
-            <primary sortas="b-pax">pax</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/sysutils/pccts.xml
===================================================================
--- general/sysutils/pccts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pccts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="pccts" xreflabel="pccts-&pccts-version;">
+<?dbhtml filename="pccts.html" dir="general"?>
+<title>pccts-&pccts-version;</title>
+
+&pccts-intro;
+&pccts-inst;
+&pccts-exp;
+&pccts-desc;
+
+</sect1>
+
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/pciutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,211 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="pciutils" xreflabel="pciutils">
+<title>pciutils</title>
 
-  <!ENTITY pciutils-download-http "https://mj.ucw.cz/download/linux/pci/pciutils-&pciutils-version;.tar.gz">
-  <!ENTITY pciutils-download-ftp  " ">
-  <!ENTITY pciutils-md5sum        "43498696be1ff05c369019296b4dc21d">
-  <!ENTITY pciutils-size          "652.6 KB">
-  <!ENTITY pciutils-buildsize     "5.7 MB">
-  <!ENTITY pciutils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="pciutils" xreflabel="pciutils-&pciutils-version;">
-  <?dbhtml filename="pciutils.html"?>
-
-
-  <title>pciutils-&pciutils-version;</title>
-
-  <indexterm zone="pciutils">
-    <primary sortas="a-pciutils">pciutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCI Utils</title>
-
-    <para>
-      The <application>PCI Utils</application> package contains
-      a set of programs for listing PCI devices, inspecting
-      their status and setting their configuration registers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pciutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pciutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pciutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pciutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pciutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pciutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pciutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref role="runtime" linkend="hwdata"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCI Utils</title>
-
-    <para>
-      Prevent the installation of the <filename>pci.ids</filename> file
-      to avoid a conflict with the <xref linkend='hwdata'/> package:
-    </para>
-
-    <screen><userinput>sed -r '/INSTALL.*(PCI_IDS|update-pciids)/d' \
-    -i Makefile</userinput></screen>
-
-    <para>
-      Install <application>PCI Utils</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>make PREFIX=/usr                \
-     SHAREDIR=/usr/share/hwdata \
-     SHARED=yes</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 PREFIX=/usr                \
-     SHAREDIR=/usr/share/hwdata \
-     SHARED=yes                 \
-     install install-lib        &amp;&amp;
-
-chmod -v 755 /usr/lib/libpci.so</userinput></screen>
-
-    <para>
-      Next, install the <xref linkend='hwdata'/> package for the
-      <filename>pci.ids</filename> file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>SHARED=yes</parameter>: This parameter enables building of
-      the shared library instead of the static one.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lspci, pcilmr, and setpci
-        </seg>
-        <seg>
-          libpci.so
-        </seg>
-        <seg>
-          /usr/include/pci
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lspci">
-        <term><command>lspci</command></term>
-        <listitem>
-          <para>
-            is a utility for displaying information about all PCI buses
-            in the system and all devices connected to them
-          </para>
-          <indexterm zone="pciutils lspci">
-            <primary sortas="b-lspci">lspci</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcilmr">
-        <term><command>pcilmr</command></term>
-        <listitem>
-          <para>
-            is a utility for margining PCIe links
-          </para>
-          <indexterm zone="pciutils pcilmr">
-            <primary sortas="b-pcilmr">pcilmr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setpci">
-        <term><command>setpci</command></term>
-        <listitem>
-          <para>
-            is a utility for querying and configuring PCI devices
-          </para>
-          <indexterm zone="pciutils setpci">
-            <primary sortas="b-setpci">setpci</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpci">
-      <term><filename class="libraryfile">libpci.so</filename></term>
-      <listitem>
-        <para>
-          is a library that allows applications to access the PCI
-          subsystem
-        </para>
-        <indexterm zone="pciutils libpci">
-          <primary sortas="c-libpci">libpci.so</primary>
-        </indexterm>
-      </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: general/sysutils/pciutils/pciutils.ent
===================================================================
--- general/sysutils/pciutils/pciutils.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pciutils/pciutils.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY pciutils SYSTEM "../pciutils.xml">
Index: general/sysutils/pkgconfig.xml
===================================================================
--- general/sysutils/pkgconfig.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="pkgconfig" xreflabel="pkgconfig-&pkgconfig-version;">
+<?dbhtml filename="pkgconfig.html" dir="general"?>
+<title>pkgconfig-&pkgconfig-version;</title>
+
+&pkgconfig-intro;
+&pkgconfig-inst;
+&pkgconfig-desc;
+
+</sect1>
+
Index: general/sysutils/pkgconfig/pkgconfig-desc.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pkgconfig package contains <userinput>pkg-config</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>pkg-config</title>
+<para>pkg-config is a function that returns metainformation for the
+specified library.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/pkgconfig/pkgconfig-inst.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of pkgconfig</title>
+
+<para>Install pkgconfig by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/pkgconfig/pkgconfig-intro.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to pkgconfig</title>
+
+<screen>Download location:              <ulink url="&pkgconfig-download;"/>
+Version used:                   &pkgconfig-version;
+Package size:                   &pkgconfig-size;
+Estimated Disk space required:  &pkgconfig-buildsize;</screen>
+
+<para>The pkgconfig package contains pkg-config. This is useful for
+passing the include path and/or library path to the compiler during the
+make script.</para>
+
+</sect2>
Index: general/sysutils/pkgconfig/pkgconfig.ent
===================================================================
--- general/sysutils/pkgconfig/pkgconfig.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY pkgconfig SYSTEM "../pkgconfig.xml">
+<!ENTITY pkgconfig-intro SYSTEM "pkgconfig-intro.xml">
+<!ENTITY pkgconfig-inst SYSTEM "pkgconfig-inst.xml">
+<!ENTITY pkgconfig-desc SYSTEM "pkgconfig-desc.xml">
+<!ENTITY pkgconfig-buildsize "5 MB">
+<!ENTITY pkgconfig-version "0.12.0">
+<!ENTITY pkgconfig-download "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.12.0.tar.gz">
+<!ENTITY pkgconfig-size "596 KB">
Index: neral/sysutils/pm-utils-kernel.xml
===================================================================
--- general/sysutils/pm-utils-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>ower management and ACPI options ---&gt;
-  [*] <emphasis role='blue'>S</emphasis>uspend to RAM and standby                                       [SUSPEND]
-  [*] H<emphasis role='blue'>i</emphasis>bernation (aka 'suspend to disk')                          [HIBERNATION]</screen>
Index: neral/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,336 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pm-utils-download-http "https://pm-utils.freedesktop.org/releases/pm-utils-&pm-utils-version;.tar.gz">
-  <!ENTITY pm-utils-download-ftp  " ">
-  <!ENTITY pm-utils-md5sum        "1742a556089c36c3a89eb1b957da5a60">
-  <!ENTITY pm-utils-size          "204 KB">
-  <!ENTITY pm-utils-buildsize     "1.6 MB">
-  <!ENTITY pm-utils-time          "0.1 SBU">
-]>
-
-<sect1 id="pm-utils" xreflabel="pm-utils-&pm-utils-version;">
-  <?dbhtml filename="pm-utils.html"?>
-
-
-  <title>pm-utils-&pm-utils-version;</title>
-
-  <indexterm zone="pm-utils">
-    <primary sortas="a-pm-utils">pm-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Power Management Utilities</title>
-
-    <para>
-      The <application>Power Management Utilities</application> provide
-      simple shell command line tools to suspend and hibernate the computer.
-      They can be used to run user supplied scripts on suspend and resume.
-    </para>
-
-    <note revision='systemd'>
-      <para>
-        On a system using <application>systemd</application> as the init
-        system, <application>systemd</application> already provides this
-        functionality. As a result, this package is probably not needed, and it
-        may conflict with <application>systemd</application>.  Read the
-        documentation for <filename>suspend.target</filename> and
-        <filename>hibernate.target</filename> in the man page
-        <ulink role='man'
-        url='&man;systemd.special.7'>systemd.special(7)</ulink> for more
-        details.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pm-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pm-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pm-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pm-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pm-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pm-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/pm-utils-&pm-utils-version;-bugfixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Power Management Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/> (to generate man pages)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="hdparm"/>,
-      <xref role="runtime" linkend="wireless_tools"/>,
-      <ulink role="runtime"
-             url="https://www.kernel.org/pub/software/network/ethtool/">
-        ethtool</ulink>, and
-      <ulink role="runtime"
-             url="https://ftp.debian.org/debian/pool/main/v/vbetool/">
-        vbetool</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel"  id="pm-utils-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-       If needed, enable the following options in the kernel configuration and
-       recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pm-utils-kernel.xml"/>
-
-    <para>
-      Suspend to RAM allows the system to enter sleep states in which main
-      memory is powered and thus its contents are preserved. The method cuts
-      power to most parts of the machine aside from the RAM.  Because of the
-      large power savings, it is advisable for laptops to automatically enter
-      this mode when the computer is running on batteries and the lid is closed
-      (or the user is inactive for some time).
-    </para>
-
-    <para>
-      Suspend to disk (Hibernation) saves the machine's state into swap space
-      and completely powers off the machine. When the machine is powered on,
-      the state is restored. Until then, there is zero power consumption.
-      Suspend to RAM and hibernation are normally appropriate for portable
-      devices such as laptops, but can be used on workstations.  The capability
-      is not really appropriate for servers.
-    </para>
-
-    <para>
-      To use hibernation, the kernel parameter
-      resume=/dev/&lt;swap_partition&gt; has to be used on the kernel command
-      line (in grub.cfg).  The swap partition should be at least the size of
-      the physical RAM on the system.
-    </para>
-
-    <indexterm zone="pm-utils pm-utils-kernel">
-      <primary sortas="d-pm-utils">pm-utils</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Power Management Utilities</title>
-
-    <para>
-      First, fix several bugs and a couple of incompatibilities with newer
-      kernels:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../pm-utils-&pm-utils-version;-bugfixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Power Management Utilities</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/pm-utils-&pm-utils-version; &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>
-
-    <para>
-      If you don't have <xref linkend="xmlto"/> installed, copy pregenerated
-      man pages, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 man/*.1 /usr/share/man/man1 &amp;&amp;
-install -v -m644 man/*.8 /usr/share/man/man8 &amp;&amp;
-ln -sv pm-action.8 /usr/share/man/man8/pm-suspend.8 &amp;&amp;
-ln -sv pm-action.8 /usr/share/man/man8/pm-hibernate.8 &amp;&amp;
-ln -sv pm-action.8 /usr/share/man/man8/pm-suspend-hybrid.8</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Power Management Utilities</title>
-
-    <para>
-      Suspend or resume functionality can be easily modified by installing files
-      into the <filename class="directory">/etc/pm/sleep.d</filename> directory.
-      These files, known as hooks, are run when the system is put into a sleep
-      state or resumed. Default hooks are located in <filename
-      class="directory">/usr/lib/pm-utils/sleep.d</filename>, and user hooks
-      should be put in <filename class="directory">/etc/pm/sleep.d</filename>.
-      See the <ulink role='man' url='&man;pm-action.8'>pm-action(8)</ulink>
-      man page for more information.
-    </para>
-
-    <para>
-      In order to use hibernation with <application>GRUB</application> and a
-      swap partition, you need to add kernel parameter
-      <literal>resume=<replaceable>swap_partition</replaceable></literal> (e.g.
-      <literal>resume=/dev/sda1</literal>) to the kernel line in the
-      <filename>/boot/grub/grub.cfg</filename> configuration file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          on_ac_power, pm-hibernate, pm-is-supported, pm-powersave, pm-suspend
-          and pm-suspend-hybrid
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/pm, /usr/lib/pm-utils and
-          /usr/share/doc/pm-utils-&pm-utils-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="on_ac_power">
-        <term><command>on_ac_power</command></term>
-        <listitem>
-          <para>
-            is a script that determines whether the system is running on AC
-            power (rather than a battery)
-          </para>
-          <indexterm zone="pm-utils on_ac_power">
-            <primary sortas="b-on_ac_power">on_ac_power</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-hibernate">
-        <term><command>pm-hibernate</command></term>
-        <listitem>
-          <para>
-            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)
-          </para>
-          <indexterm zone="pm-utils pm-hibernate">
-            <primary sortas="b-pm-hibernate">pm-hibernate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-is-supported">
-        <term><command>pm-is-supported</command></term>
-        <listitem>
-          <para>
-            is a script that checks whether power management features such as
-            suspend and hibernate are supported
-          </para>
-          <indexterm zone="pm-utils pm-is-supported">
-            <primary sortas="b-pm-is-supported">pm-is-supported</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-powersave">
-        <term><command>pm-powersave</command></term>
-        <listitem>
-          <para>
-            is a script that puts the computer into powersaving (low power)
-            mode
-          </para>
-          <indexterm zone="pm-utils pm-powersave">
-            <primary sortas="b-pm-powersave">pm-powersave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-suspend">
-        <term><command>pm-suspend</command></term>
-        <listitem>
-          <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)
-          </para>
-          <indexterm zone="pm-utils pm-suspend">
-            <primary sortas="b-pm-suspend">pm-suspend</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-suspend-hybrid">
-        <term><command>pm-suspend-hybrid</command></term>
-        <listitem>
-          <para>
-            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)
-          </para>
-          <indexterm zone="pm-utils pm-suspend-hybrid">
-            <primary sortas="b-pm-suspend-hybrid">pm-suspend-hybrid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/power-profiles-daemon-kernel.xml
===================================================================
--- general/sysutils/power-profiles-daemon-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>ower management and ACPI options ---&gt;
-  <emphasis role='blue'>C</emphasis>PU Frequency scaling ---&gt;
-    -*-   <emphasis role='blue'>C</emphasis>PU Frequency scaling                                       [CPU_FREQ]
-    -*-     '<emphasis role='blue'>p</emphasis>erformance' governor                    [CPU_FREQ_GOV_PERFORMANCE]
-    &lt;*/M&gt;   '<emphasis role='blue'>p</emphasis>owersave' governor                        [CPU_FREQ_GOV_POWERSAVE]
-    # Select if CPU is Intel:
-    [ /*]   <emphasis role='blue'>I</emphasis>ntel P state control                             [X86_INTEL_PSTATE]
-    # Select if CPU is AMD:
-    [ /*]   <emphasis role='blue'>A</emphasis>MD Processor P-State driver                        [X86_AMD_PSTATE]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  # Some drivers under this submenu provide "platform profile" support
-  # and power-profiles-daemon can take advantage from platform profiles;
-  # select a driver if suitable for your platform:
-  [ /*] <emphasis role='blue'>X</emphasis>86 Platform Specific Device Drivers ---&gt;         [X86_PLATFORM_DEVICES]</screen>
Index: neral/sysutils/power-profiles-daemon.xml
===================================================================
--- general/sysutils/power-profiles-daemon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,317 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Place this in the packages.ent file
-  <!ENTITY power-profiles-daemon-version "">
-  -->
-
-  <!ENTITY power-profiles-daemon-download-http "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/archive/&power-profiles-daemon-version;/power-profiles-daemon-&power-profiles-daemon-version;.tar.gz">
-  <!ENTITY power-profiles-daemon-download-ftp  " ">
-  <!ENTITY power-profiles-daemon-md5sum        "0196aae5798263d3d8f33a9280a6cb10">
-  <!ENTITY power-profiles-daemon-size          "76 KB">
-  <!ENTITY power-profiles-daemon-buildsize     "3.2 MB">
-  <!ENTITY power-profiles-daemon-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="power-profiles-daemon" xreflabel="power-profiles-daemon-&power-profiles-daemon-version;">
-  <?dbhtml filename="power-profiles-daemon.html"?>
-
-
-  <title>Power-profiles-daemon-&power-profiles-daemon-version;</title>
-
-  <indexterm zone="power-profiles-daemon">
-    <primary sortas="a-Power-profiles-daemon">power-profiles-daemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Power-profiles-daemon</title>
-
-    <para>
-      The <application>Power-profiles-daemon</application> package provides a program 
-      that allows modification of the system power/behavior state. This is used on
-      many laptops and can be used by a Desktop Environment to activate power saving 
-      or performance CPU governors through dbus. On other systems, Power-profiles-daemon
-      can be used as a streamlined way to set the CPU governor in order to increase system
-      performance at the cost of energy usage.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&power-profiles-daemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&power-profiles-daemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &power-profiles-daemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &power-profiles-daemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &power-profiles-daemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &power-profiles-daemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Power-profiles-daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="polkit"/>, 
-      <xref linkend="pygobject3"/>, and
-      <xref linkend="upower"/>, 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      The rest are for the tests,
-      <xref linkend="python-dbusmock"/>, 
-      <xref linkend="umockdev"/>,
-      <ulink url="https://github.com/PyCQA/isort">isort</ulink>, and
-      <ulink url="https://github.com/PyCQA/mccabe">mccabe</ulink>
-    </para>
-  </sect2>
-
-    <sect2 role="kernel" id="power-profiles-daemon-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="power-profiles-daemon-kernel.xml"/>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options are
-      selected. As much as possible, the layout should be the same as in
-      kernel configuration menus.
-    </para>
-
-    <indexterm zone="power-profiles-daemon power-profiles-daemon-kernel">
-      <primary sortas="d-Power-profiles-daemon">Power-profiles-daemon</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Power-profiles-daemon</title>
-
-    <para>
-      Install <application>Power-profiles-daemon</application> by 
-      running the following commands:
-    </para>
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-
-meson setup                       \
-      --prefix=/usr               \
-      --buildtype=release         \
-      -Dgtk_doc=false             \
-      -Dtests=false               \
-      -Dsystemdsystemunitdir=/tmp \
-      .. &amp;&amp;
-ninja</userinput></screen>
-
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-
-meson setup               \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk_doc=false     \
-      -Dtests=false       \
-      .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have installed the external dependencies, 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>
-
-    <para revision="sysv">
-      Now, clean up an unneeded systemd unit installed into /tmp:
-    </para>
-
-<screen revision="sysv" role="root">
-<userinput>rm -fv /tmp/power-profiles-daemon.service</userinput>
-</screen>
-
-    <para revision="sysv">
-      Create a directory required for persistant power states 
-      after reboot:
-    </para>
-
-<screen revision="sysv" role="root">
-<userinput>install -vdm755 /var/lib/power-profiles-daemon</userinput>
-</screen>
-
-  </sect2>
-
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Prevents building the
-      documentation. Remove this if you have <application>GTK-Doc</application>
-      installed and wish to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-Dtests=false</parameter>: Prevents building the
-      tests because they cannot be run within the boundaries of 
-      BLFS.  Remove this if you have installed the external dependencies
-      and wish to run the tests.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemdsystemunitdir=/tmp</parameter>: Removes
-      the dependency on <application>systemd</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Power-profiles-daemon</title>
-
-    <sect3  id="power-profiles-daemon-init" revision="sysv">
-      <title>Boot Script</title>
-
-      <para>
-        To automatically start the <command>power-profiles-daemon</command> when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/power-profiles-daemon</filename> bootscript from the
-        <xref linkend="bootscripts" revision="sysv"/> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="power-profiles-daemon power-profiles-daemon-init">
-        <primary sortas="f-Power-profiles-daemon">power-profiles-daemon</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-power-profiles-daemon</userinput></screen>
-    </sect3>
-
-
-    <sect3 id="power-profiles-daemon-systemd" revision="systemd">
-      <title>Systemd Unit</title>
-
-      <para>
-        To start the power-profiles-daemon on boot, enable the systemd 
-        service that was installed by running the following command as the
-        <systemitem class="username">root</systemitem> user: 
-      </para>
-
-      <screen role="root"><userinput>systemctl enable power-profiles-daemon</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Select a Power Profile</title>
-
-      <para>
-        To list all supported power profiles, issue:
-      </para>
-
-      <screen role="nodump"><userinput>powerprofilesctl</userinput></screen>
-
-      <para>
-        To activate a power profile (for example
-        <replaceable>performance</replaceable>), issue:
-      </para>
-
-      <screen role="nodump"><userinput>powerprofilesctl set <replaceable>performance</replaceable></userinput></screen>
-
-      <para>
-        Some desktop environments (for example GNOME and KDE) also provide
-        a graphical interface to interact with
-        <command>power-profiles-daemon</command> and activate a power
-        profile.
-      </para>
-
-      <para>
-        The activated power profile is automatically stored in
-        <filename>/var/lib/power-profiles-daemon/state.ini</filename> and
-        <command>power-profiles-daemon</command> will read it out and
-        activate it again on the next boot if the
-        <phrase revision='sysv'>bootscript is
-        installed</phrase><phrase revision='systemd'>Systemd
-        unit is enabled</phrase> as above.
-      </para>
-    </sect3>
-
-  </sect2>
-
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          powerprofilesctl
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="powerprofilesctl">
-        <term><command>powerprofilesctl</command></term>
-        <listitem>
-          <para>
-            This allows the user to set the power governor of the
-            CPU.
-          </para>
-          <indexterm zone="powerprofilesctl">
-            <primary sortas="b-powerprofilesctl">powerprofilesctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 raptor-download-http "https://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
-  <!ENTITY raptor-download-ftp  " ">
-  <!ENTITY raptor-md5sum        "0a71f13b6eaa0a04bf411083d89d7bc2">
-  <!ENTITY raptor-size          "1.7 MB">
-  <!ENTITY raptor-buildsize     "25 MB (additional 2 MB for the tests)">
-  <!ENTITY raptor-time          "0.1 SBU (additional 0.3 SBU for the tests)">
-]>
-
-<sect1 id="raptor" xreflabel="Raptor-&raptor-version;">
-  <?dbhtml filename="raptor.html"?>
-
-
-  <title>Raptor-&raptor-version;</title>
-
-  <indexterm zone="raptor">
-    <primary sortas="a-Raptor">Raptor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Raptor</title>
-
-    <para>
-      <application>Raptor</application> is a C library that provides a set of
-      parsers and serializers that generate Resource Description Framework
-      (RDF) triples.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&raptor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&raptor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &raptor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &raptor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &raptor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &raptor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/raptor-&raptor-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Raptor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="icu"/> and
-      <ulink url="https://lloyd.github.io/yajl/">libyajl</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Raptor</title>
-
-    <para>
-      First, fix an incompatibility with libxml2-2.11.x:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/20627/20627 \&amp;\&amp; LIBXML_VERSION &lt; 21100/' src/raptor_libxml.c</userinput></screen>
-
-    <para>
-      Install <application>Raptor</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      Several of the XML tests may fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-icu-config=/usr/bin/icu-config</option>: Use
-      this switch if you have installed <xref linkend="icu"/> and wish
-      to build <application>Raptor</application> with its support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rapper
-        </seg>
-        <seg>
-          libraptor2.so
-        </seg>
-        <seg>
-          /usr/include/raptor2 and
-          /usr/share/gtk-doc/html/raptor2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rapper">
-        <term><command>rapper</command></term>
-        <listitem>
-          <para>
-            is a RDF parsing and serializing utility
-          </para>
-          <indexterm zone="raptor rapper">
-            <primary sortas="b-rapper">rapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libraptor2">
-        <term><filename class="libraryfile">libraptor2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Raptor</application> API functions
-          </para>
-          <indexterm zone="raptor libraptor2">
-            <primary sortas="c-libraptor2">libraptor2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/rasqal.xml
===================================================================
--- general/sysutils/rasqal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rasqal-download-http "https://download.librdf.org/source/rasqal-&rasqal-version;.tar.gz">
-  <!ENTITY rasqal-download-ftp  " ">
-  <!ENTITY rasqal-md5sum        "1f5def51ca0026cd192958ef07228b52">
-  <!ENTITY rasqal-size          "1.6 MB">
-  <!ENTITY rasqal-buildsize     "22 MB (additional 4 MB for the tests)">
-  <!ENTITY rasqal-time          "0.3 SBU (additional 0.7 SBU for the tests)">
-]>
-
-<sect1 id="rasqal" xreflabel="Rasqal-&rasqal-version;">
-  <?dbhtml filename="rasqal.html"?>
-
-
-  <title>Rasqal-&rasqal-version;</title>
-
-  <indexterm zone="rasqal">
-    <primary sortas="a-Rasqal">Rasqal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rasqal</title>
-
-    <para>
-      <application>Rasqal</application> is a C library that handles Resource
-      Description Framework (RDF) query language syntaxes, query construction, and
-      execution of queries returning results as bindings, boolean, RDF graphs/triples
-      or syntaxes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rasqal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rasqal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rasqal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rasqal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rasqal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rasqal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Rasqal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="raptor"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="pcre2"/> the next rasqal release will support it -->
-      <xref linkend="libgcrypt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rasqal</title>
-
-    <para>
-      Install <application>Rasqal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rasqal-config and roqet
-        </seg>
-        <seg>
-          librasqal.so
-        </seg>
-        <seg>
-          /usr/include/rasqal and
-          /usr/share/gtk-doc/html/rasqal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rasqal-config">
-        <term><command>rasqal-config</command></term>
-        <listitem>
-          <para>
-            is an utility for retrieving the installation options
-            of <application>Rasqal</application>
-          </para>
-          <indexterm zone="rasqal rasqal-config">
-            <primary sortas="b-rasqal-config">rasqal-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roqet">
-        <term><command>roqet</command></term>
-        <listitem>
-          <para>
-            is an RDF query utility
-          </para>
-          <indexterm zone="rasqal roqet">
-            <primary sortas="b-roqet">roqet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 redland-download-http "https://download.librdf.org/source/redland-&redland-version;.tar.gz">
-  <!ENTITY redland-download-ftp  " ">
-  <!ENTITY redland-md5sum        "e5be03eda13ef68aabab6e42aa67715e">
-  <!ENTITY redland-size          "1.6 MB">
-  <!ENTITY redland-buildsize     "18 MB">
-  <!ENTITY redland-time          "0.2 SBU">
-]>
-
-<sect1 id="redland" xreflabel="Redland-&redland-version;">
-  <?dbhtml filename="redland.html"?>
-
-
-  <title>Redland-&redland-version;</title>
-
-  <indexterm zone="redland">
-    <primary sortas="a-Redland">Redland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Redland</title>
-
-    <para>
-      <application>Redland</application> is a set of free software C libraries
-      that provide support for the Resource Description Framework (RDF).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&redland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&redland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &redland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &redland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &redland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &redland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Redland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="rasqal"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libiodbc"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="postgresql"/>,
-      &berkeley-db;
-      <ulink url="&sourceforge-dl;/virtuoso/">virtuoso</ulink>, and
-      <ulink url="https://sourceforge.net/projects/threestore/">3store</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Redland</title>
-
-    <para>
-      Install <application>Redland</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rdfproc, redland-config and redland-db-upgrade</seg>
-        <seg>librdf.so and /usr/lib/redland/librdf_storage_*.so</seg>
-        <seg>/usr/lib/redland, /usr/share/gtk-doc/html/redland and
-        /usr/share/redland</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rdfproc">
-        <term><command>rdfproc</command></term>
-        <listitem>
-          <para>
-            is the Redland RDF processor utility
-          </para>
-          <indexterm zone="redland rdfproc">
-            <primary sortas="b-rdfproc">rdfproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="redland-config">
-        <term><command>redland-config</command></term>
-        <listitem>
-          <para>
-            is a script to get information about the installed version
-            of Redland
-          </para>
-          <indexterm zone="redland redland-config">
-            <primary sortas="b-redland-config">redland-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="redland-db-upgrade">
-        <term><command>redland-db-upgrade</command></term>
-        <listitem>
-          <para>
-            upgrades older Redland databases to 0.9.12 format
-          </para>
-          <indexterm zone="redland redland-db-upgrade">
-            <primary sortas="b-redland-db-upgrade">redland-db-upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sg3_utils-download-http "https://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
-  <!ENTITY sg3_utils-download-ftp  " ">
-  <!ENTITY sg3_utils-md5sum        "0024393d2d2942cc081ce613d98db68a">
-  <!ENTITY sg3_utils-size          "1.2 MB">
-  <!ENTITY sg3_utils-buildsize     "27 MB">
-  <!ENTITY sg3_utils-time          "0.2 SBU">
-]>
-
-<sect1 id="sg3_utils" xreflabel="sg3_utils-&sg3_utils-version;">
-  <?dbhtml filename="sg3_utils.html"?>
-
-
-  <title>sg3_utils-&sg3_utils-version;</title>
-
-  <indexterm zone="sg3_utils">
-    <primary sortas="a-sg3_utils">sg3_utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sg3_utils</title>
-
-    <para>
-      The <application>sg3_utils</application> package contains low level
-      utilities for devices that use a SCSI command set. Apart from SCSI parallel
-      interface (SPI) devices, the SCSI command set is used by ATAPI devices
-      (CD/DVDs and tapes), USB mass storage devices, Fibre Channel disks, IEEE
-      1394 storage devices (that use the "SBP" protocol), SAS, iSCSI and FCoE
-      devices (amongst others).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sg3_utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sg3_utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sg3_utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sg3_utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sg3_utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sg3_utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- No longer needed as 1.44 fixes the sysmacros.h use
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/sg3_utils-&sg3_utils-version;-glibc_2.28-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sg3_utils</title>
-
-    <para>
-      Install <application>sg3_utils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <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,
-          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_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,
-          sginfo, sgm_dd, and sgp_dd
-        </seg>
-        <seg>
-          libsgutils2.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?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
-          </para>
-          <indexterm zone="sg3_utils scsi_logging_level">
-            <primary sortas="b-scsi_logging_level">scsi_logging_level</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_mandat">
-        <term><command>scsi_mandat</command></term>
-        <listitem>
-          <para>
-            checks SCSI device support for mandatory commands
-          </para>
-          <indexterm zone="sg3_utils scsi_mandat">
-            <primary sortas="b-scsi_mandat">scsi_mandat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_readcap">
-        <term><command>scsi_readcap</command></term>
-        <listitem>
-          <para>
-            does the SCSI READ CAPACITY command on disks
-          </para>
-          <indexterm zone="sg3_utils scsi_readcap">
-            <primary sortas="b-scsi_readcap">scsi_readcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_ready">
-        <term><command>scsi_ready</command></term>
-        <listitem>
-          <para>
-            does the SCSI TEST UNIT READY on devices
-          </para>
-          <indexterm zone="sg3_utils scsi_ready">
-            <primary sortas="b-scsi_ready">scsi_ready</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_satl">
-        <term><command>scsi_satl</command></term>
-        <listitem>
-          <para>
-            checks for SCSI to ATA Translation (SAT) device support
-          </para>
-          <indexterm zone="sg3_utils scsi_satl">
-            <primary sortas="b-scsi_satl">scsi_satl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_start">
-        <term><command>scsi_start</command></term>
-        <listitem>
-          <para>
-            starts one or more SCSI disks
-          </para>
-          <indexterm zone="sg3_utils scsi_start">
-            <primary sortas="b-scsi_start">scsi_start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_stop">
-        <term><command>scsi_stop</command></term>
-        <listitem>
-          <para>
-            stops one or more SCSI disks
-          </para>
-          <indexterm zone="sg3_utils scsi_stop">
-            <primary sortas="b-scsi_stop">scsi_stop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_temperature">
-        <term><command>scsi_temperature</command></term>
-        <listitem>
-          <para>
-            fetches the temperature of a SCSI device
-          </para>
-          <indexterm zone="sg3_utils scsi_temperature">
-            <primary sortas="b-scsi_temperature">scsi_temperature</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_bg_ctl">
-        <term><command>sg_bg_ctl</command></term>
-        <listitem>
-          <para>
-            performs a SCSI BACKGROUND CONTROL command on a device to perform
-            "advanced background operations"
-          </para>
-          <indexterm zone="sg3_utils sg_bg_ctl">
-            <primary sortas="b-sg_bg_ctl">sg_bg_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_compare_and_write">
-        <term><command>sg_compare_and_write</command></term>
-        <listitem>
-          <para>
-            sends the SCSI COMPARE AND WRITE command to device
-          </para>
-          <indexterm zone="sg3_utils sg_compare_and_write">
-            <primary sortas="b-sg_compare_and_write">sg_compare_and_write</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_copy_results">
-        <term><command>sg_copy_results</command></term>
-        <listitem>
-          <para>
-            sends the SCSI RECEIVE COPY RESULTS command (XCOPY related)
-          </para>
-          <indexterm zone="sg3_utils sg_copy_results">
-            <primary sortas="b-sg_copy_results">sg_copy_results</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_dd">
-        <term><command>sg_dd</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices. Specialised for
-            devices that understand the SCSI command set
-          </para>
-          <indexterm zone="sg3_utils sg_dd">
-            <primary sortas="b-sg_dd">sg_dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_decode_sense">
-        <term><command>sg_decode_sense</command></term>
-        <listitem>
-          <para>
-            takes SCSI sense data in binary or as a sequence
-            of ASCII hexadecimal bytes and decodes it
-          </para>
-          <indexterm zone="sg3_utils sg_decode_sense">
-            <primary sortas="b-sg_decode_sense">sg_decode_sense</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_emc_trespass">
-        <term><command>sg_emc_trespass</command></term>
-        <listitem>
-          <para>
-            changes ownership of a LUN from another Service-Processor to
-            this one
-          </para>
-          <indexterm zone="sg3_utils sg_emc_trespass">
-            <primary sortas="b-sg_emc_trespass">sg_emc_trespass</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_format">
-        <term><command>sg_format</command></term>
-        <listitem>
-          <para>
-            formats or resizes a SCSI disk (perhaps changes its block size)
-          </para>
-          <indexterm zone="sg3_utils sg_format">
-            <primary sortas="b-sg_format">sg_format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_get_config">
-        <term><command>sg_get_config</command></term>
-        <listitem>
-          <para>
-            sends a SCSI GET CONFIGURATION command (MMC-4 +)
-          </para>
-          <indexterm zone="sg3_utils sg_get_config">
-            <primary sortas="b-sg_get_config">sg_get_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_get_elem_status">
-        <term><command>sg_get_elem_status</command></term>
-        <listitem>
-          <para>
-            sends a SCSI GET PHYSICAL ELEMENT STATUS command to a device
-          </para>
-          <indexterm zone="sg3_utils sg_get_elem_status">
-            <primary sortas="b-sg_get_elem_status">sg_get_elem_status</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_get_lba_status">
-        <term><command>sg_get_lba_status</command></term>
-        <listitem>
-          <para>
-            sends the SCSI GET LBA STATUS command
-          </para>
-          <indexterm zone="sg3_utils sg_get_lba_status">
-            <primary sortas="b-sg_get_lba_status">sg_get_lba_status</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_ident">
-        <term><command>sg_ident</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT or SET IDENTIFYING INFORMATION command
-          </para>
-          <indexterm zone="sg3_utils sg_ident">
-            <primary sortas="b-sg_ident">sg_ident</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sginfo">
-        <term><command>sginfo</command></term>
-        <listitem>
-          <para>
-            access mode page information for a SCSI (or ATAPI) device
-          </para>
-          <indexterm zone="sg3_utils sginfo">
-            <primary sortas="b-sginfo">sginfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_inq">
-        <term><command>sg_inq</command></term>
-        <listitem>
-          <para>
-            sends a SCSI INQUIRY or ATA IDENTIFY (PACKET) DEVICE command and
-            outputs the response
-          </para>
-          <indexterm zone="sg3_utils sg_inq">
-            <primary sortas="b-sg_inq">sg_inq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_logs">
-        <term><command>sg_logs</command></term>
-        <listitem>
-          <para>
-            access log pages with SCSI LOG SENSE command
-          </para>
-          <indexterm zone="sg3_utils sg_logs">
-            <primary sortas="b-sg_logs">sg_logs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_luns">
-        <term><command>sg_luns</command></term>
-        <listitem>
-          <para>
-            sends the SCSI REPORT LUNS command
-          </para>
-          <indexterm zone="sg3_utils sg_luns">
-            <primary sortas="b-sg_luns">sg_luns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_map">
-        <term><command>sg_map</command></term>
-        <listitem>
-          <para>
-            displays mapping between linux sg and other SCSI devices
-          </para>
-          <indexterm zone="sg3_utils sg_map">
-            <primary sortas="b-sg_map">sg_map</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_map26">
-        <term><command>sg_map26</command></term>
-        <listitem>
-          <para>
-            maps a special file to a SCSI generic (sg) device (or vice versa)
-          </para>
-          <indexterm zone="sg3_utils sg_map26">
-            <primary sortas="b-sg_map26">sg_map26</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgm_dd">
-        <term><command>sgm_dd</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="sg3_utils sgm_dd">
-            <primary sortas="b-sgm_dd">sgm_dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_modes">
-        <term><command>sg_modes</command></term>
-        <listitem>
-          <para>
-            reads mode pages with the SCSI MODE SENSE command
-          </para>
-          <indexterm zone="sg3_utils sg_modes">
-            <primary sortas="b-sg_modes">sg_modes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_opcodes">
-        <term><command>sg_opcodes</command></term>
-        <listitem>
-          <para>
-            reports information on supported SCSI commands or task
-            management functions
-          </para>
-          <indexterm zone="sg3_utils sg_opcodes">
-            <primary sortas="b-sg_opcodes">sg_opcodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgp_dd">
-        <term><command>sgp_dd</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices. Specialized for
-            devices that understand the SCSI command set
-          </para>
-          <indexterm zone="sg3_utils sgp_dd">
-            <primary sortas="b-sgp_dd">sgp_dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_persist">
-        <term><command>sg_persist</command></term>
-        <listitem>
-          <para>
-            sends a SCSI PERSISTENT RESERVE (IN or OUT) command to
-            manipulate registrations and reservations
-          </para>
-          <indexterm zone="sg3_utils sg_persist">
-            <primary sortas="b-sg_persist">sg_persist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_prevent">
-        <term><command>sg_prevent</command></term>
-        <listitem>
-          <para>
-            sends a SCSI PREVENT ALLOW MEDIUM REMOVAL command
-          </para>
-          <indexterm zone="sg3_utils sg_prevent">
-            <primary sortas="b-sg_prevent">sg_prevent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_raw">
-        <term><command>sg_raw</command></term>
-        <listitem>
-          <para>
-            sends an arbitrary SCSI command to a device
-          </para>
-          <indexterm zone="sg3_utils sg_raw">
-            <primary sortas="b-sg_raw">sg_raw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rbuf">
-        <term><command>sg_rbuf</command></term>
-        <listitem>
-          <para>
-            reads data using the SCSI READ BUFFER command
-          </para>
-          <indexterm zone="sg3_utils sg_rbuf">
-            <primary sortas="b-sg_rbuf">sg_rbuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rdac">
-        <term><command>sg_rdac</command></term>
-        <listitem>
-          <para>
-            displays or modifies the RDAC Redundant Controller Page
-          </para>
-          <indexterm zone="sg3_utils sg_rdac">
-            <primary sortas="b-sg_rdac">sg_rdac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read">
-        <term><command>sg_read</command></term>
-        <listitem>
-          <para>
-            reads blocks of data continually from the same offset
-          </para>
-          <indexterm zone="sg3_utils sg_read">
-            <primary sortas="b-sg_read">sg_read</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_attr">
-        <term><command>sg_read_attr</command></term>
-        <listitem>
-          <para>
-            performs a SCSI READ ATTRIBUTE command on a device
-          </para>
-          <indexterm zone="sg3_utils sg_read_attr">
-            <primary sortas="b-sg_read_attr">sg_read_attr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_block_limits">
-        <term><command>sg_read_block_limits</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ BLOCK LIMITS command
-          </para>
-          <indexterm zone="sg3_utils sg_read_block_limits">
-            <primary sortas="b-sg_read_block_limits">sg_read_block_limits</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_buffer">
-        <term><command>sg_read_buffer</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ BUFFER command
-          </para>
-          <indexterm zone="sg3_utils sg_read_buffer">
-            <primary sortas="b-sg_read_buffer">sg_read_buffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_readcap">
-        <term><command>sg_readcap</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ CAPACITY command
-          </para>
-          <indexterm zone="sg3_utils sg_readcap">
-            <primary sortas="b-sg_readcap">sg_readcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_long">
-        <term><command>sg_read_long</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ LONG command
-          </para>
-          <indexterm zone="sg3_utils sg_read_long">
-            <primary sortas="b-sg_read_long">sg_read_long</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_reassign">
-        <term><command>sg_reassign</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REASSIGN BLOCKS command
-          </para>
-          <indexterm zone="sg3_utils sg_reassign">
-            <primary sortas="b-sg_reassign">sg_reassign</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_referrals">
-        <term><command>sg_referrals</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT REFERRALS command
-          </para>
-          <indexterm zone="sg3_utils sg_referrals">
-            <primary sortas="b-sg_referrals">sg_referrals</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="sg3_utils sg_rep_zones">
-            <primary sortas="b-sg_rep_zones">sg_rep_zones</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_requests">
-        <term><command>sg_requests</command></term>
-        <listitem>
-          <para>
-            sends one or more SCSI REQUEST SENSE commands
-          </para>
-          <indexterm zone="sg3_utils sg_requests">
-            <primary sortas="b-sg_requests">sg_requests</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_reset">
-        <term><command>sg_reset</command></term>
-        <listitem>
-          <para>
-            sends a SCSI device, target, bus or host reset; or checks reset state
-          </para>
-          <indexterm zone="sg3_utils sg_reset">
-            <primary sortas="b-sg_reset">sg_reset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_reset_wp">
-        <term><command>sg_reset_wp</command></term>
-        <listitem>
-          <para>
-            sends a SCSI RESET WRITE POINTER command
-          </para>
-          <indexterm zone="sg3_utils sg_reset_wp">
-            <primary sortas="b-sg_reset_wp">sg_reset_wp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rmsn">
-        <term><command>sg_rmsn</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ MEDIA SERIAL NUMBER command
-          </para>
-          <indexterm zone="sg3_utils sg_rmsn">
-            <primary sortas="b-sg_rmsn">sg_rmsn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rtpg">
-        <term><command>sg_rtpg</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT TARGET PORT GROUPS command
-          </para>
-          <indexterm zone="sg3_utils sg_rtpg">
-            <primary sortas="b-sg_rtpg">sg_rtpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_safte">
-        <term><command>sg_safte</command></term>
-        <listitem>
-          <para>
-            fetches status information from a SCSI Accessed Fault-Tolerant
-            Enclosure (SAF-TE) device
-          </para>
-          <indexterm zone="sg3_utils sg_safte">
-            <primary sortas="b-sg_safte">sg_safte</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sanitize">
-        <term><command>sg_sanitize</command></term>
-        <listitem>
-          <para>
-            sends a SCSI SANITIZE command
-          </para>
-          <indexterm zone="sg3_utils sg_sanitize">
-            <primary sortas="b-sg_sanitize">sg_sanitize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sat_identify">
-        <term><command>sg_sat_identify</command></term>
-        <listitem>
-          <para>
-            sends an ATA IDENTIFY (PACKET) DEVICE command via a SCSI to ATA
-            Translation (SAT) layer
-          </para>
-          <indexterm zone="sg3_utils sg_sat_identify">
-            <primary sortas="b-sg_sat_identify">sg_sat_identify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sat_phy_event">
-        <term><command>sg_sat_phy_event</command></term>
-        <listitem>
-          <para>
-            sends an ATA READ LOG EXT command via a SAT pass through to
-            fetch log page 11h which contains SATA phy event counters
-          </para>
-          <indexterm zone="sg3_utils sg_sat_phy_event">
-            <primary sortas="b-sg_sat_phy_event">sg_sat_phy_event</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="sg_sat_read_gplog">
-        <term><command>sg_sat_read_gplog</command></term>
-        <listitem>
-          <para>
-             sends an ATA READ LOG EXT command via a SCSI to ATA Translation
-             (SAT) layer
-          </para>
-          <indexterm zone="sg3_utils sg_sat_read_gplog">
-            <primary sortas="b-sg_sat_read_gplog">sg_sat_read_gplog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="sg_sat_set_features">
-        <term><command>sg_sat_set_features</command></term>
-        <listitem>
-          <para>
-            sends an ATA SET FEATURES command via a SCSI to ATA Translation
-            (SAT) layer
-          </para>
-          <indexterm zone="sg3_utils sg_sat_set_features">
-            <primary sortas="b-sg_sat_set_features">sg_sat_set_features</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_scan">
-        <term><command>sg_scan</command></term>
-        <listitem>
-          <para>
-            does a scan of sg devices (or given SCSI/ATAPI/ATA devices) and
-            prints the results
-          </para>
-          <indexterm zone="sg3_utils sg_scan">
-            <primary sortas="b-sg_scan">sg_scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_seek">
-        <term><command>sg_seek</command></term>
-        <listitem>
-          <para>
-            performs a SCSI SEEK or PRE-FETCH command on a device and it's cache
-          </para>
-          <indexterm zone="sg3_utils sg_seek">
-            <primary sortas="b-sg_seek">sg_seek</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_senddiag">
-        <term><command>sg_senddiag</command></term>
-        <listitem>
-          <para>
-            performs a SCSI SEND DIAGNOSTIC command
-          </para>
-          <indexterm zone="sg3_utils sg_senddiag">
-            <primary sortas="b-sg_senddiag">sg_senddiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_ses">
-        <term><command>sg_ses</command></term>
-        <listitem>
-          <para>
-            sends controls and fetches the current status from a SCSI Enclosure
-            Services (SES) device
-          </para>
-          <indexterm zone="sg3_utils sg_ses">
-            <primary sortas="b-sg_ses">sg_ses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_ses_microcode">
-        <term><command>sg_ses_microcode</command></term>
-        <listitem>
-          <para>
-            sends microcode to a SCSI enclosure
-          </para>
-          <indexterm zone="sg3_utils sg_ses_microcode">
-            <primary sortas="b-sg_ses_microcode">sg_ses_microcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_start">
-        <term><command>sg_start</command></term>
-        <listitem>
-          <para>
-            sends a SCSI START STOP UNIT command to start, stop, load or eject
-            medium
-          </para>
-          <indexterm zone="sg3_utils sg_start">
-            <primary sortas="b-sg_start">sg_start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_stpg">
-        <term><command>sg_stpg</command></term>
-        <listitem>
-          <para>
-            sends a SCSI SET TARGET PORT GROUPS command
-          </para>
-          <indexterm zone="sg3_utils sg_stpg">
-            <primary sortas="b-sg_stpg">sg_stpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_stream_ctl">
-        <term><command>sg_stream_ctl</command></term>
-        <listitem>
-          <para>
-            performs a SCSI STREAM CONTROL or GET STREAM STATUS command on a device
-            to open or close an I/O stream
-          </para>
-          <indexterm zone="sg3_utils sg_stream_ctl">
-            <primary sortas="b-sg_stream_ctl">sg_stream_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sync">
-        <term><command>sg_sync</command></term>
-        <listitem>
-          <para>
-            sends a SCSI command to synchronize the cache
-          </para>
-          <indexterm zone="sg3_utils sg_sync">
-            <primary sortas="b-sg_sync">sg_sync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_test_rwbuf">
-        <term><command>sg_test_rwbuf</command></term>
-        <listitem>
-          <para>
-            tests the SCSI host adapter by issuing write and read operations
-            on a device's buffer and calculating checksums
-          </para>
-          <indexterm zone="sg3_utils sg_test_rwbuf">
-            <primary sortas="b-sg_test_rwbuf">sg_test_rwbuf</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="sg3_utils sg_turs">
-            <primary sortas="b-sg_turs">sg_turs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_unmap">
-        <term><command>sg_unmap</command></term>
-        <listitem>
-          <para>
-            sends a SCSI UNMAP command
-          </para>
-          <indexterm zone="sg3_utils sg_unmap">
-            <primary sortas="b-sg_unmap">sg_unmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_verify">
-        <term><command>sg_verify</command></term>
-        <listitem>
-          <para>
-            invokes SCSI VERIFY command(s) on a block device
-          </para>
-          <indexterm zone="sg3_utils sg_verify">
-            <primary sortas="b-sg_verify">sg_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_vpd">
-        <term><command>sg_vpd</command></term>
-        <listitem>
-          <para>
-            fetches Vital Product Data (VPD) pages using a SCSI INQUIRY
-            command
-          </para>
-          <indexterm zone="sg3_utils sg_vpd">
-            <primary sortas="b-sg_vpd">sg_vpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_buffer">
-        <term><command>sg_write_buffer</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE BUFFER command
-          </para>
-          <indexterm zone="sg3_utils sg_write_buffer">
-            <primary sortas="b-sg_write_buffer">sg_write_buffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_long">
-        <term><command>sg_write_long</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE LONG command
-          </para>
-          <indexterm zone="sg3_utils sg_write_long">
-            <primary sortas="b-sg_write_long">sg_write_long</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_same">
-        <term><command>sg_write_same</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE SAME command
-          </para>
-          <indexterm zone="sg3_utils sg_write_same">
-            <primary sortas="b-sg_write_same">sg_write_same</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_verify">
-        <term><command>sg_write_verify</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE AND VERIFY command
-          </para>
-          <indexterm zone="sg3_utils sg_write_verify">
-            <primary sortas="b-sg_write_verify">sg_write_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_x">
-        <term><command>sg_write_x</command></term>
-        <listitem>
-          <para>
-            performs SCSI WRITE commands on a device
-          </para>
-          <indexterm zone="sg3_utils sg_write_x">
-            <primary sortas="b-sg_write_x">sg_write_x</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_wr_mode">
-        <term><command>sg_wr_mode</command></term>
-        <listitem>
-          <para>
-            writes mode pages
-          </para>
-          <indexterm zone="sg3_utils sg_wr_mode">
-            <primary sortas="b-sg_wr_mode">sg_wr_mode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_xcopy">
-        <term><command>sg_xcopy</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices
-            using SCSI EXTENDED COPY (XCOPY)
-          </para>
-          <indexterm zone="sg3_utils sg_xcopy">
-            <primary sortas="b-sg_xcopy">sg_xcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_zone">
-        <term><command>sg_zone</command></term>
-        <listitem>
-          <para>
-            performs SCSI ZONE commands on a device, such as OPEN, CLOSE, FINISH
-            or SEQUENTIALIZE
-          </para>
-          <indexterm zone="sg3_utils sg_zone">
-            <primary sortas="b-sg_zone">sg_zone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsgutils2">
-        <term><filename class="libraryfile">libsgutils2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>sg3_utils</application> API functions
-          </para>
-          <indexterm zone="sg3_utils libsgutils2">
-            <primary sortas="c-libsgutils2">libsgutils2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/sysmon-qt.xml
===================================================================
--- general/sysutils/sysmon-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sysmon-qt-download-http "https://github.com/lfs-book/sysmon-qt/releases/download/v&sysmon-qt-version;/sysmon-qt-&sysmon-qt-version;.tar.xz">
-  <!ENTITY sysmon-qt-download-ftp  " ">
-  <!ENTITY sysmon-qt-md5sum        "9477952e6918c383cbfee36f710d0a34">
-  <!ENTITY sysmon-qt-size          "76 KB">
-  <!ENTITY sysmon-qt-buildsize     "1.1 MB">
-  <!ENTITY sysmon-qt-time          "0.3 SBU">
-]>
-
-<sect1 id="sysmon-qt" xreflabel="sysmon-qt-&sysmon-qt-version;">
-  <?dbhtml filename="sysmon-qt.html"?>
-
-
-  <title>sysmon-qt-&sysmon-qt-version;</title>
-
-  <indexterm zone="sysmon-qt">
-    <primary sortas="a-sysmon-qt">sysmon-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sysmon-qt</title>
-
-    <para>
-      The <application>sysmon-qt</application> package provides a 
-      program to monitor system values including CPU usage, memory
-      usage, and system temperatures in a compact screen window.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        There is also a version of this package, 
-        <application>sysmon-qt-1.1</application>, at the same location as below
-        that is based on &qt5-deps;.  The build instructions are
-        identical to these.  The functionality is the 
-        same and it does not make sense to build both versions.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sysmon-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sysmon-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sysmon-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sysmon-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sysmon-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sysmon-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">sysmon-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lm_sensors"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sysmon-qt</title>
-
-    <para>
-      Install <application>sysmon-qt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd src               &amp;&amp;
-qmake6 sysmon-qt.pro &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>cp sysmon-qt                 /usr/bin                 &amp;&amp;
-cp ../data/sysmon-qt.desktop /usr/share/applications/ &amp;&amp;
-cp ../data/sysmon-qt.png     /usr/share/pixmaps/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sysmon-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/sysstat.xml
===================================================================
--- general/sysutils/sysstat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,374 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sysstat-download-http "https://sysstat.github.io/sysstat-packages/sysstat-&sysstat-version;.tar.xz">
-  <!ENTITY sysstat-download-ftp  " ">
-  <!ENTITY sysstat-md5sum        "c5cac550f88327f0a93b12f6da93a0cb">
-  <!ENTITY sysstat-size          "896 KB">
-  <!ENTITY sysstat-buildsize     "29 MB">
-  <!ENTITY sysstat-time          "0.1 SBU">
-]>
-
-<sect1 id="sysstat" xreflabel="Sysstat-&sysstat-version;">
-  <?dbhtml filename="sysstat.html"?>
-
-
-  <title>Sysstat-&sysstat-version;</title>
-
-  <indexterm zone="sysstat">
-    <primary sortas="a-Sysstat">Sysstat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sysstat</title>
-
-    <para>
-      The <application>Sysstat</application> package contains utilities
-      to monitor system performance and usage activity.
-      <application>Sysstat</application> contains the <command>sar</command>
-      utility, common to many commercial Unixes, and tools you can schedule via
-      cron to collect and historize performance and activity data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sysstat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sysstat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sysstat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sysstat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sysstat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sysstat-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sysstat Dependencies</bridgehead>
-
-    <para role="recommended">
-      There are no build-time requirements for this package; however,
-      it is designed to be controlled by a cron daemon such as
-      <xref linkend="fcron" role="runtime"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysstat</title>
-
-    <para>
-      Install <application>Sysstat</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sa_lib_dir=/usr/lib/sa    \
-sa_dir=/var/log/sa        \
-conf_dir=/etc/sysstat     \
-./configure --prefix=/usr \
-            --disable-file-attr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para revision="systemd">
-      Install the systemd unit by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -v -m644 sysstat.service /usr/lib/systemd/system/sysstat.service                      &amp;&amp;
-install -v -m644 cron/sysstat-collect.service /usr/lib/systemd/system/sysstat-collect.service &amp;&amp;
-install -v -m644 cron/sysstat-collect.timer /usr/lib/systemd/system/sysstat-collect.timer     &amp;&amp;
-install -v -m644 cron/sysstat-rotate.service /usr/lib/systemd/system/sysstat-roate.service    &amp;&amp;
-install -v -m644 cron/sysstat-rotate.timer /usr/lib/systemd/system/sysstat-rotate.timer       &amp;&amp;
-install -v -m644 cron/sysstat-summary.service /usr/lib/systemd/system/sysstat-summary.service &amp;&amp;
-install -v -m644 cron/sysstat-summary.timer /usr/lib/systemd/system/sysstat-summary.timer</userinput></screen>
-
-    <para revision="systemd">
-      Fix the systemd unit by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>sed -i "/^Also=/d" /usr/lib/systemd/system/sysstat.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>sa_lib_dir</envar>: This environment variable specifies the
-      location of the package-specific library directory.
-    </para>
-
-    <para>
-      <envar>sa_dir</envar>: This environment variable specifies the
-      location of the directory containing the data files.
-    </para>
-
-    <para>
-      <envar>conf_dir</envar>: This environment variable specifies the
-      location of the system configuration directory.
-    </para>
-
-    <para>
-      <parameter>--disable-file-attr</parameter>: Do not set attributes on
-      files being installed. This parameter causes the installation to ignore
-      the man group variable resulting in the man files having
-      <systemitem class="username">root</systemitem>:
-      <systemitem class="groupname">root</systemitem> ownership.
-    </para>
-
-    <note>
-      <para>
-        Run <command>./configure --help</command> to see other influential
-        environment variables you can pass to <command>configure</command>.
-        You may want to use the <envar>history</envar> and
-        <envar>compressafter</envar> variables to customize the amount of data
-        files kept on the system.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Sysstat</title>
-
-    <sect3 id="sysstat-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sysconfig/sysstat</filename> and
-        <filename>/etc/sysconfig/sysstat.ioconf</filename>
-      </para>
-
-      <indexterm zone="sysstat sysstat-config">
-        <primary sortas="e-etc-sysconfig-sysstat">/etc/sysconfig/sysstat</primary>
-      </indexterm>
-      <indexterm zone="sysstat sysstat-config">
-        <primary sortas="e-etc-sysconfig-sysstat.ioconf">/etc/sysconfig/sysstat.ioconf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-     <title>Cron Information</title>
-
-      <para>
-        To begin gathering <application>Sysstat</application> history
-        information, you must add to, or create a privileged user's crontab.
-        The history data location is
-        <filename class="directory">/var/log/sa</filename>. The user running
-        <application>Sysstat</application> utilities via cron must have write
-        access to this location.
-      </para>
-
-      <para>
-        Below is an example of what to install in the crontab. Adjust the
-        parameters to suit your needs. Use <command>man sa1</command> and
-        <command>man sa2</command> for information about the commands.
-      </para>
-
-<screen><literal># 8am-7pm activity reports every 10 minutes during weekdays
-0 8-18 * * 1-5 /usr/lib/sa/sa1 600 6 &amp;
-
-# 7pm-8am activity reports every hour during weekdays
-0 19-7 * * 1-5 /usr/lib/sa/sa1 &amp;
-
-# Activity reports every hour on Saturday and Sunday
-0 * * * 0,6 /usr/lib/sa/sa1 &amp;
-
-# Daily summary prepared at 19:05
-5 19 * * * /usr/lib/sa/sa2 -A &amp;</literal></screen>
-
-      <para>
-        Ensure you submit the revised crontab to the cron daemon.
-      </para>
-
-    </sect3>
-
-    <sect3 id="sysstat-init">
-      <title>System Startup Information</title>
-
-      <indexterm zone="sysstat sysstat-init">
-        <primary sortas="f-sysstat">sysstat</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        At system startup, a LINUX RESTART message must be
-        inserted in the daily data file to reinitialize the kernel counters.
-        This can be automated by installing the
-        <filename>/etc/rc.d/init.d/sysstat</filename> init script included in
-        the <xref linkend="bootscripts"/> package using the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-sysstat</userinput></screen>
-
-      <para revision="systemd">
-        At system startup, a LINUX RESTART message must
-        be inserted in the daily data file to reinitialize the kernel counters.
-        This can be automated by enabling the previously installed systemd unit
-        by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable sysstat</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>cifsiostat, iostat, mpstat, pidstat, sadf, sar, and tapestat</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/sa,
-             /usr/share/doc/sysstat-&sysstat-version; and
-             /var/log/sa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cifsiostat">
-        <term><command>cifsiostat</command></term>
-        <listitem>
-          <para>
-            displays statistics about read and write operations on CIFS
-            filesystems
-          </para>
-          <indexterm zone="sysstat cifsiostat">
-            <primary sortas="b-cifsiostat">cifsiostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iostat">
-        <term><command>iostat</command></term>
-        <listitem>
-          <para>
-            reports CPU statistics and input/output
-            statistics for devices and partitions
-          </para>
-          <indexterm zone="sysstat iostat">
-            <primary sortas="b-iostat">iostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpstat">
-        <term><command>mpstat</command></term>
-        <listitem>
-          <para>
-            writes activities for each available processor
-          </para>
-          <indexterm zone="sysstat mpstat">
-            <primary sortas="b-mpstat">mpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pidstat">
-        <term><command>pidstat</command></term>
-        <listitem>
-          <para>
-            is used for monitoring individual tasks currently being managed
-            by the Linux kernel
-          </para>
-          <indexterm zone="sysstat pidstat">
-            <primary sortas="b-pidstat">pidstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sadf">
-        <term><command>sadf</command></term>
-        <listitem>
-          <para>
-            is used for displaying the contents of data files created by
-            the <command>sar</command> command. But unlike
-            <command>sar</command>, <command>sadf</command> can write its data
-            in many different formats
-          </para>
-          <indexterm zone="sysstat sadf">
-            <primary sortas="b-sadf">sadf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sar">
-        <term><command>sar</command></term>
-        <listitem>
-          <para>
-            is used for displaying the contents of elected cumulative activity
-            counters in the operating system
-          </para>
-          <indexterm zone="sysstat sar">
-            <primary sortas="b-sar">sar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tapestat">
-        <term><command>tapestat</command></term>
-        <listitem>
-          <para>
-            is used for monitoring the activity of tape drives connected to
-            a system
-          </para>
-          <indexterm zone="sysstat tapestat">
-            <primary sortas="b-tapestat">tapestat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,489 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 systemd-download-http "https://anduin.linuxfromscratch.org/LFS/systemd-&systemd-version;-&systemd-stable;.tar.xz"> For whenever we move to a stable snapshot for backports -->
-  <!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        "521cda27409a9edf0370c128fae3e690">
-  <!ENTITY systemd-size          "15 MB">
-  <!ENTITY systemd-buildsize     "198 MB (with tests)">
-  <!ENTITY systemd-time          "3.7 SBU (with tests using 4 cores)">
-
-]>
-
-<sect1 id="systemd" xreflabel="Systemd-&systemd-version;" revision="systemd">
-  <?dbhtml filename="systemd.html"?>
-
-
-  <title>Systemd-&systemd-version;</title>
-  <!-- Whenever we switch back to stable backports, make sure to add the systemd-stable reference back. -->
-
-  <indexterm zone="systemd">
-    <primary sortas="a-systemd">systemd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to systemd</title>
-
-    <para>
-      While <application>systemd</application> was installed when
-      building LFS, there are many features provided by the package that
-      were not included in the initial installation because
-      <application>Linux-PAM</application> was not yet installed.
-      The <application>systemd</application> package needs to be
-      rebuilt to provide a working <command>systemd-logind</command> service,
-      which provides many additional features for dependent packages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&systemd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&systemd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &systemd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &systemd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &systemd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &systemd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--  Comment out (instead of remove) in case a patch will be needed.-->
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-         Required patch:
-         <ulink url="&patch-root;/systemd-&systemd-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">systemd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-
-    <note>
-      <para>
-        <xref linkend='linux-pam'/> is not strictly required to build
-        <application>systemd</application>, but the main reason to rebuild
-        <application>systemd</application> in BLFS (it's already built in
-        LFS anyway) is for the <command>systemd-logind</command> daemon and
-        the
-        <filename class='libraryfile'>pam_systemd.so</filename> PAM module.
-        <xref linkend='linux-pam'/> is required for them.  All packages in
-        BLFS book with a dependency on <application>systemd</application>
-        expects it has been rebuilt with <xref linkend='linux-pam'/>.
-      </para>
-    </note>
-
-    <para role="recommended">
-      <xref linkend="linux-pam"/> and
-      <xref role="runtime" linkend="polkit"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="btrfs-progs"/>, <!-- homed may support it, see the C.E.-->
-      <xref linkend="curl"/>,
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="git"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="iptables"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libidn2"/>,
-      <xref linkend="libpwquality"/>,
-      <xref linkend="libseccomp"/>,
-      <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="sphinx"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="zsh"/> (for the zsh completions),
-      <ulink url="https://www.apparmor.net/">AppArmor</ulink>,
-      <ulink url="https://github.com/linux-audit/audit-userspace">audit-userspace</ulink>,
-      <ulink url="https://github.com/scop/bash-completion">bash-completion</ulink>,
-      <ulink url="https://jekyllrb.com/">jekyll</ulink>,
-      <ulink url="https://www.kernel.org/pub/linux/utils/kernel/kexec/">kexec-tools</ulink>,
-      <ulink url="https://github.com/libbpf/libbpf">libbpf</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="https://pypi.org/project/pefile/">pefile</ulink>,
-      <ulink url="https://pypi.org/project/pyelftools/">pyelftools</ulink>,
-      <ulink url="https://sourceforge.net/projects/linuxquota/">quota-tools</ulink>,
-      <ulink url="https://rpm.org/">rpm</ulink>,
-      <ulink url="https://github.com/SELinuxProject/selinux">SELinux</ulink>,
-      <ulink url="https://sourceware.org/systemtap/">systemtap</ulink>,
-      <ulink url="https://tpm2-tss.readthedocs.io/en/latest/">tpm2-tss</ulink>
-      and <ulink url="https://xenproject.org">Xen</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to rebuild the manual pages)</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="lxml"/> (to build the index of systemd manual pages)
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/Logind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of systemd</title>
-
-    <para>
-      Remove two unneeded groups,
-      <systemitem class="groupname">render</systemitem> and
-      <systemitem class="groupname">sgx</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>
-
-    <para>
-      Now fix a security vulnerability in the DNSSEC verification of
-      <command>systemd-resolved</command> and a bug breaking running
-      <command>systemd-analyze verify</command> on an instantiated systemd
-      unit:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      Rebuild <application>systemd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                \
-      --prefix=/usr           \
-      --buildtype=release     \
-      -Ddefault-dnssec=no     \
-      -Dfirstboot=false       \
-      -Dinstall-tests=false   \
-      -Dldconfig=false        \
-      -Dman=auto              \
-      -Dsysusers=false        \
-      -Drpmmacrosdir=no       \
-      -Dhomed=disabled        \
-      -Duserdb=false          \
-      -Dmode=release          \
-      -Dpam=enabled           \
-      -Dpamconfdir=/etc/pam.d \
-      -Ddev-kvm-mode=0660     \
-      -Dnobody-group=nogroup  \
-      -Dsysupdate=disabled    \
-      -Dukify=disabled        \
-      -Ddocdir=/usr/share/doc/systemd-&systemd-version; &amp;&amp;
-
-ninja</userinput></screen>
-<!-- Regarding homed and userdb, see the note below in Command Explanations-->
-
-    <note>
-      <para>
-        For the best test results, make sure you run the test suite from
-        a system that is booted by the same
-        <application>systemd</application> version you are rebuilding.
-      </para>
-    </note>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!-- test-netlink: https://github.com/systemd/systemd/issues/27969 -->
-      The test named <filename>test-stat-util</filename> and
-      <filename>test-netlink</filename> are known to fail
-      if some kernel features are not enabled.
-      If the test suite is ran as the &root; user, some
-      other tests may fail because they depend on various kernel
-      configuration options.
-    </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>-Dpamconfdir=/etc/pam.d</parameter>: Forces the PAM files to
-      be installed in /etc/pam.d rather than /usr/lib/pam.d.
-    </para>
-
-    <para>
-      <parameter>-Duserdb=false</parameter>: Removes a daemon that does not
-      offer any use under a BLFS configuration. If you wish to enable the
-      <application>userdbd</application> daemon, replace "false" with "true"
-      in the above meson command.
-    </para>
-
-    <para>
-      <parameter>-Dhomed=disabled</parameter>: Removes 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
-      <xref linkend="cryptsetup"/> and <xref linkend="libpwquality"/> installed,
-      and then change <quote>disabled</quote> to <quote>enabled</quote>
-      in the above <command>meson setup</command> command.
-    </para>
-
-    <para>
-      <parameter>-Dukify=disabled</parameter>: Removes a script for
-      combining a kernel, an initramfs, and a kernel command line etc.
-      into an UEFI application which can be loaded by the UEFI firmware
-      to start the embedded Linux kernel.  It's not needed for booting a
-      BLFS system with UEFI if following <xref linkend='grub-setup'/>.
-      And, it requires the <application>pefile</application> Python module
-      at runtime, so if it's enabled but <application>pefile</application>
-      is not installed, in the test suite one test for it will fail.  To
-      enable <command>systemd-ukify</command>, install the
-      <application>pefile</application> module and then change
-      <quote>disabled</quote> to <quote>enabled</quote> in the above
-      <command>meson setup</command> command.
-    </para>
-
-    <!-- EDITORS NOTE: Explanation on removing userdbd and homed:
-    In BLFS, we do not fully support disk encryption. We offer instructions for
-    building 'cryptsetup' as a dependency, but we do not offer instructions for
-    actually configuring it. In addition, we generally do not include
-    functionality that could potentially conflict with other packages, or that
-    is not of any use to us (in an enterprise configuration using Thin Clients
-    or laptops with LUKS encryption, it could make sense though, but that isn't
-    the configuration that we natively support).
-
-    A few of the complications of systemd-homed include:
-      - SSH Logins
-      - Disk Space Assignments
-      - UID Assignments (chown() on login)
-      (See https://cfp.all-systems-go.io/media/homed-asg2019.pdf)
-
-    In an article I read when systemd-homed was originally unveiled, I remember
-    reading about systemd-homed causing problems with OpenSSH Private Key Auth
-    because the user would have to login at the console in order to unlock
-    their home directory, thus allowing the private key to be unlocked and
-    processed by OpenSSH. Since BLFS does not fully support encrypted disks,
-    and because systemd-homed is incompatible with our usage of useradd /
-    traditional UNIX users and groups, I advise that we take the following
-    approach to avoid any confusion:
-
-    - Leave the added Short Descriptions for homectl and userdbctl
-    - Add the above command explanations and restore the previous behavior
-
-    Should we decide to enable homed by default anytime in the future,
-    let's move cryptsetup to recommended or required.
-
-    I would be open to discussing this after the next systemd version when
-    systemd-homed has matured a bit more. -renodr -->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring systemd</title>
-
-    <para>
-      The <filename>/etc/pam.d/system-session</filename> file needs to
-      be modified and a new file needs to be created in order for
-      <command>systemd-logind</command> to work correctly. Run the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>grep 'pam_systemd' /etc/pam.d/system-session ||
-cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF"
-<literal># Begin Systemd addition
-
-session  required    pam_loginuid.so
-session  optional    pam_systemd.so
-
-# End Systemd addition</literal>
-EOF
-
-cat &gt; /etc/pam.d/systemd-user &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/systemd-user
-
-account  required    pam_access.so
-account  include     system-account
-
-session  required    pam_env.so
-session  required    pam_limits.so
-session  required    pam_loginuid.so
-session  optional    pam_keyinit.so force revoke
-session  optional    pam_systemd.so
-
-auth     required    pam_deny.so
-password required    pam_deny.so
-
-# End /etc/pam.d/systemd-user</literal>
-EOF</userinput></screen>
-
-    <!-- For some unknown reason if I don't do this, the per-user systemd
-         manager fails to start with "Trying to run as user instance,
-         but $XDG_RUNTIME_DIR is not set."  This command is enough to
-         fix the issue, and it also seems logical to start using the newly
-         rebuilt systemd right away (like "exec bash -&dash;login" in LFS),
-         so just add it.  -->
-    <para>
-      As the &root; user, replace the running <command>systemd</command>
-      manager (the <command>init</command> process) with the
-      <command>systemd</command> executable newly built and installed:
-    </para>
-
-    <screen role='root'><userinput>systemctl daemon-reexec</userinput></screen>
-
-    <important>
-      <para>
-        Now ensure <xref linkend='shadow'/> has been already rebuilt with
-        <xref linkend='linux-pam'/> support first, then logout, and login
-        again.  This ensures the running login session registered with
-        <command>systemd-logind</command> and a per-user systemd instance
-        running for each user owning a login session.  Many BLFS packages
-        listing Systemd as a dependency needs the
-        <command>systemd-logind</command> integration and/or a running
-        per-user systemd instance.
-      </para>
-    </important>
-
-    <warning>
-      <para>
-        If upgrading from a previous version of systemd and an
-        initrd is used for system boot, you should generate a new initrd before
-        rebooting the system.
-      </para>
-    </warning>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-      <para>
-        A list of the installed files, along with their short
-        descriptions can be found at
-        <ulink url="&lfs-root;/chapter08/systemd.html#contents-systemd"/>.
-      </para>
-
-      <para>
-        Listed below are the newly installed programs
-        along with short descriptions.
-      </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          <!-- maybe userdbd/userdbctl can go in LFS, try at next time -->
-          homectl (optional),
-          systemd-cryptenroll (if <xref linkend="cryptsetup"/> is installed),
-          and userdbctl (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="homectl">
-        <term><command>homectl</command></term>
-        <listitem>
-          <para>
-            is a tool to create, remove, change, or inspect a home directory
-            managed by <command>systemd-homed</command>;  note that it's
-            useless for the classic UNIX users and home directories which
-            we are using in LFS/BLFS book
-          </para>
-          <indexterm zone="systemd homectl">
-            <primary sortas="b-homectl">homectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-cryptenroll">
-        <term><command>systemd-cryptenroll</command></term>
-        <listitem>
-          <para>
-            Is used to enroll or remove a system from full disk encryption,
-            as well as set and query private keys and recovery keys
-          </para>
-          <indexterm zone="systemd systemd-cryptenroll">
-            <primary sortas="b-systemd-cryptenroll">systemd-cryptenroll</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="userdbctl">
-        <term><command>userdbctl</command></term>
-        <listitem>
-          <para>
-            inspects users, groups, and group memberships
-          </para>
-          <indexterm zone="systemd userdbctl">
-            <primary sortas="b-userdbctl">userdbctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pam_systemd">
-        <term><filename class="libraryfile">pam_systemd.so</filename></term>
-        <listitem>
-          <para>
-            is a PAM module used to register user sessions with the
-            <application>systemd</application> login manager,
-            <command>systemd-logind</command>
-          </para>
-          <indexterm zone="systemd pam_systemd">
-            <primary sortas="c-pam_systemd">pam_systemd.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/sysutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,73 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-sysutils">
+<?dbhtml filename="sysutils.html" dir="general"?>
+<title>System Utilities</title>
 
-<chapter id="general-sysutils">
-  <?dbhtml filename="sysutils.html"?>
-
-  <title>System Utilities</title>
-
-  <para>
-    This chapter contains mainly hardware utilities. It also contains
-    some applications used by other applications in the book for
-    installation or configuration purposes.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acpid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluez.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bubblewrap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-pk-helper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-
-  <!-- sysv only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="elogind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="blocaled.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hwdata.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsb-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logrotate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modemmanager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notification-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p7zip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pax.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pciutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pm-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="power-profiles-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="raptor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rasqal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="redland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysmon-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
-
-  <!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="weston.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdotool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zip.xml"/>
+&gpm;
+&fcron;
+&hdparm;
+&which;
+&unzip;
+&zip;
+&pccts;
+&pciutils;
+&pkgconfig;
 
 </chapter>
Index: neral/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "613af9bfea52cde74d2ac34d96de544d">
-  <!ENTITY udisks2-size          "1.8 MB">
-  <!ENTITY udisks2-buildsize     "44 MB (with tests)">
-  <!ENTITY udisks2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="udisks2" xreflabel="UDisks-&udisks2-version;">
-  <?dbhtml filename="udisks2.html"?>
-
-
-  <title>UDisks-&udisks2-version;</title>
-
-  <indexterm zone="udisks2">
-    <primary sortas="a-UDisks2">UDisks2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UDisks</title>
-
-    <para>
-      The <application>UDisks</application> package provides a daemon,
-      tools and libraries to access and manipulate disks and storage
-      devices.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&udisks2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&udisks2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &udisks2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &udisks2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &udisks2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &udisks2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">UDisks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libatasmart"/>,
-      <xref linkend="libblockdev"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="systemd"><xref role='runtime' linkend="systemd"/>
-      (runtime)</phrase>
-      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/> (for the integration tests),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="lvm2"/>,
-      <!-- <xref linkend="ntfs-3g"/>, -->
-      <xref linkend="pygobject3"/> (for the integration tests),
-      <ulink url="https://github.com/relan/exfat">exFAT</ulink>, and
-      <ulink url="https://github.com/sahlberg/libiscsi">libiscsi</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="runtime">
-      <xref linkend="btrfs-progs"/>,
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="dosfstools"/>,
-      <xref linkend="gptfdisk"/>,
-      <xref linkend="mdadm"/>, and
-      <xref linkend="xfsprogs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UDisks</title>
-
-<!-- Applied upstream in version 2.9.0.
-    <para>
-      First, fix a regression caused by glib-2.64:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/stdout_channel = g/a g_io_channel_set_encoding (job->child_stdout_channel, NULL, NULL);' src/udisksspawnedjob.c &amp;&amp;
-sed -i '/stderr_channel = g/a g_io_channel_set_encoding (job->child_stderr_channel, NULL, NULL);' src/udisksspawnedjob.c</userinput></screen>
--->
-
-    <para>
-      Install <application>UDisks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-static     \
-            --enable-available-modules &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. A more
-      thorough test can be run with <command>make ci</command>. You must first
-      create the directories
-      <filename class="directory">/var/run/udisks2</filename> and
-      <filename class="directory">/var/lib/udisks2</filename>, and the optional
-      python modules should be present.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <parameter>--enable-available-modules</parameter>: This switch enables
-      additional <application>UDisks2</application> functionalities if
-      <xref linkend='libblockdev'/> has been built with optional
-      dependencies.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          udisksctl and umount.udisks2
-        </seg>
-        <seg>
-          libudisks2.so
-        </seg>
-        <seg>
-          /etc/udisks2,
-          /usr/include/udisks2,
-          /usr/libexec/udisks2,
-          /usr/share/gtk-doc/html/udisks2, and
-          /var/lib/udisks2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udisksctl">
-        <term><command>udisksctl</command></term>
-        <listitem>
-          <para>
-            is a command-line program used to interact with the
-            <command>udisksd</command> daemon
-          </para>
-          <indexterm zone="udisks2 udisksctl">
-            <primary sortas="b-udisksctl">udisksctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Removed since the user shouldn't use this, and it is in /usr/libexec
-      <varlistentry id="udisksd">
-        <term><command>udisksd</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> daemon itself.
-          </para>
-          <indexterm zone="udisks2 udisksd">
-            <primary sortas="b-udisksd">udisksd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="umountudisks2">
-        <term><command>umount.udisks2</command></term>
-        <listitem>
-          <para>
-            is a command-line program used to unmount file systems
-            that have been mounted by the
-            <application>UDisks</application> daemon
-          </para>
-          <indexterm zone="udisks2 umountudisks2">
-            <primary sortas="b-umountudisks2">umount.udisks2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libudisks2">
-        <term><filename class="libraryfile">libudisks2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>UDisks</application> API functions
-          </para>
-          <indexterm zone="udisks2 libudisks2">
-            <primary sortas="c-libudisks2">libudisks2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/unrar.xml
===================================================================
--- general/sysutils/unrar.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unrar-download-http "https://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
-  <!ENTITY unrar-download-ftp  " ">
-  <!ENTITY unrar-md5sum        "596c964288608be4b4b6502e910518d2">
-  <!ENTITY unrar-size          "256 KB">
-  <!ENTITY unrar-buildsize     "2.7 MB">
-  <!ENTITY unrar-time          "0.3 SBU">
-]>
-
-<sect1 id="unrar" xreflabel="UnRar-&unrar-version;">
-  <?dbhtml filename="unrar.html"?>
-
-
-  <title>UnRar-&unrar-version;</title>
-
-  <indexterm zone="unrar">
-    <primary sortas="a-UnRar">UnRar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UnRar</title>
-
-    <para>
-      The <application>UnRar</application> package contains a
-      <filename>RAR</filename> extraction utility used for
-      extracting files from <filename>RAR</filename> archives.
-      <filename>RAR</filename> archives are usually created
-      with <application>WinRAR</application>, primarily in a
-      Windows environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unrar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unrar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unrar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unrar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unrar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unrar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UnRar</title>
-
-    <note>
-      <para>
-        This package extracts the tarball to the unversioned
-        directory <filename>unrar</filename> and not the expected directory
-        <filename>unrar-&unrar-version;</filename>.
-      </para>
-    </note>
-
-
-    <para>
-      Install <application>UnRar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make -f makefile</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>install -v -m755 unrar /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          unrar
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="unrar-prog">
-        <term><command>unrar</command></term>
-        <listitem>
-          <para>
-            uncompresses a <filename>RAR</filename> archive
-          </para>
-          <indexterm zone="unrar unrar-prog">
-            <primary sortas="b-unrar">unrar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/unzip.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,334 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="unzip" xreflabel="unzip-&unzip-version;">
+<title>unzip-&unzip-version;</title>
 
-  <!ENTITY unzip-download-http "&sourceforge-dl;/infozip/unzip60.tar.gz">
-  <!ENTITY unzip-download-ftp  " ">
-  <!ENTITY unzip-md5sum        "62b490407489521db863b523a7f86375">
-  <!ENTITY unzip-size          "1.3 MB">
-  <!ENTITY unzip-buildsize     "9 MB">
-  <!ENTITY unzip-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="unzip" xreflabel="UnZip-&unzip-version;">
-  <?dbhtml filename="unzip.html"?>
-
-
-  <title>UnZip-&unzip-version;</title>
-
-  <indexterm zone="unzip">
-    <primary sortas="a-UnZip">UnZip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UnZip</title>
-
-    <para>
-      The <application>UnZip</application> package contains
-      <filename>ZIP</filename> extraction utilities. These are useful for
-      extracting files from <filename>ZIP</filename> archives.
-      <filename>ZIP</filename> archives are created with
-      <application>PKZIP</application> or <application>Info-ZIP</application>
-      utilities, primarily in a DOS environment.
-    </para>
-
-    &lfs121_checked;
-
-    <caution>
-      <para>
-        The previous version of the <application>UnZip</application>
-        package had some locale related issues. Currently there are no BLFS
-        editors capable of testing these locale issues. Therefore, the
-        locale related information is left on this page, but has not been
-        tested. A more general discussion of these problems can be found in
-        the <xref linkend="locale-assumed-encoding"/> section of the <xref
-        linkend="locale-issues"/> page.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unzip-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unzip-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unzip-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unzip-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unzip-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unzip-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/unzip-&unzip-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 id="unzip-locale-issues">
-    <title>UnZip Locale Issues</title>
-
-    <note>
-      <para>
-        Use of <application>UnZip</application> in the
-        <application>JDK</application>, <application>Mozilla</application>,
-        <application>DocBook</application> or any other BLFS package
-        installation is not a problem, as BLFS instructions never use
-        <application>UnZip</application> to extract a file with non-ASCII
-        characters in the file's name.
-      </para>
-    </note>
-
-    <para>
-      These issues are thought to be fixed in the patch. But since none
-      of the editors have data to test this, the following workarounds are
-      retained in case they might still be needed.
-    </para>
-
-    <para>
-      The <application>UnZip</application> package assumes that filenames
-      stored in the ZIP archives created on non-Unix systems are encoded in
-      CP850, and that they should be converted to ISO-8859-1 when writing files
-      onto the filesystem. Such assumptions are not always valid. In fact,
-      inside the ZIP archive, filenames are encoded in the DOS codepage that is
-      in use in the relevant country, and the filenames on disk should be in
-      the locale encoding. In MS Windows, the OemToChar() C function (from
-      <filename>User32.DLL</filename>) does the correct conversion (which is
-      indeed the conversion from CP850 to a superset of ISO-8859-1 if MS
-      Windows is set up to use the US English language), but there is no
-      equivalent in Linux.
-    </para>
-
-    <para>
-      When using <command>unzip</command> to unpack a ZIP archive
-      containing non-ASCII filenames, the filenames are damaged because
-      <command>unzip</command> uses improper conversion when any of its
-      encoding assumptions are incorrect. For example, in the ru_RU.KOI8-R
-      locale, conversion of filenames from CP866 to KOI8-R is required, but
-      conversion from CP850 to ISO-8859-1 is done, which produces filenames
-      consisting of undecipherable characters instead of words (the closest
-      equivalent understandable example for English-only users is rot13). There
-      are several ways around this limitation:
-    </para>
-
-    <para>
-      1) For unpacking ZIP archives with filenames containing non-ASCII
-      characters, use <ulink url="https://www.winzip.com/">WinZip</ulink> while
-      running the <ulink url="https://www.winehq.org/">Wine</ulink> Windows
-      emulator.
-    </para>
-
-    <para>
-      2) Use <command>bsdtar -xf</command> from
-      <xref role="nodep" linkend="libarchive"/> to unpack the ZIP archive.
-      Then fix the damage made to
-      the filenames using the <command>convmv</command> tool
-      (<ulink url="https://j3e.de/linux/convmv/"/>). The following is an example
-      for the zh_CN.UTF-8 locale:
-    </para>
-
-<screen><userinput>convmv -f cp936 -t utf-8 -r --nosmart --notest \
-    <replaceable>&lt;/path/to/unzipped/files&gt;</replaceable></userinput></screen>
-<!--
-    <para>
-      3) Apply the optional
-      <filename>unzip-5.50-alt-iconv-v1.1.patch</filename> patch to
-      <application>UnZip</application>. It will apply with some offsets.
-    </para>
-
-    <para>
-      It allows to specify the assumed filename encoding in the ZIP
-      archive using the <option>-O charset_name</option> option and the
-      on-disk filename encoding using the <option>-I charset_name</option>
-      option. Defaults: the on-disk filename encoding is the locale encoding,
-      the encoding inside the ZIP archive is guessed according to the builtin
-      table based on the locale encoding. For US English users, this still
-      means that unzip converts from CP850 to ISO-8859-1 by default.
-    </para>
-
-    <para>
-      Caveat: this method works only with 8-bit locale encodings, not
-      with UTF-8. Attempting to use a patched <command>unzip</command> in UTF-8
-      locales may result in a segmentation fault and is probably a security
-      risk.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UnZip</title>
-
-    <para>
-      First apply the patch:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../unzip-&unzip-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Now compile the package:
-    </para>
-
-<screen><userinput>make -f unix/Makefile generic</userinput></screen>
-
-    <para>
-      The test suite does not work for target <quote>generic</quote>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr MANDIR=/usr/share/man/man1 \
- -f unix/Makefile install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make -f unix/Makefile generic</command>:
-      This target begins by running a configure script (unlike the older
-      targets such as linux and linux_noasm) which creates a flags file that
-      is then used in the build. This ensures that the 32-bit x86 build
-      receives the right flags to unzip files which are larger than 2GB
-      when extracted.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>funzip, unzip, unzipfsx, zipgrep, and zipinfo</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="funzip">
-        <term><command>funzip</command></term>
-        <listitem>
-          <para>
-            allows the output of <command>unzip</command> commands to be
-            redirected
-          </para>
-          <indexterm zone="unzip funzip">
-            <primary sortas="b-funzip">funzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unzip-prog">
-        <term><command>unzip</command></term>
-        <listitem>
-          <para>
-            lists, tests or extracts files from a <filename>ZIP</filename>
-            archive
-          </para>
-          <indexterm zone="unzip unzip-prog">
-            <primary sortas="b-unzip">unzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unzipfsx">
-        <term><command>unzipfsx</command></term>
-        <listitem>
-          <para>
-            is a self-extracting stub that can be prepended to a
-            <filename>ZIP</filename> archive.  Files in this format allow the
-            recipient to decompress the archive without installing
-            <application>UnZip</application>
-          </para>
-          <indexterm zone="unzip unzipfsx">
-            <primary sortas="b-unzipfsx">unzipfsx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipgrep">
-        <term><command>zipgrep</command></term>
-        <listitem>
-          <para>
-            searches files in a <filename>ZIP</filename> archive for
-            lines matching a pattern
-          </para>
-          <indexterm zone="unzip zipgrep">
-            <primary sortas="b-zipgrep">zipgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipinfo">
-        <term><command>zipinfo</command></term>
-        <listitem>
-          <para>
-            produces technical information about the files in a
-            <filename>ZIP</filename> archive, including file access permissions,
-            encryption status, type of compression, etc
-          </para>
-          <indexterm zone="unzip zipinfo">
-            <primary sortas="b-zipinfo">zipinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="libunzip">
-        <term><filename class='libraryfile'>libunzip.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by the
-            <application>UnZip</application> programs.
-          </para>
-          <indexterm zone="unzip libunzip">
-            <primary sortas="c-libunzip">libunzip.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-    </variablelist>
-
-  </sect2>
+&unzip-intro;
+&unzip-inst;
+&unzip-exp;
+&unzip-desc;
 
 </sect1>
Index: neral/sysutils/upower-systemd-kernel.xml
===================================================================
--- general/sysutils/upower-systemd-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen revision="systemd"><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    [*] <emphasis role='blue'>U</emphasis>ser namespace                                                 [USER_NS]</screen>
Index: neral/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 upower-download-http "https://gitlab.freedesktop.org/upower/upower/-/archive/v&upower-version;/upower-v&upower-version;.tar.bz2">
-  <!ENTITY upower-download-ftp  " ">
-  <!ENTITY upower-md5sum        "2399845217a9c6e4510f66033fcd7cf6">
-  <!ENTITY upower-size          "140 KB">
-  <!ENTITY upower-buildsize     "5.5 MB (add 2.6 MB for tests)">
-  <!ENTITY upower-time          "less than 0.1 SBU (add 0.6 SBU for tests)">
-]>
-
-<sect1 id="upower" xreflabel="UPower-&upower-version;">
-  <?dbhtml filename="upower.html"?>
-
-
-  <title>UPower-&upower-version;</title>
-
-  <indexterm zone="upower">
-    <primary sortas="a-UPower">UPower</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UPower</title>
-
-    <para>
-      The <application>UPower</application> package provides an interface for
-      enumerating power devices, listening to device events and querying history
-      and statistics. Any application or service on the system can access the
-      org.freedesktop.UPower service via the system message bus.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&upower-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&upower-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &upower-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &upower-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &upower-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &upower-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">UPower Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="pygobject3"/>,
-      <xref linkend="python-dbusmock"/>,
-      <xref linkend="umockdev"/> (for part of the test suite), and
-      <ulink url="https://libimobiledevice.org/">libimobiledevice</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="upower-kernel" revision="systemd">
-    <!-- With UPower-0.9.11's hardening of the systemd unit file,
-         User Namespace Support (CONFIG_USER_NS) is now required. Without this,
-         you will get "ERROR 213/USER" out of a 'systemctl start upower'. -->
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="upower-systemd-kernel.xml"/>
-
-    <indexterm zone="upower upower-kernel">
-      <primary sortas="d-upower">upower</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UPower</title>
-
-    <para>
-      Install <application>UPower</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                  \
-      --prefix=/usr             \
-      --buildtype=release       \
-      -Dgtk-doc=false           \
-      -Dman=false               \
-      -Dsystemdsystemunitdir=no \
-      -Dudevrulesdir=/usr/lib/udev/rules.d &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build                         &amp;&amp;
-cd    build                         &amp;&amp;
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk-doc=false     \
-      -Dman=false         &amp;&amp;
-ninja</userinput></screen>
-
-    <!-- On my system with LANG=zh_CN.UTF-8, one test attempted to compare
-         Chinese error message with English references and failed.
-         LC_ALL=C fixes the problem.  -->
-    <!-- Headphone hotplug (bluetooth and AUX) was tested and seems to work
-         okay even with the test faliures. Maybe it's wants headphones plugged
-         in during the test? Regardless, it can be safely ignored. -->
-    <!-- On a 32-bit machine, the following test failure can be observed:
-         ======================================================================
-         FAIL: test_battery_energy_charge_mixed (__main__.Tests.test_battery_energy_charge_mixed)
-         battery which reports both current charge and energy
-
-         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 40.0)
-         AssertionError: 40.00000000000001 != 40.0
-
-         This is known upstream as https://gitlab.freedesktop.org/upower/upower/-/issues/251
-         Not sure if this is an actual problem, but it seems to start and work
-         properly -renodr
-
-         test_bluetooth_le_device: upstream MR !207  -xry111 -->
-
-    <!-- On my system all 68 tests passed for v1.90.4.  
-         Did not check on a 32-bit system. - bdubbs -->
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C ninja test</command>.  The
-      test suite should be run from a local GUI session started with
-      dbus-launch. On 32-bit machines, one test will fail due to rounding
-      errors: <filename>Tests.test_battery_energy_charge_mixed</filename>. On
-      some systems, two tests relating to the headphone hotplug feature are
-      known to fail. Those can be safely ignored since the functionality still
-      works.
-    </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>-Dgtk-doc=false</parameter>: Prevents building the
-      documentation. Remove this if you have <application>GTK-Doc</application>
-      installed and wish to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-Dman=false</parameter>: Prevents building the
-      manual pages. Remove this if you have <xref linkend='libxslt'/> and
-      <xref linkend='docbook-xsl'/> installed and wish to build the manual
-      pages.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemdsystemunitdir=no</parameter>: Removes
-      the dependency on <application>systemd</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dudevrulesdir=/usr/lib/udev/rules.d</parameter>: Tells
-      the build system where to install <application>udev</application>
-      rules because the information is missing in
-      <filename>/usr/lib/pkgconfig/libudev.pc</filename>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program<!--
-See below... <phrase revision="systemd">s</phrase>--></segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          upower
-<!-- <phrase revision="systemd"> and upowerd</phrase>
-Upowerd should not be listed, as it is in /usr/libexec, and is not supposed
-to be run by a user. Furthermore, upowerd is also in sysv, and there is no
-reason so single out systemd here. -->
-        </seg>
-        <seg>
-          libupower-glib.so
-        </seg>
-        <seg>
-          /etc/UPower,
-          /usr/include/libupower-glib, and
-          /var/lib/upower
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="upower-prog">
-        <term><command>upower</command></term>
-        <listitem>
-          <para>
-            is the <application>UPower</application> command line tool
-          </para>
-          <indexterm zone="upower upower-prog">
-            <primary sortas="b-upower">upower</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- See above
-      <varlistentry id="upowerd" revision="systemd">
-        <term><command>upowerd</command></term>
-        <listitem>
-          <para>
-            is the <application>UPower</application> Daemon. It provides the
-            org.freedesktop.UPower service on the system message bus.
-          </para>
-          <indexterm zone="upower upowerd">
-            <primary sortas="b-upowerd">upowerd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libupower-glib">
-        <term><filename class="libraryfile">libupower-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>UPower</application> API functions
-          </para>
-          <indexterm zone="upower libupower-glib">
-            <primary sortas="c-libupower-glib">libupower-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 usbutils-download-http "https://kernel.org/pub/linux/utils/usb/usbutils/usbutils-&usbutils-version;.tar.xz">
-  <!ENTITY usbutils-download-ftp  " ">
-  <!ENTITY usbutils-md5sum        "8ff21441faf2e8128e4810b3d6e49059">
-  <!ENTITY usbutils-size          "168 KB">
-  <!ENTITY usbutils-buildsize     "4.4 MB">
-  <!ENTITY usbutils-time          "0.1 SBU">
-]>
-
-<sect1 id="usbutils" xreflabel="usbutils-&usbutils-version;">
-  <?dbhtml filename="usbutils.html"?>
-
-
-  <title>usbutils-&usbutils-version;</title>
-
-  <indexterm zone="usbutils">
-    <primary sortas="a-usbutils">usbutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to USB Utils</title>
-
-    <para>
-      The <application>USB Utils</application> package contains utilities
-      used to display information about USB buses in the system and the
-      devices connected to them.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&usbutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&usbutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &usbutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &usbutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &usbutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &usbutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/usbutils-&usbutils-version;-lsusb_bugfixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">USB Utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="hwdata"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of USB Utils</title>
-
-    <para>
-      Install <application>USB Utils</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --datadir=/usr/share/hwdata &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>
-
-    <para>
-      For the <filename>usb.ids</filename> data file, install the
-      <xref linkend='hwdata'/> package.
-    </para>
-
-    <para>
-      The script <command>lsusb.py</command> displays information in a more
-      easily readable form than <command>lsusb</command>. To find the options,
-      use <command>lsusb.py -h</command>. One form of use recommended by the
-      developer is <command>lsusb.py -ciu</command>.
-    </para>
-
-  </sect2>
-<!-- No longer needed
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... lsusb.py</command>: Instructs lsusb.py where to search
-      <filename>usb.ids</filename>.
-    </para>
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lsusb, lsusb.py, usb-devices, and usbhid-dump
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsusb">
-        <term><command>lsusb</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="usbutils lsusb">
-            <primary sortas="b-lsusb">lsusb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsusb.py">
-        <term><command>lsusb.py</command></term>
-        <listitem>
-          <para>
-            displays information about all USB buses in the system and all
-            devices connected to them in reasonable human friendly form
-          </para>
-          <indexterm zone="usbutils lsusb.py">
-            <primary sortas="b-lsusb.py">lsusb.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usb-devices">
-        <term><command>usb-devices</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="usbutils usb-devices">
-            <primary sortas="b-usb-devices">usb-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usbhid-dump">
-        <term><command>usbhid-dump</command></term>
-        <listitem>
-          <para>
-            is used to dump report descriptors and streams from HID
-            (human interface device) interfaces of USB devices
-          </para>
-          <indexterm zone="usbutils usbhid-dump">
-            <primary sortas="b-usbhid-dump">usbhid-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/which.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,166 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="which" xreflabel="which-&which-version;">
+<?dbhtml filename="which.html" dir="general"?>
+<title>The "which" program / script</title>
 
-<!--  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">-->
+<para>The presence / absence of the which program in the main LFS book
+is probably one of the most contentious issues we have on the mailing
+lists.  It has resulted in at least one flame war in the recent past.
+To hopefully put an end to this once and for all, we here present the
+various options for equipping your system with "which".</para>
 
-  <!ENTITY which-download-http "&gnu-http;/which/which-&which-version;.tar.gz">
-  <!ENTITY which-download-ftp  " ">
-  <!ENTITY which-md5sum        "097ff1a324ae02e0a3b0369f07a7544a">
-  <!ENTITY which-size          "148 KB">
-  <!ENTITY which-buildsize     "1 MB">
-  <!ENTITY which-time          "less than 0.1 SBU">
-]>
+<para>The first option is simply to use a bash alias:</para>
+<screen>alias which='type -p'</screen>
+<para>This command can be put in your
+<filename>~/.bash_profile</filename> or <filename>~/.bashrc</filename>
+file in order to be set up each time you log in (see man bash for more
+information on the bash login files).  This will not always work
+however, for example it will fail when a program needs to use "which"
+but
+doesn't spawn a shell.</para>
 
-<sect1 id="which" xreflabel="Which-&which-version;">
-  <?dbhtml filename="which.html"?>
+<para>The second option is to create a simple script:</para>
+<para><screen><userinput>cat &gt; /usr/bin/which &lt;&lt;
+"EOF"</userinput>
+#!/bin/bash
+type -p "$@"
+<userinput>EOF
+chmod 755 /usr/bin/which
+chown root.root /usr/bin/which</userinput></screen></para>
+<para>This should generally work OK and is probably the easiest solution
+for boxes which don't need a good user environment to work in.</para>
 
+<para>The third option is to install the actual program
+<emphasis>which</emphasis>.</para>
 
-  <title>Which-&which-version; and Alternatives</title>
-
-  <para>
-    The presence or absence of the <command>which</command> program in the
-    main LFS book is probably one of the most contentious issues on the
-    mailing lists. It has resulted in at least one flame war in the past. To
-    hopefully put an end to this once and for all, presented here are two
-    options for equipping your system with <command>which</command>. The
-    question of which <quote><command>which</command></quote> is for you to
-    decide.
-  </para>
-
-  <indexterm zone="which">
-    <primary sortas="a-Which">Which</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNU Which</title>
-
-    <para>
-      The first option is to install the actual GNU
-      <application>which</application> package.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&which-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&which-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &which-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &which-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &which-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &which-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Which</title>
-
-    <para>
-      Install <application>which</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>which</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="which-prog">
-        <term><command>which</command></term>
-        <listitem>
-          <para>
-            shows the full path of (shell) commands installed in your
-            <envar>PATH</envar>
-          </para>
-          <indexterm zone="which which-prog">
-            <primary sortas="b-which">which</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>The 'which' Script</title>
-
-    <para>
-      The second option (for those who don't want to install the package)
-      is to create a simple script (execute as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/which &lt;&lt; "EOF"
-<literal>#!/bin/bash
-type -pa "$@" | head -n 1 ; exit ${PIPESTATUS[0]}</literal>
-EOF
-chmod -v 755 /usr/bin/which
-chown -v root:root /usr/bin/which</userinput></screen>
-
-    <para>
-      This should work OK and is probably the easiest solution
-      for most cases, but is not the most comprehensive implementation.
-    </para>
-
-  </sect2>
+&which-intro;
+&which-inst;
+&which-desc;
 
 </sect1>
+
Index: general/sysutils/which/which-desc.xml
===================================================================
--- general/sysutils/which/which-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Contents</title>
+
+<para>The which package contains <userinput>which</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>which</title>
+<para>which shows the full path of (shell) commands.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/which/which-inst.xml
===================================================================
--- general/sysutils/which/which-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of which</title>
+
+<para>Install which by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/which/which-intro.xml
===================================================================
--- general/sysutils/which/which-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Introduction to which</title>
+
+<screen>Download location:              &which-download;
+Version used:                   &which-version;
+Package size:                   &which-size;
+Estimated Disk space required:  &which-buildsize;</screen>
+
+</sect2>
Index: general/sysutils/which/which.ent
===================================================================
--- general/sysutils/which/which.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY which SYSTEM "../which.xml">
+<!ENTITY which-intro SYSTEM "which-intro.xml">
+<!ENTITY which-inst SYSTEM "which-inst.xml">
+<!ENTITY which-desc SYSTEM "which-desc.xml">
+<!ENTITY which-buildsize "667 KB">
+<!ENTITY which-version "2.13">
+<!ENTITY which-download "ftp://ftp.gnu.org/pub/gnu/which/which-2.13.tar.gz">
+<!ENTITY which-size "104 KB">
Index: general/sysutils/whichtemp.xml
===================================================================
--- general/sysutils/whichtemp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/whichtemp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,36 @@
+<sect1 id="ch05-which">
+<?dbhtml filename="which.html" dir="chapter05"?>
+<title>The "which" program / script</title>
+
+<para>The presence / absence of the which program in the main LFS book
+is probably one of the most contentious issues we have on the mailing
+lists.  It has resulted in at least one flame war in the recent past.
+To hopefully put an end to this once and for all, we here present the
+various options for equipping your system with "which".</para>
+
+<para>The first option is simply to use a bash alias:</para>
+<screen>alias which='type -p'</screen>
+<para>This command can be put in your
+<filename>~/.bash_profile</filename> or <filename>~/.bashrc</filename>
+file in order to be set up each time you log in (see man bash for more
+information on the bash login files).  This will not always work
+however, for example it will fail when a program needs to use "which" but 
+doesn't spawn a shell.</para>
+
+<para>The second option is to create a simple script:</para>
+<para><screen><userinput>cat &gt; /usr/bin/which &lt;&lt; "EOF"</userinput>
+#!/bin/bash
+type -p "$@"
+<userinput>EOF
+chmod 755 /usr/bin/which
+chown root.root /usr/bin/which</userinput></screen></para>
+<para>This should generally work OK and is probably the easiest solution
+for boxes which don't need a good user environment to work in.</para>
+
+<para>The third option is to install the actual program
+<emphasis>which</emphasis>.</para>
+
+&which;
+
+</sect1>
+
Index: neral/sysutils/xdotool.xml
===================================================================
--- general/sysutils/xdotool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdotool-download-http "https://github.com/jordansissel/xdotool/releases/download/v&xdotool-version;/xdotool-&xdotool-version;.tar.gz">
-  <!ENTITY xdotool-download-ftp  " ">
-  <!ENTITY xdotool-md5sum        "9fd993a251a7c38b32381503544b0dd7">
-  <!ENTITY xdotool-size          "116 KB">
-  <!ENTITY xdotool-buildsize     "2.1 MB">
-  <!ENTITY xdotool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdotool" xreflabel="xdotool-&xdotool-version;">
-  <?dbhtml filename="xdotool.html"?>
-
-
-  <title>xdotool-&xdotool-version;</title>
-
-  <indexterm zone="xdotool">
-    <primary sortas="a-xdotool">xdotool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdotool</title>
-
-    <para>
-      The <application>xdotool</application> package provides the capabilities
-      to simulate keyboard input and mouse activity, move and resize windows,
-      etc. It does this using X11’s XTEST extension and other Xlib functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdotool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdotool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdotool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdotool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdotool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdotool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdotool</title>
-
-    <para>
-      Install <application>xdotool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make WITHOUT_RPATH_FIX=1</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr INSTALLMAN=/usr/share/man 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>
-          xdotool
-        </seg>
-        <seg>
-          libxdo.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdotool-prog">
-        <term><command>xdotool</command></term>
-        <listitem>
-          <para>
-            uncompresses a <filename>RAR</filename> archive
-          </para>
-          <indexterm zone="xdotool xdotool-prog">
-            <primary sortas="b-xdotool">xdotool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ general/sysutils/zip.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,184 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="zip" xreflabel="zip">
+<?dbhtml filename="zip.html" dir="general"?>
+<title>zip</title>
 
-  <!ENTITY zip-download-http "&sourceforge-dl;/infozip/zip30.tar.gz">
-  <!ENTITY zip-download-ftp  " ">
-  <!ENTITY zip-md5sum        "7b74551e63f8ee6aab6fbc86676c0d37">
-  <!ENTITY zip-size          "1.1 MB">
-  <!ENTITY zip-buildsize     "6.4 MB">
-  <!ENTITY zip-time          "0.1 SBU">
-]>
-
-<sect1 id="zip" xreflabel="Zip-&zip-version;">
-  <?dbhtml filename="zip.html"?>
-
-
-  <title>Zip-&zip-version;</title>
-
-  <indexterm zone="zip">
-    <primary sortas="a-Zip">Zip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Zip</title>
-
-    <para>
-      The <application>Zip</application> package contains
-      <application>Zip</application> utilities. These
-      are useful for compressing files into <filename>ZIP</filename>
-      archives.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&zip-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&zip-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &zip-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &zip-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &zip-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &zip-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Zip</title>
-
-    <para>
-      Install <application>Zip</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make -f unix/Makefile generic_gcc</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 prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make prefix=/usr -f unix/Makefile install</command>: This
-      command overrides the <varname>prefix</varname> variable that is set to
-      <filename class='directory'>/usr/local</filename> in the
-      <filename>unix/Makefile</filename>.
-      Alternatives to <parameter>generic_gcc</parameter> can be seen with a
-      <command>make -f unix/Makefile list</command> command.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>zip, zipcloak, zipnote, and zipsplit</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="zip-prog">
-        <term><command>zip</command></term>
-        <listitem>
-          <para>
-            compresses files into a <filename>ZIP</filename> archive
-          </para>
-          <indexterm zone="zip zip-prog">
-            <primary sortas="b-zip">zip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipcloak">
-        <term><command>zipcloak</command></term>
-        <listitem>
-          <para>
-            is a utility to encrypt and decrypt a <filename>ZIP</filename>
-            archive
-          </para>
-          <indexterm zone="zip zipcloak">
-            <primary sortas="b-zipcloak">zipcloak</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipnote">
-        <term><command>zipnote</command></term>
-        <listitem>
-          <para>
-            reads or writes comments stored in a <filename>ZIP</filename>
-            file
-          </para>
-          <indexterm zone="zip zipnote">
-            <primary sortas="b-zipnote">zipnote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipsplit">
-        <term><command>zipsplit</command></term>
-        <listitem>
-          <para>
-            is a utility to split <filename>ZIP</filename> files into
-            smaller files
-          </para>
-          <indexterm zone="zip zipsplit">
-            <primary sortas="b-zipsplit">zipsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: t-version.sh
===================================================================
--- git-version.sh	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,57 +1,0 @@
-#!/bin/sh
-
-if [ "$1" = sysv ]; then
-    SYSV="INCLUDE"
-    SYSTEMD="IGNORE "
-elif [ "$1" = systemd ]; then
-    SYSV="IGNORE "
-    SYSTEMD="INCLUDE"
-else
-    echo You must provide either \"sysv\" or \"systemd\" as argument
-    exit 1
-fi
-
-echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
-echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
-
-if ! git status > /dev/null; then
-    # Either it's not a git repository, or git is unavaliable.
-    # Just workaround.
-    echo "<!ENTITY year              \"????\">"            >  version.ent
-    echo "<!ENTITY version           \"unknown\">"         >> version.ent
-    echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
-    echo "<!ENTITY pubdate           \"unknown\">"         >> version.ent
-    exit 0
-fi
-
-export LC_ALL=en_US.utf8
-export TZ=America/Chicago
-
-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")
-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)"
-version=$(echo "$sha" | sed 's/-g[^-]*$//')
-
-if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-    version="$version-wip"
-fi
-
-echo "<!ENTITY year              \"$year\">"               >  version.ent
-echo "<!ENTITY version           \"$version\">"            >> version.ent
-echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
-echo "<!ENTITY pubdate           \"$short_date\">"         >> version.ent
Index: ome.ent
===================================================================
--- gnome.ent	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<!ENTITY gnome-download-http  "https://download.gnome.org/sources">
-<!ENTITY gnome-download-ftp   "ftp://ftp.acc.umu.se/pub/gnome/sources">
-<!ENTITY gnome-minor          "3.12">
-<!ENTITY gnome-minor-20       "3.20">
-<!ENTITY gnome-minor-22       "3.22">
-<!ENTITY gnome-minor-24       "3.24">
-<!ENTITY gnome-minor-26       "3.26">
-<!ENTITY gnome-minor-28       "3.28">
-<!ENTITY gnome-minor-36       "3.36">
-<!ENTITY gnome-minor-40       "3.40">
-<!ENTITY gnome-minor-42       "3.42">
-<!ENTITY gnome-minor-44       "3.44">
-<!ENTITY gnome-minor-46       "3.46">
-<!ENTITY gnome-minor-48       "3.48">
-<!ENTITY gnome-minor-50       "3.50">
-<!ENTITY gnome-minor-52       "3.52">
-<!ENTITY gnome-41             "41">
-<!ENTITY gnome-42             "42">
-<!ENTITY gnome-43             "43">
-<!ENTITY gnome-44             "44">
-<!ENTITY gnome-45             "45">
-<!ENTITY gnome-46             "46">
-<!-- See about removing some of the above entities after 40.0 is in. -->
-
-<!-- Chapter 30 -->
-<!-- Platform -->
-<!ENTITY gcr-minor                         "3.41">
-<!ENTITY gcr-version                       "&gcr-minor;.2">
-<!ENTITY gcr4-minor                        "4.3">
-<!ENTITY gcr4-version                      "&gcr4-minor;.0">
-<!ENTITY gsettings-desktop-schemas-version "46.0">
-<!ENTITY libsecret-version                 "0.21.4">
-<!ENTITY rest-version                      "0.9.1">
-<!ENTITY totem-pl-parser-version           "3.26.6">
-<!ENTITY vte-minor                         "0.76">
-<!ENTITY vte-version                       "&vte-minor;.1">
-<!ENTITY yelp-xsl-version                  "42.1">
-<!ENTITY GConf-version                     "3.2.6">
-<!ENTITY geocode-glib-version              "3.26.4">
-<!ENTITY gjs-version                       "1.80.2">
-<!ENTITY gnome-autoar-version              "0.4.4">
-<!ENTITY gnome-desktop-version             "44.0">
-<!ENTITY gnome-menus-version               "3.36.0">
-<!--<!ENTITY gnome-video-effects-version       "0.6.0">-->
-<!ENTITY gnome-online-accounts-version     "3.50.1">
-<!ENTITY grilo-version                     "0.3.16">
-<!ENTITY libchamplain-version              "0.12.21">
-<!ENTITY libgdata-version                  "0.18.1">
-<!ENTITY libgee-version                    "0.20.6">
-<!ENTITY libgtop-version                   "2.41.3">
-<!ENTITY libgweather-minor                 "4.4">
-<!ENTITY libgweather-version               "&libgweather-minor;.2">
-<!ENTITY libpeas-version                   "1.36.0">
-<!ENTITY libshumate-version                "1.2.1">
-<!ENTITY libwnck-version                   "43.0">
-<!ENTITY evolution-data-server-version     "3.52.1">
-<!--<!ENTITY folks-version                     "0.15.5">-->
-<!--<!ENTITY gfbgraph-version                  "0.2.5">-->
-<!ENTITY tracker3-version                  "3.7.1">
-<!ENTITY tracker3-miners-version           "3.7.1">
-<!ENTITY gsound-version                    "1.0.3">
-<!ENTITY xdg-desktop-portal-gnome-version  "46.1">
-
-<!-- Runtime (sysv) and Desktop (systemd) -->
-<!--<!ENTITY caribou-version                   "0.4.21">-->
-<!ENTITY dconf-version                     "0.40.0">
-<!ENTITY dconf-editor-version              "45.0.1">
-<!ENTITY gnome-backgrounds-version         "46.0">
-<!ENTITY gvfs-version                      "1.54.0">
-<!ENTITY gexiv2-minor                      "0.14">
-<!ENTITY gexiv2-version                    "&gexiv2-minor;.2">
-<!ENTITY nautilus-version                  "46.1">
-<!--<!ENTITY zenity-version                    "3.42.1">-->
-<!ENTITY gnome-bluetooth-version           "46.0">
-<!ENTITY gnome-keyring-version             "46.1">
-<!ENTITY gnome-settings-daemon-version     "46.0">
-<!ENTITY tecla-version                     "46.0">
-<!ENTITY gnome-control-center-version      "46.1">
-<!ENTITY mutter-version                    "46.1">
-<!ENTITY gnome-shell-version               "46.1">
-<!ENTITY gnome-shell-extensions-version    "46.1">
-<!ENTITY gnome-session-version             "46.0">
-<!-- GDM Moved to display managers -->
-<!--<!ENTITY gdm-version                       "43.0">-->
-<!ENTITY gnome-user-docs-version           "46.1">
-<!-- Icons moved to packages.ent, since they're now in the Icons chapter.-->
-<!ENTITY yelp-version                      "42.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 -->
-
-<!-- Chapter 31 -->
-<!-- Applications -->
-<!ENTITY baobab-version                    "46.0">
-<!ENTITY brasero-version                   "3.12.3">
-<!--<!ENTITY cheese-version                    "44.1">-->
-<!ENTITY eog-version                       "45.3">
-<!ENTITY evince-version                    "46.0">
-<!ENTITY evolution-version                 "3.52.1">
-<!ENTITY file-roller-version               "44.1">
-<!-- gedit moved to Editors, so it's now in packages.ent -->
-<!ENTITY gnome-calculator-version          "46.0">
-<!ENTITY gnome-color-manager-version       "3.36.0">
-<!ENTITY gnome-disk-utility-version        "46.0">
-<!ENTITY gnome-logs-version                "45.0">
-<!ENTITY gnome-maps-version                "46.10">
-<!ENTITY gnome-nettool-version             "42.0">
-<!ENTITY gnome-power-manager-version       "43.0">
-<!ENTITY gnome-screenshot-version          "41.0">
-<!ENTITY gnome-system-monitor-version      "46.0">
-<!ENTITY gnome-terminal-version            "3.52.1">
-<!ENTITY gnome-tweaks-version              "46.0">
-<!ENTITY gnome-weather-version             "46.0">
-<!-- "major" version also used for links to unicode downloads -->
-<!ENTITY gucharmap-major-version         "15.1">
-<!ENTITY gucharmap-version               "&gucharmap-major-version;.4">
-<!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
-<!ENTITY seahorse-version                  "43.0">
-<!ENTITY snapshot-version                  "46.2">
-<!ENTITY vinagre-version                   "3.22.0">
-<!--<!ENTITY vino-version                      "3.22.0">-->
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/add/add.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<chapter id="gnome-add">
+<?dbhtml filename="add.html" dir="gnome"?>
+<title>Additional Gnome Packages</title>
+<para><screen>This section will contain:
+bug-buddy
+glade
+gnome-python
+gnome-user-docs
+gnome-utils
+gnome-pim
+gnome-media
+gnome-audio
+gnome-print
+gnome-games</screen></para>
+</chapter>
Index: ome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="gnome-applications">
-  <?dbhtml filename="applications.html"?>
-
-  <title><phrase>GNOME Applications</phrase></title>
-
-  <para>
-    These packages are desktop applications and assorted utilities from
-    the <application>GNOME</application> project. Feel free to
-    install them on an as needed or as desired basis.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baobab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brasero.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cheese.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-calculator.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-color-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-logs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-maps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-nettool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-power-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-screenshot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-monitor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-terminal.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-tweaks.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-weather.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="snapshot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vinagre.xml"/>
-  <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vino.xml"/> -->
-
-</chapter>
Index: ome/applications/baobab.xml
===================================================================
--- gnome/applications/baobab.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 baobab-download-http "&gnome-download-http;/baobab/&gnome-46;/baobab-&baobab-version;.tar.xz">
-  <!ENTITY baobab-download-ftp  " ">
-  <!ENTITY baobab-md5sum        "9d6749f5c88db72c2fcc421b65aa6630">
-  <!ENTITY baobab-size          "592 KB">
-  <!ENTITY baobab-buildsize     "12 MB">
-  <!ENTITY baobab-time          "less than 0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="baobab" xreflabel="Baobab-&baobab-version;">
-  <?dbhtml filename="baobab.html"?>
-
-
-  <title>Baobab-&baobab-version;</title>
-
-  <indexterm zone="baobab">
-    <primary sortas="a-Baobab">Baobab</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Baobab</title>
-
-    <para>
-      The <application>Baobab</application> package contains a graphical
-      directory tree analyzer.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&baobab-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&baobab-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &baobab-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &baobab-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &baobab-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &baobab-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Baobab Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libadwaita1"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Baobab</title>
-
-    <para>
-      Install <application>Baobab</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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 Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          baobab
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/baobab
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="baobab-prog">
-        <term><command>baobab</command></term>
-        <listitem>
-          <para>
-            is a graphical tool used to analyze disk usage
-          </para>
-          <indexterm zone="baobab baobab-prog">
-            <primary sortas="b-baobab">baobab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/brasero.xml
===================================================================
--- gnome/applications/brasero.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,243 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 brasero-download-http
-       "&gnome-download-http;/brasero/3.12/brasero-&brasero-version;.tar.xz">
-  <!ENTITY brasero-download-ftp  " ">
-  <!ENTITY brasero-md5sum        "ae48248dd36f89282d573eb7a0a1391f">
-  <!ENTITY brasero-size          "3.0 MB">
-  <!ENTITY brasero-buildsize     "105 MB">
-  <!ENTITY brasero-time          "1.0 SBU">
-]>
-
-<sect1 id="brasero" xreflabel="Brasero-&brasero-version;">
-  <?dbhtml filename="brasero.html"?>
-
-
-  <title>Brasero-&brasero-version;</title>
-
-  <indexterm zone="brasero">
-    <primary sortas="a-Brasero">Brasero</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Brasero</title>
-
-    <para>
-      <application>Brasero</application> is an application used to
-      burn CD/DVD on the <application>GNOME</application> Desktop.
-      It is designed to be as simple as possible and has some unique
-      features that enable users to create  their discs easily and quickly.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&brasero-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&brasero-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &brasero-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &brasero-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &brasero-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &brasero-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Brasero Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libcanberra"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="libburn"/>,
-      <xref linkend="libisoburn"/>, and
-      <xref linkend="libisofs"/>,
-      <xref linkend="nautilus"/>,
-      <xref linkend="tracker3"/>, and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="dvd-rw-tools"/> and
-      <xref role="runtime" linkend="gvfs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="cdrdao"/>,
-      <xref role="runtime" linkend="libdvdcss"/>,
-      <xref role="runtime" linkend="cdrtools"/>, and
-      <ulink url="https://ftpmirror.gnu.org/gnu/vcdimager/">VCDImager</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Brasero</title>
-
-    <para>
-      Install <application>Brasero</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                \
-            --enable-compile-warnings=no \
-            --enable-cxx-warnings=no     \
-            --disable-nautilus           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-*-warnings=no</parameter>: These switches fix
-      build problems under GCC-6.x compilers.
-    </para>
-
-    <para>
-      <parameter>--disable-nautilus</parameter>: This switch disables building
-      the Nautilus extension since it is incompatible with the gtk4 version of
-      Nautilus.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          brasero
-        </seg>
-        <seg>
-          libbrasero-{burn,media,utils}3.so
-          <!--/usr/lib/nautilus/extensions-3.0/libnautilus-brasero-extension.so-->
-        </seg>
-        <seg>
-          /usr/include/brasero3,
-          /usr/lib/brasero3,
-          /usr/share/brasero,
-          /usr/share/gtk-doc/html/libbrasero-{burn,media}, and
-          /usr/share/help/*/brasero
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="brasero-prog">
-        <term><command>brasero</command></term>
-        <listitem>
-          <para>
-            is a simple and easy to use CD/DVD burning application for the
-            <application>GNOME</application> Desktop
-          </para>
-          <indexterm zone="brasero brasero-prog">
-            <primary sortas="b-brasero">brasero</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrasero-burn3">
-        <term><filename class="libraryfile">libbrasero-burn3.so</filename></term>
-        <listitem>
-          <para>
-            contains the Burning API functions
-          </para>
-          <indexterm zone="brasero libbrasero-burn3">
-            <primary sortas="c-libbrasero-burn3">libbrasero-burn3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrasero-media3">
-        <term><filename class="libraryfile">libbrasero-media3.so</filename></term>
-        <listitem>
-          <para>
-            contains the Media API functions
-          </para>
-          <indexterm zone="brasero libbrasero-media3">
-            <primary sortas="c-libbrasero-media3">libbrasero-media3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrasero-utils3">
-        <term><filename class="libraryfile">libbrasero-utils3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Brasero</application> API functions
-          </para>
-          <indexterm zone="brasero libbrasero-utils3">
-            <primary sortas="c-libbrasero-utils3">libbrasero-utils3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/dummy-apps.xml
===================================================================
--- gnome/applications/dummy-apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy" revision="systemd">
-
-
-  <title>Gnome Applications</title>
-  <para/>
-</sect1>
-
Index: ome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 eog-download-http "&gnome-download-http;/eog/&gnome-45;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  " ">
-  <!ENTITY eog-md5sum        "d70e1f25805f8d4af9223ca747c5eac3">
-  <!ENTITY eog-size          "4.4 MB">
-  <!ENTITY eog-buildsize     "42 MB">
-  <!ENTITY eog-time          "0.3 SBU">
-]>
-
-<sect1 id="eog" xreflabel="EOG-&eog-version;">
-  <?dbhtml filename="eog.html"?>
-
-
-  <title>EOG-&eog-version;</title>
-
-  <indexterm zone="eog">
-    <primary sortas="a-EOG">EOG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to EOG</title>
-
-    <para>
-      <application>EOG</application> is an application used for
-      viewing and cataloging image files on the
-      <application>GNOME</application> Desktop. It also has basic editing
-      capabilities.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&eog-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&eog-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &eog-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &eog-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &eog-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &eog-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">EOG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="exempi"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="libhandy1"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpeas"/>, and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="librsvg"/>, and
-      <xref linkend="webp-pixbuf-loader"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="libportal"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of EOG</title>
-
-    <para>
-      Install <application>EOG</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dlibportal=false   \
-            ..                  &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>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user,
-      rebuild the cache database of
-      MIME types handled by desktop files so <xref linkend="nautilus"/> will
-      be able to open image files with EOG.
-    </para>
-
-<screen role="root"><userinput>update-desktop-database</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>-Dlibportal=false</parameter>: This parameter disables
-      building EOG with support for flatpak portals. Remove this parameter
-      if you have <xref role="nodep" linkend="libportal"/> installed and wish
-      to have support for flatpak portals.
-    </para>
-
-    <para>
-      <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.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          eog
-        </seg>
-        <seg>
-          libeog.so
-        </seg>
-        <seg>
-          /usr/include/eog-3.0,
-          /usr/lib/eog,
-          /usr/share/eog,
-          /usr/share/gtk-doc/html/eog (optional), and
-          /usr/share/help/*/eog
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="eog-prog">
-        <term><command>eog</command></term>
-        <listitem>
-          <para>
-            is a fast and functional image viewer as well as an
-            image cataloging program.  It has basic editing capabilities
-          </para>
-          <indexterm zone="eog eog-prog">
-            <primary sortas="b-eog">eog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,291 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 evince-download-http
-     "&gnome-download-http;/evince/&gnome-46;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-download-ftp  " ">
-  <!ENTITY evince-md5sum        "b1de095412c9fe2281df296a7b5db429">
-  <!ENTITY evince-size          "2.8 MB">
-  <!ENTITY evince-buildsize     "67 MB">
-  <!ENTITY evince-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="evince" xreflabel="Evince-&evince-version;">
-  <?dbhtml filename="evince.html"?>
-
-
-  <title>Evince-&evince-version;</title>
-
-  <indexterm zone="evince">
-    <primary sortas="a-Evince">Evince</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Evince</title>
-
-    <para>
-      <application>Evince</application> is a document viewer for multiple
-      document formats. It supports PDF, Postscript, DjVu, TIFF and DVI.
-      It is useful for viewing documents of various types using one simple
-      application instead of the multiple document viewers that once existed
-      on the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&evince-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&evince-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &evince-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &evince-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &evince-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &evince-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Evince Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libhandy1"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="openjpeg2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnome-keyring"/>,
-      &gobject-introspection;,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libsecret"/>, and
-      <xref linkend="poppler"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/> (to enable printing if support is built into
-      <application>GTK+ 3</application>),
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gspell"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gi-docgen"/>,
-      <xref linkend="libgxps"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <ulink url="https://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre/">libspectre</ulink>, and
-      <ulink url="https://github.com/jlaurens/synctex">Synctex</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Evince</title>
-
-    <para>
-      Install <application>Evince</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-CPPFLAGS+=" -I/opt/texlive/&texlive-year;/include" \
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            -Dgtk_doc=false        \
-            --wrap-mode=nodownload \
-            -Dsystemduserunitdir=no .. &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-CPPFLAGS+=" -I/opt/texlive/&texlive-year;/include" \
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            -Dgtk_doc=false        \
-            --wrap-mode=nodownload \
-            ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/docs_dir/s@\$@ / 'evince-&evince-version;'@" -i ../help/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                                &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not have a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                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"/>
-
-    <para>
-      <parameter>CPPFLAGS+=" -I/opt/texlive/&texlive-year;/include"</parameter>:
-      Make sure that meson can find libkpathsea headers from TeXLive if it
-      is installed. This has no effect on systems without TeXLive installed.
-    </para>
-
-    <para>
-      <parameter>--wrap-mode=nodownload</parameter>: This switch disables
-      fetching any dependency: the build system tries to fetch gi-docgen
-      even if <parameter>-Dgtk_doc=false</parameter> is passed.
-    </para>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: &gi-doc-disable;
-    </para>
-
-    <para>
-      <option>-Dgspell=false</option>: This switch turns off support
-      for the spell checking plugin.
-    </para>
-
-    <para>
-      <option>-Dintrospection=false</option>: Use this option if you
-      don't have built <xref linkend='glib2'/> with GObject Introspection
-      and don't wish to have introspection support built into Evince.
-    </para>
-
-    <para>
-      <option>-Dnautilus=false</option>: This switch disables building
-      the <application>Nautilus</application> Plugin. Use this switch
-      if <application>Nautilus</application> is not installed.
-    </para>
-
-    <para>
-      <option>-Dkeyring=false</option>: This switch disables the use of
-      <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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          evince, evince-previewer, and evince-thumbnailer
-        </seg>
-        <seg>
-          libevdocument3.so and
-          libevview3.so
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/evince,
-          /usr/share/gtk-doc/html/{evince,libevdocument-3.0,libevview-3.0}
-               (optional), and
-          /usr/share/help/*/evince
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="evince-prog">
-        <term><command>evince</command></term>
-        <listitem>
-          <para>
-            is a multiple format document viewer
-          </para>
-          <indexterm zone="evince evince-prog">
-            <primary sortas="b-evince">evince</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="evince-previewer">
-        <term><command>evince-previewer</command></term>
-        <listitem>
-          <para>
-            is an application that implements the printing previewer
-          </para>
-          <indexterm zone="evince evince-previewer">
-            <primary sortas="b-evince-previewer">evince-previewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="evince-thumbnailer">
-        <term><command>evince-thumbnailer</command></term>
-        <listitem>
-          <para>
-            is a simple program used to create thumbnail images of
-            supported documents
-          </para>
-          <indexterm zone="evince evince-thumbnailer">
-            <primary sortas="b-evince-thumbnailer">evince-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,257 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Editors: Make sure directory is correct when updating -->
-
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-52;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  " ">
-  <!ENTITY evolution-md5sum        "6a74512b94ae9ffa51929e1960d88e73">
-  <!ENTITY evolution-size          "13 MB">
-  <!ENTITY evolution-buildsize     "380 MB">
-  <!ENTITY evolution-time          "1.0 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
-  <?dbhtml filename="evolution.html" ?>
-
-
-  <title>Evolution-&evolution-version;</title>
-
-  <indexterm zone="evolution">
-    <primary sortas="a-Evolution">Evolution</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Evolution</title>
-
-    <para>
-      The <application>Evolution</application> package contains an
-      integrated mail, calendar and address book suite designed for the
-      <application>GNOME</application> environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&evolution-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&evolution-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &evolution-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &evolution-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &evolution-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &evolution-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/evolution-&evolution-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">Evolution Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gcr4"/>,
-      <xref linkend="gnome-autoar"/>,
-      <xref linkend="shared-mime-info"/>, and
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bogofilter"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gspell"/>,
-      <xref linkend="highlight"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libgweather"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="openldap"/>, and
-      <xref linkend="seahorse"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="geoclue2"/>,
-      <xref linkend="geocode-glib"/>, and
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://gitlab.gnome.org/Archive/clutter-gtk">clutter-gtk</ulink> (Contact Maps plugin),
-      <ulink url="https://github.com/commonmark/cmark">cmark</ulink>,
-      <ulink url="https://glade.gnome.org/">Glade</ulink>,
-      <ulink url="https://gitlab.gnome.org/GNOME/libchamplain/">libchamplain</ulink> (Contact Maps plugin),
-      <ulink url="https://www.five-ten-sg.com/libpst/">libpst</ulink>,
-      <ulink url="https://launchpad.net/libunity/">libunity</ulink>,
-      <ulink url="https://github.com/Yeraze/ytnef">libytnef</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Evolution</title>
-
-    <para>
-      Install <application>Evolution</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DSYSCONF_INSTALL_DIR=/etc  \
-      -DENABLE_INSTALLED_TESTS=ON \
-      -DENABLE_PST_IMPORT=OFF     \
-      -DENABLE_YTNEF=OFF          \
-      -DENABLE_CONTACT_MAPS=OFF   \
-      -DENABLE_MARKDOWN=OFF       \
-      -DENABLE_WEATHER=ON         \
-      -G Ninja .. &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>
-
-    <para>
-      <parameter>-DENABLE_YTNEF=OFF</parameter>: This switch is used to
-      disable the yTNEF library usage because
-      <application>libytnef</application> is not part of BLFS.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_PST_IMPORT=OFF</parameter>: This switch is
-      used to disable the pst-import plugin because
-      <application>libpst</application> is not part of BLFS.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_CONTACT_MAPS=OFF</parameter>: This switch disables
-      building the Contact Maps plugin. Remove this switch if you have installed
-      the necessary dependencies and wish to build the Contact Maps plugin.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_MARKDOWN=OFF</parameter>: This switch allows
-      building without
-      <ulink url="https://github.com/commonmark/cmark">cmark</ulink>.
-      Remove this switch if you need markdown support and you have
-      installed the necessary dependency.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_WEATHER=ON</parameter>: This switch allows
-      building against <xref linkend="libgweather"/>.
-    </para>
-
-    <para>
-      <option>-DWITH_HELP=OFF</option>: This switch disables building the
-      manual of this package.  Use this switch if you have not installed
-      <xref linkend='itstool'/>.
-    </para>
-
-    <para>
-      <option>-DWITH_OPENLDAP=OFF</option>: Use this switch if you
-      have not installed <xref linkend='openldap'/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          evolution
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/evolution,
-          /usr/lib/evolution,
-          /usr/libexec/evolution,
-          /usr/share/evolution,
-          /usr/share/installed-tests/evolution,
-          /usr/share/help/*/evolution, and optionally
-          /usr/share/gtk-doc/html/{evolution-mail-composer,evolution-mail-engine},
-          /usr/share/gtk-doc/html/{evolution-mail-formatter,evolution-shell}, and
-          /usr/share/gtk-doc/html/evolution-util
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="evolution-prog">
-        <term><command>evolution</command></term>
-        <listitem>
-          <para>
-            is an email, calendar and address book suite for
-            the <application>GNOME</application> Desktop
-          </para>
-          <indexterm zone="evolution evolution-prog">
-            <primary sortas="b-evolution">evolution</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 file-roller-download-http
-           "&gnome-download-http;/file-roller/&gnome-44;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-download-ftp  " ">
-  <!ENTITY file-roller-md5sum        "ebb5141c7c8e27df836d01f3d1d3d058">
-  <!ENTITY file-roller-size          "908 KB">
-  <!ENTITY file-roller-buildsize     "27 MB">
-  <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="file-roller" xreflabel="File-Roller-&file-roller-version;">
-  <?dbhtml filename="file-roller.html"?>
-
-
-  <title>File-Roller-&file-roller-version;</title>
-
-  <indexterm zone="file-roller">
-    <primary sortas="a-File-Roller">File-Roller</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to File Roller</title>
-
-    <para>
-      <application>File Roller</application> is an archive manager for
-      <application>GNOME</application> with support for tar, bzip2, gzip, zip,
-      jar, compress, lzop, zstd, dmg, and many other archive formats.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        <application>File Roller</application> is only a graphical
-        interface to archiving utilities such as <application>tar</application>
-        and <application>zip</application>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&file-roller-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&file-roller-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &file-roller-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &file-roller-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &file-roller-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &file-roller-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">File Roller Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/> and
-      <xref linkend="itstool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cpio"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libportal"/>, and
-      <xref linkend="nautilus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for the API documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="unrar"/>,
-      <xref role="runtime" linkend="unzip"/>, and
-      <xref role="runtime" linkend="zip"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of File Roller</title>
-
-    <para>
-      Install <application>File Roller</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dpackagekit=false  \
-            ..                  &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 &amp;&amp;
-chmod -v 0755 /usr/libexec/file-roller/isoinfo.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                href="../../xincludes/gsettings-destdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                href="../../xincludes/update-icons-and-desktop.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"/>
-
-    <para>
-      <parameter>-Dpackagekit=false</parameter>: This switch disables the use
-      of PackageKit which isn't suitable for BLFS.
-    </para>
-
-    <para>
-      <option>-Dapi_docs=enabled</option>: Use this switch if you have
-      <xref linkend="gi-docgen"/> installed and wish to
-      generate the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          file-roller
-        </seg>
-        <seg>
-          libnautilus-fileroller.so
-        </seg>
-        <seg>
-          /usr/{libexec,share{,/help/*}}/file-roller
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="file-roller-prog">
-        <term><command>file-roller</command></term>
-        <listitem>
-          <para>
-            is an archive manager for <application>GNOME</application>
-          </para>
-          <indexterm zone="file-roller file-roller-prog">
-            <primary sortas="b-file-roller">file-roller</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-46;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-download-ftp  " ">
-  <!ENTITY gnome-calculator-md5sum        "f814e27498905f13baab66bb3c8fa73a">
-  <!ENTITY gnome-calculator-size          "1.1 MB">
-  <!ENTITY gnome-calculator-buildsize     "46 MB (with tests)">
-  <!ENTITY gnome-calculator-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="gnome-calculator" xreflabel="gnome-calculator-&gnome-calculator-version;">
-  <?dbhtml filename="gnome-calculator.html"?>
-
-
-  <title>gnome-calculator-&gnome-calculator-version;</title>
-
-  <indexterm zone="gnome-calculator">
-    <primary sortas="a-gnome-calculator">gnome-calculator</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Calculator</title>
-
-    <para>
-      <application>GNOME Calculator</application> is a powerful graphical
-      calculator with financial, logical and scientific modes. It uses a
-      multiple precision package to do its arithmetic to give a high degree
-      of accuracy.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-calculator-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-calculator-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-calculator-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-calculator-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-calculator-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-calculator-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Calculator Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtksourceview5"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libgee"/>, and
-      <xref linkend="libsoup3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Calculator</title>
-
-    <para>
-      Install <application>GNOME Calculator</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcalccmd and gnome-calculator
-        </seg>
-        <seg>
-          libgcalc-2.so and libgci-1.so
-        </seg>
-        <seg>
-          /usr/include/gcalc-2,
-          /usr/include/gci-2,
-          /usr/share/devhelp/books/{GCalc-2,GCi-1}, and
-          /usr/share/help/*/gnome-calculator
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-calculator-prog">
-        <term><command>gnome-calculator</command></term>
-        <listitem>
-          <para>
-            is the official calculator of the
-            <application>GNOME</application> Desktop
-          </para>
-          <indexterm zone="gnome-calculator gnome-calculator-prog">
-            <primary sortas="b-gnome-calculator">gnome-calculator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcalccmd">
-        <term><command>gcalccmd</command></term>
-        <listitem>
-          <para>
-            is a command line version of
-            <application>gnome-calculator</application>
-          </para>
-          <indexterm zone="gnome-calculator gcalccmd">
-            <primary sortas="b-gcalccmd">gcalccmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,239 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-color-manager-download-http
-           "&gnome-download-http;/gnome-color-manager/&gnome-minor-36;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
-  <!ENTITY gnome-color-manager-download-ftp  " ">
-  <!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-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-color-manager" xreflabel="gnome-color-manager-&gnome-color-manager-version;">
-  <?dbhtml filename="gnome-color-manager.html"?>
-
-
-  <title>gnome-color-manager-&gnome-color-manager-version;</title>
-
-  <indexterm zone="gnome-color-manager">
-    <primary sortas="a-gnome-color-manager">gnome-color-manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Color Manager</title>
-
-    <para>
-      <application>GNOME Color Manager</application> is a session framework
-      for the <application>GNOME</application> desktop environment that makes
-      it easy to manage, install and generate color profiles.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-color-manager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-color-manager-download-ftp;"/>
-         </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-color-manager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-color-manager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-color-manager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-color-manager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Color Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libcanberra"/>, and
-      <xref linkend="libexif"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink> and
-      <xref linkend="docbook-utils"/> (currently causes build to fail)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Color Manager</title>
-
-    <para>
-      If <xref linkend="docbook-utils"/> is installed, disable installation
-      of the man pages to avoid a build failure:
-    </para>
-
-<screen><userinput>sed /subdir\(\'man/d -i meson.build</userinput></screen>
-
-    <para>
-      Install <application>GNOME Color Manager</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. The tests must
-      be run from an X session.
-    </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>-Dexiv=false</parameter>: This switch is used to disable
-      using Exiv2 because Exiv2-0.27 changed the API in a way that several
-      applications cannot use.
-    </para>
-    <!- - Please check this at the next version of gnome-color-manager AND/OR
-    the next version of Exiv2. No work has been done upstream, but I did file
-    an issue upstream. - ->
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          <!--gcm-calibrate,--> gcm-import, gcm-inspect,
-          gcm-picker, and gcm-viewer
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-color-manager and
-          /usr/share/help/*/gnome-color-manager
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!-- Seems to be removed in 3.36.0
-      <varlistentry id="gcm-calibrate">
-        <term><command>gcm-calibrate</command></term>
-        <listitem>
-          <para>
-            is the GCM calibrator tool.
-          </para>
-          <indexterm zone="gnome-color-manager gcm-calibrate">
-            <primary sortas="b-gcm-calibrate">gcm-calibrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="gcm-import">
-        <term><command>gcm-import</command></term>
-        <listitem>
-          <para>
-            allows you to import ICC profiles supplied by vendors
-          </para>
-          <indexterm zone="gnome-color-manager gcm-import">
-            <primary sortas="b-gcm-import">gcm-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-inspect">
-        <term><command>gcm-inspect</command></term>
-        <listitem>
-          <para>
-            allows you to inspect your session color-management settings
-          </para>
-          <indexterm zone="gnome-color-manager gcm-inspect">
-            <primary sortas="b-gcm-inspect">gcm-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-picker">
-        <term><command>gcm-picker</command></term>
-        <listitem>
-          <para>
-            allows you to pick spot colors for use by an attached colorimeter
-          </para>
-          <indexterm zone="gnome-color-manager gcm-picker">
-            <primary sortas="b-gcm-picker">gcm-picker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcm-viewer">
-        <term><command>gcm-viewer</command></term>
-        <listitem>
-          <para>
-            allows you to view properties of ICC profiles
-          </para>
-          <indexterm zone="gnome-color-manager gcm-viewer">
-            <primary sortas="b-gcm-viewer">gcm-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-46;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-download-ftp  " ">
-  <!ENTITY gnome-disk-utility-md5sum        "e1ba191bbc9c38e99f6710520fbb5a20">
-  <!ENTITY gnome-disk-utility-size          "1.7 MB">
-  <!ENTITY gnome-disk-utility-buildsize     "36 MB">
-  <!ENTITY gnome-disk-utility-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;">
-  <?dbhtml filename="gnome-disk-utility.html"?>
-
-
-  <title>gnome-disk-utility-&gnome-disk-utility-version;</title>
-
-  <indexterm zone="gnome-disk-utility">
-    <primary sortas="a-gnome-disk-utility">gnome-disk-utility</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Disk Utility</title>
-
-    <para>
-      The <application>GNOME Disk Utility</application> package provides
-      applications used for dealing with storage devices.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-disk-utility-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-disk-utility-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-disk-utility-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-disk-utility-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-disk-utility-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-disk-utility-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Disk Utility Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-settings-daemon"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libdvdread"/>,
-      <xref linkend="libhandy1"/>,
-      <xref linkend="libpwquality"/>,
-      <xref linkend="libsecret"/>, and
-      <xref linkend="udisks2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Disk Utility</title>
-
-    <para>
-      Install <application>GNOME Disk Utility</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-disk-image-mounter and gnome-disks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-disk-image-mounter">
-        <term><command>gnome-disk-image-mounter</command></term>
-        <listitem>
-          <para>
-            is used to set up disk images
-          </para>
-          <indexterm zone="gnome-disk-utility gnome-disk-image-mounter">
-            <primary sortas="b-gnome-disk-image-mounter">gnome-disk-image-mounter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-disks">
-        <term><command>gnome-disks</command></term>
-        <listitem>
-          <para>
-            is used to inspect, format, partition and configure disks
-            and block devices
-          </para>
-          <indexterm zone="gnome-disk-utility gnome-disks">
-            <primary sortas="b-gnome-disks">gnome-disks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-logs.xml
===================================================================
--- gnome/applications/gnome-logs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-logs-download-http
-           "&gnome-download-http;/gnome-logs/&gnome-45;/gnome-logs-&gnome-logs-version;.tar.xz">
-  <!ENTITY gnome-logs-download-ftp  " ">
-  <!ENTITY gnome-logs-md5sum        "5b9396cf24528ae72eb4c48934f60df2">
-  <!ENTITY gnome-logs-size          "624 KB">
-  <!ENTITY gnome-logs-buildsize     "8.8 MB">
-  <!ENTITY gnome-logs-time          "0.1 SBU">
-]>
-
-<!-- Unfortunately, after testing this on elogind/SysV, GNOME Logs will ONLY
-     use the systemd journal, and will refuse to load logs from /var/log :-( -->
-<sect1 id="gnome-logs" xreflabel="gnome-logs-&gnome-logs-version;" revision="systemd">
-  <?dbhtml filename="gnome-logs.html"?>
-
-
-  <title>gnome-logs-&gnome-logs-version;</title>
-
-  <indexterm zone="gnome-logs">
-    <primary sortas="a-gnome-logs">gnome-logs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Logs</title>
-
-    <para>
-      The <application>GNOME Logs</application> package contains a log viewer
-      for the systemd journal.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-logs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-logs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-logs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-logs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-logs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-logs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Logs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="libadwaita1"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="Optional">
-<!--      <xref linkend="appstream-glib"/>, -->
-      <xref linkend="desktop-file-utils"/> (for the test suite), and
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="libxslt"/> (to build manual pages),
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>, and
-      <ulink url="https://pypi.python.org/pypi/dogtail">dogtail</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Logs</title>
-
-    <para>
-      Install <application>GNOME Logs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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>
-          gnome-logs
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-logs and
-          /usr/share/help/*/gnome-logs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-logs-prog">
-        <term><command>gnome-logs</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> log viewer for the
-            systemd journal
-          </para>
-          <indexterm zone="gnome-logs gnome-logs-prog">
-            <primary sortas="b-gnome-logs">gnome-logs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-maps-download-http
-           "&gnome-download-http;/gnome-maps/&gnome-46;/gnome-maps-&gnome-maps-version;.tar.xz">
-  <!ENTITY gnome-maps-download-ftp  " ">
-  <!ENTITY gnome-maps-md5sum        "ecbc0b13a988ae2fbb6d102fafbee451">
-  <!ENTITY gnome-maps-size          "3.0 MB">
-  <!ENTITY gnome-maps-buildsize     "18 MB">
-  <!ENTITY gnome-maps-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-maps" xreflabel="gnome-maps-&gnome-maps-version;">
-  <?dbhtml filename="gnome-maps.html"?>
-
-
-  <title>gnome-maps-&gnome-maps-version;</title>
-
-  <indexterm zone="gnome-maps">
-    <primary sortas="a-gnome-maps">gnome-maps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Maps</title>
-
-    <para>
-      <application>GNOME Maps</application> is a map application for
-      <application>GNOME</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-maps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-maps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-maps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-maps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-maps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-maps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Maps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="geoclue2"/>,
-      <xref linkend="geocode-glib"/>,
-      <xref linkend="gjs"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libportal"/>,
-      <xref linkend="libshumate"/>,
-      <xref linkend="libgweather"/>, and
-      <xref linkend="rest"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Maps</title>
-
-    <para>
-      Install <application>GNOME Maps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-maps (symlink)
-        </seg>
-        <seg>
-          libgnome-maps.so
-        </seg>
-        <seg>
-          /usr/lib/gnome-maps and
-          /usr/share/gnome-maps
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-maps-prog">
-        <term><command>gnome-maps</command></term>
-        <listitem>
-          <para>
-            is a map application for <application>GNOME</application>
-          </para>
-          <indexterm zone="gnome-maps gnome-maps-prog">
-            <primary sortas="b-gnome-maps">gnome-maps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-nettool.xml
===================================================================
--- gnome/applications/gnome-nettool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-nettool-download-http
-           "&gnome-download-http;/gnome-nettool/&gnome-42;/gnome-nettool-&gnome-nettool-version;.tar.xz">
-  <!ENTITY gnome-nettool-download-ftp  " ">
-  <!ENTITY gnome-nettool-md5sum        "ba99489e9e3a1af03e9f2719acac7beb">
-  <!ENTITY gnome-nettool-size          "413 KB">
-  <!ENTITY gnome-nettool-buildsize     "12 MB">
-  <!ENTITY gnome-nettool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-nettool" xreflabel="gnome-nettool-&gnome-nettool-version;">
-  <?dbhtml filename="gnome-nettool.html"?>
-
-
-  <title>gnome-nettool-&gnome-nettool-version;</title>
-
-  <indexterm zone="gnome-nettool">
-    <primary sortas="a-gnome-nettool">gnome-nettool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Nettool</title>
-
-    <para>
-      The <application>GNOME Nettool</application> package is a network
-      information tool which provides GUI interface for some of the most
-      common command line network tools.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-nettool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-nettool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-nettool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-nettool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-nettool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-nettool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnome-nettool-&gnome-nettool-version;-ping_and_netstat_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Nettool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="libgtop"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="bind-utils"/>,
-      <xref role="runtime" linkend="nmap"/>,
-      <xref role="runtime" linkend="net-tools"/>,
-      <xref role="runtime" linkend="traceroute"/>, and
-      <xref role="runtime" linkend="whois"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Nettool</title>
-
-    <para>
-      First, adapt <application>GNOME Nettool</application> to changes in the
-      <application>ping</application>, <application>ping6</application>, and
-      <application>netstat</application> utilities:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gnome-nettool-&gnome-nettool-version;-ping_and_netstat_fixes-1.patch</userinput></screen>
-
-    <para>
-      Then add a fix for newer versions of meson:
-    </para>
-
-<screen><userinput>sed -i '/merge_file/s/(.*/(/' data/meson.build</userinput></screen>
-
-    <para>
-      Install <application>GNOME Nettool</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-nettool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-nettool and
-          /usr/share/help/*/gnome-nettool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-nettool-prog">
-        <term><command>gnome-nettool</command></term>
-        <listitem>
-          <para>
-            is a network information tool
-          </para>
-          <indexterm zone="gnome-nettool gnome-nettool-prog">
-            <primary sortas="b-gnome-nettool">gnome-nettool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-power-manager.xml
===================================================================
--- gnome/applications/gnome-power-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-power-manager-download-http
-           "&gnome-download-http;/gnome-power-manager/&gnome-43;/gnome-power-manager-&gnome-power-manager-version;.tar.xz">
-  <!ENTITY gnome-power-manager-download-ftp  " ">
-  <!ENTITY gnome-power-manager-md5sum        "c7e33249b59c6082312909f65739912e">
-  <!ENTITY gnome-power-manager-size          "376 KB">
-  <!ENTITY gnome-power-manager-buildsize     "7.0 MB">
-  <!ENTITY gnome-power-manager-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="gnome-power-manager" xreflabel="gnome-power-manager-&gnome-power-manager-version;">
-  <?dbhtml filename="gnome-power-manager.html"?>
-
-
-  <title>gnome-power-manager-&gnome-power-manager-version;</title>
-
-  <indexterm zone="gnome-power-manager">
-    <primary sortas="a-gnome-power-manager">gnome-power-manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Power Manager</title>
-
-    <para>
-      The <application>GNOME Power Manager</application> package contains
-      a tool used to report on power management on the system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-power-manager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-power-manager-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-power-manager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-power-manager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-power-manager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-power-manager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Power Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/> and
-<!--      <xref linkend="appstream-glib"/> -->
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Power Manager</title>
-
-    <para>
-      Install <application>GNOME Power Manager</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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>
-          gnome-power-statistics
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-power-statistics">
-        <term><command>gnome-power-statistics</command></term>
-        <listitem>
-          <para>
-            is used to visualize the power consumption of laptop hardware
-          </para>
-          <indexterm zone="gnome-power-manager gnome-power-statistics">
-            <primary sortas="b-gnome-power-statistics">gnome-power-statistics</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-41;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-download-ftp  " ">
-  <!ENTITY gnome-screenshot-md5sum        "3d0199188d8ba07399e468a61e0174e8">
-  <!ENTITY gnome-screenshot-size          "352 KB">
-  <!ENTITY gnome-screenshot-buildsize     "7.4 MB">
-  <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-screenshot" xreflabel="gnome-screenshot-&gnome-screenshot-version;">
-  <?dbhtml filename="gnome-screenshot.html"?>
-
-
-  <title>gnome-screenshot-&gnome-screenshot-version;</title>
-
-  <indexterm zone="gnome-screenshot">
-    <primary sortas="a-gnome-screenshot">gnome-screenshot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Screenshot</title>
-
-    <para>
-      The <application>GNOME Screenshot</application> is a utility used
-      for taking screenshots of the entire screen, a window or a
-      user-defined area of the screen, with optional beautifying border effects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-screenshot-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-screenshot-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-screenshot-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-screenshot-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-screenshot-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-screenshot-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Screenshot Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libcanberra"/> (Compiled with GTK+3 support), and
-      <xref linkend="libhandy1"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Screenshot</title>
-
-    <para>
-      First, fix building with newer versions of
-      <application>meson</application>:
-    </para>
-
-<screen><userinput>sed -i '/merge_file/{n;d}' data/meson.build</userinput></screen>
-
-    <para>
-      Install <application>GNOME Screenshot</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <note>
-      <para>
-        In order to best run <application>GNOME Screenshot</application>
-        from the command line, the -i option needs to be specified.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-screenshot
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-screenshot-prog">
-        <term><command>gnome-screenshot</command></term>
-        <listitem>
-          <para>
-            is used to capture the screen, a window, or a user-defined
-            area and save the snapshot image to a file
-          </para>
-          <indexterm zone="gnome-screenshot gnome-screenshot-prog">
-            <primary sortas="b-gnome-screenshot">gnome-screenshot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-system-monitor-download-http
-           "&gnome-download-http;/gnome-system-monitor/&gnome-46;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-download-ftp  " ">
-  <!ENTITY gnome-system-monitor-md5sum        "d2c121f58825bf5a441f16f13b0d3201">
-  <!ENTITY gnome-system-monitor-size          "1020 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "27 MB">
-  <!ENTITY gnome-system-monitor-time          "0.2 SBU (with parallelism=4)">
-]>
-
-<sect1 id="gnome-system-monitor" xreflabel="gnome-system-monitor-&gnome-system-monitor-version;">
-  <?dbhtml filename="gnome-system-monitor.html"?>
-
-
-  <title>gnome-system-monitor-&gnome-system-monitor-version;</title>
-
-  <indexterm zone="gnome-system-monitor">
-    <primary sortas="a-gnome-system-monitor">gnome-system-monitor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME System Monitor</title>
-
-    <para>
-      The <application>GNOME System Monitor</application> package contains
-      <application>GNOME</application>'s replacement for
-      <command>gtop</command>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-system-monitor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-system-monitor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-system-monitor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-system-monitor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-system-monitor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-system-monitor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME System Monitor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="gtkmm4"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libgtop"/>,
-      <xref linkend="libadwaita1"/>, and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="desktop-file-utils"/>,
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>, and
-      <ulink url="https://github.com/uncrustify/uncrustify">uncrustify</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME System Monitor</title>
-
-    <para>
-      Install <application>GNOME System Monitor</application> by running
-      the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            -Dsystemd=false     \
-            --buildtype=release \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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" revision="sysv">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dsystemd=false</parameter>: This switch ensures that
-      gnome-system-monitor does NOT use the systemd process monitoring framework.
-      Use this option if you are on a SysV system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-system-monitor
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/{libexec,share,share/help/*}/gnome-system-monitor
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-system-monitor-prog">
-        <term><command>gnome-system-monitor</command></term>
-        <listitem>
-          <para>
-            is used to display the process tree and hardware meters
-          </para>
-          <indexterm zone="gnome-system-monitor gnome-system-monitor-prog">
-            <primary sortas="b-gnome-system-monitor">gnome-system-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-terminal-download-http
-           "https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/&gnome-terminal-version;/gnome-terminal-&gnome-terminal-version;.tar.gz">
-  <!ENTITY gnome-terminal-download-ftp
-           " ">
-  <!ENTITY gnome-terminal-md5sum        "1b377ca70a0df2027101d0fa9c361c4a">
-  <!ENTITY gnome-terminal-size          "2.8 MB">
-  <!ENTITY gnome-terminal-buildsize     "32 MB">
-  <!ENTITY gnome-terminal-time          "0.3 SBU">
-]>
-
-<sect1 id="gnome-terminal" xreflabel="gnome-terminal-&gnome-terminal-version;">
-  <?dbhtml filename="gnome-terminal.html"?>
-
-
-  <title>gnome-terminal-&gnome-terminal-version;</title>
-
-  <indexterm zone="gnome-terminal">
-    <primary sortas="a-gnome-terminal">gnome-terminal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Terminal</title>
-
-    <para>
-      The <application>GNOME Terminal</application> package contains the
-      terminal emulator for <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-terminal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-terminal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-terminal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-terminal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-terminal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-terminal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Terminal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/>,
-      <phrase revision="systemd"><xref linkend="gnome-shell"/>,</phrase>
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libhandy1"/>,
-      <xref linkend="pcre2"/>, and
-      <xref linkend="vte"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend="gnome-shell"/> and</phrase>
-      <xref linkend="nautilus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="desktop-file-utils"/>, and
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Terminal</title>
-
-    <para>
-      First, fix some deprecated schema entries:
-    </para>
-
-<screen><userinput remap="pre">sed -i -r 's:"(/system):"/org/gnome\1:g' src/external.gschema.xml</userinput></screen>
-
-    <para>
-      Install <application>GNOME Terminal</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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" revision="systemd"><userinput>ninja install</userinput></screen>
-
-<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-rm -v /usr/lib/systemd/user/gnome-terminal-server.service</userinput></screen>
-
-    <note>
-      <para>
-        To run <application>GNOME Terminal</application>, the environment
-        variable <envar>LANG</envar> must be set to a UTF-8 locale
-        <emphasis>prior</emphasis> to starting the graphical environment.
-      </para>
-    </note>
-
-  </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>-Dsearch_provider=false</option>: This switch disables
-      the <quote>search <application>gnome-shell</application></quote>
-      provider. Use this option if you do not have gnome-shell installed.
-    </para>
-
-    <para>
-      <option>-Dnautilus_extension=false</option>: This switch disables
-      a dependency on the <application>nautilus</application> file
-      manager. Use this option if you do not have Nautilus installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-terminal
-        </seg>
-       <seg>
-          /usr/lib/nautilus/extensions-4/libterminal-nautilus.so
-          (Nautilus Extension)
-        </seg>
-        <seg>
-          /usr/{lib,share/help/*}/gnome-terminal and
-          /usr/share/xdg-terminals
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-terminal-prog">
-        <term><command>gnome-terminal</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Terminal Emulator
-          </para>
-          <indexterm zone="gnome-terminal gnome-terminal-prog">
-            <primary sortas="b-gnome-terminal">gnome-terminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gnome-weather.xml
===================================================================
--- gnome/applications/gnome-weather.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-weather-download-http
-           "&gnome-download-http;/gnome-weather/&gnome-46;/gnome-weather-&gnome-weather-version;.tar.xz">
-  <!ENTITY gnome-weather-download-ftp  " ">
-  <!ENTITY gnome-weather-md5sum        "08c626cea07068b2a02d5faba90fdc14">
-  <!ENTITY gnome-weather-size          "236 KB">
-  <!ENTITY gnome-weather-buildsize     "4.5 MB">
-  <!ENTITY gnome-weather-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-weather" xreflabel="gnome-weather-&gnome-weather-version;">
-  <?dbhtml filename="gnome-weather.html"?>
-
-
-  <title>gnome-weather-&gnome-weather-version;</title>
-
-  <indexterm zone="gnome-weather">
-    <primary sortas="a-gnome-weather">gnome-weather</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Weather</title>
-
-    <para>
-      <application>GNOME Weather</application> is a small application that allows
-      you to monitor the current weather conditions for your city, or anywhere
-      in the world, and to access updated forecasts provided by various internet
-      services.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-weather-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-weather-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-weather-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-weather-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-weather-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-weather-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Weather Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="geoclue2"/>,
-      <xref linkend="gjs"/>,
-      <xref linkend="libadwaita1"/>, and
-      <xref linkend="libgweather"/>
-<!--      <xref linkend="libhandy1"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-<!--      <xref linkend="appstream-glib"/> -->
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Weather</title>
-
-    <para>
-      Install <application>GNOME Weather</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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>
-          gnome-weather
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/org.gnome.Weather
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-weather-prog">
-        <term><command>gnome-weather</command></term>
-        <listitem>
-          <para>
-            is a small application that allows  you to monitor the
-            current weather conditions anywhere in the world
-          </para>
-          <indexterm zone="gnome-weather gnome-weather-prog">
-            <primary sortas="b-gnome-weather">gnome-weather</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- 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        "f446e71d8791f0911e14e5cee2a365b7">
-  <!ENTITY gucharmap-size          "1.4 MB">
-  <!ENTITY gucharmap-buildsize     "74 MB">
-  <!ENTITY gucharmap-time          "0.1 SBU">
-]>
-
-<sect1 id="gucharmap" xreflabel="Gucharmap-&gucharmap-version;">
-  <?dbhtml filename="gucharmap.html"?>
-
-
-  <title>Gucharmap-&gucharmap-version;</title>
-
-  <indexterm zone="gucharmap">
-    <primary sortas="a-Gucharmap">Gucharmap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gucharmap</title>
-
-    <para>
-      <application>Gucharmap</application> is a Unicode character map and
-      font viewer. It allows you to browse through all the available Unicode
-      characters and categories for the installed fonts, and to examine their
-      detailed properties. It is an easy way to find the character you might
-      only know by its Unicode name or code point.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gucharmap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gucharmap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gucharmap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gucharmap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gucharmap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gucharmap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Unicode Character Database:
-          <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>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          CJK Unified Ideographs:
-          <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>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gucharmap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="pcre2"/>, and
-      <xref linkend="unzip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gucharmap</title>
-
-    <note>
-      <para>
-        This package uses two unversioned downloads. You may want to rename
-        these to a versioned name, e.g. <filename>UCD-15.zip</filename> to
-        make upgrades easier.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Gucharmap</application> by running the following
-      commands:
-    </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 setup --prefix=/usr       \
-            --strip             \
-            --buildtype=release \
-            -Ducd_path=./ucd    \
-            -Ddocs=false        \
-            ..                  &amp;&amp;
-ninja</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>rm  -fv /usr/share/glib-2.0/schemas/org.gnome.Charmap.enums.xml &amp;&amp;
-ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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
-      &gobject-introspection;.
-    </para>
-
-    <para>
-      <option>-Dvapi=false</option>: Use this if you have not installed
-      <xref linkend="vala"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gucharmap
-        </seg>
-        <seg>
-          libgucharmap_2_90.so
-        </seg>
-        <seg>
-          /usr/include/gucharmap-2.90
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gucharmap-prog">
-        <term><command>gucharmap</command></term>
-        <listitem>
-          <para>
-            is a Unicode character map and font viewer
-          </para>
-          <indexterm zone="gucharmap gucharmap-prog">
-            <primary sortas="b-gucharmap">gucharmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgucharmap_2_90">
-        <term><filename class="libraryfile">libgucharmap_2_90.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Gucharmap</application> API functions
-          </para>
-          <indexterm zone="gucharmap libgucharmap_2_90">
-            <primary sortas="c-libgucharmap_2_90">libgucharmap_2_90.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 seahorse-download-http
-           "&gnome-download-http;/seahorse/&gnome-43;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-download-ftp  " ">
-  <!ENTITY seahorse-md5sum        "efa9fea2e1c4291c39d509eb366b9a56">
-  <!ENTITY seahorse-size          "1.3 MB">
-  <!ENTITY seahorse-buildsize     "43 MB">
-  <!ENTITY seahorse-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="seahorse" xreflabel="Seahorse-&seahorse-version;">
-  <?dbhtml filename="seahorse.html"?>
-
-
-  <title>Seahorse-&seahorse-version;</title>
-
-  <indexterm zone="seahorse">
-    <primary sortas="a-Seahorse">Seahorse</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Seahorse</title>
-
-    <para>
-      <application>Seahorse</application> is a graphical interface for
-      managing and using encryption keys. Currently it supports PGP
-      keys (using GPG/GPGME) and SSH keys.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&seahorse-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&seahorse-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &seahorse-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &seahorse-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &seahorse-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &seahorse-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Seahorse Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gcr"/>,
-      <xref linkend="gnupg2"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libhandy1"/>,
-      <xref linkend="libpwquality"/> and
-      <xref linkend="libsecret"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup3"/>,
-      <xref linkend="p11-kit"/>,
-<!--      <xref linkend="openldap"/>, picked up from gnupg2 -->
-      <xref linkend="openssh"/> (for managing SSH keys) and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="gnome-keyring"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Seahorse</title>
-
-    <para>
-      Install <application>Seahorse</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i -r 's:"(/apps):"/org/gnome\1:' data/*.xml &amp;&amp;
-
-sed -i "s/'2.3.0'/'2.3.0', '2.4.0'/" meson.build &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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"/>
-
-      <para>
-        <command>sed ... data/*.xml</command>:  This command fixes some
-        deprecated entries in the schema templates.
-      </para>
-
-      <para>
-        <command>sed ... meson.build</command>: This command fixes building
-        with GnuPG-2.4 installed.
-      </para>
-<!-- gnupg2 needs ldap anyway
-      <para>
-        <option>-Dldap-support=false</option>: Add this switch if you have not
-        installed openldap.
-      </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          seahorse
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/{libexec,share,share/help/*}/seahorse
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="seahorse-prog">
-        <term><command>seahorse</command></term>
-        <listitem>
-          <para>
-            is the graphical interface for managing and using
-            encryption keys
-          </para>
-          <indexterm zone="seahorse seahorse-prog">
-            <primary sortas="b-seahorse">seahorse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/applications/snapshot.xml
===================================================================
--- gnome/applications/snapshot.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 snapshot-download-http "&gnome-download-http;/snapshot/&gnome-46;/snapshot-&snapshot-version;.tar.xz">
-  <!ENTITY snapshot-download-ftp  " ">
-  <!ENTITY snapshot-md5sum        "212fac83b91ebc289fe79164d633b44b">
-  <!ENTITY snapshot-size          "22 MB">
-  <!ENTITY snapshot-buildsize     "1.1 GB (2.9 MB installed)">
-  <!ENTITY snapshot-time          "4.5 SBU">
-]>
-
-<sect1 id="snapshot" xreflabel="Snapshot-&snapshot-version;">
-  <?dbhtml filename="snapshot.html"?>
-
-  <title>Snapshot-&snapshot-version;</title>
-
-  <indexterm zone="snapshot">
-    <primary sortas="a-snapshot">Snapshot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Snapshot</title>
-
-    <para>
-      The <application>Snapshot</application> package contains a program that
-      takes pictures and videos from a Webcam.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&snapshot-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&snapshot-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &snapshot-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &snapshot-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &snapshot-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &snapshot-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Snapshot Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="gst10-plugins-bad"/>, and
-      <xref linkend="rust"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="pipewire"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Snapshot</title>
-
-    <note>
-      <para>
-        This package takes a long time to build because LTO is enabled, and the
-        LTO pass is not parallelized.
-      </para>
-    </note>
-
-<!-- No longer needed with pango-1.51.0
-    <para>
-      First, remove a check against the system <application>Pango</application>
-      version that is too strict:
-    </para>
-    
-<screen><userinput remap="pre">sed '/pango.v1_52/,+1d' -i vendor/pango-sys/Cargo.toml &amp;&amp;
-
-cat &gt;&gt; Cargo.toml &lt;&lt; EOF
-<literal>[patch.crates-io.pango-sys]
-path = "vendor/pango-sys"</literal>
-EOF</userinput></screen>
--->
-
-    <para>
-      Install <application>Snapshot</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!--One test is known to fail due to deprecated constructs in
-      appstream-1.0+-->
-    </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>
-          snapshot
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/snapshot
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="snapshot-prog">
-        <term><command>snapshot</command></term>
-        <listitem>
-          <para>
-            is a program used to take pictures and videos from a Webcam
-          </para>
-          <indexterm zone="snapshot snapshot-prog">
-            <primary sortas="b-snapshot">snapshot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: ome/applications/vinagre.xml
===================================================================
--- gnome/applications/vinagre.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vinagre-download-http "&gnome-download-http;/vinagre/&gnome-minor-22;/vinagre-&vinagre-version;.tar.xz">
-  <!ENTITY vinagre-download-ftp  " ">
-  <!ENTITY vinagre-md5sum        "451554ddf46636105cd5f0330e98d254">
-  <!ENTITY vinagre-size          "1.5 MB">
-  <!ENTITY vinagre-buildsize     "25 MB">
-  <!ENTITY vinagre-time          "0.2 SBU">
-]>
-
-<sect1 id="vinagre" xreflabel="Vinagre-&vinagre-version;">
-  <?dbhtml filename="vinagre.html"?>
-
-
-  <title>Vinagre-&vinagre-version;</title>
-
-  <indexterm zone="vinagre">
-    <primary sortas="a-Vinagre">Vinagre</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vinagre</title>
-
-    <para>
-      <application>Vinagre</application> is a VNC client for the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vinagre-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vinagre-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vinagre-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vinagre-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vinagre-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vinagre-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vinagre Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk-vnc"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="libsecret"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="vte"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-<!--      <xref linkend="appstream-glib"/>, -->
-      <xref linkend="avahi"/>,
-      <ulink url="&appstream-glib-url;">appstream-glib</ulink>,
-      <ulink url="https://www.freerdp.com/">FreeRDP</ulink> (For connecting to Windows desktops), and
-      <ulink url="https://www.spice-space.org/">Spice-GTK</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vinagre</title>
-
-    <para>
-      First fix an issue exposed by GCC-10:
-    </para>
-
-<screen><userinput>sed -e '/_VinagreVnc/i gboolean scaling_command_line;' \
-    -i plugins/vnc/vinagre-vnc-connection.c &amp;&amp;
-sed -e '/scaling_/s/^/extern /' \
-    -i plugins/vnc/vinagre-vnc-connection.h</userinput></screen>
-
-    <para>
-      Install <application>Vinagre</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-compile-warnings=minimum &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-compile-warnings=minimum</parameter>:
-      This switch disables compiler warnings that can cause the build to fail
-      when built under GCC6.
-    </para>
-
-   </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          vinagre
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/vinagre and
-          /usr/share/vinagre
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vinagre-prog">
-        <term><command>vinagre</command></term>
-        <listitem>
-          <para>
-            is a remote desktop viewer for the
-            <application>GNOME</application> Desktop
-          </para>
-          <indexterm zone="vinagre vinagre-prog">
-            <primary sortas="b-vinagre">vinagre</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/config/config.xml
===================================================================
--- gnome/config/config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/config/config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<chapter id="gnome-config">
+<?dbhtml filename="config.html" dir="gnome"?>
+<title>Configuring Gnome</title>
+
+<para>NOT YET DONE</para>
+
+</chapter>
Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/gnome.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<!ENTITY gnome SYSTEM "gnome.xml">
+
+<!-- Gnome Libraries -->
+<!ENTITY gnome-lib SYSTEM "lib/lib.xml">
+
+<!-- Gnome Core -->
+<!ENTITY gnome-core SYSTEM "core/core.xml">
+
+<!-- Additional Gnome Packages -->
+<!ENTITY gnome-add SYSTEM "add/add.xml">
+
+<!-- Other Gnome packages -->
+<!ENTITY gnome-other SYSTEM "other/other.xml">
+
+<!-- Configuring Gnome -->
+<!ENTITY gnome-config SYSTEM "config/config.xml">
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ gnome/gnome.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,20 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="gnome" xreflabel="gnome">
+<?dbhtml filename="gnome.html" dir="gnome"?>
+<title>Gnome</title>
 
-<part id="gnome" xreflabel="GNOME">
-  <?dbhtml filename="gnome.html" dir="gnome"?>
+<chapter>
+<title>Placeholder</title>
+<screen>So you've decided you want gnome?
 
-  <title>GNOME</title>
+this part of the book isnt ready yet (sorry),
+for now read Scot Mc Pherson;s gnome hint:
+<ulink
+url="http://hints.linuxfromscratch.org/hints/gnome-1.4.txt"/></screen>
+</chapter>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="platform/platform.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="applications/applications.xml"/>
-  <!-- transitionally, gnome-2 packages used elsewhere -->
-  <!-- Move to archive
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deprecated/deprecated.xml"/>
-  -->
 </part>
Index: gnome/lib/gdk-config.xml
===================================================================
--- gnome/lib/gdk-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/lib/gdk-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect3>
+<title>Configuring gdk-pikbuf</title>
+
+<sect4><title>Configuration Information</title>
+
+&library-config;
+
+</sect4>
+
+</sect3>
+
Index: gnome/lib/gdk-desc.xml
===================================================================
--- gnome/lib/gdk-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/lib/gdk-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect3>
+<title>Contents</title>
+
+<para>The gdk-pixbuf package contains <userinput>GTK+ pixbuf libraries</userinput>.</para>
+
+</sect3>
+
+<sect3><title>Description</title>
+
+<sect4><title>GTK+ pixbuf libraries</title>
+<para>GTK+ pixbuf libraries contains the GTK+ pixbuf libraries for the Gimp
+Tool Kit.</para></sect4>
+
+
+</sect3>
+
Index: gnome/lib/gdk-inst.xml
===================================================================
--- gnome/lib/gdk-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/lib/gdk-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect3>
+<title>Installation of gdk-pixbuf</title>
+
+<para>Install gdk-pixbuf by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect3>
+
Index: gnome/lib/gdk-intro.xml
===================================================================
--- gnome/lib/gdk-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/lib/gdk-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect3>
+<title>Introduction to gdk-pixbuf</title>
+
+<screen>Download location:              <ulink url="&gdk-download;"/>
+Version used:                   &gdk-version;
+Package size:                   &gdk-size;
+Estimated Disk space required:  &gdk-buildsize;</screen>
+
+<para>The gdk-pixbuf package is the GTK+ pixbuf library</para>
+
+<screen>gdk depends on:
+<xref linkend="GLib"/>, <xref linkend="GTK"/>, <xref linkend="libpng"/>, <xref linkend="zlib"/>,
+<xref linkend="libjpeg"/>, <xref linkend="libtiff"/></screen>
+
+</sect3>
Index: gnome/lib/gdk.xml
===================================================================
--- gnome/lib/gdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/lib/gdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2 id="gdk" xreflabel="gdk-pixbuf-&gdk-version;">
+<title>gdk-pixbuf-&gdk-version;</title>
+
+&gdk-intro;
+&gdk-inst;
+&gdk-config;
+&gdk-desc;
+
+</sect2>
+
Index: gnome/lib/lib.xml
===================================================================
--- gnome/lib/lib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/lib/lib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<chapter id="gnome-lib">
+<?dbhtml filename="lib.html" dir="gnome"?>
+<title>Gnome Libraries</title>
+<para><screen>This section will contain:
+List of needed packages from elsewhere in the book
+gtk-engine
+ORBit
+oaf
+GConf
+gnome-libs
+gnome-mime-data
+gnome-vfs
+libgtop
+xml-i18n-tools
+libghttp
+libglade
+gdk-pixbuf
+scrollkeeper</screen></para>
+
+</chapter>
Index: gnome/other/other.xml
===================================================================
--- gnome/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ gnome/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<chapter id="gnome-other">
+<?dbhtml filename="other.html" dir="gnome"?>
+<title>Other Gnome Packages</title>
+<para><screen>This section will contain:
+gtop
+ggv
+gdm</screen></para>
+
+</chapter>
Index: ome/platform/dconf.xml
===================================================================
--- gnome/platform/dconf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,295 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- DConf -->
-  <!ENTITY dconf-download-http "&gnome-download-http;/dconf/0.40/dconf-&dconf-version;.tar.xz">
-  <!ENTITY dconf-download-ftp  " ">
-  <!ENTITY dconf-md5sum        "ac8db20b0d6b996d4bbbeb96463d01f0">
-  <!ENTITY dconf-size          "115 KB">
-  <!ENTITY dconf-buildsize     "7.0 MB (with tests)">
-  <!ENTITY dconf-time          "0.1 SBU (with tests)">
-
-<!-- DConf-Editor -->
-  <!ENTITY dconf-editor-download-http "&gnome-download-http;/dconf-editor/&gnome-45;/dconf-editor-&dconf-editor-version;.tar.xz">
-  <!ENTITY dconf-editor-download-ftp  " ">
-  <!ENTITY dconf-editor-md5sum        "82b2f5d396e95757ad7eaf89c82decd6">
-  <!ENTITY dconf-editor-size          "596 KB">
-  <!ENTITY dconf-editor-buildsize     "21 MB">
-  <!ENTITY dconf-editor-time          "0.3 SBU">
-]>
-
-<sect1 id="dconf" xreflabel="DConf-&dconf-version;">
-  <?dbhtml filename="dconf.html"?>
-
-
-  <title>DConf-&dconf-version; / DConf-Editor-&dconf-editor-version;</title>
-
-  <indexterm zone="dconf">
-    <primary sortas="a-DConf">DConf</primary>
-  </indexterm>
-
-<!-- DConf -->
-
-  <sect2 role="package">
-    <title>Introduction to DConf</title>
-
-    <para>
-      The <application>DConf</application> package contains a low-level
-      configuration system. Its main purpose is to provide a backend to
-      GSettings on platforms that don't already have configuration storage
-      systems.
-    </para>
-
-    <para>
-      The <application>DConf-Editor</application>, as the name suggests, is a
-      graphical editor for the <application>DConf</application> database.
-      Installation is optional, because <command>gsettings</command> from <xref
-      linkend="glib2"/> provides similar functionality on the commandline.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dconf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dconf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dconf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dconf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dconf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dconf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dconf-editor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dconf-editor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dconf-editor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dconf-editor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dconf-editor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dconf-editor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DConf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gtk3"/> (for the editor),
-      <xref linkend="libhandy1"/> (for the editor), and
-      <xref linkend="libxml2"/> (for the editor)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxslt"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/scop/bash-completion">bash-completion</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DConf</title>
-
-    <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
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr           \
-            --buildtype=release     \
-            -Dbash_completion=false \
-            ..                      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Now, optionally install the editor:
-    </para>
-
-<screen><userinput>cd ..              &amp;&amp;
-tar -xf ../dconf-editor-&dconf-editor-version;.tar.xz &amp;&amp;
-cd dconf-editor-&dconf-editor-version;                &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      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>
-      <option>-Dgtk_doc=true</option>: Use this parameter if
-      <application>GTK-Doc</application> is installed and you wish to rebuild
-      and install the API documentation.
-    </para>
-
-<!--
-    <para><!- - Using nbsp so that spaces are output verbatim - ->
-      <command>sed -e '/&nbsp;&nbsp;desktop,/d' ...</command>: This
-      fixes a failure to build with newer versions of
-      <application>meson</application>.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dconf and dconf-editor
-        </seg>
-        <seg>
-          libdconf.so
-          and libdconfsettings.so (GIO Module installed in
-          <filename class="directory">/usr/lib/gio/modules</filename>)
-        </seg>
-        <seg>
-          /usr/{include,share/gtk-doc/html}/dconf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dconf-prog">
-        <term><command>dconf</command></term>
-        <listitem>
-          <para>
-            is a simple tool for manipulating the
-            <application>DConf</application> database
-          </para>
-          <indexterm zone="dconf dconf-prog">
-            <primary sortas="b-dconf">dconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dconf-editor">
-        <term><command>dconf-editor</command></term>
-        <listitem>
-          <para>
-            is a graphical program for editing the
-            <application>DConf</application> database
-          </para>
-          <indexterm zone="dconf dconf-editor">
-            <primary sortas="b-dconf-editor">dconf-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdconf">
-        <term><filename class="libraryfile">libdconf.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>DConf</application> client API functions
-          </para>
-          <indexterm zone="dconf libdconf">
-            <primary sortas="c-libdconf">libdconf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/dummy-desktop.xml
===================================================================
--- gnome/platform/dummy-desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>GNOME Desktop Components</title>
-  <para/>
-</sect1>
-
Index: ome/platform/dummy-platform.xml
===================================================================
--- gnome/platform/dummy-platform.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>Libraries</title>
-  <para/>
-</sect1>
-
Index: ome/platform/evolution-data-server.xml
===================================================================
--- gnome/platform/evolution-data-server.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,415 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY evolution-data-server-download-http
-           "&gnome-download-http;/evolution-data-server/&gnome-minor-52;/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-download-ftp  " ">
-  <!ENTITY evolution-data-server-md5sum        "0cf18350f9097402db202b90855bf5db">
-  <!ENTITY evolution-data-server-size          "4.8 MB">
-  <!ENTITY evolution-data-server-buildsize     "181 MB (with tests)">
-  <!ENTITY evolution-data-server-time          "0.7 SBU (using parallelism=4)">
-]>
-
-<sect1 id="evolution-data-server"
-xreflabel="evolution-data-server-&evolution-data-server-version;">
-  <?dbhtml filename="evolution-data-server.html"?>
-
-
-  <title>evolution-data-server-&evolution-data-server-version;</title>
-
-  <indexterm zone="evolution-data-server">
-    <primary sortas="a-evolution-data-server">evolution-data-server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Evolution Data Server</title>
-
-    <para>
-      The <application>Evolution Data Server</application> package provides
-      a unified backend for programs that work with contacts, tasks, and calendar
-      information. It was originally developed for
-      <application>Evolution</application> (hence the name), but is now used by
-      other packages as well.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&evolution-data-server-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&evolution-data-server-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &evolution-data-server-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &evolution-data-server-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &evolution-data-server-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &evolution-data-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Evolution Data Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libical"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="nss"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnome-online-accounts"/>,
-      &gobject-introspection;,
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libgweather"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="webkitgtk"/>
-    </para>
-
-    <bridgehead renderas="sect4"
-                revision="sysv">Recommended (Runtime)</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="blocaled" role="runtime"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="mitkrb"/>,
-      a <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
-      <xref linkend="openldap"/>,
-      &berkeley-db;, and
-      <ulink url="https://github.com/googlei18n/libphonenumber/">libphonenumber</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Evolution Data Server</title>
-
-<!-- Fixed in 3.50.2
-    <para>
-      First, fix a build failure when using libxml2-2.12.x:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/xpathInternals.h/a #include &lt;libxml/globals.h&gt;' src/libedataserver/e-xml-utils.c</userinput></screen>
--->
-
-    <para>
-      Install <application>Evolution Data Server</application> by running
-      the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr    \
-      -DSYSCONF_INSTALL_DIR=/etc     \
-      -DENABLE_VALA_BINDINGS=ON      \
-      -DENABLE_INSTALLED_TESTS=ON    \
-      -DWITH_OPENLDAP=OFF            \
-      -DWITH_KRB5=OFF                \
-      -DENABLE_INTROSPECTION=ON      \
-      -DENABLE_GTK_DOC=OFF           \
-      -DWITH_LIBDB=OFF               \
-      -DWITH_SYSTEMDUSERUNITDIR=no   \
-      -Wno-dev -G Ninja ..           &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr    \
-      -DSYSCONF_INSTALL_DIR=/etc     \
-      -DENABLE_VALA_BINDINGS=ON      \
-      -DENABLE_INSTALLED_TESTS=ON    \
-      -DWITH_OPENLDAP=OFF            \
-      -DWITH_KRB5=OFF                \
-      -DENABLE_INTROSPECTION=ON      \
-      -DENABLE_GTK_DOC=OFF           \
-      -DWITH_LIBDB=OFF               \
-      -Wno-dev -G Ninja ..           &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <!-- The tests need to be run after the package is installed due to
-    compatibility issues that show up when upgrading from previous versions
-    of e-d-s. This is due to soup2/soup3 mixing. -->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DENABLE_VALA_BINDINGS=ON</parameter>: This switch
-      enables building the Vala bindings. Remove it if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_GTK_DOC=OFF</parameter>: This switch
-      disables building the API documentation. It is broken for
-      this package due to the use of a long deprecated gtk-doc program
-      that is no longer available.
-    </para>
-
-    <para>
-      <parameter>-DWITH_LIBDB=OFF</parameter>: This switch allows building
-      this package without &berkeley-db;.  <!--This package only uses
-      &berkeley-db; to import data from very outdated releases.-->
-      <xref linkend="sqlite"/> is used for normal operation.
-    </para>
-
-    <para>
-      <option>-DENABLE_OAUTH2_WEBKITGTK4=OFF</option>: Use this switch if
-      you did not build <xref linkend="webkitgtk" role="nodep"/> with GTK-4.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-DWITH_SYSTEMDUSERUNITDIR=no</parameter>: This switch
-      disables installing the systemd units, which are not used for a Sysv
-      build.
-    </para>
-
-    <note>
-      <para>
-        To enable many of the optional dependencies, review the information
-        from <command>cmake -L CMakeLists.txt</command> for the necessary
-        parameters you must pass to the <command>cmake</command> command.
-      </para>
-    </note>
-
-  </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>
-          libcamel-1.2.so,
-          libebackend-1.2.so,
-          libebook-1.2.so,
-          libebook-contacts-1.2.so,
-          libecal-2.0.so,
-          libedata-book-1.2.so,
-          libedata-cal-2.0.so,
-          libedataserver-1.2.so,
-          libedataserverui-1.2.so,
-          libedataserverui4-1.0.so,
-          and libetestserverutils.so
-        </seg>
-        <seg>
-          /usr/include/evolution-data-server,
-          /usr/lib{,exec}/evolution-data-server,
-          /usr/share/evolution-data-server,
-          /usr/share/installed-tests/evolution-data-server, and
-          <!-- We explicitly disable gtk-doc generation, so comment these out
-          /usr/share/gtk-doc/html/{camel,libebackend,libebook},
-          /usr/share/gtk-doc/html/{libecal,libedata-book,libedata-cal},
-          /usr/share/gtk-doc/html/{libedataserver,libedataserverui} and
-          -->
-          /usr/share/pixmaps/evolution-data-server
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcamel-1">
-        <term><filename class="libraryfile">libcamel-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Evolution</application> MIME message
-            handling library
-          </para>
-          <indexterm zone="evolution-data-server libcamel-1">
-            <primary sortas="c-libcamel-1">libcamel-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libebackend-1">
-        <term><filename class="libraryfile">libebackend-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the utility library for
-            <application>Evolution Data Server</application> Backends
-          </para>
-          <indexterm zone="evolution-data-server libebackend-1">
-            <primary sortas="c-libebackend-1">libebackend-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libebook-1">
-        <term><filename class="libraryfile">libebook-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for <application>Evolution</application>
-            address books
-          </para>
-          <indexterm zone="evolution-data-server libebook-1">
-            <primary sortas="c-libebook-1">libebook-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libebook-contacts-1">
-        <term><filename class="libraryfile">libebook-contacts-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for <application>Evolution</application>
-            contacts
-          </para>
-          <indexterm zone="evolution-data-server libebook-contacts-1">
-            <primary sortas="c-libebook-contacts-1">libebook-contacts-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libecal-1">
-        <term><filename class="libraryfile">libecal-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for <application>Evolution</application>
-            calendars
-          </para>
-          <indexterm zone="evolution-data-server libecal-1">
-            <primary sortas="c-libecal-1">libecal-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedata-book-1">
-        <term><filename class="libraryfile">libedata-book-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the backend library for <application>Evolution</application>
-            address books
-          </para>
-          <indexterm zone="evolution-data-server libedata-book-1">
-            <primary sortas="c-libedata-book-1">libedata-book-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedata-cal-1">
-        <term><filename class="libraryfile">libedata-cal-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the backend library for <application>Evolution</application>
-            calendars
-          </para>
-          <indexterm zone="evolution-data-server libedata-cal-1">
-            <primary sortas="c-libedata-cal-1">libedata-cal-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedataserver-1">
-        <term><filename class="libraryfile">libedataserver-1.2.so</filename></term>
-        <listitem>
-          <para>
-            is the utility library for
-            <application>Evolution Data Server</application>
-          </para>
-          <indexterm zone="evolution-data-server libedataserver-1">
-            <primary sortas="c-libedataserver-1">libedataserver-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedataserverui-3">
-        <term><filename class="libraryfile">libedataserverui-3.0.so</filename></term>
-        <listitem>
-          <para>
-            is the GUI utility library for
-            <application>Evolution Data Server</application>
-          </para>
-          <indexterm zone="evolution-data-server libedataserverui-3">
-            <primary sortas="c-libedataserverui-3">libedataserverui-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libedataserverui4-1">
-        <term><filename class="libraryfile">libedataserverui4-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is the GTK-4 based GUI utility library for
-            <application>Evolution Data Server</application>
-          </para>
-          <indexterm zone="evolution-data-server libedataserverui4-1">
-            <primary sortas="c-libedataserverui4-1">libedataserverui4-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libetestserverutils-1">
-        <term><filename class="libraryfile">libetestserverutils.so</filename></term>
-        <listitem>
-          <para>
-            is the server test utility library for
-            <application>Evolution Data Server</application>
-          </para>
-          <indexterm zone="evolution-data-server libetestserverutils-1">
-            <primary sortas="c-libetestserverutils-1">libetestserverutils.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gcr-download-http "&gnome-download-http;/gcr/&gcr-minor;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-download-ftp  " ">
-  <!ENTITY gcr-md5sum        "40a754ba44d5e95e4d07656d6302900c">
-  <!ENTITY gcr-size          "1012 KB">
-  <!ENTITY gcr-buildsize     "33 MB (with tests)">
-  <!ENTITY gcr-time          "0.2 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="gcr" xreflabel="Gcr-&gcr-version;">
-  <?dbhtml filename="gcr.html"?>
-
-
-  <title>Gcr-&gcr-version;</title>
-
-  <indexterm zone="gcr">
-    <primary sortas="a-Gcr">Gcr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gcr</title>
-
-    <para>
-      The <application>Gcr</application> package contains libraries used
-      for displaying certificates and accessing key stores. It also
-      provides the viewer for crypto files on the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gcr Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended),
-      <xref linkend="libgcrypt"/>, and
-      <xref linkend="p11-kit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnupg2"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gcr</title>
-
-    <!--
-    <caution>
-      <para>
-        If you are upgrading from a version of gcr prior to 3.36.0, you must
-        run the <filename>remove-la-files.sh</filename> script from the
-        <xref linkend="la-files"/> after installing gcr.
-      </para>
-    </caution>
-    -->
-
-<!--
-    <para>
-      First apply a fix for building with newer versions of
-      <application>meson</application>:
-    </para>
-
-<screen><userinput>find . -name meson.build | xargs sed -i /packages.\*deps/d</userinput></screen>
--->
-
-    <para>
-      Install <application>Gcr</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's:"/desktop:"/org:' schema/*.xml &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            -Dssh_agent=false   \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen remap='doc'><userinput>sed -e "/install_dir/s@,\$@ / 'gcr-&gcr-version;'&amp;@" \
-    -i ../docs/*/meson.build                  &amp;&amp;
-meson configure -Dgtk_doc=true                &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests must be run from an X Terminal or similar. <!-- One test,
-      "test-openssl 3", is known to fail. -->
-    </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>
-      <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>
--->
-
-    <!--
-    <para>
-      <!- - https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/52/ - ->
-      <command>sed ... gck/gck-slot.c</command>:  This command fixes a bug
-      (usage of uninitialized value) identified by upstream.
-    </para>
-    -->
-
-    <para>
-      <parameter>-Dssh_agent=false</parameter>: Prevent a conflict with
-      <xref linkend='gcr4'/>.  Omit this switch if you do not plan to
-      install <xref linkend='gcr4'/> and you want to use
-      <command>gcr-ssh-agent</command>.
-    </para>
-
-    <para>
-      <option>-Dgtk=false</option>: Use this switch if you
-      haven't installed <xref linkend="gtk3"/>. Note that
-      <application>gcr-viewer</application> will not be installed
-      if this is passed to meson.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: &gi-doc-disable;
-    </para>
-
-    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcr-viewer
-        </seg>
-        <seg>
-          libgck-1.so, libgcr-base-3.so and libgcr-ui-3.so
-        </seg>
-        <seg>
-          /usr/include/gck-1,
-          /usr/include/gcr-3, and
-          /usr/share/gtk-doc/html/{gcr,gck}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcr-viewer">
-        <term><command>gcr-viewer</command></term>
-        <listitem>
-          <para>
-            is used to view certificates and key files
-          </para>
-          <indexterm zone="gcr gcr-viewer">
-            <primary sortas="b-gcr-viewer">gcr-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgck-1">
-        <term><filename class="libraryfile">libgck-1.so</filename></term>
-        <listitem>
-          <para>
-            contains GObject bindings for PKCS#11
-          </para>
-          <indexterm zone="gcr libgck-1">
-            <primary sortas="c-libgck-1">libgck-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gcr4.xml
===================================================================
--- gnome/platform/gcr4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gcr4-download-http "&gnome-download-http;/gcr/&gcr4-minor;/gcr-&gcr4-version;.tar.xz">
-  <!ENTITY gcr4-download-ftp  " ">
-  <!ENTITY gcr4-md5sum        "51ae0448c7c42caf0b7deb2639c9e9b8">
-  <!ENTITY gcr4-size          "712 KB">
-  <!ENTITY gcr4-buildsize     "30 MB (with tests)">
-  <!ENTITY gcr4-time          "0.1 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="gcr4" xreflabel="Gcr-&gcr4-version;">
-  <?dbhtml filename="gcr4.html"?>
-
-
-  <title>Gcr-&gcr4-version;</title>
-
-  <indexterm zone="gcr4">
-    <primary sortas="a-Gcr">Gcr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gcr</title>
-
-    <para>
-      The <application>Gcr</application> package contains libraries used
-      for displaying certificates and accessing key stores. It also
-      provides the viewer for crypto files on the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcr4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcr4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcr4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcr4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcr4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcr4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gcr Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended),
-      <xref linkend="libgcrypt"/>, and
-      <xref linkend="p11-kit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnupg2"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openssh"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <xref linkend="gnutls"/>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gcr</title>
-
-    <note>
-      <para>Both gcr-3 and gcr-4 are coinstallable. This version of the package is
-      used to support GTK-4 applications, such as
-      <xref linkend="gnome-shell" role="nodep"/> and
-      <xref linkend="epiphany" role="nodep"/>.</para>
-    </note>
-
-    <para>
-      Install <application>Gcr</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen remap='doc'><userinput>sed -e "/install_dir/s@,\$@ / 'gcr-&gcr4-version;'&amp;@" \
-    -i ../docs/*/meson.build                 &amp;&amp;
-meson configure -Dgtk_doc=true               &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests must be run from an X Terminal or similar.
-    </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>
-      <option>-Dgtk4=false</option>: Use this switch if you
-      haven't installed <xref linkend="gtk4"/>. Note that
-      <application>gcr-viewer</application> will not be installed
-      if this is passed to meson.
-    </para>
-
-    <para>
-      <option>-Dssh_agent=false</option>: Use this switch if you
-      haven't installed <xref linkend="openssh"/>, and wish to disable
-      ssh compatibility.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: &gi-doc-disable;
-    </para>
-
-    <para>
-      <option>-Dcrypto=gnutls</option>: Use this switch if you have
-      <xref linkend="gnutls" role="nodep"/> installed and wish to use it
-      instead of <xref linkend="libgcrypt" role="nodep"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcr-viewer-gtk4
-        </seg>
-        <seg>
-          libgck-2.so, libgcr-4.so
-        </seg>
-        <seg>
-          /usr/include/gck-2,
-          /usr/include/gcr-4, and
-          /usr/share/gtk-doc/html/{gcr,gck}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcr-viewer-gtk4">
-        <term><command>gcr-viewer-gtk4</command></term>
-        <listitem>
-          <para>
-            is used to view certificates and key files
-          </para>
-          <indexterm zone="gcr4 gcr-viewer-gtk4">
-            <primary sortas="b-gcr-viewer-gtk4">gcr-viewer-gtk4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgck-2">
-        <term><filename class="libraryfile">libgck-2.so</filename></term>
-        <listitem>
-          <para>
-            contains GObject bindings for PKCS#11
-          </para>
-          <indexterm zone="gcr4 libgck-2">
-            <primary sortas="c-libgck-2">libgck-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcr-4">
-        <term><filename class="libraryfile">libgcr-4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for accessing key stores and displaying
-            certificates
-          </para>
-          <indexterm zone="gcr4 libgcr-4">
-            <primary sortas="c-libgcr-4">libgcr-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/geocode-glib.xml
===================================================================
--- gnome/platform/geocode-glib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,191 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 geocode-glib-download-http
-           "&gnome-download-http;/geocode-glib/&gnome-minor-26;/geocode-glib-&geocode-glib-version;.tar.xz">
-  <!ENTITY geocode-glib-download-ftp  " ">
-  <!ENTITY geocode-glib-md5sum        "4c0dcdb7ee1222435b20acd3d7b68cd1">
-  <!ENTITY geocode-glib-size          "76 KB">
-  <!ENTITY geocode-glib-buildsize     "4.6 MB (with tests)">
-  <!ENTITY geocode-glib-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;">
-  <?dbhtml filename="geocode-glib.html"?>
-
-
-  <title>geocode-glib-&geocode-glib-version;</title>
-
-  <indexterm zone="geocode-glib">
-    <primary sortas="a-geocode-glib">geocode-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Geocode GLib</title>
-
-    <para>
-      The <application>Geocode GLib</application> is a convenience library
-      for the Yahoo! Place Finder APIs. The Place Finder web service allows
-      to do geocoding (finding longitude and latitude from an address), and
-      reverse geocoding (finding an address from coordinates).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&geocode-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&geocode-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &geocode-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &geocode-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &geocode-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &geocode-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Geocode GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/> and
-      <xref linkend="libsoup3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Geocode GLib</title>
-
-    <para>
-      Install <application>Geocode GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build                   &amp;&amp;
-cd    build                   &amp;&amp;
-
-meson setup --prefix /usr           \
-            --buildtype=release     \
-            -Denable-gtk-doc=false  \
-            -Dsoup2=false           \
-            ..                      &amp;&amp;
-ninja</userinput></screen>
-
-
-    <para>
-      To test the results, issue: <command>LANG=C ninja test</command>.
-      One test fails because it needs the <literal>sv_SE.utf8</literal> locale,
-      which is not installed by default in LFS.
-    </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>-Denable-gtk-doc=false</parameter>: Allow this package to be
-      built without <xref linkend="gtk-doc" role="nodep"/>. Remove this
-      parameter if <xref linkend="gtk-doc" role="nodep"/> is installed
-      and you wish to rebuild and install the API documentation.
-    </para>
-
-    <para>
-      <parameter>-Dsoup2=false</parameter>: This switch forces this package
-      to use libsoup-3 for HTTP requests instead of libsoup-2. The packages in
-      BLFS that use geocode-glib now expect libsoup-3 to be used.
-    </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>
-          libgeocode-glib-2.so
-        </seg>
-        <seg>
-          /usr/include/geocode-glib-2.0,
-          /usr/libexec/installed-tests/geocode-glib,
-          /usr/share/icons/gnome/scalable/places, and
-          /usr/share/gtk-doc/html/geocode-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgeocode-glib-2">
-        <term><filename class="libraryfile">libgeocode-glib-2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Geocode GLib</application> API functions
-          </para>
-          <indexterm zone="geocode-glib libgeocode-glib-2">
-            <primary sortas="c-libgeocode-glib-2">libgeocode-glib-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gexiv2.xml
===================================================================
--- gnome/platform/gexiv2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- gexiv2 -->
-  <!ENTITY gexiv2-download-http "&gnome-download-http;/gexiv2/&gexiv2-minor;/gexiv2-&gexiv2-version;.tar.xz">
-  <!ENTITY gexiv2-download-ftp  " ">
-  <!ENTITY gexiv2-md5sum        "1e65556fad5d24a4c365696544d8c945">
-  <!ENTITY gexiv2-size          "384 KB">
-  <!ENTITY gexiv2-buildsize     "4.0 MB (with tests)">
-  <!ENTITY gexiv2-time          "0.1 SBU (with parallelism=4 and tests)">
-]>
-
-<sect1 id="gexiv2" xreflabel="gexiv2-&gexiv2-version;">
-  <?dbhtml filename="gexiv2.html"?>
-
-
-  <title>gexiv2-&gexiv2-version;</title>
-
-  <indexterm zone="gexiv2">
-    <primary sortas="a-gexiv2">gexiv2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gexiv2</title>
-
-    <para>
-      gexiv2 is a GObject-based wrapper around the Exiv2 library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gexiv2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gexiv2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gexiv2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gexiv2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gexiv2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gexiv2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- applied in 0.14.2
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch to build against exiv2-0.28 and above:
-          <ulink url="&patch-root;/gexiv2-&gexiv2-version;-exiv_0_28-1.patch"/>
-        </para>
-        <para>
-          Required patch to build on i686 systems:
-          <ulink url="&patch-root;/gexiv2-&gexiv2-version;-buildfixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">gexiv2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exiv2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gexiv2</title>
-
-<!-- applied in 0.14.2
-    <para>
-      First apply some fixes allowing to build against exiv2-0.28 and above:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gexiv2-&gexiv2-version;-exiv_0_28-1.patch</userinput></screen>
-
-    <para>
-      Next, if you are on an i686 system, fix the build by adjusting types:
-    </para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-    i?86) patch -Np1 -i ../gexiv2-&gexiv2-version;-buildfixes-1.patch ;;
-esac</userinput></screen>
--->
-
-    <para>
-      Install <application>gexiv2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, run:
-    </para>
-
-<screen remap="test"><userinput>meson configure -Dtests=true &amp;&amp;
-ninja test</userinput></screen>
-
-    <para>
-      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>
-          libgexiv2.so
-        </seg>
-        <seg>
-          /usr/include/gexiv2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgexiv2">
-        <term><filename class="libraryfile">libgexiv2.so</filename></term>
-        <listitem>
-          <para>
-            provides a wrapper around the Exiv2 library
-          </para>
-          <indexterm zone="gexiv2 libgexiv2">
-            <primary sortas="c-libgexiv2">libgexiv2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gjs-download-http "&gnome-download-http;/gjs/1.80/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-download-ftp  " ">
-  <!ENTITY gjs-md5sum        "ae896ab9a1c5589b86fde94a45a2fcd9">
-  <!ENTITY gjs-size          "648 KB">
-  <!ENTITY gjs-buildsize     "253 MB (with tests)">
-  <!ENTITY gjs-time          "0.2 SBU (with tests; with parallelism=4)">
-]>
-
-<sect1 id="gjs" xreflabel="Gjs-&gjs-version;">
-  <?dbhtml filename="gjs.html"?>
-
-
-  <title>Gjs-&gjs-version;</title>
-
-  <indexterm zone="gjs">
-    <primary sortas="a-Gjs">Gjs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gjs</title>
-
-    <para>
-      <application>Gjs</application> is a set of Javascript bindings for
-      <application>GNOME</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gjs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gjs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gjs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gjs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gjs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gjs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gjs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="dbus"/>,
-      &gobject-introspection;, and
-      <xref linkend="spidermonkey"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (required for GNOME)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/> and
-      <xref linkend="gtk4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="sysprof"/>,-->
-      <xref linkend="valgrind"/> (for tests),
-      <ulink url="http://dtrace.org/blogs/about">DTrace</ulink>,
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>,
-      <ulink url="&sysprof-url;">sysprof</ulink>, and
-      <ulink url="https://sourceware.org/systemtap">Systemtap</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gjs</title>
-
-    <para>
-      Install <application>Gjs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir gjs-build &amp;&amp;
-cd    gjs-build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            --wrap-mode=nofallback \
-            ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command> in a
-      graphical session.
-    </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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nofallback.xml"/>
-
-    <para>
-      <option>-Dprofiler=disabled</option>: prevents building the profiler
-      backend even if <ulink url="&sysprof-url;">sysprof</ulink> 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>
-          gjs (symlink) and gjs-console
-        </seg>
-        <seg>
-          libgjs.so
-        </seg>
-        <seg>
-          /usr/include/gjs-1.0,
-          /usr/lib/gjs,
-          /usr/libexec/installed-tests/gjs,
-          /usr/share/gjs-1.0, and
-          /usr/share/installed-tests/gjs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gjs-console">
-        <term><command>gjs-console</command></term>
-        <listitem>
-          <para>
-            contains a console to run <application>JavaScript</application>
-            commands
-          </para>
-          <indexterm zone="gjs gjs-console">
-            <primary sortas="b-gjs-console">gjs-console</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgjs">
-        <term><filename class="libraryfile">libgjs.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GNOME</application> JavaScript bindings
-          </para>
-          <indexterm zone="gjs libgjs">
-            <primary sortas="c-libgjs">libgjs.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-autoar.xml
===================================================================
--- gnome/platform/gnome-autoar.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-autoar-download-http "&gnome-download-http;/gnome-autoar/0.4/gnome-autoar-&gnome-autoar-version;.tar.xz">
-  <!ENTITY gnome-autoar-download-ftp  " ">
-  <!ENTITY gnome-autoar-md5sum        "ac1a423f861ed5765a5d03251c00746d">
-  <!ENTITY gnome-autoar-size          "52 KB">
-  <!ENTITY gnome-autoar-buildsize     "2.7 MB">
-  <!ENTITY gnome-autoar-time          "0.1 SBU">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="gnome-autoar" xreflabel="gnome-autoar-&gnome-autoar-version;">
-  <?dbhtml filename="gnome-autoar.html"?>
-
-
-  <title>gnome-autoar-&gnome-autoar-version;</title>
-
-  <indexterm zone="gnome-autoar">
-    <primary sortas="a-gnome-autoar">gnome-autoar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-autoar</title>
-
-    <para>
-      The <application>gnome-autoar</application> package provides a framework
-      for automatic archive extraction, compression, and management.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-autoar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-autoar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-autoar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-autoar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-autoar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-autoar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnome-autoar Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libarchive"/> and <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for building documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-autoar</title>
-
-    <para>
-      Install <application>gnome-autoar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dvapi=true         \
-            -Dtests=true        \
-            ..                  &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>
-      <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"/>
-
-    <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>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgnome-autoar-0.so and libgnome-autoar-gtk-0.so
-        </seg>
-        <seg>
-          /usr/include/gnome-autoar-0 and /usr/share/gtk-doc/html/gnome-autoar
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnome-autoar-0">
-        <term><filename class="libraryfile">libgnome-autoar-0.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for automatic archive management
-          </para>
-          <indexterm zone="gnome-autoar libgnome-autoar-0">
-            <primary sortas="c-libgnome-autoar-0.so">libgnome-autoar-0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnome-autoar-gtk-0">
-         <term><filename class="libraryfile">libgnome-autoar-gtk-0.so</filename></term>
-         <listitem>
-           <para>
-             provides GTK+ widgets to aid in automatic archive management
-           </para>
-           <indexterm zone="gnome-autoar libgnome-autoar-gtk-0">
-             <primary sortas="c-libgnome-autoar-gtk-0.so">libgnome-autoar-gtk-0.so</primary>
-           </indexterm>
-         </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-backgrounds.xml
===================================================================
--- gnome/platform/gnome-backgrounds.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-backgrounds-download-http
-           "&gnome-download-http;/gnome-backgrounds/&gnome-46;/gnome-backgrounds-&gnome-backgrounds-version;.tar.xz">
-  <!ENTITY gnome-backgrounds-download-ftp  " ">
-  <!ENTITY gnome-backgrounds-md5sum        "85907535d2ed9d4cc6158bee41c35110">
-  <!ENTITY gnome-backgrounds-size          "18 MB">
-  <!ENTITY gnome-backgrounds-buildsize     "44 MB">
-  <!ENTITY gnome-backgrounds-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-backgrounds" xreflabel="gnome-backgrounds-&gnome-backgrounds-version;">
-  <?dbhtml filename="gnome-backgrounds.html"?>
-
-
-  <title>gnome-backgrounds-&gnome-backgrounds-version;</title>
-
-  <indexterm zone="gnome-backgrounds">
-    <primary sortas="a-gnome-backgrounds">gnome-backgrounds</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Backgrounds</title>
-
-    <para>
-      The <application>GNOME Backgrounds</application> package contains
-      a collection of graphics files which can be used as backgrounds in the
-      <application>GNOME</application> Desktop environment. Additionally,
-      the package creates the proper framework and directory structure so
-      that you can add your own files to the collection.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-backgrounds-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-backgrounds-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-backgrounds-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-backgrounds-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-backgrounds-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-backgrounds-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Backgrounds Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="libjxl"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Backgrounds</title>
-
-    <para>
-      Install <application>GNOME Backgrounds</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr ..</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/backgrounds/gnome and
-          /usr/share/gnome-background-properties
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term><filename>GNOME Backgrounds</filename></term>
-        <listitem>
-          <para>
-            are background images for the
-            <application>GNOME</application> Desktop
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-bluetooth.xml
===================================================================
--- gnome/platform/gnome-bluetooth.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-bluetooth-download-http
-           "&gnome-download-http;/gnome-bluetooth/&gnome-46;/gnome-bluetooth-&gnome-bluetooth-version;.tar.xz">
-  <!ENTITY gnome-bluetooth-download-ftp  " ">
-  <!ENTITY gnome-bluetooth-md5sum        "a462e61c804b249ff9838d895a1767f6">
-  <!ENTITY gnome-bluetooth-size          "300 KB">
-  <!ENTITY gnome-bluetooth-buildsize     "14 MB (with tests)">
-  <!ENTITY gnome-bluetooth-time          "0.1 SBU (Using parallelism=4, with tests)">
-]>
-
-<sect1 id="gnome-bluetooth" xreflabel="gnome-bluetooth-&gnome-bluetooth-version;">
-  <?dbhtml filename="gnome-bluetooth.html"?>
-
-
-  <title>gnome-bluetooth-&gnome-bluetooth-version;</title>
-
-  <indexterm zone="gnome-bluetooth">
-    <primary sortas="a-gnome-bluetooth">gnome-bluetooth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Bluetooth</title>
-
-    <para>
-      The <application>GNOME Bluetooth</application> package contains tools
-      for managing and manipulating Bluetooth devices using the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-bluetooth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-bluetooth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-bluetooth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-bluetooth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-bluetooth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-bluetooth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (required for running the test suite):
-          <ulink url="&patch-root;/gnome-bluetooth-&gnome-bluetooth-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GNOME Bluetooth Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/>,
-      <xref linkend="gsound"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="libadwaita1"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python-dbusmock"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="bluez"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Bluetooth</title>
-
-<!--
-    <para>
-      If running the test suite, apply a patch to fix test timeouts
-      with python-dbusmock 0.30.0 or later:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../gnome-bluetooth-&gnome-bluetooth-version;-testsuite_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GNOME Bluetooth</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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>
-          bluetooth-sendto
-        </seg>
-        <seg>
-          libgnome-bluetooth-3.0.so and
-          libgnome-bluetooth-ui-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gnome-bluetooth-3.0 and
-          /usr/share/gnome-bluetooth-3.0
-          <!--/usr/share/gtk-doc/html/gnome-bluetooth and
-          /usr/share/help/*/gnome-bluetooth -->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bluetooth-sendto">
-        <term><command>bluetooth-sendto</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> application for transferring
-            files over Bluetooth
-          </para>
-          <indexterm zone="gnome-bluetooth bluetooth-sendto">
-            <primary sortas="b-bluetooth-sendto">bluetooth-sendto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnome-bluetooth-3.0">
-        <term><filename class="libraryfile">libgnome-bluetooth-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GNOME Bluetooth</application> API
-            functions
-          </para>
-          <indexterm zone="gnome-bluetooth libgnome-bluetooth-3.0">
-            <primary sortas="c-libgnome-bluetooth-3.0">libgnome-bluetooth-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,233 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/&gnome-46;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-download-ftp  " ">
-  <!ENTITY gnome-control-center-md5sum        "58c966c88514d267df4ef9a357e4676e">
-  <!ENTITY gnome-control-center-size          "7.6 MB">
-  <!ENTITY gnome-control-center-buildsize     "120 MB (with tests)">
-  <!ENTITY gnome-control-center-time          "0.4 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gnome-control-center" xreflabel="gnome-control-center-&gnome-control-center-version;">
-  <?dbhtml filename="gnome-control-center.html"?>
-
-
-  <title>gnome-control-center-&gnome-control-center-version;</title>
-
-  <indexterm zone="gnome-control-center">
-    <primary sortas="a-gnome-control-center">gnome-control-center</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Control Center</title>
-
-    <para>
-      The <application>GNOME Control Center</application> package contains the
-      <application>GNOME</application> settings manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-control-center-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-control-center-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-control-center-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-control-center-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-control-center-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-control-center-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Control Center Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="accountsservice"/>,
-      <xref linkend="colord-gtk"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="gnome-settings-daemon"/>,
-      <xref linkend="gsound"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libgtop"/>,
-      <xref linkend="libpwquality"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="shared-mime-info"/>,
-      <xref linkend="tecla"/>, and
-      <xref linkend="udisks2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/> and
-      <xref linkend="samba"/> (for the Printers Panel),
-      <xref linkend="gnome-bluetooth"/>,
-      <xref linkend="ibus"/>,
-      <xref linkend="ModemManager"/> and
-      <xref linkend="libnma"/> (for the Network Panel)
-      <!-- gnome-remote-desktop can be used in the Sharing panel. -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <command>Xvfb</command> (from
-      <xref linkend='xorg-server'/> or
-      <xref role='nodep' linkend='xwayland'/>) and
-      <xref linkend="python-dbusmock"/> (both for tests)
-    </para>
-
-    <bridgehead renderas="sect4"
-                revision="sysv">Recommended (Runtime)</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="blocaled" role="runtime"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="cups-pk-helper"/> (Printers panel),
-      <xref role="runtime" linkend="gnome-color-manager"/> (Color panel),
-      <xref role="runtime" linkend="gnome-shell"/> (Applications panel), and
-      <xref role="runtime" linkend="sound-theme-freedesktop"/> (Additional Sound Effects in Sound panel)
-    </para>
-
-    <note>
-      <para>
-        Recommended dependencies are not strictly required for
-        this package to build and function, but you may not get
-        expected results at runtime if you don't install them.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Control Center</title>
-
-<!--
-    <note>
-      <para>
-        If upgrading from gnome-control-center-41 or earlier, remove a
-        desktop file that would result in duplicated menu entries. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>rm -f /usr/share/applications/gnome-control-center.desktop</userinput></screen>
-
-    </note>
--->
-
-    <para>
-      Install <application>GNOME Control Center</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <!-- for GTK_A11Y=none see upstream issue #2300.  The test still fails
-         w/o it in 43.4.1. -->
-    <para>
-      To test the results, issue:
-      <command>GTK_A11Y=none ninja test</command>. Note that
-      you must have the <application>python-dbusmock</application> module
-      installed in order for the tests to complete successfully.
-    </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>
-      <option>-Dibus=false</option>: Use this switch if you have not
-      installed the recommended <application>IBus</application> dependency.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-control-center
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-control-center,
-          /usr/share/pixmaps/faces, and
-          /usr/share/sounds/gnome
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-control-center-prog">
-        <term><command>gnome-control-center</command></term>
-        <listitem>
-          <para>
-            is a graphical user interface used to configure various
-            aspects of <application>GNOME</application>
-          </para>
-          <indexterm zone="gnome-control-center gnome-control-center-prog">
-            <primary sortas="b-gnome-control-center">gnome-control-center</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-desktop.xml
===================================================================
--- gnome/platform/gnome-desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-desktop-download-http
-           "&gnome-download-http;/gnome-desktop/&gnome-44;/gnome-desktop-&gnome-desktop-version;.tar.xz">
-  <!ENTITY gnome-desktop-download-ftp  " ">
-  <!ENTITY gnome-desktop-md5sum        "1f0b7281e462d6dfc8d3888fdaafd2ba">
-  <!ENTITY gnome-desktop-size          "748 KB">
-  <!ENTITY gnome-desktop-buildsize     "22 MB">
-  <!ENTITY gnome-desktop-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-desktop" xreflabel="gnome-desktop-&gnome-desktop-version;">
-  <?dbhtml filename="gnome-desktop.html"?>
-
-
-  <title>gnome-desktop-&gnome-desktop-version;</title>
-
-  <indexterm zone="gnome-desktop">
-    <primary sortas="a-gnome-desktop">gnome-desktop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Desktop</title>
-
-    <para>
-      The <application>GNOME Desktop</application> package contains a library
-      that provides an API shared by several applications on the
-      <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-desktop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-desktop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-desktop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-desktop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-desktop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-desktop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Desktop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="xkeyboard-config"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bubblewrap"/> (needed for thumbnailers in Nautilus) and
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Desktop</title>
-
-    <para>
-      Install <application>GNOME Desktop</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <!--<para>
-      To test the results, run <command>ninja test</command> from a X Terminal
-      or similar. One test, <filename>wallclock-reftest</filename>, is known to
-      fail due to a difference in expecations in the he_IL.UTF-8 locale.
-    </para>-->
-    <!-- This failure is known upstream and seems to be due to a translation
-         update for the Hebrew translation. See
-         https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/149 and
-         https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/70/
-    For some reason, I cannot replicate this on my gcc-10 system.-->
-    <para>
-      This package does not come with a test suite.
-      <!-- "no tests defined." -->
-    </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"/>
-
-<!-- no longer valid with 43
-    <para>
-      <option>-Dgnome_distributor="Some Name"</option>: Use this
-      parameter to supply a custom name in the <quote>Distributor:</quote>
-      field of the <quote>GNOME About</quote> display window.
-    </para>
--->
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this
-      parameter if you wish to build the API documentation.
-    </para>
-
-    <para>
-      <option>-Dinstalled_tests=true</option>: Use this
-      parameter you wish to enable the installed tests.
-    </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>
-          libgnome-bg-4.so,
-          libgnome-desktop-3.so,
-          libgnome-desktop-4.so, and
-          libgnome-rr-4.so
-        </seg>
-        <seg>
-          /usr/include/gnome-desktop-3.0,
-          /usr/include/gnome-desktop-4.0,
-          /usr/libexec/gnome-desktop-debug,
-          /usr/share/gtk-doc/html/gnome-desktop3 (optional), and
-          /usr/share/help/*/{fdl,gpl,lgpl}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnome-desktop-3">
-        <term><filename class="libraryfile">libgnome-desktop-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions shared by several <application>GNOME</application>
-            applications
-          </para>
-          <indexterm zone="gnome-desktop libgnome-desktop-3">
-            <primary sortas="c-libgnome-desktop-3">libgnome-desktop-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-keyring.xml
===================================================================
--- gnome/platform/gnome-keyring.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-keyring-download-http
-           "&gnome-download-http;/gnome-keyring/&gnome-46;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-download-ftp  " ">
-  <!ENTITY gnome-keyring-md5sum        "f0e5c53046aa337c1abdfee4368535c4">
-  <!ENTITY gnome-keyring-size          "1.3 MB">
-  <!ENTITY gnome-keyring-buildsize     "139 MB">
-  <!ENTITY gnome-keyring-time          "0.2 SBU (Using parallelism=4; add 0.2 SBU for tests)">
-]>
-
-<sect1 id="gnome-keyring" xreflabel="gnome-keyring-&gnome-keyring-version;">
-  <?dbhtml filename="gnome-keyring.html"?>
-
-
-  <title>gnome-keyring-&gnome-keyring-version;</title>
-
-  <indexterm zone="gnome-keyring">
-    <primary sortas="a-gnome-keyring">gnome-keyring</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Keyring</title>
-
-    <para>
-      The <application>GNOME Keyring</application> package contains a
-      daemon that keeps passwords and other secrets for users.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-keyring-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-keyring-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-keyring-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-keyring-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-keyring-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-keyring-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Keyring Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/> and
-      <xref linkend="gcr"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="openssh"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnupg2"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>, and
-      <ulink url="https://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Keyring</title>
-
-    <para>
-      Install <application>GNOME Keyring</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's:"/desktop:"/org:' schema/*.xml &amp;&amp;
-
-./configure --prefix=/usr      \
-            --sysconfdir=/etc  \
-            --enable-ssh-agent &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      A session bus address is necessary to run the tests. To test the results,
-      issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... schema/*.xml</command>:  This command fixes a
-      deprecated entry in the schema template.
-    </para>
-
-    <para>
-      <parameter>--enable-ssh-agent</parameter>: This switch enables the SSH
-      agent built in to gnome-keyring instead of the one in GCR. This is done
-      due to bugs in gcr which cause the agent to not work correctly.
-      <!--https://bugzilla.redhat.com/show_bug.cgi?id=2250704-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-keyring (symlink), gnome-keyring-3, and gnome-keyring-daemon
-        </seg>
-        <seg>
-          gnome-keyring-pkcs11.so (PKCS#11 module) and
-          pam_gnome_keyring.so (PAM module)
-        </seg>
-        <seg>
-          /usr/lib/gnome-keyring and
-          /usr/share/xdg-desktop-portal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-keyring-daemon">
-        <term><command>gnome-keyring-daemon</command></term>
-        <listitem>
-          <para>
-            is a session daemon that keeps passwords for users
-          </para>
-          <indexterm zone="gnome-keyring gnome-keyring-daemon">
-            <primary sortas="b-gnome-keyring-daemon">gnome-keyring-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-menus.xml
===================================================================
--- gnome/platform/gnome-menus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-menus-download-http
-           "&gnome-download-http;/gnome-menus/&gnome-minor-36;/gnome-menus-&gnome-menus-version;.tar.xz">
-  <!ENTITY gnome-menus-download-ftp  " ">
-  <!ENTITY gnome-menus-md5sum        "a8fd71fcf31a87fc799d80396a526829">
-  <!ENTITY gnome-menus-size          "492 KB">
-  <!ENTITY gnome-menus-buildsize     "8.5 MB">
-  <!ENTITY gnome-menus-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-menus" xreflabel="gnome-menus-&gnome-menus-version;">
-  <?dbhtml filename="gnome-menus.html"?>
-
-
-  <title>gnome-menus-&gnome-menus-version;</title>
-
-  <indexterm zone="gnome-menus">
-    <primary sortas="a-gnome-menus">gnome-menus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Menus</title>
-
-    <para>
-      The <application>GNOME Menus</application> package contains an
-      implementation of the draft
-      <ulink url="https://www.freedesktop.org/Standards/menu-spec">
-      Desktop Menu Specification</ulink> from freedesktop.org. It also
-      contains the <application>GNOME</application> menu layout configuration
-      files and <filename>.directory</filename> files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-menus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-menus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-menus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-menus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-menus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-menus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Menus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Menus</title>
-
-    <!-- It's been three minor versions of GNOME since this was put in.
-         Let's comment it out for now.
-    <note>
-      <para>
-        If you are upgrading from GNOME-3.28.x or GNOME-3.30.x, a command
-        must be run to reset the menu structure. This is due to a major change
-        involving <application>Sundry</application> application folder removal.
-        If you are upgrading, run the following command (as root), and then
-        log in and out of your session.
-      </para>
-
-<screen role="nodump"><userinput>gsettings reset-recursively org.gnome.desktop.app-folders</userinput></screen></note>
-    -->
-
-    <para>
-      Install <application>GNOME Menus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgnome-menu-3.so
-        </seg>
-        <seg>
-          /etc/xdg/menus,
-          /usr/include/gnome-menus-3.0, and
-          /usr/share/desktop-directories
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnome-menu-3">
-        <term><filename class="libraryfile">libgnome-menu-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions required to support
-            <application>GNOME</application>'s implementation of the
-            Desktop Menu Specification
-          </para>
-          <indexterm zone="gnome-menus libgnome-menu-3">
-            <primary sortas="c-libgnome-menu-3">libgnome-menu-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-online-accounts.xml
===================================================================
--- gnome/platform/gnome-online-accounts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,240 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-online-accounts-download-http
-           "&gnome-download-http;/gnome-online-accounts/&gnome-minor-50;/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-download-ftp  " ">
-  <!ENTITY gnome-online-accounts-md5sum        "f28ddf850689a9f3f646e3ae0dbb8b03">
-  <!ENTITY gnome-online-accounts-size          "396 KB">
-  <!ENTITY gnome-online-accounts-buildsize     "14 MB">
-  <!ENTITY gnome-online-accounts-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-online-accounts" xreflabel="gnome-online-accounts-&gnome-online-accounts-version;">
-  <?dbhtml filename="gnome-online-accounts.html"?>
-
-
-  <title>gnome-online-accounts-&gnome-online-accounts-version;</title>
-
-  <indexterm zone="gnome-online-accounts">
-    <primary sortas="a-gnome-online-accounts">gnome-online-accounts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Online Accounts</title>
-
-    <para>
-      The <application>GNOME Online Accounts</application> package contains a
-      framework used to access the user's online accounts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-online-accounts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-online-accounts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-online-accounts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-online-accounts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-online-accounts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-online-accounts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Online Accounts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gcr4"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="rest"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="mitkrb"/>, and
-      <xref linkend="valgrind"/>
-      <!-- <ulink url="https://gitlab.com/accounts-sso/libaccounts-glib">libaccounts-glib</ulink>, and
-      <ulink url="https://launchpad.net/account-plugins">account-plugins</ulink> -->
-
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Online Accounts</title>
-
-    <note>
-      <para>
-        <!-- Taken from Arch Linux - an immensely helpful link - Thanks -->
-        The Google API Key and OAuth tokens 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="https://www.chromium.org/developers/how-tos/api-keys"/>.
-        <!-- 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>
-
-    <para>
-      Install <application>GNOME Online Accounts</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup                                           \
-      --prefix=/usr                                   \
-      --buildtype=release                             \
-      -Dkerberos=false                                \
-      -Dgoogle_client_secret=5ntt6GbbkjnTVXx-MSxbmx5e \
-      -Dgoogle_client_id=595013732528-llk8trb03f0ldpqq6nprjp1s79596646.apps.googleusercontent.com \
-      .. &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"/>
-
-    <para>
-      <parameter>-Dgoogle_*</parameter>: These switches set the
-      BLFS OAuth ID and secret for Google services.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and you wish to generate
-      the API documentation.
-    </para>
-
-    <para>
-      <option>-Dkerberos=true</option>: Use this switch if you have
-      installed <xref linkend="mitkrb" role="nodep"/> and wish to use it with
-      <application>GNOME Online Accounts</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          goa-daemon and goa-identity-service (library executables)
-        </seg>
-        <seg>
-          libgoa-1.0.so and libgoa-backend-1.0.so
-        </seg>
-        <seg>
-          /usr/include/goa-1.0,
-          /usr/lib/goa-1.0, and
-          /usr/share/gtk-doc/html/goa (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="goa-daemon">
-        <term><command>goa-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME Online Accounts</application> Daemon
-          </para>
-          <indexterm zone="gnome-online-accounts goa-daemon">
-            <primary sortas="b-goa-daemon">goa-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgoa-1">
-        <term><filename class="libraryfile">libgoa-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GNOME Online Accounts</application>
-            API functions
-          </para>
-          <indexterm zone="gnome-online-accounts libgoa-1">
-            <primary sortas="c-libgoa-1">libgoa-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgoa-backend-1.0">
-        <term><filename class="libraryfile">libgoa-backend-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <application>GNOME Online Accounts</application>
-            backends
-          </para>
-          <indexterm zone="gnome-online-accounts libgoa-backend-1.0">
-            <primary sortas="c-libgoa-backend-1.0">libgoa-backend-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-session.xml
===================================================================
--- gnome/platform/gnome-session.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,308 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-session-download-http
-           "&gnome-download-http;/gnome-session/&gnome-46;/gnome-session-&gnome-session-version;.tar.xz">
-  <!ENTITY gnome-session-download-ftp  " ">
-  <!ENTITY gnome-session-md5sum        "f68f71cb53d650916f9ef9cb6076f643">
-  <!ENTITY gnome-session-size          "476 KB">
-  <!ENTITY gnome-session-buildsize     "14 MB">
-  <!ENTITY gnome-session-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;">
-  <?dbhtml filename="gnome-session.html"?>
-
-
-  <title>gnome-session-&gnome-session-version;</title>
-
-  <indexterm zone="gnome-session">
-    <primary sortas="a-gnome-session">gnome-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Session</title>
-
-    <para>
-      The <application>GNOME Session</application> package contains
-      the <application>GNOME</application> session manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="mesa"/>,
-      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/>
-      (runtime),</phrase>
-      and <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>, and
-      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build the documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Session</title>
-
-    <para>
-      When running GNOME under <xref linkend="wayland"/>, environment settings
-      are not imported for the user using the system profile. The Wayland
-      developers are currently undecided on a standard method to provide system
-      environment settings for user sessions. To work around this limitation,
-      execute the following command to make
-      <command>gnome-session</command> use a login shell:
-    </para>
-
-<screen><userinput>sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in</userinput></screen>
-
-<!--
-    <para revision="sysv">
-      Adapt meson.build so that gnome-session can build without systemd:
-    </para>
-
-<screen revision="sysv"><userinput remap="pre">sed -i "/  systemd_dep/,+3d;/if enable_systemd/a \    systemd_userunitdir = '/tmp\'" meson.build</userinput></screen>
--->
-    <para>
-      Install <application>GNOME Session</application> by
-      running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr             \
-            --buildtype=release       \
-            -Dsystemd_journal=false   \
-            -Dsystemduserunitdir=/tmp \
-            ..                        &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-<!-- For some reason, there are I/O errors with the DTD @ freedesktop
-     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>
-      This package creates two Xorg based <filename>.desktop</filename> files
-      in the <filename class="directory">/usr/share/xsessions/</filename>
-      directory, and two Wayland based <filename>.desktop</filename> files in
-      the <filename class="directory">/usr/share/wayland-sessions/</filename>
-      directory.  Only one is needed in each directory on a BLFS system, so
-      prevent the extra files showing up as options in a display manager.  As
-      the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -v /usr/share/xsessions/gnome.desktop &amp;&amp;
-rm -v /usr/share/wayland-sessions/gnome.desktop</userinput></screen>
-
-    <para revision="sysv">
-      Now, as the <systemitem class="username">root</systemitem> user,
-      remove systemd units that are useless on SysV systems:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rv /tmp/{*.d,*.target,*.service}</userinput></screen>
-
-<!-- this part is not needed on systemd, since the dbus session is created
-by systemd-user.-->
-    <para revision="sysv">
-      The startup sequence of gnome-wayland needs to create a dbus session.
-      On SysV, this has to be added to the shipped
-      <filename>gnome-wayland.desktop</filename> file, which is written for
-      systemd. As the &root; user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>sed -e 's@^Exec=@&amp;/usr/bin/dbus-run-session @' \
-    -i /usr/share/wayland-sessions/gnome-wayland.desktop</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 revision="sysv">
-      <parameter>-Dsystemd_journal=false</parameter>
-      and <parameter>-Dsystemduserunitdir=/tmp</parameter>: Allow building
-      with elogind support on a SysV based system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="starting">
-    <title>Starting GNOME</title>
-
-    <para>
-      The easiest way to start GNOME is to use a display manager.
-      <xref linkend="gdm"/> is the recommended display manager.
-    </para>
-
-    <para>
-      It is also possible to start <application>GNOME</application> from the
-      command line. However, you must still have <xref linkend="gdm"/> installed
-      for some portions of the desktop to work. One reason to start from the
-      command line is if you want Wayland support on a system that has the
-      proprietary NVIDIA driver installed, since GDM will not show the Wayland
-      session type on such a system.
-    </para>
-
-    <para>
-      To start <application>GNOME</application> using
-      <xref role="nodep" linkend="xinit"/>, run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>dbus-run-session gnome-session</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      Alternatively, to start <application>GNOME</application> with Wayland
-      support, run the following command:
-    </para>
-
-<screen role="nodump"><userinput>XDG_SESSION_TYPE=wayland dbus-run-session gnome-session</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-session, gnome-session-inhibit, and gnome-session-quit
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/gnome-session-&gnome-session-version; and
-          /usr/share/gnome-session
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-session-prog">
-        <term><command>gnome-session</command></term>
-        <listitem>
-          <para>
-            is used to start up the <application>GNOME</application>
-            Desktop environment
-          </para>
-          <indexterm zone="gnome-session gnome-session-prog">
-            <primary sortas="b-gnome-session">gnome-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-session-inhibit">
-        <term><command>gnome-session-inhibit</command></term>
-        <listitem>
-          <para>
-            is used to inhibit certain <application>GNOME</application>
-            Session functionality while executing the given command
-          </para>
-          <indexterm zone="gnome-session gnome-session-inhibit">
-            <primary sortas="b-gnome-session-inhibit">gnome-session-inhibit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-session-quit">
-        <term><command>gnome-session-quit</command></term>
-        <listitem>
-          <para>
-            is used to end the <application>GNOME</application> Session
-          </para>
-          <indexterm zone="gnome-session gnome-session-quit">
-            <primary sortas="b-gnome-session-quit">gnome-session-quit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-settings-daemon.xml
===================================================================
--- gnome/platform/gnome-settings-daemon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,274 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-settings-daemon-download-http
-           "&gnome-download-http;/gnome-settings-daemon/&gnome-46;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.xz">
-  <!ENTITY gnome-settings-daemon-download-ftp  " ">
-  <!ENTITY gnome-settings-daemon-md5sum        "408d4fc18cf6971828ff957e052ce4dd">
-  <!ENTITY gnome-settings-daemon-size          "1.4 MB">
-  <!ENTITY gnome-settings-daemon-buildsize     "35 MB">
-  <!ENTITY gnome-settings-daemon-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="gnome-settings-daemon" xreflabel="gnome-settings-daemon-&gnome-settings-daemon-version;">
-  <?dbhtml filename="gnome-settings-daemon.html"?>
-
-
-  <title>gnome-settings-daemon-&gnome-settings-daemon-version;</title>
-
-  <indexterm zone="gnome-settings-daemon">
-    <primary sortas="a-gnome-settings-daemon">gnome-settings-daemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Settings Daemon</title>
-
-    <para>
-      The <application>GNOME Settings Daemon</application> is responsible
-      for setting various parameters of a <application>GNOME Session</application>
-      and the applications that run under it.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-settings-daemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-settings-daemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-settings-daemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-settings-daemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-settings-daemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-settings-daemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (required for running the test suite):
-          <ulink url="&patch-root;/gnome-settings-daemon-&gnome-settings-daemon-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GNOME Settings Daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="colord"/>,
-      <xref linkend="fontconfig"/>,
-      <xref linkend="gcr4"/>,
-      <xref linkend="geoclue2"/>,
-      <xref linkend="geocode-glib"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libgweather"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="libwacom"/>,
-      <xref linkend="pulseaudio"/>,
-      and <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="nss"/>, and
-      <xref linkend="wayland"/>
-    </para>
-
-    <note>
-      <para>
-        Recommended dependencies are not strictly required for
-        this package to build and function, but you may not get
-        expected results at runtime if you don't install them.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4"
-                revision="sysv">Recommended (Runtime)</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="blocaled" role="runtime"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnome-session"/>,
-      <xref linkend="mutter"/>,
-      <xref linkend="python-dbusmock"/>,
-      <xref linkend="umockdev"/>, and
-      <command>Xvfb</command> (for tests, from
-      <xref linkend="xorg-server"/> or
-      <xref role="nodep" linkend="xwayland"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Settings Daemon</title>
-
-<!--
-    <para>
-      First, fix building with recent versions of
-      <application>meson</application>:
-    </para>
-
-<screen><userinput>sed "/  policy,/d" -i plugins/{power,wacom}/meson.build</userinput></screen>
--->
-
-    <para revision="sysv">
-      Next, fix libelogind detection for tests:
-    </para>
-
-<screen revision="sysv"><userinput>sed -e 's/libsystemd/libelogind/' \
-    -i plugins/power/test.py</userinput></screen>
-
-    <para revision="sysv">
-       Next, fix backlight functionality in gnome-control-center:
-    </para>
-
-<screen revision="sysv"><userinput>sed -e 's/(backlight->logind_proxy)/(0)/' \
-    -i plugins/power/gsd-backlight.c</userinput></screen>
-
-<!--
-    <para>
-      If running the test suite, apply a patch to fix test timeouts
-      with python-dbusmock 0.30.0 or later:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../gnome-settings-daemon-&gnome-settings-daemon-version;-testsuite_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GNOME Settings Daemon</application> by running the
-      following commands:
-    </para>
-
-<screen revision='sysv'><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dsystemd=false     \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision='systemd'><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <!-- [renodr, June 29th, 2019]: for some reason, on elogind, all tests
-         passed. 8 failed on systemd. It could be kernel configuration, or
-         any other package change. umockdev might be needed, but it works
-         fine without it on elogind.
-         [pierre, July 31st, 2020]: only one test passed on elogind. I
-         have umockdev, but it does not look like it is used. Adding the
-         sed allows 9 tests out of 10 to pass. -->
-    <para>
-      To check the results, execute: <command>ninja test</command>. Note that
-      you must have <application>python-dbusmock</application> installed in
-      order for the tests to complete successfully. Some tests
-      may fail depending on the init system in use.
-    </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>
-          libgsd.so
-        </seg>
-        <seg>
-          /etc/xdg/Xwayland-session.d,
-          /usr/include/gnome-settings-daemon-46,
-          /usr/lib/gnome-settings-daemon-46, and
-          /usr/share/gnome-settings-daemon
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!-- For version 3.34, there is nothing in /usr/bin but there are a lot
-     of support programs in /usr/libexec.  In NEWS:
-
-     Removed daemon, everything is now implemented in mutter
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-settings-daemon-prog">
-        <term><command>gnome-settings-daemon</command></term>
-        <listitem>
-          <para>
-            is responsible for setting the various preference parameters of
-            a <application>GNOME</application> session and the applications
-            that run under it.
-          </para>
-          <indexterm zone="gnome-settings-daemon gnome-settings-daemon-prog">
-            <primary sortas="b-gnome-settings-daemon">gnome-settings-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-shell-extensions.xml
===================================================================
--- gnome/platform/gnome-shell-extensions.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-shell-extensions-download-http
-           "&gnome-download-http;/gnome-shell-extensions/&gnome-46;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
-  <!ENTITY gnome-shell-extensions-download-ftp  " ">
-  <!ENTITY gnome-shell-extensions-md5sum        "acb8af32c832fabf613c08e833dd195b">
-  <!ENTITY gnome-shell-extensions-size          "204 KB">
-  <!ENTITY gnome-shell-extensions-buildsize     "3.6 MB">
-  <!ENTITY gnome-shell-extensions-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-shell-extensions" xreflabel="gnome-shell-extensions-&gnome-shell-extensions-version;">
-  <?dbhtml filename="gnome-shell-extensions.html"?>
-
-
-  <title>gnome-shell-extensions-&gnome-shell-extensions-version;</title>
-
-  <indexterm zone="gnome-shell-extensions">
-    <primary sortas="a-gnome-shell-extensions">gnome-shell-extensions</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Shell Extensions</title>
-
-    <para>
-      The <application>GNOME Shell Extensions</application> package contains
-      a collection of extensions providing additional and optional
-      functionality to the <application>GNOME Shell</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-shell-extensions-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-shell-extensions-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-shell-extensions-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-shell-extensions-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-shell-extensions-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-shell-extensions-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnome-shell-extensions-&gnome-shell-extensions-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GNOME Shell Extensions Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgtop"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sassc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Shell Extensions</title>
-
-<!--
-    <para>
-      First, fix a crash when using the Workspace Indicator extension:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gnome-shell-extensions-&gnome-shell-extensions-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GNOME Shell Extensions</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr .. </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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-       <seg>
-          None
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-shell/extensions
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,267 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/&gnome-46;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-download-ftp  " ">
-  <!ENTITY gnome-shell-md5sum        "56c2bf53f35792430ff0acd08ddb4047">
-  <!ENTITY gnome-shell-size          "1.9 MB">
-  <!ENTITY gnome-shell-buildsize     "61 MB (with tests)">
-  <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;">
-  <?dbhtml filename="gnome-shell.html"?>
-
-
-  <title>gnome-shell-&gnome-shell-version;</title>
-
-  <indexterm zone="gnome-shell">
-    <primary sortas="a-gnome-shell">gnome-shell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Shell</title>
-
-    <para>
-      The <application>GNOME Shell</application> is the core user interface of
-      the <application>GNOME</application> Desktop environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-shell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-shell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-shell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-shell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-shell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-shell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Shell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gcr4"/>,
-      <xref linkend="gjs"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="ibus"/>,
-      <xref linkend="mutter"/>,
-      <xref linkend="polkit"/>,
-      <xref linkend="sassc"/>, and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="gnome-autoar"/>,
-      <xref linkend="gnome-bluetooth"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="NetworkManager"/>, and
-      <xref linkend="power-profiles-daemon"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/scop/bash-completion">bash-completion</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="adwaita-icon-theme"/>,
-      <xref role="runtime" linkend="dconf"/>,
-      <phrase revision="sysv">
-        <xref role='runtime' linkend="elogind"/>,
-      </phrase>
-      <xref role="runtime" linkend="gdm"/>,
-      <xref role="runtime" linkend="gnome-backgrounds"/>,
-      <xref role="runtime" linkend="gnome-control-center"/>,
-      <xref role="runtime" linkend="gnome-menus"/>,
-      <xref role="runtime" linkend="libgweather"/>,
-      <phrase revision="sysv">and</phrase>
-      <phrase revision="systemd">
-        <xref role='runtime' linkend="systemd"/>, and
-      </phrase>
-      <xref role="runtime" linkend="telepathy-mission-control"/>
-    </para>
-
-    <bridgehead renderas="sect4"
-                revision="sysv">Recommended Runtime Dependency</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="blocaled" role="runtime"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Shell</title>
-
-    <para>
-      Install <application>GNOME Shell</application> by running the
-      following commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dsystemd=false     \
-            -Dtests=false       \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dtests=false       \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, you need to remove the
-      <parameter>-Dtests=false</parameter> switch, and to have <xref
-      linkend="mutter"/> compiled and installed with tests also.
-
-      To run the tests, issue: <command>ninja test</command>. You must be
-      running an X session to run the tests. Some will fail if <xref
-      linkend="gdm"/> is not installed. <phrase revision="sysv">Several
-      more tests may fail in the Sysv environment.</phrase>
-      <!-- "Failed to read monitors config file
-           '/home/xry111/.config/monitors.xml': Logical monitors not
-           adjacent"
-           The same thing happens in mutter but it's worked around with
-           HOME="".  We cannot use HOME="" here or more tests will fail.
-           We also cannot tell the users to remove monitors.xml because
-           doing so will purge their monitor settings.  Maybe we can
-           use bwrap to run the test with an empty tmpfs mounted on $HOME
-           in a separate namespace, but it's too overkill IMO.
-           DO NOT REMOVE unless you've tested with a "complex multi-monitor
-           configuration" (with mixed scaling settings and "strange"
-           positions of monitors). -->
-      One test named <filename>CSS styling support</filename> is known to
-      fail with some multi-monitor configurations.
-    </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 revision="sysv">
-      <command>patch ...</command>: This patch fixes a bug when trying to
-      start an xwayland application on non systemd.
-    </para>
--->
-
-    <para revision="sysv">
-      <parameter>-Dsystemd=false</parameter>: Prevents installing systemd
-      files, which are not needed in this version of BLFS.
-    </para>
-
-    <para>
-      <parameter>-Dtests=false</parameter>: Remove this switch if you want
-      to build the tests. But then <command>meson</command> will fail if
-      <xref linkend="mutter"/> tests are not installed.
-    </para>
-
-    <para>
-      <option>-Dextensions_tool=false</option>: This switch allows building
-      this package without <xref linkend='gnome-autoar'/> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-extensions, gnome-extensions-app, gnome-shell,
-          gnome-shell-extension-prefs, gnome-shell-extension-tool,
-          and gnome-shell-test-tool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-shell,
-          /usr/share/gnome-shell,
-          /usr/share/gtk-doc/html/{shell,st} (optional), and
-          /usr/share/xdg-desktop-portal/
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-shell-prog">
-        <term><command>gnome-shell</command></term>
-        <listitem>
-          <para>
-            provides the core user interface functions for the
-            <application>GNOME</application> Desktop
-          </para>
-          <indexterm zone="gnome-shell gnome-shell-prog">
-            <primary sortas="b-gnome-shell">gnome-shell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-tweaks.xml
===================================================================
--- gnome/platform/gnome-tweaks.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-tweaks-download-http
-           "&gnome-download-http;/gnome-tweaks/&gnome-46;/gnome-tweaks-&gnome-tweaks-version;.tar.xz">
-  <!ENTITY gnome-tweaks-download-ftp  " ">
-  <!ENTITY gnome-tweaks-md5sum        "3556cd4f3b201ec4d5c1be9611483b15">
-  <!ENTITY gnome-tweaks-size          "680 KB">
-  <!ENTITY gnome-tweaks-buildsize     "6.0 MB">
-  <!ENTITY gnome-tweaks-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-tweaks" xreflabel="gnome-tweaks-&gnome-tweaks-version;">
-  <?dbhtml filename="gnome-tweaks.html"?>
-
-
-  <title>gnome-tweaks-&gnome-tweaks-version;</title>
-
-  <indexterm zone="gnome-tweaks">
-    <primary sortas="a-gnome-tweaks">gnome-tweaks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Tweaks</title>
-
-    <para>
-      <application>GNOME Tweaks</application> is a simple program used
-      to tweak advanced <application>GNOME</application> settings.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-tweaks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-tweaks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-tweaks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-tweaks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-tweaks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-tweaks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnome-tweaks-&gnome-tweaks-version;-port_to_libhandy1-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GNOME Tweaks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="pygobject3"/>, and
-      <xref linkend="sound-theme-freedesktop"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Tweaks</title>
-
-<!--
-    <para>
-      First, port gnome-tweaks to libhandy-1.x:
-    </para>
-
-<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>
-      Next, fix building with newer versions of
-      <application>meson</application>:
-    </para>
-
-<screen><userinput>sed -i '/merge_file/s/(.*/(/' data/meson.build</userinput></screen>
--->
-    <para>
-      Install <application>GNOME Tweaks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-          gnome-tweaks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/gtweak and
-          /usr/share/gnome-tweaks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-tweaks-prog">
-        <term><command>gnome-tweaks</command></term>
-        <listitem>
-          <para>
-            is used to tweak advanced <application>GNOME</application>
-            settings
-          </para>
-          <indexterm zone="gnome-tweaks gnome-tweaks-prog">
-            <primary sortas="b-gnome-tweaks">gnome-tweaks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gnome-user-docs.xml
===================================================================
--- gnome/platform/gnome-user-docs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-user-docs-download-http
-           "&gnome-download-http;/gnome-user-docs/&gnome-46;/gnome-user-docs-&gnome-user-docs-version;.tar.xz">
-  <!ENTITY gnome-user-docs-download-ftp  " ">
-  <!ENTITY gnome-user-docs-md5sum        "2cbb3756788b5406cd7bbfdfbe3fbee7">
-  <!ENTITY gnome-user-docs-size          "13 MB">
-  <!ENTITY gnome-user-docs-buildsize     "165 MB">
-  <!ENTITY gnome-user-docs-time          "0.5 SBU (using parallelism=4)">
-]>
-
-<sect1 id="gnome-user-docs" xreflabel="gnome-user-docs-&gnome-user-docs-version;">
-  <?dbhtml filename="gnome-user-docs.html"?>
-
-
-  <title>gnome-user-docs-&gnome-user-docs-version;</title>
-
-  <indexterm zone="gnome-user-docs">
-    <primary sortas="a-gnome-user-docs">gnome-user-docs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME User Docs</title>
-
-    <para>
-      The <application>GNOME User Docs</application> package contains
-      documentation for <application>GNOME</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-user-docs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-user-docs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-user-docs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-user-docs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-user-docs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-user-docs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME User Docs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="itstool"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME User Docs</title>
-
-    <para>
-      Install <application>GNOME User Docs</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-       <seg>
-          None
-        </seg>
-       <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/gnome-help and
-          /usr/share/help/*/system-admin-guide
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/grilo.xml
===================================================================
--- gnome/platform/grilo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,245 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 grilo-download-http "&gnome-download-http;/grilo/0.3/grilo-&grilo-version;.tar.xz">
-  <!ENTITY grilo-download-ftp  " ">
-  <!ENTITY grilo-md5sum        "e81c4d7e182eb6448b9f0458f52511a3">
-  <!ENTITY grilo-size          "236 KB">
-  <!ENTITY grilo-buildsize     "13 MB (with tests)">
-  <!ENTITY grilo-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="grilo" xreflabel="Grilo-&grilo-version;">
-  <?dbhtml filename="grilo.html"?>
-
-
-  <title>Grilo-&grilo-version;</title>
-
-  <indexterm zone="grilo">
-    <primary sortas="a-Grilo">Grilo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo</title>
-
-    <para>
-      <application>Grilo</application> is a framework focused on making
-      media discovery and browsing easy for applications and application
-      developers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&grilo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&grilo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &grilo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &grilo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &grilo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &grilo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libsoup3"/>,
-      <xref linkend="totem-pl-parser"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="liboauth"/>, and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo</title>
-<!--
-    <para>
-      First, fix a build failure introduced by an API change in
-      <application>totem-pl-parser</application>:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/TOTEM_IS_PL_PARSER/TOTEM_PL_IS_PARSER/' libs/pls/grl-pls.c</userinput></screen>
--->
-    <para>
-      Install <application>Grilo</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build    &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            -Denable-gtk-doc=false \
-            ..                     &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Denable-gtk-doc=false</parameter>: This option disables
-      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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>grilo-test-ui-0.3, grl-inspect-0.3 and grl-launch-0.3</seg>
-        <seg>libgrilo-0.3.so, libgrlnet-0.3.so and libgrlpls-0.3.so</seg>
-        <seg>/usr/include/grilo-0.3</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grilo-test-ui">
-        <term><command>grilo-test-ui-0.3</command></term>
-        <listitem>
-          <para>
-            is a simple playground application that you can use to test the
-            framework and its plugins
-          </para>
-          <indexterm zone="grilo grilo-test-ui">
-            <primary sortas="b-grilo-test-ui">grilo-test-ui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grl-inspect">
-        <term><command>grl-inspect-0.3</command></term>
-        <listitem>
-          <para>
-            is a tool that prints out information on available Grilo sources
-          </para>
-          <indexterm zone="grilo grl-inspect">
-            <primary sortas="b-grl-inspect">grl-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grl-launch">
-        <term><command>grl-launch-0.3</command></term>
-        <listitem>
-          <para>
-            is a tool to run <application>Grilo</application> operations
-            from command line
-          </para>
-          <indexterm zone="grilo grl-launch">
-            <primary sortas="b-grl-launch">grl-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrilo">
-        <term><filename class="libraryfile">libgrilo.so</filename></term>
-        <listitem>
-          <para>
-            provides the Grilo framework
-          </para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrilo">libgrilo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrlnet">
-        <term><filename class="libraryfile">libgrlnet.so</filename></term>
-        <listitem>
-          <para>
-            provides Grilo networking helpers for plug-ins
-          </para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrlnet">libgrlnet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrlpls">
-        <term><filename class="libraryfile">libgrlpls.so</filename></term>
-        <listitem>
-          <para>
-            provides playlist handling functions
-          </para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrlpls">libgrlpls.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gsettings-desktop-schemas.xml
===================================================================
--- gnome/platform/gsettings-desktop-schemas.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gsettings-desktop-schemas-download-http
-           "&gnome-download-http;/gsettings-desktop-schemas/&gnome-46;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
-  <!ENTITY gsettings-desktop-schemas-download-ftp  " ">
-  <!ENTITY gsettings-desktop-schemas-md5sum        "b6363bdbf5a81ed42cb29a99dc88537f">
-  <!ENTITY gsettings-desktop-schemas-size          "752 KB">
-  <!ENTITY gsettings-desktop-schemas-buildsize     "20 MB">
-  <!ENTITY gsettings-desktop-schemas-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gsettings-desktop-schemas" xreflabel="gsettings-desktop-schemas-&gsettings-desktop-schemas-version;">
-  <?dbhtml filename="gsettings-desktop-schemas.html"?>
-
-
-  <title>gsettings-desktop-schemas-&gsettings-desktop-schemas-version;</title>
-
-  <indexterm zone="gsettings-desktop-schemas">
-    <primary sortas="a-gsettings-desktop-schemas">gsettings-desktop-schemas</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GSettings Desktop Schemas</title>
-
-    <para>
-      The <application>GSettings Desktop Schemas</application> package
-      contains a collection of GSettings schemas for settings shared by various
-      components of a <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gsettings-desktop-schemas-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gsettings-desktop-schemas-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gsettings-desktop-schemas-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gsettings-desktop-schemas-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gsettings-desktop-schemas-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gsettings-desktop-schemas-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GSettings Desktop Schemas Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GSettings Desktop Schemas</title>
-
-    <para>
-      Install <application>GSettings Desktop Schemas</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gsettings-destdir.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed ... schemas/*.in</command>:  This command fixes some
-        deprecated entries in the schema templates.
-      </para>
-
-      <!-- See about removing this at 8.5-rc1. -->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/gsettings-desktop-schemas and
-          /usr/share/GConf/gsettings
-       </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/gsound.xml
===================================================================
--- gnome/platform/gsound.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gsound-download-http "&gnome-download-http;/gsound/1.0/gsound-&gsound-version;.tar.xz">
-  <!ENTITY gsound-download-ftp  " ">
-  <!ENTITY gsound-md5sum        "7338c295034432a6e782fd20b3d04b68">
-  <!ENTITY gsound-size          "24 KB">
-  <!ENTITY gsound-buildsize     "864 KB">
-  <!ENTITY gsound-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gsound" xreflabel="gsound-&gsound-version;">
-  <?dbhtml filename="gsound.html"?>
-
-
-  <title>GSound-&gsound-version;</title>
-
-  <indexterm zone="gsound">
-    <primary sortas="a-gsound">gsound</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GSound</title>
-
-    <para>
-      The <application>gsound</application> package contains a small
-      library for playing system sounds.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gsound-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gsound-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gsound-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gsound-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gsound-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gsound-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <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">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for generating documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GSound</title>
-
-    <para>
-      Install <application>gsound</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-          gsound-play
-        </seg>
-        <seg>
-          libgsound.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/gsound
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsound-play">
-        <term><command>gsound-play</command></term>
-        <listitem>
-          <para>
-            plays system sounds through the libgsound interface
-          </para>
-          <indexterm zone="gsound gsound-play">
-            <primary sortas="b-gsound-play">gsound-play</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsound">
-        <term><filename class="libraryfile">libgsound.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for playing system sounds
-          </para>
-          <indexterm zone="gsound libgsound">
-            <primary sortas="c-libgsound">libgsound.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,270 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gvfs-download-http "&gnome-download-http;/gvfs/1.54/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-download-ftp  " ">
-  <!ENTITY gvfs-md5sum        "f2c1db236533c19cb3c3e0a468aac59a">
-  <!ENTITY gvfs-size          "1.2 MB">
-  <!ENTITY gvfs-buildsize     "29 MB">
-  <!ENTITY gvfs-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="gvfs" xreflabel="Gvfs-&gvfs-version;">
-  <?dbhtml filename="gvfs.html"?>
-
-
-  <title>Gvfs-&gvfs-version;</title>
-
-  <indexterm zone="gvfs">
-    <primary sortas="a-Gvfs">Gvfs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gvfs</title>
-
-    <para>
-      The <application>Gvfs</application> package is a userspace virtual
-      filesystem designed to work with the I/O abstractions of GLib's GIO
-      library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gvfs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gvfs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gvfs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gvfs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gvfs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gvfs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gvfs-&gvfs-version;-fix_security_vulnerabilities-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Gvfs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gcr4"/>,
-      <xref linkend="libusb"/>, and
-      <xref linkend="libsecret"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libcdio"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libsoup3"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <phrase revision="systemd"><xref role='runtime' linkend="systemd"/>
-      (runtime),</phrase> and
-      <xref linkend="udisks2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/>,
-      <xref linkend="avahi"/>,
-      <xref linkend="bluez"/>,
-      <xref linkend="fuse3"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libgdata"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openssh"/>,
-      <xref linkend="samba"/>,
-      <ulink url="&gnome-download-http;/gnome-desktop-testing/">gnome-desktop-testing</ulink> (for tests),
-      <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
-      <ulink url="https://www.libimobiledevice.org/">libimobiledevice</ulink>,
-      <ulink url="https://gitlab.gnome.org/GNOME/msgraph">libmsgraph</ulink>,
-      <ulink url="https://libmtp.sourceforge.net/">libmtp</ulink>,
-      <ulink url="https://github.com/sahlberg/libnfs/">libnfs</ulink>, and
-      <ulink url="https://twisted.org/">Twisted</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gvfs</title>
-
-    <para>
-      Install <application>Gvfs</application> by running the following
-      commands:
-    </para>
-
-<screen revision='sysv'><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup               \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Donedrive=false    \
-      -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>
-
-<screen revision='systemd'><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup               \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Donedrive=false    \
-      -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>
-
-    <para>
-      The test suite requires <application>gnome-desktop-testing</application>,
-      which is beyond the scope of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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"/>
-
-    <para>
-      <parameter>-D&lt;option&gt;=false</parameter>: These switches are
-      required if the corresponding dependency is not installed.
-      Remove those where you have installed the corresponding application and
-      wish to use it with <application>Gvfs</application>. The dnssd option
-      requires avahi and both goa and google require GNOME Online Accounts.
-      The google option also requires libgdata. The onedrive support requires
-      the libmsgraph package.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dtmpfilesdir=no</parameter>
-      <parameter>-Dsystemduserunitdir=no</parameter>: These
-      switches provide systemd directory locations. Setting them to
-      <quote>no</quote> disables the dependency on systemd and logind.
-    </para>
-
-    <para>
-      <option>-Dcdda=false</option>: This switch is required if libcdio is not
-      installed. The cdda backend is useless on machines without a CDROM/DVD
-      drive.
-    </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>
-          libgvfscommon.so,
-          libgvfsdaemon.so and
-          some under /usr/lib/gio/modules/
-        </seg>
-        <seg>
-          /usr/include/gvfs-client and
-          /usr/{lib,share}/gvfs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgvfscommon">
-        <term><filename class="libraryfile">libgvfscommon.so</filename></term>
-        <listitem>
-          <para>
-            contains the common API functions used in
-            <application>Gvfs</application> programs
-          </para>
-          <indexterm zone="gvfs libgvfscommon">
-            <primary sortas="c-libgvfscommon">libgvfscommon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libgdata.xml
===================================================================
--- gnome/platform/libgdata.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgdata-download-http "&gnome-download-http;/libgdata/0.18/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-download-ftp  " ">
-  <!ENTITY libgdata-md5sum        "92b058d1a0af5d1b96c86c21820f1eff">
-  <!ENTITY libgdata-size          "832 KB">
-  <!ENTITY libgdata-buildsize     "54 MB (with tests)">
-  <!ENTITY libgdata-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="libgdata" xreflabel="libgdata-&libgdata-version;">
-  <?dbhtml filename="libgdata.html"?>
-
-
-  <title>libgdata-&libgdata-version;</title>
-
-  <indexterm zone="libgdata">
-    <primary sortas="a-libgdata">libgdata</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgdata</title>
-
-    <para>
-      The <application>libgdata</application> package is a GLib-based
-      library for accessing online service APIs using the GData protocol, most
-      notably, Google's services. It provides APIs to access the common Google
-      services and has full asynchronous support.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgdata-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgdata-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgdata-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgdata-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgdata-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgdata-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgdata Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="json-glib"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gcr"/> and
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation),
-      <xref linkend="liboauth"/> (for OAuth v1 support), and
-      <xref linkend="uhttpmock"/> (required for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgdata</title>
-
-    <para>
-      Install <application>libgdata</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr              \
-            --buildtype=release        \
-            -Dgtk_doc=false            \
-            -Dalways_build_tests=false \
-            ..                         &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you wish to run the test suite, make sure
-      <xref linkend="uhttpmock"/> is installed and remove
-      <parameter>-Dalways_build_tests=false</parameter> in the
-      <command>meson</command> command line.  To test the results,
-      issue: <command>ninja test</command>. Note that
-      the tests need network access.
-    </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>-Dgtk_doc=false</parameter>: Remove this if you have
-      <xref linkend="gtk-doc"/> installed and want to rebuild the
-      documentation with it.
-    </para>
-    <para>
-      <option>-Doauth1=enabled</option>: Use this option if you wish to build
-      in support for OAuth v1. Note that you must have
-      <xref linkend="liboauth"/> installed in order to enable this option.
-    </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>
-          libgdata.so
-        </seg>
-        <seg>
-          /usr/include/libgdata and
-          /usr/share/gtk-doc/html/gdata
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdata-lib">
-        <term><filename class="libraryfile">libgdata.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgdata</application> API functions
-          </para>
-          <indexterm zone="libgdata libgdata-lib">
-            <primary sortas="c-libgdata">libgdata.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libgee.xml
===================================================================
--- gnome/platform/libgee.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgee-download-http "&gnome-download-http;/libgee/0.20/libgee-&libgee-version;.tar.xz">
-  <!ENTITY libgee-download-ftp  " ">
-  <!ENTITY libgee-md5sum        "8b9001f47e15ef7a1776ac1f5bb015a0">
-  <!ENTITY libgee-size          "676 KB">
-  <!ENTITY libgee-buildsize     "38 MB (with tests)">
-  <!ENTITY libgee-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="libgee" xreflabel="libgee-&libgee-version;">
-  <?dbhtml filename="libgee.html"?>
-
-
-  <title>libgee-&libgee-version;</title>
-
-  <indexterm zone="libgee">
-    <primary sortas="a-libgee">libgee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgee</title>
-
-    <para>
-      The <application>libgee</application> package is a collection library
-      providing GObject based interfaces and classes for commonly used data
-      structures.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgee-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgee-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgee-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgee-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgee-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgee-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgee Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="vala"/> (with Valadoc) and
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgee</title>
-
-    <para>
-      Install <application>libgee</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-    <!-- For some reason, the tests parallelize themselves and use all
-    cores available, regardless of prior settings in the environment.-->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgee-0.8.so
-        </seg>
-        <seg>
-          /usr/include/gee-0.8
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgee-lib">
-        <term><filename class="libraryfile">libgee-0.8.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgee</application> API functions
-          </para>
-          <indexterm zone="libgee libgee-lib">
-            <primary sortas="c-libgee-0.8">libgee-0.8.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libgtop.xml
===================================================================
--- gnome/platform/libgtop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgtop-download-http "&gnome-download-http;/libgtop/2.41/libgtop-&libgtop-version;.tar.xz">
-  <!ENTITY libgtop-download-ftp  " ">
-  <!ENTITY libgtop-md5sum        "465db9f4f695c298d9c48dcf7f32a9c0">
-  <!ENTITY libgtop-size          "740 KB">
-  <!ENTITY libgtop-buildsize     "19 MB">
-  <!ENTITY libgtop-time          "0.2 SBU">
-]>
-
-<sect1 id="libgtop" xreflabel="libgtop-&libgtop-version;">
-  <?dbhtml filename="libgtop.html"?>
-
-
-  <title>libgtop-&libgtop-version;</title>
-
-  <indexterm zone="libgtop">
-    <primary sortas="a-libgtop">libgtop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgtop</title>
-
-    <para>
-      The <application>libgtop</application> package contains the
-      <application>GNOME</application> top libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgtop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgtop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgtop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgtop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgtop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgtop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgtop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgtop</title>
-
-    <para>
-      Install <application>libgtop</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgtop_daemon2 and libgtop_server2
-        </seg>
-        <seg>
-          libgtop-2.0.so
-        </seg>
-        <seg>
-          /usr/include/libgtop-2.0 and
-          /usr/share/gtk-doc/html/libgtop
-       </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtop-2">
-        <term><filename class="libraryfile">libgtop-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow access to system
-            performance data
-          </para>
-          <indexterm zone="libgtop libgtop-2">
-            <primary sortas="c-libgtop-2">libgtop-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libgweather.xml
===================================================================
--- gnome/platform/libgweather.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgweather-download-http
-           "&gnome-download-http;/libgweather/&libgweather-minor;/libgweather-&libgweather-version;.tar.xz">
-  <!ENTITY libgweather-download-ftp  " ">
-  <!ENTITY libgweather-md5sum        "57ec40f5ac366b7d9757580913bf2e3b">
-  <!ENTITY libgweather-size          "2.7 MB">
-  <!ENTITY libgweather-buildsize     "98 MB (with tests)">
-  <!ENTITY libgweather-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;">
-  <?dbhtml filename="libgweather.html"?>
-
-
-  <title>libgweather-&libgweather-version;</title>
-
-  <indexterm zone="libgweather">
-    <primary sortas="a-libgweather">libgweather</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgweather</title>
-
-    <para>
-      The <application>libgweather</application> package is a library used
-      to access weather information from online services for numerous
-      locations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgweather-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgweather-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgweather-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgweather-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgweather-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgweather-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgweather Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="geocode-glib"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libsoup3"/>, and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> (gi-docgen is also provided as a meson
-      subproject, which will be used if <option>-Dgtk_doc=false</option>
-      is not passed to <command>meson</command>),
-      <xref linkend="llvm"/> (for clang-format), and
-      <ulink url="https://pypi.org/project/pylint/">pylint</ulink>
-    </para>
-
-    &test-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgweather</title>
-
-    <para>
-      Install <application>libgweather</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "s/libgweather_full_version/'libgweather-&libgweather-version;'/" \
-    -i ../doc/meson.build                             &amp;&amp;
-meson configure -Dgtk_doc=true                        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      One test needs that the locale files be installed on the system, so
-      it is better to run the tests after installing the package.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C ninja test</command>.
-    </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"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: &gi-doc-disable;
-    </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>
-          libgweather-4.so
-        </seg>
-        <seg>
-          /usr/lib/libgweather-4,
-          /usr/include/libgweather-4.0,
-          /usr/share/gtk-doc/html/libgweather-4.0 (optional), and
-          /usr/share/libgweather-4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgweather-4">
-        <term><filename class="libraryfile">libgweather-4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow for the retrieval of weather
-            information
-          </para>
-          <indexterm zone="libgweather libgweather-4">
-            <primary sortas="c-libgweather-4">libgweather-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libpeas.xml
===================================================================
--- gnome/platform/libpeas.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpeas-download-http "&gnome-download-http;/libpeas/1.36/libpeas-&libpeas-version;.tar.xz">
-  <!ENTITY libpeas-download-ftp  " ">
-  <!ENTITY libpeas-md5sum        "b3dd31a79c47af0cbf22f2d6bf52bc7d">
-  <!ENTITY libpeas-size          "192 KB">
-  <!ENTITY libpeas-buildsize     "10 MB (with tests)">
-  <!ENTITY libpeas-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libpeas" xreflabel="libpeas-&libpeas-version;">
-  <?dbhtml filename="libpeas.html"?>
-
-
-  <title>libpeas-&libpeas-version;</title>
-
-  <indexterm zone="libpeas">
-    <primary sortas="a-libpeas">libpeas</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpeas</title>
-
-    <para>
-      <application>libpeas</application> is a GObject based plugins
-      engine, and is targeted at giving every application the chance
-      to assume its own extensibility.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpeas-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpeas-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpeas-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpeas-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpeas-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpeas-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libpeas Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection; and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxml2"/> and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <ulink url="https://glade.gnome.org/">Glade</ulink>,
-      <ulink url="https://pypi.org/project/embed">embed</ulink>,
-      <ulink url="https://github.com/pavouk/lgi">LGI</ulink> (for LUA bindings,
-      built with LUA-5.1), with either
-      <ulink url="https://luajit.org/">luajit</ulink> or
-      <ulink url="https://www.lua.org/ftp/lua-5.1.5.tar.gz">LUA-5.1</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpeas</title>
-
-    <para>
-      Install <application>libpeas</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            --wrap-mode=nofallback \
-            ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/docs_dir =/s@\$@/ 'libpeas-&libpeas-version;'@" \
-    -i ../docs/reference/meson.build       &amp;&amp;
-meson configure -Dgtk_doc=true             &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      An active graphical session with bus address is necessary to
-      run the tests.
-    </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"/>
-
-    <!-- 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"/>
-
-    <para>
-      <option>-Dvapi=true</option>: Add this switch if you wish to
-      generate vapi (vala) data.
-    </para>
-
-    <para>
-      <option>-Ddemos=false</option>: Add this switch if you do not wish to
-      build the demo programs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          peas-demo
-        </seg>
-        <seg>
-          libpeas-1.0.so and libpeas-gtk-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libpeas-1.0,
-          /usr/lib/libpeas-1.0,
-          /usr/lib/peas-demo and
-          /usr/share/gtk-doc/html/libpeas (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="peas-demo">
-        <term><command>peas-demo</command></term>
-        <listitem>
-          <para>
-            is the Peas demo program
-          </para>
-          <indexterm zone="libpeas peas-demo">
-            <primary sortas="b-peas-demo">peas-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpeas-1">
-        <term><filename class="libraryfile">libpeas-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libpeas</application> API functions
-          </para>
-          <indexterm zone="libpeas libpeas-1">
-            <primary sortas="c-libpeas-1">libpeas-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpeas-gtk-1">
-        <term><filename class="libraryfile">libpeas-gtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libpeas</application>
-            <application>GTK+</application> widgets
-          </para>
-          <indexterm zone="libpeas libpeas-gtk-1">
-            <primary sortas="c-libpeas-gtk-1">libpeas-gtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libsecret.xml
===================================================================
--- gnome/platform/libsecret.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,243 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsecret-download-http "&gnome-download-http;/libsecret/0.21/libsecret-&libsecret-version;.tar.xz">
-  <!ENTITY libsecret-download-ftp  " ">
-  <!ENTITY libsecret-md5sum        "85f0534c673ccf10daf6fa419728e0d8">
-  <!ENTITY libsecret-size          "204 KB">
-  <!ENTITY libsecret-buildsize     "10 MB (with tests)">
-  <!ENTITY libsecret-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="libsecret" xreflabel="libsecret-&libsecret-version;">
-  <?dbhtml filename="libsecret.html"?>
-
-
-  <title>libsecret-&libsecret-version;</title>
-
-  <indexterm zone="libsecret">
-    <primary sortas="a-libsecret">libsecret</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsecret</title>
-
-    <para>
-      The <application>libsecret</application> package contains a
-      GObject based library for accessing the Secret Service API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsecret-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsecret-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsecret-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsecret-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsecret-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsecret-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsecret Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgcrypt"/> (or
-      <xref role="nodep" linkend="gnutls"/>, for cryptography), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="libxslt"/> (to build manual pages), and
-      <xref linkend="valgrind"/> (can be used in tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required for the test suite)</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="gjs"/>,
-      <xref linkend="pygobject3"/> (Python 3 module), and
-      <ulink url="https://github.com/tpm2-software/tpm2-tss">tpm2-tss</ulink>
-      <!-- Historically libsecret used to require Python2, but it has been
-      fully ported to Python3. -->
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="gnome-keyring"/>
-    </para>
-
-    <note>
-      <para>
-        Any package requiring <application>libsecret</application>
-        expects <application>GNOME Keyring</application> to be
-        present at runtime.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsecret</title>
-
-    <para>
-      Install <application>libsecret</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "s/api_version_major/'&libsecret-version;'/"            \
-    -i ../docs/reference/libsecret/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                 &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>dbus-run-session ninja test</command>.
-    </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"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: &gi-doc-disable;
-    </para>
-
-    <para>
-      <option>-Dmanpage=false</option>: Use this switch if you
-      have not installed <xref linkend="libxslt"/> and DocBook
-      packages.
-    </para>
-
-    <para>
-      <option>-Dcrypto=gnutls</option>: Use this switch if you want to use
-      <xref linkend="gnutls" role="nodep"/> for cryptography instead of
-      <xref linkend="libgcrypt" role="nodep"/>.
-    </para>
-
-    <para>
-      <option>-Dcrypto=disabled</option>: Use this switch if you don't have
-      <xref linkend="gnutls" role="nodep"/> or
-      <xref linkend="libgcrypt" role="nodep"/> installed. Note that disabling
-      transport encryption support by doing this is not recommended.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          secret-tool
-        </seg>
-        <seg>
-          libsecret-1.so
-        </seg>
-        <seg>
-          /usr/include/libsecret-1 and
-          /usr/share/doc/libsecret-&libsecret-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="secret-tool">
-        <term><command>secret-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool that can be used to store
-            and retrieve passwords
-          </para>
-          <indexterm zone="libsecret secret-tool">
-            <primary sortas="b-secret-tool">secret-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsecret-1">
-        <term><filename class="libraryfile">libsecret-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libsecret</application> API functions
-          </para>
-          <indexterm zone="libsecret libsecret-1">
-            <primary sortas="c-libsecret-1">libsecret-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/libshumate.xml
===================================================================
--- gnome/platform/libshumate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libshumate-download-http "&gnome-download-http;/libshumate/1.2/libshumate-&libshumate-version;.tar.xz">
-  <!ENTITY libshumate-download-ftp  " ">
-  <!ENTITY libshumate-md5sum        "16af4e2ef9f6b51a639a459020e7d010">
-  <!ENTITY libshumate-size          "316 KB">
-  <!ENTITY libshumate-buildsize     "12 MB">
-  <!ENTITY libshumate-time          "0.5 SBU">
-]>
-
-<sect1 id="libshumate" xreflabel="libshumate-&libshumate-version;">
-  <?dbhtml filename="libshumate.html"?>
-
-  <title>libshumate-&libshumate-version;</title>
-
-  <indexterm zone="libshumate">
-    <primary sortas="a-libshumate">libshumate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libshumate</title>
-
-    <para>
-      The <application>libshumate</application> package contains a GTK-4 widget
-      to display maps.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libshumate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libshumate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libshumate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libshumate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libshumate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libshumate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libshumate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/>,
-      <xref linkend="libsoup3"/>, and
-      <xref linkend="protobuf-c"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; (required for gnome-maps)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <xref linkend="valgrind"/>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libshumate</title>
-
-    <para>
-      Install <application>libshumate</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            --wrap-mode=nodownload \
-            -Dgtk_doc=false        \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen remap='doc'><userinput>sed -e 's/lib_version/version/' \
-    -i ../docs/meson.build      &amp;&amp;
-meson configure -Dgtk_doc=true  &amp;&amp;
-ninja</userinput></screen>
-
-<!--
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
--->
-
-    <para>
-      The test suite requires this package to be built with special options.
-      If you wish to run the tests, follow the instructions after installation.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you wish to run the tests, issue:
-    </para>
-
-<screen><userinput>meson configure --buildtype=debug &amp;&amp;
-ninja test</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>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libshumate-1.0.so
-        </seg>
-        <seg>
-          /usr/include/shumate-1.0 and
-          /usr/share/doc/libshumate-&libshumate-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libshumate-1.0">
-        <term><filename class="libraryfile">libshumate-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a GTK-4 widget to display maps
-          </para>
-          <indexterm zone="libshumate libshumate-1.0">
-            <primary sortas="c-libshumate-1.0">libshumate-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: ome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,363 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mutter-download-http "&gnome-download-http;/mutter/&gnome-46;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  " ">
-  <!ENTITY mutter-md5sum        "bc2266ac2c507f88bcd4d86ab93886ad">
-  <!ENTITY mutter-size          "6.4 MB">
-  <!ENTITY mutter-buildsize     "83 MB (with tests)">
-  <!ENTITY mutter-time          "0.5 SBU (Using parallelism=4; add 1.4 SBU for tests)">
-]>
-
-<sect1 id="mutter" xreflabel="Mutter-&mutter-version;">
-  <?dbhtml filename="mutter.html"?>
-
-
-  <title>Mutter-&mutter-version;</title>
-
-  <indexterm zone="mutter">
-    <primary sortas="a-Mutter">Mutter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mutter</title>
-
-    <para>
-      <application>Mutter</application> is the window manager for
-      <application>GNOME</application>. It is not invoked directly,
-      but from <application>GNOME Session</application> (on a
-      machine with a hardware accelerated video driver).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mutter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mutter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mutter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mutter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mutter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mutter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-settings-daemon"/>,
-      <xref linkend="graphene"/>,
-      <xref linkend="libei"/>,
-      <xref linkend="libxcvt"/>,
-      <xref linkend="libxkbcommon"/>, and
-      <xref linkend="pipewire"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      &gobject-introspection;, and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Required to
-    build the Wayland compositor)</bridgehead>
-    <para role="recommended">
-      <xref linkend="libinput"/>,
-      <xref linkend="wayland"/>,
-      <xref linkend="wayland-protocols"/>, and
-      <xref linkend="xwayland"/>
-    </para>
-
-    <bridgehead renderas="sect4"
-                revision="sysv">Recommended (Runtime)</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="blocaled" role="runtime"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- sorted as "d" instead of "p" -->
-      <xref linkend="python-dbusmock"/> (required for tests),
-      <xref linkend="libdisplay-info"/>,
-      <!--<xref linkend="sysprof"/>,-->
-      <xref linkend="xorg-server"/> (for X11 sessions), and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-    <!-- NOTE: Mutter compiles shipped Cogl and Clutter for it's own
-    internal use. This is because upstream have decided that Cogl and
-    Clutter should be only used by Mutter in the future, so the development
-    of Cogl and Clutter is now performed in the Mutter repository.  The
-    "standalone" Cogl and Clutter are considered obsolete now and we have
-    archived them.  -->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mutter</title>
-
-    <para>
-      Install <application>Mutter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr              \
-            --buildtype=release        \
-            -Dtests=false              \
-            -Dprofiler=false           \
-            ..                         &amp;&amp;
-ninja</userinput></screen>
-
-<!--
-    <para>
-      To test the results, issue:
-      <command>dbus-run-session ninja test</command>. The tests
-      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.
-    </para>
-    -->
-    <!-- there are no added problems in sysv, AFAICT. Running the tests is
-    not easy whatever the init system. But using the instructions below in
-    a gnome session on sysv works (no test failure)...
-    <para revision='sysv'>
-       This package does not come with a test suite that runs properly in the
-       SystemV environment.
-    </para>
-    -->
-
-    <para>
-      The test suite requires an
-      external program called <command>xvfb-run</command>.  If you wish to run
-      the tests, you should download and install it before running
-      <command>meson</command>.
-
-      You can obtain it from <ulink
-      url="&sources-anduin-http;/mutter/xvfb-run">xvfb-run</ulink>, and install
-      it with executable permissions in <filename
-      class="directory">/usr/bin</filename>.  <command>xvfb-run</command> needs
-      <command>Xvfb</command> at runtime, and <command>Xvfb</command> can be
-      installed from either <xref linkend='xorg-server'/> or <xref
-      linkend='xwayland'/>.
-
-      You should also replace <parameter>-Dtests=false</parameter> in the
-      <command>meson</command> command, with
-      <parameter>-Dtests=true -Dclutter_tests=false</parameter>.  The test
-      suite requires the mutter schema to be installed on the system, so it is
-      better to run the tests after installing the package.
-    </para>
-
-    <para>
-      You can also test basic functions of <application>Mutter</application>
-      following <xref linkend='mutter-starting'/>, after installing it.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you wish to run the tests, remove the reference to
-      <application>Zenity</application> which is not a part of BLFS
-      from one test:
-    </para>
-
-<screen role='test'><userinput>sed 's/zenity --[a-z]*/gtk4-demo/' -i ../src/tests/x11-test.sh</userinput></screen>
-
-    <para>
-      Now run the test suite:
-    </para>
-
-<screen role='test'><userinput>ninja test</userinput></screen>
-
-    <para>
-      The tests require an active X or wayland session.
-      One test named
-      <!-- https://gitlab.gnome.org/GNOME/mutter/-/issues/2848 -->
-       <!--<filename>cogl-test-framebuffer-get-bits-gl3</filename> and-->
-      <!-- This needs a pipewire daemon running.  As at Aug 2023
-           the method to run a pipewire daemon is not in BLFS
-           (but in editor notes), so claim this a known failure.  -->
-      <filename>input-capture</filename> is known to fail.
-      <!-- As Xi noted in #18580, this test is flaky. -->
-      An additional test named
-      <filename>cogl-test-offscreen-texture-formats-gles2</filename> is known
-      to fail. <!-- https://gitlab.gnome.org/GNOME/mutter/-/issues/3343 -->
-      A few other tests may fail depending on the configuration.
-      Don't make any mouse or keyboard input while the test suite is
-      running or some tests may fail.
-    </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"/>
-
-    <para>
-      <parameter>-Dtests=false</parameter>: Prevents building the tests,
-      and removes a hard requirement on <command>xvfb-run</command>.
-    </para>
-
-    <para>
-      <parameter>-Dprofiler=false</parameter>: Allow building this package
-      without <application>Sysprof</application>.  Remove this option if
-      you've installed <application>Sysprof</application> and want to
-      analysis the rendering performance of
-      <application>Mutter</application>.
-    </para>
-
-    <para>
-      <option>-Dtests=true -Dclutter_tests=false</option>: Building all the
-      tests but the tests for the shipped <application>Clutter</application>
-      library.  The <application>Clutter</application> tests are known to
-      fail with <parameter>--buildtype=release</parameter>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="starting" id="mutter-starting">
-    <title>Starting Mutter</title>
-
-    <!-- Mutter as a Wayland compositor works with recent mutter releases.
-         IIRC mutter can also be used as a X window manager: just replace
-         "twm" with "mutter &dash;&dash;x11" in xinitrc. But I've not tested
-         such a configuration recently (I don't build Xorg Server or xinit
-         these days.  -->
-
-    <para>
-      <application>Mutter</application> is normally used as a component of
-      <application>gnome-shell</application>, but it can be used as a
-      standalone Wayland compositor too.  To run
-      <application>Mutter</application> as a Wayland compositor, in a
-      virtual console, issue:
-    </para>
-
-    <screen role='nodump'><userinput>mutter --wayland -- vte-2.91</userinput></screen>
-
-    <para>
-      Replace <command>vte-2.91</command> with the command line for the
-      first application you want in the Wayland session. Note that once this
-      application exits, the Wayland session will be terminated.
-    </para>
-
-    <para>
-      <application>Mutter</application> can also function as a nested
-      compositor in another Wayland session.  In a terminal emulator, issue:
-    </para>
-
-    <screen role='nodump'><userinput>MUTTER_DEBUG_DUMMY_MODE_SPECS=1920x1080 mutter --wayland --nested -- vte-2.91</userinput></screen>
-
-    <para>
-      Replace <replaceable>1920x1080</replaceable> with the size you want
-      for the nested Wayland session.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mutter
-        </seg>
-        <seg>
-          libmutter-14.so and libmutter-test-14.so (optional)
-        </seg>
-        <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{,installed-tests}}/mutter-14
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mutter-prog">
-        <term><command>mutter</command></term>
-        <listitem>
-          <para>
-            is a <application>Clutter</application> based compositing
-            <application>GTK+</application> Window Manager
-          </para>
-          <indexterm zone="mutter mutter-prog">
-            <primary sortas="b-mutter">mutter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-14.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mutter</application> API functions
-          </para>
-          <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-14.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmutter-test">
-        <term><filename class="libraryfile">libmutter-test-14.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Mutter</application> test suite API
-            functions; this library is only installed if the test suite of
-            this package is enabled and it is needed by
-            <application>gnome-shell</application> test suite
-          </para>
-          <indexterm zone="mutter libmutter-test">
-            <primary sortas="c-libmutter-test">libmutter-test-14.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/nautilus.xml
===================================================================
--- gnome/platform/nautilus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,239 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nautilus-download-http
-           "&gnome-download-http;/nautilus/&gnome-46;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-download-ftp  " ">
-  <!ENTITY nautilus-md5sum        "5f7bbc0072c3f520c4d417d6f014c590">
-  <!ENTITY nautilus-size          "3.1 MB">
-  <!ENTITY nautilus-buildsize     "102 MB (with tests)">
-  <!ENTITY nautilus-time          "0.6 SBU (with tests, both using parallelism=4)">
-]>
-
-<sect1 id="nautilus" xreflabel="Nautilus-&nautilus-version;">
-  <?dbhtml filename="nautilus.html"?>
-
-
-  <title>Nautilus-&nautilus-version;</title>
-
-  <indexterm zone="nautilus">
-    <primary sortas="a-Nautilus">Nautilus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nautilus</title>
-
-    <para>
-      The <application>Nautilus</application> package contains the
-      <application>GNOME</application> file manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nautilus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nautilus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nautilus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nautilus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nautilus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nautilus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nautilus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="bubblewrap"/>,
-      <xref linkend="gexiv2"/>,
-      <xref linkend="gnome-autoar"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="libportal"/>,
-      <xref linkend="libseccomp"/>, and
-      <xref linkend="tracker3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="exempi"/>,
-      &gobject-introspection;,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="libcloudproviders"/>, and
-      <xref linkend="libexif"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="adwaita-icon-theme"/> and
-      <xref role="runtime" linkend="gvfs"/> (For hotplugging and device
-        mounting to work)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nautilus</title>
-
-    <para>
-      Fix the location to install the API documentation:
-    </para>
-
-<screen><userinput>sed "/docdir =/s@\$@ / 'nautilus-&nautilus-version;'@" -i meson.build</userinput></screen>
-
-<!--
-    <para>
-      Fix an inverted test that may lead to crashes, and also prevents
-      building with GCC-13:
-    </para>
-
-<screen><userinput>sed "/assert (basename ==/s/==/!=/" -i src/nautilus-file-operations.c</userinput></screen>
--->
-
-    <para>
-      Install <application>Nautilus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dselinux=false     \
-            -Dpackagekit=false  \
-            ..                  &amp;&amp;
-
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. The tests
-      need to be run in a graphical environment.  One test is known to fail
-      if <xref linkend='tracker3-miners'/> is not installed. One test is also
-      known to timeout if the user running the tests has a large home directory.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                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"/>
-
-    <para>
-      <parameter>-Dselinux=false</parameter>: This switch disables the use
-      of selinux which isn't supported by BLFS.
-    </para>
-
-    <para>
-      <parameter>-Dpackagekit=false</parameter>: This switch disables the use
-      of PackageKit which isn't suitable for BLFS.
-    </para>
-
-    <para>
-      <option>-Dcloudproviders=false</option>: Use this switch if you do not
-      have <xref linkend="libcloudproviders"/> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nautilus and nautilus-autorun-software
-        </seg>
-        <seg>
-          libnautilus-extension.so
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/nautilus and
-          /usr/share/gtk-doc/html/libnautilus-extension (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nautilus-prog">
-        <term><command>nautilus</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> file manager
-          </para>
-          <indexterm zone="nautilus nautilus-prog">
-            <primary sortas="b-nautilus">nautilus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnautilus-extension">
-        <term><filename class="libraryfile">libnautilus-extension.so</filename></term>
-        <listitem>
-          <para>
-            supplies the functions needed by the file manager extensions
-          </para>
-          <indexterm zone="nautilus libnautilus-extension">
-            <primary sortas="c-libnautilus-extension">libnautilus-extension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="gnome-core">
-  <?dbhtml filename="core.html"?>
-
-  <title>GNOME Libraries and Desktop</title>
-
-  <para>
-    The objective of this section is to build a
-    <application>GNOME</application> desktop.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-platform.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcr4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsettings-desktop-schemas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsecret.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rest.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem-pl-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp-xsl.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="geocode-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gjs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-autoar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-menus.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-video-effects.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-online-accounts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgdata.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgweather.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpeas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libshumate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution-data-server.xml"/>
-<!--  <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="tracker3.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-desktop-portal-gnome.xml"/>
-
-<!-- GNOME Desktop -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caribou.xml"/>-->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-runtime.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-backgrounds.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gexiv2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zenity.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-bluetooth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-settings-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tecla.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-control-center.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mutter.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-shell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-shell-extensions.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-session.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdm.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-tweaks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-user-docs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp.xml"/>
-  <!-- notification-daemon moved to System Utilities. -->
-  <!-- polkit-gnome moved to Security. -->
-
-</chapter>
Index: ome/platform/rest.xml
===================================================================
--- gnome/platform/rest.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rest-download-http "&gnome-download-http;/rest/0.9/rest-&rest-version;.tar.xz">
-  <!ENTITY rest-download-ftp  " ">
-  <!ENTITY rest-md5sum        "b997b83232be3814a1b78530c5700df9">
-  <!ENTITY rest-size          "72 KB">
-  <!ENTITY rest-buildsize     "3.2 MB (with tests)">
-  <!ENTITY rest-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="rest" xreflabel="rest-&rest-version;">
-  <?dbhtml filename="rest.html"?>
-
-
-  <title>rest-&rest-version;</title>
-
-  <indexterm zone="rest">
-    <primary sortas="a-rest">rest</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rest</title>
-
-    <para>
-      The <application>rest</application> package contains a library
-      that was designed to make it easier to access web services that
-      claim to be "RESTful". It includes convenience wrappers for
-      libsoup and libxml to ease remote use of the RESTful API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rest-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rest-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rest-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rest-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rest-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rest-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rest Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/>,
-      <xref linkend="libsoup3"/>, and
-      <xref linkend="make-ca"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <xref linkend="libadwaita1"/> and
-      <xref linkend="gtksourceview5"/> (to build the demo), and
-      <xref linkend="vala"/>
-    </para>
-
-    &test-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rest</title>
-
-    <para>
-      Install <application>rest</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dexamples=false    \
-            -Dgtk_doc=false     \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/output/s/librest-1.0/rest-&rest-version;/" -i ../docs/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                                 &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: &gi-doc-disable;
-    </para>
-
-    <para>
-      <parameter>-Dexamples=false</parameter>: Remove this option if
-      <xref linkend="libadwaita1"/> and <xref linkend="gtksourceview5"/> are
-      installed and you wish to build the demonstration application provided
-      by this package.
-    </para>
-
-    <para>
-      <option>-Dvapi=true</option>: Use this switch if <xref linkend="vala"/>
-      is installed and you wish to build the Vala bindings provided by this
-      package.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          librest-demo (optional)
-        </seg>
-        <seg>
-          librest-1.0.so and librest-extras-1.0.so
-        </seg>
-        <seg>
-          /usr/include/rest-1.0 and
-          /usr/share/gtk-doc/html/rest-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="librest-demo">
-        <term><command>librest-demo</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the RESTful Web API Query
-            functions
-          </para>
-          <indexterm zone="rest librest-demo">
-            <primary sortas="b-librest-demo">librest-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librest-1.0">
-        <term><filename class="libraryfile">librest-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the RESTful Web API Query functions
-          </para>
-          <indexterm zone="rest librest-1.0">
-            <primary sortas="c-librest-1.0">librest-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librest-extras-1.0">
-        <term><filename class="libraryfile">librest-extras-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains extra RESTful Web API Query functions
-          </para>
-          <indexterm zone="rest librest-extras-1.0">
-            <primary sortas="c-librest-extras-1.0">librest-extras-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/tecla.xml
===================================================================
--- gnome/platform/tecla.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tecla-download-http "&gnome-download-http;/tecla/&gnome-46;/tecla-&tecla-version;.tar.xz">
-  <!ENTITY tecla-download-ftp  " ">
-  <!ENTITY tecla-md5sum        "8e3ecd44ed17dab85aa281df19357395">
-  <!ENTITY tecla-size          "36 KB">
-  <!ENTITY tecla-buildsize     "2.2 MB">
-  <!ENTITY tecla-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="tecla" xreflabel="Tecla-&tecla-version;">
-  <?dbhtml filename="tecla.html"?>
-
-  <title>Tecla-&tecla-version;</title>
-
-  <indexterm zone="tecla">
-    <primary sortas="a-tecla">Tecla</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tecla</title>
-
-    <para>
-      The <application>Tecla</application> package contains a keyboard layout
-      viewer.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tecla-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tecla-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tecla-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tecla-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tecla-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tecla-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tecla Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libadwaita1"/> and
-      <xref linkend="libxkbcommon"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tecla</title>
-
-    <para>
-      Install <application>Tecla</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-          tecla
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts with (is the same as) the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="tecla-prog">
-        <term><command>tecla</command></term>
-        <listitem>
-          <para>
-            is a keyboard layout viewer
-          </para>
-          <indexterm zone="tecla tecla-prog">
-            <primary sortas="b-tecla">tecla</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: ome/platform/totem-pl-parser.xml
===================================================================
--- gnome/platform/totem-pl-parser.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 totem-pl-parser-download-http
-   "&gnome-download-http;/totem-pl-parser/&gnome-minor-26;/totem-pl-parser-&totem-pl-parser-version;.tar.xz">
-  <!ENTITY totem-pl-parser-download-ftp  " ">
-  <!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)">
-]>
-
-<sect1 id="totem-pl-parser" xreflabel="totem-pl-parser-&totem-pl-parser-version;">
-  <?dbhtml filename="totem-pl-parser.html"?>
-
-
-  <title>totem-pl-parser-&totem-pl-parser-version;</title>
-
-  <indexterm zone="totem-pl-parser">
-    <primary sortas="a-totem-pl-parser">totem-pl-parser</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Totem PL Parser</title>
-
-    <para>
-      The <application>Totem PL Parser</application> package contains a simple
-      GObject-based library used to parse multiple playlist formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&totem-pl-parser-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&totem-pl-parser-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &totem-pl-parser-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &totem-pl-parser-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &totem-pl-parser-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &totem-pl-parser-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Totem PL Parser Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="libarchive"/>, and
-      <xref linkend="libgcrypt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cmake"/>, <!-- uses it to look for packages -->
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gvfs"/> (for some tests),
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>, and
-      <ulink url="https://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>
-      is necessary for the tests
-    </para>
-
-    &test-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Totem PL Parser</title>
-
-    <para>
-      Install <application>Totem PL Parser</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!-- It seems caused by geolocation-dependant resolving in
-           iTunes.  -->
-      The test named <filename>parser</filename> is known to fail.
-    </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>
-          libtotem-plparser-mini.so and libtotem-plparser.so
-        </seg>
-        <seg>
-          /usr/include/totem-pl-parser and
-          /usr/share/gtk-doc/html/totem-pl-parser
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtotem-plparser">
-        <term><filename class="libraryfile">libtotem-plparser.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Totem</application> Playlist Parser library
-          </para>
-          <indexterm zone="totem-pl-parser libtotem-plparser">
-            <primary sortas="c-libtotem-plparser">libtotem-plparser.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtotem-plparser-mini">
-        <term><filename class="libraryfile">libtotem-plparser-mini.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Totem</application> Playlist Parser library,
-            mini version
-          </para>
-          <indexterm zone="totem-pl-parser libtotem-plparser-mini">
-            <primary sortas="c-libtotem-plparser-mini">libtotem-plparser-mini.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/tracker3-miners-kernel.xml
===================================================================
--- gnome/platform/tracker3-miners-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>S</emphasis>ecurity options ---&gt;
-  [*]        <emphasis role='blue'>E</emphasis>nable different security models                         [SECURITY]
-  [*]        <emphasis role='blue'>L</emphasis>andlock support                                [SECURITY_LANDLOCK]
-  # List more Linux Security Modules here (separated with comma) if needed,
-  # for example 'landlock,lockdown,smack':
-  (landlock) <emphasis role='blue'>O</emphasis>rdered list of enabled LSMs                                  [LSM]</screen>
Index: ome/platform/tracker3-miners.xml
===================================================================
--- gnome/platform/tracker3-miners.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,404 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tracker3-miners-download-http "&gnome-download-http;/tracker-miners/3.7/tracker-miners-&tracker3-miners-version;.tar.xz">
-  <!ENTITY tracker3-miners-download-ftp  " ">
-  <!ENTITY tracker3-miners-md5sum        "fc47e13aebbcbe002cfd07980d0cde46">
-  <!ENTITY tracker3-miners-size          "7.2 MB">
-  <!ENTITY tracker3-miners-buildsize     "38 MB (with tests)">
-  <!ENTITY tracker3-miners-time          "0.3 SBU (with parallelism=4; add as much as 1.0 SBU for tests, dependent on disk speed)">
-]>
-
-<sect1 id="tracker3-miners" xreflabel="tracker-miners-&tracker3-miners-version;">
-  <?dbhtml filename="tracker3-miners.html"?>
-
-
-  <title>Tracker-miners-&tracker3-miners-version;</title>
-
-  <indexterm zone="tracker3-miners">
-    <primary sortas="a-tracker3-miners">tracker3-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>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tracker3-miners-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tracker3-miners-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tracker3-miners-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tracker3-miners-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tracker3-miners-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tracker3-miners-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/tracker-miners-&tracker3-miners-version;-upstream_fixes-1.patch"/>
-        </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="tracker3"/>,
-      <xref linkend="exempi"/>, and
-      <xref linkend="gexiv2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="giflib"/>,
-      <xref role='runtime' linkend="gst10-plugins-good"/> (runtime),
-      <xref role='runtime' linkend="gst10-libav"/> (runtime),
-      <xref linkend="icu"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libgrss"/>,
-      <xref linkend="libgxps"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="poppler"/>, and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="dconf"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="libgsf"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="taglib"/>,
-      <xref linkend="totem-pl-parser"/>,
-      <ulink url="https://github.com/lipnitsk/libcue">libcue</ulink>,
-      <ulink url="https://libiptcdata.sourceforge.net/">libitpcdata</ulink>,
-      <ulink url="https://libosinfo.org">libosinfo</ulink>, and
-      <ulink url="https://gitlab.gnome.org/GNOME/gupnp">gupnp</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="tracker3-miners-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration, then recompile
-      the kernel and reboot if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="tracker3-miners-kernel.xml"/>
-
-    <indexterm zone="tracker3-miners tracker3-miners-kernel">
-      <primary sortas="d-traker-miners">tracker-miners</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tracker-miners</title>
-
-    <note>
-      <para>
-        If you plan to run the tests, some timeouts are too short when
-        using spinning disks. There are two places where timeouts are
-        used: first, individual tests inside a group of tests have a
-        default timeout of 10s. This can be changed by setting the environment
-        variable <envar>TRACKER_TESTS_AWAIT_TIMEOUT</envar> to the desired
-        value when running the tests (see below). Second, a global timeout
-        for a group of tests is fixed at configuration time. The default value
-        in the <filename class="directory">functional-tests</filename>
-        directory (other directories have only short lived tests) may be
-        increased with the following command (replace 200 with a value
-        suitable for your machine):
-      </para>
-
-<screen remap="test"><userinput>sed -i s/120/<replaceable>200</replaceable>/ tests/functional-tests/meson.build</userinput></screen>
-    </note>
-
-<!-- Applied in 3.6.2
-    <para>
-      First, fix some problems with the recent tightening of the seccomp
-      sandbox:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../tracker-miners-&tracker3-miners-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>Tracker-miners</application> by running the following
-      commands:
-    </para>
-
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dman=false         \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr                 \
-            --buildtype=release           \
-            -Dsystemd_user_services=false \
-            -Dman=false                   \
-            ..                            &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      <!-- Some tests fail in 3.6.1 due to seccomp sandbox changes.
-      See https://github.blog/2023-10-09-coordinated-disclosure-1-click-rce-on-gnome-cve-2023-43641/ -->
-      To test the results, issue (adjust the individual test timeout to a
-      value suitable for your machine, see the note above):
-    </para>
-
-<screen remap="test"><userinput>dbus-run-session env TRACKER_TESTS_AWAIT_TIMEOUT=<replaceable>20</replaceable> ninja test &amp;&amp;
-rm -rf ~/tracker-tests</userinput></screen>
-
-    <note>
-      <para>
-        The tests create files in the user directory (up to 24 MB), so
-        they have to be removed afterwards.
-      </para>
-    </note>
-
-    <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>-Dman=false</parameter>: This switch prevents the build process
-      from generating man pages. Omit this switch if you have
-      <xref linkend="asciidoc" role="nodep"/> installed and wish to generate and
-      install the man pages.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemd_user_services=false</parameter>: This switch prevents
-      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.  Note that disabling
-      seccomp might cause the system compromised more severely in case a
-      security vulnerability in tracker-miners or its dependencies is
-      exploited.
-    </para>
-
-    <para>
-      <option>-Dlandlock=disabled</option>: This switch disables the
-      Landlock file access sandbox.  Use it if you don't want to build the
-      kernel with Landlock support.  Note that disabling Landlock might
-      cause the system compromised more severely in case a security
-      vulnerability in tracker-miners or its dependencies is exploited.
-    </para>
-
-    <para>
-      <option>-Dminer_rss=false</option>: Use this option if you have not
-      installed the recommended dependency libgrss.
-    </para>
-
-    <para>
-      <option>-Dbattery_detection=none</option>: Use this option if you have
-      not installed the recommended dependency upower.  Do not use this
-      option if your system has a battery (laptop battery or UPS), or
-      tracker miners may waste the battery power and lifespan when the A/C
-      power is unavailable.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          tracker3-daemon,
-          tracker3-extract,
-          tracker3-index,
-          tracker3-info,
-          tracker3-reset,
-          tracker3-search,
-          tracker3-status, and
-          tracker3-tag
-        </seg>
-        <seg>
-          Several modules under /usr/lib/tracker-miners-3.0
-        </seg>
-        <seg>
-          /usr/lib/tracker-miners-3.0,
-          /usr/libexec/tracker3, and
-          /usr/share/tracker3-miners
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presnetation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tracker3-daemon">
-        <term><command>tracker3-daemon</command></term>
-        <listitem>
-          <para>
-            starts, stops, restarts, and lists daemons responsible for indexing
-            content
-          </para>
-          <indexterm zone="tracker3-miners tracker3-daemon">
-            <primary sortas="b-tracker3-daemon">tracker3-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-extract">
-        <term><command>tracker3-extract</command></term>
-        <listitem>
-          <para>
-            extracts metadata from a file
-          </para>
-          <indexterm zone="tracker3-miners tracker3-extract">
-            <primary sortas="b-tracker3-extract">tracker3-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-index">
-        <term><command>tracker3-index</command></term>
-        <listitem>
-          <para>
-            indexes content using the Tracker filesystem miner
-          </para>
-          <indexterm zone="tracker3-miners tracker3-index">
-            <primary sortas="b-tracker3-index">tracker3-index</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-info">
-        <term><command>tracker3-info</command></term>
-        <listitem>
-          <para>
-            retrieves all information available for a certain file
-          </para>
-          <indexterm zone="tracker3-miners tracker3-info">
-            <primary sortas="b-tracker3-info">tracker3-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-reset">
-        <term><command>tracker3-reset</command></term>
-        <listitem>
-          <para>
-            resets the Tracker index and configuration
-          </para>
-          <indexterm zone="tracker3-miners tracker3-reset">
-            <primary sortas="b-tracker3-reset">tracker3-reset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-search">
-        <term><command>tracker3-search</command></term>
-        <listitem>
-          <para>
-            searches for content by type or across all types
-          </para>
-          <indexterm zone="tracker3-miners tracker3-search">
-            <primary sortas="b-tracker3-search">tracker3-search</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-status">
-        <term><command>tracker3-status</command></term>
-        <listitem>
-          <para>
-            provides status and statistics on data that has been indexed
-          </para>
-          <indexterm zone="tracker3-miners tracker3-status">
-            <primary sortas="b-tracker3-status">tracker3-status</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-tag">
-        <term><command>tracker3-tag</command></term>
-        <listitem>
-          <para>
-            adds, removes, and lists tags
-          </para>
-          <indexterm zone="tracker3-miners tracker3-tag">
-            <primary sortas="b-tracker3-tag">tracker3-tag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ome/platform/tracker3.xml
===================================================================
--- gnome/platform/tracker3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,343 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tracker3-download-http
-           "&gnome-download-http;/tracker/3.7/tracker-&tracker3-version;.tar.xz">
-  <!ENTITY tracker3-download-ftp  " ">
-  <!ENTITY tracker3-md5sum        "63357a4966867fa86b7f899283de075e">
-  <!ENTITY tracker3-size          "1.7 MB">
-  <!ENTITY tracker3-buildsize     "58 MB (with tests)">
-  <!ENTITY tracker3-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="tracker3" xreflabel="Tracker-&tracker3-version;">
-  <?dbhtml filename="tracker3.html"?>
-
-
-  <title>Tracker-&tracker3-version;</title>
-
-  <indexterm zone="tracker3">
-    <primary sortas="a-Tracker3">Tracker3</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>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tracker3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tracker3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tracker3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tracker3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tracker3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tracker3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Not needed with 3.0.3, but keep around just in case
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/tracker-&tracker3-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Tracker Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/>,
-      <xref linkend="libseccomp"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="icu"/>,
-      <xref linkend="libsoup3"/>,
-      <xref linkend="pygobject3"/>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="tracker3-miners"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/>,
-      <xref linkend="avahi"/>,
-<!--  It looks like not used even if docs=true,
-      the pre-built doc is shipped in tarball and will be installed
-      <xref linkend="gi-docgen"/>
--->
-      <xref linkend="graphviz"/>,
-      <xref linkend="libsoup"/>,
-      <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)-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tracker</title>
-
-    <para>
-      Fix the location to install the documentation into:
-    </para>
-
-<screen><userinput>mv docs/reference/libtracker-sparql/doc/{Tracker-3.0,tracker-&tracker3-version;} &amp;&amp;
-sed '/docs_name/s/Tracker-3.0/tracker-&tracker3-version;/' \
-    -i docs/reference/libtracker-sparql/meson.build</userinput></screen>
-
-    <!-- https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/665 -->
-    <para>
-      Adapt for a behavior change of SQLite 3.45.3:
-    </para>
-
-    <screen><userinput>sed 's/ROWID/\\"rdfs:Resource\\".ID/' \
-    -i src/libtracker-sparql/core/tracker-fts.c</userinput></screen>
-
-    <para>
-      Install <application>Tracker</application> by running the following
-      commands:
-    </para>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dman=false         \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr                 \
-            --buildtype=release           \
-            -Dman=false                   \
-            -Dsystemd_user_services=false \
-            ..                            &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>meson configure -Ddebug=true
-      &amp;&amp; ninja test</command>.
-      The test suite should be run from a graphical session. <!--One test,
-      <filename>tracker: fts / fts</filename>, is known to fail due to an
-      incompatibility with SQLite-3.42.-->
-    </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"/>
-
-    <para>
-      <parameter>-Dman=false</parameter>: This switch prevents the build
-      process from generating man pages. Omit this switch if you have
-      <xref linkend="asciidoc" role="nodep"/> installed and wish to generate
-      and install the man pages.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemd_user_services=false</parameter>: This switch prevents
-      the build process from installing systemd user services since they are
-      useless on SysV systems.
-    </para>
-
-    <para>
-      <command>meson configure -Ddebug=true</command>: This command enables
-      some debug checks necessary for the test suite.  We don't want to
-      enable them for the installed Tracker 3 libraries and programs, so
-      we run the test suite after installation.
-    </para>
-
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          tracker3,
-          tracker3-endpoint,
-          tracker3-export,
-          tracker3-help,
-          tracker3-import,
-          tracker3-sparql, and
-          tracker3-sql
-        </seg>
-        <seg>
-          libtracker-sparql-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/tracker-3.0,
-          /usr/libexec/tracker3,
-          /usr/share/tracker3, and
-          /usr/share/doc/tracker-&tracker3-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tracker3-prog">
-        <term><command>tracker3</command></term>
-        <listitem>
-          <para>
-            is a control program for the indexer
-          </para>
-          <indexterm zone="tracker3 tracker3-prog">
-            <primary sortas="b-tracker3">tracker3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-endpoint">
-        <term><command>tracker3-endpoint</command></term>
-        <listitem>
-          <para>
-            creates a SPARQL endpoint
-          </para>
-          <indexterm zone="tracker3 tracker3-endpoint">
-            <primary sortas="b-tracker3-endpoint">tracker3-endpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-export">
-        <term><command>tracker3-export</command></term>
-        <listitem>
-          <para>
-            exports all data from a Tracker database
-          </para>
-          <indexterm zone="tracker3 tracker3-export">
-            <primary sortas="b-tracker3-export">tracker3-export</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-       <varlistentry id="tracker3-help">
-        <term><command>tracker3-help</command></term>
-        <listitem>
-          <para>
-            shows manual pages related to Tracker
-          </para>
-          <indexterm zone="tracker3 tracker3-help">
-            <primary sortas="b-tracker3-help">tracker3-help</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-import">
-        <term><command>tracker3-import</command></term>
-        <listitem>
-          <para>
-            imports data into a Tracker database
-          </para>
-          <indexterm zone="tracker3 tracker3-import">
-            <primary sortas="b-tracker3-import">tracker3-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-sparql">
-        <term><command>tracker3-sparql</command></term>
-        <listitem>
-          <para>
-            uses SparQL to query a Tracker database
-          </para>
-          <indexterm zone="tracker3 tracker3-sparql">
-            <primary sortas="b-tracker3-sparql">tracker3-sparql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracker3-sql">
-        <term><command>tracker3-sql</command></term>
-        <listitem>
-          <para>
-            uses SQL to query a Tracker database
-          </para>
-          <indexterm zone="tracker3 tracker3-sql">
-            <primary sortas="b-tracker3-sql">tracker3-sql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtracker3-sparql">
-        <term><filename class="libraryfile">libtracker-sparql-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains resource management and database functions
-          </para>
-          <indexterm zone="tracker3 libtracker3-sparql">
-            <primary sortas="c-libtracker3-sparql">libtracker-sparql-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/vte.xml
===================================================================
--- gnome/platform/vte.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vte-download-http "https://gitlab.gnome.org/GNOME/vte/-/archive/&vte-version;/vte-&vte-version;.tar.gz">
-  <!ENTITY vte-download-ftp  " ">
-  <!ENTITY vte-md5sum        "e72c0279961ea1ed8f5944f56279773b">
-  <!ENTITY vte-size          "696 KB">
-  <!ENTITY vte-buildsize     "17 MB (with tests)">
-  <!ENTITY vte-time          "0.4 SBU (using parallelism=4; with tests)">
-
-  <!-- For "Contents" and "Short Descriptions" sections -->
-  <!ENTITY vte-nano          "91">
-]>
-
-<sect1 id="vte" xreflabel="VTE-&vte-version;">
-  <?dbhtml filename="vte.html"?>
-
-
-  <title>VTE-&vte-version;</title>
-
-  <indexterm zone="vte">
-    <primary sortas="a-VTE">VTE</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to VTE</title>
-
-    <para>
-      The <application>VTE</application> package contains a virtual terminal
-      widget for GTK applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vte-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vte-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vte-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vte-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vte-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vte-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">VTE Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>,
-      <xref linkend="gnutls"/>,
-      &gobject-introspection;,
-      <xref linkend="gtk4"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of VTE</title>
-
-    <para>
-      Install <application>VTE</application> by running the following
-      commands:
-    </para>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -D_systemd=false    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed -e "/docdir =/s@\$@/ 'vte-&vte-version;'@" \
-    -i ../doc/reference/meson.build     &amp;&amp;
-meson configure -Ddocs=true             &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 &amp;&amp;
-rm -v /etc/profile.d/vte.*</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>
-      <command>rm -v /etc/profile.d/vte.*</command>: This command removes two
-      files installed in /etc/profile.d that have no use on a LFS system.
-    </para>
-
-    <para>
-      <option>-Dgnutls=false</option>: Add this switch if you do not
-      want to enable GnuTLS support.
-    </para>
-
-    <para>
-      <option>-Dvapi=false</option>: Add this switch if you do not
-      want to enable vala bindings.
-    </para>
-
-    <para>
-      <option>-Dgtk4=false</option>: Add this switch if you do not want to
-      build the GTK-4 version of VTE.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-<!-- EDITORS NOTE:
-     vte installs a file into /etc/profile.d (/etc/profile.d/vte.sh) so that
-     the environment is suitable for running with it's quirks. Another one
-     is now installed as of 0.60.1 (/etc/profile.d/vte.csh) to support
-     the 'tcsh' shell.
-     As of 4/27/2020, we've elected to remove this.
--->
-      <seglistitem>
-        <seg>
-          vte-2.&vte-nano; and
-          vte-2.&vte-nano;-gtk4
-        </seg>
-        <seg>
-          libvte-2.&vte-nano;.so and
-          libvte-2.&vte-nano;-gtk4.so
-        </seg>
-        <seg>
-          /usr/include/vte-2.&vte-nano;,
-          /usr/include/vte-2.&vte-nano;-gtk4, and
-          (optional) /usr/share/doc/vte-&vte-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vte291">
-        <term><command>vte-2.&vte-nano;</command></term>
-        <listitem>
-          <para>
-            is a test application for the <application>VTE</application>
-            libraries
-          </para>
-          <indexterm zone="vte vte291">
-            <primary sortas="b-vte2-&vte-nano;">vte-2.&vte-nano;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vte291-gtk4">
-        <term><command>vte-2.&vte-nano;-gtk4</command></term>
-        <listitem>
-          <para>
-            is a test application for the GTK-4 version of the
-            <application>VTE</application> libraries
-          </para>
-          <indexterm zone="vte vte291-gtk4">
-            <primary sortas="b-vte2-&vte-nano;-gtk4">vte-2.&vte-nano;-gtk4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvte291">
-        <term><filename class="libraryfile">libvte-2.&vte-nano;.so</filename></term>
-        <listitem>
-          <para>
-            is a library which implements a terminal emulator
-            widget for <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="vte libvte291">
-            <primary sortas="c-libvte2-&vte-nano;">libvte-2.&vte-nano;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvte291-gtk4">
-        <term><filename class="libraryfile">libvte-2.&vte-nano;-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            is a library which implements a terminal emulator
-            widget for <application>GTK-4</application>
-          </para>
-          <indexterm zone="vte libvte291-gtk4">
-            <primary sortas="c-libvte2-&vte-nano;-gtk4">libvte-2.&vte-nano;-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/xdg-desktop-portal-gnome.xml
===================================================================
--- gnome/platform/xdg-desktop-portal-gnome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-desktop-portal-gnome-download-http "https://download.gnome.org/sources/xdg-desktop-portal-gnome/&gnome-46;/xdg-desktop-portal-gnome-&xdg-desktop-portal-gnome-version;.tar.xz">
-  <!ENTITY xdg-desktop-portal-gnome-download-ftp  " ">
-  <!ENTITY xdg-desktop-portal-gnome-md5sum        "45c68dabea3d53bc57ee79d536b337f5">
-  <!ENTITY xdg-desktop-portal-gnome-size          "160 KB">
-  <!ENTITY xdg-desktop-portal-gnome-buildsize     "10 MB">
-  <!ENTITY xdg-desktop-portal-gnome-time          "0.2 SBU">
-]>
-
-<sect1 id="xdg-desktop-portal-gnome" xreflabel="xdg-desktop-portal-gnome-&xdg-desktop-portal-gnome-version;">
-  <?dbhtml filename="xdg-desktop-portal-gnome.html"?>
-
-  <title>xdg-desktop-portal-gnome-&xdg-desktop-portal-gnome-version;</title>
-
-  <indexterm zone="xdg-desktop-portal-gnome">
-    <primary sortas="a-xdg-desktop-portal-gnome">xdg-desktop-portal-gnome</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-desktop-portal-gnome</title>
-
-    <para>
-      <application>xdg-desktop-portal-gnome</application> is a backend for
-      <application>xdg-desktop-portal</application>, that is using GTK and
-      various pieces of GNOME infrastructure.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-desktop-portal-gnome-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-desktop-portal-gnome-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-desktop-portal-gnome-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-desktop-portal-gnome-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-desktop-portal-gnome-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-desktop-portal-gnome-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-desktop-portal-gnome Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-backgrounds"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="xdg-desktop-portal"/>, and
-      <xref role="runtime" linkend="xdg-desktop-portal-gtk"/> (at runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-desktop-portal-gnome</title>
-
-    <para>
-      Install <application>xdg-desktop-portal-gnome</application> by running the
-      following commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr             \
-            --buildtype=release       \
-            -Dsystemduserunitdir=/tmp \
-            ..                         &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para revision="sysv">
-      Remove systemd files that are useless (as the &root; user):
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -vf /tmp/*.service</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                href="../../xincludes/gsettings-destdir.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          one daemon in /usr/libexec
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xdg-desktop-portal (if no other
-          <application>xdg-desktop-portal</application> backend is installed)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: ome/platform/yelp-xsl.xml
===================================================================
--- gnome/platform/yelp-xsl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yelp-xsl-download-http "&gnome-download-http;/yelp-xsl/&gnome-42;/yelp-xsl-&yelp-xsl-version;.tar.xz">
-  <!ENTITY yelp-xsl-download-ftp  " ">
-  <!ENTITY yelp-xsl-md5sum        "c41858c78e34bb8b68a535657a3e15d9">
-  <!ENTITY yelp-xsl-size          "652 KB">
-  <!ENTITY yelp-xsl-buildsize     "10 MB">
-  <!ENTITY yelp-xsl-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="yelp-xsl" xreflabel="yelp-xsl-&yelp-xsl-version;">
-  <?dbhtml filename="yelp-xsl.html"?>
-
-
-  <title>yelp-xsl-&yelp-xsl-version;</title>
-
-  <indexterm zone="yelp-xsl">
-    <primary sortas="a-yelp-xsl">yelp-xsl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Yelp XSL</title>
-
-    <para>
-      The <application>Yelp XSL</application> package contains XSL stylesheets
-      that are used by the <application>Yelp</application> help browser to
-      format Docbook and Mallard documents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yelp-xsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yelp-xsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yelp-xsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yelp-xsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yelp-xsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yelp-xsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Yelp XSL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxslt"/> and
-      <xref linkend="itstool"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Yelp XSL</title>
-
-    <para>
-      Install <application>Yelp XSL</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/yelp-xsl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/yelp.xml
===================================================================
--- gnome/platform/yelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yelp-download-http "&gnome-download-http;/yelp/&gnome-42;/yelp-&yelp-version;.tar.xz">
-  <!ENTITY yelp-download-ftp  " ">
-  <!ENTITY yelp-md5sum        "3792122c4ab90725716cd88e9274f0f6">
-  <!ENTITY yelp-size          "1.4 MB">
-  <!ENTITY yelp-buildsize     "21 MB">
-  <!ENTITY yelp-time          "0.1 SBU">
-]>
-
-<sect1 id="yelp" xreflabel="Yelp-&yelp-version;">
-  <?dbhtml filename="yelp.html"?>
-
-
-  <title>Yelp-&yelp-version;</title>
-
-  <indexterm zone="yelp">
-    <primary sortas="a-Yelp">Yelp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Yelp</title>
-
-    <para>
-      The <application>Yelp</application> package contains a help
-      browser used for viewing help files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yelp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yelp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yelp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yelp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yelp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yelp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Yelp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="webkitgtk"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <note>
-      <para>
-        The <application>Yelp</application> package is not required for a
-        functional <application>GNOME</application> Desktop. Note, however, that
-        without <application>Yelp</application> you will not be able to view the
-        built-in Help provided by core <application>GNOME</application> and many
-        of the support applications.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Yelp</title>
-
-    <para>
-      Install <application>Yelp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user, ensure
-      that <filename>/usr/share/applications/mimeinfo.cache</filename> will
-      be updated and therefore the <command>help</command> in gnome
-      applications will work.
-    </para>
-
-<screen role="root"><userinput>update-desktop-database</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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-help (symlink) and yelp
-        </seg>
-        <seg>
-          libyelp.so
-        </seg>
-        <seg>
-          /usr/include/libyelp,
-          /usr/share/gtk-doc/html/libyelp (optional), and
-          /usr/{lib,share}/yelp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="yelp-prog">
-        <term><command>yelp</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> Help Browser
-          </para>
-          <indexterm zone="yelp yelp-prog">
-            <primary sortas="b-yelp">yelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libyelp">
-        <term><filename class="libraryfile">libyelp.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Yelp</application> API functions
-          </para>
-          <indexterm zone="yelp libyelp">
-            <primary sortas="c-libyelp">libyelp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: index.xml
===================================================================
--- index.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ index.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,39 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+			"/usr/share/docbook/docbookx.dtd" [
 
-<!--
-$Date$
--->
+<!ENTITY version "20020704">
+<!ENTITY releasedate "July 4th, 2002">
+
+<!ENTITY % book SYSTEM "book/book.ent">
+<!ENTITY % preface SYSTEM "preface/preface.ent">
+<!ENTITY % introduction SYSTEM "introduction/introduction.ent">
+<!ENTITY % postlfs SYSTEM "postlfs/postlfs.ent">
+<!ENTITY % general SYSTEM "general/general.ent">
+<!ENTITY % connect SYSTEM "connect/connect.ent">
+<!ENTITY % basicnet SYSTEM "basicnet/basicnet.ent">
+<!ENTITY % server SYSTEM "server/server.ent">
+<!ENTITY % content SYSTEM "content/content.ent">
+<!ENTITY % x SYSTEM "x/x.ent">
+<!ENTITY % kde SYSTEM "kde/kde.ent">
+<!ENTITY % gnome SYSTEM "gnome/gnome.ent">
+<!ENTITY % xsoft SYSTEM "xsoft/xsoft.ent">
+<!ENTITY % multimedia SYSTEM "multimedia/multimedia.ent">
+<!ENTITY % pst SYSTEM "pst/pst.ent">
+<!ENTITY % appendices SYSTEM "appendices/appendices.ent">
+
+%book;
+%preface;
+%introduction;
+%postlfs;
+%general;
+%connect;
+%basicnet;
+%server;
+%content;
+%x;
+%kde;
+%gnome;
+%xsoft;
+%multimedia;
+%pst;
+%appendices;
+
+]>
 
 <book>
 
-  <!-- Front Matter -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book/bookinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book/dedication.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book/preface.xml"/>
-
-  <!-- Parts -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postlfs/postlfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="general/general.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networking/networking.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="server/server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x/x.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde/kde.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome/gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce/xfce.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde/lxde.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt/lxqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xsoft/xsoft.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multimedia/multimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pst/pst.xml"/>
-
-  <!-- Appendices -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/creat-comm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/mit-lic.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/glossary.xml"/>
-
-  <index/>
+&book;
 
 </book>
Index: introduction/important/beyond.xml
===================================================================
--- introduction/important/beyond.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/important/beyond.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,229 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-important-beyond">
+<?dbhtml filename="beyond.html" dir="introduction"?>
+<title>Going Beyond BLFS</title>
 
-<sect1 id="beyond" xreflabel="Going Beyond BLFS">
-  <?dbhtml filename="beyond.html"?>
-
-
-  <title>Going Beyond BLFS</title>
-
-  <para>The packages that are installed in this book are only the tip of the
-  iceberg. We hope that the experience you gained with the LFS book and
-  the BLFS book will give you the background needed to compile, install
-  and configure packages that are not included in this book.</para>
-
-  <para>When you want to install a package to a location other than
-  <filename class='directory'>/</filename>, or
-  <filename class='directory'>/usr</filename>, you are installing
-  outside the default environment settings on most machines.  The following
-  examples should assist you in determining how to correct this situation.
-  The examples cover the complete range of settings that may need
-  updating, but they are not all needed in every situation.</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Expand the <envar>PATH</envar> to include
-      <filename class='directory'>$PREFIX/bin</filename>.</para>
-    </listitem>
-    <listitem>
-      <para>Expand the <envar>PATH</envar> for
-      <systemitem class="username">root</systemitem> to include
-      <filename class='directory'>$PREFIX/sbin</filename>.</para>
-    </listitem>
-    <listitem>
-      <para>Add <filename class='directory'>$PREFIX/lib</filename>
-      to <filename>/etc/ld.so.conf</filename> or expand
-      <envar>LD_LIBRARY_PATH</envar> to include it. Before using the latter
-      option, check out <ulink
-      url="http://xahlee.info/UnixResource_dir/_/ldpath.html"/>.
-      If you modify <filename>/etc/ld.so.conf</filename>, remember to update
-      <filename>/etc/ld.so.cache</filename> by executing
-      <command>ldconfig</command> as the
-      <systemitem class="username">root</systemitem> user.</para>
-    </listitem>
-    <listitem>
-      <para>Add <filename class='directory'>$PREFIX/man</filename>
-      to <filename>/etc/man_db.conf</filename>.</para>
-    </listitem>
-    <listitem>
-      <para>Add <filename class='directory'>$PREFIX/info</filename>
-      to <envar>INFOPATH</envar>.</para>
-    </listitem>
-    <listitem>
-      <para>Add <filename class='directory'>$PREFIX/lib/pkgconfig</filename>
-      to <envar>PKG_CONFIG_PATH</envar>. Some packages are now installing
-      <filename class='extension'>.pc</filename> files in
-      <filename class='directory'>$PREFIX/share/pkgconfig</filename>, so you may
-      have to include this directory also.</para>
-    </listitem>
-    <listitem>
-      <para>Add <filename class='directory'>$PREFIX/include</filename> to
-      <envar>CPPFLAGS</envar> when compiling packages that depend on
-      the package you installed.</para>
-    </listitem>
-    <listitem>
-      <para>Add <filename class='directory'>$PREFIX/lib</filename> to
-      <envar>LDFLAGS</envar> when compiling packages that depend on a library
-      installed by the package.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>If you are in search of a package that is not in the book, the following
-  are different ways you can search for the desired package.</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>If you know the name of the package, then search SourceForge for
-      it at <ulink url="https://sourceforge.net/directory/"/>, and search
-      GitHub for it at <ulink url="https://github.com/"/>.
-      Also search Google at <ulink url="https://google.com/"/>. Sometimes a
-      search for the <filename class='extension'>rpm</filename> at
-      <ulink url="https://rpmfind.net/"/> or the
-      <filename class='extension'>deb</filename> at
-      <ulink url="https://www.debian.org/distrib/packages#search_packages"/> can
-      also lead to a link to the package.</para>
-    </listitem>
-    <listitem>
-      <para>If you know the name of the executable, but not the package
-      that the executable belongs to, first try a Google search with the name
-      of the executable. If the results are overwhelming, try searching for the
-      given executable in the Debian repository at <ulink
-      url="https://www.debian.org/distrib/packages#search_contents"/>.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Some general hints on handling new packages:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Many of the newer packages follow the <command>./configure
-      &amp;&amp; make &amp;&amp; make install</command> process.
-      Help on the options accepted by configure can be obtained via the
-      command <command>./configure --help</command>.</para>
-    </listitem>
-    <listitem>
-      <para>Most of the packages contain documentation on compiling and
-      installing the package. Some of the documents are excellent, some not so
-      excellent. Check out the homepage of the package for any additional and
-      updated hints for compiling and configuring the package.</para>
-    </listitem>
-    <listitem>
-      <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
-      that fails, try searching Google. Often, a distribution will have already
-      solved the problem (many of them use development versions of packages, so
-      they see the changes sooner than those of us who normally use stable released
-      versions).  But be cautious - all builders tend to carry patches which are no
-      longer necessary, and to have fixes which are only required because of their
-      particular choices in how they build a package. You may have to search
-      deeply to find a fix for the package version you are trying to use, or even
-      to find the package (names are sometimes not what you might expect, e.g.
-      <application>ghostscript</application> often has a prefix or a suffix in its
-      name), but the following notes might help, particularly for those who, like
-      the editors, are trying to build the latest versions and encountering
-      problems:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Arch <ulink url="https://www.archlinux.org/packages/"/> - enter
-          the package name in the 'Keywords' box, select the package name,
-          select the 'Source Files' field, and then select the
-          <filename>PKGBUILD</filename> entry to see how they build this
-          package.</para>
-        </listitem>
-        <listitem>
-          <para>Debian
-          <ulink url="http://ftp.debian.org/debian/pool"/> (use your country's
-          version if there is one) - the source will be in .tar.gz tarballs (either
-          the original upstream <filename class='extension'>.orig</filename> source,
-          or else a <filename>dfsg</filename> containing those parts which comply
-          with Debian's free software guidelines) accompanied by versioned .diff.gz
-          or .tar.gz additions. These additions often show how the package is built,
-          and may contain patches. In the .diff.gz versions, any patches create files
-          in <filename class="directory">debian/patches</filename>.</para>
-        </listitem>
-        <listitem>
-          <para>Fedora package source gets reorganized from time to time.
-          At the moment the package source for rpms is at <ulink
-          url="https://src.fedoraproject.org/projects/rpms/%2A"/> and from there
-          you can try putting a package name in the search box. If the package is
-          found you can look at the files (specfile to control the build, various
-          patches) or the commits. If that fails, you can download
-          an srpm (source rpm) and using <application>rpm2cpio</application> (see
-          the Tip at the bottom of the page). For rpms go to <ulink
-          url="https://dl.fedoraproject.org/pub/fedora/linux/"/> and then choose
-          which repo you wish to look at - development/rawhide is the latest
-          development, or choose releases for what was shipped in a release,
-          updates for updates to a release, or updates/testing for the latest
-          updates which might work or might have problems.
-          </para>
-        </listitem>
-        <listitem>
-          <para>Gentoo - First use a search engine to find an ebuild which looks as
-          if it will fix the problem, or search at <ulink
-          url="https://packages.gentoo.org/"/> - use the search field. Note where the
-          package lives in the portage hierarchy, e.g.
-          <filename>app-something/</filename>. In general you can treat the ebuild as
-          a sort of pseudo-code / shell combination with some functions you can
-          hazard a guess at, such as <command>dodoc</command>. If the fix is just a
-          <command>sed</command>, try it. However, in most cases the fix will use a
-          patch. To find the patch, use a gentoo-portage mirror: Two links to mirrors
-          in the U.S.A. which seem to usually be up to date are
-          <ulink url="https://mirror.rackspace.com/gentoo-portage/"/> and
-          <ulink url="https://mirror.steadfast.net/gentoo-portage/"/>. Navigate down
-          the tree to the package, then to the <filename>files/</filename> directory
-          to look for the patch. Sometimes a portage mirror has not yet been updated,
-          particularly for a recent new patch. In a few cases, gentoo batch the
-          patches into a tarball and the ebuild will have a link in the form
-          https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz
-          : here, look for PATCH_DEV and PATCH_VER in the build and format the full
-          URL in your browser or for wget : remember the '~' before the developer's
-          ID and note that trying to search the earlier levels of the URL in a
-          browser may drop you at www.gentoo.org or return 403 (forbidden).
-          </para>
-        </listitem>
-        <listitem>
-          <para>openSUSE provide a rolling release, some package versions are in
-          <ulink url="https://download.opensuse.org/source/tumbleweed/repo/oss/src/"/>
-          but others are in ../update/openSUSE-current/src - the
-          source only seems to be available in source rpms.</para>
-        </listitem>
-        <listitem>
-          <para>Slackware - the official package browser is currently broken.  The
-          site at <ulink url="https://slackbuilds.org/"/> has current and previous
-          versions in their unofficial repository with links to homepages, downloads,
-          and some individual files, particularly the <filename>.SlackBuild</filename>
-          files.</para>
-        </listitem>
-        <listitem>
-          <para>Ubuntu <ulink url="http://ftp.ubuntu.com/ubuntu/pool/"/> - see the
-          Debian notes above.</para>
-        </listitem>
-      </itemizedlist>
-      <para>If everything else fails, try the blfs-support mailing-list.</para>
-    </listitem>
-  </itemizedlist>
-
-  <tip>
-    <para>If you have found a package that is only available in
-    <filename class='extension'>.deb</filename> or
-    <filename class='extension'>.rpm</filename>
-    format, there are two small scripts, <command>rpm2targz</command> and
-    <command>deb2targz</command> that are available at
-    <ulink url="&sources-anduin-http;/extras/deb2targz.tar.bz2"/> and
-    <ulink url="&sources-anduin-http;/extras/rpm2targz.tar.bz2"/> to convert the archives
-    into a simple <filename>tar.gz</filename> format.</para>
-    <para>You may also find an rpm2cpio script useful.  The Perl version in the
-    linux kernel archives at <ulink
-    url="https://lore.kernel.org/all/20021016121842.GA2292@ncsu.edu/2-rpm2cpio"/>
-    works for most source rpms.  The rpm2targz script will use an rpm2cpio script
-    or binary if one is on your path.  Note that rpm2cpio will unpack a source
-    rpm in the current directory, giving a tarball, a spec file, and perhaps patches
-    or other files.</para>
-  </tip>
+<para>NEW PAGE TO BE WRITTEN</para>
 
 </sect1>
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/important/bootscripts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,61 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-important-bootscripts">
+<?dbhtml filename="bootscripts.html" dir="introduction"?>
+<title>Using BLFS bootscripts</title>
 
-<sect1 id="bootscripts" xreflabel="blfs-bootscripts-&blfs-bootscripts-version;" revision="sysv">
-  <?dbhtml filename="bootscripts.html"?>
-
-
-  <title>BLFS Boot Scripts</title>
-
-  <indexterm zone="bootscripts">
-    <primary sortas="a-BLFS-Bootscripts">BLFS Bootscripts</primary>
-  </indexterm>
-
-  <indexterm zone="bootscripts">
-    <primary sortas="f-AA-General-Information">General Information</primary>
-  </indexterm>
-
-  <para>The BLFS Bootscripts package contains the init
-  scripts that are used throughout the book. It is assumed that you will be
-  using the BLFS Bootscripts package in conjunction with a compatible
-  LFS-Bootscripts package. Refer to
-  <ulink url="&lfs-root;/chapter09/bootscripts.html"/> for more
-  information on the LFS-Bootscripts package.</para>
-
-  <itemizedlist spacing='compact'>
-    <title>Package Information</title>
-    <listitem>
-      <para>Download: <ulink
-        url="&sources-anduin-http;/blfs-bootscripts/blfs-bootscripts-&blfs-bootscripts-version;.tar.xz"/></para>
-    </listitem>
-  </itemizedlist>
-
-  <para>The BLFS Bootscripts package will be used throughout the BLFS book
-  for startup scripts.  Unlike LFS, each init script has a separate install target
-  in the BLFS Bootscripts package. It is recommended you keep the package source
-  directory around until completion of your BLFS system. When a script is
-  requested from BLFS Bootscripts, simply change to the directory and as the
-  <systemitem class="username">root</systemitem> user, execute the given
-  <command>make install-<replaceable>&lt;init-script&gt;</replaceable></command>
-  command. This command installs the init script to its proper location (along
-  with any auxiliary configuration scripts) and also creates the appropriate
-  symlinks to start and stop the service at the appropriate run-level.</para>
-
-  <note>
-    <para>You should review each bootscript before installation to
-    ascertain that it satisfies your need. Also verify that the start and stop
-    symlinks it creates match your preferences.</para>
-  </note>
-
-  <note>
-    <para>From time to time the bootscripts are updated to accommodate
-    new packages or to make minor corrections.  All versions of the
-    bootscripts are located at <ulink
-    url="&sources-anduin-http;/blfs-bootscripts/"/>.</para>
-  </note>
+<para>The scripts included for packages such as <xref linkend="gpm"/>
+and <xref linkend="alsa"/> are based around the template supplied with
+the lfs-bootscripts package from version 3.2 and later of the LFS book.
+Note that this is lfs-bootscripts-1.6 and later (the old numbering
+changed as of LFS-3.2).  The scripts won't work with versions of LFS
+before 3.2 because of a change in their organisation with the new
+scripts.  However, it should be trivial to adapt the scripts if needed
+for older LFS versions.</para>
 
 </sect1>
Index: troduction/important/building-notes.xml
===================================================================
--- introduction/important/building-notes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1349 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="unpacking">
-  <?dbhtml filename="notes-on-building.html"?>
-
-
-  <title>Notes on Building Software</title>
-
-  <para>Those people who have built an LFS system may be aware
-  of the general principles of downloading and unpacking software. Some
-  of that information is repeated here for those new to building
-  their own software.</para>
-
-  <para>Each set of installation instructions contains a URL from which you
-  can download the package.  The patches; however, are stored on the LFS
-  servers and are available via HTTP.  These are referenced as needed in the
-  installation instructions.</para>
-
-  <para>While you can keep the source files anywhere you like, we assume that
-  you have unpacked the package and changed into the directory created by the
-  unpacking process (the source directory).  We also assume you have
-  uncompressed any required patches and they are in the directory
-  immediately above the source directory.</para>
-
-  <para>We can not emphasize strongly enough that you should start from a
-  <emphasis>clean source tree</emphasis> each time. This means that if
-  you have had an error during configuration or compilation, it's usually
-  best to delete the source tree and
-  re-unpack it <emphasis>before</emphasis> trying again. This obviously
-  doesn't apply if you're an advanced user used to hacking
-  <filename>Makefile</filename>s and C code, but if in doubt, start from a
-  clean tree.</para>
-
-  <sect2>
-    <title>Building Software as an Unprivileged (non-root) User</title>
-
-    <para>The golden rule of Unix System Administration is to use your
-    superpowers only when necessary. Hence, BLFS recommends that you
-    build software as an unprivileged user and only become the
-    <systemitem class='username'>root</systemitem> user when installing the
-    software. This philosophy is followed in all the packages in this book.
-    Unless otherwise specified, all instructions should be executed as an
-    unprivileged user. The book will advise you on instructions that need
-    <systemitem class='username'>root</systemitem> privileges.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Unpacking the Software</title>
-
-    <para>If a file is in <filename class='extension'>.tar</filename> format
-    and compressed, it is unpacked by running one of the following
-    commands:</para>
-
-<screen><userinput>tar -xvf filename.tar.gz
-tar -xvf filename.tgz
-tar -xvf filename.tar.Z
-tar -xvf filename.tar.bz2</userinput></screen>
-
-    <note>
-      <para>You may omit using the <option>v</option> parameter in the commands
-      shown above and below if you wish to suppress the verbose listing of all
-      the files in the archive as they are extracted. This can help speed up the
-      extraction as well as make any errors produced during the extraction
-      more obvious to you.</para>
-    </note>
-
-    <para>You can also use a slightly different method:</para>
-
-<screen><userinput>bzcat filename.tar.bz2 | tar -xv</userinput></screen>
-
-    <para>
-      Finally, sometimes we have a compressed patch file in
-      <filename class='extension'>.patch.gz</filename> or
-      <filename class='extension'>.patch.bz2</filename> format.
-      The best way to apply the patch is piping the output of the
-      decompressor to the <command>patch</command> utility.  For example:
-    </para>
-
-    <screen><userinput>gzip -cd ../patchname.patch.gz | patch -p1</userinput></screen>
-
-    <para>
-      Or for a patch compressed with <command>bzip2</command>:
-    </para>
-
-    <screen><userinput>bzcat ../patchname.patch.bz2 | patch -p1</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-    <title>Verifying File Integrity</title>
-
-    <para>Generally, to verify that the downloaded file is complete,
-    many package maintainers also distribute md5sums of the files. To verify the
-    md5sum of the downloaded files, download both the file and the
-    corresponding md5sum file to the same directory (preferably from different
-    on-line locations), and (assuming <filename>file.md5sum</filename> is the
-    md5sum file downloaded) run the following command:</para>
-
-<screen><userinput>md5sum -c file.md5sum</userinput></screen>
-
-    <para>If there are any errors, they will be reported. Note that the BLFS
-    book includes md5sums for all the source files also. To use the BLFS
-    supplied md5sums, you can create a <filename>file.md5sum</filename> (place
-    the md5sum data and the exact name of the downloaded file on the same
-    line of a file, separated by white space) and run the command shown above.
-    Alternately, simply run the command shown below and compare the output
-    to the md5sum data shown in the BLFS book.</para>
-
-<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 unmalicious changes to the file content.  For
-    example, an error or truncation introduced during network transfer, or
-    a <quote>stealth</quote> update to the package from the upstream
-    (updating the content of a released tarball instead of making a new
-    release properly).</para>
-
-    <para>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 unofficial 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>
-
-  <sect2>
-    <title>Creating Log Files During Installation</title>
-
-    <para>For larger packages, it is convenient to create log files instead of
-    staring at the screen hoping to catch a particular error or warning. Log
-    files are also useful for debugging and keeping records. The following
-    command allows you to create an installation log. Replace
-    <replaceable>&lt;command&gt;</replaceable> with the command you intend to execute.</para>
-
-<screen><userinput>( <replaceable>&lt;command&gt;</replaceable> 2&gt;&amp;1 | tee compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
-
-    <para><option>2&gt;&amp;1</option> redirects error messages to the same
-    location as standard output. The <command>tee</command> command allows
-    viewing of the output while logging the results to a file. The parentheses
-    around the command run the entire command in a subshell and finally the
-    <command>exit $PIPESTATUS</command> command ensures the result of the
-    <replaceable>&lt;command&gt;</replaceable> is returned as the result and not the
-    result of the <command>tee</command> command.</para>
-
-  </sect2>
-
-  <sect2 id="parallel-builds" xreflabel="Using Multiple Processors">
-    <title>Using Multiple Processors</title>
-
-    <para>For many modern systems with multiple processors (or cores) the
-    compilation time for a package can be reduced by performing a "parallel
-    make" by either setting an environment variable or telling the make program
-    to simultaneously execute multiple jobs.</para>
-
-    <para>For instance, an Intel Core i9-13900K CPU contains 8 performance
-    (P) cores and 16 efficiency (E) cores, and the P cores support SMT
-    (Simultaneous MultiThreading, also known as
-    <quote>Hyper-Threading</quote>) so each P core can run two threads
-    simultaneously and the Linux kernel will treat each P core as two
-    logical cores.  As the result, there are 32 logical cores in total.
-    To utilize all these logical cores running <command>make</command>, we
-    can set an environment variable to tell <command>make</command> to
-    run 32 jobs simultaneously:</para>
-
-    <screen><userinput>export MAKEFLAGS='-j32'</userinput></screen>
-
-    <para>or just building with:</para>
-
-    <screen><userinput>make -j32</userinput></screen>
-
-    <para>
-      If you have applied the optional <command>sed</command> when building
-      <application>ninja</application> in LFS, you can use:
-    </para>
-
-    <screen><userinput>export NINJAJOBS=32</userinput></screen>
-
-    <para>
-      when a package uses <command>ninja</command>, or just:
-    </para>
-
-    <screen><userinput>ninja -j32</userinput></screen>
-
-    <para>
-      If you are not sure about the number of logical cores, run the
-      <command>nproc</command> command.
-    </para>
-
-    <para>
-      For <command>make</command>, the default number of jobs is 1.  But
-      for <command>ninja</command>, the default number of jobs is N + 2 if
-      the number of logical cores N is greater than 2; or N + 1 if
-      N is 1 or 2.  The reason to use a number of jobs slightly greater
-      than the number of logical cores is keeping all logical
-      processors busy even if some jobs are performing I/O operations.
-    </para>
-
-    <para>
-      Note that the <option>-j</option> switches only limits the parallel
-      jobs started by <command>make</command> or <command>ninja</command>,
-      but each job may still spawn its own processes or threads.  For
-      example, <command>ld.gold</command> will use multiple threads for
-      linking, and some tests of packages can spawn multiple threads for
-      testing thread safety properties.  There is no generic way for the
-      building system to know the number of processes or threads spawned by
-      a job. So generally we should not consider the value passed with
-      <option>-j</option> a hard limit of the number of logical cores to
-      use.  Read <xref linkend='build-in-cgroup'/> if you want to set such
-      a hard limit.
-    </para>
-
-    <para>Generally the number of processes should not exceed the number of
-    cores supported by the CPU too much.  To list the processors on your
-    system, issue: <userinput>grep processor /proc/cpuinfo</userinput>.
-    </para>
-
-    <para>In some cases, using multiple processes may result in a race
-    condition where the success of the build depends on the order of the
-    commands run by the <command>make</command> program.  For instance, if an
-    executable needs File A and File B, attempting to link the program before
-    one of the dependent components is available will result in a failure.
-    This condition usually arises because the upstream developer has not
-    properly designated all the prerequisites needed to accomplish a step in the
-    Makefile.</para>
-
-    <para>If this occurs, the best way to proceed is to drop back to a
-    single processor build.  Adding <option>-j1</option> to a make command
-    will override the similar setting in the <envar>MAKEFLAGS</envar>
-    environment variable.</para>
-
-    <important>
-      <para>
-        Another problem may occur with modern CPU's, which have a lot of cores.
-        Each job started consumes memory, and if the sum of the needed
-        memory for each job exceeds the available memory, you may encounter
-        either an OOM (Out of Memory) kernel interrupt or intense swapping
-        that will slow the build beyond reasonable limits.
-      </para>
-
-      <para>
-        Some compilations with <command>g++</command> may consume up to 2.5 GB
-        of memory, so to be safe, you should restrict the number of jobs
-        to (Total Memory in GB)/2.5, at least for big packages such as LLVM,
-        WebKitGtk, QtWebEngine, or libreoffice.
-      </para>
-    </important>
-  </sect2>
-
-  <sect2 id="build-in-cgroup">
-    <title>Use Linux Control Group to Limit the Resource Usage</title>
-
-    <para>
-      Sometimes we want to limit the resource usage when we build a
-      package.  For example, when we have 8 logical cores, we may want
-      to use only 6 cores for building the package and reserve another
-      2 cores for playing a movie.  The Linux kernel provides a feature
-      called control groups (cgroup) for such a need.
-    </para>
-
-    <para>
-      Enable control group in the kernel configuration, then rebuild the
-      kernel and reboot if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="cgroup-kernel.xml"/>
-
-    <!-- We need cgroup2 mounted at /sys/fs/cgroup.  It's done by
-         systemd itself in LFS systemd, mountvirtfs script in LFS sysv. -->
-
-    <para revision='systemd'>
-      Ensure <xref linkend='systemd'/> and <xref linkend='shadow'/> have
-      been rebuilt with <xref linkend='linux-pam'/> support (if you are
-      interacting via a SSH or graphical session, also ensure the
-      <xref linkend='openssh'/> server or the desktop manager has been
-      built with <xref linkend='linux-pam'/>).  As the &root; user, create
-      a configuration file to allow resource control without &root;
-      privilege, and instruct <command>systemd</command> to reload the
-      configuration:
-    </para>
-
-    <screen revision="systemd" role="nodump"><userinput>mkdir -pv /etc/systemd/system/user@.service.d &amp;&amp;
-cat &gt; /etc/systemd/system/user@.service.d/delegate.conf &lt;&lt; EOF &amp;&amp;
-<literal>[Service]
-Delegate=memory cpuset</literal>
-systemctl daemon-reload</userinput></screen>
-
-    <para revision='systemd'>
-      Then logout and login again.  Now to run <command>make -j5</command>
-      with the first 4 logical cores and 8 GB of system memory, issue:
-    </para>
-
-    <screen revision="systemd" role="nodump"><userinput>systemctl   --user start dbus                &amp;&amp;
-systemd-run --user --pty --pipe --wait -G -d \
-            -p MemoryHigh=8G                 \
-            -p AllowedCPUs=0-3               \
-            make -j5</userinput></screen>
-
-    <para revision='sysv'>
-      Ensure <xref linkend='sudo'/> is installed.  To run
-      <command>make -j5</command> with the first 4 logical cores and 8 GB
-      of system memory, issue:
-    </para>
-
-    <!-- "\EOF" because we expect $$ to be expanded by the "bash -e"
-         shell, not the current shell.
-
-         TODO: can we use elogind to delegate the controllers (like
-         systemd) to avoid relying on sudo?  -->
-    <screen revision="sysv" role="nodump"><userinput>bash -e &lt;&lt; \EOF
-  sudo mkdir /sys/fs/cgroup/$$
-  sudo sh -c \
-    "echo +memory +cpuset > /sys/fs/cgroup/cgroup.subtree_control"
-  sudo sh -c \
-    "echo 0-3 > /sys/fs/cgroup/$$/cpuset.cpus"
-  sudo sh -c \
-    "echo $(bc -e '8*2^30') > /sys/fs/cgroup/$$/memory.high"
-  (
-    sudo sh -c "echo $BASHPID > /sys/fs/cgroup/$$/cgroup.procs"
-    exec make -j5
-  )
-  sudo rmdir /sys/fs/cgroup/$$
-EOF</userinput></screen>
-
-    <para>
-      With
-      <phrase revision='systemd'>
-        <parameter>MemoryHigh=8G</parameter>
-      </phrase>
-      <phrase revision='sysv'>
-        <literal>8589934592</literal> (the output of
-        <userinput>bc -e '8*2^30'</userinput>, 2^30 represents
-        2<superscript>30</superscript>, i.e. a Gigabyte) in the
-        <filename>memory.high</filename> entry
-      </phrase>, a soft limit of memory usage is set.
-      If the processes in the cgroup (<command>make</command> and all the
-      descendants of it) uses more than 8 GB of system memory in total,
-      the kernel will throttle down the processes and try to reclaim the
-      system memory from them.  But they can still use more than 8 GB of
-      system memory.  If you want to make a hard limit instead, replace
-      <phrase revision='systemd'>
-        <parameter>MemoryHigh</parameter> with
-        <parameter>MemoryMax</parameter>.
-      </phrase>
-      <phrase revision='sysv'>
-        <filename>memory.high</filename> with
-        <filename>memory.max</filename>.
-      </phrase>
-      But doing so will cause the processes killed if 8 GB is not enough
-      for them.
-    </para>
-
-    <para>
-      <phrase revision='systemd'>
-        <parameter>AllowedCPUs=0-3</parameter>
-      </phrase>
-      <phrase revision='sysv'>
-        <literal>0-3</literal> in the <filename>cpuset.cpus</filename>
-        entry
-      </phrase> makes the kernel only run the processes in the cgroup on
-      the logical cores with numbers 0, 1, 2, or 3.  You may need to
-      adjust this setting based the mapping between the logical cores and the
-      physical cores.  For example, with an Intel Core i9-13900K CPU,
-      the logical cores 0, 2, 4, ..., 14 are mapped to the first threads of
-      the eight physical P cores, the logical cores 1, 3, 5, ..., 15 are
-      mapped to the second threads of the physical P cores, and the logical
-      cores 16, 17, ..., 31 are mapped to the 16 physical E cores.  So if
-      we want to use four threads from four different P cores, we need to
-      specify <literal>0,2,4,6</literal> instead of <literal>0-3</literal>.
-      Note that the other CPU models may use a different mapping scheme.
-      If you are not sure about the mapping between the logical cores
-      and the physical cores, run <command>grep -E '^processor|^core'
-      /proc/cpuinfo</command> which will output logical core IDs in the
-      <computeroutput>processor</computeroutput> lines, and physical core
-      IDs in the <computeroutput>core id</computeroutput> lines.
-    </para>
-
-    <para>
-      When the <command>nproc</command> or <command>ninja</command> command
-      runs in a cgroup, it will use the number of logical cores assigned to
-      the cgroup as the <quote>system logical core count</quote>.  For
-      example, in a cgroup with logical cores 0-3 assigned,
-      <command>nproc</command> will print
-      <computeroutput>4</computeroutput>, and <command>ninja</command>
-      will run 6 (4 + 2) jobs simultaneously if no <option>-j</option>
-      setting is explicitly given.
-    </para>
-
-    <para revision="systemd">
-      Read the man pages <ulink role='man'
-      url='&man;systemd-run.1'>systemd-run(1)</ulink> and
-      <ulink role='man'
-  url='&man;systemd.resource-control.5'>systemd.resource-control(5)</ulink>
-      for the detailed explanation of parameters in the command.
-    </para>
-
-    <para revision="sysv">
-      Read the <filename>Documentation/admin-guide/cgroup-v2.rst</filename>
-      file in the Linux kernel source tree for the detailed explanation of
-      <systemitem class="filesystem">cgroup2</systemitem> pseudo file
-      system entries referred in the command.
-    </para>
-
-  </sect2>
-
-  <sect2 id="automating-builds" xreflabel="Automated Building Procedures">
-    <title>Automated Building Procedures</title>
-
-    <para>There are times when automating the building of a package can come in
-    handy. Everyone has their own reasons for wanting to automate building,
-    and everyone goes about it in their own way. Creating
-    <filename>Makefile</filename>s, <application>Bash</application> scripts,
-    <application>Perl</application> scripts or simply a list of commands used
-    to cut and paste are just some of the methods you can use to automate
-    building BLFS packages. Detailing how and providing examples of the many
-    ways you can automate the building of packages is beyond the scope of this
-    section. This section will expose you to using file redirection and the
-    <command>yes</command> command to help provide ideas on how to automate
-    your builds.</para>
-
-    <bridgehead renderas="sect3">File Redirection to Automate Input</bridgehead>
-
-    <para>You will find times throughout your BLFS journey when you will come
-    across a package that has a command prompting you for information. This
-    information might be configuration details, a directory path, or a response
-    to a license agreement. This can present a challenge to automate the
-    building of that package. Occasionally, you will be prompted for different
-    information in a series of questions. One method to automate this type of
-    scenario requires putting the desired responses in a file and using
-    redirection so that the program uses the data in the file as the answers to
-    the questions.</para>
-<!-- outdated
-    <para>Building the <application>CUPS</application> package is a good
-    example of how redirecting a file as input to prompts can help you automate
-    the build. If you run the test suite, you are asked to respond to a series
-    of questions regarding the type of test to run and if you have any
-    auxiliary programs the test can use. You can create a file with your
-    responses, one response per line, and use a command similar to the
-    one shown below to automate running the test suite:</para>
-
-<screen><userinput>make check &lt; ../cups-1.1.23-testsuite_parms</userinput></screen>
--->
-    <para>This effectively makes the test suite use the responses in the file
-    as the input to the questions. Occasionally you may end up doing a bit of
-    trial and error determining the exact format of your input file for some
-    things, but once figured out and documented you can use this to automate
-    building the package.</para>
-
-    <bridgehead renderas="sect3">Using <command>yes</command> to Automate
-    Input</bridgehead>
-
-    <para>Sometimes you will only need to provide one response, or provide the
-    same response to many prompts. For these instances, the
-    <command>yes</command> command works really well. The
-    <command>yes</command> command can be used to provide a response (the same
-    one) to one or more instances of questions. It can be used to simulate
-    pressing just the <keycap>Enter</keycap> key, entering the
-    <keycap>Y</keycap> key or entering a string of text. Perhaps the easiest
-    way to show its use is in an example.</para>
-
-    <para>First, create a short <application>Bash</application> script by
-    entering the following commands:</para>
-
-<screen><userinput>cat &gt; blfs-yes-test1 &lt;&lt; "EOF"
-<literal>#!/bin/bash
-
-echo -n -e "\n\nPlease type something (or nothing) and press Enter ---> "
-
-read A_STRING
-
-if test "$A_STRING" = ""; then A_STRING="Just the Enter key was pressed"
-else A_STRING="You entered '$A_STRING'"
-fi
-
-echo -e "\n\n$A_STRING\n\n"</literal>
-EOF
-chmod 755 blfs-yes-test1</userinput></screen>
-
-    <para>Now run the script by issuing <command>./blfs-yes-test1</command> from
-    the command line. It will wait for a response, which can be anything (or
-    nothing) followed by the <keycap>Enter</keycap> key. After entering
-    something, the result will be echoed to the screen. Now use the
-    <command>yes</command> command to automate the entering of a
-    response:</para>
-
-<screen><userinput>yes | ./blfs-yes-test1</userinput></screen>
-
-    <para>Notice that piping <command>yes</command> by itself to the script
-    results in <keycap>y</keycap> being passed to the script. Now try it with a
-    string of text:</para>
-
-<screen><userinput>yes 'This is some text' | ./blfs-yes-test1</userinput></screen>
-
-    <para>The exact string was used as the response to the script. Finally,
-    try it using an empty (null) string:</para>
-
-<screen><userinput>yes '' | ./blfs-yes-test1</userinput></screen>
-
-    <para>Notice this results in passing just the press of the
-    <keycap>Enter</keycap> key to the script. This is useful for times when the
-    default answer to the prompt is sufficient. This syntax is used in the
-    <xref linkend="net-tools-automate-example"/> instructions to accept all the
-    defaults to the many prompts during the configuration step. You may now
-    remove the test script, if desired.</para>
-
-    <bridgehead renderas="sect3">File Redirection to Automate Output</bridgehead>
-
-    <para>In order to automate the building of some packages, especially those
-    that require you to read a license agreement one page at a time, requires
-    using a method that avoids having to press a key to display each page.
-    Redirecting the output to a file can be used in these instances to assist
-    with the automation. The previous section on this page touched on creating
-    log files of the build output. The redirection method shown there used the
-    <command>tee</command> command to redirect output to a file while also
-    displaying the output to the screen. Here, the output will only be sent to
-    a file.</para>
-
-    <para>Again, the easiest way to demonstrate the technique is to show an
-    example. First, issue the command:</para>
-
-<screen><userinput>ls -l /usr/bin | less</userinput></screen>
-
-    <para>Of course, you'll be required to view the output one page at a time
-    because the <command>less</command> filter was used. Now try the same
-    command, but this time redirect the output to a file. The special file
-    <filename>/dev/null</filename> can be used instead of the filename shown,
-    but you will have no log file to examine:</para>
-
-<screen><userinput>ls -l /usr/bin | less &gt; redirect_test.log 2&gt;&amp;1</userinput></screen>
-
-    <para>Notice that this time the command immediately returned to the shell
-    prompt without having to page through the output. You may now remove the
-    log file.</para>
-
-    <para>The last example will use the <command>yes</command> command in
-    combination with output redirection to bypass having to page through the
-    output and then provide a <keycap>y</keycap> to a prompt. This technique
-    could be used in instances when otherwise you would have to page through
-    the output of a file (such as a license agreement) and then answer the
-    question of <quote>do you accept the above?</quote>. For this example,
-    another short <application>Bash</application> script is required:</para>
-
-<screen><userinput>cat &gt; blfs-yes-test2 &lt;&lt; "EOF"
-<literal>#!/bin/bash
-
-ls -l /usr/bin | less
-
-echo -n -e "\n\nDid you enjoy reading this? (y,n) "
-
-read A_STRING
-
-if test "$A_STRING" = "y"; then A_STRING="You entered the 'y' key"
-else A_STRING="You did NOT enter the 'y' key"
-fi
-
-echo -e "\n\n$A_STRING\n\n"</literal>
-EOF
-chmod 755 blfs-yes-test2</userinput></screen>
-
-    <para>This script can be used to simulate a program that requires you to
-    read a license agreement, then respond appropriately to accept the
-    agreement before the program will install anything. First, run the script
-    without any automation techniques by issuing
-    <command>./blfs-yes-test2</command>.</para>
-
-    <para>Now issue the following command which uses two automation techniques,
-    making it suitable for use in an automated build script:</para>
-
-<screen><userinput>yes | ./blfs-yes-test2 &gt; blfs-yes-test2.log 2&gt;&amp;1</userinput></screen>
-
-    <para>If desired, issue <command>tail blfs-yes-test2.log</command> to see
-    the end of the paged output, and confirmation that <keycap>y</keycap> was
-    passed through to the script. Once satisfied that it works as it should,
-    you may remove the script and log file.</para>
-
-    <para>Finally, keep in mind that there are many ways to automate and/or
-    script the build commands. There is not a single <quote>correct</quote> way
-    to do it. Your imagination is the only limit.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Dependencies</title>
-
-    <para>For each package described, BLFS lists the known dependencies.
-    These are listed under several headings, whose meaning is as follows:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><emphasis>Required</emphasis> means that the target package
-        cannot be correctly built without the dependency having first been
-        installed, except if the dependency is said to be
-        <quote>runtime</quote>, which means the target package can be built but
-        cannot function without it.</para>
-        <para>
-          Note that a target package can start to <quote>function</quote>
-          in many subtle ways: an installed configuration file can make the
-          init system, cron daemon, or bus daemon to run a program
-          automatically; another package using the target package as an
-          dependency can run a program from the target package in the
-          building system; and the configuration sections in the BLFS book
-          may also run a program from a just installed package.  So if
-          you are installing the target package without a
-          <emphasis>Required (runtime)</emphasis> dependency installed,
-          You should install the dependency as soon as possible after the
-          installation of the target package.
-        </para>
-      </listitem>
-      <listitem>
-        <para><emphasis>Recommended</emphasis> means that BLFS strongly
-        suggests this package is installed first (except if said to be
-        <quote>runtime</quote>, see below) for a clean and trouble-free
-        build, that won't have issues either during the build process, or at
-        run-time.  The instructions in the book assume these packages are
-        installed.  Some changes or workarounds may be required if these
-        packages are not installed. If a recommended dependency is said
-        to be <quote>runtime</quote>, it means that BLFS strongly suggests
-        that this dependency is installed before using the package, for
-        getting full functionality.</para>
-      </listitem>
-      <listitem>
-        <para><emphasis>Optional</emphasis> means that this package might be
-        installed for added functionality. Often BLFS will describe the
-        dependency to explain the added functionality that will result.
-        An optional dependency may be automatically pick up by the target
-        package if the dependency is installed, but another some optional
-        dependency may also need additional configuration options to enable
-        them when the target package is built.  Such additional options are
-        often documented in the BLFS book.  If an optional dependency is
-        said to be <quote>runtime</quote>, it means you may install
-        the dependency after installing the target package to support some
-        optional features of the target package if you need these
-        features.</para>
-        <para>An optional dependency may be out of BLFS.  If you need such
-        an <emphasis>external</emphasis> optional dependency for some
-        features you need, read <xref linkend='beyond'/> for the general
-        hint about installing an out-of-BLFS package.</para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 id="package_updates">
-    <title>Using the Most Current Package Sources</title>
-
-    <para>On occasion you may run into a situation in the book when a package
-    will not build or work properly. Though the Editors attempt to ensure
-    that every package in the book builds and works properly, sometimes a
-    package has been overlooked or was not tested with this particular version
-    of BLFS.</para>
-
-    <para>If you discover that a package will not build or work properly, you
-    should see if there is a more current version of the package. Typically
-    this means you go to the maintainer's web site and download the most current
-    tarball and attempt to build the package. If you cannot determine the
-    maintainer's web site by looking at the download URLs, use Google and query
-    the package's name. For example, in the Google search bar type:
-    'package_name download' (omit the quotes) or something similar. Sometimes
-    typing: 'package_name home page' will result in you finding the
-    maintainer's web site.</para>
-
-  </sect2>
-
-  <sect2 id="stripping">
-    <title>Stripping One More Time</title>
-
-    <para>
-      In LFS, stripping of debugging symbols and unneeded symbol table
-      entries was discussed a couple of times.  When building BLFS packages,
-      there are generally no special instructions that discuss stripping
-      again. Stripping can be done while installing a package, or
-      afterwards.
-    </para>
-
-    <bridgehead renderas="sect3" id="stripping-install">Stripping while Installing a Package</bridgehead>
-
-    <para>
-      There are several ways to strip executables installed by a
-      package. They depend on the build system used (see below <link
-        linkend="buildsystems">the section about build systems</link>),
-      so only some
-      generalities can be listed here:
-    </para>
-
-    <note>
-      <para>
-        The following methods using the feature of a building system
-        (autotools, meson, or cmake) will not strip static libraries if any
-        is installed.  Fortunately there are not too many static libraries
-        in BLFS, and a static library can always be stripped safely by
-        running <command>strip --strip-unneeded</command> on it manually.
-      </para>
-    </note>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          The packages using autotools usually have an
-          <parameter>install-strip</parameter> target in their generated
-          <filename>Makefile</filename> files. So installing stripped
-          executables is just a matter of using
-          <command>make install-strip</command> instead of
-          <command>make install</command>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The packages using the meson build system can accept
-          <parameter>-Dstrip=true</parameter> when running
-          <command>meson</command>.  If you've forgot to add this option
-          running the <command>meson</command>, you can also run
-          <command>meson install --strip</command> instead of
-          <command>ninja install</command>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <command>cmake</command> generates
-          <parameter>install/strip</parameter> targets for both the
-          <parameter>Unix Makefiles</parameter> and
-          <parameter>Ninja</parameter> generators (the default is
-          <parameter>Unix Makefiles</parameter> on linux). So just run
-          <command>make install/strip</command> or
-          <command>ninja install/strip</command> instead of the
-          <command>install</command> counterparts.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Removing (or not generating) debug symbols can also be
-          achieved by removing the
-          <parameter>-g&lt;something&gt;</parameter> options
-          in C/C++ calls. How to do that is very specific for each
-          package.  And, it does not remove unneeded symbol table entries.
-          So it will not be explained in detail here. See also below
-          the paragraphs about optimization.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3" id="stripping-installed">Stripping Installed Executables</bridgehead>
-
-    <para>
-      The <command>strip</command> utility changes files in place, which may
-      break anything using it if it is loaded in memory. Note that if a file is
-      in use but just removed from the disk (i.e. not overwritten nor
-      modified), this is not a problem since the kernel can use
-      <quote>deleted</quote> files.  Look at <filename>/proc/*/maps</filename>
-      and it is likely that you'll see some <emphasis>(deleted)</emphasis>
-      entries. The <command>mv</command> just removes the destination file from
-      the directory but does not touch its content, so that it satisfies the
-      condition for the kernel to use the old (deleted) file.
-      But this approach can detach hard links into duplicated copies,
-      causing a bloat which is obviously unwanted as we are stripping to
-      reduce system size.  If two files in a same file system share the
-      same inode number, they are hard links to each other and we should
-      reconstruct the link.  The script below is just an example.
-      It should be run as the &root; user:
-    </para>
-
-<screen><userinput>cat &gt; /usr/sbin/strip-all.sh &lt;&lt; "EOF"
-<literal>#!/usr/bin/bash
-
-if [ $EUID -ne 0 ]; then
-  echo "Need to be root"
-  exit 1
-fi
-
-last_fs_inode=
-last_file=
-
-{ find /usr/lib -type f -name '*.so*' ! -name '*dbg'
-  find /usr/lib -type f -name '*.a'
-  find /usr/{bin,sbin,libexec} -type f
-} | xargs stat -c '%m %i %n' | sort | while read fs inode file; do
-       if ! readelf -h $file >/dev/null 2>&amp;1; then continue; fi
-       if file $file | grep --quiet --invert-match 'not stripped'; then continue; fi
-
-       if [ "$fs $inode" = "$last_fs_inode" ]; then
-         ln -f $last_file $file;
-         continue;
-       fi
-
-       cp --preserve $file    ${file}.tmp
-       strip --strip-unneeded ${file}.tmp
-       mv ${file}.tmp $file
-
-       last_fs_inode="$fs $inode"
-       last_file=$file
-done</literal>
-EOF
-chmod 744 /usr/sbin/strip-all.sh</userinput></screen>
-
-    <para>
-      If you install programs in other directories such as <filename
-      class="directory">/opt</filename> or <filename
-      class="directory">/usr/local</filename>, you may want to strip the files
-      there too. Just add other directories to scan in the compound list of
-      <command>find</command> commands between the braces.
-    </para>
-
-    <para>
-      For more information on stripping, see <ulink
-      url="https://www.technovelty.org/linux/stripping-shared-libraries.html"/>.
-    </para>
-
-  </sect2>
-
-<!--
-  <sect2 id="libtool">
-    <title>Libtool files</title>
-
-    <para>
-      One of the side effects of packages that use Autotools, including
-      libtool, is that they create many files with an .la extension.  These
-      files are not needed in an LFS environment.  If there are conflicts with
-      pkgconfig entries, they can actually prevent successful builds.  You
-      may want to consider removing these files periodically:
-    </para>
-
-<screen><userinput>find /lib /usr/lib -not -path "*Image*" -a -name \*.la -delete</userinput></screen>
-
-    <para>
-      The above command removes all .la files with the exception of those that
-      have <quote>Image</quote> or <quote>openldap</quote> as a part of the
-      path.  These .la files are used by the ImageMagick and openldap programs,
-      respectively.  There may be other exceptions by packages not in BLFS.
-    </para>
-
-  </sect2>
--->
-  <sect2 id="buildsystems">
-    <title>Working with different build systems</title>
-
-    <para>
-      There are now three different build systems in common use for
-      converting C or C++ source code into compiled programs or
-      libraries and their details (particularly, finding out about available
-      options and their default values) differ. It may be easiest to understand
-      the issues caused by some choices (typically slow execution or
-      unexpected use of, or omission of, optimizations) by starting with
-      the <envar>CFLAGS</envar>, <envar>CXXFLAGS</envar>, and
-      <envar>LDFLAGS</envar> environment variables.  There are also some
-      programs which use Rust.
-    </para>
-
-    <para>
-      Most LFS and BLFS builders are probably aware of the basics of
-      <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> for altering how a
-      program is compiled. Typically, some form of optimization is used by
-      upstream developers (<option>-O2</option> or <option>-O3</option>),
-      sometimes with the creation of debug symbols (<option>-g</option>),
-      as defaults.
-    </para>
-
-    <para>
-      If there are contradictory flags (e.g. multiple different
-      <option>-O</option> values),
-      the <emphasis>last</emphasis> value will be used. Sometimes this means
-      that flags specified in environment variables will be picked up before
-      values hardcoded in the Makefile, and therefore ignored.  For example,
-      where a user specifies <option>-O2</option> and that is followed by
-      <option>-O3</option> the build will use <option>-O3</option>.
-    </para>
-
-    <para>
-      There are various other things which can be passed in CFLAGS or
-      CXXFLAGS, such as allowing using the instruction set extensions
-      available with a specific microarchitecture (e.g.
-      <option>-march=amdfam10</option> or <option>-march=native</option>),
-      tune the generated code for a specific microarchitecture (e. g.
-      <option>-mtune=tigerlake</option> or <option>-mtune=native</option>,
-      if <option>-mtune=</option> is not used, the microarchitecture from
-      <option>-march=</option> setting will be used), or specifying a
-      specific standard for C or C++ (<option>-std=c++17</option> for
-      example).  But one thing which has now come to light is that
-      programmers might include debug assertions in their code, expecting
-      them to be disabled in releases by using <option>-DNDEBUG</option>.
-      Specifically, if <xref linkend="mesa"/> is built with these
-      assertions enabled, some activities such as loading levels of games
-      can take extremely long times, even on high-class video cards.
-    </para>
-
-    <bridgehead renderas="sect3" id="autotools-info">Autotools with Make</bridgehead>
-
-      <para>
-        This combination is often described as <quote>CMMI</quote>
-        (configure, make, make install) and is used here to also cover
-        the few packages which have a configure script that is not
-        generated by autotools.
-      </para>
-
-      <para>
-        Sometimes running <command>./configure --help</command> will produce
-        useful options about switches which might be used.  At other times,
-        after looking at the output from configure you may need to look
-        at the details of the script to find out what it was actually searching
-        for.
-      </para>
-
-      <para>
-       Many configure scripts will pick up any CFLAGS or CXXFLAGS from the
-       environment, but CMMI packages vary about how these will be mixed with
-       any flags which would otherwise be used (<emphasis>variously</emphasis>:
-       ignored, used to replace the programmer's suggestion, used before the
-       programmer's suggestion, or used after the programmer's suggestion).
-      </para>
-
-      <para>
-        In most CMMI packages, running <command>make</command> will list
-        each command and run it, interspersed with any warnings. But some
-        packages try to be <quote>silent</quote> and only show which file
-        they are compiling or linking instead of showing the command line.
-        If you need to inspect the command, either because of an error, or
-        just to see what options and flags are being used, adding
-        <option>V=1</option> to the make invocation may help.
-      </para>
-
-    <bridgehead renderas="sect3" id="cmake-info">CMake</bridgehead>
-
-      <para>
-        CMake works in a very different way, and it has two backends which
-        can be used on BLFS: <command>make</command> and
-        <command>ninja</command>. The default backend is make, but
-        ninja can be faster on large packages with multiple processors. To
-        use ninja, specify <option>-G Ninja</option> in the cmake command.
-        However, there are some packages which create fatal errors in their
-        ninja files but build successfully using the default of Unix
-        Makefiles.
-      </para>
-
-      <para>
-        The hardest part of using CMake is knowing what options you might wish
-        to specify. The only way to get a list of what the package knows about
-        is to run <command>cmake -LAH</command> and look at the output for that
-        default configuration.
-      </para>
-
-      <para>
-        Perhaps the most-important thing about CMake is that it has a variety
-        of CMAKE_BUILD_TYPE values, and these affect the flags. The default
-        is that this is not set and no flags are generated. Any
-        <envar>CFLAGS</envar> or <envar>CXXFLAGS</envar> in the environment
-        will be used. If the programmer has coded any debug assertions,
-        those will be enabled unless -DNDEBUG is used. The following
-        CMAKE_BUILD_TYPE values will generate the flags shown, and these
-        will come <emphasis>after</emphasis> any flags in the environment
-        and therefore take precedence.
-      </para>
-
-      <informaltable align="center">
-        <tgroup cols="2">
-          <colspec colnum="1" align="center"/>
-          <colspec colnum="2" align="center"/>
-          <thead>
-            <row><entry>Value</entry><entry>Flags</entry></row>
-          </thead>
-          <tbody>
-            <row>
-              <entry>Debug</entry><entry><option>-g</option></entry>
-            </row>
-            <row>
-              <entry>Release</entry><entry><option>-O3 -DNDEBUG</option></entry>
-            </row>
-            <row>
-              <entry>RelWithDebInfo</entry><entry><option>-O2 -g -DNDEBUG</option></entry>
-            </row>
-            <row>
-              <entry>MinSizeRel</entry><entry><option>-Os -DNDEBUG</option></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-
-      <para>
-        CMake tries to produce quiet builds. To see the details of the commands
-        which are being run, use <command>make VERBOSE=1</command> or
-        <command>ninja -v</command>.
-      </para>
-
-      <para>
-        By default, CMake treats file installation differently from the other
-        build systems: if a file already exists and is not newer than a file
-        that would overwrite it, then the file is not installed. This may be
-        a problem if a user wants to record which file belongs to a package,
-        either using <envar>LD_PRELOAD</envar>, or by listing files newer
-        than a timestamp. The default can be changed by setting the variable
-        <envar>CMAKE_INSTALL_ALWAYS</envar> to 1 in the
-        <emphasis>environment</emphasis>, for example by
-        <command>export</command>'ing it.
-      </para>
-
-    <bridgehead renderas="sect3" id="meson-info">Meson</bridgehead>
-
-      <para>
-        Meson has some similarities to CMake, but many differences. To get
-        details of the defines that you may wish to change you can look at
-        <filename>meson_options.txt</filename> which is usually in the
-        top-level directory.
-      </para>
-
-      <para>
-        If you have already configured the package by running
-        <command>meson</command> and now wish to change one or more settings,
-        you can either remove the build directory, recreate it, and use the
-        altered options, or within the build directory run <command>meson
-        configure</command>, e.g. to set an option:
-      </para>
-
-<screen><userinput>meson configure -D&lt;some_option&gt;=true</userinput></screen>
-
-      <para>
-        If you do that, the file <filename>meson-private/cmd_line.txt</filename>
-        will show the <emphasis>last</emphasis> commands which were used.
-      </para>
-
-      <para>
-        Meson provides the following buildtype values, and the flags they enable
-        come <emphasis>after</emphasis> any flags supplied in the environment and
-        therefore take precedence.
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>plain : no added flags. This is for distributors to supply their
-          own <envar>CFLAGS</envar>, <envar>CXXFLAGS</envar> and
-          <envar>LDFLAGS</envar>. There is no obvious reason to use
-          this in BLFS.</para>
-        </listitem>
-        <listitem>
-          <para>debug : <option>-g</option> - 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>
-        </listitem>
-        <listitem>
-          <para>debugoptimized : <option>-O2 -g</option> - this is the
-          default specified in <filename>meson.build</filename> of some
-          packages.</para>
-        </listitem>
-        <listitem>
-          <para>release : <option>-O3</option> (occasionally a package will
-          force <option>-O2</option> here) - this is the buildtype we use
-          for most packages with Meson build system in BLFS.</para>
-        </listitem>
-      </itemizedlist>
-
-      <!-- From https://mesonbuild.com/Builtin-options.html#core-options:
-           b_ndebug: Default value = false, Possible values are
-           true, false, if-release.  Some packages sets it to if-release
-           so we mistakenly believed if-release had been the default.  -->
-      <para>
-        The <option>-DNDEBUG</option> flag is implied by the release
-        buildtype for some packages (for example <xref linkend='mesa'/>).
-        It can also be provided explicitly by passing
-        <option>-Db_ndebug=true</option>.
-      </para>
-
-      <para>
-        To see the details of the commands which are being run in a package using
-        meson, use <command>ninja -v</command>.
-      </para>
-
-    <bridgehead renderas="sect3" id="rust-info">Rustc and Cargo</bridgehead>
-
-      <para>
-        Most released rustc programs are provided as crates (source tarballs)
-        which will query a server to check current versions of dependencies
-        and then download them as necessary.  These packages are built using
-        <command>cargo --release</command>. In theory, you can manipulate the
-        RUSTFLAGS to change the optimize-level (default for
-        <option>--release</option> is 3, i. e.
-        <option>-Copt-level=3</option>, like <option>-O3</option>) or to
-        force it to build for the machine it is being compiled on, using
-        <option>-Ctarget-cpu=native</option> but in practice this seems to
-        make no significant difference.
-      </para>
-
-      <para>
-        If you are compiling a standalone Rust program (as an unpackaged
-        <filename class='extension'>.rs</filename> file) by running
-        <command>rustc</command> directly, you should specify
-        <option>-O</option> (the abbreviation of
-        <option>-Copt-level=2</option>) or <option>-Copt-level=3</option>
-        otherwise it will do an unoptimized compile and run
-        <emphasis>much</emphasis> slower.  If are compiling the program
-        for debugging it, replace the <option>-O</option> or
-        <option>-Copt-level=</option> options with <option>-g</option> to
-        produce an unoptimized program with debug info.
-      </para>
-
-      <para>
-        Like <command>ninja</command>, by default <command>cargo</command>
-        uses all logical cores.  This can often be worked around,
-        either by exporting
-        <envar>CARGO_BUILD_JOBS=<replaceable>&lt;N&gt;</replaceable></envar>
-        or passing
-        <option>--jobs <replaceable>&lt;N&gt;</replaceable></option> to
-        <command>cargo</command>.
-        For compiling rustc itself, specifying
-        <option>--jobs <replaceable>&lt;N&gt;</replaceable></option> for
-        invocations of <command>x.py</command>
-        (together with the <envar>CARGO_BUILD_JOBS</envar> environment
-        variable, which looks like a <quote>belt and braces</quote>
-        approach but seems to be necessary) mostly works. The exception is
-        running the tests when building rustc, some of them will
-        nevertheless use all online CPUs, at least as of rustc-1.42.0.
-      </para>
-
-  </sect2>
-
-  <sect2 id="optimizations">
-    <title>Optimizing the build</title>
-
-      <para>
-        Many people will prefer to optimize compiles as they see fit, by providing
-        <envar>CFLAGS</envar> or <envar>CXXFLAGS</envar>. For an
-        introduction to the options available with gcc and g++ see <ulink
-        url="https://gcc.gnu.org/onlinedocs/gcc-&gcc-version;/gcc/Optimize-Options.html"/>.
-        The same content can be also found in <command>info gcc</command>.
-      </para>
-
-      <para>
-        Some packages default to <option>-O2 -g</option>, others to
-        <option>-O3 -g</option>, and if <envar>CFLAGS</envar> or
-        <envar>CXXFLAGS</envar> are supplied they might be added to the
-        package's defaults, 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
-        particular, <filename>README.txt</filename>,
-        <filename>tuning-1-packages-and-notes.txt</filename>, and
-        <filename>tuning-notes-2B.txt</filename>. The particular thing to
-        remember is that if you want to try some of the more interesting
-        flags you may need to force verbose builds to confirm what is being
-        used.
-      </para>
-
-      <para>
-        Clearly, if you are optimizing your own program you can spend time to
-        profile it and perhaps recode some of it if it is too slow. But for
-        building a whole system that approach is impractical. In general,
-        <option>-O3</option> usually produces faster programs than
-        <option>-O2</option>.  Specifying
-        <option>-march=native</option> is also beneficial, but means that
-        you cannot move the binaries to an incompatible machine - this can
-        also apply to newer machines, not just to older machines. For
-        example programs compiled for <literal>amdfam10</literal> run on
-        old Phenoms, Kaveris, and Ryzens : but programs compiled for a
-        Kaveri will not run on a Ryzen because certain op-codes are not
-        present.  Similarly, if you build for a Haswell not everything will
-        run on a SandyBridge.
-      </para>
-
-      <note>
-        <para>
-          Be careful that the name of a <option>-march</option> setting
-          does not always match the baseline of the microarchitecture
-          with the same name.  For example, the Skylake-based Intel Celeron
-          processors do not support AVX at all, but
-          <option>-march=skylake</option> assumes AVX and even AVX2.
-        </para>
-      </note>
-
-      <para>
-        When a shared library is built by GCC, a feature named
-        <quote>semantic interposition</quote> is enabled by default.  When
-        the shared library refers to a symbol name with external linkage
-        and default visibility, if the symbol exists in both the shared
-        library and the main executable, semantic interposition guarantees
-        the symbol in the main executable is always used.  This feature
-        was invented in an attempt to make the behavior of linking a shared
-        library and linking a static library as similar as possible.  Today
-        only a small number of packages still depend on semantic
-        interposition, but the feature is still on by the default of GCC,
-        causing many optimizations disabled for shared libraries because
-        they conflict with semantic interposition.  The
-        <option>-fno-semantic-interposition</option> option can be passed
-        to <command>gcc</command> or <command>g++</command> to disable
-        semantic interposition and enable more optimizations for shared
-        libraries.  This option is used as the default of some packages
-        (for example <xref linkend='python3'/>), and it's also the default
-        of Clang.
-      </para>
-
-      <para>
-        There are also various other options which some people claim are
-        beneficial. At worst, you get to recompile and test, and then
-        discover that in your usage the options do not provide a benefit.
-      </para>
-
-      <para>
-        If building Perl or Python modules,
-        in general the <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
-        used are those which were used by those <quote>parent</quote>
-        packages.
-      </para>
-
-      <para>
-        For <envar>LDFLAGS</envar>, there are three options can be used
-        for optimization.  They are quite safe to use and the building
-        system of some packages use some of these options as the default.
-      </para>
-
-      <para>
-        With <option>-Wl,-O1</option>, the linker will
-        optimize the hash table to speed up the dynamic linking.
-        Note that <option>-Wl,-O1</option> is completely unrelated to the
-        compiler optimization flag <option>-O1</option>.
-      </para>
-
-      <para>
-        With <option>-Wl,--as-needed</option>, the linker will disregard
-        unnecessary <option>-l<replaceable>foo</replaceable></option> options
-        from the command line, i. e. the shared library <systemitem
-        class='library'>lib<replaceable>foo</replaceable></systemitem>
-        will only be linked if a symbol in <systemitem
-        class='library'>lib<replaceable>foo</replaceable></systemitem> is
-        really referred from the executable or shared library being linked.
-        This can sometimes mitigate the <quote>excessive dependencies to
-        shared libraries</quote> issues caused by
-        <application>libtool</application>.
-      </para>
-
-      <para>
-        With <option>-Wl,-z,pack-relative-relocs</option>, the linker
-        generates a more compacted form of the relative relocation entries
-        for PIEs and shared libraries.  It reduces the size of the linked
-        PIE or shared library, and speeds up the loading of the PIE or
-        shared library.
-      </para>
-
-      <para>
-        The <option>-Wl,</option> prefix is necessary because despite the
-        variable is named <envar>LDFLAGS</envar>, its content is actually
-        passed to <command>gcc</command> (or <command>g++</command>,
-        <command>clang</command>, etc.) during the link stage, not directly
-        passed to <command>ld</command>.
-      </para>
-
-  </sect2>
-
-  <sect2 id="hardening">
-    <title>Options for hardening the build</title>
-
-      <para>
-        Even on desktop systems, there are still a lot of exploitable
-        vulnerabilities. For many of these, the attack comes via javascript
-        in a browser. Often, a series of vulnerabilities are used to gain
-        access to data (or sometimes to pwn, i.e. own, the machine and
-        install rootkits).  Most commercial distros will apply various
-        hardening measures.
-      </para>
-
-      <para>
-        In the past, there was Hardened LFS where gcc (a much older version)
-        was forced to use hardening (with options to turn some of it off on a
-        per-package basis).  The current LFS and BLFS books are carrying
-        forward a part of its spirit by enabling PIE
-        (<option>-fPIE -pie</option>) and SSP
-        (<option>-fstack-protector-strong</option>) as the defaults
-        for GCC and clang.  What is being covered here is different - first
-        you have to make sure that the package is indeed using your added
-        flags and not over-riding them.
-      </para>
-
-      <para>
-        For hardening options which are reasonably cheap, there is some
-        discussion in the 'tuning' link above (occasionally, one or more
-        of these options might be inappropriate for a package). These
-        options are <option>-D_FORTIFY_SOURCE=2</option>
-        (or <option>-D_FORTIFY_SOURCE=3</option> which is more secure but
-        with a larger performance overhead) and
-        (for C++) <option>-D_GLIBCXX_ASSERTIONS</option>. On modern
-        machines these should only have a little impact on how fast things
-        run, and often they will not be noticeable.
-      </para>
-
-      <para>
-        The main distros use much more, such as RELRO (Relocation Read Only)
-        and perhaps <option>-fstack-clash-protection</option>. You may also
-        encounter the so-called <quote>userspace retpoline</quote>
-        (<option>-mindirect-branch=thunk</option> etc.) which
-        is the equivalent of the spectre mitigations applied to the linux
-        kernel in late 2018. The kernel mitigations caused a lot of complaints
-        about lost performance, if you have a production server you might wish
-        to consider testing that, along with the other available options, to
-        see if performance is still sufficient.
-      </para>
-
-      <para>
-        Whilst gcc has many hardening options, clang/LLVM's strengths lie
-        elsewhere. Some options which gcc provides are said to be less effective
-        in clang/LLVM.
-      </para>
-
-  </sect2>
-
-</sect1>
Index: troduction/important/cgroup-kernel.xml
===================================================================
--- introduction/important/cgroup-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  [*] <emphasis role='blue'>C</emphasis>ontrol Group support ---&gt;                                       [CGROUPS]
-    [*] M<emphasis role='blue'>e</emphasis>mory controller                                                [MEMCG]
-    [*] <emphasis role='blue'>C</emphasis>puset controller                                              [CPUSETS]</screen>
Index: introduction/important/important.xml
===================================================================
--- introduction/important/important.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/important/important.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,35 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="intro-important" xreflabel="Important Information">
+<?dbhtml filename="important.html" dir="introduction"?>
+<title>Important Information</title>
 
-<chapter id="important">
-  <?dbhtml filename="important.html"?>
-
-  <title>Important Information</title>
-
-  <para>This chapter is used to explain some of the policies used throughout
-  the book, to introduce important concepts and to explain some issues you may
-  see with some of the included packages.</para>
-
-  <!-- Moved to LFS
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="building-notes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="position.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patches.xml"/>
-
-  <!-- sysv only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-units.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="la-files.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraries.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale-issues.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="beyond.xml"/>
+&intro-important-unpacking;
+&intro-important-position;
+&intro-important-bootscripts;
+&intro-important-beyond;
 
 </chapter>
Index: troduction/important/la-files.xml
===================================================================
--- introduction/important/la-files.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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="la-files" xreflabel="Libtool archive (.la) files">
-  <?dbhtml filename="la-files.html"?>
-
-
-  <title>About Libtool Archive (.la) files</title>
-
-  <!-- section g : 'Others' in longindex.html -->
-  <indexterm zone="la-files">
-    <primary sortas="g-la-files">Library archive (.la) files</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Files with a .la extension</title>
-
-    <para>
-
-      In LFS and BLFS, many packages use a internally shipped libtool copy to
-      build on a variety of Unix platforms.  This includes platforms such as
-      AIX, Solaris, IRIX, HP-UX, and Cygwin as well as Linux.  The origins of
-      this tool are quite dated.  It was intended to manage libraries on
-      systems with less advanced capabilities than a modern Linux system.
-
-    </para>
-
-    <para>
-
-      On a Linux system, libtool specific files are generally unneeded.
-      Normally libraries are specified in the build process during the link
-      phase.  Since a linux system uses the <ulink
-      url="https://en.wikipedia.org/wiki/Executable_and_Linkable_Format">
-      Executable and Linkable Format (ELF)</ulink> for executables and
-      dynamic libraries, information needed to complete the task is embedded
-      in the files.  Both the linker and the program loader can query the
-      appropriate files and properly link or execute the program.
-
-    </para>
-
-    <para>
-      Static libraries are rarely used in LFS and BLFS.  And, nowadays most
-      packages store the information needed for linking against a static
-      library into a .pc file, instead of relying on libtool.
-      A <command>pkg-config --static --libs</command> command will output
-      the sufficient flags for the linker to link against a static library
-      without any libtool magic.
-    </para>
-
-    <para>
-      The problem is that libtool usually creates one or more text files for
-      package libraries called libtool archives.  These small files have a
-      ".la" extension and contain information that is similar to that embedded
-      in the libraries or pkg-config files.  When building a package that
-      uses libtool, the process automatically looks for these files.
-      Sometimes a .la file can contains the name or path of a static library
-      used during build but not installed, then the build process will break
-      because the .la file refers to something nonexistent on the system.
-      Similarly, if a package is updated and no longer uses the .la file,
-      then the build process can break with the old .la files.
-    </para>
-
-    <para>
-
-       The solution is to remove the .la files.  However there is a catch.
-       Some packages, such as <xref linkend='imagemagick'/>, use a libtool
-       function, lt_dlopen, to load libraries as needed during execution and
-       resolve their dependencies at run time.  In this case, the .la files
-       should remain.
-
-    </para>
-
-    <para>
-
-        The script below, removes all unneeded .la files and saves them in a
-        directory, /var/local/la-files by default, not in the normal library
-        path.  It also searches all pkg-config files (.pc) for embedded
-        references to .la files and fixes them to be conventional library
-        references needed when an application or library is built.  It
-        can be run as needed to clean up the directories that may be causing
-        problems.
-
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/sbin/remove-la-files.sh &lt;&lt; "EOF"
-<literal>#!/bin/bash
-
-# /usr/sbin/remove-la-files.sh
-# Written for Beyond Linux From Scratch
-# by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
-
-# Make sure we are running with root privs
-if test "${EUID}" -ne 0; then
-    echo "Error: $(basename ${0}) must be run as the root user! Exiting..."
-    exit 1
-fi
-
-# Make sure PKG_CONFIG_PATH is set if discarded by sudo
-source /etc/profile
-
-OLD_LA_DIR=/var/local/la-files
-
-mkdir -p $OLD_LA_DIR
-
-# Only search directories in /opt, but not symlinks to directories
-OPTDIRS=$(find /opt -mindepth 1 -maxdepth 1 -type d)
-
-# Move any found .la files to a directory out of the way
-find /usr/lib $OPTDIRS -name "*.la" ! -path "/usr/lib/ImageMagick*" \
-  -exec mv -fv {} $OLD_LA_DIR \;
-###############
-
-# Fix any .pc files that may have .la references
-
-STD_PC_PATH='/usr/lib/pkgconfig
-             /usr/share/pkgconfig
-             /usr/local/lib/pkgconfig
-             /usr/local/share/pkgconfig'
-
-# For each directory that can have .pc files
-for d in $(echo $PKG_CONFIG_PATH | tr : ' ') $STD_PC_PATH; do
-
-  # For each pc file
-  for pc in $d/*.pc ; do
-    if [ $pc == "$d/*.pc" ]; then continue; fi
-
-    # Check each word in a line with a .la reference
-    for word in $(grep '\.la' $pc); do
-      if $(echo $word | grep -q '.la$' ); then
-        mkdir -p $d/la-backup
-        cp -fv  $pc $d/la-backup
-
-        basename=$(basename $word )
-        libref=$(echo $basename|sed -e 's/^lib/-l/' -e 's/\.la$//')
-
-        # Fix the .pc file
-        sed -i "s:$word:$libref:" $pc
-      fi
-    done
-  done
-done</literal>
-
-EOF
-
-chmod +x /usr/sbin/remove-la-files.sh</userinput></screen>
-
-
-  </sect2>
-
-</sect1>
Index: troduction/important/libraries.xml
===================================================================
--- introduction/important/libraries.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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="libraries" xreflabel="libraries">
-  <?dbhtml filename="libraries.html"?>
-
-
-  <title>Libraries: Static or shared?</title>
-
-  <!-- section g : 'Others' in longindex.html -->
-  <indexterm zone="libraries">
-    <primary sortas="g-libraries">libraries: static or shared</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Libraries: Static or shared?</title>
-
-    <para>
-      The original libraries were simply an archive of routines from which
-      the required routines were extracted and linked into the executable
-      program. These are described as static libraries, with names of the form
-      <filename>libfoo.a</filename> on UNIX-like operating systems.
-      On some old operating systems they are the only type available.
-    </para>
-
-    <para>
-      On almost all Linux platforms there are also <quote>shared</quote>
-      (or equivalently <quote>dynamic</quote>)
-      libraries (with names of the form <filename>libfoo.so</filename>) &ndash;
-      one copy of the library is loaded into virtual memory, and shared by
-      all the programs which call any of its functions. This is space
-      efficient.
-    </para>
-
-    <para>
-      In the past, essential programs such as a shell were often linked
-      statically so that some form of minimal recovery system would exist even
-      if shared libraries, such as <filename>libc.so</filename>, became
-      damaged (e.g. moved to <filename class="directory">lost+found</filename>
-      after <command>fsck</command> following an unclean shutdown). Nowadays,
-      most people use an alternative system install or a USB stick if they
-      have to recover. Journaling filesystems also reduce the likelihood of
-      this sort of problem.
-    </para>
-
-<!-- really?
-    <para>
-      Developers, at least while they are developing, often prefer to use
-      static versions of the libraries which their code links to.
-    </para>
--->
-    <para>
-      Within the book, there are various places where configure switches
-      such as <parameter>--disable-static</parameter> are employed, and
-      other places where the possibility of using system versions of
-      libraries instead of the versions included within another package is
-      discussed. The main reason for this is to simplify updates of libraries.
-    </para>
-
-    <para>
-      If a package is linked to a dynamic library, updating to a newer
-      library version is automatic once the newer library is installed and the
-      program is (re)started (provided the library major version is unchanged,
-      e.g. going from <filename>libfoo.so.2.0</filename> to
-      <filename>libfoo.so.2.1</filename>. Going to
-      <filename>libfoo.so.3</filename> will require recompilation &ndash;
-      <command>ldd</command> can be used to find which programs use the old
-      version). If a program is linked to a static
-      library, the program always has to be recompiled. If you know which
-      programs are linked to a particular static library, this is merely an
-      annoyance. But usually you will <emphasis>not</emphasis> know which
-      programs to recompile.
-    </para>
-<!-- obsolete with /usr merge
-    <para>Most libraries are shared, but if you do something unusual, such as
-    moving a shared library to <filename class="directory">/lib</filename>
-    accidentally breaking the <literal>.so</literal> symlink in
-    <filename class="directory">/usr/lib</filename> while keeping the static
-    library in <filename class="directory">/lib</filename>, the static library
-    will be silently linked into the programs which need it.</para>
--->
-    <para>
-      One way to identify when a static library is used, is to deal with
-      it at the end of the installation of every package.  Write a script
-      to find all the static libraries in <filename
-        class="directory">/usr/lib</filename> or wherever you are installing
-      to, and either move them to another directory so that they are no
-      longer found by the linker, or rename them so that
-      <filename>libfoo.a</filename> becomes
-      e.g. <filename>libfoo.a.hidden</filename>. The static library can then
-      be temporarily restored if it is ever needed, and the package needing
-      it can be identified. This shouldn't be done blindly since many
-      libraries only exist in a static version. For example, some libraries
-      from the <application>glibc</application> and
-      <application>gcc</application> packages should always be
-      present on the system (<filename>libc_nonshared.a, libg.a,
-        libpthread_nonshared.a, libssp_nonshared.a, libsupc++.a</filename>
-      as of glibc-2.36 and gcc-12.2).
-    </para>
-
-<!-- versions hardcoded in this para, it's a comment on those versions  -->
-    <para>If you use this approach, you may discover that more packages than
-    you were expecting use a static library. That was the case with
-    <application>nettle-2.4</application> in its default static-only
-    configuration: It was required by <application>GnuTLS-3.0.19</application>,
-    but also linked into package(s) which used
-    <application>GnuTLS</application>, such as
-    <application>glib-networking-2.32.3</application>.</para>
-
-    <para>Many packages put some of their common functions into a static
-    library which is only used by the programs within the package and,
-    crucially, the library is <emphasis>not</emphasis> installed as a
-    standalone library. These internal libraries are not a problem &ndash; if
-    the package has to be rebuilt to fix a bug or vulnerability, nothing else
-    is linked to them.</para>
-
-    <para>When BLFS mentions system libraries, it means shared versions of
-    libraries. Some packages such as <xref linkend="firefox"/> and
-    <xref linkend="gs"/> bundle many other libraries in their build tree.
-    The version they ship is often older than the version used in the system,
-    so it may contain bugs &ndash; sometimes developers go to the trouble of
-    fixing bugs in their included libraries, other times they do not.</para>
-
-    <para>Sometimes, deciding to use system libraries is an easy decision.
-    Other times it may require you to alter the system version (e.g. for
-    <xref linkend="libpng"/> if used for <xref linkend="firefox"/>).
-    Occasionally, a package ships an old library and can no longer link to
-    the current version, but can link to an older version. In this case, BLFS
-    will usually just use the shipped version. Sometimes the included library
-    is no longer developed separately, or its upstream is now the same as the
-    package&apos;s upstream and you have no other packages which will use it.
-    In those cases, you'll be lead to use the included library even if
-    you usually prefer to use system libraries.</para>
-
-  </sect2>
-
-</sect1>
Index: troduction/important/locale-issues.xml
===================================================================
--- introduction/important/locale-issues.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,293 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="locale-issues" xreflabel="Locale Related Issues">
-  <?dbhtml filename="locale-issues.html"?>
-
-
-  <title>Locale Related Issues</title>
-
-  <para>This page contains information about locale related problems and
-  issues. In the following paragraphs you'll find a generic overview of
-  things that can come up when configuring your system for various locales.
-  Many (but not all) existing locale related problems can be classified
-  and fall under one of the headings below. The severity ratings below use
-  the following criteria:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Critical: The program doesn't perform its main function.
-      The fix would be very intrusive, it's better to search for a
-      replacement.</para>
-    </listitem>
-    <listitem>
-      <para>High: Part of the functionality that the program provides
-      is not usable. If that functionality is required, it's better to
-      search for a replacement.</para>
-    </listitem>
-    <listitem>
-      <para>Low: The program works in all typical use cases, but lacks
-      some functionality normally provided by its equivalents.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>If there is a known workaround for a specific package, it will
-    appear on that package's page.</para>
-
-  <sect2 id="locale-not-valid-option"
-         xreflabel="Needed Encoding Not a Valid Option">
-
-    <title>The Needed Encoding is Not a Valid Option in the Program</title>
-
-    <para>Severity: Critical</para>
-
-    <para>Some programs require the user to specify the character encoding
-    for their input or output data and present only a limited choice of
-    encodings. This is the case for the <option>-X</option> option in
-<!--    <xref linkend="a2ps"/> and --><xref linkend="enscript"/>,
-    the <option>-input-charset</option> option in unpatched
-    <xref linkend="cdrtools"/>, and the character sets offered for display
-    in the menu of <xref linkend="Links"/>. If the required encoding is not
-    in the list, the program usually becomes completely unusable. For
-    non-interactive programs, it may be possible to work around this by
-    converting the document to a supported input character set before
-    submitting to the program.</para>
-
-    <para>A solution to this type of problem is to implement the necessary
-    support for the missing encoding as a patch to the original program or to
-    find a replacement.</para>
-
-  </sect2>
-
-  <sect2 id="locale-assumed-encoding"
-         xreflabel="Program Assumes Encoding">
-
-    <title>The Program Assumes the Locale-Based Encoding of External
-    Documents</title>
-
-    <para>Severity: High for non-text documents, low for text
-    documents</para>
-
-    <para>Some programs, <xref linkend="nano"/> or
-    <xref linkend="joe"/> for example, assume that documents are always
-    in the encoding implied by the current locale. While this assumption
-    may be valid for the user-created documents, it is not safe for
-    external ones. When this assumption fails, non-ASCII characters are
-    displayed incorrectly, and the document may become unreadable.</para>
-
-    <para>If the external document is entirely text based, it can be
-    converted to the current locale encoding using the
-    <command>iconv</command> program.</para>
-
-    <para>For documents that are not text-based, this is not possible.
-    In fact, the assumption made in the program may be completely
-    invalid for documents where the Microsoft Windows operating system
-    has set de facto standards. An example of this problem is ID3v1 tags
-    in MP3 files. For these cases, the only solution is to find a
-    replacement program that doesn't have the issue (e.g., one that
-    will allow you to specify the assumed document encoding).</para>
-
-    <para>Among BLFS packages, this problem applies to
-    <xref linkend="nano"/>, <xref linkend="joe"/>, and all media players
-    except <xref linkend="audacious"/>.</para>
-
-    <para>Another problem in this category is when someone cannot read
-    the documents you've sent them because their operating system is
-    set up to handle character encodings differently. This can happen
-    often when the other person is using Microsoft Windows, which only
-    provides one character encoding for a given country. For example,
-    this causes problems with UTF-8 encoded TeX documents created in
-    Linux. On Windows, most applications will assume that these documents
-    have been created using the default Windows 8-bit encoding.
-    </para>
-
-    <para>In extreme cases, Windows encoding compatibility issues may be
-    solved only by running Windows programs under
-    <ulink url="https://www.winehq.org/">Wine</ulink>.</para>
-
-  </sect2>
-
-  <sect2 id="locale-wrong-filename-encoding"
-         xreflabel="Wrong Filename Encoding">
-
-    <title>The Program Uses or Creates Filenames in the Wrong Encoding</title>
-
-    <para>Severity: Critical</para>
-
-    <para>The POSIX standard mandates that the filename encoding is
-    the encoding implied by the current LC_CTYPE locale category. This
-    information is well-hidden on the page which specifies the behavior
-    of <application>Tar</application> and <application>Cpio</application>
-    programs. Some programs get it wrong by default (or simply don't
-    have enough information to get it right). The result is that they
-    create filenames which are not subsequently shown correctly by
-    <command>ls</command>, or they refuse to accept filenames that
-    <command>ls</command> shows properly. For the <xref linkend="glib2"/>
-    library, the problem can be corrected by setting the
-    <envar>G_FILENAME_ENCODING</envar> environment variable to the special
-    "@locale" value. <application>Glib2</application> based programs that
-    don't respect that environment variable are buggy.</para>
-
-    <para>The <xref linkend="zip"/> and <xref linkend="unzip"/> have this
-    problem because they hard-code the expected filename encoding.
-    <application>UnZip</application> contains a hard-coded conversion table
-    between the CP850 (DOS) and ISO-8859-1 (UNIX) encodings and uses this table
-    when extracting archives created under DOS or Microsoft Windows. However,
-    this assumption only works for those in the US and not for anyone using a
-    UTF-8 locale. Non-ASCII characters will be mangled in the extracted
-    filenames.</para>
-
-    <!--<para>On the other hand,
-    <application>Nautilus CD Burner</application> checks names of
-    files added to its window for UTF-8 validity. This is wrong for
-    users of non-UTF-8 locales. Also,
-    <application>Nautilus CD Burner</application> unconditionally
-    calls <command>mkisofs</command> with the
-    <parameter>-input-charset UTF-8</parameter> parameter, which is
-    only correct in UTF-8 locales.</para>-->
-
-    <para>The general rule for avoiding this class of problems is to
-    avoid installing broken programs. If this is impossible, the
-    <ulink url="https://j3e.de/linux/convmv/">convmv</ulink>
-    command-line tool can be used to fix filenames created by these
-    broken programs, or intentionally mangle the existing filenames
-    to meet the broken expectations of such programs.</para>
-
-    <para>In other cases, a similar problem is caused by importing
-    filenames from a system using a different locale with a tool that
-    is not locale-aware (e.g., <!--<xref linkend="nfs-utils"/> or-->
-    <xref linkend="openssh"/>). In order to avoid mangling non-ASCII
-    characters when transferring files to a system with a different
-    locale, any of the following methods can be used:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Transfer anyway, fix the damage with
-        <command>convmv</command>.</para>
-      </listitem>
-      <listitem>
-        <para>On the sending side, create a tar archive with the
-        <parameter>--format=posix</parameter> switch passed to
-        <command>tar</command> (this will be the default in a future
-        version of <command>tar</command>).</para>
-      </listitem>
-      <listitem>
-        <para>Mail the files as attachments. Mail clients specify the
-        encoding of attached filenames.</para>
-      </listitem>
-      <listitem>
-        <para>Write the files to a removable disk formatted with a FAT or
-        FAT32 filesystem.</para>
-      </listitem>
-      <listitem>
-        <para>Transfer the files using Samba.</para>
-      </listitem>
-      <listitem>
-        <para>Transfer the files via FTP using RFC2640-aware server
-        (this currently means only wu-ftpd, which has bad security history)
-        and client (e.g., lftp).</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>The last four methods work because the filenames are automatically
-    converted from the sender's locale to UNICODE and stored or sent in this
-    form. They are then transparently converted from UNICODE to the
-    recipient's locale encoding.</para>
-
-  </sect2>
-
-  <sect2 id="locale-wrong-multibyte-characters"
-         xreflabel="Breaks Multibyte Characters">
-
-    <title>The Program Breaks Multibyte Characters or Doesn't Count
-    Character Cells Correctly</title>
-
-    <para>Severity: High or critical</para>
-
-    <para>Many programs were written in an older era where multibyte
-    locales were not common. Such programs assume that C "char" data
-    type, which is one byte, can be used to store single characters.
-    Further, they assume that any sequence of characters is a valid
-    string and that every character occupies a single character cell.
-    Such assumptions completely break in UTF-8 locales. The visible
-    manifestation is that the program truncates strings prematurely
-    (i.e., at 80 bytes instead of 80 characters). Terminal-based
-    programs don't place the cursor correctly on the screen, don't react
-    to the "Backspace" key by erasing one character, and leave junk
-    characters around when updating the screen, usually turning the
-    screen into a complete mess.</para>
-
-    <para>Fixing this kind of problems is a tedious task from a
-    programmer's point of view, like all other cases of retrofitting new
-    concepts into the old flawed design. In this case, one has to redesign
-    all data structures in order to accommodate to the fact that a complete
-    character may span a variable number of "char"s (or switch to wchar_t
-    and convert as needed). Also, for every call to the "strlen" and
-    similar functions, find out whether a number of bytes, a number of
-    characters, or the width of the string was really meant. Sometimes it
-    is faster to write a program with the same functionality from scratch.
-    </para>
-
-    <para>Among BLFS packages, this problem applies to
-    <xref linkend="xine-ui"/> and all the shells.</para>
-
-  </sect2>
-
-  <sect2 id="locale-wrong-manpage-encoding"
-         xreflabel="Incorrect Manual Page Encoding">
-
-    <title>The Package Installs Manual Pages in Incorrect or
-    Non-Displayable Encoding</title>
-
-    <para>Severity: Low</para>
-
-    <para>LFS expects that manual pages are in the language-specific (usually
-    8-bit) encoding, as specified on the <ulink
-    url="&lfs-root;/chapter08/man-db.html">LFS Man DB page</ulink>. However,
-    some packages install translated manual pages in UTF-8 encoding (e.g.,
-    Shadow, already dealt with), or manual pages in languages not in the table.
-    Not all BLFS packages have been audited for conformance with the
-    requirements put in LFS (the large majority have been checked, and fixes
-    placed in the book for packages known to install non-conforming manual
-    pages). If you find a manual page installed by any of BLFS packages that is
-    obviously in the wrong encoding, please remove or convert it as needed, and
-    report this to BLFS team as a bug.</para>
-
-    <para>You can easily check your system for any non-conforming manual pages
-    by copying the following short shell script to some accessible location,
-
-<screen><literal>#!/bin/sh
-# Begin checkman.sh
-# Usage: find /usr/share/man -type f | xargs checkman.sh
-for a in "$@"
-do
-    # echo "Checking $a..."
-    # Pure-ASCII manual page (possibly except comments) is OK
-    grep -v '.\\"' "$a" | iconv -f US-ASCII -t US-ASCII >/dev/null 2>&amp;1 \
-        &amp;&amp; continue
-    # Non-UTF-8 manual page is OK
-    iconv -f UTF-8 -t UTF-8 "$a" >/dev/null 2>&amp;1 || continue
-    # Found a UTF-8 manual page, bad.
-    echo "UTF-8 manual page: $a" >&amp;2
-done
-# End checkman.sh
-</literal></screen>
-
-    and then issuing the following command (modify the command below if the
-    <command>checkman.sh</command> script is not in your <envar>PATH</envar>
-    environment variable):</para>
-
-<screen><userinput>find /usr/share/man -type f | xargs checkman.sh</userinput></screen>
-
-    <para>Note that if you have manual pages installed in any location other
-    than <filename class='directory'>/usr/share/man</filename> (e.g.,
-    <filename class='directory'>/usr/local/share/man</filename>), you must
-    modify the above command to include this additional location.</para>
-
-  </sect2>
-
-</sect1>
Index: troduction/important/patches.xml
===================================================================
--- introduction/important/patches.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="patches">
-  <?dbhtml filename="patches.html"?>
-
-
-  <title>Optional Patches</title>
-
-  <para>As you follow the various sections in the book, you will observe that
-  the book occasionally includes patches that are required for a successful and
-  secure installation of the packages. The general policy of the book is to
-  include patches that fall in one of the following criteria:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Fixes a compilation problem.</para>
-    </listitem>
-    <listitem>
-      <para>Fixes a security problem.</para>
-    </listitem>
-    <listitem>
-      <para>Fixes a broken functionality.</para>
-    </listitem>
-  </itemizedlist>
-
-  <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>
-  which hosts various patches (including the patches referenced in the books)
-  to enable you to configure your LFS the way you like it.</para>
-
-</sect1>
Index: troduction/important/pkgmgt.xml
===================================================================
--- introduction/important/pkgmgt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,235 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="pkgmgt">
-  <?dbhtml filename="pkgmgt.html"?>
-
-
-  <title>Package Management</title>
-
-  <para>Package Management is an often requested addition
-  to the LFS Book. A Package Manager allows tracking
-  the installation of files making it easy to remove and upgrade packages.
-  And before you begin to wonder, NO&mdash;this section does not talk about any
-  particular package manager, nor does it recommend one. What it provides is
-  a roundup of the more popular techniques and how they work. The perfect
-  package manager for you may be among these techniques or may be a combination
-  of two or more of these techniques. This section briefly mentions
-  issues that may arise when upgrading packages.</para>
-
-  <para>Some reasons why no package manager is mentioned in LFS
-  or BLFS:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Dealing with package management takes the focus away from
-      the goals of these books&mdash;teaching how a Linux system is built.</para>
-    </listitem>
-    <listitem>
-      <para>There are multiple solutions for package management, each having
-      its strengths and drawbacks. Including one that satisfies all audiences is
-      difficult.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>There are some hints written on the topic of package management. Visit
-  the <ulink url="&hints-root;">Hints subproject</ulink>
-  and see if one of them fits your need.</para>
-
-  <sect2>
-    <title>Upgrade Issues</title>
-
-    <para>A Package Manager makes it easy to upgrade to newer versions when
-    they are released. Generally the instructions in the LFS and BLFS Book can be
-    used to upgrade to the newer versions. Here are some points that you should
-    be aware of when upgrading packages, especially on a running system.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>If one of the toolchain packages
-        (<application>Glibc</application>, <application>GCC</application> or
-        <application>Binutils</application>) needs to be upgraded to a newer
-        minor version, it is safer to rebuild LFS. Though you
-        <emphasis>may</emphasis> be able to get by rebuilding all the packages
-        in their dependency order, we do not recommend it. For example, if
-        glibc-2.2.x needs to be updated to glibc-2.3.x, it is safer to rebuild.
-        For micro version updates, a simple reinstallation usually works, but
-        is not guaranteed. For example, upgrading from glibc-2.3.4 to
-        glibc-2.3.5 will not usually cause any problems.</para>
-      </listitem>
-      <listitem>
-        <para>If a package containing a shared library is updated, and if the
-        name of the library changes, then all the packages dynamically linked
-        to the library need to be recompiled to link against the newer library.
-        (Note that there is no correlation between the package version and the
-        name of the library.) For example, consider a package foo-1.2.3 that
-        installs a shared library with name
-        <filename class='libraryfile'>libfoo.so.1</filename>. Say you upgrade
-        the package to a newer version foo-1.2.4 that installs a shared library
-        with name <filename class='libraryfile'>libfoo.so.2</filename>. In this
-        case, all packages that are dynamically linked to
-        <filename class='libraryfile'>libfoo.so.1</filename> need to be
-        recompiled to link against
-        <filename class='libraryfile'>libfoo.so.2</filename>. Note that you
-        should not remove the previous libraries until the dependent packages
-        are recompiled.</para>
-      </listitem>
-      <listitem>
-        <para>If you are upgrading a running system, be on the lookout for packages
-        that use <command>cp</command> instead of <command>install</command>
-        to install files. The latter command is usually safer if the executable
-        or library is already loaded in memory.</para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2>
-    <title>Package Management Techniques</title>
-
-    <para>The following are some common package management techniques. Before
-    making a decision on a package manager, do some research on the various
-    techniques, particularly the drawbacks of the particular scheme.</para>
-
-    <sect3>
-      <title>It is All in My Head!</title>
-
-      <para>Yes, this is a package management technique. Some folks do not find the
-      need for a package manager because they know the packages intimately and know
-      what files are installed by each package. Some users also do not need any
-      package management because they plan on rebuilding the entire system
-      when a package is changed.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Install in Separate Directories</title>
-
-      <para>This is a simplistic package management that does not need any
-      extra package to manage the installations. Each package is installed in a
-      separate directory. For example, package foo-1.1 is installed in
-      <filename class='directory'>/usr/pkg/foo-1.1</filename>
-      and a symlink is made from <filename>/usr/pkg/foo</filename> to
-      <filename class='directory'>/usr/pkg/foo-1.1</filename>. When installing
-      a new version foo-1.2, it is installed in
-      <filename class='directory'>/usr/pkg/foo-1.2</filename> and the previous
-      symlink is replaced by a symlink to the new version.</para>
-
-      <para>The environment variables such as those mentioned in
-      <quote><xref linkend="beyond"/></quote> need to be expanded to
-      include <filename>/usr/pkg/foo</filename>. For more than a few packages,
-      this scheme becomes unmanageable.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Symlink Style Package Management</title>
-
-      <para>This is a variation of the previous package management technique.
-      Each package is installed similar to the previous scheme. But instead of
-      making the symlink, each file is symlinked into the
-      <filename class='directory'>/usr</filename> hierarchy. This removes the
-      need to expand the environment variables. Though the symlinks can be
-      created by the user to automate the creation, many package managers have
-      been written using this approach. A few of the popular ones are Stow,
-      Epkg, Graft, and Depot.</para>
-
-      <para>The installation needs to be faked, so that the package thinks that it is
-      installed in <filename class="directory">/usr</filename> though in reality it is
-      installed in the <filename class="directory">/usr/pkg</filename> hierarchy.
-      Installing in this manner is not usually a trivial task. For example, consider
-      that you are installing a package libfoo-1.1. The following instructions may
-      not install the package properly:</para>
-
-<screen><userinput>./configure --prefix=/usr/pkg/libfoo/1.1
-make
-make install</userinput></screen>
-
-      <para>The installation will work, but the dependent packages may not link
-      to libfoo as you would expect. If you compile a package that links against
-      libfoo, you may notice that it is linked to
-      <filename class='libraryfile'>/usr/pkg/libfoo/1.1/lib/libfoo.so.1</filename>
-      instead of <filename class='libraryfile'>/usr/lib/libfoo.so.1</filename>
-      as you would expect. The correct approach is to use <envar>DESTDIR</envar>
-      strategy to fake installation of the package. This approach works as
-      follows:</para>
-
-<screen><userinput>./configure --prefix=/usr
-make
-make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
-
-      <para>Most of the packages do support this approach, but there are some
-      which do not. For the non-compliant packages, you may either need to
-      manually install the package, or you may find that it is easier to install
-      some problematic packages into
-      <filename class='directory'>/opt</filename>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Timestamp Based</title>
-
-      <para>In this technique, a file is timestamped before the installation of
-      the package. After the installation, a simple use of the
-      <command>find</command> command with the appropriate options can generate
-      a log of all the files installed after the timestamp file was created. A
-      package manager written with this approach is install-log.</para>
-
-      <para>Though this scheme has the advantage of being simple, it has two drawbacks.
-      If during installation, the files are installed with any timestamp other than the
-      current time, those files will not be tracked by the package manager. Also, this
-      scheme can only be used when one package is installed at a time. The logs are not
-      reliable if two packages are being installed on two different consoles.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>LD_PRELOAD Based</title>
-
-      <para>In this approach, a library is preloaded before installation. During
-      installation, this library tracks the packages that are being installed by
-      attaching itself to various executables such as <command>cp</command>,
-      <command>install</command>, <command>mv</command> and tracking the system
-      calls that modify the filesystem. For this approach to work, all the executables
-      need to be dynamically linked without the suid or sgid bit. Preloading the
-      library may cause some unwanted side-effects during installation. Therefore,
-      do perform some tests to ensure that the package manager does not break
-      anything and logs all the appropriate files.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Creating Package Archives</title>
-
-      <para>In this scheme, the package installation is faked into a separate
-      tree as described in the Symlink style package management. After the
-      installation, a package archive is created using the installed files.
-      This archive is then used to install the package either on the local
-      machine or can even be used to install the package on other machines.</para>
-
-      <para>This approach is used by most of the package managers found in the
-      commercial distributions. Examples of package managers that follow this
-      approach are RPM, pkg-utils, Debian's apt, and Gentoo's Portage system.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>User Based Management</title>
-
-      <para>This scheme, unique to LFS, was devised by Matthias Benkmann,
-      and is available from the <ulink url="&hints-root;">Hints
-      Project</ulink>. In this scheme, each package is installed as a separate user
-      into the standard locations. Files belonging to a package are easily identified
-      by checking the user ID. The features and shortcomings of this approach are
-      too complex to describe in this section. For the details please see the hint at <ulink
-      url="&hints-root;/downloads/files/more_control_and_pkg_man.txt"/>.</para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: introduction/important/position.xml
===================================================================
--- introduction/important/position.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/important/position.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,92 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-important-position">
+<?dbhtml filename="position.html" dir="introduction"?>
+<title>The /usr versus /usr/local debate</title>
 
-<sect1 id="position">
-  <?dbhtml filename="position.html"?>
+<para><emphasis>Should I install XXX in /usr or
+/usr/local?</emphasis></para>
 
+<para>This is a question without an obvious answer for an LFS based
+system.</para>
 
-  <title>The /usr Versus /usr/local Debate</title>
+<para>In traditional unix systems, <filename>/usr</filename> usually 
+contains files that come
+with the system distribution, and the <filename>/usr/local</filename> tree 
+is free for the local administrator to add things to.  The only 
+really hard and fast
+rule is that unix distributions should not touch
+<filename>/usr/local</filename>, except
+perhaps for creating the basic directories within it.</para>
 
-  <para><emphasis>Should I install XXX in <filename>/usr</filename> or
-  <filename>/usr/local</filename>?</emphasis></para>
+<para>With Linux distributions, like RedHat, Debian etc. a possible rule is
+that <filename>/usr</filename> is managed by the distribution's 
+package system and <filename>/usr/local</filename> is not.  This way the 
+package manager's database knows about every file within
+<filename>/usr</filename>.</para>
 
-  <para>This is a question without an obvious answer for an
-  LFS based system.</para>
+<para>LFS users build their own system and so deciding where the system ends
+and local files begin is not straightforward.  So the choice should be
+made in order to make things easier to administer.  There are several
+reasons for dividing files between <filename>/usr</filename> and
+<filename>/usr/local</filename>.</para>
 
-  <para>In traditional Unix systems,
-  <filename class='directory'>/usr</filename> usually contains files that come
-  with the system distribution, and the
-  <filename class='directory'>/usr/local</filename> tree is free for the local
-  administrator to manage. The only really hard and fast rule is that Unix
-  distributions should not touch
-  <filename class='directory'>/usr/local</filename>, except perhaps to create
-  the basic directories within it.</para>
+<itemizedlist>
 
-  <para>With Linux distributions like Red Hat, Debian, etc., a possible rule is
-  that <filename class='directory'>/usr</filename> is managed by the
-  distribution's package system and
-  <filename class='directory'>/usr/local</filename> is not. This way the
-  package manager's database knows about every file within
-  <filename class='directory'>/usr</filename>.</para>
+<listitem><para>On a network of several machines all running LFS, or mixed 
+LFS and
+other Linux distributions, <filename>/usr/local</filename> could be used to 
+hold packages
+that are common between all the computers in the network.  It can be
+NFS mounted or mirrored from a single server.  Here local indicates
+local to the site.</para></listitem>
 
-  <para>LFS users build their own system and so deciding where
-  the system ends and local files begin is not straightforward.  So the choice
-  should be made in order to make things easier to administer.  There are
-  several reasons for dividing files between
-  <filename class='directory'>/usr</filename> and
-  <filename class='directory'>/usr/local</filename>.</para>
+<listitem><para>On a network of several computers all running an identical 
+LFS system <filename>/usr/local</filename> could hold packages that 
+are different between the machines.  In this case local refers to 
+the individual computers.</para></listitem>
 
-  <itemizedlist>
-    <listitem>
-      <para>On a network of several machines all running LFS, or mixed LFS and
-      other Linux distributions,
-      <filename class='directory'>/usr/local</filename> could be used to hold
-      packages that are common between all the computers in the network. It can
-      be NFS mounted or mirrored from a single server. Here local indicates
-      local to the site.</para>
-    </listitem>
-    <listitem>
-      <para>On a network of several computers all running an identical
-      LFS system, <filename class='directory'>/usr/local</filename> could hold
-      packages that are different between the machines. In this case local
-      refers to the individual computers.</para>
-    </listitem>
-    <listitem>
-      <para>Even on a single computer,
-      <filename class='directory'>/usr/local</filename> can be useful if you
-      have several distributions installed simultaneously, and want
-      a place to put packages that will be the same on all of them.</para>
-    </listitem>
-    <listitem>
-      <para>Or you might regularly rebuild your LFS, but
-      want a place to put files that you don't want to rebuild each time.  This
-      way you can wipe the LFS file system and start from a clean
-      partition every time without losing everything.</para>
-    </listitem>
-  </itemizedlist>
+<listitem><para>Even on a single computer <filename>/usr/local</filename> can 
+be useful if you have several distributions installed simultaneously, and want 
+a place to put packages that will be the same on all of
+them.</para></listitem>
 
-  <para>Some people ask why not use your own directory tree, e.g.,
-  <filename class='directory'>/usr/site</filename>, rather than
-  <filename class='directory'>/usr/local</filename>?</para>
+<listitem><para>Or you might regularly rebuild your LFS, but want 
+a place to put files
+that you don't want to rebuild each time.  This way you can wipe the
+LFS filesystem and start from a clean partition everytime without losing
+everything.</para></listitem>
 
-  <para>There is nothing stopping you, many sites do make their own trees,
-  however it makes installing new software more difficult.  Automatic installers
-  often look for dependencies in
-  <filename class='directory'>/usr</filename> and
-  <filename class='directory'>/usr/local</filename>, and if the file it is
-  looking for is in <filename class='directory'>/usr/site</filename> instead,
-  the installer will probably fail unless you specifically tell it where to
-  look.</para>
+</itemizedlist>
 
-  <para><emphasis>What is the BLFS position on this?</emphasis></para>
+<para>Some people ask why not use your own directory tree, eg
+<filename>/usr/site</filename> rather than
+<filename>/usr/local</filename>?</para>
 
-  <para>All of the BLFS instructions install programs in
-  <filename class='directory'>/usr</filename> with optional instructions to
-  install into <filename class='directory'>/opt</filename> for some specific
-  packages.</para>
+<para>There is nothing stopping you, many sites do make their own trees, however
+it makes installing new software more difficult.  Automatic installers
+often look for dependencies in <filename>/usr</filename> and
+<filename>/usr/local</filename>, and if the file it is looking
+for is in <filename>/usr/site</filename> instead, the installer will 
+probably fail unless
+you specifically tell it where to look.</para>
+
+<para><emphasis>What is the BLFS position on this?</emphasis></para>
+
+<para>All of the BLFS instructions install programs in
+<filename>/usr</filename> unless specifically stated otherwise.  There
+are examples where some files are placed in the
+<filename>/usr/local</filename> hierarchy but these are documented and
+are generally for a good reason. These exceptions should be well documented 
+in the book.  If you think you have
+found one which isn't please tell us!</para>
 
 </sect1>
Index: troduction/important/systemd-units.xml
===================================================================
--- introduction/important/systemd-units.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="systemd-units" xreflabel="blfs-systemd-units-&systemd-units-version;" revision="systemd">
-  <?dbhtml filename="systemd-units.html"?>
-
-
-  <title>BLFS Systemd Units</title>
-
-  <indexterm zone="systemd-units">
-    <primary sortas="a-BLFS-Sytemd-Units">BLFS Systemd Units</primary>
-  </indexterm>
-
-  <indexterm zone="systemd-units">
-    <primary sortas="f-AA-General-Information">General Information</primary>
-  </indexterm>
-
-  <para>
-    The BLFS Systemd Units package contains the systemd unit files
-    that are used throughout the book.
-  </para>
-
-  <itemizedlist spacing="compact">
-    <title>Package Information</title>
-    <listitem>
-      <para>
-        Download: <ulink url="&downloads-root;/blfs-systemd-units-&systemd-units-version;.tar.xz"/>
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <para>
-    The BLFS Systemd Units package will be used throughout the BLFS book
-    for systemd unit files. Each systemd unit has a separate install target.
-    It is recommended that you keep the package source directory around until
-    completion of your BLFS system. When a systemd unit is requested from BLFS
-    Systemd Units, simply change to the directory, and as the
-    <systemitem class="username">root</systemitem> user, execute the given
-    <command>make install-<replaceable>&lt;systemd-unit&gt;</replaceable></command>
-    command. This command installs the systemd unit to its proper location
-    (along with any auxiliary configuration scripts) and also enables it by
-    default.
-  </para>
-
-  <note>
-    <para>
-      It is advisable to peruse each systemd unit before installation to
-      determine whether the installed files meet your needs.
-    </para>
-  </note>
-
-</sect1>
Index: introduction/important/unpacking.xml
===================================================================
--- introduction/important/unpacking.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ introduction/important/unpacking.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,59 @@
+<sect1 id="intro-important-unpacking">
+<?dbhtml filename="unpacking.html" dir="introduction"?>
+<title>Getting and unpacking the software</title>
+
+<para>Those people who have built a LFS system will be aware of the
+general principles of downloading and unpacking software.  We will
+however repeat some of that information here for those new to building
+their own software.</para>
+
+<para>One difference from the LFS book is that we do <emphasis>not</emphasis> 
+mirror the packages on the BLFS website.
+Instead, each set of installation instructions contains a URL from which
+you can download the package.  We do however keep a selection of patches
+available via http/ftp.  These are referenced as needed in the
+installation instructions.</para>
+
+<para>Whilst you can keep the source tarballs anywhere you like, we
+assume that you have unpacked them and unzipped any required patches
+into <filename>/usr/src</filename>.</para>
+
+<para>We can not emphasise strongly enough that you should start from a
+<emphasis>clean source tree</emphasis> each time.  This means that if
+you have had an error, it's usually best to delete the source tree and
+re-unpack it <emphasis>before</emphasis> trying again.  This obviously
+doesn't apply if you're an advanced user used to hacking Makefiles and C
+code, but if in doubt, start from a clean tree.</para>
+
+<sect2>
+<title>Unpacking the software</title>
+
+<para>If a file is tar'ed and gzip'ed, it is unpacked by running one of
+the following two commands, depending on the filename:</para>
+
+<screen><userinput>tar xvzf filename.tar.gz
+tar xvzf filename.tgz
+tar xvzf filename.tar.Z</userinput></screen>
+
+<para>If a file is tar'ed and bzip2'ed, it can usually be unpacked by
+running:</para>
+
+<screen><userinput>tar jxvf filename.tar.bz2</userinput></screen>
+
+<para>This applies as long as you patched tar to include the j option
+during your LFS install.  If you didn't, you can use a slightly
+different method:</para>
+
+<screen><userinput>bzcat filename.tar.bz2 | tar xv</userinput></screen>
+
+<para>Finally, you need to be able to unpack patches which are generally
+not tar'd.  The best way to do this is to copy the patch file to
+<filename>/usr/src</filename> and then to run one of the following
+commands depending on whether the file is .gz or .bz2:</para>
+
+<screen><userinput>gunzip patchname.gz
+bunzip2 patchname.bz2</userinput></screen>
+
+</sect2>
+
+</sect1>
Index: introduction/introduction.ent
===================================================================
--- introduction/introduction.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ introduction/introduction.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<!ENTITY introduction SYSTEM "introduction.xml">
+
+<!ENTITY intro-welcome SYSTEM "welcome/welcome.xml">
+<!ENTITY intro-welcome-conventions SYSTEM "welcome/conventions.xml">
+<!ENTITY intro-welcome-version SYSTEM "welcome/version.xml">
+<!ENTITY intro-welcome-acks SYSTEM "welcome/acknowledgments.xml">
+<!ENTITY intro-welcome-credits SYSTEM "welcome/credits.xml">
+<!ENTITY intro-welcome-changelog SYSTEM "welcome/changelog.xml">
+<!ENTITY intro-welcome-whichsect SYSTEM "welcome/which.xml">
+<!ENTITY intro-welcome-mailinglists SYSTEM "welcome/maillists.xml">
+<!ENTITY intro-welcome-newsserver SYSTEM "welcome/newsserver.xml">
+<!ENTITY intro-welcome-contact SYSTEM "welcome/contact.xml">
+<!ENTITY intro-welcome-askhelp SYSTEM "welcome/askhelp.xml">
+
+<!ENTITY intro-important SYSTEM "important/important.xml">
+<!ENTITY intro-important-unpacking SYSTEM "important/unpacking.xml">
+<!ENTITY intro-important-position SYSTEM "important/position.xml">
+<!ENTITY intro-important-bootscripts SYSTEM "important/bootscripts.xml">
+<!ENTITY intro-important-beyond SYSTEM "important/beyond.xml">
Index: introduction/introduction.xml
===================================================================
--- introduction/introduction.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/introduction.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,16 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="introduction" xreflabel="Introduction">
+<?dbhtml filename="introduction.html" dir="introduction"?>
+<title>Introduction</title>
 
-<part id="introduction" xreflabel="Introduction">
-  <?dbhtml filename="introduction.html" dir="introduction"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="welcome/welcome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="important/important.xml"/>
+&intro-welcome;
+&intro-important;
 
 </part>
Index: introduction/welcome/acknowledgments.xml
===================================================================
--- introduction/welcome/acknowledgments.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/acknowledgments.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,74 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-acknowledgments">
+<?dbhtml filename="acknowledgments.html" dir="introduction"?>
+<title>Acknowledgments</title>
 
-<sect1 id="acknowledgments">
-  <?dbhtml filename="acknowledgments.html"?>
+<para>We would like to thank the following people and organizations for their
+contributions toward the BLFS and LFS projects:</para>
 
+<itemizedlist>
 
-  <title>Acknowledgments</title>
+<listitem><para><ulink url="mailto:strider@linux.com">Mark Stone</ulink> 
+&lt;mstone@linux.com&gt; for donating the linuxfromscratch.org 
+servers.</para></listitem>
+ 
+<listitem><para><ulink url="http://www.valinux.com">VA Linux
+Systems</ulink> for providing rackspace and bandwidth for the 
+linuxfromscratch.org server.</para></listitem>
 
-  <para>We would like to thank the following people and organizations for their
-  contributions toward the BLFS and LFS projects:</para>
+<listitem><para><ulink url="mailto:gerard@linuxfromscratch.org">Gerard
+Beekmans</ulink> &lt;gerard@linuxfromscratch.org&gt; for starting and
+writing the vast majority of the LFS project.</para></listitem>
 
-  <itemizedlist>
-    <listitem>
-      <para>All those people listed on the Credits page for submitting patches,
-      instructions and corrections to the book.  The former editor would
-      especially like to thank Bruce, Larry and Billy for their enormous inputs
-      to the project.</para>
-    </listitem>
-    <listitem>
-      <para>Jeff Bauman (former co-editor of the book) for his assistance
-      with getting BLFS off the ground.</para>
-    </listitem>
-    <listitem>
-      <para><ulink url="mailto:gerard@&lfs-domainname;">Gerard Beekmans</ulink>
-      &lt;gerard &lt;at&gt; &lfs-domainname;&gt; for starting and writing the
-      vast majority of the LFS project.</para>
-    </listitem>
-    <listitem>
-      <para>Robert Briggs for donating the &lfs-domainname; and
-      linuxfromscratch.com domain names.</para>
-    </listitem>
-    <listitem>
-      <para>DREAMWVR.COM for their sponsorship by donating various resources to
-      the LFS and related sub projects.</para>
-    </listitem>
-    <listitem>
-      <para>Bruce Dubbs for donating the anduin package server and his
-      substantial contribution to the purchase of the new quantum server.</para>
-    </listitem>
-    <listitem>
-      <para><ulink url="mailto:garrett@linux.com">Garrett LeSage</ulink>
-      &lt;garrett &lt;at&gt; linux.com&gt; for creating the LFS banner.</para>
-    </listitem>
-    <listitem>
-      <para><ulink url="mailto:bkenoah@oswd.org">Frank Skettino</ulink>
-      &lt;bkenoah &lt;at&gt; oswd.org&gt; at <ulink
-      url="http://www.oswd.org">OSWD</ulink> for coming up with the initial
-      design of the LFS and BLFS websites.</para>
-    </listitem>
-    <listitem>
-      <para><ulink url="mailto:strider@linux.com">Mark Stone</ulink>
-      &lt;mstone &lt;at&gt; linux.com&gt; for donating the original
-      &lfs-domainname; servers.</para>
-    </listitem>
-    <listitem>
-      <para><ulink url="mailto:highos@&lfs-domainname;">Jesse
-      Tie-Ten-Quee</ulink> &lt;higho &lt;at&gt; &lfs-domainname;&gt; for
-      answering many questions on IRC, having a great deal of patience and for
-      not killing the former editor for the joke in the original BLFS
-      announcement!</para>
-    </listitem>
-    <listitem>
-      <para>Countless other people on the various LFS and BLFS mailing lists
-      who are making this book possible by giving their suggestions, testing
-      the book and submitting bug reports.</para>
-    </listitem>
-  </itemizedlist>
+<listitem><para><ulink url="mailto:highos@linuxfromscratch.org">Jesse
+Tie-Ten-Quee</ulink> &lt;highos@linuxfromscratch.org&gt; for answering
+many questions on irc, having a great deal of patience and for not
+killing the current editor for the joke in the original BLFS
+announcement!</para></listitem>
+
+<listitem><para><ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM</ulink> for their ongoing sponsorship by donating various resources to the LFS and
+related sub projects.</para></listitem>
+
+<listitem><para>Robert Briggs for donating the linuxfromscratch.org and
+linuxfromscratch.com domain names.</para></listitem>
+
+<listitem><para><ulink url="mailto:bkenoah@oswd.org">Frank
+Skettino</ulink> &lt;bkenoah@oswd.org&gt; at <ulink 
+url="http://www.oswd.org">OSWD</ulink> for coming up the initial design 
+of the LFS and BLFS websites.</para></listitem>
+
+<listitem><para><ulink url="mailto:garrett@linux.com">Garrett
+LeSage</ulink> &lt;garrett@linux.com&gt; for creating the LFS 
+banner</para></listitem>
+
+<listitem><para>Countless other people on the various LFS and BLFS 
+mailinglists who are making this book happen by giving their
+suggestions, testing the book and submitting bug reports.</para></listitem>
+
+</itemizedlist>
 
 </sect1>
+
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/askhelp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,109 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-askhelp">
+<?dbhtml filename="askhelp.html" dir="introduction"?>
+<title>Asking for help and the FAQ</title>
 
-<sect1 id="askhelp">
-  <?dbhtml filename="askhelp.html"?>
-
-
-  <title>Asking for Help and the FAQ</title>
-
-  <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"/>),
-  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
-  lists can be found in <xref linkend="maillists"/>. To assist us
-  in diagnosing and solving your problem, include as much relevant information
-  as possible in your request for help.</para>
-
-  <sect2>
-    <title>Things to Check Prior to Asking</title>
-
-    <para>Before asking for help, you should review the following items:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Is the hardware support compiled into the kernel or
-        available as a module to the kernel?  If it is a module, is it
-        configured properly in <filename>modprobe.conf</filename> and has it
-        been loaded?  You should use <command>lsmod</command> as the
-        <systemitem class='username'>root</systemitem> user to see if it's
-        loaded. Check the <filename>sys.log</filename> file or run
-        <command>modprobe <replaceable>&lt;driver&gt;</replaceable></command> to
-        review any error message. If it loads properly, you may need to add
-        the <command>modprobe</command> command to your boot scripts.</para>
-      </listitem>
-      <listitem>
-        <para>Are your permissions properly set, especially for devices? LFS
-        uses groups to make these settings easier, but it also adds the step of
-        adding users to groups to allow access. A simple <command>usermod
-        -G audio <replaceable>&lt;user&gt;</replaceable></command> may be all that's
-        necessary for that user to have access to the sound system. Any question
-        that starts out with <quote>It works as root, but not as ...</quote>
-        requires a thorough review of permissions prior to asking.</para>
-      </listitem>
-      <listitem>
-        <para>BLFS liberally uses <filename
-        class='directory'>/opt/<replaceable>&lt;package&gt;</replaceable></filename>.
-        The main objection to this centers around the need to expand your
-        environment variables for each package placed there (e.g.,
-        PATH=$PATH:/opt/kde/bin). In most cases, the package instructions will
-        walk you through the changes, but some will not. The section called
-        <quote><xref linkend="beyond"/></quote> is
-        available to help you check.</para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2>
-    <title>Things to Mention</title>
-
-    <para>Apart from a brief explanation of the problem you're having, the
-    essential things to include in your request are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>the version of the book you are using (being &version;),</para>
-      </listitem>
-      <listitem>
-        <para>the package or section giving you problems,</para>
-      </listitem>
-      <listitem>
-        <para>the exact error message or symptom you are receiving,</para>
-      </listitem>
-      <listitem>
-        <para>whether you have deviated from the book or LFS at all,</para>
-      </listitem>
-      <listitem>
-        <para>if you are installing a BLFS package on a non-LFS system.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>(Note that saying that you've deviated from the book doesn't mean
-    that we won't help you. It'll just help us to see other possible causes
-    of your problem.)</para>
-
-    <para>Expect guidance instead of specific instructions. If you are
-    instructed to read something, please do so. It generally implies that
-    the answer was way too obvious and that the question would not have
-    been asked if a little research was done prior to asking. The volunteers
-    in the mailing list prefer not to be used as an alternative to doing
-    reasonable research on your end.  In addition, the quality of your
-    experience with BLFS is also greatly enhanced by this research, and
-    the quality of volunteers is enhanced because they don't feel that their
-    time has been abused, so they are far more likely to participate.</para>
-
-    <para>An excellent article on asking for help on the Internet in general
-    has been written by Eric S. Raymond. It is available online at
-    <ulink url="http://www.catb.org/~esr/faqs/smart-questions.html"/>.
-    Read and follow the hints in that document and you are much more likely
-    to get a response to start with and also to get the help you actually
-    need.</para>
-
-  </sect2>
+<para>THIS IS A NEW PAGE</para>
 
 </sect1>
+
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/changelog.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,1859 +1,423 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!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 % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<!-- vim: set expandtab: -->
-
-<sect1 id="changelog" xreflabel="Change Log">
-  <?dbhtml filename="changelog.html"?>
-
-
-  <title>Change Log</title>
-
-  <!-- <para>Please note that the Change Log only lists which editor was
-  responsible for putting the changes into SVN; please read the
-  <xref linkend="credits"/> page in Chapter 1 for details on
-  who wrote what.</para> -->
-
-  <para>Current release: &version; &ndash; &releasedate;</para>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-    <listitem>
-      <para>MMMM DD{nd,st,th}, YYYY</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    -->
-    <listitem>
-      <para>April 24th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to ruby-3.3.1 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19711">#19711</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 23rd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to gnome-control-center-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19708">#19708</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to xdg-desktop-portal-gnome-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19702">#19702</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to nautilus-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19701">#19701</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to mutter-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19700">#19700</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-user-docs-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19699">#19699</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-shell-extensions-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19698">#19698</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-shell-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19698">#19698</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gucharmap-15.1.4. Fixes
-          <ulink url="&blfs-ticket-root;19696">#19696</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to wireplumber-0.5.2. Fixes
-          <ulink url="&blfs-ticket-root;19709">#19709</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-terminal-3.52.1. Fixes
-          <ulink url="&blfs-ticket-root;19695">#19695</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-maps-46.10. Fixes
-          <ulink url="&blfs-ticket-root;19694">#19694</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to vte-0.76.1. Fixes
-          <ulink url="&blfs-ticket-root;19693">#19693</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libshumate-1.2.1. Fixes
-          <ulink url="&blfs-ticket-root;19692">#19692</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to evolution-3.52.1. Fixes
-          <ulink url="&blfs-ticket-root;19690">#19690</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to evolution-data-server-3.52.1. Fixes
-          <ulink url="&blfs-ticket-root;19690">#19690</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update Vulkan-Headers and Vulkan-Loader to 1.3.283.
-          Fixes <ulink url="&blfs-ticket-root;19689">#19689</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to nmap-7.95. Fixes
-          <ulink url="&blfs-ticket-root;19707">#19707</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libxmlb-0.3.19. Fixes
-          <ulink url="&blfs-ticket-root;19706">#19706</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libgusb-0.4.9. Fixes
-          <ulink url="&blfs-ticket-root;19705">#19705</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 22nd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to solid-6.1.1. Fixes
-          <ulink url="&blfs-ticket-root;19703">#19703</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to enchant-2.7.0. Fixes
-          <ulink url="&blfs-ticket-root;19697">#19697</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gdk-pixbuf-2.42.11. Fixes
-          <ulink url="&blfs-ticket-root;19691">#19691</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vala-0.56.17. Fixes
-          <ulink url="&blfs-ticket-root;19688">#19688</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 21st, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to lxqt-2.0. Fixes
-          <ulink url="&blfs-ticket-root;19681">#19681</ulink> and
-          <ulink url="&blfs-ticket-root;19687">#19687</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 20th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[rahul] - Update to ffmpeg-7.0. Fixes
-          <ulink url="&blfs-ticket-root;19604">#19604</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to nodejs-20.12.2. Fixes
-          <ulink url="&blfs-ticket-root;19638">#19638</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to mesa-24.0.5. Fixes
-          <ulink url="&blfs-ticket-root;19641">#19641</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to power-profiles-daemon-0.21. Fixes
-          <ulink url="&blfs-ticket-root;19581">#19581</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 19th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to thunderbird-115.10.1. Fixes
-          <ulink url="&blfs-ticket-root;19685">#19685</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gtk-4.14.3. Fixes
-          <ulink url="&blfs-ticket-root;19686">#19686</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 18th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to mpv-0.38.0. Fixes
-          <ulink url="&blfs-ticket-root;19682">#19682</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to icu-75.1. Fixes
-          <ulink url="&blfs-ticket-root;19674">#19674</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to wayland-protocols-1.35. Fixes
-          <ulink url="&blfs-ticket-root;19675">#19675</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to glibmm-2.66.7. Fixes
-          <ulink url="&blfs-ticket-root;19673">#19673</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to bind-9.18.26, bind-utils-9.18.26. Fixes
-          <ulink url="&blfs-ticket-root;19679">#19679</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to xfsprogs-6.7.0. Fixes
-          <ulink url="&blfs-ticket-root;19677">#19677</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to NASM-2.16.03. Fixes
-          <ulink url="&blfs-ticket-root;19678">#19678</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 17th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to Vulkan-Loader-1.3.282. Fixes
-          <ulink url="&blfs-ticket-root;19670">#19670</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-macros-1.20.1. Fixes
-          <ulink url="&blfs-ticket-root;19669">#19669</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libXmu-1.2.1 (Xorg library). Fixes
-          <ulink url="&blfs-ticket-root;19668">#19668</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to thunderbird-115.10.0 (Security Update).
-          Fixes <ulink url="&blfs-ticket-root;19671">#19671</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to firefox-115.10.0esr (Security Update).
-          Fixes <ulink url="&blfs-ticket-root;19664">#19664</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to spidermonkey-115.10.0 (Security Update).
-          Fixes <ulink url="&blfs-ticket-root;19666">#19666</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to pipewire-1.0.5. Fixes
-          <ulink url="&blfs-ticket-root;19665">#19665</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 16th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to php-8.3.6 (security update). Fixes
-          <ulink url="&blfs-ticket-root;19645">#19645</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to sqlite-autoconf-3450300 (3.45.3). Fixes
-          <ulink url="&blfs-ticket-root;19662">#19662</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to boost-1.85.0. Fixes
-          <ulink url="&blfs-ticket-root;19660">#19660</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Change details for KDE in tuning fontconfig
-          and note much earlier that the settings for fontconfig may
-          be ignored by applications and desktop environments. Fixes
-          <ulink url="&blfs-ticket-root;19667">#19667</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to xf86-input-wacom-1.2.2. Fixes
-          <ulink url="&blfs-ticket-root;19663">#19663</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libwacom-2.11.0. Fixes
-          <ulink url="&blfs-ticket-root;19661">#19661</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-system-monitor-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19606">#19606</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add gtkmm-4.14.0 to the book. Fixes
-          <ulink url="&blfs-ticket-root;14443">#14443</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add atkmm-2.36.3 to the book. Fixes
-          <ulink url="&blfs-ticket-root;14406">#14406</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add pangomm-2.52.0 to the book. Fixes
-          <ulink url="&blfs-ticket-root;14405">#14405</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add cairomm-1.18.0 to the book. Fixes
-          <ulink url="&blfs-ticket-root;14172">#14172</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add glibmm-2.80.0 to the book. Fixes
-          <ulink url="&blfs-ticket-root;14403">#14403</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add libsigc++3 to the book. Fixes
-          <ulink url="&blfs-ticket-root;16086">#16086</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bluez-5.75. Fixes
-          <ulink url="&blfs-ticket-root;19655">#19655</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Fix a build problem for sphinx-7.2.6. Fixes
-          <ulink url="&blfs-ticket-root;19659">#19659</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to elogind-255.4-r2. Fixes
-          <ulink url="&blfs-ticket-root;19298">#19298</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 15th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to gucharmap-15.1.3. Fixes
-          <ulink url="&blfs-ticket-root;19477">#19477</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-terminal-3.52.0. Fixes
-          <ulink url="&blfs-ticket-root;19476">#19476</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-logs-45.0. Fixes
-          <ulink url="&blfs-ticket-root;19603">#19603</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-disk-utility-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19602">#19602</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-calculator-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19599">#19599</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to file-roller-44.1. Fixes
-          <ulink url="&blfs-ticket-root;19598">#19598</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to evince-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19490">#19490</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to dvisvgm-3.3. Fixes
-          <ulink url="&blfs-ticket-root;19642">#19642</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to asymptote-2.89. Fixes
-          <ulink url="&blfs-ticket-root;19543">#19543</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Fix bugs in latex2e and dvipdfm-x in texlive. Fixes
-          <ulink url="&blfs-ticket-root;19571">#19571</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to EOG-45.3. Fixes
-          <ulink url="&blfs-ticket-root;19475">#19475</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to baobab-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19601">#19601</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to simple-scan-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19620">#19620</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python3-3.12.3. Fixes
-          <ulink url="&blfs-ticket-root;19633">#19633</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Fix CVE-2024-25081 and CVE-2024-25082 in FontForge.
-          Fixes <ulink url="&blfs-ticket-root;19545">#19545</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libxcb-1.17.0. Fixes
-          <ulink url="&blfs-ticket-root;19658">#19658</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to xcb-proto-1.17.0. Fixes
-          <ulink url="&blfs-ticket-root;19657">#19657</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to vulkan-headers-1.3.282. Fixes
-          <ulink url="&blfs-ticket-root;19656">#19656</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gtk-4.14.2. Fixes
-          <ulink url="&blfs-ticket-root;19583">#19583</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 14th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update the gstreamer stack to 1.24.2. Fixes
-          <ulink url="&blfs-ticket-root;19634">#19634</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Remove overwriting of terminfo data in xterm. Fixes
-          <ulink url="&blfs-ticket-root;19611">#19611</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to lxqt-qtplugin-1.4.1. Fixes
-          <ulink url="&blfs-ticket-root;19652">#19652</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to plasma-6.0.3. Fixes
-          <ulink url="&blfs-ticket-root;19373">#19733</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to libwebp-1.4.0. Fixes
-          <ulink url="&blfs-ticket-root;19654">#19654</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to opus-1.5.2. Fixes
-          <ulink url="&blfs-ticket-root;19653">#19653</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 12th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to kf6-6.1.0. Fixes
-          <ulink url="&blfs-ticket-root;19649">#19649</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 12th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to gnome-user-docs-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19497">#19497</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-tweaks-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19496">#19496</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-session-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19504">#19504</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-shell-extensions-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19472">#19472</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to cmake-3.29.2. Fixes
-          <ulink url="&blfs-ticket-root;19644">#19644</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to cryptsetup-2.7.2. Fixes
-          <ulink url="&blfs-ticket-root;19630">#19630</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gdm-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19505">#19505</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-shell-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19472">#19472</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to mutter-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19473">#19473</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-control-center-46.0.1. Fixes
-          <ulink url="&blfs-ticket-root;19502">#19502</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to tecla-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19486">#19486</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-settings-daemon-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19485">#19485</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-bluetooth-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19503">#19503</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to nautilus-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19501">#19501</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libxmlb-0.3.18. Fixes
-          <ulink url="&blfs-ticket-root;19631">#19631</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to taglib-2.0.1. Fixes
-          <ulink url="&blfs-ticket-root;19635">#19635</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to sentry-sdk-1.45.0 (Python module). Fixes
-          <ulink url="&blfs-ticket-root;19640">#19640</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to xorg-server-21.1.13. Fixes
-          <ulink url="&blfs-ticket-root;19650">#19650</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to xwayland-23.2.6. Fixes
-          <ulink url="&blfs-ticket-root;19623">#19623</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to snapshot-46.2. Fixes
-          <ulink url="&blfs-ticket-root;19648">#19648</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-online-accounts-3.50.1. Fixes
-          <ulink url="&blfs-ticket-root;19647">#19647</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gcr4-4.3.0. Fixes
-          <ulink url="&blfs-ticket-root;19646">#19646</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libgtop-2.41.3. Fixes
-          <ulink url="&blfs-ticket-root;19627">#19627</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to epiphany-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19491">#19491</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to WebKitGTK-2.44.1. Fixes
-          <ulink url="&blfs-ticket-root;19622">#19622</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to docutils-0.21.1 (Python module). Fixes
-          <ulink url="&blfs-ticket-root;19632">#19632</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Mako-1.3.3 (Python module). Fixes
-          <ulink url="&blfs-ticket-root;19639">#19639</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 11th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Add libjxl to the book in support gnome-backgrounds
-          and other packages. Fixes
-          <ulink url="&blfs-ticket-root;19626">#19626</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add highway to the book in support of libjxl. Fixes
-          <ulink url="&blfs-ticket-root;19626">#19626</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to Linux-PAM-1.6.1. Fixes
-          <ulink url="&blfs-ticket-root;19629">#19629</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to seamonkey-2.53.18.2. Fixes
-          <ulink url="&blfs-ticket-root;19617">#19617</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 10th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to upower-v1.90.4. Fixes
-          <ulink url="&blfs-ticket-root;19621">#19621</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libarchive-3.7.3. Fixes
-          <ulink url="&blfs-ticket-root;19618">#19618</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to js-115.9.1 (spidermonkey). Fixes
-          <ulink url="&blfs-ticket-root;19616">#19616</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to rsync-3.3.0. Fixes
-          <ulink url="&blfs-ticket-root;19614">#19614</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Patch pipewire-1.0.4 to fix an issue breaking
-          snapshot-46.1.  Fixes
-          <ulink url="&blfs-ticket-root;19637">#19637</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 9th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to xdg-desktop-portal-gnome-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19624">#19624</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to qt6-6.7.0 and qtwebengine-6.7.0. Fixes
-          <ulink url="&blfs-ticket-root;19575">#19575</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-backgrounds-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19625">#19625</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to tracker-miners-3.7.1. Fixes
-          <ulink url="&blfs-ticket-root;19482">#19482</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to tracker-3.7.1. Fixes
-          <ulink url="&blfs-ticket-root;19482">#19482</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to evolution-3.52.0. Fixes
-          <ulink url="&blfs-ticket-root;19481">#19481</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to evolution-data-server-3.52.0. Fixes
-          <ulink url="&blfs-ticket-root;19481">#19481</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-maps-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19506">#19506</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libshumate-1.2.0. Fixes
-          <ulink url="&blfs-ticket-root;19492">#19492</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Add abseil-cpp, protobuf, and protobuf-c in support
-          of libshumate and other packages. Part of
-          <ulink url="&blfs-ticket-root;19492">#19492</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 8th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update TigerVNC to use xorg-server-21.1.12. This
-          protects Xvnc against the security vulnerabilities fixed in that
-          update.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to httpd-2.4.59 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19507">#19507</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-online-accounts-3.50.0. Fixes
-          <ulink url="&blfs-ticket-root;19480">#19480</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to pygobject-3.48.2 (Python Module). Fixes
-          <ulink url="&blfs-ticket-root;19613">#19613</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Archive gnome-video-effects. Fixes
-          <ulink url="&blfs-ticket-root;19488">#19488</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gtksourceview-5.12.0. Fixes
-          <ulink url="&blfs-ticket-root;19590">#19590</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-keyring-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19484">#19484</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to xwayland-23.2.5 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19579">#19579</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to xorg-server-21.1.12 (Security Update). Addresses
-          <ulink url="&blfs-ticket-root;19579">#19579</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to nghttp2-1.61.0 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19596">#19596</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 7th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to libX11-1.8.9 (Xorg library). Fixes
-          <ulink url="&blfs-ticket-root;19610">#19610</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mtdev-1.1.7. Fixes
-          <ulink url="&blfs-ticket-root;19608">#19608</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tcsh-6.24.12. Fixes
-          <ulink url="&blfs-ticket-root;19607">#19607</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tepl-6.9.0. Fixes
-          <ulink url="&blfs-ticket-root;19591">#19591</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libgedit-gtksourceview-299.1.0. Fixes
-          <ulink url="&blfs-ticket-root;19615">#19515</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to nodejs-20.12.1 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19552">#19552</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to samba-4.20.0 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19554">#19554</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to mesa-24.0.4. Fixes
-          <ulink url="&blfs-ticket-root;19556">#19556</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 6th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Move luit from xorg apps to it's own page. Fixes
-          <ulink url="&blfs-ticket-root;19578">#19578</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gnutls-3.8.5. Fixes
-          <ulink url="&blfs-ticket-root;19592">#19592</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to enchant-2.6.9. Fixes
-          <ulink url="&blfs-ticket-root;19593">#19593</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to hwdata-0.381. Fixes
-          <ulink url="&blfs-ticket-root;19594">#19594</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to at-spi2-core-2.52.0. Fixes
-          <ulink url="&blfs-ticket-root;19587">#19587</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to sentry-sdk-1.44.1. Fixes
-          <ulink url="&blfs-ticket-root;19582">#19582</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Move libwnck from gnome section to xfce section. Fixes
-          <ulink url="&blfs-ticket-root;19577">#19577</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to pciutils-3.12.0. Fixes
-          <ulink url="&blfs-ticket-root;19609">#19609</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 5th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to libxmlb-0.3.17. Fixes
-          <ulink url="&blfs-ticket-root;19580">#19580</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to gtkmm-3.24.9. Fixes
-          <ulink url="&blfs-ticket-root;19589">#19589</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to cairomm-1.14.5. Fixes
-          <ulink url="&blfs-ticket-root;19588">#19588</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to poppler-24.04.0. Fixes
-          <ulink url="&blfs-ticket-root;19574">#19574</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to mupdf-1.24.1. Fixes
-          <ulink url="&blfs-ticket-root;19576">#19576</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to mpg123-1.32.6. Fixes
-          <ulink url="&blfs-ticket-root;19605">#19605</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to nasm-2.16.02. Fixes
-          <ulink url="&blfs-ticket-root;19595">#19595</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to LLVM-18.1.2.  Addresses
-          <ulink url="&blfs-ticket-root;19438">#19438</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 4th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to gnome-weather-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19586">#19586</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libgweather-4.4.2. Fixes
-          <ulink url="&blfs-ticket-root;19522">#19522</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Adapt Firefox to use Google's Location Service by
-          removing our MLS API key. Fixes
-          <ulink url="&blfs-ticket-root;19541">#19541</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Adapt Geoclue to use Google's Location Service due
-          to the Mozilla Location Service shutdown. Fixes
-          <ulink url="&blfs-ticket-root;19541">#19541</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gjs-1.80.2. Fixes
-          <ulink url="&blfs-ticket-root;19487">#19487</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to snapshot-46.1. Fixes
-          <ulink url="&blfs-ticket-root;19507">#19507</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to wireplumber-0.5.1. Fixes
-          <ulink url="&blfs-ticket-root;19567">#19567</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to pango-1.52.2. Fixes
-          <ulink url="&blfs-ticket-root;19585">#19585</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to cmake-3.29.1. Fixes
-          <ulink url="&blfs-ticket-root;19584">#19584</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 3rd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to libadwaita-1.5.0. Fixes
-          <ulink url="&blfs-ticket-root;19489">#19489</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update the gstreamer stack to 1.24.1. Fixes
-          <ulink url="&blfs-ticket-root;19408">#19408</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 2nd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to libreoffice-24.2.2.2. Fixes
-          <ulink url="&blfs-ticket-root;19559">#19559</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kirigami-addons-1.1.0. Fixes
-          <ulink url="&blfs-ticket-root;19573">#19573</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gobject-introspection-1.80.1. Fixes
-          <ulink url="&blfs-ticket-root;19572">#19572</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Update to biber-2.20 with biblatex-3.20 and update
-          related perl items: Module-Build-0.4234 (Perl Module), Alien-Build-2.80,
-          B-Hooks-EndOfScope-0.28, CPAN-Meta-Check-0.18, DateTime-1.65,
-          DateTime-Locale-1.40, DateTime-TimeZone=2.62, Devel-StackTrace-2.05,
-          Exporter-Tiny-1.006002, File-Listing-6.16, HTML-Tagset-3.24,
-          HTTP-Cookies-6.11, HTTP-Date-6.06, HTTP-Message-6.45, Net-SSLeay-1.94,
-          Test-Warnings-0.033, Tie-Cycle-1.228, Variable-Magic-0.64,
-          XML-LibXML-2.0210 (Perl Dependent Modules). Archive: Importer,
-          Module-Pluggable, Sub-Info (Perl Dependent Modules). Thanks to
-          Stephen Berman for reporting Net-SSLeay no-longer passed its tests, and
-          to Bruce for diagnosing this. Fixes
-          <ulink url="&blfs-ticket-root;19528">#19528</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 1st, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Upgrade c-ares-1.28.1. Fixes
-          <ulink url="&blfs-ticket-root;19566">#19566</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Fix building Inkscape with poppler-24.03.0. Fixes
-          <ulink url="&blfs-ticket-root;19570">#19570</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libical-3.0.18. Fixes
-          <ulink url="&blfs-ticket-root;19568">#19568</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to jasper-4.2.3. Fixes
-          <ulink url="&blfs-ticket-root;19565">#19565</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to soundtouch-2.3.3. Fixes
-          <ulink url="&blfs-ticket-root;19564">#19564</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mercurial-6.7.2. Fixes
-          <ulink url="&blfs-ticket-root;19562">#19562</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to harfbuzz-8.4.0. Fixes
-          <ulink url="&blfs-ticket-root;19561">#19561</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 31st, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to librsvg-2.58.0. Fixes
-          <ulink url="&blfs-ticket-root;19433">#19433</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 30th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to wireshark-4.2.4 (Security update). Fixes
-          <ulink url="&blfs-ticket-root;19555">#19555</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to sentry-sdk-1.44.0 (Python module). Fixes
-          <ulink url="&blfs-ticket-root;19558">#19558</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to c-ares-1.28.0. Fixes
-          <ulink url="&blfs-ticket-root;19563">#19563</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 29th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Update to shadow-4.15.1. Fixes
-          <ulink url="&blfs-ticket-root;19532">#19532</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 28th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to qt6-6.6.3 and qtwebengine-6.6.3. Fixes
-          <ulink url="&blfs-ticket-root;19551">#19551</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 28th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[timtas] - Update to libva-2.21.0. Fixes
-          <ulink url="&blfs-ticket-root;19546">#19546</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bubblewrap-0.9.0. Fixes
-          <ulink url="&blfs-ticket-root;19549">#19549</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to URI-5.28 (Perl Module). Fixes
-          <ulink url="&blfs-ticket-root;19550">#19550</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libblockdev-3.1.1. Fixes
-          <ulink url="&blfs-ticket-root;19548">#19548</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to btrfs-progs-v6.8. Fixes
-          <ulink url="&blfs-ticket-root;19547">#19547</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to xorgproto-2024.1. Fixes
-          <ulink url="&blfs-ticket-root;19544">#19544</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 27th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[timtas] - Update to cURL-8.7.1 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19553">#19553</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Fix a misconfiguration in LibreOffice on i686 systems.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Force vlc to compile against lua52.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 26th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to Vulkan-Headers and Vulkan-Loader 1.3.281.
-          Fixes <ulink url="&blfs-ticket-root;19434">#19434</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to icewm-3.4.7. Fixes
-          <ulink url="&blfs-ticket-root;19542">#19542</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Xorg libraries libX11-1.8.8 and libXmu-1.2.0. Fixes
-          <ulink url="&blfs-ticket-root;19539">#19539</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to emacs-29.3 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19537">#19537</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 25th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[timtas] - Update to cryptsetup-2.7.1. Fixes
-          <ulink url="&blfs-ticket-root;19425">#19425</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gsettings-desktop-schemas-46.0. Fixes
-          <ulink url="&blfs-ticket-root;19479">#19479</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 24th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to umockdev-0.18.1. Fixes
-          <ulink url="&blfs-ticket-root;19538">#19538</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Added Python modules certifi, psutil, pygdbmi, 
-          and sentry-sdk in support of plasma. Fixes
-          <ulink url="&blfs-ticket-root;19536">#19536</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Added Python modules html5lib and webencodings 
-          in support of qtwebengine. Fixes
-          <ulink url="&blfs-ticket-root;19535">#19535</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 24th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to libpciaccess-0.18.1 (xorg library). Fixes
-          <ulink url="&blfs-ticket-root;19534">#19534</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libxkbcommon-1.7.0. Fixes
-          <ulink url="&blfs-ticket-root;19533">#19533</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to SPIRV-Tools-1.3.280.0. Fixes
-          <ulink url="&blfs-ticket-root;19531">#19531</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to enchant-2.6.8. Fixes
-          <ulink url="&blfs-ticket-root;19530">#19530</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 23rd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[thomas] - Update to gnutls-3.8.4 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19510">#19510</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to rustc-1.77.0.  Fixes
-          <ulink url="&blfs-ticket-root;19527">#19527</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 22nd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[rahul] - Update to cmake-3.29.0. Fixes
-          <ulink url="&blfs-ticket-root;19525">#19525</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to gtk4-4.14.1. Fixes
-          <ulink url="&blfs-ticket-root;19464">#19464</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to pipewire-1.0.4. Fixes
-          <ulink url="&blfs-ticket-root;19462">#19462</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to spidermonkey-115.9.1 (Security Update).
-          Fixes <ulink url="&blfs-ticket-root;19500">#19500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Update to firefox-115.9.1 (Security Update).  Fixes
-          <ulink url="&blfs-ticket-root;19529">#19529</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mercurial-6.7.1. Fixes
-          <ulink url="&blfs-ticket-root;19526">#19526</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 21st, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to bind utilities/bind-9.18.25. Fixes
-          <ulink url="&blfs-ticket-root;19521">#19521</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to wayland-protocols-1.34.  Fixes
-          <ulink url="&blfs-ticket-root;19520">#19520</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcloudproviders-0.3.6.  Fixes
-          <ulink url="&blfs-ticket-root;19519">#19519</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to SPIRV-Headers-1.3.280.0.  Fixes
-          <ulink url="&blfs-ticket-root;19518">#19518</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mupdf-1.24.0.  Fixes
-          <ulink url="&blfs-ticket-root;19516">#19516</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to adwaita-icon-theme-46.0.  Fixes
-          <ulink url="&blfs-ticket-root;19514">#19514</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pinentry-1.3.0.  Fixes
-          <ulink url="&blfs-ticket-root;19513">#19513</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to glad-2.0.6.  Fixes
-          <ulink url="&blfs-ticket-root;19512">#19512</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 20th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to elogind-252.23.  Fixes
-          <ulink url="&blfs-ticket-root;19509">#19509</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to harfbuzz-8.3.1.  Fixes
-          <ulink url="&blfs-ticket-root;19494">#19494</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mercurial-6.7.  Fixes
-          <ulink url="&blfs-ticket-root;19469">#19469</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Update to texlive 2024.  Fixes
-          <ulink url="&blfs-ticket-root;19463">#19463</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Remove old ConTeXt fixes from texlive source.  Fixes
-          <ulink url="&blfs-ticket-root;18349">#18349</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to vte-0.76.0.  Fixes
-          <ulink url="&blfs-ticket-root;19474">#19474</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Adapt rsync to LZ4 now being in LFS.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bluefish-2.2.15.  Fixes
-          <ulink url="&blfs-ticket-root;19493">#19493</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to wireplumber-0.5.0.  Fixes
-          <ulink url="&blfs-ticket-root;19089">#19089</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to thunderbird-115.9.0.  Fixes
-          <ulink url="&blfs-ticket-root;19515">#19515</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to libpaper-2.2.5.  Fixes
-          <ulink url="&blfs-ticket-root;19511">#19511</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 19th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to tk8.6.14.  Fixes
-          <ulink url="&blfs-ticket-root;19498">#19498</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to SCons-4.7.0.  Fixes
-          <ulink url="&blfs-ticket-root;19495">#19495</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to glib-networking-2.80.0.  Fixes
-          <ulink url="&blfs-ticket-root;19470">#19470</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Update to firefox-115.9.0 (Security Update).  Fixes
-          <ulink url="&blfs-ticket-root;19499">#19499</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to nss-3.99.  Fixes
-          <ulink url="&blfs-ticket-root;19467">#19467</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vala-0.56.16.  Fixes
-          <ulink url="&blfs-ticket-root;19465">#19465</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libaom-3.8.2.  Fixes
-          <ulink url="&blfs-ticket-root;19461">#19461</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to libpaper-2.2.3.  Fixes
-          <ulink url="&blfs-ticket-root;19445">#19445</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tcsh-6.24.11.  Fixes
-          <ulink url="&blfs-ticket-root;19457">#19457</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to jasper-4.2.2.  Fixes
-          <ulink url="&blfs-ticket-root;19454">#19454</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libqalculate-5.0.0.  Fixes
-          <ulink url="&blfs-ticket-root;19453">#19453</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 18th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to xapian-core-1.4.25.  Fixes
-          <ulink url="&blfs-ticket-root;19427">#19427</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iceauth-1.0.10 (Xorg app).  Fixes
-          <ulink url="&blfs-ticket-root;19450">#19450</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libXaw-1.0.16 (Xorg library).  Fixes
-          <ulink url="&blfs-ticket-root;19451">#19451</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to packaging-24.0 (Python module).  Fixes
-          <ulink url="&blfs-ticket-root;19448">#19448</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pygobject3-3.48.1 (Python module).  Fixes
-          <ulink url="&blfs-ticket-root;19440">#19440</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pytest-8.1.1 (Python module).  Fixes
-          <ulink url="&blfs-ticket-root;19443">#19443</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to gvfs-1.54.0.  Fixes
-          <ulink url="&blfs-ticket-root;19483">#19483</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to HTML-Parser-3.82 (Perl module).  Fixes
-          <ulink url="&blfs-ticket-root;19458">#19458</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libwww-perl-6.77 (Perl module).  Fixes
-          <ulink url="&blfs-ticket-root;19447">#19447</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to LWP-Protocol-https-6.14 (Perl module).  Fixes
-          <ulink url="&blfs-ticket-root;19446">#19446</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to asciidoctor-2.0.22.  Fixes
-          <ulink url="&blfs-ticket-root;19437">#19437</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to shadow-4.15.0.  Fixes
-          <ulink url="&blfs-ticket-root;19432">#19432</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to glslang-14.1.0.  Fixes
-          <ulink url="&blfs-ticket-root;19435">#19435</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to php-8.3.4.  Fixes
-          <ulink url="&blfs-ticket-root;19466">#19466</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to wget-1.24.5.  Fixes
-          <ulink url="&blfs-ticket-root;19449">#19449</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to at-spi2-core-2.50.2.  Fixes
-          <ulink url="&blfs-ticket-root;19471">#19471</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 17th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to sddm-0.21.0.  Fixes
-          <ulink url="&blfs-ticket-root;19360">#19360</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Add xdotool-3.20211022.1 in support of plasma6. Addresses
-          <ulink url="&blfs-ticket-root;19373">#19373</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Add libdisplay-info-0.1.1 in support of plasma6. Addresses
-          <ulink url="&blfs-ticket-root;19373">#19373</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Add hwdata-0.380 in support of plasma6. Addresses
-          <ulink url="&blfs-ticket-root;19373">#19373</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Add kirigami-addons-1.0.1 in support of plasma6. Addresses
-          <ulink url="&blfs-ticket-root;19373">#19373</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Add qcoro-0.10.0 in support of plasma6. Addresses 
-          <ulink url="&blfs-ticket-root;19373">#19373</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to libxml2-2.12.6.  Fixes
-          <ulink url="&blfs-ticket-root;19468">#19468</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Archive wpebackend-fdo and libwpe.  Fixes
-          <ulink url="&blfs-ticket-root;19478">#19478</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to WebKitGTK-2.44.0.  Fixes
-          <ulink url="&blfs-ticket-root;18460">#18460</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 16th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[timtas] - Update to mesa-24.0.3.  Fixes
-          <ulink url="&blfs-ticket-root;19459">#19459</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 15th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[rahul] - Update to icewm-3.4.6. Fixes
-          <ulink url="&blfs-ticket-root;19430">#19430</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to unbound-1.19.3 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19429">#19429</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to bluez-5.73. Fixes
-          <ulink url="&blfs-ticket-root;19428">#19428</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[rahul] - Update to gnupg-2.4.5. Fixes
-          <ulink url="&blfs-ticket-root;19426">#19426</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Upgrade to sqlite-3.45.2. Fixes
-          <ulink url="&blfs-ticket-root;19456">#19456</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 14th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Add dtc-1.7.0 for supporting qemu-8.2.2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 12th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Update to mutt-2.2.13. Fixes
-          <ulink url="&blfs-ticket-root;19441">#19441</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to openssh-9.7p1, ssh-askpass-9.7p1. Fixes
-          <ulink url="&blfs-ticket-root;19452">#19452</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 10th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Update to asymptote-2.88. Fixes
-          <ulink url="&blfs-ticket-root;19372">#19372</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to glib-2.80.0.  Fixes
-          <ulink url="&blfs-ticket-root;19444">#19444</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to gobject-introspection-1.80.0.  Fixes
-          <ulink url="&blfs-ticket-root;19439">#19439</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Combine gobject-introspection into glib page to
-          better handle the circular dependency between these two
-          packages.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 9th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Update to dvisvgm-3.2.2. Fixes
-          <ulink url="&blfs-ticket-root;19384">#19384</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Update to ghostscript-10.03.0 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19423">#19423</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Upgrade to postfix-3.9.0. Fixes
-          <ulink url="&blfs-ticket-root;19436">#19436</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Upgrade to libxfce4ui-4.18.6. Fixes
-          <ulink url="&blfs-ticket-root;19436">#19436</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 7th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Revert to pytest-8.0.2 (Python Module). Fixes
-          <ulink url="&blfs-ticket-root;19417">#19417</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to pyparsing-3.1.2 (Python Module). Fixes
-          <ulink url="&blfs-ticket-root;19416">#19416</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libassuan-2.5.7. Fixes
-          <ulink url="&blfs-ticket-root;19415">#19415</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to SDL2-2.30.1. Fixes
-          <ulink url="&blfs-ticket-root;19412">#19412</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to umockdev-0.18.0. Fixes
-          <ulink url="&blfs-ticket-root;19399">#19399</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to opus-1.5.1. Fixes
-          <ulink url="&blfs-ticket-root;19409">#19409</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to uhttpmock-0.10.0. Fixes
-          <ulink url="&blfs-ticket-root;19406">#19406</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to vala-0.56.15. Fixes
-          <ulink url="&blfs-ticket-root;19405">#19405</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to mkfontscale-1.2.3, xauth-1.1.3, xev-1.2.6,
-          xmessage-1.0.7, xpr-1.2.0, and xrefresh-1.1.0 (Xorg Applications).
-          Fixes <ulink url="&blfs-ticket-root;19402">#19402</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gdb-14.2. Fixes
-          <ulink url="&blfs-ticket-root;19398">#19398</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 6th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to SeaMonkey-2.53.18.1 (Security Update).
-          Fixes <ulink url="&blfs-ticket-root;19420">#19420</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to LLVM-18.1.0.  Fixes
-          <ulink url="&blfs-ticket-root;19413">#19413</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to thunderbird-115.8.1 (Security Update).
-          Fixes <ulink url="&blfs-ticket-root;19411">#19411</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to xf86-input-wacom-1.2.1 (Xorg Driver).
-          Fixes <ulink url="&blfs-ticket-root;19403">#19403</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gtk-doc-1.34.0. Fixes
-          <ulink url="&blfs-ticket-root;19410">#19410</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gnome-maps-45.5. Fixes
-          <ulink url="&blfs-ticket-root;19397">#19397</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to gcr-4.2.1. Fixes
-          <ulink url="&blfs-ticket-root;19396">#19396</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libadwaita-1.4.4. Fixes
-          <ulink url="&blfs-ticket-root;19395">#19395</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to pytest-8.1.0 (Python Module). Fixes
-          <ulink url="&blfs-ticket-root;19401">#19401</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Finish updating to kf6-apps. Fixes
-          <ulink url="&blfs-ticket-root;19375">#19375</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Archive PCRE1.  Fixes
-          <ulink url="&blfs-ticket-root;18893">#18893</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 5th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to libreoffice-24.2.1.2. Fixes
-          <ulink url="&blfs-ticket-root;19382">#19382</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to qemu-8.2.2. Fixes
-          <ulink url="&blfs-ticket-root;19404">#19404</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 4th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to poppler-24.03.0. Fixes
-          <ulink url="&blfs-ticket-root;19400">#19400</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 4th, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to kImageAnnotator-0.7.1. Fixes
-          <ulink url="&blfs-ticket-root;19388">#19388</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kColorPicker-0.3.1. Fixes
-          <ulink url="&blfs-ticket-root;19387">#19387</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Preliminary update to kf6-6.0.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 3rd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to encodings-1.1.0 (Xorg Font). Fixes
-          <ulink url="&blfs-ticket-root;19393">#19393</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libXcursor-1.2.2 (Xorg Library) and
-          libfontenc-1.1.8 (Xorg Library). Fixes
-          <ulink url="&blfs-ticket-root;19392">#19392</ulink> and
-          <ulink url="&blfs-ticket-root;19389">#19389</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libxcb-1.16.1. Fixes
-          <ulink url="&blfs-ticket-root;19391">#19391</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libXdmcp-1.1.5. Fixes
-          <ulink url="&blfs-ticket-root;19394">#19394</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to nghttp2-1.60.0. Fixes
-          <ulink url="&blfs-ticket-root;19386">#19386</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mdadm-4.3. Fixes
-          <ulink url="&blfs-ticket-root;19377">#19377</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pixman-0.43.4. Fixes
-          <ulink url="&blfs-ticket-root;19376">#19376</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mesa-24.0.2.  Fixes
-          <ulink url="&blfs-ticket-root;19374">#19374</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to a52dec-0.8.0.  Fixes
-          <ulink url="&blfs-ticket-root;19368">#19368</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to swig-4.2.1.  Fixes
-          <ulink url="&blfs-ticket-root;19365">#19365</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to qpdf-11.9.0.  Fixes
-          <ulink url="&blfs-ticket-root;19363">#19363</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libunistring-1.2.  Fixes
-          <ulink url="&blfs-ticket-root;19361">#19361</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libpng-1.6.43.  Fixes
-          <ulink url="&blfs-ticket-root;19354">#19354</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mupdf-1.23.11.  Fixes
-          <ulink url="&blfs-ticket-root;19347">#19347</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to polkit-qt-1-0.200.0.  Fixes
-          <ulink url="&blfs-ticket-root;19345">#19345</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to python-dbusmock-0.31.1 (Python module).  Fixes
-          <ulink url="&blfs-ticket-root;19356">#19356</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to npth-1.7.  Fixes
-          <ulink url="&blfs-ticket-root;19353">#19353</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libksba-1.6.6.  Fixes
-          <ulink url="&blfs-ticket-root;19352">#19352</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libgpg-error-1.48.  Fixes
-          <ulink url="&blfs-ticket-root;19351">#19351</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[thomas] - Update to pciutils-3.11.1.  Fixes
-          <ulink url="&blfs-ticket-root;19364">#19364</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to shadow-4.14.6.  Fixes
-          <ulink url="&blfs-ticket-root;19385">#19385</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 2nd, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[renodr] - Update to epiphany-45.3. Fixes
-          <ulink url="&blfs-ticket-root;19381">#19381</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to glib-networking-2.78.1. Fixes
-          <ulink url="&blfs-ticket-root;19378">#19378</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to AppStream-1.0.2. Fixes
-          <ulink url="&blfs-ticket-root;19362">#19362</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to libsecret-0.21.4. Fixes
-          <ulink url="&blfs-ticket-root;19358">#19358</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to glm-1.0.1. Fixes
-          <ulink url="&blfs-ticket-root;19369">#19369</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to OpenJPEG-2.5.2 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19370">#19370</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to c-ares-1.27.0 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19357">#19357</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to NetworkManager-1.46.0. Fixes
-          <ulink url="&blfs-ticket-root;19350">#19350</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to Spidermonkey-115.8.0. Fixes
-          <ulink url="&blfs-ticket-root;19344">#19344</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to asciidoctor-2.0.21. Fixes
-          <ulink url="&blfs-ticket-root;19341">#19341</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mpg123-1.32.5. Fixes
-          <ulink url="&blfs-ticket-root;19328">#19328</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pytest-8.0.2 (Python module). Fixes
-          <ulink url="&blfs-ticket-root;19326">#19326</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to pcre2-10.43. Fixes
-          <ulink url="&blfs-ticket-root;19062">#19062</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Enable support for Vulkan in ffmpeg again. Fixes
-          <ulink url="&blfs-ticket-root;19390">#19390</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to jasper-4.2.1. Fixes
-          <ulink url="&blfs-ticket-root;19340">#19340</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to Vulkan-Headers and Vulkan-Loader 1.3.279.
-          Fixes <ulink url="&blfs-ticket-root;19327">#19327</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to giflib-5.2.2 (Security Update). Fixes
-          <ulink url="&blfs-ticket-root;19335">#19335</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to unrar-7.0.7. Fixes
-          <ulink url="&blfs-ticket-root;18768">#18768</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to xfce4-panel-4.18.6. Fixes
-          <ulink url="&blfs-ticket-root;19379">#19379</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to xarchiver-0.5.4.23. Fixes
-          <ulink url="&blfs-ticket-root;19383">#19383</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[timtas] - Update to xfce4-terminal-1.1.3. Fixes
-          <ulink url="&blfs-ticket-root;19380">#19380</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 1st, 2024</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Release of BLFS-12.1.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
+<sect1 id="intro-welcome-changelog">
+<?dbhtml filename="changelog.html" dir="introduction"?>
+<title>Changelog</title>
+
+<para>Please note that the changelog only lists which editor was
+responsible for putting the changes into CVS; please read the Credits
+page in Chapter 1 for details on who wrote what.</para>
+
+<para>&version; - &releasedate;</para>
+
+<itemizedlist>
+
+<listitem><para>July 4, 2002 [bdubbs]: Various typo and 
+grammer changes.</para></listitem>
+
+<listitem><para>July 4, 2002 [bdubbs]: KDE section - updated 
+koffice patch instruction and added a backslash to kdelibs
+build commands. Successfully rebuilt kde 3.0.2 with current
+instructions.</para></listitem>
+
+<listitem><para>July 3, 2002 [bdubbs]: KDE section - updated 
+koffice and changed to kde 3.0.2.</para></listitem>
+
+<listitem><para>July 2, 2002 [bdubbs]: KDE section - updated 
+kdeutils, kdeedu, kdeartwork, kdetoys, and kdeaddons.</para></listitem>
+
+<listitem><para>July 2, 2002 [bdubbs]: Updated 
+link location in libungif and added a note to remove a possible
+compilation error.</para></listitem>
+
+<listitem><para>July 1, 2002 [bdubbs]: KDE section - updated 
+kdegraphics, kdeadmin, and kdegames sections.  Updated imlib
+to correct an error in configure with gcc 3.1.  Changed download
+locations to links in libtiff and libungif</para></listitem>
+
+<listitem><para>June 30, 2002 [bdubbs]: KDE section - updated 
+kedmultimedia, kdenetwork and kdepim sections.</para></listitem>
+
+<listitem><para>June 29, 2002 [larry]: Chapter 5 - updated to
+alsa-0.9.0rc2 and moved gnome intro.</para></listitem>
+
+<listitem><para>June 28, 2002 [bdubbs]: QT section -  Added note to allow
+not building examples and tutorials.</para></listitem>
+
+<listitem><para>June 28, 2002 [larry]: Chapter 4 - Added GTK+-1.2.10,
+GLib-1.2.10, gdk-0.11.0, libxml-1.8.17.</para></listitem>
+
+<listitem><para>June 27, 2002 [larry]: Chapter 12 - Started adding
+GNOME-1.4.1.</para></listitem>
+
+<listitem><para>June 26, 2002 [larry]: Chapter 4 - Added
+GTK+-2.0.5, Chapter 9 - Updated to OpenSSH-3.4p1.</para></listitem>
+
+<listitem><para>June 24, 2002 [larry]: Chapter 9 - Updated to
+OpenSSH-3.3p1, with modifications to set up priviledged/unpriviledged
+operations which is now the default. Chapter 4 - Added GLib-2.0.4,
+Pango-1.0.3 and ATK-1.0.2</para></listitem>
+
+<listitem><para>June 22, 2002 [larry]: Chapter 20 - Added kernel
+configuration and additional reading links to
+introduction.</para></listitem>
+
+<listitem><para>June 21, 2002 [larry]: Chapter 04 - Added
+pkgconfig-0.12.0.</para></listitem>
+
+<listitem><para>June 15th, 2002 [larry]: Chapter 08 - Modified config
+sed command for a change in main.cf after version 1.1.9 on
+myhostname.</para></listitem>
+
+<listitem><para>June 14th, 2002 [larry]: Chapter 07 - Update to curl-7.9.8.
+</para></listitem>
+
+<listitem><para>June 7th, 2002 [markh]: Chapter 02 - Update daemontools
+and daemontools-man packages; patch from Sal Gonzalez.</para></listitem>
+
+<listitem><para>June 7th, 2002 [markh]: Chapter 05 - Update db link
+location.</para></listitem>
+
+<listitem><para>June 7th, 2002 [markh]: Chapter 13 - Update objprelink
+download location and slightly modify build command to match new
+file.</para></listitem>
+
+<listitem><para>June 7th, 2002 [markh]: Chapter 07 - Update to
+links-0.97.</para></listitem>
+
+<listitem><para>June 7th, 2002 [markh]: Chapter 05 - Update to
+hdparm-5.2.</para></listitem>
+
+<listitem><para>June 7th, 2002 [markh]: Chapter 04 - Finally applied the
+fix for libmng to make it use lcms properly.</para></listitem>
+
+<listitem><para>May 31st, 2002 [larry]: Update to
+postfix-1.1.11, modified fcron script.</para></listitem>
+
+<listitem><para>May 31st, 2002 [markh]: Chapter 06 - Update to
+wvstreams-3.70 and wvdial-1.53.</para></listitem>
+
+<listitem><para>May 31st, 2002 [bdubbs]: Add comment about 
+<filename>/lib/libmisc.la</filename> to kdebase instructions.</para></listitem>
+
+<listitem><para>May 30th, 2002 [larry]: Update to libxml2-1.4.22 and
+libxslt-1.0.18.</para></listitem>
+
+<listitem><para>May 29th, 2002 [markh]: Chapter 04 - Update openssl
+instructions to install man pages in /usr/share/man.  We get around the
+passwd man page problem by renaming the source file to openssl-passwd.
+Thanks to Jesse for suggesting this.</para></listitem>
+
+<listitem><para>May 28th, 2002 [bdubbs]: Change structure of kde xml
+and begin KDE Intro.</para></listitem>
+
+<listitem><para>May 28th, 2002 [bdubbs]: Remove extra line feed
+in qt configure instructions for man.conf.</para></listitem>
+
+<listitem><para>May 24th, 2002 [bdubbs]: Updated to openssl
+to version 0.9.6d and updated configure instruction.</para></listitem>
+
+<listitem><para>May 23rd, 2002 [larry]: Updated to libpng
+1.2.3 and OpenSSH 3.2.3p1.</para></listitem>
+
+<listitem><para>May20th, 2002 [larry]: Added pccts 133MR33 to chapter
+04 and cdrdao 1.1.5 to chapter 20.</para></listitem>
+
+<listitem><para>May19th, 2002 [larry]: Updated to OpenSSH 
+3.2.2p1.</para></listitem>
+
+<listitem><para>May 19th, 2002 [bdubbs]: Updated cvs version to 
+1.11.2.</para></listitem>
+
+<listitem><para>May 18th, 2002 [larry]: Updated to postfix
+1.1.9.</para></listitem>
+
+<listitem><para>May 17th, 2002 [bdubbs]: Chapter 11 - Inserted 
+text about Window Mangers.  Chapter 13 - Added stubs for KDE.
+Updated links for QT and objprelink.</para></listitem>
+
+<listitem><para>May 17th, 2002 [bdubbs]: Chapter 10 - Updated
+XFree86 sections. Corrected kernel make commands and changed 
+url references to links.</para></listitem>
+
+<listitem><para>May 16th, 2002 [bdubbs]: Chapter 10 - Added
+XFree86. Updated data for objprelink.</para></listitem>
+
+<listitem><para>May 16th, 2002 [larry]: Chapter 05 - Added
+unzip-5.50.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 02 - Fix up formatting
+in traceroute section.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 06 and 09.  Update to
+dhcp-3.0pl1.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 04 - Update to
+libpng-1.2.2 and fix imlib so it works with this libpng
+version.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 08 - Update to
+postfix-1.1.8.  Chapter 13 - Update to qt-3.0.4.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 04 - Add libxml2 and
+libxslt (from Larry).</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 17 - SDL (to 1.2.4) and
+XMMS (to 1.2.7) update from Jeroen.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 13 - Add objprelink and
+update QT instructions to match.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 06 - Firewalling.
+Changed references to <filename>/etc/init.d</filename> --&gt;
+<filename>/etc/rc.d/init.d</filename>.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 06 - DHCP.  Fixed
+extraneous line in dhclient.conf creation command.</para></listitem>
+
+<listitem><para>May 15th, 2002 [markh]: Chapter 05 - Alsa.  Fixed typo
+in chmod command.  Added note about manually creating
+<filename>/etc/asound.conf</filename> so that alsactl doesn't baulk on
+first startup.</para></listitem>
+
+<listitem><para>April 29th, 2002 [markh]: Chapter 06 - Add DHCP_STOP
+variable to DHCP scripts.</para></listitem>
+
+<listitem><para>April 28th, 2002 [markh]: Chapter 04 - Add
+imlib.</para></listitem>
+
+<listitem><para>April 28th, 2002 [markh]: Chapter 02, 04, 08 - Minor fixes
+to daemontools, libpng, libmng and postfix instructions.</para></listitem>
+
+<listitem><para>April 28th, 2002 [markh]: Chapter 05 - Fix to alsa
+install instructions (added a missing 's' and \).</para></listitem>
+
+<listitem><para>April 20th, 2002 [markh]: Chapter 20 - Add
+cdrtools-1.10.</para></listitem>
+
+<listitem><para>April 20th, 2002 [markh]: Chapter 09 - Add DHCP server
+instructions.</para></listitem>
+
+<listitem><para>April 20th, 2002 [markh]: Chapter 06 - We now have DHCP
+client configuration instructions.</para></listitem>
+
+<listitem><para>April 20th, 2002 [markh]: Chapter 08 and Appendix A -
+Update to postfix-1.1.7 and keep runlevels list in sync with LFS-1.9
+(from Larry).</para></listitem>
+
+<listitem><para>April 7th, 2002 [markh]: Chapter 07 - Added curl.
+Chapter 18 - Added vorbistools.</para></listitem>
+
+<listitem><para>April 7th, 2002 [markh]: Chapter 17 - Added libao,
+libogg, libvorbis.</para></listitem>
+
+<listitem><para>April 7th, 2002 [markh]: Chapter 08 - Postfix update
+from Larry and fix script to use spaces instead of
+tabs.</para></listitem>
+
+<listitem><para>April 7th, 2002 [markh]: Chapter 05 - Applied fcron
+updates (two of them) from Larry.  Moves to fcron-2.9.0 with a few
+fixes.</para></listitem>
+
+<listitem><para>April 7th, 2002 [markh]: Daemontools - moved to using
+<userinput>telinit -Q</userinput> instead of <userinput>kill -HUP
+1</userinput> following user comments on blfs-dev.</para></listitem>
+
+<listitem><para>April 7th, 2002 [markh]: Chapter 17 - Add
+audiofile-0.2.3.</para></listitem>
+
+<listitem><para>March 28th, 2002 [markh]: Chapter 08 - Add postfix-1.1.5
+instructions.</para></listitem>
+
+<listitem><para>March 28th, 2002 [markh]: Chapter 13 - Update to
+QT-3.0.3.</para></listitem>
+
+<listitem><para>March 27th, 2002 [markh]: Chapter 07 and 09 - Added
+dhcp package instructions.</para></listitem>
+
+<listitem><para>March 26th, 2002 [markh]: Chapter 04 - Add pcre-3.9
+instructions.</para></listitem>
+
+<listitem><para>March 26th, 2002 [markh]: Chapter 13 - Added initial set
+of qt instructions.</para></listitem>
+
+<listitem><para>March 26th, 2002 [markh]: Chapter 05 - Fcron update to
+2.1.0 and a few miscellaneous fixes from Larry.</para></listitem>
+
+<listitem><para>March 25th, 2002 [markh]: Chapter 05 - Fix the mistake
+whereby we tried to add lines to <filename
+class="directory">/etc/sysconfig</filename> instead of
+<filename>/etc/syslog.conf</filename>.</para></listitem>
+
+<listitem><para>March 25th, 2002 [markh]: Appendix A and other sections
+- Add the initial tables of rc?.d symlinks.  At the same time, make sure
+scripts are set to 755 (to be executable) and sort out the numbering of
+the scripts (some were still using three digits from the old-style
+links).</para></listitem>
+
+<listitem><para>March 25th, 2002 [markh]: Chapter 05 - Added the
+"which" page.</para></listitem>
+
+<listitem><para>March 20th, 2002 [markh]: Moved all homeless packages to
+a new temporary place in Chapter 02 until homes are found for them.
+This leaves appendix A empty for the symlink list.</para></listitem>
+
+<listitem><para>March 20th, 2002 [markh]: Chapter 03 - Added random
+script instructions.</para></listitem>
+
+<listitem><para>March 15th, 2002 [markh]: Chapter 05 - Small update to
+fcron instructions.  Chapter 09 - Small update to OpenSSH
+instructions.</para></listitem>
+
+<listitem><para>March 11th, 2002 [markh]: Chapter 09 - Add OpenSSH-3.1p1
+install instructions.  Chapter 07 - Add reference about installing
+OpenSSH client.</para></listitem>
+
+<listitem><para>March 11th, 2002 [markh]: Chapter 05 - Update fcron
+instructions (syslog related changes).</para></listitem>
+
+<listitem><para>March 11th, 2002 [markh]: Chapter 02 - Add comment about
+using bootscripts with LFS-3.2 and later.  Chapter 05 - Change gpm and
+alsa scripts to work with LFS-3.2 and later.</para></listitem>
+
+<listitem><para>March 11th, 2002 [markh]: Chapter 04 - Update to
+zlib-1.1.4.</para></listitem>
+
+<listitem><para>March 2nd, 2002 [markh]: Chapter 1 - Credits - Modify
+credits list so that each author is only listed once with a complete
+list of what they did (it makes the list smaller).</para></listitem>
+
+<listitem><para>March 2nd, 2002 [markh]: Chapter 5 - Add fcron-2.0.0
+instructions from Larry Lawrence.</para></listitem>
+
+<listitem><para>February 24th, 2002 [markh]: Chapter 5 - Update to
+gpm-1.20.0.</para></listitem>
+
+<listitem><para>February 21st, 2002 [markh]: Argh.. I've been writing
+the wrong date all day!  Changed all Feb 20th entries to Feb
+21st and corrected the book's date.</para></listitem>
+
+<listitem><para>February 21st, 2002 [markh]: Chapter 7 - Update to
+ncftp-3.1.2.</para></listitem>
+
+<listitem><para>February 21st, 2002 [markh]: Chapter 5 - Update to
+db-4.0.14.</para></listitem>
+
+<listitem><para>February 21st, 2002 [markh]: Chapter 4 - Update to
+lcms-1.08, libpng-1.2.1 and libtiff-3.5.7.</para></listitem>
+
+<listitem><para>February 21st, 2002 [markh]: Add chapters 18-20 as
+placeholders for multimedia section and move SDL into ch1 and
+cdparanoia, mpg123 and XMMS into ch18.</para></listitem>
+
+<listitem><para>February 21st, 2002 [markh]: Chapter 5 - Move cvs and db 
+to here from appendix a.</para></listitem>
+
+<listitem><para>February 19th, 2002 [markh]: Chapter 6 - Update to
+hdparm-4.6 and move it here from appendix a.</para></listitem>
+
+<listitem><para>February 19th, 2002 [markh]: Chapter 6 - Update to 
+wvdial-1.50 and add wvstreams-3.64 which is required by the new
+version of wvdial.</para></listitem>
+
+<listitem><para>February 19th, 2002 [markh]: Chapter 6 - Add 
+ppp.</para></listitem>
+
+<listitem><para>February 19th, 2002 [markh]: Chapter 6 - Move wvdial to
+here from appendix A.</para></listitem>
+
+<listitem><para>February 15th, 2002 [markh]: Chapter 6 - DHCP - Added
+initial DHCP section.</para></listitem>
+
+<listitem><para>February 14th, 2002 [markh]: Chapter 6 - Firewalling
+update from Henning.</para></listitem>
+
+<listitem><para>January 3rd, 2002 [markh]: Changed alsa instructions to
+include --with-kernel= for robustness.</para></listitem>
+
+<listitem><para>January 1st, 2002 [markh]: Started large rearrangement
+of book.  Many modifications made.  Fixed up quite a few things.  Happy New 
+Year to you all!</para></listitem>
+
+<listitem><para>December 31st, 2001 [markh]: Gpm - Fixed symlink
+creation so it actually works.</para></listitem>
+
+<listitem><para>December 22nd, 2001 [markh]: Zlib - Added instructions
+to copy manual page as it isn't installed by default.</para></listitem>
+
+<listitem><para>December 20th, 2001 [markh]: Chapter 3 - Added the vimrc
+page.</para></listitem>
+
+<listitem><para>December 20th, 2001 [markh]: Appendix A - Added alsa
+instructions by Alex Kloss.</para></listitem>
+
+<listitem><para>December 20th, 2001 [markh]: Chapter 2 - More text
+added.</para></listitem>
+
+<listitem><para>December 1st, 2001 [markh]: Chapter 3 - Added some
+corrections to the inputrc page regarding the role of /etc/inputrc and
+~/.inputrc.</para></listitem>
+
+<listitem><para>November 30th, 2001 [markh]: Appendix A - Added
+fetchmail instructions by Paul Campbell.</para></listitem>
+
+<listitem><para>November 26th, 2001 [markh]: General - Added
+&lt;&amp;dbhtml&gt; tags all over the place to divide generated HTML
+into directories.</para></listitem>
+
+<listitem><para>November 26th, 2001 [markh]: Chapter 3 - Added
+/etc/inputrc details by Chris Lynn and /etc/issue details by
+me.</para></listitem>
+
+<listitem><para>November 5th, 2001 [markh]: Appendix A - Added gpm
+recommendation to links instructions.</para></listitem>
+
+<listitem><para>October 25th, 2001 [markh]: Chapter 6 - Firewalling
+section added to book.</para></listitem>
+
+<listitem><para>October 25th, 2001 [markh]: Appendix A - wvdial-1.41
+added.</para></listitem>
+
+<listitem><para>October 20th, 2001 [markh]: Appendix A - hdparm-4.2
+added.</para></listitem>
+
+<listitem><para>October 20th, 2001 [markh]: Appendix B removed.  Credits
+moved to a page in Chapter 1.</para></listitem>
+
+<listitem><para>October 20th, 2001 [markh]: Appendix A - All current
+sets of installation instructions changed to install items in /usr
+instead of /usr/local.</para></listitem>
+
+<listitem><para>October 20th, 2001 [markh]: Chapter 2 - Added the /usr
+versus /usr/local debate section.</para></listitem>
+
+<listitem><para>October 14th, 2001 [markh]: Chapter 1 - Added lots of
+text.</para></listitem>
+
+<listitem><para>September 20th, 2001 [markh]: Appendix A - Small
+formatting fix to db instructions so they copy and paste
+properly.</para></listitem>
+
+<listitem><para>September 20th, 2001 [markh]: Appendix A - Updated to
+libmng-1.0.3 and libpng-1.2.0.</para></listitem>
+
+<listitem><para>September 20th, 2001 [markh]: Appendix A - Fixed lcms
+instructions so that they actually work...</para></listitem>
+
+<listitem><para>September 14th, 2001 [markh]: Appendix A - Links
+installation instructions added.</para></listitem>
+
+<listitem><para>September 14th, 2001 [markh]: Appendix A - Lynx
+installation instructions added.</para></listitem>
+
+<listitem><para>September 14th, 2001 [markh]: Appendix A - Finished off
+openssl instructions.</para></listitem>
+
+<listitem><para>September 6th, 2001 [markh]: Appendix A - Added
+daemontools</para></listitem>
+
+<listitem><para>September 4th, 2001 [markh]: General - lots and lots of
+things - setting up xml structure, adding instructions etc.</para></listitem>
+
+</itemizedlist>
+
 </sect1>
+
Index: introduction/welcome/contact.xml
===================================================================
--- introduction/welcome/contact.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/contact.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,22 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-contactinfo">
+<?dbhtml filename="contactinfo.html" dir="introduction"?>
+<title>Contact information</title>
 
-<sect1 id="contactinfo">
-  <?dbhtml filename="contactinfo.html"?>
+<para>Please direct your emails to one of the BLFS mailing lists. See
+<xref linkend="intro-welcome-maillists"/> for more information on the
+available mailing lists.</para>
 
-
-  <title>Contact Information</title>
-
-  <para>Please direct your emails to one of the BLFS mailing lists. See
-  <xref linkend="maillists"/> for more information on
-  the available mailing lists.</para>
-<!--
-  <para>The current BLFS maintainer is &maintainer-fullname;.
-  If you need to reach &maintainer-firstname;, send an email to
-  <ulink url="mailto:&maintainer-address;">&maintainer-address;</ulink>.</para> -->
+<para>The current BLFS maintainer is &maintainer-fullname;.  If you need
+to reach &maintainer-firstname;, send an email to
+<ulink url="mailto:&maintainer-address">&maintainer-address;</ulink>.</para>
 
 </sect1>
+
Index: troduction/welcome/conventions-kernel.xml
===================================================================
--- introduction/welcome/conventions-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>M<emphasis role='blue'>a</emphasis>ster section ---&gt;
-  <emphasis role='blue'>S</emphasis>ubsection ---&gt;
-    [*]     <emphasis role='blue'>R</emphasis>equired parameter                                        [REQU_PAR]
-    &lt;*&gt;     <emphasis role='blue'>R</emphasis>equired parameter (not as module)                   [REQU_PAR_NMOD]
-    &lt;*/M&gt;   <emphasis role='blue'>R</emphasis>equired parameter (could be a module)                [REQU_PAR_MOD]
-    &lt;M&gt;     <emphasis role='blue'>R</emphasis>equired parameter (as a module)                 [REQU_PAR_MOD_ONLY]
-    &lt; /*/M&gt; <emphasis role='blue'>O</emphasis>ptional parameter                                         [OPT_PAR]
-    &lt; /M&gt;   <emphasis role='blue'>O</emphasis>ptional parameter (as a module if enabled)       [OPT_PAR_MOD_ONLY]
-    [ ]     <emphasis role='blue'>I</emphasis>ncompatible parameter                                  [INCOMP_PAR]
-    &lt; &gt;     <emphasis role='blue'>I</emphasis>ncompatible parameter (even as module)             [INCOMP_PAR_MOD]</screen>
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/conventions.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,297 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-conventions">
+<?dbhtml filename="conventions.html" dir="introduction"?>
+<title>Conventions used in this book</title>
 
-<sect1 id="conventions">
-  <?dbhtml filename="conventions.html"?>
+<para>To make things easy to follow, there are a number of conventions used
+throughout the book.  Following are some examples:</para>
 
+<para><userinput>./configure --prefix=/usr</userinput></para>
 
-  <title>Conventions Used in this Book</title>
+<blockquote><para>This form of text is designed to be typed exactly 
+as seen unless otherwise noted in the surrounding text.  It is also used 
+in the explanation sections to identify which of the commands is being 
+referred to.</para></blockquote>
 
-  <sect2>
-  <title>Typographical Conventions</title>
-  <para>To make things easy to follow, a number of conventions are used
-  throughout the book.  Here are some examples:</para>
+<para><filename>install-info: unknown option 
+`--dir-file=/mnt/lfs/usr/info/dir'</filename></para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<blockquote><para>This form of text (fixed width text) is showing screen 
+output, probably as the result of commands issued and is also used to 
+show filenames such as <filename>/etc/lilo.conf</filename></para></blockquote>
 
-  <blockquote>
-    <para>This form of text should be typed exactly as shown unless
-    otherwise noted in the surrounding text. It is also used to identify
-    references to specific commands.</para>
-  </blockquote>
+<para><emphasis>Emphasis</emphasis></para>
 
-<screen><computeroutput>install-info: unknown option
-`--dir-file=/mnt/lfs/usr/info/dir'</computeroutput></screen>
+<blockquote><para>This form of text is used for several purposes in the 
+book but mainly to emphasize important points or to give examples as to 
+what to type.</para></blockquote>
 
-  <blockquote>
-    <para>This form of text (fixed width font) shows screen
-    output, probably the result of issuing a command. It is also used to
-    show filenames such as <filename>/boot/grub/grub.conf</filename></para>
-  </blockquote>
+<para><ulink url="http://www.linuxfromscratch.org/">http://www.linuxfromscratch.org/</ulink></para>
 
-  <note>
-    <para>Please configure your browser to display fixed-width text with
-    a good monospaced font, with which you can distinguish the glyphs of
-    <literal>Il1</literal> or <literal>O0</literal> clearly.</para>
-  </note>
+<blockquote><para>This form of text is used for hyperlinks, both within the 
+book and to external pages such as HowTo's, download locations,
+websites, etc.</para></blockquote>
 
-  <para><emphasis>Emphasis</emphasis></para>
+<para><screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
+	root:x:0:
+	bin:x:1:
+	......
+<userinput>EOF</userinput>
+</screen>
+</para>
 
-  <blockquote>
-    <para>This form of text is used for several purposes,
-    but mainly to emphasize important points, or to give examples of
-    what to type.</para>
-  </blockquote>
-
-  <para><ulink url="https://www.&lfs-domainname;/"/></para>
-
-  <blockquote>
-    <para>This form of text is used for hypertext links external to
-    the book, such as HowTos, download locations, websites, etc.</para>
-  </blockquote>
-
-  <para><xref linkend="seamonkey"/></para>
-
-  <blockquote>
-    <para>This form of text is used for links internal to
-    the book, such as another section describing a different package.</para>
-  </blockquote>
-
-<screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:1:
-......</literal>
-EOF</userinput></screen>
-
-  <blockquote>
-    <para>This style is mainly used when creating configuration
-    files.  The first command (in bold) tells the system to create
-    the file <filename>$LFS/etc/group</filename> from whatever is typed on the
-    following lines, until the sequence EOF is encountered.
-    Therefore, this whole section is usually typed exactly as shown.
-    Remember, copy and paste is your friend!</para>
-  </blockquote>
-
-  <para><replaceable>&lt;REPLACED TEXT&gt;</replaceable></para>
-
-  <blockquote>
-    <para>This form of text is used to encapsulate text that should be
-    modified, and is not to be typed as shown, or copied and pasted.
-    The angle brackets are not part of the literal text; they are part of the
-    substitution.</para>
-  </blockquote>
-
-  <para><systemitem class='username'>root</systemitem></para>
-
-  <blockquote>
-    <para>This form of text is used to show a specific system user or group
-    reference in the instructions.</para>
-  </blockquote>
-
-  <para>&nbsp;</para> <!-- add extra white space to improve readability -->
-  </sect2>
-
-  <sect2>
-  <title>Conventions Used for Package Dependencies</title>
-
-    <para>When new packages are created, the software's authors depend on prior work.  In
-    order to build a package in BLFS, these dependencies must be built before
-    the desired package can be compiled.  For each package, prerequisites are listed
-    in one or more separate sections:  Required, Recommended, and Optional.</para>
-
-    <bridgehead renderas="sect3">Required Dependencies</bridgehead>
-
-    <para>These dependencies are the bare minimum needed to
-    build the package.  Packages in LFS, and the required
-    dependencies of these required packages, are omitted from this list.
-    Always remember to check for nested dependencies. If a dependency is
-    said to be <quote>runtime</quote>, then it is not needed for building
-    the package, but only to use it after installation.</para>
-
-    <bridgehead renderas="sect3">Recommended Dependencies</bridgehead>
-
-    <para>These are dependencies the BLFS editors have determined
-    are important to give the package reasonable capabilities.  If a
-    recommended dependency is not said to be <quote>runtime</quote>, package
-    installation instructions assume it is installed.  If it
-    is not installed, the instructions may require modification, to
-    accommodate the missing package. A recommended <quote>runtime</quote>
-    dependency does not need to be installed before building the package, but
-    must be built afterwards for running the package with reasonable
-    capabilities.</para>
-
-    <bridgehead renderas="sect3">Optional Dependencies</bridgehead>
-
-    <para>These are dependencies the package <emphasis>may</emphasis> use.  Integration
-    of optional dependencies may be automatic by the package, or
-    additional steps not presented by BLFS may be necessary.  Optional dependencies are
-    sometimes listed without explicit BLFS instructions.  In this case you must
-    determine how to perform the installation yourself.</para>
-
-    <para>&nbsp;</para> <!-- add extra white space to improve readability -->
-  </sect2>
-
-  <sect2>
-  <title>Conventions Used for Kernel Configuration Options</title>
-
-    <para>Some packages require specific kernel configuration options.
-    The general layout for these looks like this:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="conventions-kernel.xml"/>
-
-    <para>[...] on the right gives the symbolic name of the option, so you
-    can easily check whether it is set in your <filename>.config</filename>
-    file. Note that the <filename>.config</filename> file contains a
-    <literal>CONFIG_</literal> prefix before all symbolic names.  The
-    meaning of the various entries is:
-
-    <blockquote>
-    <informaltable frame='none'><tgroup cols="2">
-      <colspec align="left"/><colspec align="left"/><tbody>
-      <row>
-        <entry><emphasis role="bold">Master section</emphasis></entry>
-        <entry>top level menu item</entry>
-      </row>
-      <row>
-        <entry><emphasis role="bold">Subsection</emphasis></entry>
-        <entry>submenu item</entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Required parameter</emphasis></entry>
-        <entry>
-          the option can either be built-in, or not selected: it must be
-          selected
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Required parameter (not as
-          module)</emphasis>
-        </entry>
-        <entry>
-          the option can be built-in, a module, or not selected (tri-state):
-          it must be selected as built-in
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Required parameter (could be
-          a module)</emphasis>
-        </entry>
-        <entry>
-          the option can be built-in, a module, or not selected:
-          it must be selected, either as built-in or as a module
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Required parameter (as
-          a module)</emphasis>
-        </entry>
-        <entry>
-          the option can be built-in, a module, or not selected:
-          it must be selected as a module; selecting it as built-in
-          may cause unwanted effects
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Optional parameter</emphasis>
-        </entry>
-        <entry>
-          the option can be built-in, a module, or not
-          selected: it may be selected as a module or built-in if you
-          need it for driving the hardware or optional kernel features
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Optional parameter (as a module
-          if enabled)</emphasis>
-        </entry>
-        <entry>
-          the option can be built-in, a module, or not
-          selected: it may be selected as a module if you need it
-          for driving the hardware or optional kernel features, but
-          selecting it as built-in may cause unwanted effects
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Incompatible parameter</emphasis>
-        </entry>
-        <entry>
-          the option can either be built-in or not selected: it must
-          <emphasis>not</emphasis> be selected
-        </entry>
-      </row>
-      <row>
-        <entry>
-          <emphasis role="bold">Incompatible parameter (even as module)</emphasis>
-        </entry>
-        <entry>
-          the option can be built-in, a module, or not selected:
-          it must <emphasis>not</emphasis> be selected
-        </entry>
-      </row>
-    </tbody></tgroup></informaltable>
-    </blockquote>
-    </para>
-
-    <para>Note that, depending on other selections, the angle brackets
-    (&lt;&gt;) in the configuration menu may appear as braces ({}) if the option cannot be unselected,
-    or even as dashes (-*- or -M-), when the choice is imposed.
-    The help text describing the option specifies the other selections on which this
-    option relies, and how those other selections are set.</para>
-
-    <para>
-      The letter in <emphasis role='blue'>blue</emphasis> is the hotkey
-      for this option.  If you are running
-      <command>make menuconfig</command>, you can press a key to quickly
-      traverse all the options with this key as the hotkey on the screen.
-    </para>
-
-    <para>&nbsp;</para> <!-- add extra white space to improve readability -->
-  </sect2>
-
-  <sect2>
-  <title>SBU values in BLFS</title>
-
-    <para>As in LFS, each package in BLFS has a build time listed in Standard
-    Build Units (SBUs).   These times are relative to the time it took to build
-    binutils in LFS, and are intended to provide some insight into how long it
-    will take to build a package. Most times listed are for a single processor
-    or core to build the package. In some cases, large, long running builds
-    tested on multi-core systems have SBU times listed with comments such
-    as '(parallelism=4)'.  These values indicate testing was done using
-    multiple cores.  Note that while this speeds up the build on systems with
-    the appropriate hardware, the speedup is not linear and to some extent
-    depends on the individual package and the specific hardware used.  </para>
-
-    <para>For packages which use ninja (i.e., anything using meson) or rust, by
-    default all cores are used; similar comments will be seen on such packages
-    even when the build time is minimal.</para>
-
-    <para>Where even a parallel build takes more than 15 SBU, on certain
-    machines the time may be considerably greater even when the build does not
-    use swap. In particular, different micro-architectures will build some
-    files at different relative speeds, and this can introduce delays when
-    certain make targets wait for another file to be created. Where a large
-    build uses a lot of C++ files, processors with Simultaneous Multi Threading
-    will share the Floating Point Unit and can take 45% longer than when using
-    four 'prime' cores (measured on an intel i7 using taskset and keeping the
-    other cores idle).</para>
-
-    <para>Some packages do not support parallel builds; for these, the
-    make command must specify -j1.  Packages that are known to impose such limits are
-    so marked in the text.</para>
-
-  </sect2>
+<blockquote><para>This type of section is used mainly when creating 
+configuration files.  The first command (in bold) tells the system to create 
+the file $LFS/etc/group from whatever is typed on the following lines until 
+the sequence EOF is encountered. Therefore, this whole section is generally 
+typed as seen.</para></blockquote>
 
 </sect1>
+
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/credits.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,119 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-credits">
+<?dbhtml filename="credits.html" dir="introduction"?>
+<title>Credits</title>
 
-<sect1 id="credits" xreflabel="Credits">
-  <?dbhtml filename="credits.html"?>
+<para>Many people have contributed both directly and indirectly to BLFS.
+This page lists all of those we can think of.  We may well have
+missed people out and if you feel this is the case, drop us line.  Many
+thanks to all of the LFS community for their assistance with this
+project.  If you are in the list and wish to have your email address
+included, again please drop us a line to &maintainer-address; and we'll
+be happy to add it.  We don't include email addresses by default so if
+you want it included, please state so when you contact us.</para>
 
+<sect2>
+<title>Editors</title>
+<itemizedlist>
 
-  <title>Credits</title>
+<listitem><para><emphasis>Editor:</emphasis> Mark
+Hymers <ulink
+url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para></listitem>
 
-  <para>Many people have contributed both directly and indirectly to
-  BLFS. This page lists all of those we can think of.  We may well have
-  left people out and if you feel this is the case, drop us a line.  Many
-  thanks to all of the LFS community for their assistance with
-  this project. </para>
+<listitem><para><emphasis>Co-Editors:</emphasis> Bruce 
+Dubbs and Larry Lawrence</para></listitem>
 
-  <sect2>
-    <title>Current Editors</title>
+</itemizedlist>
+</sect2>
 
-    <itemizedlist>
+<sect2>
+<title>Text Authors</title>
+<itemizedlist>
 
-      <listitem><para>Rahul Chandra          </para></listitem>
-      <listitem><para>Bruce Dubbs            </para></listitem>
-      <listitem><para>Pierre Labastie        </para></listitem>
-      <listitem><para>Ken Moffat             </para></listitem>
-      <listitem><para>Douglas Reno           </para></listitem>
-      <listitem><para>Xi Ruoyao              </para></listitem>
-      <listitem><para>Thomas Trepl           </para></listitem>
+<listitem><para>Chapter 01.  Based on the LFS introductory text by
+<emphasis>Gerard Beekmans</emphasis>, modified by <emphasis>Mark
+Hymers</emphasis> for BLFS.</para></listitem>
 
-    </itemizedlist>
-  </sect2>
+<listitem><para>Chapter 02: The /usr versus /usr/local
+debate: <emphasis>Andrew McMurry</emphasis>.</para></listitem>
 
-  <sect2>
-    <title>Contributors and Past Editors</title>
+<listitem><para>Chapter 03: /etc/inputrc: <emphasis>Chris
+Lynn</emphasis>.</para></listitem>
 
-    <para>The list of contributors is far too large to provide detailed
-    information about the contributions for each contributor.  Over the years,
-    the following individuals have provided significant inputs to the
-    book:</para>
+<listitem><para>Chapter 03: Customising your logon &amp; vimrc: <emphasis>Mark
+Hymers</emphasis>.</para></listitem>
 
-    <itemizedlist>
+<listitem><para>Chapter 03: Random number script <emphasis>Larry
+Lawrence</emphasis>.</para></listitem>
 
-      <listitem><para>Timothy Bauscher    </para></listitem>
-      <listitem><para>Daniel Bauman       </para></listitem>
-      <listitem><para>Jeff Bauman         </para></listitem>
-      <listitem><para>Andy Benton         </para></listitem>
-      <listitem><para>Wayne Blaszczyk     </para></listitem>
-      <listitem><para>Paul Campbell       </para></listitem>
-      <listitem><para>Nathan Coulson      </para></listitem>
-      <listitem><para>Jeroen Coumans      </para></listitem>
-      <listitem><para>Guy Dalziel         </para></listitem>
-      <listitem><para>Robert Daniels      </para></listitem>
-      <listitem><para>Richard Downing     </para></listitem>
-      <listitem><para>Manuel Canales Esparcia </para></listitem>
-      <listitem><para>Jim Gifford         </para></listitem>
-      <listitem><para>Manfred Glombowski  </para></listitem>
-      <listitem><para>Ag Hatzimanikas     </para></listitem>
-      <listitem><para>Mark Hymers         </para></listitem>
-      <listitem><para>James Iwanek        </para></listitem>
-      <listitem><para>David Jensen        </para></listitem>
-      <listitem><para>Jeremy Jones        </para></listitem>
-      <listitem><para>Seth Klein          </para></listitem>
-      <listitem><para>Alex Kloss          </para></listitem>
-      <listitem><para>Eric Konopka        </para></listitem>
-      <listitem><para>Larry Lawrence      </para></listitem>
-      <listitem><para>D-J Lucas           </para></listitem>
-      <listitem><para>Chris Lynn          </para></listitem>
-      <listitem><para>Andrew McMurry      </para></listitem>
-      <listitem><para>Randy McMurchy      </para></listitem>
-      <listitem><para>Denis Mugnier       </para></listitem>
-      <listitem><para>Billy O'Connor      </para></listitem>
-      <listitem><para>Fernando de Oliveira</para></listitem>
-      <listitem><para>Alexander Patrakov  </para></listitem>
-      <listitem><para>Olivier Peres       </para></listitem>
-      <listitem><para>Andreas Pedersen    </para></listitem>
-      <listitem><para>Henning Rohde       </para></listitem>
-      <listitem><para>Matt Rogers         </para></listitem>
-      <listitem><para>James Robertson     </para></listitem>
-      <listitem><para>Henning Rohde       </para></listitem>
-      <listitem><para>Chris Staub         </para></listitem>
-      <listitem><para>Jesse Tie-Ten-Quee  </para></listitem>
-      <listitem><para>Ragnar Thomsen      </para></listitem>
-      <listitem><para>Tushar Teredesai    </para></listitem>
-      <listitem><para>Jeremy Utley        </para></listitem>
-      <listitem><para>Zack Winkles        </para></listitem>
-      <listitem><para>Christian Wurst     </para></listitem>
-      <listitem><para>Igor Živković       </para></listitem>
+<listitem><para>Chapter 05: Which <emphasis>Mark Hymers</emphasis> with
+many thanks to <emphasis>Seth Klein</emphasis> and <emphasis>Jesse 
+Tie-Ten-Quee</emphasis>.</para></listitem>
 
-    </itemizedlist>
+<listitem><para>Chapter 06: <!--<xref
+linkend="ch06-firewall"/>-->Firewalling: <emphasis>Henning
+Rohde with thanks to Jeff Bauman</emphasis>.</para></listitem>
 
-  </sect2>
+<listitem><para>Chapter 10: XFree86 <emphasis>Bruce Dubbs</emphasis>.</para></listitem>
 
-  <sect2>
-    <title>General Acknowledgments</title>
+<listitem><para>Chapter 11: Intro to Window Managers 
+<emphasis>Bruce Dubbs</emphasis>.</para></listitem>
 
-    <itemizedlist>
+<listitem><para>Chapter 12: GNOME: <emphasis>James Iwanek</emphasis></para></listitem>
 
-      <listitem><para>Fernando Arbeiza    </para></listitem>
-      <listitem><para>Miguel Bazdresch    </para></listitem>
-      <listitem><para>Gerard Beekmans     </para></listitem>
-      <listitem><para>Oliver Brakmann     </para></listitem>
-      <listitem><para>Jeremy Byron        </para></listitem>
-      <listitem><para>Ian Chilton         </para></listitem>
-      <listitem><para>David Ciecierski    </para></listitem>
-      <listitem><para>Jim Harris          </para></listitem>
-      <listitem><para>Lee Harris          </para></listitem>
-      <listitem><para>Marc Heerdink       </para></listitem>
-      <listitem><para>Steffen Knollmann   </para></listitem>
-      <listitem><para>Eric Konopka        </para></listitem>
-      <listitem><para>Scot McPherson      </para></listitem>
-      <listitem><para>Ted Riley           </para></listitem>
+<listitem><para>Chapter 13: QT: <emphasis>Larry Lawrence</emphasis>
+objprelink and KDE: <emphasis>Bruce Dubbs</emphasis>.</para>
+</listitem>
 
-    </itemizedlist>
-  </sect2>
+</itemizedlist>
+</sect2>
+
+<sect2>
+<title>Installation Instruction Authors</title>
+<itemizedlist>
+
+<listitem><para>Alsa: <emphasis>Alex Kloss</emphasis></para></listitem>
+
+<listitem><para>ATK, audiofile, cdrdao, cdrtools, curl, dhcp, fcron, imlib,
+GLib2, GTK+2, libao, libogg, libvorbis, libxml2, libxslt, OpenSSH, Pango, pccts, pcre, pkgconfig, postfix, QT, unzip and vorbis-tools: <emphasis>Larry Lawrence</emphasis></para></listitem>
+
+<listitem><para>CDParanoia, mpg123, SDL and XMMS: <emphasis>Jeroen
+Coumans</emphasis></para></listitem>
+
+<listitem><para>cvs, gpm, hdparm, libjpeg, mng, png, tiff and ungif,
+links, lynx, openssl, which and zlib: <emphasis>Mark 
+Hymers</emphasis></para></listitem>
+
+<listitem><para>daemontools, traceroute and ucspi-tcp: <emphasis>Jeff
+Bauman</emphasis></para></listitem>
+
+<listitem><para>db and lcms: <emphasis>Jeremy Jones and Mark
+Hymers</emphasis></para></listitem>
+
+<listitem><para>fetchmail and wvdial: <emphasis>Paul
+Campbell</emphasis></para></listitem>
+
+<listitem><para>gdk, GLib, GTK+ and libxml: <emphasis>James
+Iwanek</emphasis></para></listitem>
+
+<listitem><para><!--<xref linkend="iptables"/>-->iptables: <emphasis>Henning
+Rohde</emphasis></para></listitem>
+
+</itemizedlist>
+</sect2>
+
+<sect2>
+<title>General Acknowledgments</title>
+
+<itemizedlist>
+
+<listitem><para><emphasis>Gerard Beekmans</emphasis> for generally
+putting up with us and for running the whole LFS project.</para></listitem>
+
+<listitem><para><emphasis>Bruce Dubbs</emphasis> for writing the kde.txt
+hint from which we gathered much useful information.</para></listitem>
+
+<listitem><para><emphasis>Lee Harris</emphasis> for writing the gpm.txt
+hint on which our gpm instructions are based</para></listitem>
+
+<listitem><para><emphasis>Marc Heerdink</emphasis> for writing the
+gpm2.txt hint on which our gpm instruction are based.</para></listitem>
+
+<listitem><para><emphasis>Jeremy Jones</emphasis> (otherwise known as
+<emphasis>mca</emphasis>) for hacking Makefiles and general
+assistance.</para></listitem>
+
+<listitem><para><emphasis>J_Man</emphasis> for submitting a
+gpm-1.19.3.diff file on which our gpm instructions are
+based.</para></listitem>
+
+<listitem><para><emphasis>Scot Mc Pherson</emphasis> for writing the gnome-1.4.txt
+hint on which chapter 12 is closely based</para></listitem>
+
+</itemizedlist>
+</sect2>
 
 </sect1>
+
Index: introduction/welcome/maillists.xml
===================================================================
--- introduction/welcome/maillists.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/maillists.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,22 +1,266 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="maillists" xreflabel="Mailing lists">
-  <?dbhtml filename="maillists.html"?>
-
-
-  <title>Mailing Lists</title>
-
-  <para>The &lfs-domainname; server is hosting a number of mailing
-  lists that are used for the development of the BLFS book. These lists include,
-  among others, the main development and support lists.</para>
-
-  <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>
+<sect1 id="intro-welcome-maillists" xreflabel="Mailing lists and archives">
+<?dbhtml filename="maillists.html" dir="introduction"?>
+<title>Mailing lists and archives</title>
+
+<para>The linuxfromscratch.org server is hosting the following publicly 
+accessible mailing lists:</para>
+
+<itemizedlist>
+
+<listitem><para>blfs-dev</para></listitem>
+
+<listitem><para>blfs-book</para></listitem>
+
+<listitem><para>blfs-support</para></listitem>
+
+<listitem><para>lfs-support</para></listitem>
+
+<listitem><para>lfs-dev</para></listitem>
+
+<listitem><para>lfs-announce</para></listitem>
+
+<listitem><para>lfs-security</para></listitem>
+
+<listitem><para>lfs-book</para></listitem>
+
+<listitem><para>alfs-discuss</para></listitem>
+
+</itemizedlist>
+
+<sect2>
+<title>blfs-book</title>
+
+<para>The blfs-book list is used by the BLFS-BOOK editors
+to co-ordinate blfs-book's maintenance, like XML issues and the like.
+Actual discussion on what should be added and removed should take place
+on blfs-dev.</para>
+
+</sect2>
+
+<sect2>
+<title>blfs-dev</title>
+
+<para>The blfs-dev mailing list discusses matters related to the
+BLFS-BOOK (Beyond LFS).  If problems with the book come up, a bug
+or two need to be
+reported, or suggestions to improve the book (such as suggestions as to
+installation instructions to add) are to be made, this mailing list
+is the right one.</para>
+
+<para>Requests for help with programs beyond the base LFS setup (not
+just those in BLFS) should go to blfs-support.</para>
+
+</sect2>
+
+<sect2>
+<title>blfs-support</title>
+
+<para>The blfs-support list deals with support requests for any software
+not installed in the LFS book.  The list is not just for help with
+software explicitly mentioned in the BLFS book, any software beyond that
+installed as part of the base LFS system can be discussed here.</para>
+
+</sect2>
+
+<sect2>
+<title>lfs-support</title>
+
+<para>The lfs-support mailing list provides support to users building an
+LFS system as far as the end of the main book.  Requests for help with
+installing software beyond the base system should go to the blfs-support
+list.</para>
+
+</sect2>
+
+<sect2>
+<title>lfs-dev</title>
+
+<para>The lfs-dev mailing list discusses matters strictly related to the
+LFS-BOOK. If problems with the book come up, a bug or two need to be
+reported, or suggestions to improve the book should be made,
+this mailing list is the right one.</para>
+
+<para>Requests for help should go to lfs-support or blfs-support.</para>
+
+</sect2>
+
+<sect2>
+<title>lfs-announce</title>
+
+<para>The lfs-announce list is a moderated list. It can be subscribed
+to, but
+you can't post any messages to this list. This list is used to announce
+new stable releases. The lfs-dev list will carry information about
+development releases as well. If a user is already on the lfs-dev
+list, there's little use subscribing to
+this list as well because everything that is posted to the lfs-announce
+list will be posted to the lfs-dev list as well.</para>
+
+</sect2>
+
+<sect2>
+<title>lfs-security</title>
+
+<para>The lfs-security mailing list discusses security-related matters.
+Security concerns or security problems with a package used by LFS,
+should be addressed on this list.</para>
+
+</sect2>
+
+<sect2>
+<title>lfs-book</title>
+
+<para>The lfs-book list is used by the LFS-BOOK editors to co-ordinate
+lfs-book's maintenance, like XML issues and the like. Actual discussion
+on what should be added and removed take place on lfs-dev.</para>
+
+</sect2>
+
+<sect2>
+<title>alfs-discuss</title>
+
+<para>The alfs-discuss list discusses the development of ALFS, which
+stands for
+Automated Linux From Scratch. The goal of this project is to develop an
+installation tool that can install an LFS system automatically.
+It's main goal is to speed up compilation by taking away the need to
+manually enter the commands to configure, compile, and install
+packages.</para>
+
+</sect2>
+
+<sect2>
+<title>Mail archives</title>
+
+<para>All these lists are archived and can be viewed online at
+<ulink url="http://archive.linuxfromscratch.org/mail-archives"/> or downloaded
+from <ulink url="&ftp-root;/mail-archives"/>.</para>
+
+</sect2>
+
+<sect2>
+<title>How to subscribe?</title>
+
+<para>Any of the above-mentioned mailinglists can be subscribed to by
+sending an email to <ulink 
+url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink>
+and writing <emphasis>subscribe listname</emphasis> as the subject
+header of the message.</para>
+
+<para>Multiple lists at the same time can be subscribed to by using
+one email. This is done by leaving the subject blank and putting all the
+commands in the body of the email. The email will look like:</para>
+
+<blockquote><literallayout>To: listar@linuxfromscratch.org
+Subject:
+
+subscribe lfs-dev
+subscribe blfs-support
+subscribe alfs-discuss</literallayout></blockquote>
+
+<para>After the email is sent, the Listar program will reply with an
+email requesting a confirmation of the subscription request. After
+this confirmation email is sent back, Listar will send an
+email again with the message that the user has been subscribed to the
+list(s) along with an introduction message for that particular
+list.</para>
+
+</sect2>
+
+<sect2>
+<title>How to unsubscribe?</title>
+
+<para>To unsubscribe from a list, send an email 
+to <ulink url="mailto:listar@linuxfromscratch.org"/> and 
+write <emphasis>unsubscribe listname</emphasis> as the subject header of 
+the message.</para>
+
+<para>Multiple lists can be unsubscribed at the same time
+using one email. This is done by leaving the subject header blank and
+putting all the commands in the body of the email. The email will look
+like: </para>
+
+<blockquote><literallayout>To: listar@linuxfromscratch.org
+Subject:
+
+unsubscribe lfs-dev
+unsubscribe blfs-support
+unsubscribe alfs-discuss</literallayout></blockquote>
+
+<para>After the email is sent, the Listar program will reply with an
+email requesting a confirmation of the unsubscription
+request. After this confirmation email is sent back, Listar will
+send an email again with the message that the user has been unsubscribed
+from the list(s).</para>
+
+</sect2>
+
+<sect2>
+<title>Other list modes</title>
+
+<para>The modes that can be set by a user require sending an email to
+<ulink
+url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink>.
+The modes themselves are set by writing
+the appropriate commands in the subject header of the message.</para>
+
+<para>As the name implies, the <emphasis>Set command</emphasis> tells
+what
+to write to set a mode. The <emphasis>Unset command</emphasis> tells
+what to write to unset a mode.</para>
+
+<para>The listname in the example subject headers should be replaced
+with the
+listname to which
+the mode is going to be applied to. If more than one mode is to be set
+(to
+the same list or multiple lists) with one email, this can be done by
+leaving the subject header blank and writing all the commands in the
+body of
+the message instead.</para>
+
+</sect2>
+
+<sect2>
+<title>Digests</title>
+
+<literallayout>
+Set command: <emphasis>set listname digest</emphasis>
+Unset command: <emphasis>unset listname digest</emphasis>
+</literallayout>
+
+<para>All lists have the digest mode available which can be set after a
+user
+has subscribed to a list. Being in digest mode will
+cause you to stop receiving individual messages as they are posted to
+the list and instead receive one email a day containing all
+the messages posted to the list during that day.</para>
+
+<para>There is a second digest mode called digest2. When a user is set
+to this
+mode he will receive the daily digests but will also continue to
+receive the individual messages to the lists as they are posted. To
+set this mode, substitute <emphasis>digest</emphasis> for
+<emphasis>digest2</emphasis> in the command.</para>
+
+</sect2>
+
+<sect2>
+<title>Vacation</title>
+
+<literallayout>
+Set command: <emphasis>set listname vacation</emphasis>
+Unset command: <emphasis>unset listname vacation</emphasis>
+</literallayout>
+
+<para>If a user is going to be away for a while or wishes to stop
+receiving
+messages from the lists but doesn't want to unsubscribe, he can change
+to vacation mode. This has the same effect as unsubscribing,
+but without having to go through the unsubscribe process and
+then later through the subscribe process again.</para>
+
+</sect2>
 
 </sect1>
+
Index: troduction/welcome/mirrors.xml
===================================================================
--- introduction/welcome/mirrors.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="mirrors" xreflabel="Mirrors">
-  <?dbhtml filename="mirrors.html"?>
-
-
-  <title>Mirror Sites</title>
-
-  <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
-  list of current mirrors.</para>
-
-</sect1>
Index: introduction/welcome/newsserver.xml
===================================================================
--- introduction/welcome/newsserver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/newsserver.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,24 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-newsserver">
+<?dbhtml filename="newsserver.html" dir="introduction"?>
+<title>News server</title>
 
-<sect1 id="intro-welcome-newsserver">
-  <?dbhtml filename="newsserver.html"?>
+<para>All the mailing lists hosted at linuxfromscratch.org are also 
+accessible via the NNTP server. All messages posted to a mailing list 
+will be copied to it's correspondent newsgroup, and vice versa.</para>
 
-
-  <title>News Server</title>
-
-  <para>All the mailing lists hosted at &lfs-domainname; are also
-  accessible via the NNTP server. All messages posted to a mailing
-  list will be copied to its correspondent newsgroup. Note, however,
-  that as this is written, it is not possible to write to the mailing
-  lists via the NNTP service.</para>
-
-
-  <para>The news server can be reached at <ulink
-  url="news:news.&lfs-domainname;">news.&lfs-domainname;</ulink>.</para>
+<para>The news server can be reached at <ulink
+url="news:news.linuxfromscratch.org"/>.</para>
 
 </sect1>
Index: troduction/welcome/packages.xml
===================================================================
--- introduction/welcome/packages.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="packages" xreflabel="Getting the Source Packages">
-  <?dbhtml filename="packages.html"?>
-
-
-  <title>Getting the Source Packages</title>
-
-  <para>Within the BLFS instructions, each package has two references for
-  finding the source files for the package&mdash;an HTTP link and an FTP link
-  (some packages may only list one of these links). Every effort has been made
-  to ensure that these links are accurate. However, the World Wide Web is in
-  continuous flux. Packages are sometimes moved or updated and the exact URL
-  specified is not always available.</para>
-
-  <para>To overcome this problem, the BLFS Team, with the assistance of Oregon
-  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
-  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
-  addresses, get it from these sites.</para>
-
-  <para>We would like to ask a favor, however.  Although this is a public
-  resource for you to use, please do not abuse it.  We have already had one
-  unthinking individual download over 3 GB of data, including multiple copies of
-  the same files that are placed at different locations (via symlinks) to make
-  finding the right package easier.  This person clearly did not know what files
-  he needed and downloaded everything.  The best place to download files
-  is the site or sites set up by the source code developer.  Please try
-  there first.</para>
-
-</sect1>
Index: introduction/welcome/version.xml
===================================================================
--- introduction/welcome/version.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/version.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,28 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-version" xreflabel="Book Version">
+<?dbhtml filename="version.html" dir="introduction"?>
+<title>Book version</title>
 
-<sect1 id="version" xreflabel="Book Version">
-  <?dbhtml filename="version.html"?>
+<para>This is BLFS-BOOK version &version; dated &releasedate;. If this 
+version is older than a month a newer version is probably already available 
+for download. Check one of the mirror sites below for updated
+versions.</para>
 
+<para>Below is a list of our current HTTP and FTP mirror sites as
+of October 14th 2001. This list might not be accurate anymore. 
+The latest info can be found on our website at
+<ulink url="http://beyond.linuxfromscratch.org">http://beyond.linuxfromscratch.org</ulink>.</para>
 
-  <title>Book Version</title>
+<sect2>
+<title>HTTP Mirrors</title>
 
-  <para>This is BLFS-BOOK version &version; dated &releasedate;. This is the
-  &blfs-version; branch of the BLFS book, currently targeting the LFS
-  &lfs-version; book. For development versions, if this version is older than a
-  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
-  an updated version.</para>
+<sect3>
+<title>North America</title>
 
-  <!-- This is here only for production releases. Omit the stuff above and
-       then uncomment below as needed
+<itemizedlist>
 
-  <para>This is BLFS-BOOK version &version; dated &releasedate;. This version
-  is intended as the complement to the LFS-&lfs-version; book.</para> -->
+<listitem><para>Fremont, California, USA [100 Mbit] - <ulink
+url="http://beyond.linuxfromscratch.org/blfs/intro.shtml">http://beyond.linuxfromscratch.org/blfs/intro.shtml</ulink></para></listitem>
+
+<listitem><para>Columbus, Ohio, USA [1 Mbit] - <ulink
+url="http://beyond.us.linuxfromscratch.org/blfs/intro.shtml">http://beyond.us.linuxfromscratch.org/blfs/intro.shtml</ulink></para></listitem>
+
+</itemizedlist>
+
+</sect3>
+
+<sect3>
+<title>Europe</title>
+
+<itemizedlist>
+
+<listitem><para>Teeside, United Kingdom [256 Kbit] - <ulink
+url="http://beyond.linuxfromscratch.co.uk/blfs/intro.shtml">http://beyond.linuxfromscratch.co.uk/blfs/intro.shtml</ulink></para></listitem>
+
+</itemizedlist>
+
+</sect3>
+
+</sect2>
 
 </sect1>
+
Index: introduction/welcome/welcome.xml
===================================================================
--- introduction/welcome/welcome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/welcome.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,35 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="intro-welcome" xreflabel="Welcome to BLFS">
+<?dbhtml filename="welcome.html" dir="introduction"?>
+<title>Welcome to BLFS</title>
+<para>The Beyond LinuxFromScratch book is designed to carry on from
+where the LFS book leaves off.  Unlike the LFS book, it isn't designed
+to be followed straight through.  Reading the <xref
+linkend="intro-welcome-whichsections"/> part of this chapter should
+help guide you through the book.</para>
 
-<chapter id="welcome">
-  <?dbhtml filename="welcome.html"?>
+<para>Please read most of this part of the book carefully as it explains
+quite a few of the conventions we use throughout the book.</para>
 
-  <title>Welcome to BLFS</title>
-
-  <para>The Beyond Linux From Scratch book is designed to carry on from where
-  the LFS book leaves off. But unlike the LFS book, it isn't designed to be
-  followed straight through.  Reading the <xref linkend="whichsections"/>
-  part of this chapter should help guide you through the book.</para>
-
-  <para>Please read most of this part of the book carefully as it explains
-  quite a few of the conventions used throughout the book.</para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acknowledgments.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="conventions.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="version.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mirrors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maillists.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wiki.xml"/>
-  <!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newsserver.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="askhelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="credits.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="contact.xml"/>
-
+&intro-welcome-conventions;
+&intro-welcome-version;
+&intro-welcome-acks;
+&intro-welcome-credits;
+&intro-welcome-changelog;
+&intro-welcome-whichsect;
+&intro-welcome-mailinglists;
+&intro-welcome-newsserver;
+&intro-welcome-contact;
+&intro-welcome-askhelp;
 </chapter>
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ introduction/welcome/which.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,80 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="intro-welcome-whichsections" xreflabel="Which sections of the book?">
+<?dbhtml filename="which.html" dir="introduction"?>
+<title>Which sections of the book do I want?</title>
 
-<sect1 id="whichsections" xreflabel="Which sections of the book?">
-  <?dbhtml filename="which.html"?>
+<para>Unlike the LinuxFromScratch book, BLFS isn't designed to be
+followed in a linear manner.  This is because LFS provides instructions
+on how to create a base system which is capable of turning into anything 
+from a web server to a multimedia desktop system.  BLFS is where we try
+to guide you through going from the base system to your intended
+destination and so choice is very much involved.</para>
 
+<para>MUCH OF THIS PAGE HAS TO BE RE-WRITTEN TO FIT THE NEW LAYOUT.  THE
+OLD TEXT IS STILL IN THE XML SOURCE AND THE NEW TEXT CAN BE BASED ON
+IT.</para>
 
-  <title>Which Sections of the Book Do I Want?</title>
+<!-- THIS NEEDS REWRITING TO FIT THE NEW LAYOUT
+<para>Everyone who reads the book will want to read certain sections.
+<xref linkend="part1"/> which you are reading now contains generic
+information.  Especially take note of the information 
+in <xref linkend="chapter02"/> as this chapter contains comments about 
+how to unpack software and various other aspects which apply 
+throughout the book.</para>
 
-  <para>Unlike the Linux From Scratch book, BLFS isn't designed to be
-  followed in a linear manner. LFS provides instructions
-  on how to create a base system which can become anything
-  from a web server to a multimedia desktop system. BLFS attempts
-  to guide you in the process of going from the base system to your intended
-  destination. Choice is very much involved.</para>
+<para>Most people will want to at least browse through <xref
+linkend="part2"/> as this contains information on general post-LFS
+configuration issues and information on various libraries which are
+needed by many packages.  Note that you don't have to install all of
+these libraries to start with, each BLFS install procedure tells you
+which packages it depends upon so you can choose the program you want
+to install and see what it needs.</para>
 
-  <para>Everyone who reads this book will want to read certain sections.  The
-  <xref linkend="introduction"/>, which you are currently reading,
-  contains generic information.  Take special note of the information in
-  <xref linkend="important"/>, as this contains comments about how to
-  unpack software, issues related to the use of different locales, and various other
-  considerations which apply throughout the book.</para>
+<para>Likewise, most people will probably want to look at <xref
+linkend="chapter06"/> to deal with connecting to the Internet or your local
+LAN.  The basic LFS book deals with setting up a static-ip based
+ethernet connection, all other configurations such as DHCP and dial-up
+internet connections are dealt with in this part of BLFS.</para>
 
-  <para>The part on <xref linkend="postlfs"/> is where most people will want
-  to turn next.  This deals not only with configuration, but also with Security
-  (<xref linkend="postlfs-security"/>), File Systems (<xref
-  linkend="postlfs-filesystems"/> -- including GRUB for UEFI), Text Editors (<xref
-  linkend="postlfs-editors"/>), and Shells (<xref linkend="postlfs-shells"/>).
-  Indeed, you may wish to reference some parts of this chapter (especially
-  the sections on Text Editors and File Systems) while building your LFS
-  system.</para>
+<para>Once you have dealt with these basics, you may wish to configure
+network services such as mail.  All of this is dealt with in the
+remainder of <xref linkend="part3"/>.  Those wanting to build servers
+should find enough information to give them a good starting point here.</para>
 
-  <para>Following these basic items, most people will want to at least browse
-  through the <xref linkend="general"/> part of the book.  This contains
-  information on many items which are prerequisites for other sections of the
-  book, as well as some items (such as <xref linkend="general-prog"/>)
-  which are useful in their own right.  You don't have to install all
-  of the libraries and packages found in this part; each
-  BLFS installation procedure tells you which other packages this one
-  depends upon. You can choose the program you want to install, and see
-  what it needs. (Don't forget to check for nested dependencies!)</para>
+<para>Those creating desktop systems will want to look at the next three
+parts of the book: <xref linkend="part4"/>, <xref linkend="part5"/> and
+<xref linkend="part6"/>.</para>-->
 
-  <para>Likewise, most people will probably want to look at the
-  <xref linkend="basicnet"/> section.  It deals with connecting to the Internet
-  or your LAN (<xref linkend="basicnet-connect"/>)
-  using a variety of methods such as DHCP and PPP, and with items
-  such as Networking Libraries (<xref linkend="basicnet-netlibs"/>), plus various
-  basic networking programs and utilities.</para>
-
-  <para>Once you have dealt with these basics, you may wish to configure
-  more advanced network services.  These are dealt with in the <xref
-  linkend="server"/> part of the book.  Those wanting to build servers
-  should find a good starting point there.  Note that this section
-  also contains information on several database packages.</para>
-
-  <para>The next twelve chapters deal with desktop systems.  This
-  portion of the book starts with a part talking about <xref linkend="x"/>. This
-  part also deals with some generic X-based libraries (<xref linkend="x-lib"/>).
-  After that, <xref linkend="kde"/>, <xref linkend="gnome"/>,
-  <xref linkend="xfce"/>, and <xref linkend="lxqt"/> are given their
-  own parts, followed by one on <xref linkend="xsoft"/>.</para>
-
-  <para>The book then moves on to deal with <xref linkend="multimedia"/>
-  packages. Note that many people may want to use the <xref linkend="alsa"/>
-  instructions from this chapter when first starting their BLFS
-  journey; the instructions are placed here because it is the most logical
-  place for them.</para>
-
-  <para>The final part of the main BLFS book deals with <xref
-  linkend="pst"/>.  This is useful for most people with desktop systems, but
-  even those who are creating dedicated server systems may find it useful.</para>
-
-  <para>We hope you enjoy using BLFS. May you realize your dream of building
-  the perfectly personalized Linux system!</para>
+<para>We hope you enjoy using BLFS and find it useful.</para>
 
 </sect1>
+
Index: troduction/welcome/wiki.xml
===================================================================
--- introduction/welcome/wiki.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="wiki" xreflabel="wiki">
-  <?dbhtml filename="wiki.html"?>
-
-
-  <title>Editor Notes</title>
-
-  <para>The BLFS Project has created a Wiki for editors to comment
-  on pages and instructions at <ulink url='&blfs-wiki;'/>.</para>
-
-  <para>When <emphasis>editor notes</emphasis> are present, a link
-  appears in the form <literal>&blfs-wiki;/pkgname</literal> right
-  below the dependency list. The idea behind the editor notes is to
-  give additional information about the package and/or its build
-  instructions, common pitfalls or maybe even more sophisticated
-  configuration for special cases of use.</para>
-
-  <para>The vast majority of the packages do not have editor notes.</para>
-
-  <note>
-    <para>
-      The <emphasis>editor notes</emphasis> might be outdated. Even
-      though the pages should be reviewed when a package is updated,
-      it might happen that there are notes referring to an obsolete
-      version and therefore, the notes might be out of date. Always
-      check the date of the notes and more importantly, the version
-      of the package the notes refer to.
-    </para>
-  </note>
-
-<!--
-  <para>The following are the rules for posting:
-
-    <itemizedlist>
-      <listitem>
-        <para>Due to excessive spamming, the commenting function is
-        restricted to authenticated users (editors) only.</para>
-      </listitem>
-      <listitem>
-        <para>Suggestions to change the book should be made by creating a new ticket,
-        <emphasis>not</emphasis> by making comments in the Wiki.</para>
-      </listitem>
-      <listitem>
-        <para>Questions with your specific installation problems should be made
-        by subscribing and mailing to the BLFS Support Mailing List at <ulink
-        url='mailto:blfs-support@&lfs-domainname;'/>.</para>
-      </listitem>
-      <listitem>
-        <para>Discussions of build instructions should be made by subscribing
-        and mailing to the BLFS Development List at <ulink
-        url='mailto:blfs-dev@&lfs-domainname;'/>.</para>
-      </listitem>
-      <listitem>
-        <para>Inappropriate material will be removed.</para>
-      </listitem>
-    </itemizedlist>
-
-  </para>
--->
-
-</sect1>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/add/add.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<chapter id="kde-add">
+<?dbhtml filename="add.html" dir="kde"?>
+<title>KDE Additional Packages</title>
+
+&kde-multimedia;
+&kde-network;
+&kde-graphics;
+&kde-pim;
+&kde-admin;
+&kde-games;
+&kde-utils;
+&kde-edu;
+&kde-artwork;
+&kde-toys;
+&kde-addons;
+
+</chapter>
Index: e/extra-cmake-modules.xml
===================================================================
--- kde/extra-cmake-modules.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 extra-cmake-modules-download-http "&kf6-download-http;/extra-cmake-modules-&kf6-version;.tar.xz">
-   <!ENTITY extra-cmake-modules-download-ftp  " ">
-   <!ENTITY extra-cmake-modules-md5sum        "1109efb1a8e84918f74c2e8e650a049a">
-   <!ENTITY extra-cmake-modules-size          "336 KB">
-   <!ENTITY extra-cmake-modules-buildsize     "4.7 MB">
-   <!ENTITY extra-cmake-modules-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="extra-cmake-modules" xreflabel="extra-cmake-modules-&kf6-version;">
-  <?dbhtml filename="extra-cmake-modules.html"?>
-
-
-  <title>extra-cmake-modules-&kf6-version;</title>
-
-  <indexterm zone="extra-cmake-modules">
-    <primary sortas="a-extra-cmake-modules">extra-cmake-modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Extra Cmake Modules</title>
-
-    <para>
-      The <application>Extra Cmake Modules</application> package contains
-      extra <application>CMake</application> modules used by
-      <application>KDE Frameworks</application> and other packages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&extra-cmake-modules-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&extra-cmake-modules-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &extra-cmake-modules-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &extra-cmake-modules-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &extra-cmake-modules-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &extra-cmake-modules-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Extra Cmake Modules Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx"/> (for building documentation),
-      <ulink url="https://pypi.org/project/PyQt5/">PyQt</ulink> (experimental
-      support for building KDE Python bindings), and
-      <ulink url="https://github.com/fsfe/reuse-tool/">ReuseTool</ulink> (for running 
-      internal tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Extra Cmake Modules</title>
-
-    <para>
-      Install <application>Extra Cmake Modules</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i '/"lib64"/s/64//' kde-modules/KDEInstallDirsCommon.cmake &amp;&amp;
-
-sed -e '/PACKAGE_INIT/i set(SAVE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")' \
-    -e '/^include/a set(PACKAGE_PREFIX_DIR "${SAVE_PACKAGE_PREFIX_DIR}")' \
-    -i ECMConfig.cmake.in &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <note><para>
-      Unlike other KF6 packages, this module is installed in /usr because
-      it can be used by some non-KF6 packages.
-    </para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... Modules/KDEInstallDirs.cmake</command>:
-      This command disables applications using cmake from attempting to
-      install files in a <filename class="directory">lib64</filename>
-      sub-directory.
-    </para>
-
-    <para>
-    <command>sed ... ECMConfig.cmake.in</command>:
-      This command protects the global <application>cmake</application>
-      variable <envar>PACKAGE_PREFIX_DIR</envar> from being changed when
-      checking ECM presence: since we install ECM into <filename
-      class="directory">/usr</filename>, the check would set that variable to
-      <filename class="directory">/usr</filename>, while most KDE packages
-      expect it to be set to <filename class="directory">/opt/kf5</filename>
-      and would fail to build if it is set to something else.
-    </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>
-          None
-        </seg>
-        <seg>
-          /usr/share/ECM and
-          /usr/share/doc/ECM (if documentation was built)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-addons.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,30 @@
+<sect1 id="kde-addons">
+<?dbhtml filename="kde-addons.html" dir="kde"?>
+<title>Installation of KDE Addons</title>
+
+<para><screen>Estimated build disk space:  17 MB
+Estimated installed space:    5 MB
+Package size:                &kde-addons-size;
+Estimated build time:        15 min (667 MHz)</screen></para>
+
+<para>kdeaddons depends on:
+<screen><xref linkend="kde-base"/>, <xref linkend="kde-multimedia"/>, and <xref linkend="kde-network"/>.</screen></para>
+
+<para>Install kdeaddons with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Addons package provides:</para>
+<itemizedlist>
+<listitem><para>konquorer plugins</para></listitem>
+<listitem><para>kicker applets</para></listitem>
+<listitem><para>noatun plugins</para></listitem>
+<listitem><para>newskicker scripts</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-admin.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,41 @@
+<sect1 id="kde-admin">
+<?dbhtml filename="kde-admin.html" dir="kde"?>
+<title>Installation of KDE Admin</title>
+
+<para><screen>Estimated build disk space:  18 MB
+Estimated installed space:    4 MB
+Package size:                &kde-admin-size;
+Estimated build time:        10 min (667 MHz)</screen></para>
+
+<para>kdeadmin depends on:
+<screen><xref linkend="kde-base"/>.
+The kpackage program can use <filename>rpm</filename>.
+kuser can use <filename>shadow</filename> and <filename>pam</filename>.</screen></para>
+
+<para>Install kdeadmin with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking --with-shadow &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>kdeadmin Installation Commmand explanations</title>
+
+<para><userinput>--with-shadow:</userinput> This option allows use of 
+shadow passwords.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Admin package provides:</para>
+<itemizedlist>
+<listitem><para>kpackage - A package manager</para></listitem>
+<listitem><para>kcron - A task scheduler</para></listitem>
+<listitem><para>kuser - Graphical user manager</para></listitem>
+<listitem><para>kwuftpd - FTPD editor</para></listitem>
+<listitem><para>ksysv - Sys V-Init Editor</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-artwork.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,29 @@
+<sect1 id="kde-artwork">
+<?dbhtml filename="kde-artwork.html" dir="kde"?>
+<title>Installation of KDE Artwork</title>
+
+<para><screen>Estimated build disk space:  32 MB
+Estimated installed space:   21 MB
+Package size:                &kde-base-size;
+Estimated build time:         8 min (667 MHz)</screen></para>
+
+<para>kdeartwork depends on:
+<screen><xref linkend="kde-base"/>.</screen></para>
+
+<para>Install kdeartwork with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Artwork package provides:</para>
+<itemizedlist>
+<listitem><para>KDE themes including wallpapers, sounds, icons, 
+and window decorations</para></listitem>
+<listitem><para>kscreensaver - KDE screensavers</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-base.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,36 @@
+<sect1 id="kde-base" xreflabel="kde-base-&kde-version;">
+<title>Installing kdebase</title>
+<para><screen>Estimated build disk space: 132 MB
+Estimated installed space:   45 MB
+Package size:                &kde-base-size;
+Estimated build time:        98 min (667 MHz)</screen></para>
+
+<para>kdebase can use many optional libraries and programs.  The following are
+recommended:
+<screen><xref linkend="openssl"/>, lesstif, <xref linkend="CDParanoia"/>, <xref linkend="libvorbis"/>,
+shadow, cups, and <xref linkend="objprelink"/>.</screen></para>
+
+<para>Other programs and libraries that can be used by kdebase are:
+<screen>lame, and pam</screen></para>
+
+<para>Check to see if <filename>/lib/libmisc.la</filename> exists.  If not, run:
+<screen>ln -sf /usr/lib/libmisc.la /lib/libmisc.la</screen></para>
+
+<para>Install kdebase with:
+<screen><userinput>./configure --prefix=&kde-dir;  --enable-objprelink \
+     --disable-debug --disable-dependency-tracking --disable-lametest \
+     --with-shadow &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>kdebase Installation Commmand explanations</title>
+ 
+<para><userinput>--disable-lametest:</userinput> Do not search for and use 
+lame support.  This package provides scanner support.</para>
+  
+<para><userinput>--with-shadow:</userinput> Use shadow password 
+support.</para>
+</sect2>
+   
+</sect1>
Index: kde/inst/kde-bindings.xml
===================================================================
--- kde/inst/kde-bindings.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-bindings.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="kde-bindings" xreflabel="kde-bindings-&kde-version;">
+<title>Installing kde-bindings</title>
+<para><screen>Estimated build disk space: ??? MB
+Estimated installed space:   ?? MB
+Package size:                &kde-bindings-size;
+Estimated build time:        ?? min</screen></para>
+
+<para>NOT YET DONE</para>
+ 
+</sect1>
Index: kde/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-edu.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<sect1 id="kde-edu">
+<?dbhtml filename="kde-edu.html" dir="kde"?>
+<title>Installation of KDE Edu</title>
+
+<para><screen>Estimated build disk space:  37 MB
+Estimated installed space:   15 MB
+Package size:                &kde-edu-size;
+Estimated build time:        13 min (667 MHz)</screen></para>
+
+<para>kdeedu depends on:
+<screen><xref linkend="kde-base"/>.</screen></para>
+
+<para>Install kdeedu with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Edu package provides:</para>
+<itemizedlist>
+<listitem><para>keduca - Tests and Exams</para></listitem>
+<listitem><para>kgeo - Interactive geometry tutorial</para></listitem>
+<listitem><para>klettres - Alphabet tutor (French)</para></listitem>
+<listitem><para>kstars - Desktop planetarium</para></listitem>
+<listitem><para>ktouch - Touch typing tutor</para></listitem>
+<listitem><para>kvoctrain - Vocabulary trainer</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-games.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,33 @@
+<sect1 id="kde-games">
+<?dbhtml filename="kde-games.html" dir="kde"?>
+<title>Installation of KDE Games</title>
+
+<para><screen>Estimated build disk space:  54 MB
+Estimated installed space:   20 MB
+Package size:                &kde-games-size;
+Estimated build time:        24 min (667 MHz)</screen></para>
+
+<para>kdegames depends on:
+<screen><xref linkend="kde-base"/>.</screen></para>
+
+<para>Install kdegames with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Games package provides the following games:</para>
+<itemizedlist>
+<listitem><para>Arcade: KAsteroids, KBounce, KFoulEggs, KSirtet,
+KSmileTris, KSnakeRace, KSpaceDuel, KTron</para></listitem>
+<listitem><para>Boardgames: KBackgammon, KBattleship, KBlakBox, KMahjongg,
+KReversi, KWin4, Kenolaba, Shisen-Sho</para></listitem>
+<listitem><para>Card Games: KPoker, Lieutnant, Patience</para></listitem>
+<listitem><para>Strategy &amp; Tactics: KAtomic, KJumpingCube, KMines,
+KSokoban, Kolor Lines, Konquest, SameGame</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-graphics.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,40 @@
+<sect1 id="kde-graphics">
+<?dbhtml filename="kde-graphics.html" dir="kde"?>
+<title>Installation of KDE Graphics</title>
+
+<para><screen>Estimated build disk space:  24 MB
+Estimated installed space:    7 MB
+Package size:                &kde-graphics-size;
+Estimated build time:        24 min (667 MHz)</screen></para>
+
+<para>kdegraphics depends on:
+<screen><xref linkend="kde-base"/> and <xref linkend="which"/> (or the which script).
+The kuickshow program requires <xref linkend="imlib"/>.
+The kooka program requires <filename>sane</filename>.</screen></para>
+
+<para>Install kdegraphics with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Graphics package provides:</para>
+<itemizedlist>
+<listitem><para>kcoloredit - color pallette editor</para></listitem>
+<listitem><para>kdvi - DVI viewer</para></listitem>
+<listitem><para>kfax - FAX viewer</para></listitem>
+<listitem><para>kfract - A fractal generator</para></listitem>
+<listitem><para>kghostview - PS/PDF viewer</para></listitem>
+<listitem><para>kiconedit - An icon editor</para></listitem>
+<listitem><para>kooka - Raster image scan program</para></listitem>
+<listitem><para>kpaint - A paint program</para></listitem>
+<listitem><para>kruler - Screen ruler</para></listitem>
+<listitem><para>ksnapshot - Screen capture program</para></listitem>
+<listitem><para>kuickshow - Image viewer</para></listitem>
+<listitem><para>kview - Another image viewer</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-libs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,61 @@
+<sect1 id="kde-libs">
+<title>Installing kdelibs</title>
+ 
+<para><screen>Estimated build disk space: 115 MB
+Estimated installed space:   41 MB
+Package size:                &kde-libs-size;
+Estimated build time:        62 min (667 MHz)</screen></para>
+
+<para>kdelibs can use many optional libraries and programs.  The following are 
+recommended:
+<screen><xref linkend="openssl"/>, <xref linkend="alsa"/>, <xref linkend="pcre"/>, <xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>, cups, and <xref linkend="objprelink"/>.</screen></para>
+
+<para>Other programs and libraries that can be used by kdelibs are:
+<screen>libfam</screen></para>
+
+<para>Install kdelibs with:
+<screen><userinput>./configure --prefix=&kde-dir;  --enable-objprelink \
+     --disable-debug --disable-dependency-tracking --with-alsa  \
+     --enable-fast-malloc=full &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>       
+
+<sect2><title>kdelibs Installation Commmand explanations</title>
+<para><userinput>--prefix=&kde-dir;:</userinput> This option tells
+the process to install the package in &kde-dir;.</para>
+
+<warning><para><filename>objprelink</filename> has been known to cause 
+problems on some systems.  If it does not work on your system you will 
+have to rebuild kde without it.  This applies to all KDE 
+packages.</para></warning>
+
+<para><userinput>--enable-objprelink:</userinput> This option enables
+the linking process to optimize executable loading times by prelinking
+many internal references.</para>
+
+<para><userinput>--disable-debug:</userinput> This option causes the
+system to be compiled without debugging code.</para>
+
+<para><userinput>--disable-dependency-tracking:</userinput> This option
+speeds up one time builds.</para>
+
+<para><userinput>--with-alsa:</userinput> This option tells the build process to
+search for and use Alsa for sound support.</para>
+
+<para><userinput>--enable-fast-malloc=full:</userinput> This option tells
+KDE programs to use an internal memory allocation scheme 
+optimized for KDE.</para>
+</sect2>
+
+<sect2><title>Configuring kdelibs</title>
+<para>There is no additional configuration to do for kdelibs.</para>
+</sect2>
+
+<sect2><title>Contents</title>
+<para>kde-libs provices:</para>
+
+<para>To be done.</para>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-multimedia.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,55 @@
+<sect1 id="kde-multimedia">
+<?dbhtml filename="kde-multimedia.html" dir="kde"?>
+<title>Installation of KDE Multimedia</title>
+
+<para><screen>Estimated build disk space:  69 MB
+Estimated installed space:   15 MB
+Package size:                &kde-multimedia-size;
+Estimated build time:        44 min (667 MHz)</screen></para>
+
+<para>kdemultimedia depends on:
+<screen><xref linkend="arts"/>, <xref linkend="kde-libs"/>, and <xref linkend="kde-base"/>.</screen></para>
+
+<para>Install kdemultimedia with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking --with-arts-alsa &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>kdemultimedia Installation Commmand explanations</title>
+
+<para><userinput>--with-arts-alsa:</userinput> Use the alsa support built 
+into aRts.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring kdemultimedia</title>
+<para>There is no explicit configuration for the kde multimedia package, 
+however Kscd needs to find the CD drive.  The default 
+is <filename>/dev/cdrom</filename> which may not exist on your system.  The 
+easiest way to do this is to create a symbolic link to this from your CD 
+drive (e.g. <filename>/dev/hdc</filename>, <filename>/dev/scd0</filename>, 
+etc):
+<screen><userinput>cd /dev &amp;&amp;
+ln -s "CD Drive" /dev/cdrom</userinput></screen>
+</para>
+</sect2>
+
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Multimedia package provides:</para>
+<itemizedlist>
+<listitem><para>kaboodle - A multimedia player</para></listitem>
+<listitem><para>noatun - Another multimedia player</para></listitem>
+<listitem><para>TiMidity - Midi player</para></listitem>
+<listitem><para>kmidi - A front end for TiMidity</para></listitem>
+<listitem><para>kmix - Sound mixer</para></listitem>
+<listitem><para>Kscd - CD player</para></listitem>
+<listitem><para>aKtion! - Video player</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-network.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,40 @@
+<sect1 id="kde-network">
+<?dbhtml filename="kde-network.html" dir="kde"?>
+<title>Installation of KDE Network</title>
+
+<para><screen>Estimated build disk space:  52 MB
+Estimated installed space:   16 MB
+Package size:                &kde-network-size;
+Estimated build time:        28 min (667 MHz)</screen></para>
+
+<para>kdenetwork depends on:
+<screen><xref linkend="kde-base"/>.</screen></para>
+
+<para>Install kdenetwork with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2><title>Configuring kdenetwork</title>
+<para>There is no explicit configuration for the kde network package, however 
+individual packages need to be set up with user information.
+</para>
+</sect2>
+
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Network package provides:</para>
+<itemizedlist>
+<listitem><para>KMail - A mail client</para></listitem>
+<listitem><para>KNewsTicker - News applet for the KDE Application Launcher Panel</para></listitem>
+<listitem><para>KNode - A news reader</para></listitem>
+<listitem><para>KPPP - Internet dial-up utility</para></listitem>
+<listitem><para>KSirc - A chat client</para></listitem>
+<listitem><para>Kit - An AOL messaging client (AIM)</para></listitem>
+<listitem><para>Korn - A mail notification utility</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-pim.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,37 @@
+<sect1 id="kde-pim">
+<?dbhtml filename="kde-pim.html" dir="kde"?>
+<title>Installation of KDE PIM</title>
+
+<para><screen>Estimated build disk space:  50 MB
+Estimated installed space:    7 MB
+Package size:                &kde-pim-size;
+Estimated build time:        22 min (667 MHz)</screen></para>
+
+<para>kdepim depends on:
+<screen><xref linkend="kde-base"/>.</screen></para>
+
+<para>The kpilot application depends on <filename>pilot-link</filename> 
+version 0.9.5 which can be found at <ulink 
+url="http://www.slac.com/pilone/kpilot_home"/></para>
+
+<para>Install kdepim with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE PIM package provides:</para>
+<itemizedlist>
+<listitem><para>kalarm - A system to provide reminder messages.</para></listitem>
+<listitem><para>kandy - A program to synchronize mobile phone numbers</para></listitem>
+<listitem><para>karm - A personal time tracker</para></listitem>
+<listitem><para>knotes - Popup notes utility</para></listitem>
+<listitem><para>korganizer - Personal calendar/todo system</para></listitem>
+<listitem><para>kpilot - A program to synchrinize a Palm-Pilot</para></listitem>
+<listitem><para>libical - A calendar library</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-sdk.xml
===================================================================
--- kde/inst/kde-sdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-sdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="kde-sdk" xreflabel="kde-sdk-&kde-version;">
+<title>Installing kde-sdk</title>
+<para><screen>Estimated build disk space: ??? MB
+Estimated installed space:   ?? MB
+Package size:                &kde-sdk-size;
+Estimated build time:        ?? min</screen></para>
+
+<para>NOT YET DONE</para>
+ 
+</sect1>
Index: kde/inst/kde-toys.xml
===================================================================
--- kde/inst/kde-toys.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-toys.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<sect1 id="kde-toys">
+<?dbhtml filename="kde-toys.html" dir="kde"?>
+<title>Installation of KDE Toys</title>
+
+<para><screen>Estimated build disk space:  12 MB
+Estimated installed space:    4 MB
+Package size:                &kde-toys-size;
+Estimated build time:         4 min (667 MHz)</screen></para>
+
+<para>kdetoys depends on:
+<screen><xref linkend="kde-base"/></screen></para>
+
+<para>Install kdetoys with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE toys package provides:</para>
+<itemizedlist>
+<listitem><para>AMOR - Amusing Misuse of Resources</para></listitem>
+<listitem><para>kaphorism - Aphorisms</para></listitem>
+<listitem><para>kmoon - Moon phase indicator</para></listitem>
+<listitem><para>kodo - Measure your desktop mileage</para></listitem>
+<listitem><para>kteatime - Time your tea brewing</para></listitem>
+<listitem><para>ktux - Small Tux crossing stars</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kde-utils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,38 @@
+<sect1 id="kde-utils">
+<?dbhtml filename="kde-utils.html" dir="kde"?>
+<title>Installation of KDE Utils</title>
+
+<para><screen>Estimated build disk space:  23 MB
+Estimated installed space:    6 MB
+Package size:                &kde-utils-size;
+Estimated build time:        13 min (667 MHz)</screen></para>
+
+<para>kdeutils depends on:
+<screen><xref linkend="kde-base"/>.</screen></para>
+
+<para>Install kdeutils with:
+<screen><userinput>./configure --prefix=&kde-dir; --enable-objprelink \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<sect2>
+<title>Contents</title>
+<para>The KDE Utils package provides the following:</para>
+<itemizedlist>
+<listitem><para>kcalc - Scientific Calculator</para></listitem>
+<listitem><para>charselectapplet - Character Selector Applet</para></listitem>
+<listitem><para>arc - Archiving Tool</para></listitem>
+<listitem><para>kdepasswd - Change passwords</para></listitem>
+<listitem><para>kdf - View disk usage</para></listitem>
+<listitem><para>kedit - Text editor</para></listitem>
+<listitem><para>kfloppy - Floppy formatter</para></listitem>
+<listitem><para>khexeditor - Binary editor </para></listitem>
+<listitem><para>kjots - Note taker</para></listitem>
+<listitem><para>kljtool - HP Laserjet control panel</para></listitem>
+<listitem><para>klpq - View print job queues</para></listitem>
+<listitem><para>ktimer - Task scheduler</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
Index: kde/inst/kdevelop.xml
===================================================================
--- kde/inst/kdevelop.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kdevelop.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="kdevelop" xreflabel="kdevelop-&kde-version;">
+<title>Installing kdevelop</title>
+<para><screen>Estimated build disk space: ??? MB
+Estimated installed space:   ?? MB
+Package size:                &kdevelop-size;
+Estimated build time:        ?? min</screen></para>
+
+<para>NOT YET DONE</para>
+ 
+</sect1>
Index: kde/inst/kdm.xml
===================================================================
--- kde/inst/kdm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kdm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="kdm" xreflabel="kdm-&kde-version;">
+<title>Installing kdm</title>
+<para><screen>Estimated build disk space: ??? MB
+Estimated installed space:   ?? MB
+Package size:                &kdm-size;
+Estimated build time:        ?? min</screen></para>
+
+<para>NOT YET DONE</para>
+ 
+</sect1>
Index: kde/inst/kdoc.xml
===================================================================
--- kde/inst/kdoc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/kdoc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="kdoc" xreflabel="kdoc-&kde-version;">
+<title>Installing kdoc</title>
+<para><screen>Estimated build disk space: ??? MB
+Estimated installed space:   ?? MB
+Package size:                &kdoc-size;
+Estimated build time:        ?? min</screen></para>
+
+<para>NOT YET DONE</para>
+ 
+</sect1>
Index: kde/inst/objprelink.xml
===================================================================
--- kde/inst/objprelink.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/inst/objprelink.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,68 @@
+<sect1 id="objprelink" xreflabel="objprelink">
+<?dbhtml filename="objprelink.html" dir="kde"?>
+<title>objprelink</title>
+
+<sect2>
+<title>Introduction to objprelink</title>
+
+<screen>Download location:              <ulink url="&objprelink-download;"/>
+Version used:                   &objprelink-version;
+Package size:                   &objprelink-size;
+Estimated Disk space required:  &objprelink-buildsize;</screen>
+
+<para>The objprelink package contains the C code (only) for objprelink.
+This is useful for prelinking c++ files to produce more efficient dynamic 
+links.  This program is only applicable to Intel architecture computers.
+</para>
+
+<screen>objprelink depends on: binutils (libbfd.a and libiberty.a)
+</screen>
+
+</sect2>
+
+<sect2>
+<title>Installation of objprelink</title>
+ 
+<para><screen><userinput>
+gcc -O2 -o objprelink objprelink-1.c /usr/lib/libbfd.a /usr/lib/libiberty.a &amp;&amp;
+cp objprelink /usr/bin</userinput></screen></para>
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>cp objprelink /usr</userinput> Since there is
+no makefile, we need to copy the executable manually.</para>
+</sect2>
+
+<sect2>
+<title>Configuring objprelink</title>
+
+<sect3><title>Configuration Information</title>
+
+<para>There is no configuration to do.</para>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The objprelink package contains <userinput>objprelink.c</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>objprelink</title>
+<para>The objprelink package contains a program for prelinking c++ files 
+to produce more efficient dynamic links.  This program is only applicable 
+to Intel architecture computers.
+</para>
+</sect3>
+
+</sect2>
+
+</sect1>
+
Index: e/introduction.xml
===================================================================
--- kde/introduction.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<!--
-$Date$
--->
-
-<chapter id="kde-prereq" xreflabel="Introduction to KDE">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction to KDE</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extra-cmake-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-gstreamer.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-vlc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma-wayland-protocols.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kuserfeedback.xml"/>-->
-
-</chapter>
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ kde/kde-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,32 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE partintro 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;
-]>
+<partintro>
+<title>Introduction to KDE</title>
 
-<sect1 id="kde-intro">
-  <?dbhtml filename="kdeintro.html"?>
+<screen>Download location:         <ulink url="&kde-download;"/>
+Version used:              &kde-version;</screen>
 
+<para>
+<screen>KDE depends on: <xref linkend="xfree86"/> and <xref linkend="qt"/></screen>
+</para>
 
-  <title>KDE Preliminaries</title>
+<para>KDE is a comprehensive desktop environment that builds on 
+<productname>XFree86</productname> and <productname>QT</productname> to provide
+a window manager and many user tools, including a browser, word processor, 
+spreadsheet, persentation package, games, and numerous other utilities.  It 
+provides extensive capabilites for customization.</para>
 
-  <para>
-    <application>KDE</application> is a comprehensive desktop environment with
-    a huge number of applications written for it and a huge amount of users.
-    It is based on the <application>Qt</application> framework.
-  </para>
+<para>We divide the KDE instructions into three parts.  Firstly, the
+core packages which you need for the rest of KDE to work.  Secondly,
+additional packages which provide functionality in various areas
+(multimedia, graphics etc) and finally, other KDE packages.</para>
 
-  <para>
-    The KDE5 system has two main blocks: the libraries, called KDE
-    Frameworks 6 or KF6, which can be used in other environments, and the
-    desktop environment called KDE Plasma 6. Most of the applications written
-    by the KDE team only use KF6, and do not need the plasma environment.
-  </para>
+<para>KDE also has many internationalization packages in the form of:
+<userinput>kde-i18n-xx-&kde-version;.tar.bz2</userinput>
+where the xx is a two to five letter code for the country covered.  We
+do not cover the installation of these packages here.</para>
 
-  <para>
-    For more information visit the official KDE project site at
-    <ulink url="https://kde.org/"/>.
-  </para>
-
-</sect1>
+</partintro>
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/kde.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,64 @@
+<!ENTITY kde SYSTEM "kde.xml">
+<!ENTITY kde-intro SYSTEM "kde-intro.xml">
+
+<!-- KDE Core -->
+<!ENTITY kde-core SYSTEM "core/core.xml">
+<!ENTITY kde-core-arts SYSTEM "core/arts.xml">
+<!ENTITY kde-core-config SYSTEM "core/config.xml">
+
+<!-- KDE Additional -->
+<!ENTITY kde-add SYSTEM "add/add.xml">
+
+<!-- KDE Other -->
+<!ENTITY kde-other SYSTEM "other/other.xml">
+
+<!-- Package entities -->
+
+<!ENTITY objprelink SYSTEM "inst/objprelink.xml">
+<!ENTITY objprelink-buildsize "447 KB">
+<!ENTITY objprelink-version "">
+<!ENTITY objprelink-download "http://objprelink.sourceforge.net/objprelink-1.c">
+<!ENTITY objprelink-size "427 KB">
+
+<!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
+<!ENTITY kde-base SYSTEM "inst/kde-base.xml">
+<!ENTITY kde-multimedia SYSTEM "inst/kde-multimedia.xml">
+<!ENTITY kde-network SYSTEM "inst/kde-network.xml">
+<!ENTITY kde-graphics SYSTEM "inst/kde-graphics.xml">
+<!ENTITY kde-pim SYSTEM "inst/kde-pim.xml">
+<!ENTITY kde-admin SYSTEM "inst/kde-admin.xml">
+<!ENTITY kde-games SYSTEM "inst/kde-games.xml">
+<!ENTITY kde-utils SYSTEM "inst/kde-utils.xml">
+<!ENTITY kde-edu SYSTEM "inst/kde-edu.xml">
+<!ENTITY kde-artwork SYSTEM "inst/kde-artwork.xml">
+<!ENTITY kde-toys SYSTEM "inst/kde-toys.xml">
+<!ENTITY kde-addons SYSTEM "inst/kde-addons.xml">
+<!ENTITY kde-office SYSTEM "inst/kde-office.xml">
+<!ENTITY kdoc SYSTEM "inst/kdoc.xml">
+<!ENTITY kde-bindings SYSTEM "inst/kde-bindings.xml">
+<!ENTITY kde-sdk SYSTEM "inst/kde-sdk.xml">
+<!ENTITY kdevelop SYSTEM "inst/kdevelop.xml">
+<!ENTITY kdm SYSTEM "inst/kdm.xml">
+
+<!ENTITY kde-libs-size "7.2 MB">
+<!ENTITY kde-base-size "12.0 MB">
+<!ENTITY kde-multimedia-size "5.5 MB">
+<!ENTITY kde-network-size "3.7 MB">
+<!ENTITY kde-graphics-size "2.5 MB">
+<!ENTITY kde-pim-size "3.0 MB">
+<!ENTITY kde-admin-size "1.2 MB">
+<!ENTITY kde-games-size "6.9 MB">
+<!ENTITY kde-utils-size "1.4 MB">
+<!ENTITY kde-edu-size   "8.7 MB">
+<!ENTITY kde-artwork-size "10.0 MB">
+<!ENTITY kde-toys-size "1.3 MB">
+<!ENTITY kde-addons-size "899 KB">
+<!ENTITY kdoc-size "??? MB">
+<!ENTITY kde-bindings-size "??? MB">
+<!ENTITY kde-sdk-size "??? MB">
+<!ENTITY kdevelop-size "??? MB">
+<!ENTITY kdm-size "??? MB">
+
+<!ENTITY kde-version "3.0.2">
+<!ENTITY kde-download "ftp://ftp.kde.org/pub/kde/stable/3.0.2/src">
+<!ENTITY kde-dir "/opt/kde302">
Index: kde/kde.xml
===================================================================
--- kde/kde.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ kde/kde.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,30 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="kde" xreflabel="KDE">
+<?dbhtml filename="kde.html" dir="kde"?>
+<title>KDE</title>
 
-<part id="kde" xreflabel="KDE">
-  <?dbhtml filename="kde.html" dir="kde"?>
-
-  <title>KDE</title>
-  <partintro>
-    <para>
-      <application>KDE</application> is a comprehensive desktop environment
-      with a huge number of applications written for it and a huge amount of
-      users. It is based on the <application>Qt</application> framework.
-    </para>
-
-    <para>
-      For more information visit the official KDE project site at
-      <ulink url="https://kde.org/"/>.
-    </para>
-  </partintro>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5/kf5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-apps/kf5-apps.xml"/>
-<!-- Call the xml with a 5 for now even though is should be 6 -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma5/plasma5.xml"/>
+&kde-intro;
+&kde-core;
+&kde-add;
+&kde-other;
 
 </part>
Index: e/kf5-apps/add-pkgs.xml
===================================================================
--- kde/kf5-apps/add-pkgs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="kde-add-pkgs" xreflabel="Further KDE packages">
-  <?dbhtml filename="add-pkgs.html"?>
-
-
-  <title>Further KDE packages</title>
-
-  <para>
-    This section did not provide instructions for all of the available packages
-    in the KDE Software Compilation (KDE Gear). The included packages were selected
-    based on what most people would want to use on a standard desktop computer.
-  </para>
-
-  <para>
-    For a full list of available packages, have a look on the KDE5 servers at
-    <ulink url="&kf5apps-download-http;">&kf5apps-download-http;</ulink>.
-  </para>
-
-  <para condition="html" role="usernotes">
-    Editor Notes: <ulink url="&blfs-wiki;/Further_KDE_Packages"/>
-  </para>
-
-  <para>
-    Some additional packages worth mentioning are:
-  </para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Juk: A lightweight music player.</para>
-    </listitem>
-    <listitem>
-      <para>Dragon: A video player.</para>
-    </listitem>
-    <listitem>
-      <para>Kcalc: A scientific calculator.</para>
-    </listitem>
-    <listitem>
-      <para>Kwalletmanager: A credentials management application.</para>
-    </listitem>
-    <listitem>
-      <para>Marble: A global map program.</para>
-    </listitem>
-    <listitem>
-      <para>
-        A variety (about 40) of KDE games including:
-        kpat, kfourinline, and kmines.
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <note>
-    <para>
-      Some packages will require additional dependencies.  To determine
-      what dependencies are needed, run from the top of the source tree:
-    </para>
-
-<screen><userinput>cmake -Wno-dev -L .</userinput></screen>
-
-  </note>
-
-  <para>
-    Most of these packages can be built with the standard KDE5 instructions:
-  </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-  <para>
-    And as the &root; user:
-  </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-</sect1>
Index: e/kf5-apps/ark5.xml
===================================================================
--- kde/kf5-apps/ark5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ark-download-http "&kf6apps-download-http;/ark-&kf6apps-version;.tar.xz">
-  <!ENTITY ark-download-ftp  " ">
-  <!ENTITY ark-md5sum        "9c3fa345bf105dcd408bab7b0e549bd6">
-  <!ENTITY ark-size          "2.9 MB">
-  <!ENTITY ark-buildsize     "37 MB">
-  <!ENTITY ark-time          "0.5 SBU (using parallelism=4)">
-]>
-
-<sect1 id="ark" xreflabel="Ark-&kf6apps-version;">
-  <?dbhtml filename="ark.html"?>
-
-
-  <title>Ark-&kf6apps-version;</title>
-
-  <indexterm zone="ark">
-    <primary sortas="a-Ark">Ark</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ark</title>
-
-    <para>
-      The <application>Ark</application> package is a KF6 archive tool.
-      It is a graphical front end to tar and similar tools.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ark-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ark-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ark-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ark-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ark-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ark-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ark Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/> and
-      <xref linkend="libarchive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <!-- See README.packagers in the source tree -->
-       <xref linkend="cpio"/>,
-       <xref linkend="p7zip"/>,
-       <xref linkend="unrar"/>,
-       <xref linkend="unzip"/>, and
-       <xref linkend="zip"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ark</title>
-
-    <para>
-      Install <application>Ark</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ark
-        </seg>
-        <seg>
-          libkerfuffle.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/lib/plugins/kerfuffle and
-          $KF6_PREFIX/share/doc/HTML/*/ark
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="ark-prog">
-        <term><command>ark</command></term>
-        <listitem>
-          <para>
-             is a KF6-based Archive Manager
-          </para>
-          <indexterm zone="ark ark-prog">
-            <primary sortas="b-ark">ark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/gwenview.xml
===================================================================
--- kde/kf5-apps/gwenview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gwenview-download-http "&kf6apps-download-http;/gwenview-&kf6apps-version;.tar.xz">
-  <!ENTITY gwenview-download-ftp  " ">
-  <!ENTITY gwenview-md5sum        "805b090ef0cd0e42d4f56fa0dce0b476">
-  <!ENTITY gwenview-size          "6.6 MB">
-  <!ENTITY gwenview-buildsize     "55 MB">
-  <!ENTITY gwenview-time          "0.9 SBU (using parallelism=4)">
-]>
-
-<sect1 id="gwenview" xreflabel="Gwenview-&kf6apps-version;">
-  <?dbhtml filename="gwenview.html"?>
-
-
-  <title>Gwenview-&kf6apps-version;</title>
-
-  <indexterm zone="gwenview">
-    <primary sortas="a-Gwenview">Gwenview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gwenview</title>
-
-    <para>
-      <application>Gwenview</application> is a fast and easy-to-use
-      image viewer for KDE.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gwenview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gwenview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gwenview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gwenview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gwenview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gwenview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gwenview Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exiv2"/>,
-      <xref linkend="kimageannotator"/>,
-      <xref linkend="kf6-frameworks"/>, and
-      <xref linkend="lcms2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libkdcraw"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="plasma-activities"/> and 
-      <ulink url="https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html">CFitsio</ulink> 
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gwenview</title>
-
-    <para>
-      Install <application>Gwenview</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &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>
-          gwenview and gwenview_importer
-        </seg>
-        <seg>
-          libgwenviewlib.so and
-          gvpart.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/share/{gwenview,doc/HTML/*/gwenview}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="gwenview-prog">
-        <term><command>gwenview</command></term>
-        <listitem>
-          <para>
-            is the KDE image viewer
-          </para>
-          <indexterm zone="gwenview gwenview-prog">
-            <primary sortas="b-gwenview">gwenview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="gwenview-importer">
-        <term><command>gwenview_importer</command></term>
-        <listitem>
-          <para>
-            is a Photo importer
-          </para>
-          <indexterm zone="gwenview gwenview-importer">
-            <primary sortas="b-gwenview_importer">gwenview_importer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/k3b.xml
===================================================================
--- kde/kf5-apps/k3b.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 k3b-download-http "&kf5apps-download-http;/k3b-&kf5apps-version;.tar.xz">
-  <!ENTITY k3b-download-ftp  " ">
-  <!ENTITY k3b-md5sum        "63d0cc37185c49f759f60c0f265572bc">
-  <!ENTITY k3b-size          "10 MB">
-  <!ENTITY k3b-buildsize     "128 MB">
-  <!ENTITY k3b-time          "1.0 SBU (using parallelism=4)">
-]>
-
-<sect1 id="k3b" xreflabel="k3b-&kf5apps-version;">
-  <?dbhtml filename="k3b.html"?>
-
-
-  <title>k3b-&kf5apps-version;</title>
-
-  <indexterm zone="k3b">
-    <primary sortas="a-K3b">K3b</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to K3b</title>
-
-    <para>
-      The <application>K3b</application> package contains a KF6-based
-      graphical interface to the <application>Cdrtools</application> and
-      <application>dvd+rw-tools</application> CD/DVD manipulation tools. It also
-      combines the capabilities of many other multimedia packages into one
-      central interface to provide a simple-to-operate application that can be
-      used to handle many of your CD/DVD recording and formatting requirements.
-      It is used for creating audio, data, video and mixed-mode CDs as well
-      as copying, ripping and burning CDs and DVDs.
-    </para>
-
-    <para>
-      Though <application>k3b</application> can be used to copy almost any
-      DVD to similar medium, it does not provide a way to copy, or reproduce a
-      double-layer DVD onto single-layer medium. Of course, there is not a
-      program anywhere on any platform that can make an exact duplicate of a
-      double-layer DVD onto a single-layer disk, there are programs on some
-      platforms that can compress the data on a double-layer DVD to fit on a
-      single-layer DVD producing a duplicate, but compressed, image. If you need
-      to copy the contents of a double-layer DVD to single-layer medium, you may
-      want to look at the
-      <ulink url="http://www.mcmurchy.com/rmlcopydvd/">RMLCopyDVD</ulink> package.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&k3b-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&k3b-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &k3b-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &k3b-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &k3b-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &k3b-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">K3b Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>,
-      <xref linkend="libkcddb"/>,
-      <xref linkend="libsamplerate"/>, and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <para role="required">
-      The CD/DVD drive is detected at run time using <xref linkend="udisks2"
-      role="runtime"/>, which must therefore be installed before running
-      <command>k3b</command>.
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libburn"/>,
-      <xref linkend="libdvdread"/>, and
-      <xref linkend="taglib"/>
-    </para>
-
-    <para role="recommended">
-      There are programs from three packages that
-      <application>k3b</application> will look for at runtime:
-      <xref role="runtime" linkend="cdrtools"/> (required to burn CD-ROM media),
-      <xref role="runtime" linkend="dvd-rw-tools"/> (required to burn or format
-      DVD media), and <xref role="runtime" linkend="cdrdao"/> (required to burn
-      CD-ROM media in DAO (Disk At Once) mode). If you  don't need the
-      capability provided by any of the three packages, you don't have to
-      install it. However, a warning message will be generated every time you
-      run the <command>k3b</command> program if any are not installed.
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime </bridgehead>
-    <para role="optional">
-      <xref linkend="ffmpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="flac"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="libmad"/>,
-      <xref linkend="libsndfile"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="libmusicbrainz"/>, and
-      <ulink url="https://www.musepack.net/">Musepack (libmpcdec)</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of K3b</title>
-
-    <para>
-      Install <application>K3b</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev ..                        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          k3b
-        </seg>
-        <seg>
-          libk3bdevice.so,
-          libk3blib.so,
-          and numerous plugin modules for the installed dependencies
-        </seg>
-        <seg>
-          $KF6_PREFIX/share/k3b and
-          $KF6_PREFIX/share/doc/HTML/*/k3b
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="k3b-prog">
-        <term><command>k3b</command></term>
-        <listitem>
-          <para>
-            is the graphical CD/DVD program
-          </para>
-          <indexterm zone="k3b k3b-prog">
-            <primary sortas="b-k3b">k3b</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/kdenlive5.xml
===================================================================
--- kde/kf5-apps/kdenlive5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kdenlive-download-http "&kf6apps-download-http;/kdenlive-&kf6apps-version;.tar.xz">
-  <!ENTITY kdenlive-download-ftp  " ">
-  <!ENTITY kdenlive-md5sum        "ae03ea95bc510c92735b818d10033364">
-  <!ENTITY kdenlive-size          "13 MB">
-  <!ENTITY kdenlive-buildsize     "217 MB">
-  <!ENTITY kdenlive-time          "2.4 SBU (using parallelism=4)">
-]>
-
-<sect1 id="kdenlive" xreflabel="Kdenlive-&kf6apps-version;">
-  <?dbhtml filename="kdenlive.html"?>
-
-
-  <title>Kdenlive-&kf6apps-version;</title>
-
-  <indexterm zone="kdenlive">
-    <primary sortas="a-Kdenlive">Kdenlive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdenlive</title>
-
-    <para>
-      The <application>Kdenlive</application> package is a KF6 based video
-      editor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kdenlive-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kdenlive-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kdenlive-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kdenlive-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kdenlive-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kdenlive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kdenlive Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>,
-      <xref linkend="mlt"/>, and
-      <xref role="runtime" linkend="v4l-utils"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="breeze-icons"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdenlive</title>
-
-    <para>
-      Install <application>Kdenlive</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kdenlive and kdenlive_render
-        </seg>
-        <seg>
-          mltpreview.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/share/doc/HTML/*/kdenlive and
-          $KF6_PREFIX/share/kdenlive
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="kdenlive-prog">
-        <term><command>kdenlive</command></term>
-        <listitem>
-          <para>
-             is an open source non-linear video editor which supports
-             a large number of formats
-          </para>
-          <indexterm zone="kdenlive kdenlive-prog">
-            <primary sortas="b-kdenlive">kdenlive</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kdenlive_render">
-        <term><command>kdenlive_render</command></term>
-        <listitem>
-          <para>
-             is a render program for <command>kdenlive</command>
-          </para>
-          <indexterm zone="kdenlive kdenlive_render">
-            <primary sortas="b-kdenlive_render">kdenlive_render</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/kf5-apps.xml
===================================================================
--- kde/kf5-apps/kf5-apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kf5-apps">
-  <?dbhtml filename="kf6-apps.html"?>
-
-  <title>KDE Frameworks 6 Based Applications</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ark5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenlive5.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmix5.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kio-extras.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="khelpcenter.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konsole5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma-activities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="okular5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkdcraw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gwenview.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkcddb.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="k3b.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add-pkgs.xml"/>
-
-</chapter>
Index: e/kf5-apps/khelpcenter.xml
===================================================================
--- kde/kf5-apps/khelpcenter.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 khelpcenter-download-http "&kf6apps-download-http;/khelpcenter-&kf6apps-version;.tar.xz">
-  <!ENTITY khelpcenter-download-ftp  " ">
-  <!ENTITY khelpcenter-md5sum        "07ae9c8bb78bfe70353565e61d09e716">
-  <!ENTITY khelpcenter-size          "4.2 MB">
-  <!ENTITY khelpcenter-buildsize     "39 MB">
-  <!ENTITY khelpcenter-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="khelpcenter" xreflabel="khelpcenter-&kf6apps-version;">
-  <?dbhtml filename="khelpcenter.html"?>
-
-
-  <title>Khelpcenter-&kf6apps-version;</title>
-
-  <indexterm zone="khelpcenter">
-    <primary sortas="a-khelpcenter">khelpcenter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Khelpcenter</title>
-
-    <para>
-      <application>Khelpcenter</application> is an application
-      to show KDE Applications' documentation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&khelpcenter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&khelpcenter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &khelpcenter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &khelpcenter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &khelpcenter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &khelpcenter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Khelpcenter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="xapian"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="qtwebengine"/>
-    </para>
-
-<!-- Is this true any more ???
-    <note>
-      <para>
-        Khelpcenter does not provide the plugin to display the manual pages.
-        It is found in kio-extras, another <ulink
-        url="&kf6apps-download-http;">KDE application</ulink>.
-        Depending on what is installed on your system, other dependencies
-        may be needed to build it.
-      </para>
-    </note>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Khelpcenter</title>
-
-    <para>
-      Install <application>khelpcenter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &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>
-          khelpcenter
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $KF6_PREFIX/share/khelpcenter,
-          $KF6_PREFIX/share/doc/HTML/*/{khelpcenter,fundamentals,onlinehelp}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="khelpcenter-prog">
-        <term><command>khelpcenter</command></term>
-        <listitem>
-          <para>
-            is the help viewer for KDE applications
-          </para>
-          <indexterm zone="khelpcenter khelpcenter-prog">
-            <primary sortas="b-khelpcenter">khelpcenter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/kio-extras.xml
===================================================================
--- kde/kf5-apps/kio-extras.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kio-extras-download-http "&kf5apps-download-http;/kio-extras-&kf5apps-version;.tar.xz">
-  <!ENTITY kio-extras-download-ftp  " ">
-  <!ENTITY kio-extras-md5sum        "d16ed519ecd148253147c4525f1b9d86">
-  <!ENTITY kio-extras-size          "1.4 MB">
-  <!ENTITY kio-extras-buildsize     "49 MB">
-  <!ENTITY kio-extras-time          "0.4 SBU (using parallelism=4)">
-]>
-
-<sect1 id="kio-extras" xreflabel="kio-extras-&kf5apps-version;">
-  <?dbhtml filename="kio-extras.html"?>
-
-  <title>kio-extras-&kf5apps-version;</title>
-
-  <indexterm zone="kio-extras">
-    <primary sortas="a-kio-extras">kio-extras</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kio-extras</title>
-
-    <para>
-      The <application>kio-extras</application> package contains additional
-      components to increase the functionality of the KDE resource and
-      network access abstractions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kio-extras-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kio-extras-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kio-extras-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kio-extras-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kio-extras-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kio-extras-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kio-extras Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kdsoap"/> and
-      <xref linkend="kf6-frameworks"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libtirpc"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="taglib"/>,
-      <ulink url="https://libmtp.sourceforge.net/">libmtp</ulink>,
-      <ulink url="https://www.libssh.org/">libssh</ulink>, and
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kio-extras</title>
-
-    <para>
-      Install <application>kio-extras</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libkioarchive.so and 32 plugins
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/kmix5.xml
===================================================================
--- kde/kf5-apps/kmix5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kmix-download-http "&kf5apps-download-http;/kmix-&kf5apps-version;.tar.xz">
-  <!ENTITY kmix-download-ftp  " ">
-  <!ENTITY kmix-md5sum        "60b622cd36e45f2ea9586b9c3beaba2d">
-  <!ENTITY kmix-size          "1.2 MB">
-  <!ENTITY kmix-buildsize     "20 MB">
-  <!ENTITY kmix-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="kmix" xreflabel="KMix-&kf5apps-version;">
-  <?dbhtml filename="kmix.html"?>
-
-
-  <title>KMix-&kf5apps-version;</title>
-
-  <indexterm zone="kmix">
-    <primary sortas="a-KMix">KMix</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to KMix</title>
-
-    <para>
-      The <application>KMix</application> package contains a KF6 based Sound
-      Mixer application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kmix-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kmix-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kmix-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kmix-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kmix-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kmix-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">KMix Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcanberra"/> and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of KMix</title>
-
-    <para>
-      Install <application>KMix</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kmix, kmixctrl, and kmixremote
-        </seg>
-        <seg>
-          libkmixcore.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/share/kmix and
-          $KF6_PREFIX/share/doc/HTML/*/kmix
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="kmix-prog">
-        <term><command>kmix</command></term>
-        <listitem>
-          <para>
-            is a mini audio mixer for kde
-          </para>
-          <indexterm zone="kmix kmix-prog">
-            <primary sortas="b-kmix">kmix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kmixctrl">
-        <term><command>kmixctrl</command></term>
-        <listitem>
-          <para>
-            is used to save or restore the settings of
-            <command>kmix</command>
-          </para>
-          <indexterm zone="kmix kmixctrl">
-            <primary sortas="b-kmixctrl">kmixctrl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="kmixremote">
-        <term><command>kmixremote</command></term>
-        <listitem>
-          <para>
-            is a utility to mute, get and set volume levels
-          </para>
-          <indexterm zone="kmix kmixremote">
-            <primary sortas="b-kmixremote">kmixremote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/konsole5.xml
===================================================================
--- kde/kf5-apps/konsole5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 konsole-download-http "&kf6apps-download-http;/konsole-&kf6apps-version;.tar.xz">
-  <!ENTITY konsole-download-ftp  " ">
-  <!ENTITY konsole-md5sum        "275951a37c2cb7f23a3df2f6c587293f">
-  <!ENTITY konsole-size          "1.7 MB">
-  <!ENTITY konsole-buildsize     "60 MB">
-  <!ENTITY konsole-time          "0.8 SBU (using parallelism=4)">
-]>
-
-<sect1 id="konsole" xreflabel="Konsole-&kf6apps-version;">
-  <?dbhtml filename="konsole.html"?>
-
-
-  <title>Konsole-&kf6apps-version;</title>
-
-  <indexterm zone="konsole">
-    <primary sortas="a-Konsole">Konsole</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Konsole</title>
-
-    <para>
-      The <application>Konsole</application> package is a KF6 based terminal
-      emulator.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&konsole-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&konsole-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &konsole-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &konsole-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &konsole-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &konsole-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/konsole-&kf6apps-version;-scrollbar-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Konsole Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Konsole</title>
-
-    <note>
-      <para>
-        In non-plasma environments, the konsole scrollbar and its
-        handle do not show up well.  If desired, apply the optional patch to
-        the package:
-      </para>
-
-      <screen><userinput>patch -Np1 -i ../konsole-&kf6apps-version;-scrollbar-1.patch</userinput></screen>
-
-      <para>
-        The patch makes the scrollbar light gray with a small white border. The
-        handle is dark gray.  If desired, the colors may be changed to taste by
-        editing the patch.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Konsole</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          konsole and konsoleprofile
-        </seg>
-        <seg>
-          libkdeinit6_konsole.so and libkonsoleprivate.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/share/doc/HTML/*/konsole,
-          $KF6_PREFIX/share/konsole, and
-          $KF6_PREFIX/share/kxmlgui6/konsole
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="konsole-prog">
-        <term><command>konsole</command></term>
-        <listitem>
-          <para>
-             is an X terminal emulation which provides a command-line
-             interface
-          </para>
-          <indexterm zone="konsole konsole-prog">
-            <primary sortas="b-konsole">konsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="konsoleprofile">
-        <term><command>konsoleprofile</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to change the current tab's profile
-            options
-          </para>
-          <indexterm zone="konsole konsoleprofile">
-            <primary sortas="b-konsoleprofile">konsoleprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/libkcddb.xml
===================================================================
--- kde/kf5-apps/libkcddb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libkcddb-download-http "&kf5apps-download-http;/libkcddb-&kf5apps-version;.tar.xz">
-  <!ENTITY libkcddb-download-ftp  " ">
-  <!ENTITY libkcddb-md5sum        "29438c22614fb4bd372c7cd326ce5853">
-  <!ENTITY libkcddb-size          "444 KB">
-  <!ENTITY libkcddb-buildsize     "11 MB">
-  <!ENTITY libkcddb-time          "0.1 SBU">
-]>
-
-<sect1 id="libkcddb" xreflabel="libkcddb-&kf5apps-version;">
-  <?dbhtml filename="libkcddb.html"?>
-
-
-  <title>libkcddb-&kf5apps-version;</title>
-
-  <indexterm zone="libkcddb">
-    <primary sortas="a-libkcddb">libkcddb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkcddb</title>
-
-    <para>
-      The <application>libkcddb</application> package contains a library
-      used to retrieve audio CD meta data from the internet.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libkcddb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libkcddb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libkcddb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libkcddb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libkcddb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libkcddb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libkcddb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libmusicbrainz5"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkcddb</title>
-
-    <para>
-      Install <application>libkcddb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -DQT_MAJOR_VERSION=6               \
-      -Wno-dev ..                        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKCddb6.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/include/KCddb6
-          $KF6_PREFIX/lib/cmake/KCddb6
-          $KF6_PREFIX/share/doc/HTML/*/kcontrol
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libkcddb-lib">
-        <term><filename class="libraryfile">libKCddb6.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to retrieve audio CD meta data
-            from the internet
-          </para>
-          <indexterm zone="libkcddb libkcddb-lib">
-            <primary sortas="c-libkcddb">libkcddb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/libkdcraw.xml
===================================================================
--- kde/kf5-apps/libkdcraw.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libkdcraw-download-http "&kf6apps-download-http;/libkdcraw-&kf6apps-version;.tar.xz">
-  <!ENTITY libkdcraw-download-ftp  " ">
-  <!ENTITY libkdcraw-md5sum        "b7dddaabde0c40ee334b01e08579a27c">
-  <!ENTITY libkdcraw-size          "40 KB">
-  <!ENTITY libkdcraw-buildsize     "1.7 MB">
-  <!ENTITY libkdcraw-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libkdcraw" xreflabel="libkdcraw-&kf6apps-version;">
-  <?dbhtml filename="libkdcraw.html"?>
-
-
-  <title>libkdcraw-&kf6apps-version;</title>
-
-  <indexterm zone="libkdcraw">
-    <primary sortas="a-libkdcraw">libkdcraw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkdcraw</title>
-
-    <para>
-      <application>Libkdcraw</application> is a KDE wrapper around the
-      <xref linkend="libraw"/> library for manipulating image metadata.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libkdcraw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libkdcraw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libkdcraw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libkdcraw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libkdcraw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libkdcraw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libkdcraw Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/> and
-      <xref linkend="libraw"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkdcraw</title>
-
-    <para>
-      Install <application>libkdcraw</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -DQT_MAJOR_VERSION=6               \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKDcrawQt6.so
-        </seg>
-        <seg>
-          $KF5_PREFIX/include/KDcrawQt6 and
-          $KF5_PREFIX/lib/cmake/KDcrawQt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/libkexiv2.xml
===================================================================
--- kde/kf5-apps/libkexiv2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libkexiv2-download-http "&kf6apps-download-http;/libkexiv2-&kf6apps-version;.tar.xz">
-  <!ENTITY libkexiv2-download-ftp  " ">
-  <!ENTITY libkexiv2-md5sum        "f1b1b8cdd54252c47d17bde6a8ad2cd8">
-  <!ENTITY libkexiv2-size          "60 KB">
-  <!ENTITY libkexiv2-buildsize     "3.6 MB">
-  <!ENTITY libkexiv2-time          "0.3 SBU">
-]>
-
-<sect1 id="libkexiv2" xreflabel="libkexiv2-&kf6apps-version;">
-  <?dbhtml filename="libkexiv2.html"?>
-
-
-  <title>libkexiv2-&kf6apps-version;</title>
-
-  <indexterm zone="libkexiv2">
-    <primary sortas="a-libkexiv2">libkexiv2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkexiv2</title>
-
-    <para>
-      <application>Libkexiv2</application> is a KDE wrapper around the Exiv2
-      library for manipulating image metadata.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libkexiv2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libkexiv2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libkexiv2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libkexiv2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libkexiv2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libkexiv2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libkexiv2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/> and
-      <xref linkend="exiv2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkexiv2</title>
-
-    <para>
-      Install <application>libkexiv2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_WITH_QT6=ON                \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libKExiv2Qt6.so
-        </seg>
-        <seg>
-          $KF5_PREFIX/include/KExiv2Qt6 and
-          $KF5_PREFIX/lib/cmake/KExiv2Qt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="libkexiv2-prog">
-        <term><command>libkexiv2</command></term>
-        <listitem>
-          <para>
-             is an X terminal emulation which provides a command-line
-             interface.
-          </para>
-          <indexterm zone="libkexiv2 libkexiv2-prog">
-            <primary sortas="b-libkexiv2">libkexiv2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="libkexiv2profile5">
-        <term><command>libkexiv2profile</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to change the current tab's profile
-            options.
-          </para>
-          <indexterm zone="libkexiv2 libkexiv2profile5">
-            <primary sortas="b-libkexiv2profile">libkexiv2profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/okular5.xml
===================================================================
--- kde/kf5-apps/okular5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 okular-download-http "&kf6apps-download-http;/okular-&kf6apps-version;.tar.xz">
-  <!ENTITY okular-download-ftp  " ">
-  <!ENTITY okular-md5sum        "dc4d4a856f9f5224ce9cd214c6366010">
-  <!ENTITY okular-size          "8.2 MB">
-  <!ENTITY okular-buildsize     "93 MB">
-  <!ENTITY okular-time          "1.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="okular" xreflabel="Okular-&kf6apps-version;">
-  <?dbhtml filename="okular.html"?>
-
-
-  <title>Okular-&kf6apps-version;</title>
-
-  <indexterm zone="okular">
-    <primary sortas="a-Okular">Okular</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Okular</title>
-
-    <para>
-      Okular is a document viewer for KDE. It can view documents of many types
-      including PDF, PostScript, TIFF, DjVu, DVI, XPS, and ePub.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&okular-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&okular-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &okular-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &okular-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &okular-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &okular-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Okular Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/> and
-      <xref linkend="plasma-activities"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libkexiv2"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="poppler"/> (built with Qt6, required for PDF support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qca"/>,
-      <ulink url="https://www.pell.portland.or.us/~orc/Code/discount/">discount</ulink>,
-      <ulink url="https://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="https://libspectre.freedesktop.org/">libspectre</ulink>
-      <ulink url="https://sourceforge.net/projects/ebook-tools">libepub</ulink>, and
-      <ulink url="https://libzip.org">LibZip</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Okular</title>
-
-    <para>
-      Install <application>Okular</application> by running the following
-      commands:
-    </para>
-
-    <note>
-      <para>
-        If any of the optional dependencies are installed, remove the
-        associated reference in the SKIP_OPTIONAL environment variable.
-      </para>
-    </note>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-SKIP_OPTIONAL='Discount;DjVuLibre;EPub;LibSpectre;LibZip'
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -DFORCE_NOT_REQUIRED_DEPENDENCIES="$SKIP_OPTIONAL" \
-      -Wno-dev .. &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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          okular
-        </seg>
-        <seg>
-          Okular6Core.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/include/okular,
-          $KF6_PREFIX/lib/cmake/Okular6,
-          $KF6_PREFIX/lib/plugins/okular,
-          $KF6_PREFIX/share/okular, and
-          $KF6_PREFIX/share/doc/HTML/*/okular
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="okular-prog">
-        <term><command>okular</command></term>
-        <listitem>
-          <para>
-             is a document viewer
-          </para>
-          <indexterm zone="okular okular-prog">
-            <primary sortas="b-okular">okular</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5-apps/plasma-activities.xml
===================================================================
--- kde/kf5-apps/plasma-activities.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 plasma-activities-download-http "https://download.kde.org/stable/plasma/&plasma-version;/plasma-activities-&plasma-version;.tar.xz">
-  <!ENTITY plasma-activities-download-ftp  " ">
-  <!ENTITY plasma-activities-md5sum        "eac6aebafbb8c2cbef5a121d5c0afb10">
-  <!ENTITY plasma-activities-size          "72 KB">
-  <!ENTITY plasma-activities-buildsize     "8.0 MB">
-  <!ENTITY plasma-activities-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="plasma-activities" xreflabel="plasma-activities-&plasma-version;">
-  <?dbhtml filename="plasma-activities.html"?>
-
-
-  <title>plasma-activities-&plasma-version;</title>
-
-  <indexterm zone="plasma-activities">
-    <primary sortas="a-plasma-activities">plasma-activities</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to plasma-activities-&plasma-version;</title>
-
-    <para>
-      The <application>plasma-activities-&plasma-version;</application> application
-      provides core components for KDE Activities.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&plasma-activities-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&plasma-activities-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &plasma-activities-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &plasma-activities-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &plasma-activities-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &plasma-activities-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">plasma-activities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/> and
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of plasma-activities</title>
-
-    <para>
-      Install <application>plasma-activities</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &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>
-          plasma-activities-cli6
-        </seg>
-        <seg>
-          libPlasmaActivities.so
-        </seg>
-        <seg>
-          $KF6_PREFIX/include/PlasmaActivities,
-          $KF6_PREFIX/lib/cmake/PlasmaActivities, and
-          $KF6_PREFIX/share/share/qlogging-categories6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="plasma-activities-prog">
-        <term><command>plasma-activities-cli6</command></term>
-        <listitem>
-          <para>
-            is the activity manager for KDE applications
-          </para>
-          <indexterm zone="plasma-activities plasma-activities-prog">
-            <primary sortas="b-plasma-activities">plasma-activities</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5/kf5.xml
===================================================================
--- kde/kf5/kf5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="kf6">
-  <?dbhtml filename="kf6.html"?>
-
-  <title>KDE Frameworks 6</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf6-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf6-frameworks.xml"/>
-
-</chapter>
-
Index: e/kf5/kf6-frameworks.xml
===================================================================
--- kde/kf5/kf6-frameworks.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,934 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-
-  <!-- kf6-download-http is defined on packages.ent
-  <!ENTITY kf6-download-http "&kf6-download-http;"> -->
-  <!ENTITY kf6-download-ftp  " ">
-  <!ENTITY kf6-md5sum        "See Below">
-  <!ENTITY kf6-size          "97 MB">
-  <!ENTITY kf6-buildsize     "2.5 GB (177 MB installed)">
-  <!ENTITY kf6-time          "13 SBU (using parallelism=8)">
-]>
-
-<sect1 id="kf6-frameworks" xreflabel="KDE Frameworks-&kf6-version;">
-  <?dbhtml filename="frameworks6.html"?>
-
-  <title>Building KDE Frameworks 6 (KF6)</title>
-
-  <indexterm zone="kf6-frameworks">
-     <primary sortas="a-kde-frameworks">KDE Frameworks</primary>
-  </indexterm>
-
-  <para>
-    KDE Frameworks is a collection of libraries based on top of Qt6 and
-    QML derived from the previous KDE libraries. They can be used
-    independent of the KDE Display Environment (Plasma 6).
-  </para>
-
-  &lfs121_checked;
-
-  <para>
-    The instructions below build all of the KDE Frameworks packages in one
-    step by using a bash script.
-  </para>
-
-  <bridgehead renderas="sect3">Package Information</bridgehead>
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para>
-        Download (HTTP): <ulink url="&kf6-download-http;"/>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download (FTP): <ulink url="&kf6-download-ftp;"/>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download MD5 sum: &kf6-md5sum;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download size: &kf6-size;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated disk space required: &kf6-buildsize;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated build time: &kf6-time;
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">KF6 Dependencies</bridgehead>
-
-  <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required">
-    <!--<xref linkend="boost"/>,-->
-    <xref linkend="extra-cmake-modules"/>,
-    <xref linkend="DocBook"/>,
-    <xref linkend="docbook-xsl"/>,
-    <!--<xref linkend="giflib"/>,-->
-    <xref linkend="libcanberra"/>,
-    <!--<xref linkend="libepoxy"/>,-->
-    <xref linkend="libgcrypt"/>,
-    <xref linkend="libical"/>,
-    <!--<xref linkend="libjpeg"/>,-->
-    <!--<xref linkend="libpng"/>,-->
-    <xref linkend="libxslt"/>,
-    <xref linkend="lmdb"/>,
-    <xref linkend="qca"/>,
-    <xref linkend="qrencode"/>,
-    <!--<xref linkend="phonon"/>,-->
-    <xref linkend="plasma-wayland-protocols"/>,
-    <xref linkend="shared-mime-info"/>,
-    <xref linkend="perl-uri"/>, and
-    <xref linkend="wget"/> (required to download the packages)
-  </para>
-
-  <bridgehead renderas="sect4">Recommended</bridgehead>
-  <para role="recommended">
-    <xref linkend="aspell"/> (Dictionary backend for Sonnet),
-    <xref linkend="avahi"/> (DNS-SD backend for KDNSSD),
-    <xref linkend="ModemManager"/> (needed to build ModemManager-Qt),
-    <xref linkend="NetworkManager"/> (needed to build NetworkManager-Qt),
-    <xref linkend="polkit-qt"/> (Authentication backend for KAuth), and
-    <xref linkend="vulkan-loader"/> (Add support for Vulkan graphics drivers)
-  </para>
-
-  <para role="recommended">
-    Furthermore, the instructions below assume that the environment has been
-    set up as described in <xref linkend="kf6-intro"/>.
-  </para>
-
-  <bridgehead renderas="sect4">Optional</bridgehead>
-  <para role="optional">
-    <xref linkend="bluez"/> (needed to build Bluez-Qt),
-    <ulink url="https://libdmtx.sourceforge.net/">Datamatrix</ulink> (deemed
-      recommended for Prison by upstream)
-  </para>
-
-  <bridgehead renderas="sect4">Runtime dependency for FrameworkIntegration</bridgehead>
-  <para role="optional">
-<!--<xref role="runtime" linkend="oxygen-fonts"/> and -->
-    <xref role="runtime" linkend="noto-fonts"/>
-  </para>
-  <bridgehead renderas="sect4">Additional recommended dependencies for kapidox</bridgehead>
-  <para role="recommended">
-    <xref role="runtime" linkend="doxygen"/> (Run time),
-    <xref linkend="doxypypy"/>,
-    <xref linkend="doxyqml"/>,
-    <xref linkend="PyYAML"/>, and
-    <xref linkend="requests"/>
-  </para>
-
-  <bridgehead renderas="sect4">Additional image formats support in KImageFormats</bridgehead>
-  <para role="optional">
-<!--    <xref linkend="jasper"/>,-->
-    <xref linkend="libavif"/>,
-    <xref linkend="libjxl"/>,
-    <xref linkend="libraw"/>,
-    <ulink url="https://github.com/strukturag/libheif">libheif</ulink>,
-    <!--<ulink url="https://github.com/libjxl/libjxl">libjxl</ulink>, and-->
-    <!-- www.openexr.com redirects here -->
-    <ulink url="https://github.com/AcademySoftwareFoundation/openexr">OpenEXR</ulink>
-  </para>
-
-  <bridgehead renderas="sect4">Optional dependencies for Solid</bridgehead>
-  <para role="optional">
-    <xref linkend="udisks2"/>,
-    <xref linkend="upower"/> and
-    <ulink role="runtime" url="https://www.freedesktop.org/software/media-player-info/">media-player-info</ulink> (runtime)
-  </para>
-
-  <bridgehead renderas="sect4">Optional dependency for KWallet</bridgehead>
-  <para role="optional">
-    <xref linkend="gpgme"/>, built with C++ bindings (which is the default).
-  </para>
-
-  <bridgehead renderas="sect4">Optional dictionary backends for Sonnet</bridgehead>
-  <para role="optional">
-    <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink> and
-    <ulink url="https://hunspell.sourceforge.net/">Hunspell</ulink>
-  </para>
-
-  <sect2>
-    <title>Downloading KDE Frameworks</title>
-
-    <para>
-      The easiest way to get the KDE Frameworks packages is to use a single
-      <command>wget</command> to fetch them all at once:
-    </para>
-
-<screen><userinput>url=https://download.kde.org/stable/frameworks/&kf6-short-version;/
-wget -r -nH -nd -A '*.xz' -np $url</userinput>
-<literal>
-The options used here are:
-  -r            recurse through child directories
-  -nH           disable generation of host-prefixed directories
-  -nd           do not create a hierarchy of directories
-  -A '*.xz'     just get the *.xz files
-  -np           don't get parent directories</literal></screen>
-
-   </sect2>
-
-  <sect2>
-    <title>Setting Package Order</title>
-
-    <para>
-      The order of building files is important due to internal dependencies.
-      Create the list of files in the proper order as follows:
-    </para>
-
-<screen><userinput>cat &gt; frameworks-&kf6-version;.md5 &lt;&lt; "EOF"
-<literal>2ea9b1e25d890f1bba27760d8c9b3953  attica-6.1.0.tar.xz
-#1109efb1a8e84918f74c2e8e650a049a  extra-cmake-modules-6.1.0.tar.xz
-440a8c01da58cfd7e4f857a66cdd3b28  kapidox-6.1.0.tar.xz
-145c3ec54b23bdbd6bf8f18fd64868fe  karchive-6.1.0.tar.xz
-00be41140dcecc9c6ac823fd27dfc9b7  kcodecs-6.1.0.tar.xz
-50c79892fb59a879fa929cc23f377b9c  kconfig-6.1.0.tar.xz
-f35bca04c8a22197c5ff0929868cc368  kcoreaddons-6.1.0.tar.xz
-8840182685d4a4bb92b9fa8c47574611  kdbusaddons-6.1.0.tar.xz
-f9b60ee071ee5b810460d46d60180aa6  kdnssd-6.1.0.tar.xz
-1ca4e766eaf6ecc75aa3700bd371280e  kguiaddons-6.1.0.tar.xz
-78229a5127e3514369d7267d45069213  ki18n-6.1.0.tar.xz
-6305247d06bb9b28b4eaca9bb04c5b8d  kidletime-6.1.0.tar.xz
-a9fe7f30eb8dfd289fef060d38bbab7c  kimageformats-6.1.0.tar.xz
-854103ad3d8698c4ee947c3255c3a8d1  kitemmodels-6.1.0.tar.xz
-e8ce0d5ae9a5ae43602945a0ced68b3d  kitemviews-6.1.0.tar.xz
-66811dcda2ad18be2efa7f4e0b07985f  kplotting-6.1.0.tar.xz
-4d20beb9c658c24246649dd8f9ec98fb  kwidgetsaddons-6.1.0.tar.xz
-0157d6b3717278454e4d4890d37537c7  kwindowsystem-6.1.0.tar.xz
-794c4993dbd31cae17ca78ef5c0ccf92  networkmanager-qt-6.1.0.tar.xz
-76137f869de9fb084ce8944e320bd19d  solid-6.1.1.tar.xz
-5935e8552015db47c311d9ef03bcc377  sonnet-6.1.0.tar.xz
-7df40ccb0e87c1a947f67f89ef109ffb  threadweaver-6.1.0.tar.xz
-332f96f9356f2b90f8cde116b96cc320  kauth-6.1.0.tar.xz
-29d3700496362f61b4af60e73de6253b  kcompletion-6.1.0.tar.xz
-5211c51c2c48ce8d42053329ea9a6455  kcrash-6.1.0.tar.xz
-00494474335a7a847fbfc0ce9cc32b7b  kdoctools-6.1.0.tar.xz
-0eee89e837bd262638b852ee6e8c7c49  kpty-6.1.0.tar.xz
-dec360a19f2653bf20d17005d305b73a  kunitconversion-6.1.0.tar.xz
-328b11d4dc905bb4dbeb067ea8115a0f  kcolorscheme-6.1.0.tar.xz
-6df45f2cbe0607889a557e62b35184ef  kconfigwidgets-6.1.0.tar.xz
-7c0750ee394f58cda0d4dd73975309a4  kservice-6.1.0.tar.xz
-87312ffd4ee3c805ed67864d9dee4ec3  kglobalaccel-6.1.0.tar.xz
-3bc4b0aa05aec8566155aa0bf3317714  kpackage-6.1.0.tar.xz
-3293aa08539521b78dde13aef330b043  kdesu-6.1.0.tar.xz
-d4f9bab5b8006328a96c5ce05ae61851  kiconthemes-6.1.0.tar.xz
-5ff9cc47d71a9111f2960145c3177f08  knotifications-6.1.0.tar.xz
-a0801b79ec1f543a64c2fd7d23399a84  kjobwidgets-6.1.0.tar.xz
-09029c7d5b7934e2838ae760d87b7ddd  ktextwidgets-6.1.0.tar.xz
-d7aa6d7d29197abaa699ad28002c4cc4  kxmlgui-6.1.0.tar.xz
-3c6fc85d22238971ad7bcbab77d94b0f  kbookmarks-6.1.0.tar.xz
-01f6026145fac0707feb3c744e13bc48  kwallet-6.1.0.tar.xz
-f09462c9ef3a243abab31420e3943528  kded-6.1.0.tar.xz
-d41f53f00db6b4a2709d9fb24e81ad45  kio-6.1.0.tar.xz
-d1552e0c680ebc5b1162f894b6671c7b  kdeclarative-6.1.0.tar.xz
-a2a3e33fb573e8bc5e8d49fe789043e9  kcmutils-6.1.0.tar.xz
-d052029caf5d6411507d326609292700  kirigami-6.1.0.tar.xz
-0ffe7c71589b34ee6dde32707fb84fea  syndication-6.1.0.tar.xz
-63fca0fcb82dd8173184d14f6ff519c1  knewstuff-6.1.0.tar.xz
-96953c094839f886fc43d287576d9803  frameworkintegration-6.1.0.tar.xz
-ec7504166ea139c8fef17e83f651e5ef  kparts-6.1.0.tar.xz
-8282b873eceba18b47974e382cbc2ee5  syntax-highlighting-6.1.0.tar.xz
-b531f57c24203d3972421fb816588410  ktexteditor-6.1.0.tar.xz
-390b1c5de3944f6e94d3ae5bfc20711e  modemmanager-qt-6.1.0.tar.xz
-c061f51583773539bbc1ba0167d5baae  kcontacts-6.1.0.tar.xz
-772b9f66446d3cba45b603fa610e6e6b  kpeople-6.1.0.tar.xz
-0e602a520f5f8539dd95574f4a04f344  bluez-qt-6.1.0.tar.xz
-3e8c83dc749f935b6e39f66b086118d4  kfilemetadata-6.1.0.tar.xz
-5ce22318eddec82b8f95eef7e99b2fa2  baloo-6.1.0.tar.xz
-#97bcb1e182e8f1cf20417ca65ce17a8f  breeze-icons-6.1.0.tar.xz
-ae2041981ba891a57c34b7c8dd41a9f6  krunner-6.1.0.tar.xz
-d4226bf24a8014c9921f3cafcc851289  prison-6.1.0.tar.xz
-4bec26db5300fb0a76dd5dd70f82a1ff  qqc2-desktop-style-6.1.0.tar.xz
-272813a08f40a2879bbe7b0b89eb2ca7  kholidays-6.1.0.tar.xz
-05a36c14152b46b1c906a7512050b6f1  purpose-6.1.0.tar.xz
-5b87511f9f09182b141849ed4bf4a989  kcalendarcore-6.1.0.tar.xz
-5809b8240d26f837d9f83f3e0f64c343  kquickcharts-6.1.0.tar.xz
-216d353820eda22e2b1435152b0c02f2  knotifyconfig-6.1.0.tar.xz
-ec2be1ead3532396c9953498c3442f8c  kdav-6.1.0.tar.xz
-d94fdcee06950ba7ec7e0c6d62e1e82d  kstatusnotifieritem-6.1.0.tar.xz
-de907b29d1e2160a09ca8ec4ead1538f  ksvg-6.1.0.tar.xz
-5a240a769c7bfbb374345b4fda2e7bc4  ktexttemplate-6.1.0.tar.xz
-9e288ba87210b6bd7af76ad6f68dbd44  kuserfeedback-6.1.0.tar.xz</literal>
-EOF</userinput></screen>
-
-  <para>
-    In the above list, notice that some files have been commented out with
-    a hash (#) character. 
-    
-    The extra-cmake-modules entry has been commented out
-    because it was built earlier in the <xref linkend="kde-prereq"/>. 
-    
-    The icon package is covered separately at <xref linkend="breeze-icons"/>.
-  </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of KDE Frameworks</title>
-
-    &as_root;
-
-    <caution>
-
-      <para>
-        If installing in <filename class="directory">/opt</filename> and there
-        is an existing /opt/kf6 either as a regular directory or a symbolic
-        link, it should be reinitialized (as <systemitem class="username">
-        root</systemitem>):
-      </para>
-
-      <screen role="root" revision="sysv"><userinput>mv -v /opt/kf6 /opt/kf6.old                         &amp;&amp;
-install -v -dm755           $KF6_PREFIX/{etc,share} &amp;&amp;
-ln -sfv /etc/dbus-1         $KF6_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF6_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF6_PREFIX/share</userinput></screen>
-
-      <screen role="root" revision="systemd"><userinput>mv -v /opt/kf6 /opt/kf6.old                         &amp;&amp;
-install -v -dm755           $KF6_PREFIX/{etc,share} &amp;&amp;
-ln -sfv /etc/dbus-1         $KF6_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF6_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF6_PREFIX/share       &amp;&amp;
-install -v -dm755           $KF6_PREFIX/lib         &amp;&amp;
-ln -sfv /usr/lib/systemd    $KF6_PREFIX/lib</userinput></screen>
-
-    </caution>
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Install all of the packages by running the following
-      commands:
-    </para>
-
-<screen><userinput>while read -r line; do
-
-    # Get the file name, ignoring comments and blank lines
-    if $(echo $line | grep -E -q '^ *$|^#' ); then continue; fi
-    file=$(echo $line | cut -d" " -f2)
-
-    pkg=$(echo $file|sed 's|^.*/||')          # Remove directory
-    packagedir=$(echo $pkg|sed 's|\.tar.*||') # Package directory
-
-    name=$(echo $pkg|sed 's|-6.*$||') # Isolate package name
-
-    tar -xf $file
-    pushd $packagedir
-
-      # kapidox is a python module
-      case $name in
-        kapidox)
-          &build-wheel-cmd; $PWD
-          as_root &install-wheel; kapidox
-          popd
-          rm -rf $packagedir
-          continue
-          ;;
-      esac
-
-      mkdir build
-      cd    build
-
-      cmake -D CMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-            -D CMAKE_INSTALL_LIBEXECDIR=libexec \
-            -D CMAKE_PREFIX_PATH=$QT6DIR        \
-            -D CMAKE_BUILD_TYPE=Release         \
-            -D BUILD_TESTING=OFF                \
-            -W no-dev ..
-      make
-      as_root make install
-    popd
-<!-- some packages end with files owned by root in $packagedir, so use as_root
-     in the following -->
-  as_root rm -rf $packagedir
-  as_root /sbin/ldconfig
-
-done &lt; frameworks-&kf6-version;.md5
-
-exit</userinput></screen>
-
-    <note>
-      <para>
-        Any modules that have been omitted can be installed later by
-        using the same <command>mkdir build; cd build; cmake; make;
-        make install</command> procedure as above.
-      </para>
-    </note>
-
-    <para revision="sysv">
-      Useless systemd units have been installed in
-      <filename class="directory">$KF6_PREFIX/lib</filename>. Remove
-      them now (as &root;):
-    </para>
-
-<screen role="root"
-        revision="sysv"><userinput>rm -rf $KF6_PREFIX/lib/systemd</userinput></screen>
-
-    <para>
-      Sometimes the installation paths are hardcoded into installed files.
-      If the installed directory is not /usr, rename the directory and create a
-      symlink:
-    </para>
-
-    <screen role="root"><userinput>mv -v /opt/kf6 /opt/kf6-&kf6-version;
-ln -sfvn kf6-&kf6-version; /opt/kf6</userinput></screen>
-
-  </sect2>
-
-    <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_PREFIX_PATH=$QT6DIR</parameter>: This switch is used
-      to allow cmake to find the proper Qt libraries.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This switch is used to prevent
-      building test programs and libraries that are of no use to an end user.
-    </para>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          balooctl,
-          baloo_file,
-          baloo_file_extractor,
-          baloosearch,
-          balooshow,
-          checkXML6,
-          depdiagram-generate,
-          depdiagram-generate-all,
-          depdiagram-prepare,
-          desktoptojson,
-          gentrigrams,
-          kactivities-cli,
-          kapidox_generate,
-          kate-syntax-highlighter,
-          kbuildsycoca6,
-          kcookiejar6,
-          kdebugdialog6,
-          kded6,
-          kdeinit6,
-          kdeinit6_shutdown,
-          kdeinit6_wrapper,
-          kf6-config,
-          kf6kross,
-          kgendesignerplugin,
-          kglobalaccel6,
-          kiconfinder6,
-          kjs6,
-          kjscmd6,
-          kjsconsole,
-          knewstuff-dialog,
-          kpackagelauncherqml,
-          kpackagetool6,
-          kquitapp6,
-          kreadconfig6,
-          kshell6,
-          ktelnetservice6,
-          ktrash6,
-          kwalletd6,
-          kwallet-query,
-          kwrapper6,
-          kwriteconfig6,
-          meinproc6,
-          parsetrigrams,
-          plasmapkg2,
-          preparetips6,
-          protocoltojson, and
-          solid-hardware6
-        </seg>
-        <seg>
-          libkdeinit6_klauncher.so,
-          libKF6Activities.so,
-          libKF6ActivitiesStats.so,
-          libKF6Archive.so,
-          libKF6Attica.so,
-          libKF6AuthCore.so,
-          libKF6Auth.so,
-          libKF6Baloo.so,
-          libKF6BluezQt.so,
-          libKF6Bookmarks.so,
-          libKF6CalendarCore.so,
-          libKF6CalendarEvents.so,
-          libKF6Codecs.so,
-          libKF6Completion.so,
-          libKF6ConfigCore.so,
-          libKF6ConfigGui.so,
-          libKF6ConfigWidgets.so,
-          libKF6Contacts.so,
-          libKF6CoreAddons.so,
-          libKF6Crash.so,
-          libKF6DAV.so,
-          libKF6DBusAddons.so,
-          libKF6Declarative.so,
-          libKF6DNSSD.so,
-          libKF6DocTools.so,
-          libKF6Emoticons.so,
-          libKF6FileMetaData.so,
-          libKF6GlobalAccel.so,
-          libKF6GuiAddons.so,
-          libKF6Holidays.so,
-          libKF6I18n.so,
-          libKF6IconThemes.so,
-          libKF6IdleTime.so,
-          libKF6ItemModels.so,
-          libKF6ItemViews.so,
-          libKF6JobWidgets.so,
-          libKF6JSApi.so,
-          libKF6JsEmbed.so,
-          libKF6JS.so,
-          libKF6KCMUtils.so,
-          libKF6KDELibs4Support.so,
-          libKF6KHtml.so,
-          libKF6KIOCore.so,
-          libKF6KIOFileWidgets.so,
-          libKF6KIOGui.so,
-          libKF6KIONTLM.so,
-          libKF6KIOWidgets.so,
-          libKF6Kirigami2.so,
-          libKF6KrossCore.so,
-          libKF6KrossUi.so,
-          libKF6MediaPlayer.so,
-          libKF6NetworkManagerQt.so,
-          libKF6NewStuffCore.so,
-          libKF6NewStuff.so,
-          libKF6Notifications.so,
-          libKF6NotifyConfig.so,
-          libKF6Package.so,
-          libKF6Parts.so,
-          libKF6PeopleBackend.so,
-          libKF6People.so,
-          libKF6PeopleWidgets.so,
-          libKF6PlasmaQuick.so,
-          libKF6Plasma.so,
-          libKF6Plotting.so,
-          libKF6Prison.so,
-          libKF6Pty.so,
-          libKF6Purpose.so,
-          libKF6PurposeWidgets.so,
-          libKF6QuickAddons.so,
-          libKF6Runner.so,
-          libKF6Service.so,
-          libKF6Solid.so,
-          libKF6SonnetCore.so,
-          libKF6SonnetUi.so,
-          libKF6Style.so,
-          libKF6Su.so,
-          libKF6SyntaxHighlighting.so,
-          libKF6TextEditor.so,
-          libKF6TextWidgets.so,
-          libKF6ThreadWeaver.so,
-          libKF6UnitConversion.so,
-          libKF6Wallet.so,
-          libKF6WaylandClient.so,
-          libKF6WaylandServer.so,
-          libKF6WidgetsAddons.so,
-          libKF6WindowSystem.so,
-          libKF6XmlGui.so,
-          libKF6XmlRpcClient.so, and
-          libkwalletbackend6.so
-        </seg>
-        <seg>
-          /opt/kf6 (symlink to /opt/kf6-&kf6-version;) if installing in /opt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkXML6">
-        <term><command>checkXML6</command></term>
-        <listitem>
-          <para>
-            is a tool to check for syntax errors in KDE DocBook XML files
-          </para>
-          <indexterm zone="kf6-frameworks checkXML6">
-            <primary sortas="b-checkXML6">checkXML6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depdiagram-generate">
-        <term><command>depdiagram-generate</command></term>
-        <listitem>
-          <para>
-            is a tool to generate a dependency diagram
-          </para>
-          <indexterm zone="kf6-frameworks depdiagram-generate">
-            <primary sortas="b-depdiagram-generate">depdiagram-generate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depdiagram-generate-all">
-        <term><command>depdiagram-generate-all</command></term>
-        <listitem>
-          <para>
-            is a tool to generate a dependency diagram for all frameworks at once
-          </para>
-          <indexterm zone="kf6-frameworks depdiagram-generate-all">
-            <primary sortas="b-depdiagram-generate-all">depdiagram-generate-all</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depdiagram-prepare">
-        <term><command>depdiagram-prepare</command></term>
-        <listitem>
-          <para>
-            is a tool to prepare dot files
-          </para>
-          <indexterm zone="kf6-frameworks depdiagram-prepare">
-            <primary sortas="b-depdiagram-prepare">depdiagram-prepare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="desktoptojson">
-        <term><command>desktoptojson</command></term>
-        <listitem>
-          <para>
-            is a tool to convert a .desktop file to a .json file
-          </para>
-          <indexterm zone="kf6-frameworks desktoptojson">
-            <primary sortas="b-desktoptojson">desktoptojson</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbuildsycoca6">
-        <term><command>kbuildsycoca6</command></term>
-        <listitem>
-          <para>
-            rebuilds the KService desktop file system configuration
-       cache
-          </para>
-          <indexterm zone="kf6-frameworks kbuildsycoca6">
-            <primary sortas="b-kbuildsycoca6">kbuildsycoca6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kcookiejar6">
-        <term><command>kcookiejar6</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the HTTP cookie store used by KDE,
-            a D-BUS service to store/retrieve/clean cookies
-          </para>
-          <indexterm zone="kf6-frameworks kcookiejar6">
-            <primary sortas="b-kcookiejar6">kcookiejar6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kded6">
-        <term><command>kded6</command></term>
-        <listitem>
-          <para>
-            consolidates several small services in one process
-          </para>
-          <indexterm zone="kf6-frameworks kded6">
-            <primary sortas="b-kded6">kded6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdeinit6">
-        <term><command>kdeinit6</command></term>
-        <listitem>
-          <para>
-            is a process launcher somewhat similar to the famous init used
-            for booting UNIX
-          </para>
-          <indexterm zone="kf6-frameworks kdeinit6">
-            <primary sortas="b-kdeinit6">kdeinit6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kf6-config">
-        <term><command>kf6-config</command></term>
-        <listitem>
-          <para>
-            is a command line program used to retrieve information about
-            KDE installation or user paths
-          </para>
-          <indexterm zone="kf6-frameworks kf6-config">
-            <primary sortas="b-kf6-config">kf6-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kf6kross">
-        <term><command>kf6kross</command></term>
-        <listitem>
-          <para>
-            executes kross scripts written in KDE Javascript, Python, Ruby,
-            Java and Falcon
-          </para>
-          <indexterm zone="kf6-frameworks kf6kross">
-            <primary sortas="b-kf6kross">kf6kross</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="kgenapidox">
-        <term><command>kgenapidox</command></term>
-        <listitem>
-          <para>
-            is a tool to generate API documentation in the KDE style.
-          </para>
-          <indexterm zone="kf6-frameworks kgenapidox">
-            <primary sortas="b-kgenapidox">kgenapidox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="kgendesignerplugin">
-        <term><command>kgendesignerplugin</command></term>
-        <listitem>
-          <para>
-            generates widget plugins for Qt(TM) Designer
-          </para>
-          <indexterm zone="kf6-frameworks kgendesignerplugin">
-            <primary sortas="b-kgendesignerplugin">kgendesignerplugin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kglobalaccel6">
-        <term><command>kglobalaccel6</command></term>
-        <listitem>
-          <para>
-            is a daemon use to register the key bindings and for getting
-            notified when the action triggered
-          </para>
-          <indexterm zone="kf6-frameworks kglobalaccel6">
-            <primary sortas="b-kglobalaccel6">kglobalaccel6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjs6">
-        <term><command>kjs6</command></term>
-        <listitem>
-          <para>
-            is KDE ECMAScript/JavaScript engine
-          </para>
-          <indexterm zone="kf6-frameworks kjs6">
-            <primary sortas="b-kjs5">kjs6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjscmd6">
-        <term><command>kjscmd6</command></term>
-        <listitem>
-          <para>
-             is a tool for launching KJSEmbed scripts from the command line
-          </para>
-          <indexterm zone="kf6-frameworks kjscmd6">
-            <primary sortas="b-kjscmd6">kjscmd6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kjsconsole">
-        <term><command>kjsconsole</command></term>
-        <listitem>
-          <para>
-            is a console for <command>kjs6</command>
-          </para>
-          <indexterm zone="kf6-frameworks kjsconsole">
-            <primary sortas="b-kjsconsole">kjsconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpackagelauncherqml">
-        <term><command>kpackagelauncherqml</command></term>
-        <listitem>
-          <para>
-            is a commandline tool for launching kpackage QML application
-          </para>
-          <indexterm zone="kf6-frameworks kpackagelauncherqml">
-            <primary sortas="b-kpackagelauncherqml">kpackagelauncherqml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpackagetool6">
-        <term><command>kpackagetool6</command></term>
-        <listitem>
-          <para>
-            is a command line kpackage tool
-          </para>
-          <indexterm zone="kf6-frameworks kpackagetool6">
-            <primary sortas="b-kpackagetool6">kpackagetool6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kreadconfig6">
-        <term><command>kreadconfig6</command></term>
-        <listitem>
-          <para>
-            is a command line tool to retrieve values from KDE
-            configuration files
-          </para>
-          <indexterm zone="kf6-frameworks kreadconfig6">
-            <primary sortas="b-kreadconfig6">kreadconfig6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kshell6">
-        <term><command>kshell6</command></term>
-        <listitem>
-          <para>
-            start applications via kdeinit
-          </para>
-          <indexterm zone="kf6-frameworks kshell6">
-            <primary sortas="b-kshell6">kshell6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktelnetservice6">
-        <term><command>ktelnetservice6</command></term>
-        <listitem>
-          <para>
-            is a telnet service
-          </para>
-          <indexterm zone="kf6-frameworks ktelnetservice6">
-            <primary sortas="b-ktelnetservice6">ktelnetservice6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktrash6">
-        <term><command>ktrash6</command></term>
-        <listitem>
-          <para>
-            is a helper program to handle the KDE trash can
-          </para>
-          <indexterm zone="kf6-frameworks ktrash6">
-            <primary sortas="b-ktrash6">ktrash6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwalletd6">
-        <term><command>kwalletd6</command></term>
-        <listitem>
-          <para>
-           is the wallet manager daemon
-          </para>
-          <indexterm zone="kf6-frameworks kwalletd6">
-            <primary sortas="b-kwalletd6">kwalletd6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwriteconfig6">
-        <term><command>kwriteconfig6</command></term>
-        <listitem>
-          <para>
-            is a command line tool to write values in KDE
-            configuration files
-          </para>
-          <indexterm zone="kf6-frameworks kwriteconfig6">
-            <primary sortas="b-kwriteconfig6">kwriteconfig6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="meinproc6">
-        <term><command>meinproc6</command></term>
-        <listitem>
-          <para>
-            converts DocBook files to HTML
-          </para>
-          <indexterm zone="kf6-frameworks meinproc6">
-            <primary sortas="b-meinproc6">meinproc6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="plasmapkg2">
-        <term><command>plasmapkg2</command></term>
-        <listitem>
-          <para>
-            is a tool to install, list, remove Plasma packages
-          </para>
-          <indexterm zone="kf6-frameworks plasmapkg2">
-            <primary sortas="b-plasmapkg2">plasmapkg2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preparetips6">
-        <term><command>preparetips6</command></term>
-        <listitem>
-          <para>
-            is a script to extract the text from a tips file
-          </para>
-          <indexterm zone="kf6-frameworks preparetips6">
-            <primary sortas="b-preparetips6">preparetips6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="solid-hardware6">
-        <term><command>solid-hardware6</command></term>
-        <listitem>
-          <para>
-            is a command line tool to investigate available devices
-         </para>
-          <indexterm zone="kf6-frameworks solid-hardware6">
-            <primary sortas="b-solid-hardware6">solid-hardware6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-   </variablelist>
-
-  </sect2>
-
-</sect1>
Index: e/kf5/kf6-intro.xml
===================================================================
--- kde/kf5/kf6-intro.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,240 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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 kf6-download-http "&kf6-download-http;">
-  <!ENTITY kf6-download-ftp  " ">
-  <!ENTITY kf6-md5sum        "See Below">
-  <!ENTITY kf6-size          "30 MB">
-  <!ENTITY kf6-buildsize     "11.7 MB">
-  <!ENTITY kf6-time          "0.4 SBU">
-]>
-
-<sect1 id="kf6-intro" xreflabel="Introduction to KF6">
-  <?dbhtml filename="kf6-intro.html"?>
-
-
-  <title>KDE Frameworks 6 Pre-installation Configuration</title>
-
-  <indexterm zone="kf6-intro">
-     <primary sortas="g-kf6">KDE Frameworks Introduction</primary>
-  </indexterm>
-
-  <para>
-    KF6 can be installed in <filename class="directory">/usr</filename> or
-    <filename class="directory">/opt/kf6</filename>. The BLFS editors
-    recommend the latter in the BLFS environment.
-  </para>
-
-  <sect2>
-    <title>Installing in /usr</title>
-
-    <para>
-      One option is to install <application>KDE Frameworks</application>
-      into the <filename class="directory">/usr</filename> hierarchy.
-      This creates a simpler setup but makes it more difficult to try
-      multiple versions of <application>KDE Frameworks</application>.
-    </para>
-
-<screen><userinput>export KF6_PREFIX=/usr</userinput></screen>
-
-    <para>
-      It is a good idea to add the following variables to your
-      system or personal profiles:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/qt6.sh &lt;&lt; "EOF"
-<literal># Begin kf6 extension for /etc/profile.d/qt6.sh
-
-pathappend /usr/lib/plugins        QT_PLUGIN_PATH
-pathappend $QT6DIR/lib/plugins     QT_PLUGIN_PATH
-
-pathappend /usr/lib/qt6/qml        QML2_IMPORT_PATH
-pathappend $QT6DIR/lib/qml         QML2_IMPORT_PATH
-
-# End extension for /etc/profile.d/qt6.sh</literal>
-EOF
-
-cat &gt; /etc/profile.d/kf6.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/kf6.sh
-
-export KF6_PREFIX=/usr
-
-# End /etc/profile.d/kf6.sh</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>
-        If <application>qt6</application> was installed in <filename
-        class="directory">/usr</filename>, the <filename
-        class="directory">$QT6DIR/lib/</filename> portions of the above paths
-        may need to be changed to <filename
-        class="directory">$QT6DIR/lib/qt6/</filename>.
-      </para>
-    </note>
-
-    <para>
-      Additionally, if <xref linkend="sudo"/> is installed, these variables
-      should be available to the super user. Execute the following commands as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT_PLUGIN_PATH
-Defaults env_keep += QML2_IMPORT_PATH</literal>
-EOF
-
-cat &gt;&gt; /etc/sudoers.d/kde &lt;&lt; "EOF"
-<literal>Defaults env_keep += KF6_PREFIX</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-    <title>Installing in /opt</title>
-
-    <para>
-      A method of building multiple versions installs
-      <application>KDE Frameworks</application> in the
-      <filename class="directory">/opt</filename> hierarchy:
-    </para>
-
-<screen><userinput>export KF6_PREFIX=/opt/kf6</userinput></screen>
-
-    <para>
-      If you are not installing <application>KDE Frameworks</application>
-      in <filename class="directory">/usr</filename>, you will need to
-      make some additional configuration changes. Best practice is to add
-      those to your system or personal profile:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/kf6.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/kf6.sh
-
-export KF6_PREFIX=/opt/kf6
-
-pathappend $KF6_PREFIX/bin              PATH
-pathappend $KF6_PREFIX/lib/pkgconfig    PKG_CONFIG_PATH
-
-pathappend $KF6_PREFIX/etc/xdg          XDG_CONFIG_DIRS
-pathappend $KF6_PREFIX/share            XDG_DATA_DIRS
-
-pathappend $KF6_PREFIX/lib/plugins      QT_PLUGIN_PATH
-pathappend $KF6_PREFIX/lib/plugins/kcms QT_PLUGIN_PATH
-
-pathappend $KF6_PREFIX/lib/qml          QML2_IMPORT_PATH
-
-pathappend $KF6_PREFIX/lib/python&python3-majorver;/site-packages PYTHONPATH
-
-pathappend $KF6_PREFIX/include          CPLUS_INCLUDE_PATH
-# End /etc/profile.d/kf6.sh</literal>
-EOF
-
-cat &gt;&gt; /etc/profile.d/qt6.sh &lt;&lt; "EOF"
-<literal># Begin Qt6 changes for KF6
-
-pathappend /usr/lib/plugins            QT_PLUGIN_PATH
-pathappend $QT6DIR/plugins             QT_PLUGIN_PATH
-pathappend $QT6DIR/qml                 QML2_IMPORT_PATH
-
-# End Qt6 changes for KF6</literal>
-EOF</userinput></screen>
-
-    <para>
-      Expand your <filename>/etc/ld.so.conf</filename> file:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin KF6 addition
-
-/opt/kf6/lib
-
-# End KF6 addition</literal>
-EOF</userinput></screen>
-
-    <indexterm zone="kf6-intro">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para revision="sysv">
-      Several <application>KDE Frameworks</application> and
-      <application>Plasma</application> packages install
-      files into <application>D-Bus</application> and
-      <application>Polkit</application> directories. When installing
-      <application>KDE Frameworks</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.
-      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           $KF6_PREFIX/{etc,share} &amp;&amp;
-ln -sfv /etc/dbus-1         $KF6_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF6_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF6_PREFIX/share</userinput></screen>
-
-    <para revision="systemd">
-      Several <application>KDE Frameworks</application> and
-      <application>KDE Plasma</application> packages install
-      files into <application>D-Bus</application>,
-      <application>Polkit</application>, and
-      <application>systemd</application> directories. When installing
-      <application>KDE 6</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           $KF6_PREFIX/{etc,share} &amp;&amp;
-ln -sfv /etc/dbus-1         $KF6_PREFIX/etc         &amp;&amp;
-ln -sfv /usr/share/dbus-1   $KF6_PREFIX/share       &amp;&amp;
-ln -sfv /usr/share/polkit-1 $KF6_PREFIX/share       &amp;&amp;
-install -v -dm755           $KF6_PREFIX/lib         &amp;&amp;
-ln -sfv /usr/lib/systemd    $KF6_PREFIX/lib</userinput></screen>
-
-    <para>
-      Some packages may also install icons from the "hicolor" icon set. Since that
-      icon set is used by many packages, it is a good idea to create a
-      symlink to the one in <filename class="directory">/usr/share</filename>
-      to avoid having multiple installations of <xref linkend="hicolor-icon-theme"/>.
-      Run the following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755                $KF6_PREFIX/share/icons &amp;&amp;
-ln -sfv /usr/share/icons/hicolor $KF6_PREFIX/share/icons</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/kf6</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/kf6-&kf6-version;</filename>. After installing
-        <application>KDE Frameworks</application>, you may rename the directory
-        and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mv /opt/kf6{,-&kf6-version;}
-ln -sfv kf6-&kf6-version; /opt/kf6</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>KDE Frameworks</application>. To do that, just remove
-        the symlink and use <filename class="directory">/opt/kf6</filename>
-        as the prefix again. Which version of
-        <application>KDE Frameworks</application> you use depends only on
-        where the symlink points. No other reconfiguration will be needed.
-      </para>
-    </tip>
-
-  </sect2>
-
-</sect1>
Index: kde/other/other.xml
===================================================================
--- kde/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ kde/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<chapter id="kde-other">
+<?dbhtml filename="other.html" dir="kde"?>
+<title>Other KDE Packages</title>
+
+&kdoc;
+&kde-bindings;
+&kde-sdk;
+&kdevelop;
+&kdm;
+
+</chapter>
Index: e/phonon-backend-vlc.xml
===================================================================
--- kde/phonon-backend-vlc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "2a27b5d249f97a15040481008fb16e1b">
-  <!ENTITY phonon-backend-vlc-size          "72 KB">
-  <!ENTITY phonon-backend-vlc-buildsize     "6.6 MB">
-  <!ENTITY phonon-backend-vlc-time          "0.2 SBU">
-]>
-
-<sect1 id="phonon-backend-vlc" xreflabel="phonon-backend-vlc-&phonon-backend-vlc-version;">
-  <?dbhtml filename="phonon-backend-vlc.html"?>
-
-
-  <title>Phonon-backend-vlc-&phonon-backend-vlc-version;</title>
-
-  <indexterm zone="phonon-backend-vlc">
-    <primary sortas="a-phonon-backend-vlc">phonon-backend-vlc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Phonon-backend-vlc</title>
-
-    <para>
-      This package provides a <application>Phonon</application> backend
-      which utilizes the <application>VLC</application> media framework.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&phonon-backend-vlc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&phonon-backend-vlc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &phonon-backend-vlc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &phonon-backend-vlc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &phonon-backend-vlc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &phonon-backend-vlc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Phonon-backend-vlc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="phonon"/> and
-    <xref linkend="vlc"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Phonon-backend-vlc</title>
-
-    <para>
-      Install <application>Phonon-backend-vlc</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  \
-      -DPHONON_BUILD_QT5=OFF      \
-      .. &amp;&amp;
-make</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>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply higher level of compiler optimizations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>phonon_vlc_qt5.so</seg>
-        <seg>/usr/lib/plugins/phonon4qt5_backend</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-phonon">
-        <term><command>phonon</command></term>
-        <listitem>
-          <para>
-            placeholder
-          </para>
-          <indexterm zone="a-phonon phonon">
-            <primary sortas="b-phonon">phonon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: e/phonon.xml
===================================================================
--- kde/phonon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 phonon-download-http "&kde-download-http;phonon/&phonon-version;/phonon-&phonon-version;.tar.xz">
-  <!ENTITY phonon-download-ftp  " ">
-  <!ENTITY phonon-md5sum        "e80e9c73967080016bdb3c0ee514ceab">
-  <!ENTITY phonon-size          "400 KB">
-  <!ENTITY phonon-buildsize     "23 MB">
-  <!ENTITY phonon-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="phonon" xreflabel="phonon-&phonon-version;">
-  <?dbhtml filename="phonon.html"?>
-
-
-  <title>Phonon-&phonon-version;</title>
-
-  <indexterm zone="phonon">
-    <primary sortas="a-phonon">phonon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Phonon</title>
-
-    <para>
-      <application>Phonon</application> is the multimedia API for KDE.
-      It replaces the old <application>aRts</application> package.
-      Phonon needs the VLC backend.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&phonon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&phonon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &phonon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &phonon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &phonon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &phonon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Phonon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="qt6"/>
-    </para>
-
-    <para role="required">
-      <xref linkend="phonon-backend-vlc" role="runtime"/> needs to be
-      installed afterwards for multimedia operation in
-      <application>KDE</application>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="pulseaudio"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Phonon</title>
-    <para>
-      Install <application>Phonon</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  \
-      -DPHONON_BUILD_QT5=OFF      \
-      -Wno-dev .. &amp;&amp;
-make</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>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DPHONON_BUILD_QT6=OFF</parameter>: By default both the 
-      Qt5 and Qt6 versions of this package are built.  We currently just 
-      want the Qt5 version, since BLFS does not carry Qt6 yet.
-    </para>
-<!--
-    <para>
-      <parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE</parameter>:
-      This switch ensures that the plugins and mkspecs files get installed in
-      the correct location.
-    </para>
-
-    <para>
-     <parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is used to
-     ensure that Qt5 version of the library is built even if Qt4 is present.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          phononsettings
-        </seg>
-        <seg>
-          libphonon4qt5.so and
-          libphonon4qt5experimental.so
-        </seg>
-        <seg>
-          /usr/include/phonon4qt5,
-          /usr/lib/cmake/phonon4qt5, and
-          /usr/lib/plugins/designer
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: e/plasma-wayland-protocols.xml
===================================================================
--- kde/plasma-wayland-protocols.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "7755dcac14e90068a7e26922c3a4a296">
-  <!ENTITY plasma-wayland-protocols-size          "44 KB">
-  <!ENTITY plasma-wayland-protocols-buildsize     "740 KB">
-  <!ENTITY plasma-wayland-protocols-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="plasma-wayland-protocols" xreflabel="plasma-wayland-protocols-&plasma-wayland-protocols-version;">
-  <?dbhtml filename="plasma-wayland-protocols.html"?>
-
-
-  <title>Plasma-wayland-protocols-&plasma-wayland-protocols-version;</title>
-
-  <indexterm zone="plasma-wayland-protocols">
-    <primary sortas="a-plasma-wayland-protocols">plasma-wayland-protocols</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Plasma-wayland-protocols</title>
-
-    <para>
-      This package provides a custom set of protocol definitions for KDE.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&plasma-wayland-protocols-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&plasma-wayland-protocols-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &plasma-wayland-protocols-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &plasma-wayland-protocols-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &plasma-wayland-protocols-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &plasma-wayland-protocols-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Plasma-wayland-protocols Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="extra-cmake-modules"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Plasma-wayland-protocols</title>
-
-    <para>
-      Install <application>Plasma-wayland-protocols</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>/usr/share/plasma-wayland-protocols and
-             /usr/lib/cmake/PlasmaWaylandProtocols</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: e/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,545 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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 plasma-download-http "https://download.kde.org/stable/plasma/&plasma-version;">
-  <!ENTITY plasma-download-ftp  " ">
-  <!ENTITY plasma-md5sum        "See Below">
-  <!ENTITY plasma-size          "242 MB">
-  <!ENTITY plasma-buildsize     "1.9 GB (501 MB installed)">
-  <!ENTITY plasma-time          "17 SBU (using parallelism=8)">
-]>
-
-<sect1 id="plasma-build" xreflabel="Plasma-&plasma-version;">
-  <?dbhtml filename="plasma-all.html"?>
-
-
-  <title>Building Plasma</title>
-
-  <indexterm zone="plasma-build">
-     <primary sortas="a-kde-plasma">KDE Plasma</primary>
-  </indexterm>
-
-  <para>
-    KDE Plasma is a collection of packages based on top of KDE Frameworks
-    and QML. They implement the KDE Display Environment (Plasma).
-  </para>
-
-  &lfs121_checked;
-
-  <para>
-    The instructions below build all of the Plasma packages in one
-    step by using a bash script.
-  </para>
-
-  <bridgehead renderas="sect3">Package Information</bridgehead>
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para>
-        Download (HTTP): <ulink url="&plasma-download-http;"/>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download (FTP): <ulink url="&plasma-download-ftp;"/>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download MD5 sum: &plasma-md5sum;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Download size: &plasma-size;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated disk space required: &plasma-buildsize;
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Estimated build time: &plasma-time;
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">Plasma Dependencies</bridgehead>
-
-  <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required">
-    <!--<xref linkend="gtk2"/>, Does not seem to be needed any more -->
-    <xref linkend="boost"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="kf6-frameworks"/>,
-    <xref linkend="kirigami-addons"/>,
-    <xref linkend="libdisplay-info"/>,
-    <xref linkend="libpwquality"/>,
-    <xref linkend="libqalculate"/>,
-    <xref linkend="libnl"/>,
-    <xref linkend="libxcvt"/>,
-    <xref linkend="libxkbcommon"/>,
-    <xref linkend="mesa"/> built with <xref linkend="wayland"/>,
-    <xref linkend="pipewire"/>,
-    <xref linkend="pulseaudio"/>,
-    <xref linkend="qca"/>,
-    <xref linkend="qcoro"/>,
-    <xref linkend="sassc"/>,
-    <xref linkend="taglib"/>, 
-    <xref linkend="xdotool"/>, and 
-    <xref linkend="xorg-evdev-driver"/>
-  </para>
-
-  <bridgehead renderas="sect4">Recommended</bridgehead>
-  <para role="recommended">
-    <xref linkend="gsettings-desktop-schemas"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="libinput"/>,
-    <xref linkend="libpcap"/>,
-    <xref linkend="linux-pam"/>,
-    <xref linkend="lm_sensors"/>,
-    <xref linkend="oxygen-icons"/>, 
-    <xref linkend="pciutils"/>, 
-    <xref linkend="power-profiles-daemon"/>, and 
-    the following Python modules: 
-      <xref linkend="psutil"/>,
-      <xref linkend="pygdbmi"/>,
-      <xref linkend="sentry-sdk"/>, 
-      <xref linkend="urllib3"/> (if they are not installed, they will be
-      downloaded and installed by the drkonqi build procedure)
-  </para>
-
-  <bridgehead renderas="sect4">Recommended (runtime)</bridgehead>
-  <para role="recommended">
-    <xref role="runtime" linkend="accountsservice"/>,
-    <xref role="runtime" linkend="breeze-icons"/>,
-    <xref role="runtime" linkend="smartmontools"/>,
-    <xref role="runtime" linkend="xdg-desktop-portal"/>, and
-    <xref role="runtime" linkend="xwayland"/>
-  </para>
-
-  <bridgehead renderas="sect4">Optional</bridgehead>
-  <para role="optional">
-    <xref linkend="appstream"/> (build with -qt=true),
-    <xref linkend="glu"/>,
-    <xref linkend='ibus'/>,
-    <xref linkend='qtwebengine'/>,
-    <xref linkend="xorg-synaptics-driver"/>,
-    <ulink url="https://www.kdevelop.org/">KDevPlatform</ulink>,
-    <ulink url="https://gpsd.gitlab.io/gpsd/">libgps</ulink>,
-    <ulink url="https://github.com/libhybris/libhybris">libhybris</ulink>,
-    <ulink url="https://www.freedesktop.org/software/PackageKit/releases/">packagekit-qt</ulink>,
-    <ulink url="https://launchpad.net/qapt">Qapt</ulink>,
-    <ulink url="https://github.com/osiam/osiam">SCIM</ulink>, and
-    <ulink url="http://www.dest-unreach.org/socat/">socat</ulink> (for pam_kwallet)
-  </para>
-
-  <sect2>
-    <title>Downloading KDE Plasma</title>
-
-    <para>
-      The easiest way to get the KDE Plasma packages is to use a single
-      <command>wget</command> to fetch them all at once:
-    </para>
-
-<screen><userinput>url=https://download.kde.org/stable/plasma/&plasma-version;/
-wget -r -nH -nd -A '*.xz' -np $url</userinput>
-<literal>
-The options used here are:
-  -r            recurse through child directories
-  -nH           disable generation of host-prefixed directories
-  -nd           do not create a hierarchy of directories
-  -A '*.xz'     just get the *.xz files
-  -np           don't get parent directories</literal></screen>
-
-   </sect2>
-
-  <sect2>
-    <title>Setting Package Order</title>
-
-    <para>
-      The order of building files is important due to internal dependencies.
-      Create the list of files in the proper order as follows:
-    </para>
-
-<screen><userinput>cat &gt; plasma-&plasma-version;.md5 &lt;&lt; "EOF"
-<literal>186e3608e5a9b4695db6f215b042b262  kdecoration-6.0.3.tar.xz
-1f1d12d08bcf9309ab1c49641bb8eaf3  libkscreen-6.0.3.tar.xz
-48b300ca4490da873f652596ef7f1444  libksysguard-6.0.3.tar.xz
-68307af2cbd738f8222d4899c44e95f3  breeze-6.0.3.tar.xz
-ceab9d1b168592840f12ab7b301cee85  breeze-gtk-6.0.3.tar.xz
-c1206b4c182b3a01614d0a6ade96e76c  layer-shell-qt-6.0.3.tar.xz
-eac6aebafbb8c2cbef5a121d5c0afb10  plasma-activities-6.0.3.tar.xz
-2e71b9fb2f41bf2d63dcef0dc5da8fcd  libplasma-6.0.3.tar.xz
-209a5df56d6adf25edc58737e7c77ea7  kscreenlocker-6.0.3.tar.xz
-109d6dcb1b0fab015bda4c3d508baf1f  oxygen-6.0.3.tar.xz
-637e400d06550a3ef3b872f8011470cd  kinfocenter-6.0.3.tar.xz
-021e8ab1bca725301425f946db4b74c6  kglobalacceld-6.0.3.tar.xz
-7c2273b104ff7f83930d3e6d92b6c458  kwayland-6.0.3.tar.xz
-d04c8ab91d6befe8d51bf1f4b90eb733  kwin-6.0.3.1.tar.xz
-#5e6e0275809aabbd05bf703f0e1dfd91  kwin-6.0.3.tar.xz
-28cb89b0a2c79e65b49a7396d2e156e7  plasma5support-6.0.3.tar.xz
-329a0134a743d45a9f85c0f09763fa3f  plasma-activities-stats-6.0.3.tar.xz
-c64d5a3b3a2a38e1efaaa18ec0ed0f15  kpipewire-6.0.3.tar.xz
-635c8a687f95b77da538dfa67b64cf11  plasma-workspace-6.0.3.tar.xz
-fc1f1dbff3071fb70fde8f2b402f2cad  plasma-disks-6.0.3.tar.xz
-be2620c0ce9947023c6fda97f9336a2b  bluedevil-6.0.3.tar.xz
-e3fffb113826cddf572f1a63a4803285  kde-gtk-config-6.0.3.tar.xz
-d3b5bab22961eb000ffca29ed31e853b  kmenuedit-6.0.3.tar.xz
-8e1c31ac47e3f5751fa0415c77ffdb93  kscreen-6.0.3.tar.xz
-0918f152f0049c8d2f3f96252d40b5d4  kwallet-pam-6.0.3.tar.xz
-96a0755c99e66a0f5cc53d6f4c384493  kwrited-6.0.3.tar.xz
-9ba1923b7fec42694d930e973894542f  milou-6.0.3.tar.xz
-ed40c562d6b4a1b97271bb7d0cfc9710  plasma-nm-6.0.3.tar.xz
-7ebe34a38f77fe3547b1f2614803f8ce  plasma-pa-6.0.3.tar.xz
-ce37763cc6b1763cdf6c24cd5decd0d9  plasma-workspace-wallpapers-6.0.3.tar.xz
-63b3ff934d9eb5fcccca27166dec78af  polkit-kde-agent-1-6.0.3.tar.xz
-9ea75163cc91e7e952285fc212745f4f  powerdevil-6.0.3.tar.xz
-12923d808bf6f6d9b3a807e72e1941ba  plasma-desktop-6.0.3.tar.xz
-41e74069e7487d72feb91b33de0a0c13  kgamma-6.0.3.tar.xz
-38b6bf5620962febb86dd526aa1c4788  ksshaskpass-6.0.3.tar.xz
-#6c4ceff65c64495bbefdac1f163a2ca9  plasma-sdk-6.0.3.tar.xz
-d8ff0a33561736bd81d2f0cf26b80eb9  sddm-kcm-6.0.3.tar.xz
-#2f8485cee3dc80bb07fead85571ba8ad  discover-6.0.3.tar.xz
-#68daa2b8dbb2e9f3ace51bcbaa2632c1  breeze-grub-6.0.3.tar.xz
-#83885a3eba356552f094874192c31c28  breeze-plymouth-6.0.3.tar.xz
-52d84e5435c807851e91b31e724b0c2a  kactivitymanagerd-6.0.3.tar.xz
-4698864e111f4ca549364fe4fdf09ad3  plasma-integration-6.0.3.tar.xz
-#f8a08001b7a6f5865bceda7a28515308  plymouth-kcm-6.0.3.tar.xz
-699405b00fd157de30a3a0cbd93703a0  xdg-desktop-portal-kde-6.0.3.tar.xz
-497e9cd3c74e79c1401fbacdb5b71513  drkonqi-6.0.3.tar.xz
-9b8d1a55ea8bbddb952bd9736155fbaa  plasma-vault-6.0.3.tar.xz
-#069994af9dfd7b42c9408a8cd0fc49b3  plasma-browser-integration-6.0.3.tar.xz
-c2f06a0b32bc4e17441876c2c6bfa6ad  kde-cli-tools-6.0.3.tar.xz
-4af7e9b64eaf7e6055a94988bfe0b0e7  systemsettings-6.0.3.tar.xz
-ed18f319cd1e8abc7b6a220983e89dfd  plasma-thunderbolt-6.0.3.tar.xz
-#6653173b1b429bd95b9a23a5d9821d5a  plasma-nano-6.0.3.tar.xz
-#3e9ad4e8cd7f17c9ec9c27343be81669  plasma-mobile-6.0.3.tar.xz
-#1138655f05d7ad84edf55683c5b6359b  plasma-mobile-6.0.3.1.tar.xz
-13f3bd14874ddccbf19a454be09df781  plasma-firewall-6.0.3.tar.xz
-8ae9665bb844ab84a6cbaa3059c64f50  plasma-systemmonitor-6.0.3.tar.xz
-ae65db4bac3bac3cf58ad4198c0b522a  qqc2-breeze-style-6.0.3.tar.xz
-3449bff47dd931b1da6e182512034fbc  ksystemstats-6.0.3.tar.xz
-787f7051bcc2e1f66dca37bd2326d75e  oxygen-sounds-6.0.3.tar.xz
-761ce4d784b8800bb8a51f0b3f8b042d  kdeplasma-addons-6.0.3.tar.xz
-#d1513338480b042380a58aed49c1fac9  flatpak-kcm-6.0.3.tar.xz
-512b5cc6ef9cbf22784d97b97dd45632  plasma-welcome-6.0.3.tar.xz
-62c2fa68a55dc36ac182837a8accc892  ocean-sound-theme-6.0.3.tar.xz
-d407dff0646743d613d862d92c118005  print-manager-6.0.3.tar.xz
-#2766783e2a2f2e966bab54eddaf1ce59  wacomtablet-6.0.3.tar.xz
-#d3c59bcf64a487b17e89fbc9ec34a150  kwayland-integration-6.0.3.tar.xz</literal>
-EOF</userinput></screen>
-
-    <note>
-      <title>About Commented Out Packages</title>
-      <para>
-        The breeze-grub, breeze-plymouth, and plymouth-kcm packages above are
-        all for customized support of <ulink
-            url="https://www.freedesktop.org/wiki/Software/Plymouth/"
-          >Plymouth</ulink>
-        which is designed to be run within an initial ram disk during boot (see
-        <xref linkend="initramfs"/>).
-
-        The plasma-sdk package is optional and used for software development.
-        
-        The plasma-nano package is used for embedded systems.
-
-        The plasma-mobile package provides phone functionality for Plasma.
-        
-        The discover package requires <xref linkend="appstream"/> to be built
-        with the -Dqt=true switch.
-
-        The flatpack-kcm package is for managing support of flatpack applications.
-
-        The plasma-browser-integration package is only used by plasma-meta which is
-        not installed by BLFS.
-
-        The wacomtablet application requires plasma5 support.
-
-        Two packages, kwayland-integration-6.0.3 and kwin-6.0.3. have been 
-        replaces by 6.0.3.1 versions.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Plasma</title>
-
-    &as_root;
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Install all of the packages by running the following
-      commands:
-    </para>
-
-<screen><userinput>while read -r line; do
-
-    # Get the file name, ignoring comments and blank lines
-    if $(echo $line | grep -E -q '^ *$|^#' ); then continue; fi
-    file=$(echo $line | cut -d" " -f2)
-
-    pkg=$(echo $file|sed 's|^.*/||')          # Remove directory
-    packagedir=$(echo $pkg|sed 's|\.tar.*||') # Package directory
-
-    tar -xf $file
-    pushd $packagedir
-<!--
-       # Fix some build issues when generating some configuration files
-       case $name in
-         plasma-workspace)
-           sed -i '/set.HAVE_X11/a set(X11_FOUND 1)' CMakeLists.txt
-         ;;
-
-         khotkeys)
-           sed -i '/X11Extras/a set(X11_FOUND 1)' CMakeLists.txt
-         ;;
-
-         plasma-desktop)
-           sed -i '/X11.h)/i set(X11_FOUND 1)' CMakeLists.txt
-         ;;
-       esac
--->
-       mkdir build
-       cd    build
-
-       cmake -D CMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-             -D CMAKE_INSTALL_LIBEXECDIR=libexec \
-             -D CMAKE_BUILD_TYPE=Release         \
-             -D BUILD_QT5=OFF                    \
-             -D BUILD_TESTING=OFF                \
-             -W no-dev ..  &amp;&amp;
-
-        make
-        as_root make install
-    popd
-
-<!-- some packages end up with files owned by root in $packagedir,
-     so use as_root for removing -->
-    as_root rm -rf $packagedir
-    as_root /sbin/ldconfig
-
-done &lt; plasma-&plasma-version;.md5
-
-exit</userinput></screen>
-
-    <para>
-      If you did not set <envar>$KF6_PREFIX</envar> to
-      <filename>/usr</filename>, create symlinks to allow display managers to
-      find <application>Plasma</application>, and to allow the XDG Desktop
-      Portal to be detected. As the &root; user:
-    </para>
-
-<screen><userinput># Setup xsessions (X11 sessions)
-install -dvm 755 /usr/share/xsessions
-cd /usr/share/xsessions
-
-[ -e plasma.desktop ] ||
-ln -sfv $KF6_PREFIX/share/xsessions/plasmax11.desktop 
-
-# Setup wayland-sessions 
-install -dvm 755 /usr/share/wayland-sessions
-cd /usr/share/wayland-sessions
-
-[ -e plasmawayland.desktop ] ||
-ln -sfv $KF6_PREFIX/share/wayland-sessions/plasma.desktop
-<!-- work around a bug in xdg-desktop-portal-->
-# Setup xdg-desktop-portal
-install -dvm 755 /usr/share/xdg-desktop-portal
-cd /usr/share/xdg-desktop-portal 
-
-[ -e kde-portals.conf ] ||
-ln -sfv $KF6_PREFIX/share/xdg-desktop-portal/kde-portals.conf
-
-# Setup kde portal
-install -dvm 755 /usr/share/xdg-desktop-portal/portals
-cd /usr/share/xdg-desktop-portal/portals
-
-[ -e kde.portal ] ||
-ln -sfv $KF6_PREFIX/share/xdg-desktop-portal/portals/kde.portal</userinput></screen>
-
-    <para revision="sysv">
-      Useless systemd units have been installed in
-      <filename class="directory">$KF6_PREFIX/lib</filename>. Remove
-      them now (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"
-        revision="sysv"><userinput>rm -rf $KF6_PREFIX/lib/systemd</userinput></screen>
-
-  </sect2>
-<!--
-    <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -sfv ../code/$(basename $j) $(dirname $j)/../ui/</command>:
-      Create symbolic links so qml files can find needed javascript modules.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="configuration">
-    <title>Configuring Plasma</title>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If you built Plasma with the recommended <application>Linux
-        PAM</application> support, create necessary configuration files by
-        running the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/kde &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/kde
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/kde</literal>
-EOF
-
-cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/kde-np
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/kde-np</literal>
-EOF
-
-cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/kscreensaver
-
-auth    include system-auth
-account include system-account
-
-# End /etc/pam.d/kscreensaver</literal>
-EOF</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="starting">
-    <title>Starting Plasma</title>
-
-    <para revision="sysv">
-      You can start <application>Plasma</application> from runlevel 3, using
-      <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="lightdm"/>.
-    </para>
-
-    <para revision="systemd">
-      You can start <application>Plasma</application> from a TTY, using
-      <xref linkend="xinit"/><!--, or from a graphical display manager, such as
-      <xref linkend="sddm"/>-->.
-    </para>
-
-    <para>
-      To start <application>Plasma</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>dbus-launch --exit-with-x11 $KF6_PREFIX/bin/startplasma-x11</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      The X session starts on the first unused virtual terminal, normally vt7.
-      You can switch to another vt<emphasis>n</emphasis> simultaneously
-      pressing the keys Ctrl-Alt-F<emphasis>n</emphasis>
-      (<emphasis>n</emphasis>=1, 2, ...).  To switch back to the X session,
-      normally started at vt7, use Ctrl-Alt-F7. The vt where the command
-      <command>startx</command> was executed will display many messages,
-      including X starting messages, applications automatically started with
-      the session, and eventually, some warning and error messages. You may
-      prefer to redirect those messages to a log file, which not only will keep
-      the initial vt uncluttered, but can also be used for debugging purposes. This
-      can be done starting X with:
-    </para>
-
-    <screen role="nodump"><userinput>startx &amp;&gt; ~/x-session-errors</userinput></screen>
-
-    <para>
-      When shutting down or rebooting, the shutdown messages appear on the vt
-      where X was running. If you wish to see those messages, simultaneously
-      press keys Alt-F7 (assuming that X was running on vt7).
-    </para>
-<!-- Start plasma wayland with 
-
-/opt/kf6/lib/libexec/plasma-dbus-run-session-if-needed /opt/kf6/bin/startplasma-wayland
-
-Investigate why it's in /opt/kf6/lib/libexec and not just in /opt/kf6/libexec
-
-
-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
-    display manager such as <xref linkend="lightdm"/>, there will be two entries
-    for <application>Plasma</application>, one for use with
-    <application>Xorg</application>, and another for
-    <application>Wayland</application>. Modify the
-    <application>Xorg</application> entry with the following command, as the
-    <systemitem class="username">root</systemitem> user, so that you can
-    differentiate between the two:</para>
-
-<screen role="root"><userinput>sed '/^Name=/s/Plasma/Plasma on Xorg/' -i /usr/share/xsessions/plasma.desktop</userinput></screen>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-           There are too many plasma programs (over 50 in /opt/kf6/bin) to list
-           separately here.
-        </seg>
-        <seg>
-           There are too many plasma libraries (over 250 in /opt/kf6/lib) to list
-           separately here.
-        </seg>
-        <seg>
-           There are too many plasma directories (over 2700 in /opt/kf6) to
-           list separately here.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: e/plasma5/plasma5.xml
===================================================================
--- kde/plasma5/plasma5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="plasma">
-  <?dbhtml filename="plasma.html"?>
-
-  <title>KDE Plasma</title>
-
-  <para>
-    KDE Plasma is a desktop environment built using KDE Frameworks and
-    QML which runs on top of a fully hardware accelerated graphics stack using
-    Qt, QtQuick, and an OpenGL(-ES) scenegraph.
-  </para>
-
-  <para>
-    No additional configuration is needed before building the KDE Plasma
-    because it uses the same configuration that KDE Frameworks uses.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma-all.xml"/>
-
-</chapter>
Index: e/polkit-qt.xml
===================================================================
--- kde/polkit-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "6f23bc987ea9c49b4ef21983b9d1dc15">
-  <!ENTITY polkit-qt-size          "60 KB">
-  <!ENTITY polkit-qt-buildsize     "3.8 MB">
-  <!ENTITY polkit-qt-time          "0.1 SBU">
-]>
-
-<sect1 id="polkit-qt" xreflabel="polkit-qt-&polkit-qt-version;">
-  <?dbhtml filename="polkit-qt.html"?>
-
-
-  <title>Polkit-Qt-&polkit-qt-version;</title>
-
-  <indexterm zone="polkit-qt">
-    <primary sortas="a-polkit-qt">polkit-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Polkit-Qt</title>
-
-    <para>
-      <application>Polkit-Qt</application> provides an API to PolicyKit in
-      the Qt environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&polkit-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&polkit-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &polkit-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &polkit-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &polkit-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &polkit-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Polkit-Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Polkit-Qt</title>
-
-    <para>
-      Install <application>Polkit-Qt</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  \
-      -DQT_MAJOR_VERSION=6        \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </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>
-          libpolkit-qt6-agent-1.so,
-          libpolkit-qt6-core-1.so, and
-          libpolkit-qt6-gui-1.so
-        </seg>
-        <seg>
-          /usr/include/polkit-qt6-1 and
-          /usr/lib/cmake/PolkitQt6-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-polkit-qt">
-        <term><command>polkit-qt</command></term>
-        <listitem>
-          <para>
-            placeholder.
-          </para>
-          <indexterm zone="a-polkit-qt polkit-qt">
-            <primary sortas="b-polkit-qt">polkit-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: rnel-config/.gitignore
===================================================================
--- kernel-config/.gitignore	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-__pycache__
-s-kernel-version
Index: rnel-config/Makefile
===================================================================
--- kernel-config/Makefile	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,29 +1,0 @@
-INPUT = $(wildcard */*.toml */*/*.toml */*/*/*.toml)
-OUTPUT = $(patsubst %.toml, ../%-kernel.xml, $(INPUT))
-
-ifeq ($(KERNEL_TREE),)
-$(error "must set KERNEL_TREE=/path/to/kernel/source")
-endif
-
-all: $(OUTPUT) ../introduction/welcome/conventions-kernel.xml
-
-kernel.version: s-kernel-version; @true
-
-.PHONY: s-kernel-version
-s-kernel-version:
-	./kernel_version.py $(KERNEL_TREE) > tmp-kernel.version
-	if ! diff tmp-kernel.version kernel.version ; then           \
-		mv tmp-kernel.version kernel.version;                    \
-	else                                                         \
-		rm tmp-kernel.version;                                   \
-	fi
-	touch s-kernel-version
-
-%-kernel.xml.tmp: %.toml kernel-config.py kernel_version.py kernel.version
-	./kernel-config.py $(KERNEL_TREE) $< > $@
-
-../%-kernel.xml: %-kernel.xml.tmp
-	mv $< $@
-
-../introduction/welcome/conventions-kernel.xml: kernel-config.py testdata/Kconfig testdata/config.toml.example
-	./kernel-config.py testdata testdata/config.toml.example > $@
Index: rnel-config/general/genlib/keyutils-test.toml
===================================================================
--- kernel-config/general/genlib/keyutils-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,25 +1,0 @@
-BIG_KEYS='*'
-KEYS='*'
-KEY_DH_OPERATIONS='*'
-CRYPTO = { value = '*', forced = '*' }
-SYSTEM_TRUSTED_KEYRING='*'
-SECONDARY_TRUSTED_KEYRING='*'
-SYSTEM_BLACKLIST_KEYRING='*'
-ASYMMETRIC_KEY_TYPE='*'
-ASYMMETRIC_PUBLIC_KEY_SUBTYPE='*'
-CRYPTO_RSA='*M'
-CRYPTO_SHA1='*M'
-
-[X509_CERTIFICATE_PARSER]
-value = '*'
-comment = [
-  "If not built into the kernel, [SYSTEM_TRUSTED_KEYRING] won't show up;",
-  "building as a module won't work"
-]
-
-[CRYPTO_LIB_CHACHA20POLY1305]
-value = '*'
-comment = [
-  "If not built into the kernel, [BIG_KEYS] won't show up;",
-  "building as a module won't work"
-]
Index: rnel-config/general/genlib/libusb.toml
===================================================================
--- kernel-config/general/genlib/libusb.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,14 +1,0 @@
-USB_SUPPORT='*'
-USB='*M'
-USB_PCI='*'
-
-USB_EHCI_HCD='*M '
-USB_OHCI_HCD='*M '
-
-[USB_XHCI_HCD]
-value = '*M '
-comment = [
-	'These are most common USB controller drivers for PC-like systems.',
-	'For modern systems often [USB_XHCI_HCD] is the only one needed',
-	'even if the system has USB 2.0 ports'
-]
Index: rnel-config/general/genutils/lsof-test.toml
===================================================================
--- kernel-config/general/genutils/lsof-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-POSIX_MQUEUE = '*'
Index: rnel-config/general/sysutils/autofs-optional.toml
===================================================================
--- kernel-config/general/sysutils/autofs-optional.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-# what are these for ?
-NETWORK_FILESYSTEMS='*'
-NFS_FS='*M'
-CIFS='*M'
Index: rnel-config/general/sysutils/autofs.toml
===================================================================
--- kernel-config/general/sysutils/autofs.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-AUTOFS_FS='*M'
Index: rnel-config/general/sysutils/bluez.toml
===================================================================
--- kernel-config/general/sysutils/bluez.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,42 +1,0 @@
-TIMERFD='*'
-EVENTFD='*'
-
-NET='*'
-BT='*M'
-BT_RFCOMM='*M'
-BT_RFCOMM_TTY='*'
-BT_BNEP='*M'
-BT_BNEP_MC_FILTER='*'
-BT_BNEP_PROTO_FILTER='*'
-BT_HIDP='*M'
-RFKILL='*M'
-
-# Forced by EXT4_FS && BLOCK
-CRYPTO = { value = '*', forced = '*' }
-CRYPTO_USER='*M'
-CRYPTO_AES='*M'
-CRYPTO_CCM='*M'
-CRYPTO_CMAC='*M'
-CRYPTO_USER_API_HASH='*M'
-CRYPTO_USER_API_SKCIPHER='*M'
-CRYPTO_USER_API_AEAD='*M'
-
-BT_BREDR='*'
-BT_HCIBTSDIO='*M '
-BT_HCIUART='*M '
-
-
-[BT_HCIBTUSB]
-value = '*M '
-comment = [
-	"Select the appropriate drivers for your bluetooth hardware.",
-	"There are more vendor-specific drivers not listed here",
-]
-
-[EXPERT]
-value = '* '
-comment = [
-	'If it is disabled, [TIMERFD] and [EVENTFD] will be hidden and',
-	'enabled implicitly.  We DO NOT recommend to enable [EXPERT]',
-	'unless you are really an expert user'
-]
Index: rnel-config/general/sysutils/bubblewrap.toml
===================================================================
--- kernel-config/general/sysutils/bubblewrap.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-# With !EXPERT we cannot unset NAMESPACES
-NAMESPACES = { value = '*', forced = true }
-USER_NS='*'
Index: rnel-config/general/sysutils/elogind-test.toml
===================================================================
--- kernel-config/general/sysutils/elogind-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-# Forced by EXT4_FS && BLOCK
-CRYPTO = { value = '*', forced = '*' }
-CRYPTO_USER = '*M'
-CRYPTO_USER_API_HASH = '*M'
Index: rnel-config/general/sysutils/elogind.toml
===================================================================
--- kernel-config/general/sysutils/elogind.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-INOTIFY_USER = '*'
-# not really forced, but if you select DRM_I915 it will seem "forced"
-TMPFS='*'
-TMPFS_POSIX_ACL='*'
Index: rnel-config/general/sysutils/gpm.toml
===================================================================
--- kernel-config/general/sysutils/gpm.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-INPUT= { value = '*', forced = '*' }
-INPUT_MOUSEDEV='*M'
Index: rnel-config/general/sysutils/lm_sensors.toml
===================================================================
--- kernel-config/general/sysutils/lm_sensors.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,13 +1,0 @@
-HWMON='*M'
-SENSORS_K8TEMP='*M '
-SENSORS_K10TEMP='*M '
-SENSORS_FAM15H_POWER='*M '
-SENSORS_CORETEMP='*M '
-BLK_DEV_NVME='* '
-ACPI='*'
-ACPI_BATTERY='*M '
-ACPI_THERMAL='*M '
-
-[NVME_HWMON]
-value = '* '
-comment = 'Set [HWMON] to <*> (not <M>!) or it will not show up'
Index: rnel-config/general/sysutils/pm-utils.toml
===================================================================
--- kernel-config/general/sysutils/pm-utils.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-SUSPEND='*'
-HIBERNATION='*'
Index: rnel-config/general/sysutils/power-profiles-daemon.toml
===================================================================
--- kernel-config/general/sysutils/power-profiles-daemon.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-# Selected by CPU_SUP_INTEL, which is always y when !CONFIG_EXPERT
-CPU_FREQ = { value = '*', forced = true }
-# If one of X86_INTEL_PSTATE and X86_AMD_PSTATE is selected, it's forced
-# to '*'.  Let's not consider VIA, Transmeta, etc. for now...
-CPU_FREQ_GOV_PERFORMANCE = { value = '*', forced = '*' }
-CPU_FREQ_GOV_POWERSAVE = '*M'
-# Not really forced: if you unset SCHED_MC you may unset this as well
-X86_INTEL_PSTATE = { value = ' *', comment = 'Select if CPU is Intel' }
-X86_AMD_PSTATE = { value = ' *', comment = 'Select if CPU is AMD' }
-
-[X86_PLATFORM_DEVICES]
-value = ' *'
-comment = [
-	'Some drivers under this submenu provide "platform profile" support',
-	'and power-profiles-daemon can take advantage from platform profiles;',
-	'select a driver if suitable for your platform',
-]
Index: rnel-config/general/sysutils/upower-systemd.toml
===================================================================
--- kernel-config/general/sysutils/upower-systemd.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,5 +1,0 @@
-revision = 'systemd'
-
-# Forced by !EXPERT
-NAMESPACES = { value = '*', forced = true }
-USER_NS='*'
Index: rnel-config/gnome/platform/tracker3-miners.toml
===================================================================
--- kernel-config/gnome/platform/tracker3-miners.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-SECURITY='*'
-SECURITY_LANDLOCK='*'
-
-[LSM]
-value = "landlock"
-comment = [
-  "List more Linux Security Modules here (separated with comma) if needed,",
-  "for example 'landlock,lockdown,smack'",
-]
Index: rnel-config/introduction/important/cgroup.toml
===================================================================
--- kernel-config/introduction/important/cgroup.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-CGROUPS='*'
-MEMCG='*'
-CPUSETS='*'
Index: rnel-config/kernel-config.py
===================================================================
--- kernel-config/kernel-config.py	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,306 +1,0 @@
-#!/usr/bin/env python3
-
-# SPDX-License-Identifier: MIT
-# Copyright 2023 The LFS Editors
-
-# Stupid script to render "mconf"-style kernel configuration
-# Usage: kernel-config.py [path to kernel tree] [needed config].toml
-# The toml file should be like:
-#   for bool and tristate:
-#     EXT4="*"
-#     DRM="*M"
-#     EXPERT=" "
-#     DRM_I915="*M"
-#   for choice:
-#     HIGHMEM64G="X"
-#   an entry with comment:
-#     DRM_I915 = { value = " *M", comment = "for i915, crocus, or iris" }
-
-choice_bit = 1 << 30
-ind0 = 0
-ind1 = 0
-menu_id = 1
-stack = []
-if_stack = []
-
-expand_var_mp = { 'SRCARCH': 'x86' }
-main_dep = {}
-
-def expand_var(s):
-    for k in expand_var_mp:
-        s = s.replace('$(' + k + ')', expand_var_mp[k])
-    return s
-
-def pop_stack(cond):
-    global ind0, ind1, stack
-    assert(cond(stack[-1][0]))
-    s, i0, i1, _ = stack[-1]
-    stack = stack[:-1]
-    ind0 -= i0
-    ind1 -= i1
-
-def pop_stack_while(cond):
-    while stack and cond(stack[-1][0]):
-        pop_stack(cond)
-
-def cur_menu():
-    global stack
-    return stack[-1][3] if stack else 0
-
-def cur_if():
-    global if_stack
-    return if_stack[-1][:] if if_stack else []
-
-def clean_dep(d):
-    d = d.strip()
-    if d.endswith('=y') or d.endswith('=M'):
-        d = d[:-2]
-    elif d.endswith(' != ""'):
-        d = d[:-6]
-    return d
-
-def parse_config(buf):
-    global ind0, ind1, stack, menu_id
-    is_choice = buf[0].strip() == 'choice'
-    is_menu = buf[0].startswith('menu') or is_choice
-    is_nonconfig_menu = buf[0].startswith('menu ') or is_choice
-    key = None if is_nonconfig_menu else buf[0].split()[1].strip()
-    title = buf[0][len('menu '):] if is_nonconfig_menu else None
-    deps = ['menu'] + cur_if()
-    klass = None
-
-    for line in buf[1:]:
-        line = line.strip()
-        if line.startswith('depends on '):
-            new_deps = line[len('depends on '):].split('&&')
-            deps += [clean_dep(x) for x in new_deps]
-        elif line.startswith('prompt'):
-            title = line[len('prompt '):]
-        else:
-            for prefix in ['tristate', 'bool', 'string']:
-                if line.startswith(prefix + ' '):
-                    title = line[len(prefix) + 1:]
-                    klass = prefix
-                elif line == prefix:
-                    klass = prefix
-                elif line.startswith('def_' + prefix + ' '):
-                    klass = prefix
-                else:
-                    continue
-
-                if '"' in line:
-                    tail = line[line.rfind('"') + 1:].strip()
-                    if tail[:3] == 'if ':
-                        deps += [clean_dep(x) for x in tail[3:].split('&&')]
-
-    pop_stack_while(lambda x: x not in deps)
-
-    menu_id += is_menu
-    internal_key = key or menu_id
-    if stack:
-        fa = stack[-1][0]
-        if fa == 'menu':
-            fa = cur_menu() & ~choice_bit
-        main_dep[internal_key] = fa
-
-    val = known_config.get(key)
-    comment = None
-    forced = None
-
-    if type(val) == dict:
-        comment = val.get('comment')
-        forced = val.get('forced')
-        val = val['value']
-
-    klass = klass or 'string'
-    if title:
-        title = title.strip().lstrip('"')
-        title = title[:title.find('"')]
-
-    if not val:
-        pass
-    elif klass == 'string':
-        val = '(' + val + ')'
-    else:
-        assert((val == 'X') == bool(cur_menu() & choice_bit))
-        if (val == 'X'):
-            val = '(X)'
-        else:
-            val = list(val)
-            val.sort()
-            for c in val:
-                if c not in 'M* ' or (c == 'M' and klass != 'tristate'):
-                    raise Exception('unknown setting %s for %s' % (c, key))
-            bracket = None
-            if klass == 'tristate' and forced != '*' :
-                bracket = '{}' if forced else '<>'
-            else:
-                bracket = '--' if forced else '[]'
-
-            val = bracket[0] + '/'.join(val) + bracket[1]
-
-    arrow = ' --->' if is_menu else ''
-    r = [ind0, val, ind1, title, arrow, internal_key, cur_menu(), comment]
-
-    # Don't indent for untitled (internal) entries
-    x = 2 if title else 0
-
-    key = key or 'menu'
-    menu = (menu_id if is_menu else cur_menu())
-    menu |= choice_bit if is_choice else 0
-    stack_ent = (key, 2, 0, menu) if is_menu else (key, 0, x, menu)
-    ind0 += stack_ent[1]
-    ind1 += stack_ent[2]
-    stack += [stack_ent]
-
-    return r
-
-def load_kconfig(file):
-    global ind0, ind1, stack, path, menu_id, if_stack
-    r = []
-    config_buf = []
-    with open(path + file) as f:
-        for line in f:
-            if config_buf:
-                if not (line.startswith('\t') or line.startswith('    ')):
-                    r += [parse_config(config_buf)]
-                    config_buf = []
-                else:
-                    config_buf += [line]
-                    continue
-            if line.startswith('source') or line.startswith('\tsource'):
-                sub = expand_var(line.strip().split()[1].strip('"'))
-                r += load_kconfig(sub)
-            elif line.startswith('config') or line.startswith('menu'):
-                config_buf = [line]
-            elif line.startswith('choice'):
-                config_buf = [line]
-            elif line.startswith('endmenu') or line.startswith('endchoice'):
-                pop_stack_while(lambda x: x != 'menu')
-                pop_stack(lambda x: x == 'menu')
-            elif line.startswith('if '):
-                line = line[3:]
-                top = cur_if()
-                top += [x.strip() for x in line.split("&&")]
-                if_stack += [top]
-            elif line.startswith('endif'):
-                if_stack = if_stack[:-1]
-
-    if config_buf:
-        r += [parse_config(config_buf)]
-
-    return r
-
-known_config = {}
-
-def escape(x):
-    return x.replace('<', '&lt;').replace('>', '&gt;')
-
-from sys import argv
-import tomllib
-
-path = argv[1]
-if path[-1] != '/':
-    path += '/'
-with open(argv[2], 'rb') as f:
-    known_config = tomllib.load(f)
-
-r = load_kconfig('Kconfig')
-
-# Refcount all menus
-
-index_ikey = {}
-for i in reversed(range(len(r))):
-    index_ikey[r[i][5]] = i
-
-for i in reversed(range(len(r))):
-    if r[i][1] != None:
-        key = r[i][5]
-        fa = main_dep.get(key)
-        if not fa:
-            continue
-        j = index_ikey[fa]
-        if type(fa) == int or not r[j][3]:
-            # The main dependency is a menu or untitled magic entry,
-            # just mark it used
-            r[j][1] = ''
-        if r[j][1] is None:
-            raise Exception('[%s] needs unselected [%s]' % (key, fa))
-
-r = [i for i in r if i[1] != None and i[3]]
-
-# Now we are going to pretty-print r
-
-## Calculate the maximum value length for each menu
-max_val_len = {}
-for _, val, _, _, _, _, menu, _ in r:
-    x = max_val_len.get(menu) or 0
-    max_val_len[menu] = max(x, len(val))
-
-## Output
-
-max_line = 80
-buf = []
-
-done = [x[5] for x in r] + ['revision']
-for i in known_config:
-    if i not in done:
-        raise Exception("%s seems not exist" % i)
-
-sep = known_config.get('separate_toplevel_menu')
-
-for i0, val, i1, title, arrow, key, menu, comment in r:
-    rem = max_line
-    is_choice = (val == '(X)')
-
-    if val:
-        val += (max_val_len[menu] - len(val)) * ' '
-
-    rem -= i0 + i1 + bool(val) + len(val)
-    line = i0 * ' ' + escape(val) + (i1 + bool(val)) * ' '
-
-    rem -= len(arrow)
-
-    if len(title) > rem:
-        title = title[:rem - 3] + '...'
-
-    b = title
-    if not is_choice:
-        while not (b[0].isalpha() and b[0] not in 'YyMmNnHh'):
-            b = b[1:]
-    a = title[:len(title) - len(b)]
-    b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"
-    line += escape(a) + b0 + escape(b[1:]) + escape(arrow)
-
-    rem -= len(title)
-
-    key = ' [' + key + ']' if type(key) == str else ''
-
-    if len(key) <= rem:
-        line += (rem - len(key)) * ' ' + key
-    else:
-        key = '... ' + key
-        line += '\n' + ' ' * (max_line - len(key)) + key
-    if type(comment) == str:
-        comment = [comment]
-    if comment:
-        comment = '\n'.join([' ' * i0 + '# ' + line for line in comment])
-        buf += [escape(comment) + ':']
-
-    if not menu and buf:
-        buf += ['']
-
-    buf += [line.rstrip()]
-
-from jinja2 import Template
-
-t = Template('''<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen{{ rev }}>{{ '\n'.join(buf) }}</screen>''')
-
-rev = known_config.get('revision')
-rev = ' revision="%s"' % rev if rev else ''
-print(t.render(rev = rev, buf = buf))
Index: rnel-config/kernel.version
===================================================================
--- kernel-config/kernel.version	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-6.8.5
Index: rnel-config/kernel_version.py
===================================================================
--- kernel-config/kernel_version.py	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#!/usr/bin/env python3
-
-def kernel_version(path):
-    version = None
-    patchlevel = None
-    sublevel = None
-
-    with open(path + 'Makefile') as f:
-        for line in f:
-            if line.startswith('VERSION ='):
-                version = line[len('VERSION ='):].strip()
-            elif line.startswith('PATCHLEVEL ='):
-                patchlevel = line[len('PATCHLEVEL ='):].strip()
-            elif line.startswith('SUBLEVEL ='):
-                sublevel = line[len('SUBLEVEL ='):].strip()
-
-    assert(version and patchlevel and sublevel)
-    return '.'.join([version, patchlevel, sublevel])
-
-if __name__ == '__main__':
-    from sys import argv
-
-    path = argv[1]
-    if path[:-1] != '/':
-        path += '/'
-
-    print(kernel_version(path))
Index: rnel-config/multimedia/libdriv/alsa-lib.toml
===================================================================
--- kernel-config/multimedia/libdriv/alsa-lib.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-SOUND = '*M'
-
-[SND]
-value = '*M'
-comment = [
-	'Select settings and drivers appropriate for your hardware',
-	'in the submenu',
-]
Index: rnel-config/multimedia/libdriv/intel-media.toml
===================================================================
--- kernel-config/multimedia/libdriv/intel-media.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-DRM='*M'
-DRM_I915='*M'
Index: rnel-config/networking/netlibs/libnl-test.toml
===================================================================
--- kernel-config/networking/netlibs/libnl-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,44 +1,0 @@
-# Forced by !EXPERT
-NAMESPACES = { value = '*', forced = true }
-
-USER_NS='*'
-NET_NS='*'
-
-NET='*'
-INET='*'
-IP_ADVANCED_ROUTER='*'
-IP_MULTIPLE_TABLES='*'
-NET_IPIP='*M'
-NET_IPGRE_DEMUX='*M'
-NET_IPGRE='*M'
-NET_IPVTI='*M'
-IPV6='*'
-IPV6_TUNNEL='*M'
-IPV6_SIT='*M'
-IPV6_MULTIPLE_TABLES='*'
-NETFILTER='*'
-NF_TABLES='*M'
-NF_TABLES_NETDEV='*'
-
-# forced by NFT_FWD_NETDEV
-NF_DUP_NETDEV = { value = '*M', forced = true }
-
-NFT_FWD_NETDEV = '*M'
-BRIDGE='*M'
-
-# forced by IPVLAN
-NET_L3_MASTER_DEV = { value = '*', forced = true }
-
-VLAN_8021Q='*M'
-NETDEVICES='*'
-NET_CORE='*'
-BONDING='*M'
-DUMMY='*M'
-IFB='*M'
-MACVLAN='*M'
-MACVTAP='*M'
-IPVLAN='*M'
-VXLAN='*M'
-MACSEC='*M'
-VETH='*M'
-NET_VRF='*M'
Index: rnel-config/networking/netprogs/bridgeutils.toml
===================================================================
--- kernel-config/networking/netprogs/bridgeutils.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-NET='*'
-BRIDGE='*M'
Index: rnel-config/networking/netprogs/cifsutils.toml
===================================================================
--- kernel-config/networking/netprogs/cifsutils.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-NETWORK_FILESYSTEMS='*'
-CIFS='*M'
Index: rnel-config/networking/netprogs/nfs-utils.toml
===================================================================
--- kernel-config/networking/netprogs/nfs-utils.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-NETWORK_FILESYSTEMS='*'
-NFS_FS='*M'
-NFSD='*M'
Index: rnel-config/networking/netprogs/wireless-kernel.toml
===================================================================
--- kernel-config/networking/netprogs/wireless-kernel.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,6 +1,0 @@
-NET='*'
-WIRELESS='*'
-CFG80211='*M'
-MAC80211='*M '
-NETDEVICES='*'
-WLAN='*'
Index: rnel-config/networking/netprogs/wireless-tools.toml
===================================================================
--- kernel-config/networking/netprogs/wireless-tools.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-NET='*'
-WIRELESS='*'
-CFG80211='*M'
-CFG80211_WEXT='*'
Index: rnel-config/networking/netutils/networkmanager-test.toml
===================================================================
--- kernel-config/networking/netutils/networkmanager-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,28 +1,0 @@
-NET='*'
-INET='*'
-NET_IPIP='*M'
-NET_IPGRE_DEMUX='*M'
-NET_IPGRE='*M'
-IPV6='*'
-IPV6_SIT='*M'
-IPV6_GRE='*M'
-IPV6_MULTIPLE_TABLES='*'
-MPTCP='*'
-MPTCP_IPV6='*'
-VLAN_8021Q='*M'
-NET_SCHED='*'
-NET_SCH_SFQ='*'
-NET_SCH_TBF='*'
-NET_SCH_FQ_CODEL='*'
-NET_SCH_INGRESS='*'
-NETDEVICES='*'
-NET_CORE='*'
-BONDING='*M'
-DUMMY='*M'
-NET_TEAM='*M'
-MACVLAN='*M'
-MACVTAP='*M'
-IPVLAN='*M'
-VXLAN='*M'
-VETH='*M'
-NET_VRF='*M'
Index: rnel-config/networking/netutils/wireshark.toml
===================================================================
--- kernel-config/networking/netutils/wireshark.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-NET='*'
-PACKET='*M'
Index: rnel-config/postlfs/config/builtin-fw.toml
===================================================================
--- kernel-config/postlfs/config/builtin-fw.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,6 +1,0 @@
-# not really forced, though it should display as forced on most editors'
-# system
-FW_LOADER='*'
-
-EXTRA_FIRMWARE='xx/aa.bin xx/bb.bin'
-EXTRA_FIRMWARE_DIR='/lib/firmware'
Index: rnel-config/postlfs/filesystems/btrfs-progs-test.toml
===================================================================
--- kernel-config/postlfs/filesystems/btrfs-progs-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-BTRFS_FS='*M'
-BTRFS_FS_POSIX_ACL='*'
Index: rnel-config/postlfs/filesystems/btrfs-progs.toml
===================================================================
--- kernel-config/postlfs/filesystems/btrfs-progs.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-BTRFS_FS='*M'
Index: rnel-config/postlfs/filesystems/dosfstools.toml
===================================================================
--- kernel-config/postlfs/filesystems/dosfstools.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-MSDOS_FS="*M "
-VFAT_FS="*M"
Index: rnel-config/postlfs/filesystems/fuse-test.toml
===================================================================
--- kernel-config/postlfs/filesystems/fuse-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-FUSE_FS="*M"
-CUSE="*M"
Index: rnel-config/postlfs/filesystems/fuse.toml
===================================================================
--- kernel-config/postlfs/filesystems/fuse.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-FUSE_FS="*M"
Index: rnel-config/postlfs/filesystems/jfs.toml
===================================================================
--- kernel-config/postlfs/filesystems/jfs.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-JFS_FS='*M'
Index: rnel-config/postlfs/filesystems/lvm2.toml
===================================================================
--- kernel-config/postlfs/filesystems/lvm2.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-MD='*'
-BLK_DEV='*'
-BLK_DEV_DM='*M'
-DM_CRYPT='*M'
-DM_SNAPSHOT='*M'
-DM_THIN_PROVISIONING='*M'
-DM_CACHE='*M'
-DM_MIRROR='*M'
-DM_ZERO='*M'
-DM_DELAY='*M'
-BLK_DEV_RAM='*M'
-MAGIC_SYSRQ='*'
Index: rnel-config/postlfs/filesystems/mdadm.toml
===================================================================
--- kernel-config/postlfs/filesystems/mdadm.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-MD='*'
-# TODO: is M really suitable?  But anyway I don't think it make too much
-# sense to set this to * but the desired types to M ...
-BLK_DEV_MD='*M'
-MD_AUTODETECT='*'
-MD_RAID1='*M '
-MD_RAID10='*M '
-MD_RAID456='*M '
-
-[MD_RAID0]
-value = '*M '
-comment = 'Only the RAID types desired are required'
Index: rnel-config/postlfs/filesystems/ntfs-3g.toml
===================================================================
--- kernel-config/postlfs/filesystems/ntfs-3g.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-FUSE_FS="*M"
Index: rnel-config/postlfs/filesystems/ntfs3.toml
===================================================================
--- kernel-config/postlfs/filesystems/ntfs3.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-NTFS3_FS="*M"
Index: rnel-config/postlfs/filesystems/parted-test.toml
===================================================================
--- kernel-config/postlfs/filesystems/parted-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,2 +1,0 @@
-SCSI_LOWLEVEL='*'
-SCSI_DEBUG='M'
Index: rnel-config/postlfs/filesystems/uefi-bootloaders/grub-setup.toml
===================================================================
--- kernel-config/postlfs/filesystems/uefi-bootloaders/grub-setup.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-# forced by !EXPERT
-BLOCK = { value = '*', forced = true }
-EFI='*'
-EFI_STUB='*'
-PARTITION_ADVANCED='* '
-EFI_PARTITION="*"
-SYSFB_SIMPLEFB="*"
-DRM="*"
-DRM_FBDEV_EMULATION="*"
-DRM_SIMPLEDRM="*"
-FRAMEBUFFER_CONSOLE = '*'
-VFAT_FS="*M"
-EFIVAR_FS="*M"
-# forced by both ACPI and PCI on a typical x86 desktop/server system
-NLS = { value = "*", forced = "*" }
-NLS_CODEPAGE_437="*M"
-NLS_ISO8859_1="*M"
Index: rnel-config/postlfs/filesystems/xfsprogs.toml
===================================================================
--- kernel-config/postlfs/filesystems/xfsprogs.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-XFS_FS='*M'
Index: rnel-config/postlfs/security/cryptsetup.toml
===================================================================
--- kernel-config/postlfs/security/cryptsetup.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-MD='*'
-BLK_DEV_DM='*M'
-DM_CRYPT='*M'
-# Forced by EXT4_FS && BLOCK
-CRYPTO = { value = '*', forced = '*' }
-CRYPTO_XTS='*M'
-# Not really forced
-CRYPTO_SHA256="*M"
-# Not really forced too
-CRYPTO_AES="*M"
-CRYPTO_USER_API_SKCIPHER="*M"
-CRYPTO_TWOFISH = { value = "*M", comment = "For tests" }
Index: rnel-config/postlfs/security/iptables.toml
===================================================================
--- kernel-config/postlfs/security/iptables.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-NET='*'
-NETFILTER='*'
-NETFILTER_ADVANCED='*'
-NF_CONNTRACK='*M'
-NETFILTER_XTABLES='*M'
-NETFILTER_XT_TARGET_LOG='*M'
-IP_NF_IPTABLES='*M'
Index: rnel-config/postlfs/security/linux-pam.toml
===================================================================
--- kernel-config/postlfs/security/linux-pam.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-AUDIT='*'
Index: rnel-config/postlfs/virtualization/qemu-bridge.toml
===================================================================
--- kernel-config/postlfs/virtualization/qemu-bridge.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,5 +1,0 @@
-NET='*'
-BRIDGE='*M'
-NETDEVICES='*'
-NET_CORE='*'
-TUN='*M'
Index: rnel-config/postlfs/virtualization/qemu-kvm.toml
===================================================================
--- kernel-config/postlfs/virtualization/qemu-kvm.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-VIRTUALIZATION='*'
-KVM='*M'
-KVM_INTEL = { value = '*M ', comment = 'Enable the option for your CPU' }
-KVM_AMD='*M '
Index: rnel-config/pst/printing/parallel-printer.toml
===================================================================
--- kernel-config/pst/printing/parallel-printer.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-PARPORT='*M'
-PARPORT_PC='*M'
-PRINTER='*M'
Index: rnel-config/pst/printing/usb-printer.toml
===================================================================
--- kernel-config/pst/printing/usb-printer.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-# Things like XHCI_HCD or OHCI_HCD do not belong here
-# These should be in libusb page
-USB_SUPPORT='*'
-USB_PRINTER='*M'
Index: rnel-config/server/major/kea.toml
===================================================================
--- kernel-config/server/major/kea.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-NET='*'
-PACKET='*M'
-INET='*'
-IPV6='*'
Index: rnel-config/testdata/Kconfig
===================================================================
--- kernel-config/testdata/Kconfig	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,31 +1,0 @@
-menu "Master section"
-
-menu "Subsection"
-
-config REQU_PAR
-	bool "Required parameter"
-
-config REQU_PAR_NMOD
-	tristate "Required parameter (not as module)"
-
-config REQU_PAR_MOD
-	tristate "Required parameter (could be a module)"
-
-config REQU_PAR_MOD_ONLY
-	tristate "Required parameter (as a module)"
-
-config OPT_PAR
-	tristate "Optional parameter"
-
-config OPT_PAR_MOD_ONLY
-	tristate "Optional parameter (as a module if enabled)"
-
-config INCOMP_PAR
-	bool "Incompatible parameter"
-
-config INCOMP_PAR_MOD
-	tristate "Incompatible parameter (even as module)"
-
-endmenu # subsection
-
-endmenu # master section
Index: rnel-config/testdata/config.toml.example
===================================================================
--- kernel-config/testdata/config.toml.example	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-REQU_PAR='*'
-REQU_PAR_NMOD='*'
-REQU_PAR_MOD='*M'
-OPT_PAR='*M '
-INCOMP_PAR=' '
-INCOMP_PAR_MOD=' '
-REQU_PAR_MOD_ONLY='M'
-OPT_PAR_MOD_ONLY=' M'
Index: rnel-config/x/installing/libevdev-test.toml
===================================================================
--- kernel-config/x/installing/libevdev-test.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-INPUT_MISC="*"
-INPUT_UINPUT="*M"
-INPUT = { value = '*', forced = '*' }
Index: rnel-config/x/installing/libevdev.toml
===================================================================
--- kernel-config/x/installing/libevdev.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-# forced by VT && TTY, with !EXPERT VT and TTY are always set
-INPUT = { value = "*", forced = "*" }
-INPUT_EVDEV="*M"
Index: rnel-config/x/installing/mesa.toml
===================================================================
--- kernel-config/x/installing/mesa.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-DRM="*M"
-DRM_RADEON = { value = " *M", comment = "For r300 or r600" }
-DRM_AMDGPU = { value = " *M", comment = "For radeonsi" }
-DRM_AMDGPU_SI="*"
-DRM_AMDGPU_CIK="*"
-DRM_AMD_DC="*"
-DRM_NOUVEAU = { value = " *M", comment = "For nouveau" }
-DRM_I915 = { value = " *M", comment = "For i915, crocus, or iris" }
-DRM_VMWGFX = { value = " *M", comment = "For svga" }
-DRM_VGEM = { value = " *M", comment = "For swrast" }
Index: rnel-config/x/installing/x7driver-wacom.toml
===================================================================
--- kernel-config/x/installing/x7driver-wacom.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-HID_SUPPORT="*"
-# forced by USB_HID && HID_SUPPORT && USB && INPUT
-HID = { value = "*M", forced = true }
-USB_HID = "*M"
-USB_SUPPORT="*"
-USB = "*M"
-HID_WACOM = "*M"
Index: rnel-config/x/installing/xorg-server-simpledrm.toml
===================================================================
--- kernel-config/x/installing/xorg-server-simpledrm.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-SYSFB_SIMPLEFB="*"
-DRM="*"
-DRM_SIMPLEDRM="*"
Index: rnel-config/x/installing/xorg-server.toml
===================================================================
--- kernel-config/x/installing/xorg-server.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,4 +1,0 @@
-DRM="*M"
-DRM_VMWGFX="*M "
-DRM_BOCHS="*M "
-DRM_VBOXVIDEO="*M "
Index: rnel-config/x/lib/qtwebengine.toml
===================================================================
--- kernel-config/x/lib/qtwebengine.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,3 +1,0 @@
-NAMESPACES = { value = '*', forced = true }
-USER_NS = { value = '* ', comment = 'Enable or disable *both* of them' }
-PID_NS = '* '
Index: rnel-config/xsoft/other/rox-filer.toml
===================================================================
--- kernel-config/xsoft/other/rox-filer.toml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-DNOTIFY='*'
Index: qt/apps/apps.xml
===================================================================
--- lxqt/apps/apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="lxqt-apps">
-  <?dbhtml filename="lxqt-apps.html" ?>
-
-  <title>LXQt Applications</title>
-
-  <para>
-    This is a small collection of optional applications that add extra
-    capabilities to the <application>LXQt</application> desktop.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lximage-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-archiver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-notificationd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pavucontrol-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screengrab.xml"/>
-
-</chapter>
Index: qt/apps/lximage-qt.xml
===================================================================
--- lxqt/apps/lximage-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lximage-qt-download-http "https://github.com/lxqt/lximage-qt/releases/download/&lxqt-version;/lximage-qt-&lxqt-version;.tar.xz">
-  <!ENTITY lximage-qt-download-ftp  " ">
-  <!ENTITY lximage-qt-md5sum        "73aaf95d34bc94c6e1401c11f266f900">
-  <!ENTITY lximage-qt-size          "828 KB">
-  <!ENTITY lximage-qt-buildsize     "11 MB">
-  <!ENTITY lximage-qt-time          "0.4 SBU">
-]>
-
-<sect1 id="lximage-qt" xreflabel="lximage-qt-&lxqt-version;">
-  <?dbhtml filename="lximage-qt.html"?>
-
-
-  <title>lximage-qt-&lxqt-version;</title>
-
-  <indexterm zone="lximage-qt">
-    <primary sortas="a-lximage-qt">lximage-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lximage-qt</title>
-
-    <para>
-      The <application>lximage-qt</application> package contains a lightweight
-      image viewer and screenshot program.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lximage-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lximage-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lximage-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lximage-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lximage-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lximage-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lximage-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libfm-qt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lximage-qt</title>
-
-    <para>
-      Install <application>lximage-qt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_BUILD_TYPE=Release  \
-      -D CMAKE_INSTALL_PREFIX=/usr \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have <xref linkend="xdg-utils"/> installed, as the &root;
-      user, run <command>xdg-icon-resource forceupdate --theme hicolor</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lximage-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lximage-qt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lximage-qt-prog">
-        <term><command>lximage-qt</command></term>
-        <listitem>
-          <para>
-            is a lightweight image viewer and screenshot program. There is a
-            menu entry in Utilities for the screenshot program. From the
-            command line, you can obtain a full screen or window shot by
-            running <command>lximage-qt --screenshot</command>
-          </para>
-          <indexterm zone="lximage-qt lximage-qt-prog">
-            <primary sortas="b-lximage-qt">lximage-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/lxqt-archiver.xml
===================================================================
--- lxqt/apps/lxqt-archiver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-archiver-download-http "https://github.com/lxqt/lxqt-archiver/releases/download/&lxqt-archiver-version;/lxqt-archiver-&lxqt-archiver-version;.tar.xz">
-  <!ENTITY lxqt-archiver-download-ftp  " ">
-  <!ENTITY lxqt-archiver-md5sum        "3145a209ebe5e9e97468a102e1b8396c">
-  <!ENTITY lxqt-archiver-size          "184 KB">
-  <!ENTITY lxqt-archiver-buildsize     "11 MB">
-  <!ENTITY lxqt-archiver-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-archiver" xreflabel="lxqt-archiver-&lxqt-archiver-version;">
-  <?dbhtml filename="lxqt-archiver.html"?>
-
-
-  <title>lxqt-archiver-&lxqt-archiver-version;</title>
-
-  <indexterm zone="lxqt-archiver">
-    <primary sortas="a-lxqt-archiver">lxqt-archiver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-archiver</title>
-
-    <para>
-      The <application>lxqt-archiver</application> package is a simple and
-      lightweight desktop-agnostic Qt file archiver.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-archiver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-archiver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-archiver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-archiver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-archiver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-archiver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-archiver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libfm-qt"/>,
-      <xref linkend="liblxqt"/>, and
-      <xref linkend="json-glib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-archiver</title>
-
-    <para>
-      Install <application>lxqt-archiver</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_BUILD_TYPE=Release  \
-      -D CMAKE_INSTALL_PREFIX=/usr \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-archiver
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt-archiver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-archiver-prog">
-        <term><command>lxqt-archiver</command></term>
-        <listitem>
-          <para>
-            is a Qt-based file archiver
-          </para>
-          <indexterm zone="lxqt-archiver lxqt-archiver-prog">
-            <primary sortas="b-lxqt-archiver">lxqt-archiver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/lxqt-notificationd.xml
===================================================================
--- lxqt/apps/lxqt-notificationd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-notificationd-download-http "https://github.com/lxqt/lxqt-notificationd/releases/download/&lxqt-version;/lxqt-notificationd-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-notificationd-download-ftp  " ">
-  <!ENTITY lxqt-notificationd-md5sum        "a1427b39f8c64a8ecac40c0834830f82">
-  <!ENTITY lxqt-notificationd-size          "64 KB">
-  <!ENTITY lxqt-notificationd-buildsize     "5.9 MB">
-  <!ENTITY lxqt-notificationd-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-notificationd" xreflabel="lxqt-notificationd-&lxqt-version;">
-  <?dbhtml filename="lxqt-notificationd.html"?>
-
-
-  <title>lxqt-notificationd-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-notificationd">
-    <primary sortas="a-lxqt-notificationd">lxqt-notificationd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-notificationd</title>
-
-    <para>
-      The <application>lxqt-notificationd</application> package is the
-      <application>LXQt</application> notification daemon.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-notificationd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-notificationd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-notificationd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-notificationd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-notificationd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-notificationd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-notificationd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-notificationd</title>
-
-    <para>
-      Install <application>lxqt-notificationd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_BUILD_TYPE=Release  \
-      -D CMAKE_INSTALL_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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DPULL_TRANSLATIONS=no</parameter>: Removes the need for
-      <xref linkend="git"/>, which would otherwise be requested to download
-      the translation files.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-notificationd and
-          lxqt-notificationd
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt/translations/lxqt-config-notificationd and
-          /usr/share/lxqt/translations/lxqt-notificationd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-notificationd">
-        <term><command>lxqt-config-notificationd</command></term>
-        <listitem>
-          <para>
-            is the <command>lxqt-notificationd</command> GUI configuration tool
-          </para>
-          <indexterm zone="lxqt-notificationd lxqt-config-notificationd">
-            <primary sortas="b-lxqt-config-notificationd">lxqt-config-notificationd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-notificationd-prog">
-        <term><command>lxqt-notificationd</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> notification daemon
-          </para>
-          <indexterm zone="lxqt-notificationd lxqt-notificationd-prog">
-            <primary sortas="b-lxqt-notificationd">lxqt-notificationd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/pavucontrol-qt.xml
===================================================================
--- lxqt/apps/pavucontrol-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pavucontrol-qt-download-http "https://github.com/lxqt/pavucontrol-qt/releases/download/&lxqt-version;/pavucontrol-qt-&lxqt-version;.tar.xz">
-  <!ENTITY pavucontrol-qt-download-ftp  " ">
-  <!ENTITY pavucontrol-qt-md5sum        "d530390b798e299aa42e9b81cda033b7">
-  <!ENTITY pavucontrol-qt-size          "112 KB">
-  <!ENTITY pavucontrol-qt-buildsize     "7.4 MB">
-  <!ENTITY pavucontrol-qt-time          "0.2 SBU">
-]>
-
-<sect1 id="pavucontrol-qt" xreflabel="pavucontrol-qt-&lxqt-version;">
-  <?dbhtml filename="pavucontrol-qt.html"?>
-
-
-  <title>pavucontrol-qt-&lxqt-version;</title>
-
-  <indexterm zone="pavucontrol-qt">
-    <primary sortas="a-pavucontrol-qt">pavucontrol-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pavucontrol-qt</title>
-
-    <para>
-      <application>pavucontrol-qt</application> is the Qt port of the volume
-      control utility pavucontrol, which is used to adjust audio levels in
-      Pulseaudio. It is desktop environment agnostic.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pavucontrol-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pavucontrol-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pavucontrol-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pavucontrol-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pavucontrol-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pavucontrol-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pavucontrol-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and
-      <xref linkend="pulseaudio"/> (built with <xref linkend="glib2"/> support)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pavucontrol-qt</title>
-
-    <para>
-       Install <application>pavucontrol-qt</application> by running the following
-       commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_BUILD_TYPE=Release  \
-      -D CMAKE_INSTALL_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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pavucontrol-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/pavucontrol-qt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pavucontrol-qt-prog">
-        <term><command>pavucontrol-qt</command></term>
-        <listitem>
-          <para>
-            is a Qt based GUI configuration tool for sound settings using
-            <application>pulseaudio</application>
-          </para>
-          <indexterm zone="pavucontrol-qt pavucontrol-qt-prog">
-            <primary sortas="b-pavucontrol-qt">pavucontrol-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/qps.xml
===================================================================
--- lxqt/apps/qps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qps-download-http "https://github.com/lxqt/qps/releases/download/&qps-version;/qps-&qps-version;.tar.xz">
-  <!ENTITY qps-download-ftp  " ">
-  <!ENTITY qps-md5sum        "3f5465fa6ed6b02d75c8bf2553f54cc0">
-  <!ENTITY qps-size          "448 KB">
-  <!ENTITY qps-buildsize     "11 MB">
-  <!ENTITY qps-time          "0.4 SBU">
-]>
-
-<sect1 id="qps" xreflabel="qps-&qps-version;">
-  <?dbhtml filename="qps.html"?>
-
-
-  <title>qps-&qps-version;</title>
-
-  <indexterm zone="qps">
-    <primary sortas="a-qps">qps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qps</title>
-
-    <para>
-      The <application>qps</application> package contains a Qt process
-      manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qps</title>
-
-    <para>
-      Install <application>qps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_BUILD_TYPE=Release  \
-      -D CMAKE_INSTALL_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>
-
-    <para>
-      If you have <xref linkend="xdg-utils"/> installed, as the
-      &root; user, run 
-      <command>xdg-icon-resource forceupdate --theme hicolor</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          qps
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/qps
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qps-prog">
-        <term><command>qps</command></term>
-        <listitem>
-          <para>
-            is a Qt-based process manager
-          </para>
-          <indexterm zone="qps qps-prog">
-            <primary sortas="b-qps">qps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/qterminal.xml
===================================================================
--- lxqt/apps/qterminal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qterminal-download-http "https://github.com/lxqt/qterminal/releases/download/&qterminal-version;/qterminal-&qterminal-version;.tar.xz">
-  <!ENTITY qterminal-download-ftp  " ">
-  <!ENTITY qterminal-md5sum        "9fd252579ded4aa05665d4fc979629e6">
-  <!ENTITY qterminal-size          "188 KB">
-  <!ENTITY qterminal-buildsize     "5.8 MB">
-  <!ENTITY qterminal-time          "0.3 SBU">
-]>
-
-<sect1 id="qterminal" xreflabel="qterminal-&qterminal-version;">
-  <?dbhtml filename="qterminal.html"?>
-
-
-  <title>qterminal-&qterminal-version;</title>
-
-  <indexterm zone="qterminal">
-    <primary sortas="a-qterminal">qterminal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qterminal</title>
-
-    <para>
-      The <application>qterminal</application> package contains a Qt widget
-      based terminal emulator for <application>Qt</application> with support
-      for multiple tabs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qterminal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qterminal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qterminal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qterminal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qterminal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qterminal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qterminal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qtermwidget"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qterminal</title>
-
-    <para>
-      Install <application>qterminal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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>
-          qterminal
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/qterminal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qterminal-prog">
-        <term><command>qterminal</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt</application> based lightweight terminal
-            emulator
-          </para>
-          <indexterm zone="qterminal qterminal-prog">
-            <primary sortas="b-qterminal">qterminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/qtermwidget.xml
===================================================================
--- lxqt/apps/qtermwidget.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qtermwidget-download-http "https://github.com/lxqt/qtermwidget/releases/download/&qtermwidget-version;/qtermwidget-&qtermwidget-version;.tar.xz">
-  <!ENTITY qtermwidget-download-ftp  " ">
-  <!ENTITY qtermwidget-md5sum        "9fd252579ded4aa05665d4fc979629e6">
-  <!ENTITY qtermwidget-size          "188 KB">
-  <!ENTITY qtermwidget-buildsize     "5.8 MB">
-  <!ENTITY qtermwidget-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="qtermwidget" xreflabel="qtermwidget-&qtermwidget-version;">
-  <?dbhtml filename="qtermwidget.html"?>
-
-
-  <title>qtermwidget-&qtermwidget-version;</title>
-
-  <indexterm zone="qtermwidget">
-    <primary sortas="a-qtermwidget">qtermwidget</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qtermwidget</title>
-
-    <para>
-      As the name suggests, the <application>qtermwidget</application> package
-      is a terminal widget for <application>Qt</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtermwidget-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtermwidget-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtermwidget-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtermwidget-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtermwidget-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtermwidget-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qtermwidget Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &qt5-deps;
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qtermwidget"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtermwidget</title>
-
-    <para>
-      Install <application>qtermwidget</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TEST=true</option>: Builds test application.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libqtermwidget5.so
-        </seg>
-        <seg>
-          /usr/include/qtermwidget5,
-          /usr/lib/cmake/qtermwidget5, and
-          /usr/share/qtermwidget5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqtermwidget5-lib">
-        <term><filename class="libraryfile">libqtermwidget5.so</filename></term>
-        <listitem>
-          <para>
-            provides a terminal widget for Qt5
-          </para>
-          <indexterm zone="qtermwidget libqtermwidget5-lib">
-            <primary sortas="c-libqtermwidget5">libqtermwidget5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/apps/screengrab.xml
===================================================================
--- lxqt/apps/screengrab.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 screengrab-download-http "https://github.com/lxqt/screengrab/releases/download/&screengrab-version;/screengrab-&screengrab-version;.tar.xz">
-  <!ENTITY screengrab-download-ftp  " ">
-  <!ENTITY screengrab-md5sum        "bec5465f053bfb964c7a6e57e20e421f">
-  <!ENTITY screengrab-size          "340 KB">
-  <!ENTITY screengrab-buildsize     "9.1 MB">
-  <!ENTITY screengrab-time          "0.2 SBU">
-]>
-
-<sect1 id="screengrab" xreflabel="screengrab-&screengrab-version;">
-  <?dbhtml filename="screengrab.html"?>
-
-
-  <title>screengrab-&screengrab-version;</title>
-
-  <indexterm zone="screengrab">
-    <primary sortas="a-screengrab">screengrab</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to screengrab</title>
-
-    <para>
-      The <application>screengrab</application> package is a cross-platform
-      tool for making screenshots quickly.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&screengrab-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&screengrab-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &screengrab-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &screengrab-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &screengrab-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &screengrab-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">screengrab Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-kwindowsystem"/> and
-      <xref linkend="libqtxdg"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of screengrab</title>
-
-    <para>
-      Install <application>screengrab</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_BUILD_TYPE=Release  \
-      -D CMAKE_INSTALL_PREFIX=/usr \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have <xref linkend="xdg-utils"/> installed, as the &root;
-      user, run <command>xdg-icon-resource forceupdate --theme hicolor</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          screengrab
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/screengrab and
-          /usr/share/doc/screengrab
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="screengrab-prog">
-        <term><command>screengrab</command></term>
-        <listitem>
-          <para>
-            is a cross platform tool for creating screenshots quickly
-          </para>
-          <indexterm zone="screengrab screengrab-prog">
-            <primary sortas="b-screengrab">screengrab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/desktop.xml
===================================================================
--- lxqt/desktop/desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="lxqt-desktop">
-  <?dbhtml filename="lxqt-desktop.html" ?>
-
-  <title>LXQt Desktop</title>
-
-  <para>
-    LXQt is an extremely fast-performing and energy-saving desktop environment.
-  </para>
-
-  <para>
-    <application>LXQt</application> is a <application>Qt</application> based
-    Desktop Environment. It is focused on being a classic desktop with a
-    modern look and feel. It can customize appearance everywhere.
-    The panel(s) have plugins and settings.  It is Window Manager agnostic,
-    has multi-language support and standard keyboard shortcuts.
-    <application>LXQt</application> uses
-    less CPU and less RAM than most other environments. It is especially
-    useful for cloud computers with low hardware specifications, such as
-    netbooks, mobile devices (e.g. MIDs) or older computers, but can be used
-    with modern hardware.
-  </para>
-
-  <para>
-    Build LXQt core packages in the order presented in the book for the
-    easiest resolution of dependencies.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-kf5.xml"/>
-<!-- Needed kf5 packages -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwindowsystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/>
-<!-- Needed plasma packages -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-libkscreen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-layer-shell.xml"/>
-<!-- Needed dependency -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="muparser.xml"/>
-<!-- group 0 -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-build-tools.xml"/>
-<!-- group I -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqtxdg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-menu-data.xml"/>
-<!-- group II -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblxqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtxdg-tools.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-extra.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="menu-cache.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-qt.xml"/>
-<!-- group III -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-globalkeys.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenu-lxqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/>
-  <!-- qtermwidget from apps -->
-
-<!-- group IV -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-powermanagement.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-runner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-themes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-admin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-policykit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-sudo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-openssh-askpass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-session.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-desktop-portal-lxqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obconf-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="post-install.xml"/>
-</chapter>
Index: qt/desktop/dummy-desktop.xml
===================================================================
--- lxqt/desktop/dummy-desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>LXQt Desktop Components</title>
-  <para/>
-</sect1>
-
Index: qt/desktop/dummy-kf5.xml
===================================================================
--- lxqt/desktop/dummy-kf5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>KF5, Plasma, and Misc Dependencies</title>
-  <para/>
-</sect1>
-
Index: qt/desktop/libdbusmenu-lxqt.xml
===================================================================
--- lxqt/desktop/libdbusmenu-lxqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdbusmenu-lxqt-download-http "https://github.com/lxqt/libdbusmenu-lxqt/releases/download/&libdbusmenu-lxqt-version;/libdbusmenu-lxqt-&libdbusmenu-lxqt-version;.tar.xz">
-  <!ENTITY libdbusmenu-lxqt-download-ftp  " ">
-  <!ENTITY libdbusmenu-lxqt-md5sum        "90b4882c9f84d7dd45129773140942bd">
-  <!ENTITY libdbusmenu-lxqt-size          "40 KB">
-  <!ENTITY libdbusmenu-lxqt-buildsize     "8.1 MB">
-  <!ENTITY libdbusmenu-lxqt-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="libdbusmenu-qt" xreflabel="libdbusmenu-lxqt-&libdbusmenu-lxqt-version;">
-  <?dbhtml filename="libdbusmenu-lxqt.html"?>
-
-
-  <title>libdbusmenu-lxqt-&libdbusmenu-lxqt-version;</title>
-
-  <indexterm zone="libdbusmenu-qt">
-    <primary sortas="a-libdbusmenu-lxqt">libdbusmenu-lxqt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdbusmenu-lxqt</title>
-
-    <para>
-      The <application>libdbusmenu-lxqt</application> package provides a
-      Qt implementation of the DBusMenu protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdbusmenu-lxqt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdbusmenu-lxqt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdbusmenu-lxqt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdbusmenu-lxqt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdbusmenu-lxqt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdbusmenu-lxqt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdbusmenu-lxqt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/flavio/qjson">qjson</ulink> 
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdbusmenu-lxqt</title>
-
-    <para>
-      Install <application>libdbusmenu-lxqt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdbusmenu-lxqt.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/dbusmenu-lxqt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqtlxqt-lib">
-        <term><filename class="libraryfile">libqtlxqt.so</filename></term>
-        <listitem>
-          <para>
-            contains the LXQt QT plugin loader
-          </para>
-          <indexterm zone="libdbusmenu-lxqt libqtlxqt-lib">
-            <primary sortas="c-libqtlxqt">libqtlxqt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: qt/desktop/libfm-extra.xml
===================================================================
--- lxqt/desktop/libfm-extra.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-buildsize     "11 MB">
-  <!ENTITY libfm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libfm-extra" xreflabel="libfm-extra-&libfm-extra-version;">
-  <?dbhtml filename="libfm-extra.html"?>
-
-
-  <title>libfm-extra-&libfm-extra-version;</title>
-
-  <indexterm zone="libfm-extra">
-    <primary sortas="a-libfm-extra">libfm-extra</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libfm-extra</title>
-
-    <para>
-      The <application>libfm-extra</application> package contains a library and
-      other files required by the <command>menu-cache-gen</command> program in 
-      /usr/bin/libexec installed by <xref linkend="menu-cache"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libfm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libfm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libfm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libfm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libfm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libfm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libfm-extra Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libexif"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="lxmenu-data"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libfm-extra</title>
-
-    <para>
-      Install <application>libfm-extra</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --with-extra-only \
-            --with-gtk=no     \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-extra-only</parameter>: This switch disables all
-      components except for the 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.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libfm-extra.so
-        </seg>
-        <seg>
-          /usr/include/libfm (symlink) and
-          /usr/include/libfm-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfm-extra-lib">
-        <term><filename class="libraryfile">libfm-extra.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libfm-extra</application> API functions
-          </para>
-          <indexterm zone="libfm-extra libfm-extra-lib">
-            <primary sortas="c-libfm-extra">libfm-extra.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/libfm-qt.xml
===================================================================
--- lxqt/desktop/libfm-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libfm-qt-download-http "https://github.com/lxqt/libfm-qt/releases/download/&lxqt-version;/libfm-qt-&lxqt-version;.tar.xz">
-  <!ENTITY libfm-qt-download-ftp  " ">
-  <!ENTITY libfm-qt-md5sum        "364155e5d3450a8ad6e08614ef5ccfe3">
-  <!ENTITY libfm-qt-size          "404 KB">
-  <!ENTITY libfm-qt-buildsize     "30 MB">
-  <!ENTITY libfm-qt-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="libfm-qt" xreflabel="libfm-qt-&lxqt-version;">
-  <?dbhtml filename="libfm-qt.html"?>
-
-
-  <title>libfm-qt-&lxqt-version;</title>
-
-  <indexterm zone="libfm-qt">
-    <primary sortas="a-libfm-qt">libfm-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libfm-qt</title>
-
-    <para>
-      <application>libfm-qt</application> is the Qt port of libfm, a library
-      providing components to build desktop file managers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libfm-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libfm-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libfm-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libfm-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libfm-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libfm-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libfm-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="menu-cache"/>, and
-      <xref linkend="qt6"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libfm-qt</title>
-
-    <para>
-      Install <application>libfm-qt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>
-          libfm-qt6.so
-        </seg>
-        <seg>
-          /usr/include/libfm-qt6,
-          /usr/share/libfm-qt6, and
-          /usr/share/cmake/fm-qt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfm-qt-lib">
-        <term><filename class="libraryfile">libfm-qt6.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libfm-qt6</application> API functions
-          </para>
-          <indexterm zone="libfm-qt libfm-qt-lib">
-            <primary sortas="c-libfm-qt">libfm-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/liblxqt.xml
===================================================================
--- lxqt/desktop/liblxqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liblxqt-download-http "https://github.com/lxqt/liblxqt/releases/download/&lxqt-version;/liblxqt-&lxqt-version;.tar.xz">
-  <!ENTITY liblxqt-download-ftp  " ">
-  <!ENTITY liblxqt-md5sum        "c1c51cb0d759cc6beb8b576b5a2c8285">
-  <!ENTITY liblxqt-size          "84 KB">
-  <!ENTITY liblxqt-buildsize     "7.8 MB">
-  <!ENTITY liblxqt-time          "0.3 SBU">
-]>
-
-<sect1 id="liblxqt" xreflabel="liblxqt-&lxqt-version;">
-  <?dbhtml filename="liblxqt.html"?>
-
-
-  <title>liblxqt-&lxqt-version;</title>
-
-  <indexterm zone="liblxqt">
-    <primary sortas="a-liblxqt">liblxqt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liblxqt</title>
-
-    <para>
-      The <application>liblxqt</application> is the core utility library for all
-      <application>LXQt</application> components.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liblxqt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liblxqt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liblxqt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liblxqt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liblxqt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liblxqt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liblxqt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libqtxdg"/>,
-      <xref linkend="lxqt-kwindowsystem"/>, and
-      <xref linkend="polkit-qt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liblxqt</title>
-
-    <para>
-      Install <application>liblxqt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-backlight_backend
-        </seg>
-        <seg>
-          liblxqt.so
-        </seg>
-        <seg>
-          /usr/include/lxqt and
-          /usr/share/cmake/lxqt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-backlight_backend">
-        <term><command>lxqt-backlight_backend</command></term>
-        <listitem>
-          <para>
-            sets the backlight level for a display
-          </para>
-          <indexterm zone="liblxqt lxqt-backlight_backend">
-            <primary sortas="b-lxqt-backlight_backend">lxqt-backlight_backend</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblxqt-lib">
-        <term><filename class="libraryfile">liblxqt.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt</application> API functions
-          </para>
-          <indexterm zone="liblxqt liblxqt-lib">
-            <primary sortas="c-liblxqt">liblxqt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/libqtxdg.xml
===================================================================
--- lxqt/desktop/libqtxdg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqtxdg-download-http "https://github.com/lxqt/libqtxdg/releases/download/&libqtxdg-version;/libqtxdg-&libqtxdg-version;.tar.xz">
-  <!ENTITY libqtxdg-download-ftp  " ">
-  <!ENTITY libqtxdg-md5sum        "4aaf75449cb6c8251f3b2fc21e4c5122">
-  <!ENTITY libqtxdg-size          "72 KB">
-  <!ENTITY libqtxdg-buildsize     "9.5 MB">
-  <!ENTITY libqtxdg-time          "0.3 SBU">
-]>
-
-<sect1 id="libqtxdg" xreflabel="libqtxdg-&libqtxdg-version;">
-  <?dbhtml filename="libqtxdg.html"?>
-
-
-  <title>libqtxdg-&libqtxdg-version;</title>
-
-  <indexterm zone="libqtxdg">
-    <primary sortas="a-libqtxdg">libqtxdg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqtxdg</title>
-
-    <para>
-      The <application>libqtxdg</application> is a Qt implementation of the
-      freedesktop.org xdg specifications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqtxdg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqtxdg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqtxdg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqtxdg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqtxdg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqtxdg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqtxdg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="gtk3"/>
-          (for <command>gtk-update-icon-cache</command>)
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libqtxdg"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqtxdg</title>
-
-    <para>
-      Install <application>libqtxdg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..       &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TESTS=ON</option>: Use this option if you wish to build
-      tests. If you pass this option, you can run the tests by executing:
-      <command>make test</command>.
-    </para>
-
-    <para>
-      <option>-DBUILD_DEV_UTILS=ON</option>: Use this switch if you wish to
-      build and install the development utilities.
-    </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>
-          libQt6Xdg.so and libQt6XdgIconLoader.so
-        </seg>
-        <seg>
-          /usr/include/{qt6xdg,qt6xdgiconloader} and
-          /usr/share/cmake/{qt6xdg,qt6xdgiconloader}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libQt6Xdg-lib">
-        <term><filename class="libraryfile">libQt6Xdg.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libQt6Xdg</application> API functions
-          </para>
-          <indexterm zone="libqtxdg libQt6Xdg-lib">
-            <primary sortas="c-libQt6Xdg">libQt6Xdg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQt6XdgIconLoader-lib">
-        <term><filename class="libraryfile">libQt6XdgIconLoader.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libQt6XdgIconLoader</application> API functions
-          </para>
-          <indexterm zone="libqtxdg libQt6XdgIconLoader-lib">
-            <primary sortas="c-libQt6XdgIconLoader">libQt6XdgIconLoader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/libsysstat.xml
===================================================================
--- lxqt/desktop/libsysstat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsysstat-download-http "https://github.com/lxqt/libsysstat/releases/download/&libsysstat-version;/libsysstat-&libsysstat-version;.tar.xz">
-  <!ENTITY libsysstat-download-ftp  " ">
-  <!ENTITY libsysstat-md5sum        "8a48fa8de906f9e73bd9ef91e39128eb">
-  <!ENTITY libsysstat-size          "20 KB">
-  <!ENTITY libsysstat-buildsize     "2.1 MB">
-  <!ENTITY libsysstat-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libsysstat" xreflabel="libsysstat-&libsysstat-version;">
-  <?dbhtml filename="libsysstat.html"?>
-
-
-  <title>libsysstat-&libsysstat-version;</title>
-
-  <indexterm zone="libsysstat">
-    <primary sortas="a-libsysstat">libsysstat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsysstat</title>
-
-    <para>
-      The <application>libsysstat</application> package contains a library used
-      to query system information and statistics.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsysstat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsysstat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsysstat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsysstat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsysstat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsysstat-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsysstat Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-build-tools"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libsysstat"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsysstat</title>
-
-    <para>
-      Install <application>libsysstat</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libsysstat-qt6.so
-        </seg>
-        <seg>
-          /usr/include/sysstat-qt6 and
-          /usr/share/cmake/sysstat-qt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsysstat-qt6">
-        <term><filename class="libraryfile">libsysstat-qt6.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libsysstat-qt6</application> API
-            functions
-          </para>
-          <indexterm zone="libsysstat libsysstat-qt6">
-            <primary sortas="c-libsysstat-qt6">libsysstat-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-about.xml
===================================================================
--- lxqt/desktop/lxqt-about.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-about-download-http "https://github.com/lxqt/lxqt-about/releases/download/&lxqt-version;/lxqt-about-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-about-download-ftp  " ">
-  <!ENTITY lxqt-about-md5sum        "ec17b9089bbf2dc5dfdfbcca196543f6">
-  <!ENTITY lxqt-about-size          "48 KB">
-  <!ENTITY lxqt-about-buildsize     "3.4 MB">
-  <!ENTITY lxqt-about-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-about" xreflabel="lxqt-about-&lxqt-version;">
-  <?dbhtml filename="lxqt-about.html"?>
-
-
-  <title>lxqt-about-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-about">
-    <primary sortas="a-lxqt-about">lxqt-about</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-about</title>
-
-    <para>
-      The <application>lxqt-about</application> package provides the standalone
-      <application>LXQt</application> <quote>About</quote> dialog.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-about-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-about-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-about-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-about-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-about-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-about-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-about Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-about</title>
-
-    <para>
-      Install <application>lxqt-about</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-about
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-about-prog">
-        <term><command>lxqt-about</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> <quote>About</quote> dialog
-          </para>
-          <indexterm zone="lxqt-about lxqt-about-prog">
-            <primary sortas="b-lxqt-about">lxqt-about</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-admin.xml
===================================================================
--- lxqt/desktop/lxqt-admin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-admin-download-http "https://github.com/lxqt/lxqt-admin/releases/download/&lxqt-version;/lxqt-admin-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-admin-download-ftp  " ">
-  <!ENTITY lxqt-admin-md5sum        "afc939f22db9e40d45508191a8c7ec04">
-  <!ENTITY lxqt-admin-size          "152 KB">
-  <!ENTITY lxqt-admin-buildsize     "4.5 MB">
-  <!ENTITY lxqt-admin-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-admin" xreflabel="lxqt-admin-&lxqt-version;">
-  <?dbhtml filename="lxqt-admin.html"?>
-
-
-  <title>lxqt-admin-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-admin">
-    <primary sortas="a-lxqt-admin">lxqt-admin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-admin</title>
-
-    <para>
-      The <application>lxqt-admin</application> package provides two GUI tools
-      to adjust settings of the operating system
-      <application>LXQt</application> is running on.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-admin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-admin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-admin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-admin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-admin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-admin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-admin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-admin</title>
-
-    <para>
-      Install <application>lxqt-admin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-admin-time, 
-          lxqt-admin-user, and 
-          lxqt-admin-user-helper
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-admin-time">
-        <term><command>lxqt-admin-time</command></term>
-        <listitem>
-          <para>
-            is a GUI to adjust the current time and date
-          </para>
-          <indexterm zone="lxqt-admin lxqt-admin-time">
-            <primary sortas="b-lxqt-admin-time">lxqt-admin-time</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-admin-user">
-        <term><command>lxqt-admin-user</command></term>
-        <listitem>
-          <para>
-            is a GUI to manage users and groups
-          </para>
-          <indexterm zone="lxqt-admin lxqt-admin-user">
-            <primary sortas="b-lxqt-admin-user">lxqt-admin-user</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-build-tools.xml
===================================================================
--- lxqt/desktop/lxqt-build-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-build-tools-download-http "https://github.com/lxqt/lxqt-build-tools/releases/download/&lxqt-version;/lxqt-build-tools-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-build-tools-download-ftp  " ">
-  <!ENTITY lxqt-build-tools-md5sum        "f6b52c3a792dd48d7debfa90eed52f3b">
-  <!ENTITY lxqt-build-tools-size          "28 KB">
-  <!ENTITY lxqt-build-tools-buildsize     "1.0 MB">
-  <!ENTITY lxqt-build-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-build-tools" xreflabel="lxqt-build-tools-&lxqt-version;">
-  <?dbhtml filename="lxqt-build-tools.html"?>
-
-
-  <title>lxqt-build-tools-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-build-tools">
-    <primary sortas="a-lxqt-build-tools">lxqt-build-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-build-tools</title>
-
-    <para>
-      The <application>lxqt-build-tools</application> package provides several
-      tools needed to build LXQt itself as well as other components maintained
-      by the LXQt project.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-build-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-build-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-build-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-build-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-build-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-build-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-build-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-build-tools"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-build-tools</title>
-
-    <para>
-      Install <application>lxqt-build-tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      .. &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt2-transupdate
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-         /usr/share/cmake/lxqt2-build-tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt2-transupdate">
-        <term><command>lxqt2-transupdate</command></term>
-        <listitem>
-          <para>
-            updates translations for LXQt components
-          </para>
-          <indexterm zone="lxqt-build-tools lxqt2-transupdate">
-            <primary sortas="b-lxqt2-transupdate">lxqt2-transupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-config.xml
===================================================================
--- lxqt/desktop/lxqt-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-config-download-http "https://github.com/lxqt/lxqt-config/releases/download/&lxqt-version;/lxqt-config-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-config-download-ftp  " ">
-  <!ENTITY lxqt-config-md5sum        "3c5064b356b4d457258252bd521f3372">
-  <!ENTITY lxqt-config-size          "372 KB">
-  <!ENTITY lxqt-config-buildsize     "27 MB">
-  <!ENTITY lxqt-config-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="lxqt-config" xreflabel="lxqt-config-&lxqt-version;">
-  <?dbhtml filename="lxqt-config.html"?>
-
-
-  <title>lxqt-config-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-config">
-    <primary sortas="a-lxqt-config">lxqt-config</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-config</title>
-
-    <para>
-      The <application>lxqt-config</application> package provides the
-      <application>LXQt</application> Configuration Center.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-config-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-config-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-config-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-config-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-config-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-config-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-config Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      <xref linkend="lxqt-kconfig"/>,
-      <xref linkend="lxqt-libkscreen"/>, and
-      <xref linkend="xorg-libinput-driver"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-config</title>
-
-    <para>
-      Install <application>lxqt-config</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config,
-          lxqt-config-appearance,
-          lxqt-config-brightness,
-          lxqt-config-file-associations,
-          lxqt-config-input,
-          lxqt-config-locale, and
-          lxqt-config-monitor
-        </seg>
-        <seg>
-          liblxqt-config-cursor.so
-        </seg>
-        <seg>
-          /usr/lib/lxqt-config
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-prog">
-        <term><command>lxqt-config</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> Configuration Center
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-prog">
-            <primary sortas="b-lxqt-config">lxqt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-appearance">
-        <term><command>lxqt-config-appearance</command></term>
-        <listitem>
-          <para>
-            is used to change system themes, icon themes, and fonts used by
-            applications in an LXQt session
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-appearance">
-            <primary sortas="b-lxqt-config-appearance">lxqt-config-appearance</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-brightness">
-        <term><command>lxqt-config-brightness</command></term>
-        <listitem>
-          <para>
-            configures the brightness setting of a monitor
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-brightness">
-            <primary sortas="b-lxqt-config-brightness">lxqt-config-brightness</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-file-associations">
-        <term><command>lxqt-config-file-associations</command></term>
-        <listitem>
-          <para>
-            is used to associate filetypes with programs
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-file-associations">
-            <primary sortas="b-lxqt-config-file-associations">lxqt-config-file-associations</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-input">
-        <term><command>lxqt-config-input</command></term>
-        <listitem>
-          <para>
-            is used to configure input devices, setting options such as the
-            mouse speed, the cursor, the keyboard speed, and the keyboard layout
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-input">
-            <primary sortas="b-lxqt-config-input">lxqt-config-input</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-locale">
-        <term><command>lxqt-config-locale</command></term>
-        <listitem>
-          <para>
-            configures the locale used in <application>LXQt</application>
-            sessions
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-locale">
-            <primary sortas="b-lxqt-config-locale">lxqt-config-locale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-config-monitor">
-        <term><command>lxqt-config-monitor</command></term>
-        <listitem>
-          <para>
-            is a graphical frontend to <application>xrandr</application> that
-            configures monitors on a system
-          </para>
-          <indexterm zone="lxqt-config lxqt-config-monitor">
-            <primary sortas="b-lxqt-config-monitor">lxqt-config-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblxqt-config-cursor-lib">
-        <term><filename class="libraryfile">liblxqt-config-cursor.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt-config-cursor</application> API
-            functions
-          </para>
-          <indexterm zone="lxqt-config liblxqt-config-cursor-lib">
-            <primary sortas="c-liblxqt-config-cursor">liblxqt-config-cursor.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-globalkeys.xml
===================================================================
--- lxqt/desktop/lxqt-globalkeys.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-globalkeys-download-http "https://github.com/lxqt/lxqt-globalkeys/releases/download/&lxqt-version;/lxqt-globalkeys-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-globalkeys-download-ftp  " ">
-  <!ENTITY lxqt-globalkeys-md5sum        "c919f92964fb62953af831618955f9a3">
-  <!ENTITY lxqt-globalkeys-size          "76 KB">
-  <!ENTITY lxqt-globalkeys-buildsize     "12 MB">
-  <!ENTITY lxqt-globalkeys-time          "0.5 SBU">
-]>
-
-<sect1 id="lxqt-globalkeys" xreflabel="lxqt-globalkeys-&lxqt-version;">
-  <?dbhtml filename="lxqt-globalkeys.html"?>
-
-
-  <title>lxqt-globalkeys-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-globalkeys">
-    <primary sortas="a-lxqt-globalkeys">lxqt-globalkeys</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-globalkeys</title>
-
-    <para>
-      The <application>lxqt-globalkeys</application> package contains a daemon
-      used to register global keyboard shortcuts as well as an editor for
-      keyboard shortcuts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-globalkeys-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-globalkeys-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-globalkeys-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-globalkeys-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-globalkeys-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-globalkeys-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-globalkeys Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-globalkeys</title>
-
-    <para>
-      Install <application>lxqt-globalkeys</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-globalkeyshortcuts and
-          lxqt-globalkeysd
-        </seg>
-        <seg>
-          liblxqt-globalkeys.so and
-          liblxqt-globalkeys-ui.so
-        </seg>
-        <seg>
-          /usr/include/lxqt-globalkeys{,-ui} and
-          /usr/share/cmake/lxqt-globalkeys{,-ui}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-globalkeyshortcuts">
-        <term><command>lxqt-config-globalkeyshortcuts</command></term>
-        <listitem>
-          <para>
-            is an editor for keyboard shortcuts
-          </para>
-          <indexterm zone="lxqt-globalkeys lxqt-config-globalkeyshortcuts">
-            <primary sortas="b-lxqt-config-globalkeyshortcuts">lxqt-config-globalkeyshortcuts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-globalkeysd">
-        <term><command>lxqt-globalkeysd</command></term>
-        <listitem>
-          <para>
-            is the global keyboard shortcut daemon
-          </para>
-          <indexterm zone="lxqt-globalkeys lxqt-globalkeysd">
-            <primary sortas="b-lxqt-globalkeysd">lxqt-globalkeysd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-globalkeys-lib">
-        <term><filename class="libraryfile">lxqt-globalkeys.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>lxqt-globalkeys</application> API
-            functions
-          </para>
-          <indexterm zone="lxqt-globalkeys lxqt-globalkeys-lib">
-            <primary sortas="c-lxqt-globalkeys">lxqt-globalkeys.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblxqt-globalkeys-ui-lib">
-        <term><filename class="libraryfile">liblxqt-globalkeys-ui.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>liblxqt-globalkeys-ui</application> API
-            functions
-          </para>
-          <indexterm zone="lxqt-globalkeys liblxqt-globalkeys-ui-lib">
-            <primary sortas="c-liblxqt-globalkeys-ui">liblxqt-globalkeys-ui.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-kconfig.xml
===================================================================
--- lxqt/desktop/lxqt-kconfig.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kconfig-download-http "&kf6-download-http;/kconfig-&kf6-version;.tar.xz">
-  <!ENTITY kconfig-download-ftp  " ">
-  <!ENTITY kconfig-md5sum        "50c79892fb59a879fa929cc23f377b9c">
-  <!ENTITY kconfig-size          "288 KB">
-  <!ENTITY kconfig-buildsize     "24 MB">
-  <!ENTITY kconfig-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="lxqt-kconfig" xreflabel="kconfig-&kf6-version; for lxqt">
-  <?dbhtml filename="lxqt-kconfig.html"?>
-
-
-  <title>kconfig-&kf6-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kconfig">
-    <primary sortas="a-kconfig">kconfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kconfig</title>
-
-    <para>
-      The <application>kconfig</application> package provides access to
-      configuration files.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the KF6 set of packages.
-        If <xref linkend="kf6-frameworks"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kconfig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kconfig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kconfig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kconfig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kconfig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kconfig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kconfig Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kconfig</title>
-
-    <para>
-      Install <application>kconfig</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake - DCMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kreadconfig6 and
-          kwriteconfig6
-        </seg>
-        <seg>
-          libKF6ConfigCore.so,
-          libKF6ConfigGui.so, and
-          libKF6ConfigQml.so
-        </seg>
-        <seg>
-          /usr/lib/libexec/kf6,
-          /usr/lib/qml/org/kde/config,
-          /usr/lib/cmake/KF6Config, and
-          /usr/include/KF6/{KConfigCore,KConfig,KConfigQml,KConfigGui}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kconfig-kreadconfig6">
-        <term><command>kreadconfig6</command></term>
-        <listitem>
-          <para>
-            reads a configuration file using the KConfig interface
-          </para>
-          <indexterm zone="lxqt-kconfig kreadconfig6">
-            <primary sortas="b-kreadconfig6">kreadconfig6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-kconfig-kwriteconfig6">
-        <term><command>kwriteconfig6</command></term>
-        <listitem>
-          <para>
-            writes to a configuration file using the KConfig interface
-          </para>
-          <indexterm zone="lxqt-kconfig kwriteconfig6">
-            <primary sortas="b-kwriteconfig6">kwriteconfig6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-kconfig-libKF6ConfigCore">
-        <term><filename class="libraryfile">libKF6ConfigCore.so</filename></term>
-        <listitem>
-          <para>
-            contains the core configuration library for KF6
-          </para>
-          <indexterm zone="lxqt-kconfig lxqt-kconfig-libKF6ConfigCore">
-            <primary sortas="c-libKF6ConfigCore">libKF6ConfigCore.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-kconfig-libKF6ConfigGui">
-        <term><filename class="libraryfile">libKF6ConfigGui.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for a GUI for KConfig
-          </para>
-          <indexterm zone="lxqt-kconfig lxqt-kconfig-libKF6ConfigGui">
-            <primary sortas="c-libKF6ConfigGui">libKF6ConfigGui.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-       <varlistentry id="lxqt-kconfig-libKF6ConfigQml">
-        <term><filename class="libraryfile">libKF6ConfigQml.so</filename></term>
-        <listitem>
-          <para>
-            contains a QML interface to KConfig
-          </para>
-          <indexterm zone="lxqt-kconfig lxqt-kconfig-libKF6ConfigQml">
-            <primary sortas="c-libKF6ConfigQml">libKF6ConfigQml.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-kidletime.xml
===================================================================
--- lxqt/desktop/lxqt-kidletime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kidletime-download-http "&kf6-download-http;/kidletime-&kf6-version;.tar.xz">
-  <!ENTITY kidletime-download-ftp  " ">
-  <!ENTITY kidletime-md5sum        "6305247d06bb9b28b4eaca9bb04c5b8d">
-  <!ENTITY kidletime-size          "32 KB">
-  <!ENTITY kidletime-buildsize     "5.3 MB">
-  <!ENTITY kidletime-time          "0.2 SBU">
-]>
-
-<sect1 id="lxqt-kidletime" xreflabel="kidletime-&kf6-version; for lxqt">
-  <?dbhtml filename="lxqt-kidletime.html"?>
-
-
-  <title>kidletime-&kf6-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kidletime">
-    <primary sortas="a-kidletime">kidletime</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kidletime</title>
-
-    <para>
-      KIdleTime is used to report the idle time of users and the system. It is
-      useful not only for determining the current idle time of the PC,
-      but also for getting notified upon idle time events, such as custom
-      timeouts or user activity.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the KF6 set of packages.
-        If <xref linkend="kf6-frameworks"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kidletime-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kidletime-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kidletime-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kidletime-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kidletime-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kidletime-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kidletime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="plasma-wayland-protocols"/>, and
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kidletime</title>
-
-    <para>
-      Install <application>kidletime</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>
-          libKF6IdleTime.so
-        </seg>
-        <seg>
-          /usr/lib/plugins/kf6/org.kde.kidletime.platforms,
-          /usr/lib/cmake/KF6IdleTime, and
-          /usr/include/KF6/KIdleTime
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kidletime-lib">
-        <term><filename class="libraryfile">libKF6IdleTime.so</filename></term>
-        <listitem>
-          <para>
-            contains the KDE API for idle time reports
-          </para>
-          <indexterm zone="lxqt-kidletime-lib">
-            <primary sortas="c-libKF6IdleTime.so">libKF6IdleTime.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-kwayland.xml
===================================================================
--- lxqt/desktop/lxqt-kwayland.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kwayland-download-http "http://download.kde.org/stable/plasma/&plasma-version;/kwayland-&plasma-version;.tar.xz">
-  <!ENTITY kwayland-download-ftp  " ">
-  <!ENTITY kwayland-md5sum        "7c2273b104ff7f83930d3e6d92b6c458">
-  <!ENTITY kwayland-size          "232 KB">
-  <!ENTITY kwayland-buildsize     "24 MB">
-  <!ENTITY kwayland-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="lxqt-kwayland" xreflabel="kwayland-&plasma-version; for lxqt">
-  <?dbhtml filename="lxqt-kwayland.html"?>
-
-
-  <title>kwayland-&plasma-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kwayland">
-    <primary sortas="a-kwayland">kwayland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kwayland</title>
-
-    <para>
-      <application>kwayland</application> is a Qt-style API to interact with
-      the <application>wayland-client</application> and
-      <application>wayland-server</application> API.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the KF6 set of packages.
-        If <xref linkend="kf6-frameworks"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kwayland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kwayland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kwayland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kwayland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kwayland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kwayland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kwayland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="mesa"/> (built with <xref linkend="wayland"/> support),
-      <xref linkend="plasma-wayland-protocols"/>, and
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kwayland</title>
-
-    <para>
-      Install <application>kwayland</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>
-          libKWaylandClient.so 
-        </seg>
-        <seg>
-          /usr/include/KWayland, and
-          /usr/lib/cmake/KWayland
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kwayland-client">
-        <term><filename class="libraryfile">libKWaylandClient.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>wayland-client</application> Qt-style
-            wrapper library
-          </para>
-          <indexterm zone="lxqt-kwayland-client">
-            <primary sortas="c-libKF5WaylandClient">libKF5WaylandClient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-kwindowsystem.xml
===================================================================
--- lxqt/desktop/lxqt-kwindowsystem.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kwindowsystem-download-http "&kf6-download-http;/kwindowsystem-&kf6-version;.tar.xz">
-  <!ENTITY kwindowsystem-download-ftp  " ">
-  <!ENTITY kwindowsystem-md5sum        "0157d6b3717278454e4d4890d37537c7">
-  <!ENTITY kwindowsystem-size          "2.3 MB">
-  <!ENTITY kwindowsystem-buildsize     "73 MB">
-  <!ENTITY kwindowsystem-time          "0.6 SBU">
-]>
-
-<sect1 id="lxqt-kwindowsystem" xreflabel="kwindowsystem-&kf6-version; for lxqt">
-  <?dbhtml filename="lxqt-kwindowsystem.html"?>
-
-
-  <title>kwindowsystem-&kf6-version; for lxqt</title>
-
-  <indexterm zone="lxqt-kwindowsystem">
-    <primary sortas="a-kwindowsystem">kwindowsystem</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kwindowsystem</title>
-
-    <para>
-      The <application>kwindowsystem</application> provides information about,
-      and allows interaction with, the windowing system. It provides a high
-      level API that is windowing system independent and has platform specific
-      implementations.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the KF6 set of packages.
-        If <xref linkend="kf6-frameworks"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kwindowsystem-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kwindowsystem-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kwindowsystem-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kwindowsystem-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kwindowsystem-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kwindowsystem-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kwindowsystem Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="plasma-wayland-protocols"/>,
-      <xref linkend="qt6"/>, and
-      <xref linkend="xorg7-lib"/> 
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/kwindowsystem"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kwindowsystem</title>
-
-    <para>
-      Install <application>kwindowsystem</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>
-          libKF5WindowSystem.so
-        </seg>
-        <seg>
-          $QT6DIR/qml/org/kde,
-          $QT6DIR/plugins/kf6,
-          /usr/share/qlogging-categories6,
-          /usr/lib/cmake/KF5WindowSystem, and
-          /usr/include/KF6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-kwindowsystem-lib">
-        <term><filename class="libraryfile">libKF5WindowSystem.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>KF5 Windowing</application> API functions
-          </para>
-          <indexterm zone="lxqt-kwindowsystem-lib">
-            <primary sortas="c-libKF5WindowSystem">libKF5WindowSystem.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-layer-shell.xml
===================================================================
--- lxqt/desktop/lxqt-layer-shell.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 layer-shell-download-http "http://download.kde.org/stable/plasma/&plasma-version;/layer-shell-qt-&plasma-version;.tar.xz">
-  <!ENTITY layer-shell-download-ftp  " ">
-  <!ENTITY layer-shell-md5sum        "c1206b4c182b3a01614d0a6ade96e76c">
-  <!ENTITY layer-shell-size          "24 KB">
-  <!ENTITY layer-shell-buildsize     "4.9 MB">
-  <!ENTITY layer-shell-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="layer-shell-qt" xreflabel="layer-shell-qt-&plasma-version; for lxqt">
-  <?dbhtml filename="lxqt-layer-shell-qt.html"?>
-
-  <title>layer-shell-qt-&plasma-version; for lxqt</title>
-
-  <indexterm zone="layer-shell-qt">
-    <primary sortas="a-layer-shell-qt">layer-shell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to layer-shell-qt</title>
-
-    <para>
-      This component is meant for applications to be able to easily 
-      use clients based on a "wtl-layer-shell" protocol. Clients can use 
-      this interface to assign the surface_layer role to
-      wl_surfaces. Such surfaces are assigned to a "layer" of the output and
-      rendered with a defined z-depth respective to each other.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the plasma set of packages.
-        If <xref linkend="plasma-build"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&layer-shell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&layer-shell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &layer-shell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &layer-shell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &layer-shell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &layer-shell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">layer-shell-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt6"/> 
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of layer-shell</title>
-
-    <para>
-      Install <application>layer-shell-qt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>
-          libLayerShellQtInterface.so
-        </seg>
-        <seg>
-          /usr/lib/qml/org/kde/layershell,
-          /usr/include/LayerShellQt, and
-          /usr/lib/wayland-shell-integration
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-libkscreen.xml
===================================================================
--- lxqt/desktop/lxqt-libkscreen.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libkscreen-download-http "http://download.kde.org/stable/plasma/&plasma-version;/libkscreen-&plasma-version;.tar.xz">
-  <!ENTITY libkscreen-download-ftp  " ">
-  <!ENTITY libkscreen-md5sum        "1f1d12d08bcf9309ab1c49641bb8eaf3">
-  <!ENTITY libkscreen-size          "116 KB">
-  <!ENTITY libkscreen-buildsize     "19 MB">
-  <!ENTITY libkscreen-time          "0.3 SBU (using parallelism=4)">
-]>
-
-<sect1 id="lxqt-libkscreen" xreflabel="libkscreen-&plasma-version; for lxqt">
-  <?dbhtml filename="lxqt-libkscreen.html"?>
-
-
-  <title>libkscreen-&plasma-version; for lxqt</title>
-
-  <indexterm zone="lxqt-libkscreen">
-    <primary sortas="a-libkscreen">libkscreen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libkscreen</title>
-
-    <para>
-      The <application>libkscreen</application> package contains the
-      KDE Screen Management library.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the plasma set of packages.
-        If <xref linkend="plasma-build"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libkscreen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libkscreen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libkscreen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libkscreen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libkscreen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libkscreen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libkscreen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="plasma-wayland-protocols"/> and
-      <xref linkend="qt6"/> 
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libkscreen</title>
-
-    <para>
-      Install <application>libkscreen</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para revision="sysv">
-      Next, remove a systemd unit which serves no purpose on a SysV system as
-      the &root; user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -v /usr/lib/systemd/user/plasma-kscreen.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kscreen-doctor
-        </seg>
-        <seg>
-          libKF6Screen.so and
-          libKF6ScreenDpms.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/KF6Screen,
-          /usr/include/KF6/KScreen, and
-          /usr/lib/plugins/kf6/kscreen
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-libkscreen-kscreen-doctor">
-        <term><command>kscreen-doctor</command></term>
-        <listitem>
-          <para>
-            allows modifying the screen setup from the command line
-          </para>
-          <indexterm zone="lxqt-libkscreen lxqt-libkscreen-kscreen-doctor">
-            <primary sortas="b-kscreen-doctor">kscreen-doctor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-libkscreen-lib">
-        <term><filename class="libraryfile">libKF6Screen.so</filename></term>
-        <listitem>
-          <para>
-            contains the KDE Screen Management library
-          </para>
-          <indexterm zone="lxqt-libkscreen-lib">
-            <primary sortas="c-libKF6Screen">libKF6Screen.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-        <varlistentry id="lxqt-libkscreen-dpms-lib">
-        <term><filename class="libraryfile">libKF6ScreenDpms.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling DPMS
-          </para>
-          <indexterm zone="lxqt-libkscreen-dpms-lib">
-            <primary sortas="c-libKF6ScreenDpms">libKF6ScreenDpms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-menu-data.xml
===================================================================
--- lxqt/desktop/lxqt-menu-data.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-menu-data-download-http "https://github.com/lxqt/lxqt-menu-data/releases/download/&lxqt-version;/lxqt-menu-data-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-menu-data-download-ftp  " ">
-  <!ENTITY lxqt-menu-data-md5sum        "ba924239447b2d5d19c3024871fba199">
-  <!ENTITY lxqt-menu-data-size          "56 KB">
-  <!ENTITY lxqt-menu-data-buildsize     "1.8 MB">
-  <!ENTITY lxqt-menu-data-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-menu-data" xreflabel="lxqt-menu-data-&lxqt-version;">
-  <?dbhtml filename="lxqt-menu-data.html"?>
-
-
-  <title>lxqt-menu-data-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-menu-data">
-    <primary sortas="a-lxqt-menu-data">lxqt-menu-data</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-menu-data</title>
-
-    <para>
-      The <application>lxqt-menu-data</application> package contains compliant
-      menu files for LXQt.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-menu-data-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-menu-data-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-menu-data-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-menu-data-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-menu-data-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-menu-data-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-menu-data Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-build-tools"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-menu-data"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-menu-data</title>
-
-    <para>
-      Install <application>lxqt-menu-data</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/xdg/menus,
-          /usr/share/desktop-directories, and
-          /usr/share/cmake/lxqt-menu-data
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-openssh-askpass.xml
===================================================================
--- lxqt/desktop/lxqt-openssh-askpass.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-openssh-askpass-download-http "https://github.com/lxqt/lxqt-openssh-askpass/releases/download/&lxqt-version;/lxqt-openssh-askpass-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-openssh-askpass-download-ftp  " ">
-  <!ENTITY lxqt-openssh-askpass-md5sum        "905fed7b4db6bf74af44f390f52a75be">
-  <!ENTITY lxqt-openssh-askpass-size          "20 KB">
-  <!ENTITY lxqt-openssh-askpass-buildsize     "2.0 MB">
-  <!ENTITY lxqt-openssh-askpass-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-openssh-askpass" xreflabel="lxqt-openssh-askpass-&lxqt-version;">
-  <?dbhtml filename="lxqt-openssh-askpass.html"?>
-
-
-  <title>lxqt-openssh-askpass-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-openssh-askpass">
-    <primary sortas="a-lxqt-openssh-askpass">lxqt-openssh-askpass</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-openssh-askpass</title>
-
-    <para>
-      The <application>lxqt-openssh-askpass</application> package is a GUI
-      to query credentials on behalf of other programs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-openssh-askpass-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-openssh-askpass-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-openssh-askpass-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-openssh-askpass-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-openssh-askpass-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-openssh-askpass-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-openssh-askpass Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-openssh-askpass</title>
-
-    <para>
-      Install <application>lxqt-openssh-askpass</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-openssh-askpass
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt/translations/lxqt-openssh-askpass
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-openssh-askpass-prog">
-        <term><command>lxqt-config-openssh-askpass</command></term>
-        <listitem>
-          <para>
-            queries a user for credentials on behalf of another program
-          </para>
-          <indexterm zone="lxqt-openssh-askpass lxqt-openssh-askpass-prog">
-            <primary sortas="b-lxqt-openssh-askpass">lxqt-openssh-askpass</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-panel.xml
===================================================================
--- lxqt/desktop/lxqt-panel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-panel-download-http "https://github.com/lxqt/lxqt-panel/releases/download/&lxqt-version;/lxqt-panel-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-panel-download-ftp  " ">
-  <!ENTITY lxqt-panel-md5sum        "2e0eabd4730e411ccee0d27b3dd1539f">
-  <!ENTITY lxqt-panel-size          "644 KB">
-  <!ENTITY lxqt-panel-buildsize     "68 MB">
-  <!ENTITY lxqt-panel-time          "0.6 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="lxqt-panel" xreflabel="lxqt-panel-&lxqt-version;">
-  <?dbhtml filename="lxqt-panel.html"?>
-
-
-  <title>lxqt-panel-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-panel">
-    <primary sortas="a-lxqt-panel">lxqt-panel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-panel</title>
-
-    <para>
-      The <application>lxqt-panel</application> package contains a
-      lightweight X11 desktop panel.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-panel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-panel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-panel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-panel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-panel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-panel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-panel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="layer-shell-qt"/>,
-      <xref linkend="libdbusmenu-qt"/>,
-      <xref linkend="liblxqt"/>,
-      <xref linkend="lxqt-globalkeys"/>,
-      <xref linkend="lxqt-menu-data"/>,
-      <xref linkend="lxqt-solid"/>, and 
-      <xref linkend="menu-cache"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/> or
-      <xref linkend="pulseaudio"/> (volume plugin; see Command Explanations below
-         if not present),
-      <xref linkend="libstatgrab"/> (network monitor and CPU load plugins),
-      <xref linkend="libsysstat"/> (CPU and network monitor plugins),
-      <xref linkend="libxkbcommon"/> (keyboard indicator plugin), and
-      <xref linkend="lm_sensors"/> (sensors plugin)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-panel</title>
-
-    <para>
-      Install <application>lxqt-panel</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-D&lt;plugin&gt;_PLUGIN=no</option>: Disable a &lt;plugin&gt;,
-      where &lt;plugin&gt; may be CLOCK, COLORPICKER, CPULOAD, DIRECTORYMENU,
-      DESKTOPSWITCH, KBINDICATOR, MAINMENU, MOUNT, QUICKLAUNCH, SENSORS,
-      SHOWDESKTOP, NETWORKMONITOR, SYSSTAT, TASKBAR, STATUSNOTIFIER, TRAY,
-      VOLUME, WORLDCLOCK, or SPACER
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-panel
-        </seg>
-        <seg>
-          several plugins under /usr/lib/lxqt-panel
-        </seg>
-        <seg>
-          /usr/lib/lxqt-panel and
-          /usr/share/lxqt/panel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-panel-prog">
-        <term><command>lxqt-panel</command></term>
-        <listitem>
-          <para>
-            is a lightweight <application>Qt6</application> based
-            panel for the <application>LXQt</application> Desktop
-          </para>
-          <indexterm zone="lxqt-panel lxqt-panel-prog">
-            <primary sortas="b-lxqt-panel">lxqt-panel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-policykit.xml
===================================================================
--- lxqt/desktop/lxqt-policykit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-policykit-download-http "https://github.com/lxqt/lxqt-policykit/releases/download/&lxqt-version;/lxqt-policykit-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-policykit-download-ftp  " ">
-  <!ENTITY lxqt-policykit-md5sum        "4c3b3533a966798fb46ff8da3f8ffa07">
-  <!ENTITY lxqt-policykit-size          "40 KB">
-  <!ENTITY lxqt-policykit-buildsize     "2.6 MB">
-  <!ENTITY lxqt-policykit-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-policykit" xreflabel="lxqt-policykit-&lxqt-version;">
-  <?dbhtml filename="lxqt-policykit.html"?>
-
-
-  <title>lxqt-policykit-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-policykit">
-    <primary sortas="a-lxqt-policykit">lxqt-policykit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-policykit</title>
-
-    <para>
-      The <application>lxqt-policykit</application> package is the
-      <application>LXQt</application> PolicyKit agent.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-policykit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-policykit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-policykit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-policykit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-policykit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-policykit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-policykit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and
-      <xref linkend="polkit-qt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-policykit</title>
-
-    <para>
-      Install <application>lxqt-policykit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-policykit-agent
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt/translations/lxqt-policykit-agent
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-policykit-agent-prog">
-        <term><command>lxqt-policykit-agent</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> PolicyKit agent
-          </para>
-          <indexterm zone="lxqt-policykit lxqt-policykit-agent-prog">
-            <primary sortas="b-lxqt-policykit-agent">lxqt-policykit-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-powermanagement.xml
===================================================================
--- lxqt/desktop/lxqt-powermanagement.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-powermanagement-download-http "https://github.com/lxqt/lxqt-powermanagement/releases/download/&lxqt-version;/lxqt-powermanagement-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-powermanagement-download-ftp  " ">
-  <!ENTITY lxqt-powermanagement-md5sum        "fef1b1f47ff94635ed478e36e4137337">
-  <!ENTITY lxqt-powermanagement-size          "96 KB">
-  <!ENTITY lxqt-powermanagement-buildsize     "8.6 MB">
-  <!ENTITY lxqt-powermanagement-time          "0.3 SBU">
-]>
-
-<sect1 id="lxqt-powermanagement" xreflabel="lxqt-powermanagement-&lxqt-version;">
-  <?dbhtml filename="lxqt-powermanagement.html"?>
-
-
-  <title>lxqt-powermanagement-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-powermanagement">
-    <primary sortas="a-lxqt-powermanagement">lxqt-powermanagement</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-powermanagement</title>
-
-    <para>
-      The <application>lxqt-powermanagement</application> package provides the
-      power management module for <application>LXQt</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-powermanagement-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-powermanagement-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-powermanagement-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-powermanagement-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-powermanagement-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-powermanagement-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-powermanagement Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      <xref linkend="lxqt-kidletime"/>,
-      <xref linkend="lxqt-solid"/>, and
-      <xref linkend="upower"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-powermanagement</title>
-
-    <para>
-      Install <application>lxqt-powermanagement</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-powermanagement and lxqt-powermanagement
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-powermanagement">
-        <term><command>lxqt-config-powermanagement</command></term>
-        <listitem>
-          <para>
-            is the <command>lxqt-powermanagement</command> GUI configuration
-            tool
-          </para>
-          <indexterm zone="lxqt-powermanagement lxqt-config-powermanagement">
-            <primary sortas="b-lxqt-config-powermanagement">lxqt-config-powermanagement</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-powermanagement-prog">
-        <term><command>lxqt-powermanagement</command></term>
-        <listitem>
-          <para>
-            is the <application>LXQt</application> power management module
-          </para>
-          <indexterm zone="lxqt-powermanagement lxqt-powermanagement-prog">
-            <primary sortas="b-lxqt-powermanagement">lxqt-powermanagement</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-qtplugin.xml
===================================================================
--- lxqt/desktop/lxqt-qtplugin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-qtplugin-download-http "https://github.com/lxqt/lxqt-qtplugin/releases/download/&lxqt-version;/lxqt-qtplugin-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-qtplugin-download-ftp  " ">
-  <!ENTITY lxqt-qtplugin-md5sum        "4385d081c09816bdb0ce3d6cd2b31225">
-  <!ENTITY lxqt-qtplugin-size          "24 KB">
-  <!ENTITY lxqt-qtplugin-buildsize     "2.4 MB">
-  <!ENTITY lxqt-qtplugin-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-qtplugin" xreflabel="lxqt-qtplugin-&lxqt-version;">
-  <?dbhtml filename="lxqt-qtplugin.html"?>
-
-
-  <title>lxqt-qtplugin-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-qtplugin">
-    <primary sortas="a-lxqt-qtplugin">lxqt-qtplugin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-qtplugin</title>
-
-    <para>
-      The <application>lxqt-qtplugin</application> package provides an
-      <application>LXQt</application> <application>Qt</application> platform
-      integration plugin.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-qtplugin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-qtplugin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-qtplugin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-qtplugin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-qtplugin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-qtplugin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-qtplugin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/> and
-      <xref linkend="libdbusmenu-qt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-qtplugin</title>
-
-    <para>
-      Install <application>lxqt-qtplugin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="configuration">
-    <title>Configuring lxqt-qtplugin</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        To use the plugin in Qt 5, the environment variable
-        <envar>QT_QPA_PLATFORMTHEME</envar> must be set to <quote>lxqt</quote>.
-        One way to do that is to issue as the &root; user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/lxqt.sh &lt;&lt; "EOF"
-<literal># Begin lxqt-qtplugin configuration
-
-export QT_QPA_PLATFORMTHEME=lxqt
-
-# End lxqt-qtplugin configuration</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libqtlxqt.so (in $QT6DIR/plugins/platformthemes)
-        </seg>
-        <seg>
-          $QT6DIR/plugins/platformthemes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqtlxqt-lib">
-        <term><filename class="libraryfile">libqtlxqt.so</filename></term>
-        <listitem>
-          <para>
-            contains the LXQt QT plugin loader
-          </para>
-          <indexterm zone="lxqt-qtplugin libqtlxqt-lib">
-            <primary sortas="c-libqtlxqt">libqtlxqt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-runner.xml
===================================================================
--- lxqt/desktop/lxqt-runner.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-runner-download-http "https://github.com/lxqt/lxqt-runner/releases/download/&lxqt-version;/lxqt-runner-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-runner-download-ftp  " ">
-  <!ENTITY lxqt-runner-md5sum        "923c96c9253fa4b9eb70e1bb0aabfb26">
-  <!ENTITY lxqt-runner-size          "224 KB">
-  <!ENTITY lxqt-runner-buildsize     "6.1 MB">
-  <!ENTITY lxqt-runner-time          "0.1 SBU">
-]>
-
-<sect1 id="lxqt-runner" xreflabel="lxqt-runner-&lxqt-version;">
-  <?dbhtml filename="lxqt-runner.html"?>
-
-
-  <title>lxqt-runner-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-runner">
-    <primary sortas="a-lxqt-runner">lxqt-runner</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-runner</title>
-
-    <para>
-      The <application>lxqt-runner</application> package provides a tool used
-      to launch programs quickly by typing their names.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-runner-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-runner-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-runner-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-runner-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-runner-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-runner-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-runner Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-globalkeys"/>,
-      <xref linkend="lxqt-kwindowsystem"/>, and
-      <xref linkend="muparser"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-runner</title>
-
-    <para>
-      Install <application>lxqt-runner</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="use">
-    <title>Using lxqt-runner</title>
-
-    <para>
-      To use <application>lxqt-runner</application>, simultaneously press the
-      Alt-F2 keys. A dialog window appears in the top center of the screen.
-      When you start typing a command, a list of possible matches appears and
-      changes as you keep typing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-runner
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-runner-prog">
-        <term><command>lxqt-runner</command></term>
-        <listitem>
-          <para>
-            launches a graphical dialog box for quickly running a program
-          </para>
-          <indexterm zone="lxqt-runner lxqt-runner-prog">
-            <primary sortas="b-lxqt-runner">lxqt-runner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-session.xml
===================================================================
--- lxqt/desktop/lxqt-session.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,235 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-session-download-http "https://github.com/lxqt/lxqt-session/releases/download/&lxqt-version;/lxqt-session-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-session-download-ftp  " ">
-  <!ENTITY lxqt-session-md5sum        "7e3e0553e7562ef5c25072c8dc671f78">
-  <!ENTITY lxqt-session-size          "192 KB">
-  <!ENTITY lxqt-session-buildsize     "12 MB">
-  <!ENTITY lxqt-session-time          "0.4 SBU">
-]>
-
-<sect1 id="lxqt-session" xreflabel="lxqt-session-&lxqt-version;">
-  <?dbhtml filename="lxqt-session.html"?>
-
-
-  <title>lxqt-session-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-session">
-    <primary sortas="a-lxqt-session">lxqt-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-session</title>
-
-    <para>
-      The <application>lxqt-session</application> package contains the default
-      session manager for <application>LXQt</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>,
-      <xref linkend="qtxdg-tools"/>, and
-      <xref linkend="xdg-user-dirs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-session</title>
-
-    <para>
-      Install <application>lxqt-session</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e '/TryExec/s|=|=/usr/bin/|' \
-    -i xsession/lxqt.desktop.in &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e '/TryExec/s|=|='/usr'/bin/|' -i xsessions/lxqt.desktop.in</command>:
-      If you are using a display manager, the full path of the
-      <quote>TryExec</quote> directive has to be given so that the
-      <application>LXQt</application> desktop will appear in the sessions list.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring lxqt-session</title>
-
-    <para>
-      Window Managers other than <xref linkend="openbox"/> may be used, e.g.
-      <xref linkend="xfwm4"/>. Please note that <xref linkend="icewm"/> is not a
-      good substitute. <application>Fluxbox</application> does work, although
-      in this context (with <xref linkend="lxqt-config"/>), <xref
-      linkend="openbox"/> is better.  The configuration file
-      <filename>/usr/share/lxqt/windowmanagers.conf</filename> comes with many
-      examples of Window Managers and the ones which are installed will appear
-      in a drop down list of <command>lxqt-config-session</command>. For the
-      ones not included in
-      <filename>/usr/share/lxqt/windowmanagers.conf</filename>, you can use
-      <command>lxqt-config-session</command>'s "search" button, e.g. for <xref
-      linkend="fluxbox"/>, navigating through the file system until you can
-      choose <command>fluxbox</command>. <!--Alternatively, if you wish the Window
-      Manager of your choice to appear in the drop down list, include it in
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>. For <xref
-      linkend="fluxbox"/>, include the line
-    </para>
-
-<screen role="nodump"><userinput><literal>fluxbox/Name=Fluxbox</literal></userinput></screen>
-    <para>
-      and it will appear as an option in the drop down list. To change the WM,
-      after selecting it, you need to restart the session.
--->
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxqt-config-session,
-          lxqt-leave,
-          lxqt-session, and
-          startlxqt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt/translations/lxqt-{leave,config-session,session}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-config-session-prog">
-        <term><command>lxqt-config-session</command></term>
-        <listitem>
-          <para>
-            is a GUI configuration tool for <command>lxqt-session</command>
-          </para>
-          <indexterm zone="lxqt-session lxqt-config-session-prog">
-            <primary sortas="b-lxqt-config-session">lxqt-config-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-leave-prog">
-        <term><command>lxqt-leave</command></term>
-        <listitem>
-          <para>
-            is a graphical dialog to terminate the session
-          </para>
-          <indexterm zone="lxqt-session lxqt-leave-prog">
-            <primary sortas="b-lxqt-leave">lxqt-leave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-session-prog">
-        <term><command>lxqt-session</command></term>
-        <listitem>
-          <para>
-            is a lightweight X session manager
-          </para>
-          <indexterm zone="lxqt-session lxqt-session-prog">
-            <primary sortas="b-lxqt-session">lxqt-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="startlxqt">
-        <term><command>startlxqt</command></term>
-        <listitem>
-          <para>
-            is used to start the desktop session for
-            <application>LXQt</application>
-          </para>
-          <indexterm zone="lxqt-session startlxqt">
-            <primary sortas="b-startlxqt">startlxqt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-solid.xml
===================================================================
--- lxqt/desktop/lxqt-solid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 solid-download-http "&kf6-download-http;/solid-&kf6-solid-version;.tar.xz">
-  <!ENTITY solid-download-ftp  " ">
-  <!ENTITY solid-md5sum        "76137f869de9fb084ce8944e320bd19d">
-  <!ENTITY solid-size          "300 KB">
-  <!ENTITY solid-buildsize     "33 MB">
-  <!ENTITY solid-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="lxqt-solid" xreflabel="solid-&kf6-solid-version; for lxqt">
-  <?dbhtml filename="lxqt-solid.html"?>
-
-
-  <title>solid-&kf6-solid-version; for lxqt</title>
-
-  <indexterm zone="lxqt-solid">
-    <primary sortas="a-solid">solid</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to solid</title>
-
-    <para>
-      <application>Solid</application> is a device integration framework.  It
-      provides a way of querying and interacting with hardware independently of
-      the underlying operating system.
-    </para>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-        This package is extracted from the KF6 set of packages.
-        If <xref linkend="kf6-frameworks"/> is built, do <emphasis
-        role="bold">NOT</emphasis> also build this package as presented
-        here.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&solid-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&solid-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &solid-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &solid-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &solid-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &solid-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">solid Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="udisks2"/>,
-      <xref role="runtime" linkend="upower"/>,
-      <ulink url="https://libimobiledevice.org/">libimobiledevice</ulink>, and
-      <!-- includes both libimobiledevice and libplist, which CMake says are
-           optional.-->
-      <ulink role="runtime"
-             url="http://www.freedesktop.org/wiki/Software/media-player-info">
-      media-player-info</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of solid</title>
-
-    <para>
-      Install <application>solid</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -W no-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          solid-hardware6
-        </seg>
-        <seg>
-          libKF6Solid.so
-        </seg>
-        <seg>
-          /usr/include/KF6/Solid and
-          /usr/lib/cmake/KF6Solid
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxqt-solid-solid-hardware6">
-        <term><command>solid-hardware6</command></term>
-        <listitem>
-          <para>
-            queries hardware information from the system
-          </para>
-          <indexterm zone="lxqt-solid lxqt-solid-solid-hardware6">
-            <primary sortas="b-solid-hardware6">solid-hardware6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-solid-lib">
-        <term><filename class="libraryfile">libKF6Solid.so</filename></term>
-        <listitem>
-          <para>
-            provides a way of querying and interacting with hardware
-            independently of the underlying operating system
-          </para>
-          <indexterm zone="lxqt-solid-lib">
-            <primary sortas="c-libKF6Solid">libKF6solid.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-sudo.xml
===================================================================
--- lxqt/desktop/lxqt-sudo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-sudo-download-http "https://github.com/lxqt/lxqt-sudo/releases/download/&lxqt-version;/lxqt-sudo-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-sudo-download-ftp  " ">
-  <!ENTITY lxqt-sudo-md5sum        "e6e2079901270e6f9b527dc5d44e098e">
-  <!ENTITY lxqt-sudo-size          "40 KB">
-  <!ENTITY lxqt-sudo-buildsize     "2.4 MB">
-  <!ENTITY lxqt-sudo-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-sudo" xreflabel="lxqt-sudo-&lxqt-version;">
-  <?dbhtml filename="lxqt-sudo.html"?>
-
-
-  <title>lxqt-sudo-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-sudo">
-    <primary sortas="a-lxqt-sudo">lxqt-sudo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-sudo</title>
-
-    <para>
-      The <application>lxqt-sudo</application> package is a graphical front
-      end to <application>sudo</application> and <application>su</application>
-      respectively.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-sudo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-sudo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-sudo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-sudo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-sudo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-sudo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-sudo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liblxqt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-sudo</title>
-
-    <para>
-      Install <application>lxqt-sudo</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxdoas (symlinkk to lxqt-sudo),
-          lxqt-sudo,
-          lxsu (symlinkk to lxqt-sudo), and
-          lxsudo (symlinkk to lxqt-sudo)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt/translations/lxqt-sudo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxdoas">
-        <term><command>lxdoas</command></term>
-        <listitem>
-          <para>
-            is a graphical frontend for <command>doas</command>
-          </para>
-          <indexterm zone="lxqt-sudo lxdoas">
-            <primary sortas="b-lxdoas">lxdoas</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxqt-sudo-prog">
-        <term><command>lxqt-sudo</command></term>
-        <listitem>
-          <para>
-             is a graphical frontend for <command>sudo</command>
-          </para>
-          <indexterm zone="lxqt-sudo lxqt-sudo-prog">
-            <primary sortas="b-lxqt-sudo">lxqt-sudo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsudo">
-        <term><command>lxsudo</command></term>
-        <listitem>
-          <para>
-             is a graphical frontend for <command>sudo</command>
-          </para>
-          <indexterm zone="lxqt-sudo lxsudo">
-            <primary sortas="b-lxsudo">lxsudo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lxsu">
-        <term><command>lxsu</command></term>
-        <listitem>
-          <para>
-             is a graphical frontend for <command>su</command>
-          </para>
-          <indexterm zone="lxqt-sudo lxsu">
-            <primary sortas="b-lxsu">lxsu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/lxqt-themes.xml
===================================================================
--- lxqt/desktop/lxqt-themes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxqt-themes-download-http "https://github.com/lxqt/lxqt-themes/releases/download/&lxqt-version;/lxqt-themes-&lxqt-version;.tar.xz">
-  <!ENTITY lxqt-themes-download-ftp  " ">
-  <!ENTITY lxqt-themes-md5sum        "6e9c345037b4718ff500dfbbac0ce435">
-  <!ENTITY lxqt-themes-size          "25 MB">
-  <!ENTITY lxqt-themes-buildsize     "55 MB">
-  <!ENTITY lxqt-themes-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxqt-themes" xreflabel="lxqt-themes-&lxqt-version;">
-  <?dbhtml filename="lxqt-themes.html"?>
-
-
-  <title>lxqt-themes-&lxqt-version;</title>
-
-  <indexterm zone="lxqt-themes">
-    <primary sortas="a-lxqt-themes">lxqt-themes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lxqt-themes</title>
-
-    <para>
-      The <application>lxqt-themes</application> package provides a number of
-      graphics files and themes for the <application>LXQt</application>
-      desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxqt-themes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxqt-themes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxqt-themes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxqt-themes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxqt-themes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxqt-themes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lxqt-themes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxqt-build-tools"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxqt-themes"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lxqt-themes</title>
-
-    <para>
-      Install <application>lxqt-themes</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxqt/{graphics,themes,palettes,wallpapers}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/menu-cache.xml
===================================================================
--- lxqt/desktop/menu-cache.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 menu-cache-download-http "&sourceforge-dl;/lxde/menu-cache-&menu-cache-version;.tar.xz">
-  <!ENTITY menu-cache-download-ftp  " ">
-  <!ENTITY menu-cache-md5sum        "99999a0bca48b980105208760c8fd893">
-  <!ENTITY menu-cache-size          "260 KB">
-  <!ENTITY menu-cache-buildsize     "3.7 MB">
-  <!ENTITY menu-cache-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="menu-cache" xreflabel="menu-cache-&menu-cache-version;">
-  <?dbhtml filename="menu-cache.html"?>
-
-
-  <title>menu-cache-&menu-cache-version;</title>
-
-  <indexterm zone="menu-cache">
-    <primary sortas="a-menu-cache">menu-cache</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Menu Cache</title>
-
-    <para>
-      The <application>Menu Cache</application> package contains a
-      library for creating and utilizing caches to speed up the
-      manipulation for freedesktop.org defined application menus.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&menu-cache-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&menu-cache-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &menu-cache-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &menu-cache-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &menu-cache-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &menu-cache-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/menu-cache-&menu-cache-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Menu Cache Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libfm-extra"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="xdg-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Menu Cache</title>
-
-    <para>
-      First fix a memory leak and <quote>multiple definitions</quote>
-      issues:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../menu-cache-&menu-cache-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Menu Cache</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-gtk-doc</option>: Use this option if
-      <application>GTK-Doc</application> is installed and you wish to build and
-      install the API documentation.
-    </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>
-          libmenu-cache.so
-        </seg>
-        <seg>
-          /usr/{include,libexec,share/gtk-doc/html}/menu-cache
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmenu-cache">
-        <term><filename class="libraryfile">libmenu-cache.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>menu-cache</application> API functions
-          </para>
-          <indexterm zone="menu-cache libmenu-cache">
-            <primary sortas="c-libmenu-cache">libmenu-cache.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/muparser.xml
===================================================================
--- lxqt/desktop/muparser.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 muparser-download-http "https://github.com/beltoforion/muparser/archive/v&muparser-version;/muparser-&muparser-version;.tar.gz">
-  <!ENTITY muparser-download-ftp  " ">
-  <!ENTITY muparser-md5sum        "b92180a648be88238008ea01a597ccb9">
-  <!ENTITY muparser-size          "112 KB">
-  <!ENTITY muparser-buildsize     "5.1 MB">
-  <!ENTITY muparser-time          "0.1 SBU">
-]>
-
-<sect1 id="muparser" xreflabel="muparser-&muparser-version;">
-  <?dbhtml filename="muparser.html"?>
-
-  <title>muparser-&muparser-version;</title>
-
-  <indexterm zone="muparser">
-    <primary sortas="a-muparser">muparser</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to muparser</title>
-
-    <para>
-      The <application>muparser</application> package is a fast math parser
-      library for C and C++.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&muparser-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&muparser-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &muparser-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &muparser-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &muparser-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &muparser-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">muparser Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of muparser</title>
-
-    <para>
-      Install <application>muparser</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      ..                          &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>
-          libmuparser.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/muparser
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="muparser-lib">
-        <term><filename class="libraryfile">muparser.so</filename></term>
-        <listitem>
-          <para>
-            provides a fast math parser library for C and C++
-          </para>
-          <indexterm zone="muparser muparser-lib">
-            <primary sortas="c-muparser">muparser.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/obconf-qt.xml
===================================================================
--- lxqt/desktop/obconf-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 obconf-qt-download-http "https://github.com/lxqt/obconf-qt/releases/download/&obconf-qt-version;/obconf-qt-&obconf-qt-version;.tar.xz">
-  <!ENTITY obconf-qt-download-ftp  " ">
-  <!ENTITY obconf-qt-md5sum        "e89509d190e34fef75875856edcb4855">
-  <!ENTITY obconf-qt-size          "116 KB">
-  <!ENTITY obconf-qt-buildsize     "4.6 MB">
-  <!ENTITY obconf-qt-time          "0.2 SBU">
-]>
-
-<sect1 id="obconf-qt" xreflabel="obconf-qt-&obconf-qt-version;">
-  <?dbhtml filename="obconf-qt.html"?>
-
-
-  <title>obconf-qt-&obconf-qt-version;</title>
-
-  <indexterm zone="obconf-qt">
-    <primary sortas="a-obconf-qt">obconf-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to obconf-qt</title>
-
-    <para>
-      The <application>obconf-qt</application> package is a Qt-based
-      configuration tool for <application>Openbox</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&obconf-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&obconf-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &obconf-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &obconf-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &obconf-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &obconf-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/obconf-qt-&obconf-qt-version;-qt6-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">obconf-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="lxqt-build-tools"/>,
-      <xref linkend="openbox"/>, and
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of obconf-qt</title>
-
-    <para>
-       First, make the program compatible with <xref linkend="qt6"/>.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../obconf-qt-&obconf-qt-version;-qt6-1.patch</userinput></screen>
-
-    <para>
-       Install <application>obconf-qt</application> by running the following
-       commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          obconf-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="obconf-qt-prog">
-        <term><command>obconf-qt</command></term>
-        <listitem>
-          <para>
-            is a Qt-based configuration tool for
-            <application>Openbox</application>
-          </para>
-          <indexterm zone="obconf-qt obconf-qt-prog">
-            <primary sortas="b-obconf-qt">obconf-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/pcmanfm-qt.xml
===================================================================
--- lxqt/desktop/pcmanfm-qt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,167 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pcmanfm-qt-download-http "https://github.com/lxqt/pcmanfm-qt/releases/download/&lxqt-version;/pcmanfm-qt-&lxqt-version;.tar.xz">
-  <!ENTITY pcmanfm-qt-download-ftp  " ">
-  <!ENTITY pcmanfm-qt-md5sum        "163f512c5ad0994394fd316a0caaef92">
-  <!ENTITY pcmanfm-qt-size          "388 KB">
-  <!ENTITY pcmanfm-qt-buildsize     "18 MB">
-  <!ENTITY pcmanfm-qt-time          "0.4 SBU">
-]>
-
-<sect1 id="pcmanfm-qt" xreflabel="pcmanfm-qt-&lxqt-version;">
-  <?dbhtml filename="pcmanfm-qt.html"?>
-
-  <title>pcmanfm-qt-&lxqt-version;</title>
-
-  <indexterm zone="pcmanfm-qt">
-    <primary sortas="a-pcmanfm-qt">pcmanfm-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pcmanfm-qt</title>
-
-    <para>
-      The <application>pcmanfm-qt</application> is a file manager and desktop
-      icon manager (a <application>Qt</application> port of
-      <application>pcmanfm</application> and <application>libfm</application>).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcmanfm-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcmanfm-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcmanfm-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcmanfm-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcmanfm-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcmanfm-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pcmanfm-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="layer-shell-qt"/>,
-      <xref linkend="liblxqt"/>,
-      <xref linkend="libfm-qt"/>, and
-      <xref linkend="lxqt-menu-data"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gvfs"/> (runtime) and 
-      <xref linkend="oxygen-icons"/> or another icon theme (depending on your
-      choice, some icons will be missing in several places)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pcmanfm-qt</title>
-
-    <para>
-      Install <application>pcmanfm-qt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To make <application>pcmanfm-qt</application> easier to find in
-      menus, adjust the .desktop file. Again, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>sed -e '/Categories=/s/=/=System;FileTools;/' \
-    -e '/Name=/s/=.*/=File Manager PCManFM-Qt'/ \
-    -i /usr/share/applications/pcmanfm-qt.desktop</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcmanfm-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/pcmanfm-qt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcmanfm-qt-prog">
-        <term><command>pcmanfm-qt</command></term>
-        <listitem>
-          <para>
-            is a file manager and desktop icon manager
-          </para>
-          <indexterm zone="pcmanfm-qt pcmanfm-qt-prog">
-            <primary sortas="b-pcmanfm-qt">pcmanfm-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/post-install.xml
===================================================================
--- lxqt/desktop/post-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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="lxqt-post-install" xreflabel="LXQt-Post-Install">
-  <?dbhtml filename="post-install.html"?>
-
-  <title>LXQt Desktop Final Instructions</title>
-
-  <indexterm zone="lxqt-post-install">
-    <primary sortas="g-lxqt-post-install">LXQt-post-install</primary>
-  </indexterm>
-
-  <sect2 role="package">
-  <title>Post-Install Instructions</title>
-
-    <para>
-      Please follow these instructions before starting
-      <application>LXQt</application> for the first time.
-    </para>
-
-    <bridgehead renderas="sect3">Dependencies to Start LXQt</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openbox"/>, or another window manager, such as
-      <xref role="nodep" linkend="xfwm4"/>, or
-      kwin from <xref role="nodep" linkend="plasma-build"/>.
-      Note that <xref role="nodep" linkend="icewm"/> is not suitable for LXQt.
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="breeze-icons"/> and
-      <xref linkend="desktop-file-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lightdm"/> or another Display Manager, e.g.
-      <xref role="nodep" linkend="sddm"/>, or
-      <xref linkend="xscreensaver"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Final Configuration</title>
-
-    <sect3 id="lxqt-final-updates" xreflabel="LXQt Final Database Updates">
-      <title>LXQt Final Database Updates</title>
-
-      <para>
-        The desktop databases need to be created or updated at this point.
-        Run the following commands as the &root; user:
-      </para>
-
-<screen role="root"><userinput>ldconfig                             &amp;&amp;
-update-mime-database /usr/share/mime &amp;&amp;
-xdg-icon-resource forceupdate        &amp;&amp;
-update-desktop-database -q</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="starting">
-    <title>Starting LXQt</title>
-
-    <para revision="sysv">
-      You can start <application>LXQt</application> from runlevel 3, using
-      <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="lightdm"/>.
-    </para>
-
-    <para revision="systemd">
-      You can start <application>LXQt</application> from a TTY, using
-      <xref linkend="xinit"/>, or by using a graphical display manager such
-      as <xref linkend="lightdm"/>.
-    </para>
-
-    <para>
-      To start <application>LXQt</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>exec startlxqt</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      The X session starts on the first unused virtual terminal, normally vt1.
-      You can switch to another vt<emphasis>n</emphasis> by simultaneously
-      pressing the keys Ctrl-Alt-F<emphasis>n</emphasis>
-      (<emphasis>n</emphasis>=2, 3, ...).  To switch back to the X session,
-      normally started at vt1, use Ctrl-Alt-F1. The vt where the command
-      <command>startx</command> was executed will display many messages,
-      including X starting messages, applications automatically started with
-      the session, and eventually, some warning and error messages, but these
-      are hidden by the graphical interface. You may prefer to redirect those
-      messages to a log file, which can be used for debugging purposes. This
-      can be done starting X with:
-    </para>
-
-    <screen role="nodump"><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-    <title>Initial Configuration</title>
-
-    <para>
-      When LXQt first starts, it will ask you for the window manager to use.
-      To start, the BLFS editors recommend using <application>openbox</application>.
-      At this point both the background and the panel will be black.  Right clicking
-      on the background will bring up a menu and selecting "Desktop Preferences"
-      will allow you to change the background color or set a background image.
-    </para>
-
-    <para>
-      The panel will be at the bottom of the screen.  Right clicking on the
-      panel will bring up a menu that will allow you to customize the panel
-      including adding widgets and setting the background color.  The BLFS 
-      editors recommend installing, at a minimum, the Application Manager and
-      Task Manager widgets.
-    </para>
-
-    <para>
-      After LXQt has started for the first time, the BLFS editors recommend
-      going through the settings presented in the LXQt Configuration Center,
-      which can be found under LXQt Settings in the Preferences menu of the
-      application launcher.
-    </para>
-
-    <note>
-      <para>
-         The user configuration files will be created in the directory
-         $HOME/.config/lxqt/.  To get widget icons to display properly,
-         the lxqt.conf file may need to be manually edited to include the
-         line "icon_theme=oxygen".
-      </para>
-    </note>
-
-  </sect2>
-</sect1>
Index: qt/desktop/pre-install.xml
===================================================================
--- lxqt/desktop/pre-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="lxqt-pre-install" xreflabel="LXQt Pre-Install">
-  <?dbhtml filename="pre-install.html"?>
-
-  <title>LXQt Desktop Pre-Install Instructions</title>
-
-  <indexterm zone="lxqt-pre-install">
-    <primary sortas="g-lxqt-pre-install">LXQt Pre-Install</primary>
-  </indexterm>
-  <sect2>
-    <title>Notes about building LXQt dependencies</title>
-
-    <para>
-      To build LXQt, the following steps are recommended:
-    </para>
-
-    <procedure>
-      <step>
-        <para>
-          First, build the whole <xref linkend="xorg"/>, including
-          Wayland support with required and recommended dependencies.  Test
-          that the environment works with twm as the window manager.  With
-          experience, some of the packages can be omitted, but that is not
-          recommended for first time users.
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Second, build the required parts of Qt. The full package, <xref
-          linkend="qt6"/> is quite long and has a lot of dependencies. 
-        </para>
-      </step>
-
-      <step>
-        <para>
-          Finally build the LXQt desktop using the pages below in order.
-          The packages in the applications section are optional, but as
-          a minimum, <xref linkend="qterminal"/> is recommended.
-        </para>
-      </step>
-    </procedure>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/qtxdg-tools.xml
===================================================================
--- lxqt/desktop/qtxdg-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qtxdg-tools-download-http "https://github.com/lxqt/qtxdg-tools/releases/download/&qtxdg-tools-version;/qtxdg-tools-&qtxdg-tools-version;.tar.xz">
-  <!ENTITY qtxdg-tools-download-ftp  " ">
-  <!ENTITY qtxdg-tools-md5sum        "6b9022f7f39f8bff398e69206ad01a93">
-  <!ENTITY qtxdg-tools-size          "20 KB">
-  <!ENTITY qtxdg-tools-buildsize     "1.8 MB">
-  <!ENTITY qtxdg-tools-time          "0.1 SBU">
-]>
-
-<sect1 id="qtxdg-tools" xreflabel="qtxdg-tools-&qtxdg-tools-version;">
-  <?dbhtml filename="qtxdg-tools.html"?>
-
-  <title>qtxdg-tools-&qtxdg-tools-version;</title>
-
-  <indexterm zone="qtxdg-tools">
-    <primary sortas="a-qtxdg-tools">qtxdg-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qtxdg-tools</title>
-
-    <para>
-      The <application>qtxdg-tools</application> contains a CLI MIME tool
-      for handling file associations and opening files with their
-      default applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtxdg-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtxdg-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtxdg-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtxdg-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtxdg-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtxdg-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qtxdg-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libqtxdg"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtxdg-tools</title>
-
-    <para>
-      Install <application>qtxdg-tools</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qtxdg-mat
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/cmake/qtxdg-tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qtxdg-mat">
-        <term><command>qtxdg-mat</command></term>
-        <listitem>
-          <para>
-            queries and modifies defaults for applications, such as the default
-            terminal, web browser, email client, and file manager
-          </para>
-          <indexterm zone="qtxdg-tools qtxdg-mat">
-            <primary sortas="b-qtxdg-mat">qtxdg-mat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: qt/desktop/xdg-desktop-portal-lxqt.xml
===================================================================
--- lxqt/desktop/xdg-desktop-portal-lxqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-desktop-portal-lxqt-download-http "https://github.com/lxqt/xdg-desktop-portal-lxqt/releases/download/&xdg-desktop-portal-lxqt-version;/xdg-desktop-portal-lxqt-&xdg-desktop-portal-lxqt-version;.tar.xz">
-  <!ENTITY xdg-desktop-portal-lxqt-download-ftp  " ">
-  <!ENTITY xdg-desktop-portal-lxqt-md5sum        "7045d7ca3d99262ef9ad066b1b801eb9">
-  <!ENTITY xdg-desktop-portal-lxqt-size          "16 KB">
-  <!ENTITY xdg-desktop-portal-lxqt-buildsize     "2.4 MB">
-  <!ENTITY xdg-desktop-portal-lxqt-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-desktop-portal-lxqt" xreflabel="xdg-desktop-portal-lxqt-&xdg-desktop-portal-lxqt-version;">
-  <?dbhtml filename="xdg-desktop-portal-lxqt.html"?>
-
-  <title>xdg-desktop-portal-lxqt-&xdg-desktop-portal-lxqt-version;</title>
-
-  <indexterm zone="xdg-desktop-portal-lxqt">
-    <primary sortas="a-xdg-desktop-portal-lxqt">xdg-desktop-portal-lxqt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-desktop-portal-lxqt</title>
-
-    <para>
-      <application>xdg-desktop-portal-lxqt</application> is a backend for
-      <application>xdg-desktop-portal</application>, that is using the Qt
-      library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-desktop-portal-lxqt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-desktop-portal-lxqt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-desktop-portal-lxqt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-desktop-portal-lxqt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-desktop-portal-lxqt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-desktop-portal-lxqt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-desktop-portal-lxqt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libfm-qt"/>,
-      <xref linkend="lxqt-kwindowsystem"/>, and
-      <xref role="runtime" linkend="xdg-desktop-portal"/> (at runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-desktop-portal-lxqt</title>
-
-    <para>
-      Install <application>xdg-desktop-portal-lxqt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdg-desktop-portal-lxqt (in /usr/libexec)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xdg-desktop-portal (if no other
-          <application>xdg-desktop-portal</application> backend is installed)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: qt/lxqt.xml
===================================================================
--- lxqt/lxqt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
-
-<part id="lxqt" xreflabel="LXQt">
-  <?dbhtml filename="lxqt.html" dir="lxqt"?>
-
-  <title>LXQt</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop/desktop.xml"/>
-<!-- with the build order given in
-https://github.com/lxqt/lxqt/wiki/Building-from-source, it is hard to separate between desktop and applications. Using only "desktop" for now
-
-Moving some apps to desktop. Jul 6. bdubbs
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
-
-</part>
Index: multimedia/audioutils/CDParanoia.xml
===================================================================
--- multimedia/audioutils/CDParanoia.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/CDParanoia.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="CDParanoia" xreflabel="CDParanoia-&CDParanoia-version;">
+<?dbhtml filename="cdparanoia.html" dir="multimedia"?>
+<title>CDParanoia-&CDParanoia-version;</title>
+
+&CDParanoia-intro;
+&CDParanoia-inst;
+&CDParanoia-config;
+&CDParanoia-desc;
+
+</sect1>
+
Index: multimedia/audioutils/XMMS.xml
===================================================================
--- multimedia/audioutils/XMMS.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/XMMS.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="xmms" xreflabel="xmms-&XMMS-version">
+<?dbhtml filename="xmms.html" dir="multimedia"?>
+<title>xmms-&XMMS-version;</title>
+
+&XMMS-intro;
+&XMMS-inst;
+&XMMS-exp;
+&XMMS-config;
+&XMMS-desc;
+
+</sect1>
+
Index: ltimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,347 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 audacious-download-http
-           "https://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
-  <!ENTITY audacious-download-ftp         " ">
-  <!ENTITY audacious-md5sum               "751a002964907c3a8fc2f571ffc00ec7">
-  <!ENTITY audacious-size                 "620 KB">
-  <!ENTITY audacious-buildsize            "16 MB (with Qt5 and GTK3 support)">
-  <!ENTITY audacious-time                 "0.2 SBU (with Qt5 and GTK3 support)">
-
-  <!ENTITY audacious-plugins-download
-           "https://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
-  <!ENTITY audacious-plugins-md5sum       "3e233d8219407218244e684e096236ec">
-  <!ENTITY audacious-plugins-size         "1.7 MB">
-  <!ENTITY audacious-plugins-buildsize    "37 MB (with Qt5 and GTK3 support)">
-  <!ENTITY audacious-plugins-time         "1.4 SBU (with Qt5 and GTK3 support)">
-]>
-
-<sect1 id="audacious" xreflabel="Audacious-&audacious-version;">
-  <?dbhtml filename="audacious.html"?>
-
-
-  <title>Audacious-&audacious-version;</title>
-
-  <indexterm zone="audacious">
-    <primary sortas="a-Audacious">Audacious</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Audacious</title>
-
-    <para>
-      <application>Audacious</application> is an audio player.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&audacious-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&audacious-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &audacious-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &audacious-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &audacious-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &audacious-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-    <title>Required Plugins</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&audacious-plugins-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &audacious-plugins-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &audacious-plugins-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &audacious-plugins-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &audacious-plugins-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Audacious Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> or
-      (<xref linkend="qt5"/> or
-       <xref role="nodep" linkend="qt5-components"/> with qtmultimedia)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional">
-      <xref linkend="libarchive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (for Plugins)</bridgehead>
-    <para role="recommended">
-      <xref linkend="mpg123"/>,
-      <xref linkend="ffmpeg"/>, and
-      <xref linkend="neon"/> (for online mp3 and ogg radio)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for Plugins)</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="faad2"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libcdio"/> (to identify and play CDs),
-      <xref linkend="libnotify"/>,
-      <xref linkend="libsndfile"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="pipewire"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl2"/>,
-      <ulink url="https://ampache-browser.org/">ampache-browser</ulink>,
-      <ulink url="https://adplug.github.io/">adplug</ulink>,
-      <ulink url="https://sourceforge.net/projects/bs2b/">The Bauer
-        stereophonic-to-binaural DSP (bs2b) library</ulink>,
-      <ulink url="https://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
-      <ulink url="https://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="https://www.sourceforge.net/projects/sidplay-residfp/">libsidplayfp</ulink>,
-      <ulink url="https://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="https://www.wavpack.com/">WavPack</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Audacious</title>
-
-    <sect3>
-    <title>Installation of the Main Audacious Program</title>
-
-      <para>
-        Install <application>Audacious</application> by running the following
-        commands (you may wish to change the buildstamp to another string):
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk3=true         \
-            -Dbuildstamp=BLFS   \
-            -Dlibarchive=true   \
-            ..                  &amp;&amp;
-
-ninja</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Installation of Audacious Plugins</title>
-
-      <para>
-        Install the required plugins package by issuing the following commands:
-      </para>
-
-<screen><userinput>tar -xf ../../audacious-plugins-&audacious-plugins-version;.tar.bz2 &amp;&amp;
-cd audacious-plugins-&audacious-plugins-version;                    &amp;&amp;
-
-sed -e '/libxml/a #include &lt;libxml/parser.h&gt;' \
-    -i src/scrobbler2/scrobbler.h             &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup           \
-  --prefix=/usr       \
-  --buildtype=release \
-  -Dgtk3=true         \
-  ..                  &amp;&amp;
-
-ninja</userinput></screen>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dbuildstamp=BLFS</parameter>: This switch appends
-      the given text to the version string.
-    </para>
-
-    <para>
-      <parameter>-Dgtk3=true</parameter>: This option sets the default
-      graphical user interface.
-    </para>
-
-    <para>
-      <parameter>-Dlibarchive=true</parameter>: This adds libarchive support,
-      for reading compressed module sets or skins.
-    </para>
-
-    <para>
-      <command>sed -e '/libxml/a ...'</command>: This fixes building against
-      libxml-2.12.x.
-    </para>
-
-    <para>
-      <option>-Dvalgrind=true</option>: The option enables Valgrind analysis
-      support.
-    </para>
-
-  </sect2>
-
-<!-- None of this seems valid for audacios-4.3
-  <sect2 role="configuration">
-    <title>Configuring Audacious</title>
-
-    <para>
-      If you built with both Gtk and Qt user interfaces, the Qt version
-      can be executed from a terminal, issuing <command>audacious
-      - -qt</command>. If you wish a desktop menu entry to execute this Qt
-      version, issue the following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -v /usr/share/applications/audacious{,-qt}.desktop &amp;&amp;
-
-sed -e '/^Name/ s/$/ Qt/' \
-    -e '/Exec=/ s/audacious/&amp; - -qt/' \
-    -i /usr/share/applications/audacious-qt.desktop</userinput></screen>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          audacious and
-          audtool
-        </seg>
-        <seg>
-          libaudcore.so,
-          libaudgui.so,
-          libaudqt.so,
-          libaudtag.so,
-          and several plugin libraries under /usr/lib/audacious/ sub-directories
-        </seg>
-        <seg>
-          /usr/include/{audacious,libaudcore,libaudgui,libaudqt},
-          /usr/lib/audacious, and
-          /usr/share/audacious
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="audacious-prog">
-        <term><command>audacious</command></term>
-        <listitem>
-          <para>
-            is an audio player and is a descendant of <application>XMMS</application>
-          </para>
-          <indexterm zone="audacious audacious-prog">
-            <primary sortas="b-audacious">audacious</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="audtool">
-        <term><command>audtool</command></term>
-        <listitem>
-          <para>
-            is a small tool to modify the behavior of a running
-            <command>audacious</command> instance
-          </para>
-          <indexterm zone="audacious audtool">
-            <primary sortas="b-audtool">audtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/audioutils/audioutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,34 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="multimedia-audioutils">
+<?dbhtml filename="audioutils.html" dir="multimedia"?>
+<title>Audio utilities</title>
 
-<chapter id="multimedia-audioutils">
-  <?dbhtml filename="audioutils.html"?>
+<para>This chapter contains programs involved with audio file
+manipulation; that is to say playing, recording, ripping and the other
+common things which people want to do.  To use much of this software,
+you will require either the kernel sound drivers installed, or <xref
+linkend="alsa"/> installed.  Note that in the 2.5 kernel development
+tree, the old drivers are being replaced with ALSA and so when the
+stable 2.6 series arrives; most people will be using it by
+default.</para>
 
-  <title>Audio Utilities</title>
-
-  <para>
-    This chapter contains programs involved with audio file
-    manipulation; that is to say playing, recording, ripping and the other
-    common things which people want to do. It also includes a package used
-    to render text to speech using your system's audio hardware. To use much
-    of this software, you will need to have the kernel sound drivers
-    installed.
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amarok.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audacious.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdparanoia.xml"/>
-  <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freetts.xml"/> -->
-  <!-- Removed until it gets kf6 support
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kwave.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lame.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpg123.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pavucontrol.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pnmixer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vorbistools.xml"/>
+&mpg123;
+&vorbistools;
+&XMMS;
+&lame;
+&CDParanoia;
 
 </chapter>
Index: ltimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 CDParanoia-download-http "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-&CDParanoia-version;.src.tgz">
-  <!ENTITY CDParanoia-download-ftp  " ">
-  <!ENTITY CDParanoia-md5sum        "b304bbe8ab63373924a744eac9ebc652">
-  <!ENTITY CDParanoia-size          "179 KB">
-  <!ENTITY CDParanoia-buildsize     "2.9 MB">
-  <!ENTITY CDParanoia-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="cdparanoia" xreflabel="CDParanoia-&CDParanoia-version;">
-  <?dbhtml filename="cdparanoia.html"?>
-
-
-  <title>CDParanoia-&CDParanoia-version;</title>
-
-  <indexterm zone="cdparanoia">
-    <primary sortas="a-CDParanoia">CDParanoia</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CDParanoia</title>
-
-    <para>
-      The <application>CDParanoia</application> package contains a CD audio
-      extraction tool. This is useful for extracting <filename>.wav</filename>
-      files from audio CDs. A CDDA capable CDROM drive is needed.
-      Practically all drives supported by Linux can be used.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&CDParanoia-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&CDParanoia-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &CDParanoia-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &CDParanoia-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &CDParanoia-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &CDParanoia-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cdparanoia-&CDParanoia-version;-gcc_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/cdparanoia"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CDParanoia</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      Install <application>CDParanoia</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../cdparanoia-&CDParanoia-version;-gcc_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
-make -j1</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;
-chmod -v 755 /usr/lib/libcdda_*.so.0.10.2 &amp;&amp;
-rm -fv /usr/lib/libcdda_*.a</userinput></screen>
-
-  </sect2>
-  <!--
-  <sect2 role="configuration">
-    <title>Configuring CDParanoia</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/lib-config.xml"/>
-
-    </sect3>
-
-  </sect2>
-  As far as I can tell, no other packages have this information. The
-  instructions above all assume that the libraries are installed in /usr
-  (see the chmod... and prefix=/usr above). I believe this information
-  is redundant/useless for this package, so I'm commenting it out. -renodr
-  -->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cdparanoia
-        </seg>
-        <seg>
-          libcdda_interface.so and libcdda_paranoia.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cdparanoia-prog">
-        <term><command>cdparanoia</command></term>
-        <listitem>
-          <para>
-            is used for 'ripping' an audio-cd. Ripping is the process of
-            digitally extracting music from an audio CD
-          </para>
-          <indexterm zone="cdparanoia cdparanoia-prog">
-            <primary sortas="b-cdparanoia">cdparanoia</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcdda_interface">
-        <term><filename class="libraryfile">libcdda_interface</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <command>cdparanoia</command>, as
-            well as other packages, which can automatically identify if a
-            CD device is CDDA compatible
-          </para>
-          <indexterm zone="cdparanoia libcdda_interface">
-            <primary sortas="c-libcdda_interface">libcdda_interface</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcdda_paranoia">
-        <term><filename class="libraryfile">libcdda_paranoia</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <command>cdparanoia</command>, as
-            well as other packages, which provide data verification, synchronization,
-            error handling and scratch reconstruction capability
-          </para>
-          <indexterm zone="cdparanoia libcdda_paranoia">
-            <primary sortas="c-libcdda_paranoia">libcdda_paranoia</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/audioutils/cdparanoia/CDParanoia-config.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/cdparanoia/CDParanoia-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Configuring CDParanoia</title>
+
+<sect3><title>Configuration Information</title>
+
+<para>CDParanoia itself needs little configuration; information can be
+found from the man-page.</para>
+
+<para>For the libcdda library, the usual rules apply:</para>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: multimedia/audioutils/cdparanoia/CDParanoia-desc.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/cdparanoia/CDParanoia-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Contents</title>
+
+<para>The CDParanoia package contains <userinput>cdparanoia</userinput>
+and the <userinput>libcdda library</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cdparanoia</title>
+<para>This is used for 'ripping' an audio-cd. Ripping is the process of 
+digitally extracting music from an audio-cd.</para></sect3>
+
+<sect3><title>libcdda library</title>
+<para>No description is currently available.</para></sect3>
+
+</sect2>
+
Index: multimedia/audioutils/cdparanoia/CDParanoia-inst.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/cdparanoia/CDParanoia-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of CDParanoia</title>
+
+<para>Install CDParanoia by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make FLAGS="$CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/audioutils/cdparanoia/CDParanoia-intro.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/cdparanoia/CDParanoia-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to CDParanoia</title>
+
+<screen>Download location:              &CDParanoia-download;
+Version used:                   &CDParanoia-version;
+Package size:                   &CDParanoia-size;
+Estimated Disk space required:  &CDParanoia-buildsize;</screen>
+
+<para>The CDParanoia package contains cdparanoia. This is useful for
+extracting wave files from audio cd's.  A CDDA capable CDROM drive is
+needed.  Practically all drives supported by Linux can be used.</para>
+
+</sect2>
Index: multimedia/audioutils/cdparanoia/cdparanoia.ent
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/cdparanoia/cdparanoia.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY CDParanoia SYSTEM "../CDParanoia.xml">
+<!ENTITY CDParanoia-intro SYSTEM "CDParanoia-intro.xml">
+<!ENTITY CDParanoia-inst SYSTEM "CDParanoia-inst.xml">
+<!ENTITY CDParanoia-desc SYSTEM "CDParanoia-desc.xml">
+<!ENTITY CDParanoia-config SYSTEM "CDParanoia-config.xml">
+<!ENTITY CDParanoia-buildsize "1.3 MB">
+<!ENTITY CDParanoia-version "III-9.8">
+<!ENTITY CDParanoia-download "http://www.xiph.org/paranoia/download/cdparanoia-III-alpha9.8.src.tgz">
+<!ENTITY CDParanoia-size "114 KB">
Index: ltimedia/audioutils/kwave.xml
===================================================================
--- multimedia/audioutils/kwave.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kwave-download-http "&kf6apps-download-http;/kwave-&kf6apps-version;.tar.xz">
-  <!ENTITY kwave-download-ftp  " ">
-  <!ENTITY kwave-md5sum        "09075523852cf46e97dba018c1457b9c">
-  <!ENTITY kwave-size          "6.7 MB">
-  <!ENTITY kwave-buildsize     "77 MB">
-  <!ENTITY kwave-time          "0.8 SBU (using parallelism=4)">
-]>
-
-<sect1 id="kwave" xreflabel="kwave-&kf6apps-version;">
-  <?dbhtml filename="kwave.html"?>
-
-
-  <title>kwave-&kf6apps-version;</title>
-
-  <indexterm zone="kwave">
-    <primary sortas="a-kwave">kwave</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to KWave</title>
-
-    <para>
-      The <application>KWave</application> package contains a KDE Frameworks based Sound
-      Editor application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kwave-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kwave-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kwave-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kwave-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kwave-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kwave-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">KWave Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="audiofile"/>,
-      <xref linkend="fftw"/>,
-      <xref linkend="id3lib"/>, and
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="libogg"/>, and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of KWave</title>
-
-    <para>
-      Install <application>KWave</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -DBUILD_TESTING=OFF                \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kwave
-        </seg>
-        <seg>
-          libkwave.so,
-          libkwavegui.so, and
-          30 plugins
-        </seg>
-        <seg>
-          $KF6_PREFIX/lib/plugins/kwave,
-          $KF6_PREFIX/share/kwave,
-          $KF6_PREFIX/share/doc/HTML/*/kwave
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="kwave-prog">
-        <term><command>kwave</command></term>
-        <listitem>
-          <para>
-            is a sound editor built on the KDE Frameworks
-          </para>
-          <indexterm zone="kwave kwave-prog">
-            <primary sortas="b-kwave">kwave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/audioutils/lame.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,196 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="lame" xreflabel="lame">
+<?dbhtml filename="lame.html" dir="multimedia"?>
+<title>lame</title>
 
-  <!ENTITY lame-download-http "&sourceforge-dl;/lame/lame-&lame-version;.tar.gz">
-  <!ENTITY lame-download-ftp  " ">
-  <!ENTITY lame-md5sum        "83e260acbe4389b54fe08e0bdbf7cddb">
-  <!ENTITY lame-size          "1.5 MB">
-  <!ENTITY lame-buildsize     "9.7 MB">
-  <!ENTITY lame-time          "0.1 SBU">
-]>
-
-<sect1 id="lame" xreflabel="LAME-&lame-version;">
-  <?dbhtml filename="lame.html"?>
-
-
-  <title>LAME-&lame-version;</title>
-
-  <indexterm zone="lame">
-    <primary sortas="a-LAME">LAME</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LAME</title>
-
-    <para>
-      The <application>LAME</application> package contains an MP3
-      encoder and optionally, an MP3 frame analyzer. This is useful
-      for creating and analyzing compressed audio files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lame-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lame-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lame-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lame-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lame-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lame-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LAME Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="https://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
-      <xref linkend="libsndfile"/> and
-      <xref linkend="nasm"/>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/lame"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LAME</title>
-
-    <para>
-      Install <application>LAME</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-mp3rtp --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make pkghtmldir=/usr/share/doc/lame-&lame-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-mp3rtp</parameter>: This switch enables building
-      the encode-to-RTP program.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-nasm</option>: Enable the use of
-      <xref linkend="nasm"/> to compile optimized assembly routines for
-      32-bit x86.  This option has no effect on x86_64.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lame and mp3rtp
-        </seg>
-        <seg>
-          libmp3lame.so
-        </seg>
-        <seg>
-          /usr/include/lame and
-          /usr/share/doc/lame-&lame-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lame-prog">
-        <term><command>lame</command></term>
-        <listitem>
-          <para>
-            creates MP3 audio files from raw
-            PCM or <filename>.wav</filename> data
-          </para>
-          <indexterm zone="lame lame-prog">
-            <primary sortas="b-lame">lame</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mp3rtp">
-        <term><command>mp3rtp</command></term>
-        <listitem>
-          <para>
-            is used to encode MP3 with RTP streaming of the output
-          </para>
-          <indexterm zone="lame mp3rtp">
-            <primary sortas="b-mp3rtp">mp3rtp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmp3lame">
-        <term><filename class="libraryfile">libmp3lame.so</filename></term>
-        <listitem>
-          <para>
-            libraries provide the functions necessary to convert
-            raw PCM and WAV files to MP3 files
-          </para>
-          <indexterm zone="lame libmp3lame">
-            <primary sortas="c-libmp3lame">libmp3lame.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: multimedia/audioutils/lame/lame.ent
===================================================================
--- multimedia/audioutils/lame/lame.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/lame/lame.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY lame SYSTEM "../lame.xml">
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/audioutils/mpg123.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,239 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="mpg123" xreflabel="mpg123-&mpg123-version;">
+<?dbhtml filename="mpg123.html" dir="multimedia"?>
+<title>mpg123-&mpg123-version;</title>
 
-  <!ENTITY mpg123-download-http "&sourceforge-dl;/mpg123/mpg123-&mpg123-version;.tar.bz2">
-  <!ENTITY mpg123-download-ftp  " ">
-  <!ENTITY mpg123-md5sum        "19443e8ef816c95fb2ed92aa35ece1d3">
-  <!ENTITY mpg123-size          "1.0 MB">
-  <!ENTITY mpg123-buildsize     "16 MB (with tests)">
-  <!ENTITY mpg123-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="mpg123" xreflabel="mpg123-&mpg123-version;">
-  <?dbhtml filename="mpg123.html"?>
-
-
-  <title>mpg123-&mpg123-version;</title>
-
-  <indexterm zone="mpg123">
-    <primary sortas="a-mpg123">mpg123</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mpg123</title>
-
-    <para>
-      The <application>mpg123</application> package contains a console-based MP3
-      player. It claims to be the fastest MP3 decoder for Unix.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mpg123-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mpg123-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mpg123-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mpg123-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mpg123-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mpg123-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">mpg123 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl"/>,
-      <ulink url="https://jackaudio.org">JACK</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink> and
-	  <ulink url="http://www.portaudio.com/">PortAudio</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mpg123</title>
-
-    <para>
-      Install <application>mpg123</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>- -with-module-suffix=.so</parameter>: This switch tells
-      <command>mpg123</command> to load modules with
-      <filename class="extension">.so</filename> extension which is useful if you
-      don't want to keep <filename class="extension">.la</filename> files.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          mpg123, mpg123-id3dump, mpg123-strip, and out123
-        </seg>
-        <seg>
-          libmpg123.so, libout123.so, and libsyn123.so
-        </seg>
-        <seg>
-          /usr/lib/mpg123
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mpg123-prog">
-        <term><command>mpg123</command></term>
-        <listitem>
-          <para>
-            is used for playing MP3 files via the console
-          </para>
-          <indexterm zone="mpg123 mpg123-prog">
-            <primary sortas="b-mpg123">mpg123</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpg123-id3dump">
-        <term><command>mpg123-id3dump</command></term>
-        <listitem>
-          <para>
-            is a tool to dump ID3 meta data from MPEG audio files
-            using libmpg123
-          </para>
-          <indexterm zone="mpg123 mpg123-id3dump">
-            <primary sortas="b-mpg123">mpg123-id3dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpg123-strip">
-        <term><command>mpg123-strip</command></term>
-        <listitem>
-          <para>
-            extracts only MPEG frames from a stream using libmpg123
-            (stdin to stdout)
-          </para>
-          <indexterm zone="mpg123 mpg123-strip">
-            <primary sortas="b-mpg123">mpg123-strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="out123">
-        <term><command>out123</command></term>
-        <listitem>
-          <para>
-            plays raw PCM audio to an output device
-          </para>
-          <indexterm zone="mpg123 out123">
-            <primary sortas="b-mpg123">out123</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmpg123">
-        <term><filename class="libraryfile">libmpg123.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>mpg123</application> API functions
-          </para>
-          <indexterm zone="mpg123 libmpg123">
-            <primary sortas="c-libmpg123">libmpg123.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libout123">
-        <term><filename class="libraryfile">libout123.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>out123</application> API functions
-          </para>
-          <indexterm zone="mpg123 libout123">
-            <primary sortas="c-libout123">libout123.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsyn123">
-        <term><filename class="libraryfile">libsyn123.so</filename></term>
-        <listitem>
-          <para>
-            contains some audio signal synthesis and format conversion
-            functions
-          </para>
-          <indexterm zone="mpg123 libsyn123">
-            <primary sortas="c-libsyn123">libsyn123.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&mpg123-intro;
+&mpg123-inst;
+&mpg123-exp;
+&mpg123-desc;
 
 </sect1>
+
Index: multimedia/audioutils/mpg123/mpg123-desc.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/mpg123/mpg123-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Contents</title>
+
+<para>The mpg123 package contains <userinput>mpg123</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>mpg123</title>
+<para>mpg123 is used for playing mp3 files via the console.</para></sect3>
+
+</sect2>
+
Index: multimedia/audioutils/mpg123/mpg123-exp.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/mpg123/mpg123-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>make linux:</userinput> This command builds 
+mpg123 for linux.</para>
+<para><userinput>make linux-help:</userinput> This command lists 
+all build-options for mpg123.</para>
+<para><userinput>make install:</userinput> This command installs 
+mpg123 in /usr/local/bin</para>
+
+</sect2>
+
Index: multimedia/audioutils/mpg123/mpg123-inst.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/mpg123/mpg123-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Installation of mpg123</title>
+
+<para>Install mpg123 by running the following commands:</para>
+
+<para><screen><userinput>make PREFIX=/usr linux &amp;&amp;</userinput>
+<userinput>make PREFIX=/usr install</userinput></screen></para>
+
+<para>You can optimize the build of mpg123 for your processor. 
+To do this, type</para>
+<para><screen><userinput>make linux-help</userinput></screen></para>
+
+<para>and select the optimization appropriate for your machine.
+However, this may not always work.  There have been problems reported
+with using optimizations with mpg123; make PREFIX=/usr linux always
+seems to work.</para>
+
+</sect2>
+
Index: multimedia/audioutils/mpg123/mpg123-intro.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/mpg123/mpg123-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to mpg123</title>
+
+<screen>Download location:              &mpg123-download;
+Version used:                   &mpg123-version;
+Package size:                   &mpg123-size;
+Estimated Disk space required:  &mpg123-buildsize;</screen>
+
+<para>The mpg123 package contains a console-based mp3-player. It claims to 
+be the fastest mp3-decoder for unix.</para>
+
+<screen>mpg123 depends on: <xref linkend="alsa"></xref> with 
+oss-compatibility.</screen>
+
+</sect2>
Index: multimedia/audioutils/mpg123/mpg123.ent
===================================================================
--- multimedia/audioutils/mpg123/mpg123.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/mpg123/mpg123.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY mpg123 SYSTEM "../mpg123.xml">
+<!ENTITY mpg123-intro SYSTEM "mpg123-intro.xml">
+<!ENTITY mpg123-inst SYSTEM "mpg123-inst.xml">
+<!ENTITY mpg123-exp SYSTEM "mpg123-exp.xml">
+<!ENTITY mpg123-desc SYSTEM "mpg123-desc.xml">
+<!ENTITY mpg123-buildsize "1.3 MB">
+<!ENTITY mpg123-version "0.59r">
+<!ENTITY mpg123-download "http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz">
+<!ENTITY mpg123-size "155 KB">
Index: ltimedia/audioutils/pavucontrol.xml
===================================================================
--- multimedia/audioutils/pavucontrol.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pavucontrol-download-http "https://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">
-]>
-
-<sect1 id="pavucontrol" xreflabel="pavucontrol-&pavucontrol-version;">
-  <?dbhtml filename="pavucontrol.html"?>
-
-
-  <title>pavucontrol-&pavucontrol-version;</title>
-
-  <indexterm zone="pavucontrol">
-    <primary sortas="a-pavucontrol">pavucontrol</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pavucontrol</title>
-
-    <para>
-      PulseAudio Volume Control (pavucontrol) is a simple GTK based volume
-      control tool ("mixer") for the PulseAudio sound server. In contrast to
-      classic mixer tools, this one allows you to control both the volume of
-      hardware devices and of each playback stream separately.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pavucontrol-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pavucontrol-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pavucontrol-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pavucontrol-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pavucontrol-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pavucontrol-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pavucontrol Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtkmm3"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libsigc"/>, and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pavucontrol</title>
-
-    <para>
-       Install <application>pavucontrol</application> by running the following
-       commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/pavucontrol-&pavucontrol-version; &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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pavucontrol
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/pavucontrol and /usr/share/doc/pavucontrol-5.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pavucontrol-prog">
-        <term><command>pavucontrol</command></term>
-        <listitem>
-          <para>
-            is a GUI configuration tool for sound settings using
-            <application>pulsaudio</application>
-          </para>
-          <indexterm zone="pavucontrol pavucontrol-prog">
-            <primary sortas="b-pavucontrol">pavucontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/audioutils/pnmixer.xml
===================================================================
--- multimedia/audioutils/pnmixer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-md5sum        "e9f17f56c50de39393030a96e343427b">
-  <!ENTITY pnmixer-size          "236 KB">
-  <!ENTITY pnmixer-buildsize     "2.5 MB">
-  <!ENTITY pnmixer-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="pnmixer" xreflabel="pnmixer-&pnmixer-version;">
-  <?dbhtml filename="pnmixer.html"?>
-
-
-  <title>pnmixer-&pnmixer-version;</title>
-
-  <indexterm zone="pnmixer">
-    <primary sortas="a-pnmixer">pnmixer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pnmixer</title>
-
-    <para>
-      The <application>Pnmixer</application> package provides a lightweight
-      volume control with a tray icon.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pnmixer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pnmixer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pnmixer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pnmixer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pnmixer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pnmixer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pnmixer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-utils"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pnmixer</title>
-
-    <para>
-      Install <application>Pnmixer</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..  &amp;&amp;
-make</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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pnmixer
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/pnmixer
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pnmixer-prog">
-        <term><command>pnmixer</command></term>
-        <listitem>
-          <para>
-            is a lightweight volume control that sits in a tray
-          </para>
-          <indexterm zone="pnmixer pnmixer">
-            <primary sortas="b-pnmixer">pnmixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/audioutils/vorbistools.xml
===================================================================
--- multimedia/audioutils/vorbistools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/audioutils/vorbistools.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,298 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="vorbistools" xreflabel="vorbistools-&vorbistools-version;">
+<?dbhtml filename="vorbistools.html" dir="multimedia"?>
+<title>vorbistools-&vorbistools-version;</title>
 
-  <!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-size          "1.3 MB">
-  <!ENTITY vorbistools-buildsize     "12 MB">
-  <!ENTITY vorbistools-time          "0.1 SBU">
-]>
-
-<sect1 id="vorbistools" xreflabel="vorbis-tools-&vorbistools-version;">
-  <?dbhtml filename="vorbistools.html"?>
-
-
-  <title>vorbis-tools-&vorbistools-version;</title>
-
-  <indexterm zone="vorbistools">
-    <primary sortas="a-Vorbis-Tools">Vorbis Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vorbis Tools</title>
-
-    <para>
-      The <application>Vorbis Tools</application> package contains
-      command-line tools useful for encoding, playing or editing
-      files using the Ogg CODEC.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vorbistools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vorbistools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vorbistools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vorbistools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vorbistools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vorbistools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Applied in 1.4.2
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/vorbis-tools-&vorbistools-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Vorbis Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libvorbis"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (required to build the
-    <command>ogg123</command> program)</bridgehead>
-    <para role="optional">
-      <xref linkend="libao"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="speex"/>, and
-      <ulink url="https://code.google.com/archive/p/libkate/">libkate</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vorbis Tools</title>
-
-<!-- Applied in 1.4.2
-    <para>
-      First, apply a patch to fix some security issues:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../vorbis-tools-&vorbistools-version;-security_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>Vorbis Tools</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vcut \
-            --without-curl &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-vcut</parameter>: This parameter is used so that
-      the <command>vcut</command> program is built as it is not by default.
-    </para>
-
-    <para>
-      <parameter>--without-curl</parameter>: This parameter disables HTTP
-      streaming in <command>ogg123</command>. Remove this parameter if you have
-      <application>cURL</application> installed.
-    </para>
-
- </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Vorbis Tools</title>
-
-    <sect3 id="vorbistools-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/libao.conf</filename>,
-        <filename>~/.libao</filename> and
-        <filename>~/.ogg123rc</filename>
-      </para>
-
-      <indexterm zone="vorbistools vorbistools-config">
-        <primary sortas="e-AA.libao">~/.libao</primary>
-      </indexterm>
-
-      <indexterm zone="vorbistools vorbistools-config">
-        <primary sortas="e-AA.ogg123rc">~/.ogg123rc</primary>
-      </indexterm>
-
-      <indexterm zone="vorbistools vorbistools-config">
-        <primary sortas="e-etc-libao.conf">/etc/libao.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Issue <command>man libao.conf</command> for information
-        about setting the default output device. Also see
-        <filename>/usr/share/doc/vorbis-tools-&vorbistools-version;/ogg123rc-example
-        </filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          ogg123, oggdec, oggenc, ogginfo, vcut and vorbiscomment
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/vorbis-tools-&vorbistools-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ogg123">
-        <term><command>ogg123</command></term>
-        <listitem>
-          <para>
-            is a command-line audio player for Ogg Vorbis streams
-          </para>
-          <indexterm zone="vorbistools ogg123">
-            <primary sortas="b-ogg123">ogg123</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oggdec">
-        <term><command>oggdec</command></term>
-        <listitem>
-          <para>
-            is a simple decoder which converts Ogg Vorbis files into
-            PCM audio files (WAV or raw)
-          </para>
-          <indexterm zone="vorbistools oggdec">
-            <primary sortas="b-oggdec">oggdec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oggenc">
-        <term><command>oggenc</command></term>
-        <listitem>
-          <para>
-            is an encoder that turns raw, WAV or
-            AIFF files into an Ogg Vorbis stream
-          </para>
-          <indexterm zone="vorbistools oggenc">
-            <primary sortas="b-oggenc">oggenc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ogginfo">
-        <term><command>ogginfo</command></term>
-        <listitem>
-          <para>
-            prints information stored in an audio file
-          </para>
-          <indexterm zone="vorbistools ogginfo">
-            <primary sortas="b-ogginfo">ogginfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vcut">
-        <term><command>vcut</command></term>
-        <listitem>
-          <para>
-            splits a file into two files at a designated cut point
-          </para>
-          <indexterm zone="vorbistools vcut">
-            <primary sortas="b-vcut">vcut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vorbiscomment">
-        <term><command>vorbiscomment</command></term>
-        <listitem>
-          <para>
-            is an editor that changes information in the audio file
-            metadata tags
-          </para>
-          <indexterm zone="vorbistools vorbiscomment">
-            <primary sortas="b-vorbiscomment">vorbiscomment</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&vorbistools-intro;
+&vorbistools-inst;
+&vorbistools-desc;
 
 </sect1>
+
Index: multimedia/audioutils/vorbistools/vorbistools-desc.xml
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/vorbistools/vorbistools-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Contents</title>
+
+<para>The vorbis-tools package contains <userinput>oggenc</userinput>,
+<userinput>ogg123</userinput>, <userinput>vcut</userinput> and
+<userinput>vorbiscomment</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>oggenc</title>
+<para>oggenc is the encoder that turns raw, WAV or AIFF files
+into an Ogg Vorbis stream.</para></sect3>
+
+<sect3><title>ogg123</title>
+<para>ogg123 is a commandline audio player for Ogg Vorbis streams.</para></sect3>
+
+<sect3><title>ogginfo</title>
+<para>ogginfo prints information stored in the audio
+file.</para></sect3>
+
+<sect3><title>vcut</title>
+<para>vcut will split a file into two files at a designated cut
+point.</para></sect3>
+
+<sect3><title>vorbiscomment</title>
+<para>vorbiscomment is an editor that changes information in the audio
+file metadata tags.</para></sect3>
+
+</sect2>
+
Index: multimedia/audioutils/vorbistools/vorbistools-inst.xml
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/vorbistools/vorbistools-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of vorbis-tools</title>
+
+<para>Install vorbis-tools by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install </userinput></screen></para>
+
+</sect2>
+
Index: multimedia/audioutils/vorbistools/vorbistools-intro.xml
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/vorbistools/vorbistools-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to vorbis-tools</title>
+
+<screen>Download location:              &vorbistools-download;
+Version used:                   &vorbistools-version;
+Package size:                   &vorbistools-size;
+Estimated Disk space required:  &vorbistools-buildsize;</screen>
+
+<para>The vorbis-tools package contains command line tools for ogg audio
+files.  This is useful for encoding, playing or editing files using the ogg CODEX.</para>
+
+<screen>vorbis-tools depends on:
+<xref linkend="curl"/>, <xref linkend="libao"/>, <xref
+linkend="libogg"/> and <xref linkend="libvorbis"/></screen>
+
+</sect2>
Index: multimedia/audioutils/vorbistools/vorbistools.ent
===================================================================
--- multimedia/audioutils/vorbistools/vorbistools.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/vorbistools/vorbistools.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY vorbistools SYSTEM "../vorbistools.xml">
+<!ENTITY vorbistools-intro SYSTEM "vorbistools-intro.xml">
+<!ENTITY vorbistools-inst SYSTEM "vorbistools-inst.xml">
+<!ENTITY vorbistools-desc SYSTEM "vorbistools-desc.xml">
+<!ENTITY vorbistools-buildsize "2 MB">
+<!ENTITY vorbistools-version "1.0rc3">
+<!ENTITY vorbistools-download "http://www.vorbis.com/files/rc3/unix/vorbis-tools-1.0rc3.tar.gz">
+<!ENTITY vorbistools-size "260 KB">
Index: multimedia/audioutils/xmms/XMMS-config.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/xmms/XMMS-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Configuring xmms</title>
+
+<sect3><title>Config files</title>
+<para><userinput>~/.xmms/config</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>When you start XMMS for the first time, you can configure it with 
+<userinput>CTRL+P</userinput> Note that you can extend XMMS' functionality
+with plugins and skins. You can find these at http://xmms.org. 
+</para>
+</sect3>
+
+</sect2>
+
Index: multimedia/audioutils/xmms/XMMS-desc.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/xmms/XMMS-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Contents</title>
+
+<para>The xmms package contains <userinput>xmms, xmms-config, gnomexmss, 
+wmxmms.</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>xmms</title>
+<para>XMMS, which stands for X Multimedia System, is a program comparable in
+function with WinAMP. It's main function is playing audio files like wav and
+mp3. It can be extended with plugins to play a number of other audio or video
+formats. It's look can be customized with WinAMP style skins.</para></sect3>
+
+<sect3><title>xmms-config</title>
+<para>This script is used by other programs which need to link with xmms to
+retrieve the library and include paths XMMS was compiled with. </para></sect3>
+
+<sect3><title>gnomexmms</title>
+<para>This is an applet for the GNOME desktop environment that will dock into
+the GNOME panel. From the applet you can start and control xmms.</para></sect3>
+
+<sect3><title>wmxmms</title>
+<para>wmxmms is a dock applet for the Window Maker window manager. From the 
+applet you ca start and control xmms.</para></sect3>
+</sect2>
Index: multimedia/audioutils/xmms/XMMS-exp.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/xmms/XMMS-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><userinput>./configure --prefix=/usr \
+--enable-one-plugin-dir &amp;&amp;</userinput></screen>
+This command ensures that all plugins are located under
+/usr/lib/xmms/Plugins.</para>
+</sect2>
+
Index: multimedia/audioutils/xmms/XMMS-inst.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/xmms/XMMS-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of XMMS</title>
+
+<para>Install XMMS by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr \
+--enable-one-plugin-dir &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+</sect2>
+
Index: multimedia/audioutils/xmms/XMMS-intro.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/xmms/XMMS-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to XMMS</title>
+
+<screen>Download location:              &XMMS-download;
+Version used:                   &XMMS-version;
+Package size:                   &XMMS-size;
+Estimated Disk space required:  &XMMS-buildsize;</screen>
+
+<para>XMMS is an audio player for the X Window System. </para>
+
+<screen>XMMS depends on:
+a working soundcard, x11, gtk, glib
+XMMS will utilize esd, gnome, libmikmod, libogg, libvorbis and libxml if
+installed prior to XMMS.</screen>
+</sect2>
Index: multimedia/audioutils/xmms/xmms.ent
===================================================================
--- multimedia/audioutils/xmms/xmms.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/audioutils/xmms/xmms.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY XMMS SYSTEM "../XMMS.xml">
+<!ENTITY XMMS-intro SYSTEM "XMMS-intro.xml">
+<!ENTITY XMMS-inst SYSTEM "XMMS-inst.xml">
+<!ENTITY XMMS-exp SYSTEM "XMMS-exp.xml">
+<!ENTITY XMMS-desc SYSTEM "XMMS-desc.xml">
+<!ENTITY XMMS-config SYSTEM "XMMS-config.xml">
+<!ENTITY XMMS-buildsize "NOT KNOWN">
+<!ENTITY XMMS-version "1.2.7">
+<!ENTITY XMMS-download "ftp://ftp.xmms.org/xmms/1.2.x/xmms-1.2.7.tar.bz2">
+<!ENTITY XMMS-size "1.7 MB">
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,205 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="cdrdao" xreflabel="cdrdao-&cdrdao-version;">
+<?dbhtml filename="cdrdao.html" dir="multimedia"?>
+<title>cdrdao-&cdrdao-version;</title>
 
-  <!ENTITY cdrdao-download-http "&sourceforge-dl;/cdrdao/cdrdao-&cdrdao-version;.tar.bz2">
-  <!ENTITY cdrdao-download-ftp  " ">
-  <!ENTITY cdrdao-md5sum        "2ada887d1b30b440867b8df0d3023cf7">
-  <!ENTITY cdrdao-size          "1.4 MB">
-  <!ENTITY cdrdao-buildsize     "39 MB">
-  <!ENTITY cdrdao-time          "0.1 SBU">
-]>
-
-<sect1 id="cdrdao" xreflabel="Cdrdao-&cdrdao-version;">
-  <?dbhtml filename="cdrdao.html"?>
-
-
-  <title>Cdrdao-&cdrdao-version;</title>
-
-  <indexterm zone="cdrdao">
-    <primary sortas="a-Cdrdao">Cdrdao</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cdrdao</title>
-
-    <para>
-      The <application>Cdrdao</application> package contains
-      CD recording utilities. These are useful for burning a
-      CD in disk-at-once mode.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cdrdao-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cdrdao-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cdrdao-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cdrdao-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cdrdao-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3"><application>Cdrdao</application> Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- <xref linkend="gtkmm2"/>, not used any more, was used for gcdmaster
-           which also needed a gnome2 library-->
-      <xref linkend="libao"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="libmad"/>, and
-      <xref linkend="lame"/> (required to build <command>toc2mp3</command>)
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/cdrdao"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cdrdao</title>
-
-    <para>
-      Install <application>Cdrdao</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &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;
-install -v -m755 -d /usr/share/doc/cdrdao-&cdrdao-version; &amp;&amp;
-install -v -m644 README /usr/share/doc/cdrdao-&cdrdao-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>--mandir=/usr/share/man</command>: Install manual pages in
-      /usr/share/man instead of /usr/man.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally
-        toc2mp3</seg>
-        <seg>None</seg>
-        <seg>/usr/share/cdrdao, /usr/share/doc/cdrdao-&cdrdao-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cdrdao-prog">
-        <term><command>cdrdao</command></term>
-        <listitem>
-          <para>
-            records audio or data CD-Rs in disk-at-once (DAO) mode
-            based on a textual description of the CD contents
-          </para>
-          <indexterm zone="cdrdao cdrdao-prog">
-            <primary sortas="b-cdrdao">cdrdao</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cue2toc">
-        <term><command>cue2toc</command></term>
-        <listitem>
-          <para>
-            converts CUE to TOC format for audio CDs
-          </para>
-          <indexterm zone="cdrdao cue2toc">
-            <primary sortas="b-cue2toc">cue2toc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="toc2cddb">
-        <term><command>toc2cddb</command></term>
-        <listitem>
-          <para>
-            converts a <application>Cdrdao</application>
-            TOC file into a cddb file and prints it to stdout
-          </para>
-          <indexterm zone="cdrdao toc2cddb">
-            <primary sortas="b-toc2cddb">toc2cddb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="toc2cue">
-        <term><command>toc2cue</command></term>
-        <listitem>
-          <para>
-            converts TOC to CUE format for audio CDs
-          </para>
-          <indexterm zone="cdrdao toc2cue">
-            <primary sortas="b-toc2cue">toc2cue</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="toc2mp3">
-        <term><command>toc2mp3</command></term>
-        <listitem>
-          <para>
-            converts an audio CD disk image (<filename>.toc</filename> file)
-            to MP3 files
-          </para>
-          <indexterm zone="cdrdao toc2mp3">
-            <primary sortas="b-toc2mp3">toc2mp3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&cdrdao-intro;
+&cdrdao-inst;
+&cdrdao-desc;
 
 </sect1>
+
Index: multimedia/cdwriteutils/cdrdao/cdrdao-desc.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrdao/cdrdao-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The cdrdao package contains <userinput>cdrdao</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cdrdao</title>
+<para>cdrdao records audio or data CD-Rs in disk-at-once (DAO) mode
+based on a textual description of the CD contents.</para></sect3>
+
+</sect2>
+
Index: multimedia/cdwriteutils/cdrdao/cdrdao-inst.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrdao/cdrdao-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of cdrdao</title>
+
+<para>Install cdrdao by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install </userinput></screen></para>
+
+</sect2>
+
Index: multimedia/cdwriteutils/cdrdao/cdrdao-intro.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrdao/cdrdao-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to cdrdao</title>
+
+<screen>Download location:              <ulink url="&cdrdao-download;"/>
+Version used:                   &cdrdao-version;
+Package size:                   &cdrdao-size;
+Estimated Disk space required:  &cdrdao-buildsize;</screen>
+
+<para>The cdrdao package contains cdrdao. This is useful for burning
+a CD in disk-at-once mode.</para>
+
+<screen>cdrdao depends on:
+<xref linkend="pccts"/></screen>
+
+</sect2>
Index: multimedia/cdwriteutils/cdrdao/cdrdao.ent
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrdao/cdrdao.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY cdrdao SYSTEM "../cdrdao.xml">
+<!ENTITY cdrdao-intro SYSTEM "cdrdao-intro.xml">
+<!ENTITY cdrdao-inst SYSTEM "cdrdao-inst.xml">
+<!ENTITY cdrdao-desc SYSTEM "cdrdao-desc.xml">
+<!ENTITY cdrdao-buildsize "15.9 MB">
+<!ENTITY cdrdao-version "1.1.5">
+<!ENTITY cdrdao-download "http://sourceforge.net/projects/cdrdao">
+<!ENTITY cdrdao-size "852 KB">
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,351 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="cdrtools" xreflabel="cdrtools-&cdrtools-version;">
+<?dbhtml filename="cdrtools.html" dir="multimedia"?>
+<title>cdrtools-&cdrtools-version;</title>
 
-  <!ENTITY cdrtools-download-http "&sourceforge-dl;/cdrtools/cdrtools-&cdrtools-version;.tar.bz2">
-  <!ENTITY cdrtools-download-ftp  " ">
-  <!ENTITY cdrtools-md5sum        "1e224a6adbbe4ad40047b9fddbb0e60c">
-  <!ENTITY cdrtools-size          "2.1 MB">
-  <!ENTITY cdrtools-buildsize     "32 MB">
-  <!ENTITY cdrtools-time          "0.7 SBU">
-]>
-
-<sect1 id="cdrtools" xreflabel="Cdrtools-&cdrtools-version;">
-  <?dbhtml filename="cdrtools.html"?>
-
-
-  <title>Cdrtools-&cdrtools-version;</title>
-
-  <indexterm zone="cdrtools">
-    <primary sortas="a-Cdrtools">Cdrtools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cdrtools</title>
-
-    <para>
-      The <application>Cdrtools</application> package contains
-      CD recording utilities. These are useful for reading, creating or writing
-      (burning) CDs, DVDs, and Blu-ray discs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cdrtools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cdrtools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cdrtools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cdrtools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cdrtools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cdrtools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cdrtools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/Cdrtools"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cdrtools</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Cdrtools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export GMAKE_NOWARN=true &amp;&amp;
-make -j1 INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root</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>export GMAKE_NOWARN=true &amp;&amp;
-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 \
-                    /usr/share/doc/cdrtools-&cdrtools-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>export GMAKE_NOWARN=true</command>: This variable avoids a
-      warning when using GNU make.
-    </para>
-
-    <para>
-      <parameter>INS_BASE=/usr</parameter>: This parameter moves
-      the install directory from <filename class="directory">/opt/schily</filename>
-      to <filename class="directory">/usr</filename>.
-    </para>
-
-    <para>
-      <parameter>DEFINSUSR=root DEFINSGRP=root</parameter>: These parameters
-      install all programs with root:root ownership instead of the default
-      bin:bin.
-    </para>
-
-    <para>
-      <parameter>MANSUFF_LIB=3cdr</parameter>: This parameter prevents
-      <application>Cdrtools</application> from overwriting important pages
-      which are already installed by LFS. The installed man pages of section 3
-      will have a suffix <literal>3cdr</literal> and can be shown using
-      <command>man 3cdr &lt;manpage&gt;</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>btcflash, cdda2mp3, cdda2ogg, cdda2wav, cdrecord, devdump,
-             isodebug, isodump, isoinfo, isovfy, mkhybrid, mkisofs, readcd,
-             rscsi, scgcheck, scgskeleton</seg>
-
-        <seg>libcdrdeflt.a, libdeflt.a, libedc_ecc.a, libedc_ecc_dec.a,
-             libfile.a, libfind.a, libhfs.a, libmdigest.a, libparanoia.a,
-             librscg.a, libscg.a, libscgcmd.a, libschily.a, libsiconv.a</seg>
-
-        <seg>/usr/lib/{profiled,siconv}, /usr/include/{scg,schily},
-             /usr/share/doc/cdda2wav,cdrecord,libparanoia,mkisofs,rscsi}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="btcflash">
-        <term><command>btcflash</command></term>
-        <listitem>
-          <para>
-            flashes the firmware on BTC DRW1008 DVD+/-RW recorder.
-            Please exercise care with this program
-          </para>
-          <indexterm zone="cdrtools btcflash">
-            <primary sortas="b-btcflash">btcflash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdda2wav">
-        <term><command>cdda2wav</command></term>
-        <listitem>
-          <para>
-            converts Compact Disc audio into WAV sound files
-          </para>
-          <indexterm zone="cdrtools cdda2wav">
-            <primary sortas="b-cdda2wav">cdda2wav</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdrecord">
-        <term><command>cdrecord</command></term>
-        <listitem>
-          <para>
-            records audio or data Compact Discs
-          </para>
-          <indexterm zone="cdrtools cdrecord">
-            <primary sortas="b-cdrecord">cdrecord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="devdump">
-        <term><command>devdump</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program used to dump an
-            ISO-9660 device or file in hex
-          </para>
-          <indexterm zone="cdrtools devdump">
-            <primary sortas="b-devdump">devdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isodebug">
-        <term><command>isodebug</command></term>
-        <listitem>
-          <para>
-            is used to display the command-line parameters used to create
-            an ISO-9660 image
-          </para>
-          <indexterm zone="cdrtools isodebug">
-            <primary sortas="b-isodebug">isodebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isodump">
-        <term><command>isodump</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program used to dump a device or file based on
-            ISO-9660
-          </para>
-          <indexterm zone="cdrtools isodump">
-            <primary sortas="b-isodump">isodump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isoinfo">
-        <term><command>isoinfo</command></term>
-        <listitem>
-          <para>
-            is used to analyze or list an ISO-9660 image
-          </para>
-          <indexterm zone="cdrtools isoinfo">
-            <primary sortas="b-isoinfo">isoinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isovfy">
-        <term><command>isovfy</command></term>
-        <listitem>
-          <para>
-            is used to verify an ISO-9660 image
-          </para>
-          <indexterm zone="cdrtools isovfy">
-            <primary sortas="b-isovfy">isovfy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkhybrid">
-        <term><command>mkhybrid</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>mkisofs</command> used to
-            create ISO-9660/HFS hybrid filesystem images
-          </para>
-          <indexterm zone="cdrtools mkhybrid">
-            <primary sortas="b-mkhybrid">mkhybrid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkisofs">
-        <term><command>mkisofs</command></term>
-        <listitem>
-          <para>
-            is used to create ISO-9660/JOLIET/HFS filesystem images,
-            optionally with Rock Ridge attributes
-          </para>
-          <indexterm zone="cdrtools mkisofs">
-            <primary sortas="b-mkisofs">mkisofs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readcd">
-        <term><command>readcd</command></term>
-        <listitem>
-          <para>
-            reads or writes Compact Discs
-          </para>
-          <indexterm zone="cdrtools readcd">
-            <primary sortas="b-readcd">readcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rscsi">
-        <term><command>rscsi</command></term>
-        <listitem>
-          <para>
-            is a remote SCSI manager
-          </para>
-          <indexterm zone="cdrtools rscsi">
-            <primary sortas="b-rscsi">rscsi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scgcheck">
-        <term><command>scgcheck</command></term>
-        <listitem>
-          <para>
-            is used to check and verify the Application Binary Interface
-            of <filename class="libraryfile">libscg</filename>
-          </para>
-          <indexterm zone="cdrtools scgcheck">
-            <primary sortas="b-scgcheck">scgcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libscg">
-        <term><filename class="libraryfile">libscg.a</filename></term>
-        <listitem>
-          <para>
-            is a highly portable SCSI transport library
-          </para>
-          <indexterm zone="cdrtools libscg">
-            <primary sortas="c-libscg">libscg.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&cdrtools-intro;
+&cdrtools-inst;
+&cdrtools-exp;
+&cdrtools-desc;
 
 </sect1>
+
Index: multimedia/cdwriteutils/cdrtools/cdrtools-desc.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,47 @@
+<sect2>
+<title>Contents</title>
+
+<para>The cdrtools package contains <userinput>cdrecord</userinput>,
+<userinput>cdda2wav</userinput>, <userinput>mkisofs</userinput>,
+<userinput>readcd</userinput>, <userinput>scgcheck</userinput>,
+<userinput>isoinfo</userinput>, <userinput>isodump</userinput>,
+<userinput>dsovfy</userinput>, <userinput>devdump</userinput>,
+<userinput>rscsi</userinput> and
+<userinput>support libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cdrecord</title>
+<para>cdrecord records audio or data Compact Discs.</para></sect3>
+
+<sect3><title>cdda2wav</title>
+<para>cdda2wav dumps Compact Disc audio into wav sound files.</para></sect3>
+
+<sect3><title>mkisofs</title>
+<para>mkisofs and mkhybrid generates an ISO9660/JOLIET/HFS hybrid
+filesystem.</para></sect3>
+
+<sect3><title>readcd</title>
+<para>readcd reads or writes Compact Discs.</para></sect3>
+
+<sect3><title>scgcheck</title>
+<para>scgcheck is used to check and verify the Application Binary
+Interface of libscg.</para></sect3>
+
+<sect3><title>support utilities</title>
+<para>isoinfo, isodump, isovfy and devdump are utility programs for
+dumping and verifying iso9660 images.</para></sect3>
+
+<sect3><title>rscsi</title>
+<para>rscsi is a remote scsi manager.</para></sect3>
+
+<sect3><title>support libraries</title>
+<para>libdeflt, libfile, libhfs, librscg, libscg, libschily and libunls
+are the support libraries for this package.</para></sect3>
+
+
+
+</sect2>
+
Index: multimedia/cdwriteutils/cdrtools/cdrtools-exp.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>INS_BASE=/usr :</userinput> This command moves the
+install directory from <filename class="directory"> /opt/schily
+</filename> to <filename class="directory"> /usr </filename>.</para>
+
+<para><userinput>DEFINSUSR=root DEFINSGRP=root :</userinput>These
+commands install all programs with root.root ownership instead of the default
+bin.bin.</para>
+
+</sect2>
+
Index: multimedia/cdwriteutils/cdrtools/cdrtools-inst.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of cdrtools</title>
+
+<para>Install cdrtools by running the following commands:</para>
+
+<para><screen><userinput>make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root \
+&nbsp;&nbsp;&nbsp;COPTS=$CFLAGS &amp;&amp;
+make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root \ 
+&nbsp;&nbsp;&nbsp;COPTS=$CFLAGS install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Introduction to cdrtools</title>
+
+<screen>Download location:              &cdrtools-download;
+Version used:                   &cdrtools-version;
+Package size:                   &cdrtools-size;
+Estimated Disk space required:  &cdrtools-buildsize;</screen>
+
+<para>The cdrtools package contains cdrecord and mkisofs. These are
+useful for reading, creating or writing (burning) Compact Discs.</para>
+
+</sect2>
Index: multimedia/cdwriteutils/cdrtools/cdrtools.ent
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/cdrtools/cdrtools.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY cdrtools SYSTEM "../cdrtools.xml">
+<!ENTITY cdrtools-intro SYSTEM "cdrtools-intro.xml">
+<!ENTITY cdrtools-inst SYSTEM "cdrtools-inst.xml">
+<!ENTITY cdrtools-desc SYSTEM "cdrtools-desc.xml">
+<!ENTITY cdrtools-exp SYSTEM "cdrtools-exp.xml">
+<!ENTITY cdrtools-buildsize "12.3 MB">
+<!ENTITY cdrtools-version "1.10">
+<!ENTITY cdrtools-download "ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/cdrtools-1.10.tar.gz">
+<!ENTITY cdrtools-size "1.27 MB">
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,51 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="multimedia-cdwriteutils">
+<?dbhtml filename="cdwriteutils.html" dir="multimedia"?>
+<title>CD-Writing utilities</title>
 
-<chapter id="multimedia-cdwriteutils">
-  <?dbhtml filename="cdwriteutils.html"?>
+<para>This chapter contains information on CD-writing in Linux.  You
+will first have to configure your kernel for cd-writing.  We start by
+discussing how to do this, then discuss installing the actual utilities.</para>
 
-  <title>CD/DVD-Writing Utilities</title>
+<para>Additional sources of information on CD-writing include:</para>
 
-  <para>
-    This chapter contains information on CD/DVD-writing utilities in Linux.
-  </para>
+<itemizedlist>
 
-  <para>
-    Additional sources of information include:
-  </para>
+<listitem><para><ulink
+url="http://www.tldp.org/HOWTO/CD-Writing-HOWTO.html">CD-Writing 
+HOWTO</ulink></para></listitem>
 
-  <itemizedlist>
-    <listitem>
-      <para>
-        <ulink
-        url="https://www.tldp.org/HOWTO/CD-Writing-HOWTO.html">CD-Writing
-        HOWTO</ulink>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <ulink url="https://www.cdrfaq.org">CD-Recordable FAQ</ulink>
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <ulink url="http://fy.chalmers.se/~appro/linux/DVD+RW/">The
-        dvd+rw-tools Website</ulink>
-      </para>
-    </listitem>
-  </itemizedlist>
+<listitem><para><ulink url="http://www.cdrfaq.org">CD-Recordable
+FAQ</ulink></para></listitem>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdrdao.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdrtools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dvd+rw-tools.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="k3b.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libburn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libisoburn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libisofs.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="simpleburn.xml"/> -->
+</itemizedlist>
+
+&multimedia-cdwriteutils-kernel;
+&cdrtools;
+&cdrdao;
 
 </chapter>
Index: ltimedia/cdwriteutils/dvd+rw-tools.xml
===================================================================
--- multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dvd-rw-tools-download-http "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-&dvd-rw-tools-version;.tar.gz">
-  <!ENTITY dvd-rw-tools-download-ftp  " ">
-  <!ENTITY dvd-rw-tools-md5sum        "8acb3c885c87f6838704a0025e435871">
-  <!ENTITY dvd-rw-tools-size          "138 KB">
-  <!ENTITY dvd-rw-tools-buildsize     "1.7 MB">
-  <!ENTITY dvd-rw-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="dvd-rw-tools" xreflabel="dvd+rw-tools-&dvd-rw-tools-version;">
-  <?dbhtml filename="dvd-rw-tools.html"?>
-
-
-  <title>dvd+rw-tools-&dvd-rw-tools-version;</title>
-
-  <indexterm zone="dvd-rw-tools">
-    <primary sortas="a-dvd-rw-tools">dvd+rw-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dvd+rw-tools</title>
-
-    <para>
-        The <application>dvd+rw-tools</application> package contains
-    several utilities to master the DVD media, both +RW/+R and -R[W]. The
-    principle tool is <command>growisofs</command> which provides a way to both
-    lay down <emphasis role='strong'>and</emphasis> grow an ISO9660 file system
-    on (as well as to burn an arbitrary pre-mastered image to) all supported
-    DVD media. This is useful for creating a new DVD or adding to an existing
-    image on a partially burned DVD.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dvd-rw-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dvd-rw-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dvd-rw-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dvd-rw-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dvd-rw-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dvd-rw-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">dvd+rw-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para>
-      <xref role="runtime" linkend="cdrtools"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dvd+rw-tools</title>
-
-    <para>
-      Install <application>dvd+rw-tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/stat.h/a #include &lt;sys/sysmacros.h&gt;' growisofs.c &amp;&amp;
-sed -i '/stdlib/a #include &lt;limits.h&gt;' transport.hxx &amp;&amp;
-make all rpl8 btcflash</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 prefix=/usr install &amp;&amp;
-install -v -m644 -D index.html \
-    /usr/share/doc/dvd+rw-tools-&dvd-rw-tools-version;/index.html</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/stdlib/a #include &lt;limits.h&gt;' ...</command>: This
-      sed includes <filename>limits.h</filename>, one of the kernel headers.
-      This is needed due to a change in the 2.6.23 kernel headers.
-    </para>
-
-<!-- left these here in the event that libisoburn gets fixed and can be a
-     substitution again
-
-    <para>
-      <command>sed -i 's#mkisofs"#xorrisofs"#' growisofs.c</command>: This sed
-      changes the code to use <command>xorrisofs</command> from
-      <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>.
-    </para>
-
-    <para>
-      <command>sed -i 's#mkisofs#xorrisofs#;s#MKISOFS#XORRISOFS#'
-      growisofs.1</command>: This sed fixes the man page to account for the
-      above change.
-    </para>
--->
-    <para>
-      <command>make all rpl8 btcflash</command>: This command uses additional
-      targets so that all the utilities are built.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>btcflash, dvd+rw-booktype, dvd+rw-format, dvd+rw-mediainfo,
-        dvd-ram-control, growisofs, and rpl8</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/dvd+rw-tools-&dvd-rw-tools-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="growisofs">
-        <term><command>growisofs</command></term>
-        <listitem>
-          <para>
-            is a combined <command>mkisofs</command> frontend/DVD recording
-            program
-          </para>
-          <indexterm zone="dvd-rw-tools growisofs">
-            <primary sortas="b-growisofs">growisofs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: multimedia/cdwriteutils/kernel.xml
===================================================================
--- multimedia/cdwriteutils/kernel.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/cdwriteutils/kernel.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,52 @@
+<sect1 id="kernel" xreflabel="kernel">
+<?dbhtml filename="kernel.html" dir="multimedia"?>
+<title>Configuring your kernel for CD-Writing</title>
+
+<para>In the kernel configuration, check your settings with those listed
+below for your CD-ROM interface type:</para>
+
+<para>SCSI CD-writer:</para>
+<screen>
+SCSI support menu
+  SCSI support:           Y or M
+  SCSI CD-ROM support:    Y or M
+  SCSI generic support:   Y or M
+  Vendor-specific extensions:  [1]
+Also include the low-level driver for your SCSI card if
+applicable.</screen>
+
+
+<para>IDE CD-writer:</para>
+<screen>
+ATA/IDE/MFM/RLL support menu
+  IDE/ATAPI CDROM support:     N
+  SCSI emulation support: Y or M
+SCSI support menu
+  SCSI support:           Y or M
+  SCSI CD-ROM support:    Y or M
+  SCSI generic support:   Y or M
+  Vendor-specific extensions:  [1]</screen>
+
+<para>[1] Read the help to determine if this selection is applicable for
+your hardware.</para>
+
+<para>If necessary, recompile the kernel with
+<screen>make dep &amp;&amp;
+make bzImage&amp;&amp;
+make modules &amp;&amp;
+make modules_install</screen>
+</para>
+<para>
+Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
+<filename>/usr/src/linux/System.map</filename> to
+<filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
+appropriately and run <userinput>lilo</userinput>.
+</para>
+
+<para>For more information about these settings and the drivers they
+install, read <ulink
+url="http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO/sr.html">The Linux 2.4
+SCSI subsystem HOWTO</ulink>.</para>
+
+</sect1>
+
Index: ltimedia/cdwriteutils/libburn.xml
===================================================================
--- multimedia/cdwriteutils/libburn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libburn-download-http
-           "https://files.libburnia-project.org/releases/libburn-&libburn-version;.tar.gz">
-  <!ENTITY libburn-download-ftp  " ">
-  <!ENTITY libburn-md5sum        "cf9852f3b71dbc2b6c9e76f6eb0474f0">
-  <!ENTITY libburn-size          "972 KB">
-  <!ENTITY libburn-buildsize     "17 MB">
-  <!ENTITY libburn-time          "0.1 SBU">
-]>
-
-<sect1 id="libburn" xreflabel="libburn-&libburn-version;">
-  <?dbhtml filename="libburn.html"?>
-
-
-  <title>libburn-&libburn-version;</title>
-
-  <indexterm zone="libburn">
-    <primary sortas="a-libburn">libburn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libburn</title>
-
-    <para>
-      <application>libburn</application> is a library for writing preformatted
-      data onto optical media: CD, DVD and BD (Blu-Ray).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libburn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libburn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libburn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libburn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libburn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libburn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libburn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to generate HTML documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libburn</title>
-
-    <para>
-      Install <application>libburn</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <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>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          cdrskin
-        </seg>
-        <seg>
-          libburn.so
-        </seg>
-        <seg>
-          /usr/include/libburn
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cdrskin">
-        <term><command>cdrskin</command></term>
-        <listitem>
-          <para>
-            burns preformatted data to CD, DVD, and BD via
-            <application>libburn</application>
-          </para>
-          <indexterm zone="libburn cdrskin">
-            <primary sortas="b-cdrskin">cdrskin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libburn-lib">
-        <term><filename class="libraryfile">libburn.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libburn</application> API functions
-          </para>
-          <indexterm zone="libburn libburn-lib">
-            <primary sortas="c-libburn">libburn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/cdwriteutils/libisoburn.xml
===================================================================
--- multimedia/cdwriteutils/libisoburn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libisoburn-download-http
-           "https://files.libburnia-project.org/releases/libisoburn-&libisoburn-version;.tar.gz">
-  <!ENTITY libisoburn-download-ftp  " ">
-  <!ENTITY libisoburn-md5sum        "efb19f7f718f0791f717b2c6094995ec">
-  <!ENTITY libisoburn-size          "1.5 MB">
-  <!ENTITY libisoburn-buildsize     "20 MB (with Tk and HTML documentation)">
-  <!ENTITY libisoburn-time          "0.2 SBU (with Tk and HTML documentation)">
-]>
-
-<sect1 id="libisoburn" xreflabel="libisoburn-&libisoburn-version;">
-  <?dbhtml filename="libisoburn.html"?>
-
-
-  <title>libisoburn-&libisoburn-version;</title>
-
-  <indexterm zone="libisoburn">
-    <primary sortas="a-libisoburn">libisoburn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libisoburn</title>
-
-    <para>
-      <application>libisoburn</application> is a frontend for libraries
-      <application>libburn</application> and <application>libisofs</application>
-      which enables creation and expansion of ISO-9660 filesystems on all
-      CD/DVD/BD media supported by <application>libburn</application>. This
-      includes media like DVD+RW, which do not support multi-session management
-      on media level and even plain disk files or block devices.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libisoburn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libisoburn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libisoburn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libisoburn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libisoburn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libisoburn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libisoburn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libburn"/> and
-      <xref linkend="libisofs"/>
-    </para>
-
-    <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>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libisoburn</title>
-
-    <para>
-      Install <application>libisoburn</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr              \
-            --disable-static           \
-            --enable-pkg-check-modules &amp;&amp;
-make</userinput></screen>
-
-    <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>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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/libisoburn-&libisoburn-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/libisoburn-&libisoburn-version;</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>
-      <parameter>--enable-pkg-check-modules</parameter>: Enable
-      <application>pkg-config</application> check for
-      <application>libburn</application> and
-      <application>libisofs</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          osirrox,
-          xorrecord,
-          xorriso,
-          xorriso-dd-target,
-          xorrisofs, and
-          xorriso-tcltk
-        </seg>
-        <seg>
-          libisoburn.so
-        </seg>
-        <seg>
-          /usr/include/libisoburn and
-          /usr/share/doc/libisoburn-&libisoburn-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="osirrox">
-        <term><command>osirrox</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>xorriso</command> that copies files
-            from ISO image to a disk filesystem
-          </para>
-          <indexterm zone="libisoburn osirrox">
-            <primary sortas="b-osirrox">osirrox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xorrecord">
-        <term><command>xorrecord</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>xorriso</command> that provides a
-            cdrecord type user interface
-          </para>
-          <indexterm zone="libisoburn xorrecord">
-            <primary sortas="b-xorrecord">xorrecord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xorriso">
-        <term><command>xorriso</command></term>
-        <listitem>
-          <para>
-            is a program to create, load, manipulate, read, and write ISO 9660
-            filesystem images with Rock Ridge extensions
-          </para>
-          <indexterm zone="libisoburn xorriso">
-            <primary sortas="b-xorriso">xorriso</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            is a symbolic link to <command>xorriso</command> that provides
-            a mkisofs type user interface
-          </para>
-          <indexterm zone="libisoburn xorrisofs">
-            <primary sortas="b-xorrisofs">xorrisofs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="xorriso-tcltk">
-        <term><command>xorriso-tcltk</command></term>
-        <listitem>
-          <para>
-            is a frontend that operates xorriso in dialog mode
-          </para>
-          <indexterm zone="libisoburn xorriso-tcltk">
-            <primary sortas="b-xorriso-tcltk">xorriso-tcltk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libisoburn-lib">
-        <term><filename class="libraryfile">libisoburn.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libisoburn</application> API functions
-          </para>
-          <indexterm zone="libisoburn libisoburn-lib">
-            <primary sortas="c-libisoburn">libisoburn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/cdwriteutils/libisofs.xml
===================================================================
--- multimedia/cdwriteutils/libisofs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libisofs-download-http
-           "https://files.libburnia-project.org/releases/libisofs-&libisofs-version;.tar.gz">
-  <!ENTITY libisofs-download-ftp  " ">
-  <!ENTITY libisofs-md5sum        "9f996b317f622802f12d28d27891709f">
-  <!ENTITY libisofs-size          "858 KB">
-  <!ENTITY libisofs-buildsize     "14 MB">
-  <!ENTITY libisofs-time          "0.1 SBU">
-]>
-
-<sect1 id="libisofs" xreflabel="libisofs-&libisofs-version;">
-  <?dbhtml filename="libisofs.html"?>
-
-
-  <title>libisofs-&libisofs-version;</title>
-
-  <indexterm zone="libisofs">
-    <primary sortas="a-libisofs">libisofs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libisofs</title>
-
-    <para>
-      <application>libisofs</application> is a library to create an ISO-9660
-      filesystem with extensions like RockRidge or Joliet.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libisofs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libisofs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libisofs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libisofs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libisofs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libisofs-time;
-        </para>
-      </listitem>
-    </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="https://www.einval.com/~steve/software/JTE/">libjte</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libisofs</title>
-
-    <para>
-      Install <application>libisofs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <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>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libisofs.so
-        </seg>
-        <seg>
-          /usr/include/libisofs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libisofs-lib">
-        <term><filename class="libraryfile">libisofs.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libisofs</application> API functions
-          </para>
-          <indexterm zone="libisofs libisofs-lib">
-            <primary sortas="c-libisofs">libisofs.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/SDL.xml
===================================================================
--- multimedia/libdriv/SDL.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/SDL.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="SDL" xreflabel="SDL-&SDL-version;">
+<?dbhtml filename="sdl.html" dir="multimedia"?>
+<title>SDL-&SDL-version;</title>
+
+&SDL-intro;
+&SDL-inst;
+&SDL-exp;
+&SDL-config;
+&SDL-desc;
+
+</sect1>
+
Index: ltimedia/libdriv/alsa-firmware.xml
===================================================================
--- multimedia/libdriv/alsa-firmware.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 alsa-firmware-download-http "&alsa-download-http;/firmware/alsa-firmware-&alsa-firmware-version;.tar.bz2">
-  <!ENTITY alsa-firmware-download-ftp  " ">
-  <!ENTITY alsa-firmware-md5sum        "ee6c1d24a1a4ac1d86992b408ed710a2">
-  <!ENTITY alsa-firmware-size          "4.9 MB">
-  <!ENTITY alsa-firmware-buildsize     "39 MB">
-  <!ENTITY alsa-firmware-time          "less than 0.1 SBU">
-]>
-<sect1 id="alsa-firmware" xreflabel="alsa-firmware-&alsa-firmware-version;">
-  <?dbhtml filename="alsa-firmware.html"?>
-
-
-  <title>alsa-firmware-&alsa-firmware-version;</title>
-
-  <indexterm zone="alsa-firmware">
-    <primary sortas="a-alsa-firmware">alsa-firmware</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Firmware</title>
-
-    <para>
-      The <application>ALSA Firmware</application> package
-      contains firmware for certain sound cards.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-firmware-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-firmware-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-firmware-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-firmware-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-firmware-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-firmware-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA Firmware Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-tools"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.pjrc.com/tech/8051/">AS31</ulink>
-     (for rebuilding the firmware from source)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Firmware</title>
-
-    <para>
-      The <application>ALSA Firmware</application> package is only
-      needed by those with advanced requirements for their sound
-      card. See the README for configure options.
-    </para>
-
-    <para>
-      Install <application>ALSA Firmware</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          Several directories in /lib/firmware and
-          /usr/share/alsa/firmware
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/alsa-lib-kernel.xml
===================================================================
--- multimedia/libdriv/alsa-lib-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>S</emphasis>ound card support ---&gt;                                          [SOUND]
-    # Select settings and drivers appropriate for your hardware
-    # in the submenu:
-    &lt;*/M&gt; <emphasis role='blue'>A</emphasis>dvanced Linux Sound Architecture ---&gt;                           [SND]</screen>
Index: ltimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 alsa-lib-download-http "&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
-  <!ENTITY alsa-lib-download-ftp  " ">
-  <!ENTITY alsa-lib-md5sum        "1c5870770047b6a520d18a43f49e42ea">
-  <!ENTITY alsa-lib-size          "1.1 MB">
-  <!ENTITY alsa-lib-buildsize     "46 MB (with tests and docs)">
-  <!ENTITY alsa-lib-time          "0.3 SBU (with tests and docs)">
-]>
-
-<sect1 id="alsa-lib" xreflabel="alsa-lib-&alsa-lib-version;">
-  <?dbhtml filename="alsa-lib.html"?>
-
-
-  <title>alsa-lib-&alsa-lib-version;</title>
-
-  <indexterm zone="alsa-lib">
-    <primary sortas="a-alsa-lib">alsa-lib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Library</title>
-
-    <para>
-      The <application>ALSA Library</application> package contains
-      the ALSA library used by programs (including <application>ALSA
-      Utilities</application>) requiring access to the ALSA sound
-      interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-lib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-lib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-lib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-lib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-lib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-lib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">ALSA Library Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="runtime">
-      <phrase revision='sysv'><xref linkend='elogind'/></phrase>
-      <phrase revision='systemd'><xref linkend='systemd'/></phrase>
-    </para>
-
-    <note>
-      <para>
-        If the recommended runtime dependency is not installed, you may
-        need to run any application requiring ALSA library as the &root;
-        user or a user in the
-        <systemitem class='groupname'>audio</systemitem> group.
-      </para>
-    </note>
-
-    <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-&alsa-lib-version;.tar.bz2">alsa-ucm-conf</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel"  id="alsa-lib-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-       If needed, enable the following options in the kernel
-       configuration and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="alsa-lib-kernel.xml"/>
-
-    <para>
-      In the Device Drivers &rArr; Sound card support &rArr; Advanced Linux
-      Sound Architecture section of the kernel configuration, select the
-      settings and drivers appropriate for your hardware.  If necessary,
-      recompile and install your new kernel.
-    </para>
-
-    <indexterm zone="alsa-lib alsa-lib-kernel">
-      <primary sortas="d-ALSA">ALSA</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Library</title>
-<!--
-    <para>
-      First, if you are building on a 32-bit system, fix a regression that
-      causes a segmentation fault when playing audio:
-    </para>
-
-<screen><userinput>case $(uname -m) in
-   i?86) patch -Np1 -i ../alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch ;;
-esac</userinput></screen>
--->
-    <para>
-      Install <application>ALSA Library</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure &amp;&amp;
-make</userinput></screen>
-
-   <para>
-     If you have <application>Doxygen</application> installed and you wish to
-     build the library API documentation, run the following
-     commands from the top-level directory of the source tree:
-   </para>
-
-<screen remap="doc"><userinput>make doc</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To install the API documentation, run the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search &amp;&amp;
-install -v -m644 doc/doxygen/html/*.* \
-                /usr/share/doc/alsa-lib-&alsa-lib-version;/html &amp;&amp;
-install -v -m644 doc/doxygen/html/search/* \
-                /usr/share/doc/alsa-lib-&alsa-lib-version;/html/search</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ALSA Library</title>
-
-    <sect3 id="alsa-lib-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.asoundrc</filename> and
-        <filename>/etc/asound.conf</filename>
-      </para>
-
-      <indexterm zone="alsa-lib alsa-lib-config">
-        <primary sortas="e-AA.asoundrc">~/.asoundrc</primary>
-      </indexterm>
-
-      <indexterm zone="alsa-lib alsa-lib-config">
-        <primary sortas="e-etc-asound.conf">/etc/asound.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The default <filename>alsa.conf</filename> is adequate for most
-        installations. For extra functionality and/or advanced control of your
-        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"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aserver
-        </seg>
-        <seg>
-          libasound.so and
-          libatopology.so
-        </seg>
-        <seg>
-          /usr/include/alsa,
-          /usr/share/alsa and
-          /usr/share/doc/alsa-lib-&alsa-lib-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aserver">
-        <term><command>aserver</command></term>
-        <listitem>
-          <para>
-            is the ALSA server
-          </para>
-          <indexterm zone="alsa-lib aserver">
-            <primary sortas="b-aserver">aserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound">
-        <term><filename class="libraryfile">libasound.so</filename></term>
-        <listitem>
-          <para>
-            contains the ALSA API functions
-          </para>
-          <indexterm zone="alsa-lib libasound">
-            <primary sortas="c-libasound">libasound.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatopology">
-        <term><filename class="libraryfile">libatopology.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for the ALSA topologies
-          </para>
-          <indexterm zone="alsa-lib libatopology">
-            <primary sortas="c-libatopology">libatopology.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,257 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 alsa-plugins-download-http "&alsa-download-http;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
-  <!ENTITY alsa-plugins-download-ftp  " ">
-  <!ENTITY alsa-plugins-md5sum        "8fb7e05b84c87f30655a8997a9a983d1">
-  <!ENTITY alsa-plugins-size          "400 KB">
-  <!ENTITY alsa-plugins-buildsize     "5.5 MB">
-  <!ENTITY alsa-plugins-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="alsa-plugins" xreflabel="alsa-plugins-&alsa-plugins-version;">
-  <?dbhtml filename="alsa-plugins.html"?>
-
-
-  <title>alsa-plugins-&alsa-plugins-version;</title>
-
-  <indexterm zone="alsa-plugins">
-    <primary sortas="a-alsa-plugins">alsa-plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Plugins</title>
-
-    <para>
-      The <application>ALSA Plugins</application> package contains
-      plugins for various audio libraries and sound servers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-plugins-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-plugins-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-plugins-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-plugins-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-plugins-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-plugins-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA Plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="ffmpeg"/>, <!-- looks for libav, libavcodec -->
-      <xref linkend="libsamplerate"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="speex"/>,
-      <ulink url="https://jackaudio.org/">JACK</ulink>,
-      <ulink url="https://github.com/AVnu/libavtp/">libavtp</ulink>, and
-      <ulink url="http://maemo.org/">maemo</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Plugins</title>
-
-    <para>
-      Install <application>ALSA Plugins</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --sysconfdir=/etc --disable-libav &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-libav</option>: Disable FFMpeg support as the
-      package does not build when <xref linkend="ffmpeg"/> is installed.
-    </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>
-          Numerous libasound_module_<replaceable>&lt;module&gt;</replaceable>.so
-          modules including
-          conf_pulse,
-          ctl_arcam_av,
-          ctl_oss,
-          ctl_pulse,
-          pcm_a52,
-          pcm_jack,
-          pcm_oss,
-          pcm_pulse,
-          pcm_speex,
-          pcm_upmix,
-          pcm_usb_stream,
-          pcm_vdownmix,
-          rate_lavrate*,
-          rate_samplerate*, and
-          rate_speexrate*
-        </seg>
-        <seg>
-          /usr/lib/alsa-lib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libasound_module_pcm_oss.so">
-        <term><filename class="libraryfile">libasound_module_pcm_oss.so</filename></term>
-        <listitem>
-          <para>
-            Allows native <application>ALSA</application> applications to
-            run on <application>OSS</application>
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_pcm_oss.so">
-            <primary sortas="c-libasound_module_pcm_oss">libasound_module_pcm_oss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_pcm_upmix.so">
-        <term><filename class="libraryfile">libasound_module_pcm_upmix.so</filename></term>
-        <listitem>
-          <para>
-            Allows upmixing sound to 4 or 6 channels
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_pcm_upmix.so">
-            <primary sortas="c-libasound_module_pcm_upmix">libasound_module_pcm_upmix.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_pcm_vdownmix.so">
-        <term><filename class="libraryfile">libasound_module_pcm_vdownmix.so</filename></term>
-        <listitem>
-          <para>
-            Allows downmixing sound from 4-6 channels to 2
-            channel stereo output
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_pcm_vdownmix.so">
-            <primary sortas="c-libasound_module_pcm_vdownmix">libasound_module_pcm_vdownmix.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_pcm_jack.so">
-        <term><filename class="libraryfile">libasound_module_pcm_jack.so</filename></term>
-        <listitem>
-          <para>
-            Allows native <application>ALSA</application> applications to
-            work with <command>jackd</command>
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_pcm_jack.so">
-            <primary sortas="c-libasound_module_pcm_jack">libasound_module_pcm_jack.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_pcm_pulse.so">
-        <term><filename class="libraryfile">libasound_module_pcm_pulse.so</filename></term>
-        <listitem>
-          <para>
-            Allows native <application>ALSA</application> applications
-            to access a <application>PulseAudio</application> sound
-            daemon
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_pcm_pulse.so">
-            <primary sortas="c-libasound_module_pcm_pulse">libasound_module_pcm_pulse.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_pcm_a52.so">
-        <term><filename class="libraryfile">libasound_module_pcm_a52.so</filename></term>
-        <listitem>
-          <para>
-            Converts S16 linear sound format to A52 compressed format
-            and sends it to an SPDIF output
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_pcm_a52.so">
-            <primary sortas="c-libasound_module_pcm_a52">libasound_module_pcm_a52.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_rate_samplerate.so">
-        <term><filename class="libraryfile">libasound_module_rate_samplerate.so</filename></term>
-        <listitem>
-          <para>
-            Provides an external rate converter through
-            <filename class="libraryfile">libsamplerate</filename>
-          </para>
-          <indexterm zone="alsa-plugins libasound_module_rate_samplerate.so">
-            <primary sortas="c-libasound_module_rate_samplerate">libasound_module_rate_samplerate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,527 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 alsa-tools-download-http "&alsa-download-http;/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
-  <!ENTITY alsa-tools-download-ftp  " ">
-  <!ENTITY alsa-tools-md5sum        "bc5f5e5689f46a9d4a0b85dc6661732c">
-  <!ENTITY alsa-tools-size          "1.8 MB">
-  <!ENTITY alsa-tools-buildsize     "18 MB">
-  <!ENTITY alsa-tools-time          "0.3 SBU">
-]>
-
-<sect1 id="alsa-tools" xreflabel="alsa-tools-&alsa-tools-version;">
-  <?dbhtml filename="alsa-tools.html"?>
-
-
-  <title>alsa-tools-&alsa-tools-version;</title>
-
-  <indexterm zone="alsa-tools">
-    <primary sortas="a-alsa-tools">alsa-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Tools</title>
-
-    <para>
-      The <application>ALSA Tools</application> package
-      contains advanced tools for certain sound cards.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/>
-      (to build <command>echomixer</command>,
-      <command>envy24control</command> and
-      <command>rmedigicontrol</command>),
-      <xref linkend="gtk3"/>
-      (to build <command>hdajackretask</command>) and
-      <xref linkend="fltk"/>
-      (to build <command>hdspconf</command> and
-      <command>hdspmixer</command>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Tools</title>
-
-&as_root;
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Now, remove a tool that needs <application>Qt2 or 3</application> and two
-      unneeded files (for the BLFS instructions below):
-    </para>
-
-    <screen><userinput>rm -rf qlo10k1 Makefile gitcompile</userinput></screen>
-
-    <para>
-      The <application>ALSA Tools</application> package is only needed by those
-      with advanced requirements for their sound card. The tools can be built
-      all together at once, but if only a subset is needed, you need to
-      <command>cd</command> into the directory of each tool you wish to compile
-      and run the commands. Here, we present instructions to build all tools.
-    </para>
-
-    <para>
-      Install all <application>ALSA Tools</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>for tool in *
-do
-  case $tool in
-    seq )
-      tool_dir=seq/sbiload
-    ;;
-    * )
-      tool_dir=$tool
-    ;;
-  esac
-
-  pushd $tool_dir
-    ./configure --prefix=/usr
-    make
-    as_root make install
-    as_root /sbin/ldconfig
-  popd
-
-done
-unset tool tool_dir</userinput></screen>
-
-    <para>
-      Finally, exit the shell that was started earlier:
-    </para>
-
-<screen><userinput>exit</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          as10k1, cspctl, dl10k1, echomixer, envy24control, hda-verb, hdajackretask,
-          hdajacksensetest, hdspconf, hdsploader, hdspmixer, hwmixvolume,
-          init_audigy, init_audigy_eq10, init_live, lo10k1, ld10k1, ld10k1d,
-          mixartloader, pcxhrloader,
-          rmedigicontrol, sbiload, sscape_ctl, us428control,
-          usx2yloader, and vxloader
-        </seg>
-        <seg>
-          liblo10k1.so
-        </seg>
-        <seg>
-          /etc/hotplug,
-          /usr/include/lo10k1,
-          /usr/share/ld10k1, and
-          /usr/share/sounds
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="as10k1">
-        <term><command>as10k1</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="alsa-tools as10k1">
-            <primary sortas="b-as10k1">as10k1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cspctl">
-        <term><command>cspctl</command></term>
-        <listitem>
-          <para>
-            is an SB16/AWE32 Creative Signal Processor (ASP/CSP) control
-            program
-          </para>
-          <indexterm zone="alsa-tools cspctl">
-            <primary sortas="b-cspctl">cspctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="echomixer">
-        <term><command>echomixer</command></term>
-        <listitem>
-          <para>
-            is the Linux equivalent of the Echoaudio console application
-            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
-          </para>
-          <indexterm zone="alsa-tools echomixer">
-            <primary sortas="b-echomixer">echomixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="envy24control">
-        <term><command>envy24control</command></term>
-        <listitem>
-          <para>
-            is a control tool for Envy24 (ice1712) based sound cards
-          </para>
-          <indexterm zone="alsa-tools envy24control">
-            <primary sortas="b-envy24control">envy24control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdajackretask">
-        <term><command>hdajackretask</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="alsa-tools hdajackretask">
-            <primary sortas="b-hdajackretask">hdajackretask</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hda-verb">
-        <term><command>hda-verb</command></term>
-        <listitem>
-          <para>
-            is a small program to send HD-audio commands to the given
-            ALSA hwdep device on the hd-audio interface
-          </para>
-          <indexterm zone="alsa-tools hda-verb">
-            <primary sortas="b-hda-verb">hda-verb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdspconf">
-        <term><command>hdspconf</command></term>
-        <listitem>
-          <para>
-            is a GUI to control the Hammerfall
-            HDSP Alsa Settings. Up to four hdsp cards are supported
-          </para>
-          <indexterm zone="alsa-tools hdspconf">
-            <primary sortas="b-hdspconf">hdspconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdsploader">
-        <term><command>hdsploader</command></term>
-        <listitem>
-          <para>
-            is used to load the firmware required by the Hammerfall
-            HDSP sound cards
-          </para>
-          <indexterm zone="alsa-tools hdsploader">
-            <primary sortas="b-hdsploader">hdsploader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdspmixer">
-        <term><command>hdspmixer</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="alsa-tools hdspmixer">
-            <primary sortas="b-hdspmixer">hdspmixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hwmixvolume">
-        <term><command>hwmixvolume</command></term>
-        <listitem>
-          <para>
-            allows you to control the volume of individual streams on sound
-            cards that use hardware mixing
-          </para>
-          <indexterm zone="alsa-tools hwmixvolume">
-            <primary sortas="b-hwmixvolume">hwmixvolume</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init_audigy_progs">
-        <term><command>init_audigy*</command></term>
-        <listitem>
-          <para>
-            are tools used to initialize Creative Sound Blaster Audigy-series
-            cards
-          </para>
-          <indexterm zone="alsa-tools init_audigy_progs">
-            <primary sortas="b-init_audigy_progs">init_audigy*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init_live">
-        <term><command>init_live</command></term>
-        <listitem>
-          <para>
-            is a tool used to initialize Creative Sound Blaster Live cards
-          </para>
-          <indexterm zone="alsa-tools init_live">
-            <primary sortas="b-init_live">init_live</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld10k1">
-        <term><command>ld10k1</command></term>
-        <listitem>
-          <para>
-            is the server of a EMU10K{1,2} patch loader for ALSA
-          </para>
-          <indexterm zone="alsa-tools ld10k1">
-            <primary sortas="b-ld10k1">ld10k1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lo10k1">
-        <term><command>lo10k1</command></term>
-        <listitem>
-          <para>
-            is the client of a EMU10K{1,2} patch loader for ALSA
-          </para>
-          <indexterm zone="alsa-tools lo10k1">
-            <primary sortas="b-lo10k1">lo10k1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dl10k1">
-        <term><command>dl10k1</command></term>
-        <listitem>
-          <para>
-            loads config dumps generated by <command>lo10k1</command>
-            and <command>ld10k1</command>
-          </para>
-          <indexterm zone="alsa-tools dl10k1">
-            <primary sortas="b-dl10k1">dl10k1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld10k1d">
-        <term><command>ld10k1d</command></term>
-        <listitem>
-          <para>
-            is an init script for the <command>ld10k1</command>
-            patch loader
-          </para>
-          <indexterm zone="alsa-tools ld10k1d">
-            <primary sortas="b-ld10k1d">ld10k1d</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- No longer installed due to Qt2/3 dependency.
-      <varlistentry id="qlo10k1">
-        <term><command>qlo10k1</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt</application> GUI for the
-            <command>ld10k1</command> patch loader.
-          </para>
-          <indexterm zone="alsa-tools qlo10k1">
-            <primary sortas="b-qlo10k1">qlo10k1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="mixartloader">
-        <term><command>mixartloader</command></term>
-        <listitem>
-          <para>
-            is a helper program to load the firmware binaries onto the
-            Digigram's miXart board sound drivers. The following modules
-            require this program: snd-mixart. These drivers don't work
-            properly at all until the certain firmware files are loaded, i.e. no
-            PCM nor mixer devices will appear
-          </para>
-          <indexterm zone="alsa-tools mixartloader">
-            <primary sortas="b-mixartloader">mixartloader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcxhrloader">
-        <term><command>pcxhrloader</command></term>
-        <listitem>
-          <para>
-            is a helper program to load the firmware binaries onto
-            Digigram's pcxhr compatible board sound drivers. The following
-            modules require this program: snd-pcxhr. These drivers don't work
-            properly at all until certain firmware files are loaded, i.e. no PCM
-            nor mixer devices will appear
-          </para>
-          <indexterm zone="alsa-tools pcxhrloader">
-            <primary sortas="b-pcxhrloader">pcxhrloader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmedigicontrol">
-        <term><command>rmedigicontrol</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="alsa-tools rmedigicontrol">
-            <primary sortas="b-rmedigicontrol">rmedigicontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sbiload">
-        <term><command>sbiload</command></term>
-        <listitem>
-          <para>
-            is an OPL2/3 FM instrument loader for the ALSA sequencer
-          </para>
-          <indexterm zone="alsa-tools sbiload">
-            <primary sortas="b-sbiload">sbiload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sscape_ctl">
-        <term><command>sscape_ctl</command></term>
-        <listitem>
-          <para>
-            is an ALSA SoundScape control utility
-          </para>
-          <indexterm zone="alsa-tools sscape_ctl">
-            <primary sortas="b-sscape_ctl">sscape_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="us428control">
-        <term><command>us428control</command></term>
-        <listitem>
-          <para>
-            is a Tascam US-428 control program
-          </para>
-          <indexterm zone="alsa-tools us428control">
-            <primary sortas="b-us428control">us428control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usx2yloader">
-        <term><command>usx2yloader</command></term>
-        <listitem>
-          <para>
-            is a helper program to load the 2nd Phase firmware binaries onto
-            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
-          </para>
-          <indexterm zone="alsa-tools usx2yloader">
-            <primary sortas="b-usx2yloader">usx2yloader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vxloader">
-        <term><command>vxloader</command></term>
-        <listitem>
-          <para>
-            is a helper program to load the firmware binaries onto the
-            Digigram's VX-board sound drivers. The following modules require
-            this program:
-          snd-vx222, snd-vxpocket, snd-vxp440. These drivers don't work properly at all
-          until the certain firmware files are loaded, i.e. no PCM nor mixer devices will
-          appear
-          </para>
-          <indexterm zone="alsa-tools vxloader">
-            <primary sortas="b-vxloader">vxloader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,517 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-download-ftp  " ">
-  <!ENTITY alsa-utils-md5sum        "36676025301315789306e99e39154732">
-  <!ENTITY alsa-utils-size          "1.6 MB">
-  <!ENTITY alsa-utils-buildsize     "16 MB">
-  <!ENTITY alsa-utils-time          "0.2 SBU">
-]>
-
-<sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;">
-  <?dbhtml filename="alsa-utils.html"?>
-
-
-  <title>alsa-utils-&alsa-utils-version;</title>
-
-  <indexterm zone="alsa-utils">
-    <primary sortas="a-alsa-utils">alsa-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Utilities</title>
-
-    <para>
-      The <application>ALSA Utilities</application> package contains
-      various utilities which are useful for controlling your sound
-      card.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/>,
-      <xref linkend="fftw"/>,
-      <xref linkend="libsamplerate"/>,
-      <xref linkend="xmlto"/>, and
-      <ulink url="https://hightek.org/projects/dialog/">Dialog</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Utilities</title>
-
-<!-- Fixed in 1.2.10
-    <para>
-      This package provides its own implementation of
-      <literal>strlcpy</literal> and <literal>strlcat</literal> functions.
-      But they are provided by Glibc-2.38 now, so we need to remove the
-      custom implementation to avoid a conflict with the Glibc header:
-    </para>
-
-    <screen><userinput>echo '' > alsactl/init_sysdeps.c</userinput></screen>
--->
-
-    <para>
-      Install <application>ALSA Utilities</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --disable-alsaconf \
-            --disable-bat      \
-            --disable-xmlto    \
-            --with-curses=ncursesw &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-alsaconf</parameter>: This switch disables building
-      the <command>alsaconf</command> configuration tool which is incompatible
-      with <application>Udev</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-xmlto</parameter>: Omit this switch if you have
-      installed <xref linkend="xmlto"/> and wish to regenerate the man pages.
-    </para>
-
-    <para>
-      <parameter>--disable-bat</parameter>: Omit this switch if you have
-      installed <xref linkend="fftw"/> and wish to
-      install the Basic Audio Tester (BAT).
-    </para>
-
-    <para>
-      <parameter>--with-curses=ncursesw</parameter>: This switch forces the
-      use of wide-character ncurses libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="alsa-utils-config-sect">
-    <title>Configuring ALSA Utilities</title>
-
-    <sect3 id="alsa-utils-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/var/lib/alsa/asound.state</filename>
-      </para>
-
-      <indexterm zone="alsa-utils alsa-utils-config">
-        <primary sortas="e-var-lib-alsa-asound.state">/var/lib/alsa/asound.state</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        As the &root; user, apply the default setting for the sound card.
-        Note that this command may return an exit code of 99 although the
-        card is correctly initialized:
-      </para>
-
-<screen role="nodump"><userinput>alsactl init</userinput></screen>
-
-      <para>
-        Note that all channels of your sound card may be muted by default.
-        You can use the <command>alsamixer</command> program to change
-        this. Use <command>speaker-test</command> to check that your
-        settings have been applied correctly. You should hear
-        <quote>pink noise</quote> on your speakers.
-      </para>
-
-      <para>
-        The <filename>alsactl</filename> program is normally run from a
-        standard <application>udev</application> rule. The first time it
-        is run, it will complain that there is no state in
-        <filename>/var/lib/alsa/asound.state</filename>. You can prevent
-        this by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>alsactl -L store</userinput></screen>
-
-      <para>
-        The volume settings should be restored from the saved state by
-        <application>Udev</application> when the device is detected
-        (during boot or when plugged in for USB devices).
-      </para>
-<!-- not needed with elogind or systemd-logind
-      <para>
-        All sound devices are not accessible for any user except
-        <systemitem class="username">root</systemitem> and members of the
-        <systemitem class="groupname">audio</systemitem> group. Add any
-        users that might use the sound devices to that group:
-      </para>
-
-<screen role="root"><userinput>usermod -a -G audio <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <note>
-        <para>
-          You may need to log out and back in again to refresh your group
-          memberships. '<command>su <replaceable>&lt;username&gt;</replaceable></command>'
-          should work as well.
-        </para>
-      </note>
--->
-      <para>
-        On systems which have multiple sound cards, you may need to adjust the
-        default audio device so that you can get output from your speakers.
-        To set the default device, first check the
-        <filename>/proc/asound/cards</filename> file to determine which number
-        you need to set. After you know this information, set the default card
-        with the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/asound.conf &lt;&lt; "EOF"
-<literal># Begin /etc/asound.conf
-
-defaults.pcm.card 1
-defaults.ctl.card 1
-
-# End /etc/asound.conf</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="alsa-utils-init" revision="sysv">
-      <title>Boot Script</title>
-
-      <indexterm zone="alsa-utils alsa-utils-init">
-        <primary sortas="f-alsa">alsa</primary>
-      </indexterm>
-
-      <para>
-        To automatically store and restore volume settings (if the udev rule
-        doesn't work for you) when the system is rebooted, install the
-        <filename>/etc/rc.d/init.d/alsa</filename> boot script from the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
-      </para>
-
-<screen role="root"><userinput>make install-alsa</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>
-          aconnect, alsactl, alsaloop, alsamixer, alsatplg,
-          alsaucm, alsa-info.sh, amidi, amixer, aplay, aplaymidi,
-          arecord (symlink), arecordmidi, aseqdump, aseqnet, axfer,
-          iecset, and speaker-test
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/sounds/alsa and /var/lib/alsa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aconnect">
-        <term><command>aconnect</command></term>
-        <listitem>
-          <para>
-            is a utility for connecting and disconnecting two
-            existing ports in the ALSA sequencer system
-          </para>
-          <indexterm zone="alsa-utils aconnect">
-            <primary sortas="b-aconnect">aconnect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsactl">
-        <term><command>alsactl</command></term>
-        <listitem>
-          <para>
-            is used to control advanced settings for ALSA sound card drivers.
-            Use this if alsamixer cannot utilize all of your sound card's
-            features
-          </para>
-          <indexterm zone="alsa-utils alsactl">
-            <primary sortas="b-alsactl">alsactl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsaloop">
-        <term><command>alsaloop</command></term>
-        <listitem>
-          <para>
-            allows creation of a PCM loopback between a PCM capture
-            device and a PCM playback device
-          </para>
-          <indexterm zone="alsa-utils alsaloop">
-            <primary sortas="b-alsaloop">alsaloop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsamixer">
-        <term><command>alsamixer</command></term>
-        <listitem>
-          <para>
-            is an Ncurses based mixer program for use with
-            the ALSA sound card drivers
-          </para>
-          <indexterm zone="alsa-utils alsamixer">
-            <primary sortas="b-alsamixer">alsamixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsatplg">
-        <term><command>alsatplg</command></term>
-        <listitem>
-          <para>
-            is a utility used to compile topology configuration files into
-            binary files for kernel drivers
-          </para>
-          <indexterm zone="alsa-utils alsatplg">
-            <primary sortas="b-alsatplg">alsatplg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsaucm">
-        <term><command>alsaucm</command></term>
-        <listitem>
-          <para>
-          allows applications to access the hardware in an abstracted manner
-          </para>
-          <indexterm zone="alsa-utils alsaucm">
-            <primary sortas="b-alsaucm">alsaucm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amidi">
-        <term><command>amidi</command></term>
-        <listitem>
-          <para>
-            is used to read from and write to ALSA
-            RawMIDI ports
-          </para>
-          <indexterm zone="alsa-utils amidi">
-            <primary sortas="b-amidi">amidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amixer">
-        <term><command>amixer</command></term>
-        <listitem>
-          <para>
-            allows command-line control of the mixers for the
-            ALSA sound card drivers
-          </para>
-          <indexterm zone="alsa-utils amixer">
-            <primary sortas="b-amixer">amixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aplay">
-        <term><command>aplay</command></term>
-        <listitem>
-          <para>
-            is a command-line soundfile player for the
-            ALSA sound card drivers
-          </para>
-          <indexterm zone="alsa-utils aplay">
-            <primary sortas="b-aplay">aplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aplaymidi">
-        <term><command>aplaymidi</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that plays the specified
-            MIDI file(s) to one or more ALSA sequencer ports
-          </para>
-          <indexterm zone="alsa-utils aplaymidi">
-            <primary sortas="b-aplaymidi">aplaymidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arecord">
-        <term><command>arecord</command></term>
-        <listitem>
-          <para>
-            is a command-line soundfile recorder for the
-            ALSA sound card drivers
-          </para>
-          <indexterm zone="alsa-utils arecord">
-            <primary sortas="b-arecord">arecord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arecordmidi">
-        <term><command>arecordmidi</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that records a standard
-            MIDI file from one or more ALSA sequencer ports
-          </para>
-          <indexterm zone="alsa-utils arecordmidi">
-            <primary sortas="b-arecordmidi">arecordmidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aseqdump">
-        <term><command>aseqdump</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that prints the sequencer events it
-            receives as text
-          </para>
-          <indexterm zone="alsa-utils aseqdump">
-            <primary sortas="b-aseqdump">aseqdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aseqnet">
-        <term><command>aseqnet</command></term>
-        <listitem>
-          <para>
-            is an ALSA sequencer client which sends and
-            receives event packets over a network
-          </para>
-          <indexterm zone="alsa-utils aseqnet">
-            <primary sortas="b-aseqnet">aseqnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="axfer">
-        <term><command>axfer</command></term>
-        <listitem>
-          <para>
-            is a command-line recorder and player used to transfer audio frames
-            between sound devices and files
-          </para>
-          <indexterm zone="alsa-utils axfer">
-            <primary sortas="b-axfer">axfer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iecset">
-        <term><command>iecset</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="alsa-utils iecset">
-            <primary sortas="b-iecset">iecset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="speaker-test">
-        <term><command>speaker-test</command></term>
-        <listitem>
-          <para>
-            is a command-line speaker test tone generator for ALSA
-          </para>
-          <indexterm zone="alsa-utils speaker-test">
-            <primary sortas="b-speaker-test">speaker-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/alsa.xml
===================================================================
--- multimedia/libdriv/alsa.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/libdriv/alsa.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,26 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="alsa" xreflabel="alsa-&alsa-version;">
+<?dbhtml filename="alsa.html" dir="multimedia"?>
+<title>alsa-&alsa-version;</title>
 
-<!-- This is indexed under 'others'. -->
-<sect1 id="alsa" xreflabel="ALSA">
-  <?dbhtml filename="alsa.html"?>
+<para>The first question which people tend to ask about ALSA is why they
+should use it over the sound drivers included in the kernel - there are
+several reasons.  Firstly, the ALSA drivers support more sound cards
+than those in the kernel.  Secondly, the OSS emulation is in some cases
+faster and better than the original OSS driver itself.  And finally, there are
+some programs which can use ALSA's enhanced features to better drive the
+soundcard.</para>
 
+<para>ALSA is also likely to be the future of Linux Sound (hence the
+name <emphasis>Advanced Linux Sound Architecture</emphasis>), and the
+ALSA drivers will probably be included into the main linux kernel at
+some point during the 2.5 development series, leading eventually to ALSA
+being the "standard" sound drivers into the future 2.6 stable
+kernel.</para>
 
-  <title>ALSA</title>
+<para>You currently need to decide whether to use the 0.5.x series or
+the 0.9-beta series.  At the moment, if you use the 0.9.x drivers, some
+older software will fail to compile with ALSA support.  This is because
+there is a new API in the 0.9.x series which isn't yet widely supported.
+In these cases it is usually possible just to use the OSS driver
+emulation which ALSA supplies (which can be superior to the OSS drivers
+themselves).  We don't recommend one ALSA series over the other
+as there are advantages to both versions, however you should probably
+use the latest point release of whichever series you decide to
+use.</para>
 
-  <indexterm zone="alsa">
-    <primary sortas="g-ALSA-Description">ALSA Description</primary>
-  </indexterm>
-
-  <para>
-    The Linux kernel now provides ALSA support by
-    default.  However, applications need to interface to that capability.  The
-    following six sections of the book deal with the separate components of
-    ALSA: the libraries, the plugins, the utilities, the tools, and the firmware.
-  </para>
+&alsa-intro;
+&alsa-desc;
+&alsa-inst;
+&alsa-config;
+&alsa-cards;
 
 </sect1>
+
Index: multimedia/libdriv/alsa/alsa-cards.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-cards.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa-cards.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,23 @@
+<sect2>
+<title>Soundcards supported by alsa</title>
+
+<para>try "cat /proc/pci | grep audio" and look for the PCI ID:</para>
+
+<screen>PCI-ID          Name                            Driver
+EMU10k1         Soundblaster SB Live! (or else) emu10k1
+10b9:5451       ALi 5451 Onboard                ali5451
+ES1371          Ensoniq 1371 (Soundblaster)     ens1371
+ES1370          Ensoniq 1370 (Soundblaster)     ens1370
+ES1983S         ESS Maestro 3                   es1983
+VIA             VIA AC97 Audio Controller 686A  via686a 
+ES1986          ESS Maestro 2                   es1986
+Vortex 2        Aureal Vortex II                ???
+ALS4000         Avance Logic ALS 4000           als4000</screen>
+
+<para>For further cards look at CARDS-Status (0.9.x-version) or
+the doc/CARDS file (older Version). Please send an email to
+l.x.@gmx.de about what you'd got on "cat /proc/pci | grep audio" and
+what driver you used. If that Appendix grows big enough, I'll
+use it for an automatic installation script.</para>
+
+</sect2>
Index: multimedia/libdriv/alsa/alsa-config.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Configuring alsa</title>
+
+<sect3><title>/dev/sndstat</title>
+
+<para>There is software out there to look at /dev/sndstat to find out wether a
+sound driver is installed. If you have such software sniggering at you
+"no soundcard found", try the following (before giving up):</para>
+
+<para><screen><userinput>rm /dev/sndstat
+ln -s /proc/asound/sndstat /dev/sndstat</userinput></screen></para>
+
+</sect3>
+
+<sect3>
+<title>Device permissions</title>
+
+<para>If the software is complaining about having no access to the 
+devices with your current UID, you need to set the proper permissions
+(as root):</para>
+
+<para><userinput>chmod a+rw /dev/mi* /dev/dsp* /dev/seq*</userinput>
+This should do the job.</para>
+
+<para>Alternatively, add your user to the <userinput>audio</userinput>
+group and make sure the above <filename>/dev</filename> files are 
+chgrp'd to the audio group and have group read and write access.</para>
+
+</sect3>
+
+</sect2>
+
Index: multimedia/libdriv/alsa/alsa-desc.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Contents</title>
+
+<para>There are 5 different alsa-packages:</para>
+
+<para>The alsa-driver package contains the driver module sources.</para>
+
+<para>The alsa-lib package contains a Library for sound access methods
+provided by the alsa-driver.</para>
+
+<para>The alsa-utils package contains the tools 
+<userinput>alsamixer</userinput>, a ncurses based console mixer,
+<userinput>alsactl</userinput>, a control program for the driver,
+<userinput>aplay</userinput>, a simple player for .wav and .au files,
+and <userinput>arecord</userinput>, a simple sound recorder.
+</para>
+
+<para>The alsa-oss-lib package (only version 0.9.x) contains a library
+for developers to convert their OSS applications to ALSA.</para>
+
+<para>The alsa-tools package (only version 0.9.x) contains some utlis
+for older cards and for expensive multichannel cards.</para>
+
+</sect2>
Index: multimedia/libdriv/alsa/alsa-exp.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1>
+<title>Command explanations</title>
+
+<para><userinput>COMMAND:</userinput> This command does something.</para>
+
+</sect1>
+
Index: multimedia/libdriv/alsa/alsa-inst.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,189 @@
+<sect2>
+<title>Installation of alsa</title>
+
+<para>Unpack the packages you've downloaded</para>
+
+<sect3>
+<title>Installation of the driver</title>
+
+<para><screen><userinput>./configure \
+    --with-moddir=/lib/modules/&lt;kernel-version&gt;/kernel/drivers/sound/ \
+	--with-kernel=&lt;path-to-kernel-source-tree-to-build-for&gt; \
+	--with-sequencer=yes --with-oss=yes \
+	--with-cards=&lt;soundcards-to-compile&gt; &&
+make &&
+make install </userinput></screen></para>
+
+<para>Replace &lt;path-to-kernel-source-tree-to-build-for&gt; and
+&lt;kernel-version&gt; with which the path to the source tree of the 
+kernel version you want to build the drivers for (most commonly your 
+current version) and the kernel version number respectively.  You also
+need to replace &lt;soundcards-to-compile&gt; with the card names 
+you need drivers for (read the SOUNDCARDS section below); otherwise 
+"./configure --help" gives you a list of
+drivers you can compile.</para>
+
+<para>There are two ways of setting up the modules. The easiest
+way is the "let the kernel module loader load them automatically"-way, 
+the other one is to use the bootscript you'll find in the
+/utils-directory of the driver.</para>
+
+<para>For both ways, you need to add some lines to /etc/modules.conf:</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/modules.conf &lt;&lt; "EOF"</userinput>
+alias char-major-116 snd
+options snd snd_major=116 snd_cards_limit=1
+alias snd-card-0 snd-card-&lt;soundcard&gt;
+alias sound-slot-0 snd-card-0
+alias sound-service-0-0 snd-mixer-oss
+alias sound-service-0-3 snd-pcm-oss
+post-install snd-card-&lt;soundcard&gt; /usr/sbin/alsactl restore
+<userinput>EOF</userinput></screen></para>
+
+<para>Remember to replace &lt;soundcard&gt; with whatever is 
+appropriate.  Note that if you are going to use the LFS-style alsa
+script we give below, there is no need for the post-install line.</para>
+
+<para>If you want kmod to automatically load the modules, as long as you
+have the post-install line in modules.conf, you don't need a startup
+script.  If on the other hand you want to use an LFS style startup
+script (because you want to perform other operations at startup/shutdown
+or for another reason), you can use this script here:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/alsa &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/alsa
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+# ALSA specific parts by Mark Hymers - markh@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+if [ -f /etc/sysconfig/alsa ]
+then
+	source /etc/sysconfig/alsa
+fi
+
+if [ -z "$CONF" ] 
+then
+	echo "Please create an /etc/sysconfig/alsa file containing"
+	echo "a CONF value (usually /etc/asound.conf)"
+	exit 1;
+fi
+
+case "$1" in
+	start)
+		echo -n "Starting alsa...    Restoring volumes..."
+		loadproc /usr/sbin/alsactl -f $CONF restore
+		#echo -n "                    Loading MIDI font..."
+		#loadproc sfxload $FONT
+		;;
+
+	stop)
+		echo -n "Stopping alsa...    Saving volumes......"
+		loadproc /usr/sbin/alsactl -f $CONF store
+		#echo -n "            Removing MIDI font.........."
+		#loadproc sfxload -i
+		;;
+
+	restart)
+		$0 stop
+		/usr/bin/sleep 1
+		$0 start
+		;;
+	
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		exit 1
+		;;
+
+esac
+
+# End $rc_base/init.d/alsa
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/alsa</userinput></screen></para>
+
+<para>Note that the Loading and Removing MIDI font lines are commented out.
+This is because they are only needed for certain soundcards and also
+require an additional program (<userinput>sfxload</userinput>).  An
+example of a soundcard which needs MIDI fonts loaded in order to play
+MIDI files is the Soundblaster Live! which is based on a emu10k1
+chip.</para>
+
+<para>If you are using the above script, you will also need 
+a <filename>/etc/sysconfig/alsa</filename> file.  Create this using
+the following commands:</para>
+
+<para><screen><userinput>cat &gt; /etc/sysconfig/alsa &lt;&lt; "EOF"</userinput>
+# Begin /etc/sysconfig/alsa
+
+# CONF is where you want the system to store volume settings.
+# /etc/asound.conf is recommended
+CONF=/etc/asound.conf
+
+# FONT is where your midi font (if any) is stored.
+FONT=/usr/share/8mbgmsfx.sf2
+
+# End /etc/sysconfig/alsa
+<userinput>EOF</userinput></screen></para>
+
+<para>Then create the appropriate symlinks:
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/alsa ../rc0.d/K35alsa &amp;&amp;
+ln -sf ../init.d/alsa ../rc1.d/K35alsa &amp;&amp;
+ln -sf ../init.d/alsa ../rc2.d/S40alsa &amp;&amp;
+ln -sf ../init.d/alsa ../rc3.d/S40alsa &amp;&amp;
+ln -sf ../init.d/alsa ../rc4.d/S40alsa &amp;&amp;
+ln -sf ../init.d/alsa ../rc5.d/S40alsa &amp;&amp;
+ln -sf ../init.d/alsa ../rc6.d/K35alsa</userinput></screen></para>
+
+<para>Beware. All channels of your soundcard are muted by default. You can use
+the <filename>alsamixer</filename> (in alsa-utils, requires alsa-lib) or any 
+other OSS mixer program (like kmix, gmix, aumix) to unmute them.  We
+recommend that you do this <emphasis>before</emphasis> running the
+script above because otherwise alsactl will complain that it cannot read
+the <filename>/etc/asound.conf</filename> file.  You can do this by 
+running <userinput>alsamixer</userinput>, setting the volumes and then
+running <userinput>alsactl -f /etc/asound.conf store</userinput>.  This
+means that the first time you run the script, it will have a valid
+<filename>asound.conf</filename> file to use.</para>
+
+<para>If you get an error like
+<screen>alsamixer: failed to open mixer #0/#0: No such file or directory</screen>
+run the snddevices script in the alsa-driver directory.  From the
+alsa-driver source directory run:</para>
+
+<para><screen><userinput>./snddevices</userinput></screen></para>
+</sect3>
+
+<sect3>
+<title>Installation of the library</title>
+<para>From the alsa-lib source directory, run:</para>
+<para><screen><userinput>./configure &&
+make install</userinput></screen></para>
+</sect3>
+
+<sect3>
+<title>Installation of the utils</title>
+<para>From the alsa-utils source directory, run:</para>
+<para><screen><userinput>./configure &&
+make install</userinput></screen></para>
+</sect3>
+
+<sect3>
+<title>Installation of additional packages (alsa-oss-lib and alsa-tools)</title>
+
+<para><screen><userinput>./configure &&
+make install</userinput></screen></para>
+
+<para>These commands are all you need to install 
+alsa-oss-lib or alsa-tools.  Remember oss-lib is only for future 
+versions and the alsa-tools are only useful for the owners of very old 
+or expensive cards (e.g multichannel cards), so most people 
+don't need it.</para>
+
+</sect3>
+</sect2>
+
Index: multimedia/libdriv/alsa/alsa-intro.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to alsa</title>
+
+<screen>Download location:              &alsa-download;
+Version used:                   &alsa-version;
+Package size:                   &alsa-size;
+Estimated Disk space required:  &alsa-buildsize;</screen>
+
+<para>The alsa packages contains a sound driver collection for
+the most known sound cards, a library for easy sound programming
+and some little utilities.</para>
+
+</sect2>
Index: multimedia/libdriv/alsa/alsa.ent
===================================================================
--- multimedia/libdriv/alsa/alsa.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/alsa/alsa.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY alsa SYSTEM "../alsa.xml">
+<!ENTITY alsa-intro SYSTEM "alsa-intro.xml">
+<!ENTITY alsa-inst SYSTEM "alsa-inst.xml">
+<!ENTITY alsa-desc SYSTEM "alsa-desc.xml">
+<!ENTITY alsa-config SYSTEM "alsa-config.xml">
+<!ENTITY alsa-cards SYSTEM "alsa-cards.xml">
+<!ENTITY alsa-buildsize "4-6MB (depending on chosen drivers)">
+<!ENTITY alsa-version "0.5.12a/0.9.0rc2">
+<!ENTITY alsa-download "http://www.alsa-project.org">
+<!ENTITY alsa-size "400-600k (depending on version)">
Index: multimedia/libdriv/arts.xml
===================================================================
--- multimedia/libdriv/arts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/arts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,73 @@
+<sect1 id="arts" xreflabel="arts-&arts-version;">
+<?dbhtml filename="arts.html" dir="multimedia"?>
+<title>aRts-&arts-version;</title>
+
+<para><screen>Estimated build disk space:  35 MB
+Estimated installed space:  5.7 MB
+Package size:                &arts-size;
+Estimated build time:        11 min (667 MHz)</screen></para>
+
+<para>The Analog Realtime Synthesizer (aRts) provides sound support for KDE.  
+It provides necessary libraries for kdelibs.  It will use the 
+following optional packages, if installed:
+<screen><xref linkend="alsa"/>, <xref linkend="audiofile"/>, <xref linkend="libvorbis"/>, 
+and <xref linkend="objprelink"/>.</screen></para>
+
+<para>
+<screen><userinput>./configure --prefix=&kde-dir;  --enable-objprelink \
+     --disable-debug --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sf &kde-dir; /opt/kde</userinput></screen></para>
+
+<note><para>Another configure option is <userinput>--enable-final</userinput>. 
+This option can speed up the build process, but requires a lot of memory.  If
+you have less than 256MB of RAM, this option will cause swapping and 
+significantly slow compilation. This option applies to all the 
+kde packages.</para></note>
+
+<sect2><title>aRts Installation Commmand explanations</title>
+<para><userinput>--prefix=&kde-dir;:</userinput> This option tells the
+process to install the package in &kde-dir;.</para>
+
+<warning><para>
+<filename>objprelink</filename> has been known to cause problems on some 
+systems.  If it does not work on your system you will have to rebuild kde 
+without it.</para></warning>
+
+<para><userinput>--enable-objprelink:</userinput> This option enables
+the linking process to optimize executable loading times by prelinking 
+many internal references.
+</para>
+
+<para><userinput>--disable-debug:</userinput> This option causes the
+system to be compiled without debugging code.
+</para>
+
+<para><userinput>--disable-dependency-tracking:</userinput> This option speeds
+up one time builds.
+</para>
+
+<para><userinput>ln -s &kde-dir; /opt/kde:</userinput> This command creates
+a link for access to KDE.  If a newer version of KDE is released, the new
+system can be built by changing the <userinput>--prefix</userinput> location
+and then set up by just changing the link.
+</para>
+
+</sect2>
+
+<sect2><title>Configuring aRts</title>
+<para>The library directory <filename class="directory">/opt/kde/lib</filename> 
+should appear in <filename>/etc/ld.so.conf</filename> 
+so that ldd can find the shared libraries. The following command will add it 
+if it is missing:
+<screen><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
+# Begin kde addition to /etc/ld.so.conf
+
+/opt/kde/lib
+
+# End kde addition
+<userinput>EOF
+ldconfig</userinput></screen></para>
+</sect2>
+</sect1>
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/libdriv/audiofile.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,226 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="audiofile" xreflabel="audiofile-&audiofile-version;">
+<?dbhtml filename="audiofile.html" dir="multimedia"?>
+<title>audiofile-&audiofile-version;</title>
 
-  <!ENTITY audiofile-download-http "&gnome-download-http;/audiofile/0.3/audiofile-&audiofile-version;.tar.xz">
-  <!ENTITY audiofile-download-ftp  " ">
-  <!ENTITY audiofile-md5sum        "235dde14742317328f0109e9866a8008">
-  <!ENTITY audiofile-size          "520 KB">
-  <!ENTITY audiofile-buildsize     "18 MB">
-  <!ENTITY audiofile-time          "0.6 SBU">
-]>
-
-<sect1 id="audiofile" xreflabel="AudioFile-&audiofile-version;">
-  <?dbhtml filename="audiofile.html"?>
-
-
-  <title>AudioFile-&audiofile-version;</title>
-
-  <indexterm zone="audiofile">
-    <primary sortas="a-AudioFile">AudioFile</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AudioFile</title>
-
-    <para>
-      The <application>AudioFile</application> package contains the
-      audio file libraries and two sound file support programs useful
-      to support basic sound file formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&audiofile-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&audiofile-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &audiofile-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &audiofile-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &audiofile-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &audiofile-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/audiofile-&audiofile-version;-consolidated_patches-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AudioFile Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="flac"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AudioFile</title>
-
-    <para>
-      Install <application>AudioFile</application> by running the following
-      commands:
-    </para>
-
-<!-- No longer needed with the patch
-     CXXFLAGS="${CXXFLAGS:- -O2 -g} -std=c++98" -->
-
-<screen><userinput>patch -Np1 -i ../audiofile-&audiofile-version;-consolidated_patches-1.patch &amp;&amp;
-autoreconf -fiv                             &amp;&amp;
-
-./configure --prefix=/usr --disable-static  &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      Note that the tests will fail if the --disable-static
-      option is used and tests are executed before
-      <command>make install</command>. You have three options:
-    </para>
-
-    <para>
-     (a) configure without --disable-static, run the tests, but do not
-     install, then start a fresh build using --disable-static just for
-     installing the package.
-    </para>
-
-    <para>
-     (b) configure with --disable-static, but only run the tests after the
-     package is installed.
-    </para>
-
-    <para>
-     (c) configure with --disable-static, but only run the tests after a
-     DESTDIR install.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sfconvert and sfinfo
-        </seg>
-        <seg>
-          libaudiofile.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sfinfo">
-        <term><command>sfinfo</command></term>
-        <listitem>
-          <para>
-            displays the sound file format, audio encoding, sampling
-            rate and duration for audio formats supported by this library
-          </para>
-          <indexterm zone="audiofile sfinfo">
-            <primary sortas="b-sfinfo">sfinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfconvert">
-        <term><command>sfconvert</command></term>
-        <listitem>
-          <para>
-            converts sound file formats where the original format and
-            destination format are supported by this library
-          </para>
-          <indexterm zone="audiofile sfconvert">
-            <primary sortas="b-sfconvert">sfconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaudiofile">
-        <term><filename class="libraryfile">libaudiofile.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by programs to support AIFF,
-            AIFF-compressed, Sun/NeXT, WAV and BIC audio formats
-          </para>
-          <indexterm zone="audiofile libaudiofile">
-            <primary sortas="c-libaudiofile">libaudiofile.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&audiofile-intro;
+&audiofile-inst;
+&audiofile-config;
+&audiofile-desc;
 
 </sect1>
Index: multimedia/libdriv/audiofile/audiofile-config.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/audiofile/audiofile-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring audiofile</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: multimedia/libdriv/audiofile/audiofile-desc.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/audiofile/audiofile-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,30 @@
+<sect2>
+<title>Contents</title>
+
+<para>The audiofile package contains <userinput>audiofile
+libraries</userinput>,
+<userinput>audiofile-config</userinput>, <userinput>sfinfo
+</userinput>and <userinput>sfconvert</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>audiofile libraries</title>
+<para>The audiofile library is used by programs to support AIFF,
+AIFF-compressed, SUN/NeXT, WAVE and BICS audio formats </para></sect3>
+
+<sect3><title>audiofile-config</title>
+<para>The audiofile-config script is used during the compile process by
+programs linking to this library. </para></sect3>
+
+<sect3><title>sfinfo</title>
+<para>The sfinfo program displays the sound file format, audio encoding, 
+sampling rate and duration for audio formats supported by this library.</para></sect3>
+
+<sect3><title>sfconvert</title>
+<para>The sfconvert program converts sound file formats where the
+origional format and destination format are supported by this library.</para></sect3>
+
+</sect2>
+
Index: multimedia/libdriv/audiofile/audiofile-inst.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/audiofile/audiofile-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of audiofile</title>
+
+<para>Install audiofile by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/libdriv/audiofile/audiofile-intro.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/audiofile/audiofile-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to audiofile</title>
+
+<screen>Download location:              &audiofile-download;
+Version used:                   &audiofile-version;
+Package size:                   &audiofile-size;
+Estimated Disk space required:  &audiofile-buildsize;</screen>
+
+<para>The audiofile package contains the audiofile libraries and two
+sound file support programs. These are useful to support basic sound
+file formats.</para>
+
+</sect2>
Index: multimedia/libdriv/audiofile/audiofile.ent
===================================================================
--- multimedia/libdriv/audiofile/audiofile.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/audiofile/audiofile.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY audiofile SYSTEM "../audiofile.xml">
+<!ENTITY audiofile-intro SYSTEM "audiofile-intro.xml">
+<!ENTITY audiofile-inst SYSTEM "audiofile-inst.xml">
+<!ENTITY audiofile-desc SYSTEM "audiofile-desc.xml">
+<!ENTITY audiofile-config SYSTEM "audiofile-config.xml">
+<!ENTITY audiofile-buildsize "17 MB">
+<!ENTITY audiofile-version "0.2.3">
+<!ENTITY audiofile-download "ftp://ftp.68k.org/pub/michael/audiofile-0.2.3.tar.gz">
+<!ENTITY audiofile-size "332 KB">
Index: multimedia/libdriv/esound.xml
===================================================================
--- multimedia/libdriv/esound.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/esound.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="esound" xreflabel="esound">
+<?dbhtml filename="esound.html" dir="multimedia"?>
+<title>esound</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: multimedia/libdriv/esound/esound.ent
===================================================================
--- multimedia/libdriv/esound/esound.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/esound/esound.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY esound SYSTEM "../esound.xml">
Index: ltimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 faac-download-http "https://github.com/knik0/faac/archive/&faac-version;/faac-&faac-version;.tar.gz">
-  <!ENTITY faac-download-ftp  " ">
-  <!ENTITY faac-md5sum        "8d61e6d55088e599aa91532d5e6995b0">
-  <!ENTITY faac-size          "240 KB">
-  <!ENTITY faac-buildsize     "4.7 MB">
-  <!ENTITY faac-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="faac" xreflabel="FAAC-&faac-version;">
-  <?dbhtml filename="faac.html"?>
-
-
-  <title>FAAC-&faac-version;</title>
-
-  <indexterm zone="faac">
-    <primary sortas="a-faac">faac</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FAAC</title>
-
-    <para>
-      <application>FAAC</application> is an encoder for a lossy sound
-      compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3 standards
-      and known as Advanced Audio Coding (AAC). This encoder is useful for
-      producing files that can be played back on iPod. Moreover, iPod does not
-      understand other sound compression schemes in video files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&faac-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&faac-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &faac-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &faac-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &faac-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &faac-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FAAC</title>
-
-    <para>
-      Install <application>FAAC</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./bootstrap                                &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite. However, basic
-      functionality can be tested by encoding a sample WAV file (the sample
-      file is installed by the <xref linkend="alsa-utils"/> package:
-    </para>
-
-<screen remap="test"><userinput>./frontend/faac -o Front_Left.mp4 /usr/share/sounds/alsa/Front_Left.wav</userinput></screen>
-
-    <para>
-      Then, decode the result using the <command>faad</command> program
-      from the <xref linkend="faad2"/> package and play back the decoded file
-      (requires the <command>aplay</command> program from the
-      <xref linkend="alsa-utils"/> package:
-    </para>
-
-<screen remap="test"><userinput>faad Front_Left.mp4
-aplay Front_Left.wav</userinput></screen>
-
-    <para>
-      <command>aplay</command> should identify the file as
-      <quote>Signed 16 bit Little Endian, Rate 48000 Hz, Stereo</quote>, and
-      you should hear the words <quote>front left</quote>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <!-- 1.28: This is still broken, it causes a segfault. -->
-    <!--
-    <para>
-      <option>- -enable-drm</option>: This option is supposed to enable
-      support for encoding files for
-      <ulink url="http://www.drm.org/">Digital Radio Mondiale</ulink>, but
-      actually breaks the base functionality of the package (e.g., the resulting
-      <command>faac</command> program produces files that cannot be decoded
-      by <xref linkend="faad2"/>, even if compiled with DRM support).
-      Don't use it.
-    </para>
-    -->
-    <!-- Since we say "Don't use it", let's not even list it. That would open up
-    the possibility of a user seeing it and enabling it anyway. -->
-  </sect2>
-
-  <sect2>
-    <title>Other AAC encoders</title>
-
-    <para>
-      The quality of <application>FAAC</application> is not up
-      to par with the best AAC encoders currently available. Also, it only
-      supports AAC and not High Efficiency AAC (also known as aacPlus), which
-      provides better quality at low bitrates by means of using the
-      <quote>spectral band replication</quote> technology. There are the
-      following alternative programs for producing AAC and HE-AAC streams:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.nero.com/eng/nero-aac-codec.html">Nero AAC
-          Codec</ulink>:
-          available only in the binary form, the command-line AAC and HE-AAC
-          encoders for Linux are in the same archive as the Windows
-          application.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <ulink url="https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1459">3GPP
-          Enhanced aacPlus general audio codec</ulink>:
-          available in the source form, can encode only HE-AAC up to 48 kbps
-          out of the box, but the maximum bitrate can be changed by editing
-          the tuning table in the
-          <filename>FloatFR_sbrenclib/src/sbr_main.c</filename> file.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      Note, however, that iPod supports only Low Complexity AAC profile, which
-      is the default in FAAC, but may not be the default in Nero AAC Encoder
-      and is completely unavailable in the 3GPP encoder.
-    </para>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>faac</seg>
-        <seg>libfaac.so and libmp4v2.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="faac-prog">
-        <term><command>faac</command></term>
-        <listitem>
-          <para>
-            is a command-line AAC encoder
-          </para>
-          <indexterm zone="faac faac-prog">
-            <primary sortas="b-faac">faac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfaac">
-        <term><filename class="libraryfile">libfaac.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for encoding AAC streams
-          </para>
-          <indexterm zone="faac libfaac">
-            <primary sortas="c-libfaac">libfaac.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmp4v2">
-        <term><filename class="libraryfile">libmp4v2.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for creating and manipulating MP4 files
-          </para>
-          <indexterm zone="faac libmp4v2">
-            <primary sortas="c-libmp4v2">libmp4v2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 faad2-download-http "https://github.com/knik0/faad2/archive/&faad2-version;/faad2-&faad2-version;.tar.gz">
-  <!ENTITY faad2-download-ftp  " ">
-  <!ENTITY faad2-md5sum        "f85b2514c4fb2f87d22a3bc879d83277">
-  <!ENTITY faad2-size          "642 KB">
-  <!ENTITY faad2-buildsize     "9.0 MB">
-  <!ENTITY faad2-time          "0.1 SBU">
-]>
-
-<sect1 id="faad2" xreflabel="FAAD2-&faad2-version;">
-  <?dbhtml filename="faad2.html"?>
-
-
-  <title>FAAD2-&faad2-version;</title>
-
-  <indexterm zone="faad2">
-    <primary sortas="a-faad2">faad2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FAAD2</title>
-
-    <para>
-      <application>FAAD2</application> is a decoder for a lossy sound
-      compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3
-      standards and known as Advanced Audio Coding (AAC).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&faad2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&faad2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &faad2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &faad2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &faad2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &faad2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Sample AAC file: <ulink url="https://www.nch.com.au/acm/sample.aac"/> (7 KB)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FAAD2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FAAD2</title>
-
-    <para>
-      Install <application>FAAD2</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  \
-      -DBUILD_SHARED_LIBS=ON      \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite. However, basic
-      functionality can be tested by decoding the sample AAC file:
-    </para>
-
-<screen remap="test"><userinput>./faad -o sample.wav ../../sample.aac</userinput></screen>
-
-    <para>
-      This should display a copyright message and the following
-      information about the sample file:
-    </para>
-
-<literallayout><computeroutput>sample.aac file info:
-ADTS, 4.608 sec, 13 kbps, 16000 Hz
-
-  ---------------------
- | Config:  2 Ch       |
-  ---------------------
- | Ch |    Position    |
-  ---------------------
- | 00 | Left front     |
- | 01 | Right front    |
-  ---------------------</computeroutput></literallayout>
-
-    <para>
-      Now play the result (requires the <command>aplay</command> program
-      from the <xref linkend="alsa-utils"/> package):
-    </para>
-
-<screen remap="test"><userinput>aplay sample.wav</userinput></screen>
-
-    <para>
-      <command>aplay</command> should identify the file as
-      <quote>Signed 16 bit Little Endian, Rate 16000 Hz, Stereo</quote>, and
-      you should hear some piano notes.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>faad</seg>
-        <seg>libfaad.so and libfaad_drm.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="faad-prog">
-        <term><command>faad</command></term>
-        <listitem>
-          <para>
-            is a command-line utility for decoding AAC and MP4 files
-          </para>
-          <indexterm zone="faad2 faad-prog">
-            <primary sortas="b-faad">faad</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfaad">
-        <term><filename class="libraryfile">libfaad.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for decoding AAC streams
-          </para>
-          <indexterm zone="faad2 libfaad">
-            <primary sortas="c-libfaad">libfaad.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/fdk-aac.xml
===================================================================
--- multimedia/libdriv/fdk-aac.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fdk-aac-download-http "&sourceforge-dl;/opencore-amr/fdk-aac-&fdk-aac-version;.tar.gz">
-  <!ENTITY fdk-aac-download-ftp  " ">
-  <!ENTITY fdk-aac-md5sum        "f43e593991caefdce509ad837d3301bd">
-  <!ENTITY fdk-aac-size          "2.8 MB">
-  <!ENTITY fdk-aac-buildsize     "39 MB">
-  <!ENTITY fdk-aac-time          "0.6 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="fdk-aac" xreflabel="fdk-aac-&fdk-aac-version;">
-  <?dbhtml filename="fdk-aac.html"?>
-
-
-  <title>fdk-aac-&fdk-aac-version;</title>
-
-  <indexterm zone="fdk-aac">
-    <primary sortas="a-fdk-aac">fdk-aac</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fdk-aac</title>
-
-    <para>
-      <application>fdk-aac</application> package provides the Fraunhofer FDK AAC
-      library, which is purported to be a high quality Advanced Audio Coding
-      implementation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fdk-aac-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fdk-aac-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fdk-aac-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fdk-aac-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fdk-aac-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fdk-aac-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fdk-aac</title>
-
-    <para>
-      Install <application>fdk-aac</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libfdk-aac.so
-        </seg>
-        <seg>
-          /usr/include/fdk-aac
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfdk-aac">
-        <term><filename class="libraryfile">libfdk-aac.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to encode audio in AAC format
-          </para>
-          <indexterm zone="fdk-aac libfdk-aac">
-            <primary sortas="c-libfdk-aac">libfdk-aac.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 flac-download-http "https://downloads.xiph.org/releases/flac/flac-&flac-version;.tar.xz">
-  <!ENTITY flac-download-ftp  " ">
-  <!ENTITY flac-md5sum        "7cab20b46e0bc859234bf5ba7da81625">
-  <!ENTITY flac-size          "1.0 MB">
-  <!ENTITY flac-buildsize     "22 MB (additional 163 MB to run the test suite)">
-  <!ENTITY flac-time          "0.2 SBU (additional 0.6 SBU to run the test suite)">
-]>
-
-<sect1 id="flac" xreflabel="FLAC-&flac-version;">
-  <?dbhtml filename="flac.html"?>
-
-
-  <title>FLAC-&flac-version;</title>
-
-  <indexterm zone="flac">
-    <primary sortas="a-FLAC">FLAC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FLAC</title>
-
-    <para>
-      <application>FLAC</application> is an audio CODEC similar to
-      MP3, but lossless, meaning that audio is compressed without losing any
-      information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&flac-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&flac-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &flac-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &flac-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &flac-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <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>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">FLAC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libogg"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="doxygen"/>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FLAC</title>
-
-    <para>
-      Install <application>FLAC</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                                \
-            --disable-thorough-tests                     \
-            --docdir=/usr/share/doc/flac-&flac-version;          &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that
-      if you passed the <option>--enable-exhaustive-tests</option> and
-      <option>--enable-valgrind-testing</option> parameters to
-      <command>configure</command> and then run the test suite, it will take a
-      <emphasis>very</emphasis> long time (up to 300 SBUs) and use about 375 MB
-      of disk space.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-thorough-tests</parameter>: This parameter is
-      used so that the test suite will complete in a reasonable amount of time.
-      Remove it if you desire more extensive tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>flac and metaflac</seg>
-        <seg>libFLAC.so and libFLAC++.so</seg>
-        <seg>/usr/include/FLAC, /usr/include/FLAC++ and
-        /usr/share/doc/flac-&flac-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="flac-prog">
-        <term><command>flac</command></term>
-        <listitem>
-          <para>
-            is a command-line utility for encoding, decoding and
-            converting FLAC files
-          </para>
-          <indexterm zone="flac flac-prog">
-            <primary sortas="b-flac">flac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="metaflac">
-        <term><command>metaflac</command></term>
-        <listitem>
-          <para>
-            is a program for listing, adding, removing, or editing
-            metadata in one or more FLAC files
-          </para>
-          <indexterm zone="flac metaflac">
-            <primary sortas="b-metaflac">metaflac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libflac">
-        <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
-          </para>
-          <indexterm zone="flac libflac">
-            <primary sortas="c-libFLAC">libFLAC{,++}.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="libxmms-flac">
-        <term><filename class="libraryfile">libxmms-flac.{so,a}</filename></term>
-        <listitem>
-          <para>
-            is a plugin for <application>XMMS</application>.
-          </para>
-          <indexterm zone="flac libxmms-flac">
-            <primary sortas="c-libxmms-flac">libxmms-flac.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/frei0r.xml
===================================================================
--- multimedia/libdriv/frei0r.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 frei0r-download-http "https://files.dyne.org/frei0r/releases/frei0r-plugins-&frei0r-version;.tar.gz">
-  <!ENTITY frei0r-download-ftp  " ">
-  <!ENTITY frei0r-md5sum        "45ffe53925ce0a90ce1d838c05e0a3c0">
-  <!ENTITY frei0r-size          "804 KB">
-  <!ENTITY frei0r-buildsize     "40 MB">
-  <!ENTITY frei0r-time          "0.5 SBU">
-]>
-
-<sect1 id="frei0r" xreflabel="frei0r-plugins-&frei0r-version;">
-  <?dbhtml filename="frei0r.html"?>
-
-
-  <title>frei0r-plugins-&frei0r-version;</title>
-
-  <indexterm zone="frei0r">
-    <primary sortas="a-frei0r">frei0r</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Frei0r-plugins</title>
-
-    <para>
-      <application>Frei0r</application> is a minimalistic plugin API for
-      video effects. Note that the 0 in the name is a zero, not a capital
-      letter o.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&frei0r-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&frei0r-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &frei0r-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &frei0r-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &frei0r-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &frei0r-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Frei0r-plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para>
-       <xref linkend='gavl'/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>
-      <xref linkend='doxygen'/> and
-      <xref linkend='opencv'/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Frei0r-plugins</title>
-
-    <para>
-      Install <application>Frei0r</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev ..                 &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DWITHOUT_OPENCV=TRUE</option>: This option instructs the make
-      procedure to disable building plugins dependent upon opencv.
-    </para>
-
-    <para>
-      <option>-DWITHOUT_GAVL=TRUE</option>: This option instructs the make
-      procedure to disable building plugins dependent upon gavl.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Over 130 video effects plugins</seg>
-        <seg>/usr/lib/frei0r-1</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gavl.xml
===================================================================
--- multimedia/libdriv/gavl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gavl-download-http "&sourceforge-dl;/gmerlin/gavl-&gavl-version;.tar.gz">
-  <!ENTITY gavl-download-ftp  " ">
-  <!ENTITY gavl-md5sum        "2752013a817fbc43ddf13552215ec2c0">
-  <!ENTITY gavl-size          "4.4 MB">
-  <!ENTITY gavl-buildsize     "50 MB">
-  <!ENTITY gavl-time          "0.8 SBU">
-]>
-
-<sect1 id="gavl" xreflabel="gavl-&gavl-version;">
-  <?dbhtml filename="gavl.html"?>
-
-
-  <title>gavl-&gavl-version;</title>
-
-  <indexterm zone="gavl">
-    <primary sortas="a-gavl">Gavl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gavl</title>
-
-    <para>
-      <application>Gavl</application> is short for Gmerlin Audio Video
-      Library.  It is a low level library that handles the details of audio and
-      video formats like colorspaces, samplerates, multichannel configurations
-      etc. It provides standardized definitions for those formats as well as
-      container structures for carrying audio samples or video images inside an
-      application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gavl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gavl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gavl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gavl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gavl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gavl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gavl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para>
-      <xref linkend='libpng'/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>
-      <xref linkend='doxygen'/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gavl</title>
-
-    <para>
-      Install <application>Gavl</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>LIBS=-lm                      \
-./configure --prefix=/usr     \
-            --without-doxygen \
-            --docdir=/usr/share/doc/gavl-&gavl-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>LIBS=-lm</envar>: This variable ensures the math library is
-      searched when linking.
-    </para>
-
-    <para>
-      <parameter>--without-doxygen</parameter>: This switch disables use of
-      Doxygen. Omit if Doxygen is installed and you wish to build the API
-      documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgavl.so</seg>
-        <seg>/usr/include/gavl and
-             /usr/share/doc/gavl-&gavl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgavl.so">
-        <term><filename class="libraryfile">libgavl.so</filename></term>
-        <listitem>
-          <para>
-            is the Gmerlin Audio Video Library
-          </para>
-          <indexterm zone="gavl libgavl.so">
-            <primary sortas="c-libgavl.so">libgavl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gst10-libav.xml
===================================================================
--- multimedia/libdriv/gst10-libav.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gst10-libav-download-http "&gstreamer-dl;/gst-libav/gst-libav-&gst10-libav-version;.tar.xz">
-  <!ENTITY gst10-libav-download-ftp  " ">
-  <!ENTITY gst10-libav-md5sum        "1806080f07f86a67a5332b3d834a2e39">
-  <!ENTITY gst10-libav-size          "200 KB">
-  <!ENTITY gst10-libav-buildsize     "9.0 MB">
-  <!ENTITY gst10-libav-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gst10-libav" xreflabel="gst-libav-&gst10-libav-version;">
-  <?dbhtml filename="gst10-libav.html"?>
-
-
-  <title>gst-libav-&gst10-libav-version;</title>
-
-  <indexterm zone="gst10-libav">
-    <primary sortas="a-gst-libav">gst-libav</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Libav</title>
-
-    <para>
-      The <application>GStreamer Libav</application> package contains
-      <application>GStreamer</application> plugins for
-      <application>Libav</application> (a fork of
-      <application>FFmpeg</application>).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-libav-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-libav-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-libav-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-libav-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-libav-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-libav-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Libav Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ffmpeg"/> and
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="yasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Libav</title>
-
-    <para>
-      Remove/Check for a series of deprecated API's by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '444a#if LIBAVUTIL_VERSION_MAJOR &lt; 59' ext/libav/gstavcfg.c &amp;&amp;
-sed -i '446a#endif' ext/libav/gstavcfg.c &amp;&amp;
-sed -i '/ID_R210/d' ext/libav/gstavviddec.c &amp;&amp;
-sed -i 's/ID_V410\ ||/ID_V410\ ||\ in_plugin->id\ ==\ AV_CODEC_ID_R210/' ext/libav/gstavviddec.c &amp;&amp;
-sed -i '/ID_R210/a#if\ LIBAVCODEC_VERSION_MAJOR\ \&lt;\ 61' ext/libav/gstavviddec.c &amp;&amp;
-sed -i '/ID_AYUV/a#endif' ext/libav/gstavviddec.c &amp;&amp;
-sed -i '/ID_R210/d' ext/libav/gstavvidenc.c &amp;&amp;
-sed -i 's/ID_V410\ ||/ID_V410\ ||\ in_plugin->id\ ==\ AV_CODEC_ID_R210/' ext/libav/gstavvidenc.c &amp;&amp;
-sed -i '/ID_R210/a#if\ LIBAVCODEC_VERSION_MAJOR\ \&lt;\ 61' ext/libav/gstavvidenc.c &amp;&amp;
-sed -i '/ID_AYUV/a#endif' ext/libav/gstavvidenc.c &amp;&amp;
-sed -i ext/libav/gstavdemux.c -e '1375,1430d' \
-            -e '2058d' \
-            -e '2105,2140d' \
-            -e '2217,2221d' &amp;&amp;
-sed -i '2122aif (!gst_element_register (plugin, type_name, rank, type)) {' ext/libav/gstavdemux.c</userinput></screen>
-
-
-    <para>
-      Install <application>GStreamer Libav</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release &amp;&amp;
-ninja</userinput></screen>
-
-
-    <para>
-      To run the tests, 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>
-
-    <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 Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgstlibav.so in /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,320 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gst10-plugins-bad-download-http
-           "&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        "06d6a2472a4dfa441f3220890736c474">
-  <!ENTITY gst10-plugins-bad-size          "6.7 MB">
-  <!ENTITY gst10-plugins-bad-buildsize     "187 MB (with tests)">
-  <!ENTITY gst10-plugins-bad-time          "1.0 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gst10-plugins-bad" xreflabel="gst-plugins-bad-&gst10-plugins-bad-version;">
-  <?dbhtml filename="gst10-plugins-bad.html"?>
-
-
-  <title>gst-plugins-bad-&gst10-plugins-bad-version;</title>
-
-  <indexterm zone="gst10-plugins-bad">
-    <primary sortas="a-gst-plugins-bad">gst-plugins-bad</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Bad Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Bad Plug-ins</application> package contains a
-      set of plug-ins that aren't up to par compared to the rest. They
-      might be close to being good quality, but they're missing something - be
-      it a good code review, some documentation, a set of tests, a real live
-      maintainer, or some actual wide use.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-plugins-bad-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-plugins-bad-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-plugins-bad-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-plugins-bad-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-plugins-bad-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-plugins-bad-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Bad Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libdvdread"/>,
-      <xref linkend="libdvdnav"/>, and
-      <xref linkend="soundtouch"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="faac"/>,
-      <xref linkend="faad2"/>,
-      <xref linkend="fdk-aac"/>,
-      <xref linkend="gtk3"/> (for examples),
-      <xref linkend="gst10-plugins-good"/> (for one test),
-      <xref linkend="json-glib"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libaom"/>,
-      <xref linkend="libass"/>,
-      <xref linkend="libexif"/> (for one test),
-      <xref linkend="librsvg"/>,
-      <xref linkend="libsoup"/> (for one test),
-      <xref linkend="libsndfile"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="libva"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="neon"/>,
-      <xref linkend="nettle"/> or <xref linkend="libgcrypt"/>
-      (for SSL support in the hls plugin, if both are not installed OpenSSL will
-      be used instead),
-      <xref linkend="opencv"/> (with additional modules),
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="opus"/>,
-      <xref linkend="qrencode"/>,
-      <xref linkend="sbc"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="valgrind"/>,
-      both <xref linkend="vulkan-loader"/> and
-      <ulink url='https://github.com/google/shaderc'>glslc</ulink>
-      (for Vulkan plugin),
-      <xref linkend="wayland"/> (<xref linkend="gtk3"/> must have been
-      compiled with wayland support),
-      <xref linkend="x265"/>,
-      <!--<ulink url="https://aomedia.googlesource.com/aom/">aom</ulink>,-->
-      <ulink url="https://bs2b.sourceforge.net/">bs2b</ulink>,
-      <ulink url="https://acoustid.org/chromaprint">Chromaprint</ulink>,
-      <ulink url="https://github.com/kornelski/dssim">dssim</ulink>,
-      <ulink url="https://github.com/festvox/flite">Flite</ulink>,
-      <ulink url="https://www.fluidsynth.org/">FluidSynth</ulink>,
-      <ulink url="https://bitbucket.org/mpyne/game-music-emu/">Game Music Emu</ulink>,
-      <ulink url="https://www.quut.com/gsm/">GSM</ulink>,
-      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>,
-      <ulink url="https://www.ladspa.org/">LADSPA</ulink>,
-      <ulink url="https://github.com/EHfive/ldacBT">ldacBT</ulink>,
-      <ulink url="https://github.com/aja-video/libajantv2">libajantv2</ulink>,
-      <ulink url="https://github.com/AVnu/libavtp">libavtp</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394/files/libdc1394-2/">libdc1394-2</ulink>,
-      <ulink url="https://www.videolan.org/developers/libdca.html">libdca</ulink>,
-      <ulink url="https://www.libde265.org">libde265</ulink>,
-      <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/libmms/">libmms</ulink>,
-      <ulink url="https://github.com/Konstanty/libmodplug">libmodplug</ulink>,
-      <ulink url="https://libnice.freedesktop.org/">libnice</ulink>,
-      <ulink url="https://code.google.com/p/musicip-libofa/">libofa</ulink>,
-      <ulink url="https://lib.openmpt.org/libopenmpt/">libopenmpt</ulink>,
-      <ulink url="https://structure.io/openni">libopenni</ulink>,
-      <ulink url="https://github.com/cisco/libsrtp">libsrtp</ulink>,
-      <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="https://mjpeg.sourceforge.net/">MJPEG Tools</ulink>,
-      <ulink url="https://snyk.io/advisor/npm-package/mplex2">mplex2</ulink>,
-      <ulink url="https://www.musepack.net/">musepack</ulink>,
-      <ulink url="https://github.com/microsoft/onnxruntime">onnxruntime</ulink>,
-      <ulink url="https://openal.org/">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://github.com/jart/spandsp">spandsp</ulink>,
-      <ulink url="https://github.com/Haivision/srt">Srt</ulink>,
-      <ulink url="https://github.com/OpenVisualCloud/SVT-HEVC/">svthevcenc</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">VO AAC</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">VO AMRWB</ulink>,
-      <!--<ulink url="https://vulkan.lunarg.com/sdk/home/">Vulkan</ulink>,-->
-      <ulink url="https://github.com/Mindwerks/wildmidi/">WildMidi</ulink>,
-      <ulink url="https://webkit.org/wpe/">WPE-WebKit</ulink>,
-      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink>,
-      <ulink url="https://zbar.sourceforge.net/">ZBAR</ulink>,
-      <ulink url="https://zapping.sourceforge.net/ZVBI/index.html/">ZVBI</ulink>, and
-      <ulink url="https://github.com/zxing/zxing">zxing</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Bad Plug-ins</title>
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-objc-error.xml"/>
-    -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-plugins.xml"/>
-
-    <para>
-      Install <application>GStreamer Bad Plug-ins</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -D gpl=enabled      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Several tests
-      need a terminal emulator in a graphical session. Three tests,
-      <emphasis>elements_vacompositor</emphasis>,
-      <emphasis>elements_vapostproc</emphasis>, and
-      <emphasis>elements_dash_mpd</emphasis>, are known to fail.
-      <!-- Upstream issue is https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3124 -->
-
-      <!-- Upstream issue gst-plugins-bad/#1426 -->
-      If <xref linkend='gst10-plugins-good'/> is not installed, two tests
-      <emphasis>elements_rtpsrc</emphasis> and
-      <emphasis>elements_rtpsink</emphasis> will fail.
-    </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>-Dgpl=enabled</parameter>: Without this switch, plugins with
-      dependencies on (A)GPL licensed libraries are not built.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gst-transcoder-1.0 and
-          playout
-        </seg>
-        <seg>
-          libgstadaptivedemux-1.0.so,
-          libgstanalytics-1.0.so,
-          libgstbadaudio-1.0.so,
-          libgstbasecamerabinsrc-1.0.so,
-          libgstcuda-1.0.so,
-          libgstcodecparsers-1.0.so,
-          libgstcodecs-1.0.so,
-          libgstdxva-1.0.so,
-          libgstinsertbin-1.0.so,
-          libgstisoff-1.0.so,
-          libgstmpegts-1.0.so,
-          libgstmse-1.0.so,
-          libgstphotography-1.0.so,
-          libgstplay-1.0.so,
-          libgstplayer-1.0.so,
-          libgstsctp-1.0.so,
-          libgsttranscoder-1.0.so,
-          libgsturidownloader-1.0.so,
-          libgstva-1.0.so,
-          libgstwayland-1.0.so,
-          libgstwebrtc-1.0.so, and
-          several plugins under /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          /usr/include/gstreamer-1.0/gst/{audio,basecamerabinsrc,cuda},
-          /usr/include/gstreamer-1.0/gst/{codecparsers,insertbin,interfaces},
-          /usr/include/gstreamer-1.0/gst/{isoff,mpegts,play,player,sctp}
-          /usr/include/gstreamer-1.0/gst/{transcoder,uridownloader,va}, and
-          /usr/include/gstreamer-1.0/gst/{wayland,webrtc}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gst-transcoder-1.0">
-        <term><command>gst-transcoder-1.0</command></term>
-        <listitem>
-          <para>
-            is used to transcode a stream into a different format
-          </para>
-          <indexterm zone="gst10-plugins-bad gst-transcoder-1.0">
-            <primary sortas="b-gst-transcoder-1.0">gst-transcoder-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="playout">
-        <term><command>playout</command></term>
-        <listitem>
-          <para>
-            is an example application used to sequentially play a list of
-            audio-video files
-          </para>
-          <indexterm zone="gst10-plugins-bad playout">
-            <primary sortas="b-playout">playout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gst10-plugins-base-download-http
-           "&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        "22f20294c967ec5c22a7babb96e411f2">
-  <!ENTITY gst10-plugins-base-size          "2.3 MB">
-  <!ENTITY gst10-plugins-base-buildsize     "91 MB (with tests)">
-  <!ENTITY gst10-plugins-base-time          "1.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gst10-plugins-base" xreflabel="gst-plugins-base-&gst10-plugins-base-version;">
-  <?dbhtml filename="gst10-plugins-base.html"?>
-
-
-  <title>gst-plugins-base-&gst10-plugins-base-version;</title>
-
-  <indexterm zone="gst10-plugins-base">
-    <primary sortas="a-gst-plugins-base">gst-plugins-base</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Base Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Base Plug-ins</application> is a well-groomed and
-      well-maintained collection of <application>GStreamer</application> plug-ins
-      and elements, spanning the range of possible types of elements one would want
-      to write for <application>GStreamer</application>. You will need at least one
-      of Good, Bad, Ugly or Libav plugins for <application>GStreamer</application>
-      applications to function properly.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-plugins-base-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-plugins-base-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-plugins-base-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-plugins-base-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-plugins-base-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-plugins-base-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Base Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gstreamer10"/>
-    </para>
-
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="cdparanoia"/> (for building the CDDA plugin),
-      &gobject-introspection;,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libogg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="pango"/>,
-      <xref linkend="wayland-protocols"/>, and
-      <xref linkend="xorg7-lib"/>
-   </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="graphene"/>,
-      <xref linkend="gtk3"/> (for examples),
-      <!--<xref linkend="libtheora"/>,-->
-      <xref linkend="opus"/>,
-      &qt5-deps; (for examples),
-      <xref linkend="sdl2"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://pypi.org/project/hotdoc">hotdoc</ulink>,
-      <ulink url="http://www.theora.org">libtheora</ulink>,
-      <ulink url="http://libvisual.org/">libvisual</ulink>,
-      <ulink url="https://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and
-      <ulink url="https://wiki.xiph.org/Tremor">Tremor</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Base Plug-ins</title>
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-objc-error.xml"/>
-    -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-plugins.xml"/>
-
-    <para>
-      Install <application>GStreamer Base Plug-ins</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..               \
-      --prefix=/usr          \
-      --buildtype=release    \
-      --wrap-mode=nodownload &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. The tests
-      require an X terminal running, or all of the GL tests will fail. Five
-      tests may produce timeouts on some systems depending on their graphics
-      hardware and speed. One test, <filename>elements_appsrc</filename>, iw
-      known to fail on some systems.
-    </para>
-
-    <note>
-      <para>
-        When installing, the build process does some additional
-        linking.  If you do not have Xorg in /usr, the LIBRARY_PATH
-        variable needs to be defined for the root user.  If
-        using sudo to assume root, use the -E option to pass
-        your current environment variables for the install process.
-      </para>
-    </note>
-
-    <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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nodownload.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gst-device-monitor-1.0,
-          gst-discoverer-1.0, and
-          gst-play-1.0
-        </seg>
-        <seg>
-          libgstallocators-1.0.so,
-          libgstapp-1.0.so,
-          libgstaudio-1.0.so,
-          libgstfft-1.0.so,
-          libgstgl-1.0.so,
-          libgstpbutils-1.0.so,
-          libgstriff-1.0.so,
-          libgstrtp-1.0.so,
-          libgstrtsp-1.0.so,
-          libgstsdp-1.0.so,
-          libgsttag-1.0.so,
-          libgstvideo-1.0.so,
-          and several plugins under /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          /usr/include/gstreamer-1.0/gst/{allocators,app,audio,fft,gl,pbutils},
-          /usr/include/gstreamer-1.0/gst/{riff,rtp,rtsp,sdp,tag,video}, and
-          /usr/share/gst-plugins-base
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="gst-device-monitor-1.0">
-        <term><command>gst-device-monitor-1.0</command></term>
-        <listitem>
-          <para>
-            is a command line tool that can be used to test
-            GStreamer's device monitoring functionality
-          </para>
-          <indexterm zone="gst10-plugins-base gst-device-monitor-1.0">
-            <primary sortas="b-gst-device-monitor-1.0">gst-device-monitor-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="gst-discoverer-1.0">
-        <term><command>gst-discoverer-1.0</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to print basic metadata and
-            stream information about a media file
-          </para>
-          <indexterm zone="gst10-plugins-base gst-discoverer-1.0">
-            <primary sortas="b-gst-discoverer-1.0">gst-discoverer-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="gst-play-1.0">
-        <term><command>gst-play-1.0</command></term>
-        <listitem>
-          <para>
-            is a command line tool that can be used to test basic
-            playback using the playbin element
-          </para>
-          <indexterm zone="gst10-plugins-base gst-play-1.0">
-            <primary sortas="b-gst-play-1.0">gst-play-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gst10-plugins-good-download-http
-           "&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        "1b706be887f5d809cac33c9600d1cdd3">
-  <!ENTITY gst10-plugins-good-size          "2.8 MB">
-  <!ENTITY gst10-plugins-good-buildsize     "110 MB (with tests)">
-  <!ENTITY gst10-plugins-good-time          "0.8 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gst10-plugins-good" xreflabel="gst-plugins-good-&gst10-plugins-good-version;">
-  <?dbhtml filename="gst10-plugins-good.html"?>
-
-
-  <title>gst-plugins-good-&gst10-plugins-good-version;</title>
-
-  <indexterm zone="gst10-plugins-good">
-    <primary sortas="a-gst-plugins-good">gst-plugins-good</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Good Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Good Plug-ins</application> is a set of plug-ins
-      considered by the <application>GStreamer</application> developers to have
-      good quality code, correct functionality, and the preferred license (LGPL
-      for the plug-in code, LGPL or LGPL-compatible for the supporting library).
-      A wide range of video and audio decoders, encoders, and filters are included.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-plugins-good-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-plugins-good-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-plugins-good-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-plugins-good-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-plugins-good-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-plugins-good-time;
-        </para>
-      </listitem>
-    </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>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libsoup3"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="mpg123"/>,
-      <xref linkend="nasm"/>, and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <!--<xref linkend="alsa-oss"/>,-->
-      <xref linkend="gtk3"/> (for examples),
-      <xref linkend="libdv"/>,
-      &qt5-deps;,
-      <xref linkend="qt6"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="taglib"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend='v4l-utils'/>,
-      <xref linkend="wayland"/>,
-      <ulink url="https://www.alsa-project.org/files/pub/oss-lib">alsa-oss</ulink>,
-      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>,
-      <ulink url="https://jackaudio.org/">JACK</ulink>,
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>,
-      <ulink url="https://sourceforge.net/projects/libavc1394/">libavc1394</ulink>,
-      <ulink url="https://sourceforge.net/projects/libraw1394/">libiec61883</ulink>,
-      <ulink url="https://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="https://www.icecast.org">libshout</ulink>,
-      <ulink url="https://gstreamer.freedesktop.org/src/orc/">Orc</ulink>,
-      <ulink url="https://www.twolame.org/">TwoLame</ulink>, and
-      <ulink url="https://wavpack.com/">WavPack</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Good Plug-ins</title>
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-objc-error.xml"/>
-    -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-plugins.xml"/>
-
-    <para>
-      Install <application>GStreamer Good Plug-ins</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!--Two tests, <filename>generic_states</filename> and
-      <filename>elements_flvmux</filename>,
-      are known to fail on some systems.-->
-    </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>
-          Several plugins under /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          /usr/share/gstreamer-1.0/presets
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-ugly.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gst10-plugins-ugly-download-http
-           "&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        "405e4820eabd142d3cede21360742b7f">
-  <!ENTITY gst10-plugins-ugly-size          "216 KB">
-  <!ENTITY gst10-plugins-ugly-buildsize     "8.9 MB (with tests)">
-  <!ENTITY gst10-plugins-ugly-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="gst10-plugins-ugly" xreflabel="gst-plugins-ugly-&gst10-plugins-ugly-version;">
-  <?dbhtml filename="gst10-plugins-ugly.html"?>
-
-
-  <title>gst-plugins-ugly-&gst10-plugins-ugly-version;</title>
-
-  <indexterm zone="gst10-plugins-ugly">
-    <primary sortas="a-gst-plugins-ugly">gst-plugins-ugly</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Ugly Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Ugly Plug-ins</application> is a set of plug-ins
-      considered by the <application>GStreamer</application> developers to have
-      good quality and correct functionality, but distributing them might pose problems.
-      The license on either the plug-ins or the supporting libraries might not be how
-      the <application>GStreamer</application> developers would like. The code might
-      be widely known to present patent problems.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-plugins-ugly-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-plugins-ugly-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-plugins-ugly-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-plugins-ugly-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-plugins-ugly-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-plugins-ugly-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Ugly Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="liba52"/> (needed to play DVD's),
-      <xref linkend="libdvdread"/>, and
-      <xref linkend="x264"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libmpeg2"/>,
-      <xref linkend="libcdio"/> (for CD-ROM drive access),
-      <xref linkend="valgrind"/>,
-      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>,
-      <ulink url="https://packages.debian.org/source/sid/libsidplay">libsidplay</ulink>, and
-      <ulink url="https://gstreamer.freedesktop.org/src/orc/">Orc</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Ugly Plug-ins</title>
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-objc-error.xml"/>
-    -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-plugins.xml"/>
-
-    <para>
-      Install <application>GStreamer Ugly Plug-ins</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgpl=enabled       &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgpl=enabled</parameter>: Without this switch, plugins with
-      dependencies on (A)GPL licensed libraries are not built.
-    </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>
-          Several plugins under /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gstreamer10-vaapi.xml
===================================================================
--- multimedia/libdriv/gstreamer10-vaapi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gstreamer10-vaapi-download-http "&gstreamer-dl;/gstreamer-vaapi/gstreamer-vaapi-&gstreamer-vaapi-version;.tar.xz">
-  <!ENTITY gstreamer10-vaapi-download-ftp  " ">
-  <!ENTITY gstreamer10-vaapi-md5sum        "920572f5fdd73bb8b04efb59f7b9747f">
-  <!ENTITY gstreamer10-vaapi-size          "524 KB">
-  <!ENTITY gstreamer10-vaapi-buildsize     "13 MB">
-  <!ENTITY gstreamer10-vaapi-time          "0.3 SBU">
-]>
-
-<sect1 id="gstreamer10-vaapi" xreflabel="gstreamer-vaapi-&gstreamer-vaapi-version;">
-  <?dbhtml filename="gstreamer10-vaapi.html"?>
-
-
-  <title>gstreamer-vaapi-&gstreamer-vaapi-version;</title>
-
-  <indexterm zone="gstreamer10-vaapi">
-    <primary sortas="a-gstreamer10-vaapi">gstreamer-vaapi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gstreamer-vaapi</title>
-
-    <para>
-      The <application>gstreamer-vaapi</application> package contains a
-      <application>gstreamer</application> plugin for hardware accelerated
-      video decode/encode for the prevailing coding standards today (MPEG-2,
-      MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).
-    </para>
-
-    <note>
-      <para>
-        On systems without hardware acceleration (notably virtual machines
-        under <xref linkend="qemu"/>), this package may cause the X server
-        to crash. The BLFS team recommends not to install this package in
-        this case.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gstreamer10-vaapi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gstreamer10-vaapi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gstreamer10-vaapi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gstreamer10-vaapi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gstreamer10-vaapi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gstreamer10-vaapi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gstreamer-vaapi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="gstreamer10"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gst10-plugins-bad"/>, and
-      <xref linkend="libva"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://pypi.org/project/hotdoc">hotdoc</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gstreamer-vaapi</title>
-
-    <para>
-      Install <application>gstreamer-vaapi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a working 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 Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgstvaapi.so in /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,327 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gstreamer10-download-http "&gstreamer-dl;/gstreamer/gstreamer-&gstreamer10-version;.tar.xz">
-  <!ENTITY gstreamer10-download-ftp  " ">
-  <!ENTITY gstreamer10-md5sum        "fd0faca3054dd579768f81288be822d4">
-  <!ENTITY gstreamer10-size          "1.8 MB">
-  <!ENTITY gstreamer10-buildsize     "56 MB (with tests)">
-  <!ENTITY gstreamer10-time          "0.4 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gstreamer10" xreflabel="gstreamer-&gstreamer10-version;">
-  <?dbhtml filename="gstreamer10.html"?>
-
-
-  <title>gstreamer-&gstreamer10-version;</title>
-
-  <indexterm zone="gstreamer10">
-    <primary sortas="a-gstreamer">gstreamer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gstreamer</title>
-
-    <para>
-      <application>gstreamer</application> is a streaming media framework that
-      enables applications to share a common set of plugins for tasks such as
-      video encoding and decoding, audio encoding and decoding, audio and video
-      filters, audio visualisation, web streaming and anything else that
-      streams in real-time or otherwise. This package only provides base
-      functionality and libraries. You may need at least <xref
-      linkend="gst10-plugins-base"/> and one of Good, Bad, Ugly or Libav
-      plugins.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gstreamer10-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gstreamer10-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gstreamer10-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gstreamer10-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gstreamer10-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gstreamer10-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/gstreamer-&gstreamer10-version;-buffer_size_reset_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">gstreamer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/> (for examples),
-      <xref linkend="gsl"/> (used by one test if installed),
-      <xref linkend="libunwind"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://github.com/scop/bash-completion/">bash-completion</ulink>,
-      <ulink url="https://pypi.org/project/hotdoc/">hotdoc</ulink>, and
-      <ulink url="https://sourceware.org/elfutils/">libdw</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gstreamer</title>
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gst10-objc-error.xml"/>
-    -->
-    <para>
-      Install <application>gstreamer</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgst_debug=false   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <caution>
-      <para>
-        If you are reinstalling <application>gstreamer</application> from a
-        previous version, it is best if you remove the prior version, including
-        plugins, before installing the new version.  If there is a mixture of
-        versions installed, using processes may hang or not work properly.  As
-        the  <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>rm -rf /usr/bin/gst-* /usr/{lib,libexec}/gstreamer-1.0</userinput></screen>
-    </caution>
-
-    <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>
-          gst-inspect-1.0,
-          gst-launch-1.0,
-          gst-stats-1.0,
-          gst-tester-1.0, and
-          gst-typefind-1.0
-        </seg>
-        <seg>
-          libgstbase-1.0.so,
-          libgstcheck-1.0.so,
-          libgstcontroller-1.0.so,
-          libgstnet-1.0.so, and
-          libgstreamer-1.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib,libexec,share}/gstreamer-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gst-inspect-1.0">
-        <term><command>gst-inspect-1.0</command></term>
-        <listitem>
-          <para>
-            is a tool that prints out information on available
-            <application>gstreamer</application> plugins,
-            information about a particular plugin, or information
-            about a particular element
-          </para>
-          <indexterm zone="gstreamer10 gst-inspect-1.0">
-            <primary sortas="b-gst-inspect-1.0">gst-inspect-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-launch-1.0">
-        <term><command>gst-launch-1.0</command></term>
-        <listitem>
-          <para>
-            is a tool that builds and runs basic
-            <application>gstreamer</application> pipelines
-          </para>
-          <indexterm zone="gstreamer10 gst-launch-1.0">
-            <primary sortas="b-gst-launch-1.0">gst-launch-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-stats-1.0">
-        <term><command>gst-stats-1.0</command></term>
-        <listitem>
-          <para>
-            is a tool used to gather statistics about
-            <application>gstreamer</application> operations
-          </para>
-          <indexterm zone="gstreamer10 gst-stats-1.0">
-            <primary sortas="b-gst-stats-1.0">gst-stats-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-tester-1.0">
-        <term><command>gst-tester-1.0</command></term>
-        <listitem>
-          <para>
-            runs a test plan in TAP compatible format while integrating with
-            the meson test harness
-          </para>
-          <indexterm zone="gstreamer10 gst-tester-1.0">
-            <primary sortas="b-gst-tester-1.0">gst-tester-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gst-typefind-1.0">
-        <term><command>gst-typefind-1.0</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="gstreamer10 gst-typefind-1.0">
-            <primary sortas="b-gst-typefind-1.0">gst-typefind-1.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgstbase-1.0">
-        <term><filename class="libraryfile">libgstbase-1.0.so</filename></term>
-        <listitem>
-          <para>
-            provides some base classes to be extended by elements and utility
-            classes that are most useful for plugin developers
-          </para>
-          <indexterm zone="gstreamer10 libgstbase-1.0">
-            <primary sortas="c-libgstbase-1.0">libgstbase-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgstcheck-1.0">
-        <term><filename class="libraryfile">libgstcheck-1.0.so</filename></term>
-        <listitem>
-          <para>
-            provides functionality for writing unit tests that use the check
-            framework
-          </para>
-          <indexterm zone="gstreamer10 libgstcheck-1.0">
-            <primary sortas="c-libgstcheck-1.0">libgstcheck-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgstcontroller-1.0">
-        <term><filename class="libraryfile">libgstcontroller-1.0.so</filename></term>
-        <listitem>
-          <para>
-            provides functionality to animate element properties over time
-          </para>
-          <indexterm zone="gstreamer10 libgstcontroller-1.0">
-            <primary sortas="c-libgstcontroller-1.0">libgstcontroller-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgstnet-1.0">
-        <term><filename class="libraryfile">libgstnet-1.0.so</filename></term>
-        <listitem>
-          <para>
-            provides network elements and objects
-          </para>
-          <indexterm zone="gstreamer10 libgstnet-1.0">
-            <primary sortas="c-libgstnet-1.0">libgstnet-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgstreamer-1.0">
-        <term><filename class="libraryfile">libgstreamer-1.0.so</filename></term>
-        <listitem>
-          <para>
-            provides all of the core <application>gstreamer</application>
-            services, including initialization, plugin management and types,
-            as well as the object hierarchy that defines elements and bins,
-            along with some more specialized elements
-          </para>
-          <indexterm zone="gstreamer10 libgstreamer-1.0">
-            <primary sortas="c-libgstreamer-1.0">libgstreamer-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/id3lib.xml
===================================================================
--- multimedia/libdriv/id3lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 id3lib-download-http "&sourceforge-dl;/id3lib/id3lib-&id3lib-version;.tar.gz">
-  <!ENTITY id3lib-download-ftp  " ">
-  <!ENTITY id3lib-md5sum        "19f27ddd2dda4b2d26a559a4f0f402a7">
-  <!ENTITY id3lib-size          "932 KB">
-  <!ENTITY id3lib-buildsize     "16 MB">
-  <!ENTITY id3lib-time          "0.2 SBU">
-]>
-
-<sect1 id="id3lib" xreflabel="id3lib-&id3lib-version;">
-  <?dbhtml filename="id3lib.html"?>
-
-
-  <title>id3lib-&id3lib-version;</title>
-
-  <indexterm zone="id3lib">
-    <primary sortas="a-id3lib">id3lib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to id3lib</title>
-
-    <para>
-      <application>id3lib</application> is a library for reading,
-      writing and manipulating id3v1 and id3v2 multimedia data containers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&id3lib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&id3lib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &id3lib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &id3lib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &id3lib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &id3lib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patches: <ulink
-          url="&patch-root;/id3lib-&id3lib-version;-consolidated_patches-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Id3lib</title>
-
-    <para>
-      Install <application>id3lib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../id3lib-&id3lib-version;-consolidated_patches-1.patch &amp;&amp;
-
-libtoolize -fc                &amp;&amp;
-aclocal                       &amp;&amp;
-autoconf                      &amp;&amp;
-automake --add-missing --copy &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This packages does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install  &amp;&amp;
-cp doc/man/* /usr/share/man/man1 &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/id3lib-&id3lib-version; &amp;&amp;
-install -v -m644 doc/*.{gif,jpg,png,ico,css,txt,php,html} \
-                    /usr/share/doc/id3lib-&id3lib-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          id3convert,
-          id3cp,
-          id3info, and
-          id3tag
-        </seg>
-        <seg>
-          libid3.so
-        </seg>
-        <seg>
-           /usr/include/id3 and
-           /usr/share/doc/id3lib-&id3lib-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="id3convert">
-        <term><command>id3convert</command></term>
-        <listitem>
-          <para>
-            converts between id3v1/v2 tagging formats
-          </para>
-          <indexterm zone="id3lib id3convert">
-            <primary sortas="b-id3convert">id3convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="id3cp">
-        <term><command>id3cp</command></term>
-        <listitem>
-          <para>
-            extracts id3v1/v2 tags from digital audio files
-          </para>
-          <indexterm zone="id3lib id3cp">
-            <primary sortas="b-id3cp">id3cp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="id3info">
-        <term><command>id3info</command></term>
-        <listitem>
-          <para>
-            prints id3v1/v2 tag contents
-          </para>
-          <indexterm zone="id3lib id3info">
-            <primary sortas="b-id3info">id3info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="id3tag">
-        <term><command>id3tag</command></term>
-        <listitem>
-          <para>
-            is a utility for editing id3v1/v2 tags
-          </para>
-          <indexterm zone="id3lib id3tag">
-            <primary sortas="b-id3tag">id3tag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libid3">
-        <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
-          </para>
-          <indexterm zone="id3lib libid3">
-            <primary sortas="c-libid3">libid3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/intel-media-kernel.xml
===================================================================
--- multimedia/libdriv/intel-media-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-                                                                      ...  [DRM]
-    &lt;*/M&gt; <emphasis role='blue'>I</emphasis>ntel 8xx/9xx/G3x/G4x/HD Graphics                           [DRM_I915]</screen>
Index: ltimedia/libdriv/intel-media.xml
===================================================================
--- multimedia/libdriv/intel-media.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,274 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 intel-media-driver-version                "23.2.4">-->
-
-  <!ENTITY intel-media-download-http "https://github.com/intel/media-driver/archive/intel-media-&intel-media-version;.tar.gz">
-  <!ENTITY intel-media-download-ftp  " ">
-  <!ENTITY intel-media-md5sum        "5e2fffaf1c1972b8791c3cfd59cd6a9e">
-  <!ENTITY intel-media-size          "25 MB">
-  <!ENTITY intel-media-buildsize     "2.1 GB (359 MB installed)">
-  <!ENTITY intel-media-time          "6.3 SBU (with parallelism=4)">
-
-]>
-
-  <sect1 id="intel-media" xreflabel="intel-media-&intel-media-version;">
-  <?dbhtml filename="intel-media.html"?>
-
-    <sect1info>
-      <date>$Date$</date>
-    </sect1info>
-
-    <title>intel-media-&intel-media-version;</title>
-
-    <indexterm zone="intel-media">
-      <primary sortas="a-intel-media">intel-media</primary>
-    </indexterm>
-
-    <sect2 role="package">
-      <title>Introduction to intel-media</title>
-
-      <para>
-        The <application>intel-media</application> package provides a
-        VA API driver for Intel GPUs that are provided with Broadwell CPUs and
-        higher. This includes support for a variety of codecs.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect3">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&intel-media-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&intel-media-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &intel-media-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &intel-media-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &intel-media-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &intel-media-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-<!--
-      <bridgehead renderas="sect2">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/intel-media-&intel-media-version;-upstream_fixes-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
--->
-
-      <note>
-        <para>
-          The tarball <filename>intel-media-&intel-media-version;.tar.gz</filename>
-          will extract to the directory
-          <filename class="directory">media-driver-intel-media-&intel-media-version;</filename>.
-        </para>
-      </note>
-
-      <bridgehead renderas="sect3">intel-media Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cmake"/>,
-        <xref linkend="intel-gmmlib"/>,
-        <xref linkend="libva"/>, and
-        <xref linkend="xorg-env"/>
-      </para>
-
-    </sect2>
-
-    <sect2 role="kernel" id='intel-media-kernel'>
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration.
-        Recompile the kernel if necessary:
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="intel-media-kernel.xml"/>
-
-      <indexterm zone="intel-media intel-media-kernel">
-        <primary sortas="d-intel-media">intel-media</primary>
-      </indexterm>
-    </sect2>
-
-    <!-- TODO: It's said Gen9+ (Skylake or later) may need some firmware files. -->
-
-    <sect2 role="installation">
-      <title>Installation of intel-media</title>
-
-      <note>
-        <para>
-          This package takes a long time to build because it compiles code
-          specific to each individual generation of Intel GPUs and for a
-          variety of media codecs.
-        </para>
-
-        <!-- This reduce the size of iHD_drv_video.so from 319M to 157M
-             for me.  -->
-        <!-- It seems ARL depends on MTL.  We need to review once an Arrow
-             Lake CPU is launched.  -->
-        <!-- Support for ARL is completely broken, needs to be turned off to 
-             complete the build -->
-        <para>
-          If you know the model of your Intel GPU, you can pass the
-          <option>-D{GEN{8,9,11,12},MTL,ARL}=OFF</option> option to the
-          <command>cmake</command> command but leaving the option for your
-          GPU out.  Note that the <quote>GEN</quote> number here is the
-          generation of the GPU, not the CPU.  For example, with an Intel
-          Core i7-1065G7 CPU shipping a 11th-generation Intel GPU, the
-          <option>-D{GEN{8,9,12},MTL,ARL}=OFF</option> option can be used
-          so the code specific to the other generations of Intel GPUs won't
-          be built.
-        </para>
-
-        <para>
-          To determine the model of the Intel GPU, install
-          <xref linkend='pciutils'/> and run
-          <command>lspci -nn | grep -Ei 'VGA|DISPLAY'</command> first.
-          It will output some information about the GPU.  If the output
-          contains <literal>Meteor Lake</literal>, the GPU model is
-          <literal>MTL</literal>.  Otherwise, follow
-          <ulink url='https://dgpu-docs.intel.com/devices/hardware-table.html'/>
-          to find the entry for your GPU and the model of the GPU should
-          be in the <quote>Architecture</quote> column.  The Xe and XeHPG
-          architectures are covered by the <literal>GEN12</literal> model.
-        </para>
-        <!-- TODO: The info about MTL is my best guess, the referred Intel
-        page does not contain Meteor Lake GPU PCI devicd ID as at Feb 2024.
-        XeHPC is not enabled by default but they are some data center GPUs.
-        Not sure if anyone will run LFS in a data center. -->
-      </note>
-
-<!--
-      <para>
-        First, fix a few build failures with GCC-13:
-      </para>
-
- <screen><userinput remap="pre">patch -Np1 -i ../intel-media-&intel-media-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-      <para>
-        Install <application>intel-media</application> by running the
-        following commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$XORG_PREFIX \
-      -DINSTALL_DRIVER_SYSCONF=OFF        \
-      -DBUILD_TYPE=Release                \
-      -G Ninja                            \
-      -Wno-dev ..                   &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>
-
-    <!-- As of Oct 1 2023, the build is broken if MTL and ARL are turned on
-         hopefully this is fixed by the time they launch, in which 
-         case we can remove the option and this section [rahul] -->
-    <!-- As of October 31st, 2023, the build seems to be functional again! This
-         is with version 23.4.0. [renodr]
-    <sect2 role="commands">
-      <title>Command Explanations</title>
-       
-      <para>
-        <parameter>-D{MTL,ARL}=OFF</parameter>: As of October 2023,
-        Meteor Lake and Arrow Lake iGPU support is broken but still
-        in intel-media. The build fails if support for either iGPU
-        is turned on. Since both of these have not been officially
-        released yet, it is safe to turn support for them off.
-      </para>
-
-     </sect2> 
-    -->
-
-    <sect2 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Drivers</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            libigfxcmrt.so
-          </seg>
-          <seg>
-            iHD_drv_video.so
-          </seg>
-          <seg>
-            /usr/include/igfxcmrt
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect2">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libigfxcmrt">
-          <term><filename class="libraryfile">libigfxcmrt.so</filename></term>
-          <listitem>
-            <para>
-              provides API functions which allow running GPU kernels on the
-              render engine
-            </para>
-            <indexterm zone="intel-media libigfxcmrt">
-              <primary sortas="c-libigfxcmrt">libigfxcmrt.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect2>
-
-  </sect1>
Index: ltimedia/libdriv/intel-vaapi-driver.xml
===================================================================
--- multimedia/libdriv/intel-vaapi-driver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 intel-vaapi-driver-version       "2.4.1">
-  <!ENTITY intel-vaapi-driver-download-http "https://github.com/intel/intel-vaapi-driver/releases/download/&intel-vaapi-driver-version;/intel-vaapi-driver-&intel-vaapi-driver-version;.tar.bz2">
-  <!ENTITY intel-vaapi-driver-download-ftp  " ">
-  <!ENTITY intel-vaapi-driver-md5sum        "073fce0f409559109ad2dd0a6531055d">
-  <!ENTITY intel-vaapi-driver-size          "2.8 MB">
-  <!ENTITY intel-vaapi-driver-buildsize     "97 MB">
-  <!ENTITY intel-vaapi-driver-time          "0.3 SBU">
-]>
-
-  <sect1 id="intel-vaapi-driver" xreflabel="intel-vaapi-driver-&intel-vaapi-driver-version;">
-  <?dbhtml filename="intel-vaapi-driver.html"?>
-
-    <title>intel-vaapi-driver-&intel-vaapi-driver-version;</title>
-
-    <indexterm zone="intel-vaapi-driver">
-      <primary sortas="a-intel-vaapi-driver">intel-vaapi-driver</primary>
-    </indexterm>
-
-    <sect2 role="package">
-      <title>Introduction to intel-vaapi-driver</title>
-
-      <para>
-         The <application>intel-vaapi-driver</application> package contains
-         a VA API driver for Intel GPUs that are provided with Haswell CPUs
-         and earlier.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect3">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&intel-vaapi-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&intel-vaapi-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &intel-vaapi-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &intel-vaapi-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &intel-vaapi-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &intel-vaapi-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect3">intel-vaapi-driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libva"/> and
-        <xref linkend="xorg-env"/>
-      </para>
-
-    </sect2>
-
-    <sect2 role="kernel" id='intel-vaapi-driver-kernel'>
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration.
-        Recompile the kernel if necessary:
-      </para>
-
-      <!-- Reuse the file of intel-media for same configuration -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="intel-media-kernel.xml"/>
-
-      <indexterm zone="intel-vaapi-driver intel-vaapi-driver-kernel">
-        <primary sortas="d-intel-vaapi-driver">intel-vaapi-driver</primary>
-      </indexterm>
-    </sect2>
-
-    <sect2 role="installation">
-      <title>Installation of intel-vaapi-driver</title>
-
-      <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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect2>
-
-    <sect2 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            i965_drv_video.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect2>
-
-  </sect1>
Index: ltimedia/libdriv/liba52.xml
===================================================================
--- multimedia/libdriv/liba52.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liba52-download-http "https://distfiles.adelielinux.org/source/a52dec/a52dec-&liba52-version;.tar.gz">
-  <!ENTITY liba52-download-ftp  " ">
-  <!ENTITY liba52-md5sum        "4debeed0257f5312e84d92711a5cfcec">
-  <!ENTITY liba52-size          "448 KB">
-  <!ENTITY liba52-buildsize     "3.7 MB">
-  <!ENTITY liba52-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liba52" xreflabel="liba52-&liba52-version;">
-  <?dbhtml filename="liba52.html"?>
-
-
-  <title>Liba52-&liba52-version;</title>
-
-  <indexterm zone="liba52">
-    <primary sortas="a-Liba52">Liba52</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Liba52</title>
-
-    <para>
-      <application>liba52</application> is a free library for decoding
-      ATSC A/52 (also known as AC-3) streams. The A/52 standard is used
-      in a variety of applications, including digital television and DVD.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liba52-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liba52-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liba52-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liba52-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liba52-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liba52-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://cr.yp.to/djbfft.html">djbfft</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/liba52"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Liba52</title>
-
-    <para>
-      Install <application>liba52</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --mandir=/usr/share/man \
-            --enable-shared         \
-            --disable-static        \
-            CFLAGS="${CFLAGS:--g -O3} -fPIC" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-cp liba52/a52_internal.h /usr/include/a52dec &amp;&amp;
-install -v -m644 -D doc/liba52.txt \
-    /usr/share/doc/liba52-&liba52-version;/liba52.txt</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>CFLAGS="${CFLAGS:--g -O3} -fPIC"</parameter>: This appends
-      <option>-fPIC</option> to <envar>CFLAGS</envar> but use
-      <option>-g -O3</option> (the default of this package) instead of an
-      empty string when <envar>CFLAGS</envar> is not set.
-      This is needed to compile <application>liba52</application> without
-      runtime text relocation.  Runtime text relocation is prohibited on
-      x86_64 so <option>-fPIC</option> is strictly required.  On 32-bit x86
-      runtime text relocation is allowed but it's insecure and it may waste
-      physical RAM, so <option>-fPIC</option> is still better.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <command>cp liba52/a52_internal.h ...</command>: Copying this header
-      file into /usr/include/a52dec allows some other programs (such as
-      <application>xine-lib</application>) to compile and link against a system
-      installed <application>liba52</application>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>a52dec and extract_a52</seg>
-        <seg>liba52.so</seg>
-        <seg>/usr/include/a52dec and
-        /usr/share/doc/liba52-&liba52-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a52dec">
-        <term><command>a52dec</command></term>
-        <listitem>
-          <para>
-            plays ATSC A/52 audio streams
-          </para>
-          <indexterm zone="liba52 a52dec">
-            <primary sortas="b-a52dec">a52dec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extract_a52">
-        <term><command>extract_a52</command></term>
-        <listitem>
-          <para>
-            extracts ATSC A/52 audio from an MPEG stream
-          </para>
-          <indexterm zone="liba52 extract_a52">
-            <primary sortas="b-extract_a52">extract_a52</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liba52-lib">
-        <term><filename class="libraryfile">liba52.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for the programs dealing with ATSC A/52 streams
-          </para>
-          <indexterm zone="liba52 liba52-lib">
-            <primary sortas="c-liba52">liba52.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/libdriv/libao.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,180 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libao" xreflabel="libao-&libao-version;">
+<?dbhtml filename="libao.html" dir="multimedia"?>
+<title>libao-&libao-version;</title>
 
-  <!ENTITY libao-download-http "https://downloads.xiph.org/releases/ao/libao-&libao-version;.tar.gz">
-  <!ENTITY libao-download-ftp  " ">
-  <!ENTITY libao-md5sum        "9f5dd20d7e95fd0dd72df5353829f097">
-  <!ENTITY libao-size          "456 KB">
-  <!ENTITY libao-buildsize     "3.9 MB">
-  <!ENTITY libao-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libao" xreflabel="libao-&libao-version;">
-  <?dbhtml filename="libao.html"?>
-
-
-  <title>Libao-&libao-version;</title>
-
-  <indexterm zone="libao">
-    <primary sortas="a-Libao">Libao</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libao</title>
-
-    <para>
-      The <application>libao</application> package contains a
-      cross-platform audio library. This is useful to output audio on a wide
-      variety of platforms. It currently supports WAV files, OSS (Open Sound
-      System), ESD (Enlighten Sound Daemon), ALSA (Advanced Linux Sound
-      Architecture), NAS (Network Audio system), aRTS (analog Real-Time
-      Synthesizer), and PulseAudio (next generation
-      <application>GNOME</application> sound architecture).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libao-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libao-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libao-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libao-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libao-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libao-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libao Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="alsa-lib"/>, and
-      <xref linkend='pulseaudio'/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libao</title>
-
-    <para>
-      Install <application>libao</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 &amp;&amp;
-install -v -m644 README /usr/share/doc/libao-&libao-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Libao</title>
-
-    <sect3 id="libao-config">
-      <title>Config Files</title>
-
-    <para>
-      <filename>/etc/libao.conf</filename> and
-      <filename>~/.libao</filename>
-    </para>
-
-      <indexterm zone="libao libao-config">
-        <primary sortas="e-etc-libao.conf">/etc/libao.conf</primary>
-      </indexterm>
-
-      <indexterm zone="libao libao-config">
-        <primary sortas="e-AA.libao">~/.libao</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Currently, the only configuration option available is setting the
-        default output device. Issue <command>man libao.conf</command>
-        for details.
-      </para>
-
-    </sect3>
-
-  </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>libao.so and plugins under /usr/lib/ao/plugins-4</seg>
-        <seg>/usr/include/ao, /usr/lib/ao and /usr/share/doc/libao-&libao-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libao-lib">
-        <term><filename class="libraryfile">libao.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for programs wishing to output sound over
-            supported platforms
-          </para>
-          <indexterm zone="libao libao-lib">
-            <primary sortas="c-libao">libao.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libao-intro;
+&libao-inst;
+&libao-exp;
+&libao-config;
+&libao-desc;
 
 </sect1>
+
Index: multimedia/libdriv/libao/libao-config.xml
===================================================================
--- multimedia/libdriv/libao/libao-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/libao/libao-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Configuring libao</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+</sect3>
+
+</sect2>
+
Index: multimedia/libdriv/libao/libao-desc.xml
===================================================================
--- multimedia/libdriv/libao/libao-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/libao/libao-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libao package contains <userinput>ao libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ao libraries</title>
+<para>libao provides functions for programs wishing to output sound over
+supported platforms.</para></sect3>
+
+</sect2>
+
Index: multimedia/libdriv/libao/libao-exp.xml
===================================================================
--- multimedia/libdriv/libao/libao-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/libao/libao-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>make CC="gcc $CFLAGS" :</userinput> This makes libao
+compile using our CFLAGS for optimizations.</para>
+
+</sect2>
+
Index: multimedia/libdriv/libao/libao-inst.xml
===================================================================
--- multimedia/libdriv/libao/libao-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/libao/libao-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of libao</title>
+
+<para>Install libao by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/libdriv/libao/libao-intro.xml
===================================================================
--- multimedia/libdriv/libao/libao-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/libao/libao-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to libao</title>
+
+<screen>Download location:              &libao-download;
+Version used:                   &libao-version;
+Package size:                   &libao-size;
+Estimated Disk space required:  &libao-buildsize;</screen>
+
+<para>The libao package contains a cross-platform audio library. This is
+useful to output audio on a wide variety of platforms.  It currently
+supports WAV files, OSS (Open Sound System), ESD (Enlighten Sound
+Daemon) and ALSA (Advanced Linux Sound Architecture).</para>
+
+</sect2>
Index: multimedia/libdriv/libao/libao.ent
===================================================================
--- multimedia/libdriv/libao/libao.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/libao/libao.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libao SYSTEM "../libao.xml">
+<!ENTITY libao-intro SYSTEM "libao-intro.xml">
+<!ENTITY libao-inst SYSTEM "libao-inst.xml">
+<!ENTITY libao-exp SYSTEM "libao-exp.xml">
+<!ENTITY libao-desc SYSTEM "libao-desc.xml">
+<!ENTITY libao-config SYSTEM "libao-config.xml">
+<!ENTITY libao-buildsize "1.9 MB">
+<!ENTITY libao-version "0.8.2">
+<!ENTITY libao-download "http://www.vorbis.com/files/rc3/unix/libao-0.8.2.tar.gz">
+<!ENTITY libao-size "202 KB">
Index: ltimedia/libdriv/libaom.xml
===================================================================
--- multimedia/libdriv/libaom.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libaom-download-http "https://storage.googleapis.com/aom-releases/libaom-&libaom-version;.tar.gz">
-  <!ENTITY libaom-download-ftp  " ">
-  <!ENTITY libaom-md5sum        "4a1a94acf8d2798f7eb31134ba5be98a">
-  <!ENTITY libaom-size          "5.2 MB">
-  <!ENTITY libaom-buildsize     "103 MB (add 1.0 GB for tests)">
-  <!ENTITY libaom-time          "1.0 SBU (with parallelism=4, add 187 SBU for tests)">
-]>
-
-<!-- Tests not run for version 3.6.1. -->
-
-<sect1 id="libaom" xreflabel="libaom-&libaom-version;">
-  <?dbhtml filename="libaom.html"?>
-
-  <title>libaom-&libaom-version;</title>
-
-  <indexterm zone="libaom">
-    <primary sortas="a-libaom">libaom</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libaom</title>
-
-    <para>
-      The <application>libaom</application> package contains a reference
-      version of the Alliance for Open Media video codec. This codec is a
-      patent free alternative to H.265, and is starting to be used throughout
-      the internet.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libaom-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libaom-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libaom-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libaom-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libaom-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libaom-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libaom Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="yasm"/>
-      (or <xref role='nodep' linkend="nasm"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    &test-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libaom</title>
-
-    <para>
-      Install <application>libaom</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir aom-build &amp;&amp;
-cd    aom-build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_SHARED_LIBS=1       \
-      -DENABLE_DOCS=no            \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja runtests</command>. Note that
-      the tests take an extremely long time to run.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-rm -v /usr/lib/libaom.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=1</parameter>: This switch builds shared
-      versions of the libraries.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_DOCS=no</parameter>: This switch disables building
-      the documentation because it fails due to an incompatibility with the
-      latest version of <xref role="nodep" linkend="doxygen"/>.
-    </para>
-
-    <para>
-      <option>-DENABLE_NASM=yes</option>: Use this switch if you have both
-      <xref linkend="yasm"/> and
-      <xref role="nodep" linkend="nasm"/> installed and wish to use
-      nasm instead of yasm.
-    </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>
-          libaom.so
-        </seg>
-        <seg>
-          /usr/include/aom
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libaom-lib">
-        <term><filename class="libraryfile">libaom.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a reference implementation of the
-            AV1 codec
-          </para>
-          <indexterm zone="libaom libaom-lib">
-            <primary sortas="c-libaom">libaom.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: ltimedia/libdriv/libass.xml
===================================================================
--- multimedia/libdriv/libass.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libass-download-http "https://github.com/libass/libass/releases/download/&libass-version;/libass-&libass-version;.tar.xz">
-  <!ENTITY libass-download-ftp  " ">
-  <!ENTITY libass-md5sum        "73f00a898161be424e05d4bee1962dbb">
-  <!ENTITY libass-size          "396 KB">
-  <!ENTITY libass-buildsize     "6.5 MB">
-  <!ENTITY libass-time          "0.1 SBU">
-]>
-
-<sect1 id="libass" xreflabel="libass-&libass-version;">
-  <?dbhtml filename="libass.html"?>
-
-
-  <title>libass-&libass-version;</title>
-
-  <indexterm zone="libass">
-    <primary sortas="a-libass">libass</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libass</title>
-
-    <para>
-      <application>libass</application> is a portable subtitle renderer for the
-      ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format that
-      allows for more advanced subtitles than the conventional SRT and similar
-      formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libass-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libass-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libass-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libass-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libass-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libass-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libass Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="freetype2"/>,
-      <xref linkend="fribidi"/>, and
-      <xref linkend="nasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="fontconfig"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="harfbuzz"/> and
-      <ulink url="https://github.com/adah1972/libunibreak">libunibreak</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libass</title>
-
-    <para>
-      Install <application>libass</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--disable-fontconfig</option>: Use this switch if you didn't
-      install <application>Fontconfig</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libass.so
-        </seg>
-        <seg>
-          /usr/include/ass
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libass-lib">
-        <term><filename class="libraryfile">libass.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to render ASS/SSA subtitle format
-          </para>
-          <indexterm zone="libass libass-lib">
-            <primary sortas="c-libass">libass.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcanberra-download-http
-           "https://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">
-  <!ENTITY libcanberra-download-ftp  " ">
-  <!ENTITY libcanberra-md5sum        "34cb7e4430afaf6f447c4ebdb9b42072">
-  <!ENTITY libcanberra-size          "312 KB">
-  <!ENTITY libcanberra-buildsize     "7.5 MB">
-  <!ENTITY libcanberra-time          "0.1 SBU">
-]>
-
-<sect1 id="libcanberra" xreflabel="libcanberra-&libcanberra-version;">
-  <?dbhtml filename="libcanberra.html"?>
-
-
-  <title>libcanberra-&libcanberra-version;</title>
-
-  <indexterm zone="libcanberra">
-    <primary sortas="a-libcanberra">libcanberra</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcanberra</title>
-
-    <para>
-      <application>libcanberra</application> is an implementation of the XDG Sound
-      Theme and Name Specifications, for generating event sounds on free desktops,
-      such as <application>GNOME</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcanberra-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcanberra-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcanberra-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcanberra-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcanberra-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcanberra-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libcanberra-&libcanberra-version;-wayland-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcanberra Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libvorbis"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gstreamer10"/>, and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/>,
-      <xref linkend='pulseaudio'/>, and
-      <ulink url="https://tdb.samba.org/">tdb</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended Sound Theme (Run Time)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="sound-theme-freedesktop"/>,
-      or another theme, for example from
-      <ulink url="https://www.gnome-look.org/browse?cat=316">the gnome-look
-      website</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcanberra</title>
-
-    <para>
-      At first, apply a patch to fix an issue causing some applications to
-      crash in Wayland based desktop environment:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libcanberra-0.30-wayland-1.patch</userinput></screen>
-
-    <para>
-      Install <application>libcanberra</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-oss &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 docdir=/usr/share/doc/libcanberra-&libcanberra-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-oss</parameter>: disable optional deprecated OSS
-      support
-    </para>
-
-    <para>
-      <option>--disable-gtk</option>: disable optional GTK+ 2 support
-    </para>
-
-    <para>
-      <option>--disable-gtk3</option>: disable optional GTK+ 3 support
-    </para>
-    <!-- gtk-doc support is broken due to an obsolete command "gtkdoc-mktmpl"
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          canberra-boot and canberra-gtk-play
-        </seg>
-        <seg>
-          libcanberra-gtk.so, libcanberra-gtk3.so and
-          libcanberra.so
-        </seg>
-        <seg>
-          /usr/lib/libcanberra-&libcanberra-version;,
-          /usr/share/doc/libcanberra-&libcanberra-version; and
-          /usr/share/gtk-doc/html/libcanberra
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--
-      <varlistentry id="canberra-boot">
-        <term><command>canberra-boot</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="libcanberra canberra-boot">
-            <primary sortas="b-canberra-boot">canberra-boot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="canberra-gtk-play">
-        <term><command>canberra-gtk-play</command></term>
-        <listitem>
-          <para>
-            is an application used for playing sound events
-          </para>
-          <indexterm zone="libcanberra canberra-gtk-play">
-            <primary sortas="b-canberra-gtk-play">canberra-gtk-play</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk">
-        <term><filename class="libraryfile">libcanberra-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 2</application>
-          </para>
-          <indexterm zone="libcanberra libcanberra-gtk">
-            <primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk3">
-        <term><filename class="libraryfile">libcanberra-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="libcanberra libcanberra-gtk3">
-            <primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-lib">
-        <term><filename class="libraryfile">libcanberra.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> API functions
-          </para>
-          <indexterm zone="libcanberra libcanberra-lib">
-            <primary sortas="c-libcanberra">libcanberra.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libcddb.xml
===================================================================
--- multimedia/libdriv/libcddb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcddb-download-http "&sourceforge-dl;/libcddb/libcddb-&libcddb-version;.tar.bz2">
-  <!ENTITY libcddb-download-ftp  " ">
-  <!ENTITY libcddb-md5sum        "8bb4a6f542197e8e9648ae597cd6bc8a">
-  <!ENTITY libcddb-size          "384 KB">
-  <!ENTITY libcddb-buildsize     "3.9 MB (with tests)">
-  <!ENTITY libcddb-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libcddb" xreflabel="libcddb-&libcddb-version;">
-  <?dbhtml filename="libcddb.html"?>
-
-
-  <title>libcddb-&libcddb-version;</title>
-
-  <indexterm zone="libcddb">
-    <primary sortas="a-libcddb">libcddb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcddb</title>
-
-    <para>
-      The <application>libcddb</application> is a library that implements
-      the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB
-      server.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcddb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcddb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcddb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcddb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcddb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcddb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    &test-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcddb</title>
-
-    <para>
-      By default this package accesses
-      <systemitem class='domainname'>freedb.org</systemitem>, which is
-      already closed.  Modify the default to use
-      <systemitem class='domainname'>gnudb.gnudb.org</systemitem> instead,
-      and fix two stale test data files:
-    </para>
-
-<screen><userinput>sed -e '/DEFAULT_SERVER/s/freedb.org/gnudb.gnudb.org/' \
-    -e '/DEFAULT_PORT/s/888/&amp;0/'                       \
-    -i include/cddb/cddb_ni.h                          &amp;&amp;
-sed '/^Genre:/s/Trip-Hop/Electronic/' -i tests/testdata/920ef00b.txt &amp;&amp;
-sed '/DISCID/i# Revision: 42'         -i tests/testcache/misc/12340000</userinput></screen>
-
-    <para>
-      Install <application>libcddb</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check -k</command>.
-      The test suite needs the Internet connection.  One test fails due to
-      missing test server.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cddb_query
-        </seg>
-        <seg>
-          libcddb.so
-        </seg>
-        <seg>
-          /usr/include/cddb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cddb_query">
-        <term><command>cddb_query</command></term>
-        <listitem>
-          <para>
-            provides a user interface to a CDDB server
-          </para>
-          <indexterm zone="libcddb cddb_query">
-            <primary sortas="b-cddb_query">cddb_query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libcdio.xml
===================================================================
--- multimedia/libdriv/libcdio.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcdio-download-http "&gnu-http;/libcdio/libcdio-&libcdio-version;.tar.bz2">
-  <!ENTITY libcdio-download-ftp  " ">
-  <!ENTITY libcdio-md5sum        "aa7629e8f73662a762f64c444b901055">
-  <!ENTITY libcdio-size          "1.7 MB">
-  <!ENTITY libcdio-buildsize     "43 MB (both packages, including checks)">
-  <!ENTITY libcdio-time          "0.3 SBU (using parallelism=4; both packages, including checks)">
-
-  <!ENTITY libcdio-paranoia      "libcdio-paranoia-10.2+2.0.1">
-]>
-
-<sect1 id="libcdio" xreflabel="libcdio-&libcdio-version;">
-  <?dbhtml filename="libcdio.html"?>
-
-
-  <title>libcdio-&libcdio-version;</title>
-
-  <indexterm zone="libcdio">
-    <primary sortas="a-libcdio">libcdio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcdio</title>
-
-    <para>
-      The <application>libcdio</application> is a library for CD-ROM and CD
-      image access. The associated <application>libcdio-cdparanoia</application>
-      library reads audio from the CD-ROM directly as data, with no analog step
-      between, and writes the data to a file or pipe as .wav, .aifc or as raw 16
-      bit linear PCM.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcdio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcdio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcdio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcdio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcdio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcdio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required file: <ulink
-          url="&gnu-http;/libcdio/&libcdio-paranoia;.tar.bz2"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcdio Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-        <xref linkend="libcddb"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcdio</title>
-
-    <para>
-      Install <application>libcdio</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check -k</command>.
-      One test named <filename>realpath</filename> is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Now install libcdio-paranoia:
-    </para>
-
-<screen><userinput>tar -xf ../&libcdio-paranoia;.tar.bz2 &amp;&amp;
-cd &libcdio-paranoia; &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cdda-player,
-          cd-drive,
-          cd-info,
-          cd-paranoia,
-          cd-read,
-          iso-info,
-          iso-read, and
-          mmc-tool
-        </seg>
-        <seg>
-          libcdio.so,
-          libcdio++.so,
-          libcdio_cdda,
-          libcdio_paranoia,
-          libiso9660,
-          libiso9660++, and
-          libudf.so</seg>
-        <seg>
-          /usr/include/cdio and
-          /usr/include/cdio++
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cd-drive">
-        <term><command>cd-drive</command></term>
-        <listitem>
-          <para>
-            shows CD-ROM drive characteristics
-          </para>
-          <indexterm zone="libcdio cd-drive">
-            <primary sortas="b-cd-drive">cd-drive</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-info">
-        <term><command>cd-info</command></term>
-        <listitem>
-          <para>
-            shows information about a CD or CD-image
-          </para>
-          <indexterm zone="libcdio cd-info">
-            <primary sortas="b-cd-info">cd-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-paranoia">
-        <term><command>cd-paranoia</command></term>
-        <listitem>
-          <para>
-            is an audio CD reading utility which
-            includes extra data verification features
-          </para>
-          <indexterm zone="libcdio cd-paranoia">
-            <primary sortas="b-cd-paranoia">cd-paranoia</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-read">
-        <term><command>cd-read</command></term>
-        <listitem>
-          <para>
-            reads Information from a CD or CD-image
-          </para>
-          <indexterm zone="libcdio cd-read">
-            <primary sortas="b-cd=read">cd-read</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdda-player">
-        <term><command>cdda-player</command></term>
-        <listitem>
-          <para>
-            is a simple curses CD player
-          </para>
-          <indexterm zone="libcdio cdda-player">
-            <primary sortas="b-cdda-player">cdda-player</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iso-info">
-        <term><command>iso-info</command></term>
-        <listitem>
-          <para>
-            shows Information about an ISO 9660 image
-          </para>
-          <indexterm zone="libcdio iso-info">
-            <primary sortas="b-iso-info">iso-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iso-read">
-        <term><command>iso-read</command></term>
-        <listitem>
-          <para>
-            reads portions of an ISO 9660 image
-          </para>
-          <indexterm zone="libcdio iso-read">
-            <primary sortas="b-iso-read">iso-read</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mmc-tool">
-        <term><command>mmc-tool</command></term>
-        <listitem>
-          <para>
-            issues libcdio multimedia commands
-          </para>
-          <indexterm zone="libcdio mmc-tool">
-            <primary sortas="b-mmc-tool">mmc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcdio.so">
-        <term><filename class="libraryfile">libcdio.so</filename></term>
-        <listitem>
-          <para>
-            contains the primary cdio API functions
-          </para>
-          <indexterm zone="libcdio libcdio.so">
-            <primary sortas="c-libcdio.so">libcdio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/libdriv/libdriv.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,94 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="multimedia-libdriv">
+<?dbhtml filename="libdriv.html" dir="multimedia"?>
+<title>Multimedia Libraries and Drivers</title>
 
-<chapter id="multimedia-libdriv">
-  <?dbhtml filename="libdriv.html"?>
+<para>Many multimedia programs require libraries and/or drivers in order 
+to function properly.  The packages in this section fall into this category.
+Generally you only need to install these if you are installing a program
+which has the library listed as either a requirement, or as an option to
+enable it to support certain functionality.</para>
 
-  <title>Multimedia Libraries and Drivers</title>
-
-  <para>
-    Many multimedia programs require libraries and/or drivers in order
-    to function properly.  The packages in this section fall into this category.
-    Generally you only need to install these if you are installing a program
-    which has the library listed as either a requirement, or as an option to
-    enable it to support certain functionality.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-oss.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audiofile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faad2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fdk-aac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="frei0r.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gavl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer10.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-base.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-good.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-bad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-ugly.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-libav.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer10-vaapi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="id3lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-media.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-vaapi-driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liba52.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libao.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaom.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcddb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcdio.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdiscid.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdcss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdread.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdnav.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libogg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libplacebo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libquicktime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsamplerate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsndfile.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtheora.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-va-gl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvorbis.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvpx.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mlt.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opal.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pipewire.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pulseaudio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sdl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sdl2.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sound-theme-freedesktop.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soundtouch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="speex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="taglib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="v4l-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireplumber.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x264.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x265.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xine-lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xvid.xml"/>
+&alsa;
+&arts;
+&audiofile;
+&esound;
+&SDL;
+&libao;
+&libogg;
+&libvorbis;
 
 </chapter>
Index: ltimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdv-download-http "&sourceforge-dl;/libdv/libdv-&libdv-version;.tar.gz">
-  <!ENTITY libdv-download-ftp  " ">
-  <!ENTITY libdv-md5sum        "f895162161cfa4bb4a94c070a7caa6c7">
-  <!ENTITY libdv-size          "574 KB">
-  <!ENTITY libdv-buildsize     "6.0 MB">
-  <!ENTITY libdv-time          "0.2 SBU">
-]>
-
-<sect1 id="libdv" xreflabel="libdv-&libdv-version;">
-  <?dbhtml filename="libdv.html"?>
-
-
-  <title>Libdv-&libdv-version;</title>
-
-  <indexterm zone="libdv">
-    <primary sortas="a-Libdv">Libdv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libdv</title>
-
-    <para>
-      The Quasar DV Codec (<application>libdv</application>) is a software
-      CODEC for DV video, the encoding format used by most digital
-      camcorders.  It can be used to copy videos from camcorders using a
-      firewire (IEEE 1394) connection.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libdv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="popt"/>,
-      <xref linkend="sdl"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libdv</title>
-
-    <para>
-      Install <application>libdv</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-xv \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d      /usr/share/doc/libdv-&libdv-version; &amp;&amp;
-install -v -m644 README* /usr/share/doc/libdv-&libdv-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-xv</parameter>: This parameter is required if
-      an <application>X Window System</application> is not installed.  It also
-      prevents <command>configure</command> testing for
-      <filename class="libraryfile">libXv</filename> which is only used for an
-      obsolete program <command>playdv</command> that will not be built with
-      current <application>linux</application> headers and would also need
-      other obsolete dependencies.
-    </para> <!-- gtk+-1.2, glib+-1.2 -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dubdv, dvconnect, and encodedv<!--, and playdv--></seg>
-        <seg>libdv.so</seg>
-        <seg>/usr/include/libdv and /usr/share/doc/libdv-&libdv-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dubdv">
-        <term><command>dubdv</command></term>
-        <listitem>
-          <para>
-            inserts audio into a digital video stream
-          </para>
-          <indexterm zone="libdv dubdv">
-            <primary sortas="b-dubdv">dubdv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvconnect">
-        <term><command>dvconnect</command></term>
-        <listitem>
-          <para>
-            is a small utility to send or capture raw data from and to the
-            camcorder
-          </para>
-          <indexterm zone="libdv dvconnect">
-            <primary sortas="b-dvconnect">dvconnect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="encodedv">
-        <term><command>encodedv</command></term>
-        <listitem>
-          <para>
-            encodes a series of images to a digital video stream
-          </para>
-          <indexterm zone="libdv encodedv">
-            <primary sortas="b-encodedv">encodedv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-  <!--<varlistentry id="playdv">
-        <term><command>playdv</command></term>
-        <listitem>
-          <para>
-            displays digital video streams on the screen.
-          </para>
-          <indexterm zone="libdv playdv">
-            <primary sortas="b-playdv">playdv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libdv-lib">
-        <term><filename class="libraryfile">libdv.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for programs interacting with the
-            Quasar DV CODEC
-          </para>
-          <indexterm zone="libdv libdv-lib">
-            <primary sortas="c-libdv">libdv.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libdvdcss" xreflabel="libdvdcss-&libdvdcss-version;">
-  <?dbhtml filename="libdvdcss.html"?>
-
-
-  <title>libdvdcss-&libdvdcss-version;</title>
-
-  <indexterm zone="libdvdcss">
-    <primary sortas="a-libdvdcss">libdvdcss</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdvdcss</title>
-
-    <para>
-      <application>libdvdcss</application> is a simple library
-      designed for accessing DVDs as a block device without having to
-      bother about the decryption.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdvdcss-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdvdcss-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdvdcss-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdvdcss-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdvdcss-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdvdcss-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdvdcss Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdvdcss</title>
-
-    <para>
-      Install <application>libdvdcss</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libdvdcss-&libdvdcss-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdvdcss.so
-        </seg>
-        <seg>
-          /usr/include/dvdcss and
-          /usr/share/doc/libdvdcss-&libdvdcss-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdvdcss-lib">
-        <term><filename class="libraryfile">libdvdcss.so</filename></term>
-        <listitem>
-          <para>
-            provides the functionality that is required for transparent
-            DVD access with CSS decryption
-          </para>
-          <indexterm zone="libdvdcss libdvdcss-lib">
-            <primary sortas="c-libdvdcss">libdvdcss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libdvdnav.xml
===================================================================
--- multimedia/libdriv/libdvdnav.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-buildsize     "3.7 MB">
-  <!ENTITY libdvdnav-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libdvdnav" xreflabel="libdvdnav-&libdvdnav-version;">
-  <?dbhtml filename="libdvdnav.html"?>
-
-
-  <title>Libdvdnav-&libdvdnav-version;</title>
-
-  <indexterm zone="libdvdnav">
-    <primary sortas="a-Libdvdnav">Libdvdnav</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libdvdnav</title>
-
-    <para>
-      <application>libdvdnav</application> is a library that allows easy use
-      of sophisticated DVD navigation features such as DVD menus, multiangle
-      playback and even interactive DVD games.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdvdnav-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdvdnav-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdvdnav-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdvdnav-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdvdnav-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdvdnav-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libdvdnav Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libdvdread"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libdvdnav</title>
-
-    <para>
-      Install <application>libdvdnav</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libdvdnav-&libdvdnav-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libdvdnav.so</seg>
-        <seg>
-          /usr/include/dvdnav and
-          /usr/share/doc/libdvdnav-&libdvdnav-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdvdnav-lib">
-        <term><filename class="libraryfile">libdvdnav.so</filename></term>
-        <listitem>
-          <para>
-            is the DVD navigation library
-          </para>
-          <indexterm zone="libdvdnav libdvdnav-lib">
-            <primary sortas="c-libdvdnav">libdvdnav.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdvdread-download-http "https://get.videolan.org/libdvdread/&libdvdread-version;/libdvdread-&libdvdread-version;.tar.bz2">
-  <!ENTITY libdvdread-download-ftp  " ">
-  <!ENTITY libdvdread-md5sum        "3c58d1624a71a16ff40f55dbaca82523">
-  <!ENTITY libdvdread-size          "388 KB">
-  <!ENTITY libdvdread-buildsize     "3.6 MB">
-  <!ENTITY libdvdread-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libdvdread" xreflabel="libdvdread-&libdvdread-version;">
-  <?dbhtml filename="libdvdread.html"?>
-
-
-  <title>Libdvdread-&libdvdread-version;</title>
-
-  <indexterm zone="libdvdread">
-    <primary sortas="a-Libdvdread">Libdvdread</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libdvdread</title>
-
-    <para>
-      <application>libdvdread</application> is a library which
-      provides a simple foundation for reading DVDs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdvdread-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdvdread-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdvdread-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdvdread-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdvdread-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdvdread-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libdvdread</title>
-
-    <para>
-      Install <application>libdvdread</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libdvdread-&libdvdread-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libdvdread.so</seg>
-        <seg>
-          /usr/include/dvdread and
-          /usr/share/doc/libdvdread-&libdvdread-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdvdread-lib">
-        <term><filename class="libraryfile">libdvdread.so</filename></term>
-        <listitem>
-          <para>
-            provides functionality required to access DVDs
-          </para>
-          <indexterm zone="libdvdread libdvdread-lib">
-            <primary sortas="c-libdvdread">libdvdread.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmad-download-http "&sourceforge-dl;/mad/libmad-&libmad-version;.tar.gz">
-  <!ENTITY libmad-download-ftp  " ">
-  <!ENTITY libmad-md5sum        "1be543bc30c56fb6bea1d7bf6a64e66c">
-  <!ENTITY libmad-size          "491 KB">
-  <!ENTITY libmad-buildsize     "4.2 MB">
-  <!ENTITY libmad-time          "0.1 SBU">
-]>
-
-<sect1 id="libmad" xreflabel="libmad-&libmad-version;">
-  <?dbhtml filename="libmad.html"?>
-
-
-  <title>libmad-&libmad-version;</title>
-
-  <indexterm zone="libmad">
-    <primary sortas="a-Libmad">Libmad</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmad</title>
-
-    <para>
-      <application>libmad</application> is a high-quality
-      MPEG audio decoder capable of 24-bit output.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmad-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmad-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmad-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmad-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmad-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmad-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/libmad-&libmad-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmad</title>
-
-    <para>
-      Install <application>libmad</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libmad-&libmad-version;-fixes-1.patch                &amp;&amp;
-sed "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" -i configure.ac &amp;&amp;
-touch NEWS AUTHORS ChangeLog                                 &amp;&amp;
-autoreconf -fi                                               &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-  <screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Some packages check for the <application>pkg-config</application> file
-      for <application>libmad</application>. This file is particularly needed
-      so that <application>Cdrdao</application> can recognize the installed
-      <application>libmad</application>.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/mad.pc &lt;&lt; "EOF"
-<literal>prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: mad
-Description: MPEG audio decoder
-Requires:
-Version: &libmad-version;
-Libs: -L${libdir} -lmad
-Cflags: -I${includedir}</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>touch NEWS AUTHORS ChangeLog</command>: Prevent autoreconf from
-      returning an error.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libmad.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmad-lib">
-        <term><filename class="libraryfile">libmad.so</filename></term>
-        <listitem>
-          <para>
-            is a MPEG audio decoder library
-          </para>
-          <indexterm zone="libmad libmad-lib">
-            <primary sortas="c-libmad">libmad.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,220 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmpeg2-download-http "https://libmpeg2.sourceforge.net/files/libmpeg2-&libmpeg2-version;.tar.gz">
-  <!ENTITY libmpeg2-download-ftp  " ">
-  <!ENTITY libmpeg2-md5sum        "0f92c7454e58379b4a5a378485bbd8ef">
-  <!ENTITY libmpeg2-size          "513 KB">
-  <!ENTITY libmpeg2-buildsize     "6 MB">
-  <!ENTITY libmpeg2-time          "0.1 SBU">
-]>
-
-<sect1 id="libmpeg2" xreflabel="libmpeg2-&libmpeg2-version;">
-  <?dbhtml filename="libmpeg2.html"?>
-
-
-  <title>libmpeg2-&libmpeg2-version;</title>
-
-  <indexterm zone="libmpeg2">
-    <primary sortas="a-libmpeg2">libmpeg2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmpeg2</title>
-
-    <para>
-      The <application>libmpeg2</application> package contains a library for
-      decoding MPEG-2 and MPEG-1 video streams. The library is able to decode
-      all MPEG streams that conform to certain restrictions: <quote>constrained
-      parameters</quote> for MPEG-1, and <quote>main profile</quote> for MPEG-2.
-      This is useful for programs and applications needing to decode MPEG-2 and
-      MPEG-1 video streams.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmpeg2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmpeg2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmpeg2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmpeg2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmpeg2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmpeg2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmpeg2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/> and
-      <xref linkend="sdl"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmpeg2</title>
-
-    <para>
-      Install <application>libmpeg2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/static const/static/' libmpeg2/idct_mmx.c &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. To
-      perform a more comprehensive regression test, see the file
-      <filename>test/README</filename> in the source tree.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/libmpeg2-&libmpeg2-version; &amp;&amp;
-install -v -m644 README doc/libmpeg2.txt \
-                    /usr/share/doc/libmpeg2-&libmpeg2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: This <command>sed</command> fixes
-      problems with recent GCC compilers.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>corrupt_mpeg2, extract_mpeg2 and mpeg2dec</seg>
-        <seg>libmpeg2.so and libmpeg2convert.so</seg>
-        <seg>
-          /usr/include/mpeg2dec and
-          /usr/share/doc/libmpeg2-&libmpeg2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--
-     Don't fill this one in. It's designed for a user to corrupt their own
-     mpeg files, which can be used for malice.
-     <varlistentry id="corrupt_mpeg2">
-        <term><command>corrupt_mpeg2</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="libmpeg2 corrupt_mpeg2">
-            <primary sortas="b-corrupt_mpeg2">corrupt_mpeg2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="extract_mpeg2">
-        <term><command>extract_mpeg2</command></term>
-        <listitem>
-          <para>
-            extracts MPEG video streams from a multiplexed stream
-          </para>
-          <indexterm zone="libmpeg2 extract_mpeg2">
-            <primary sortas="b-extract_mpeg2">extract_mpeg2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg2dec">
-        <term><command>mpeg2dec</command></term>
-        <listitem>
-          <para>
-            decodes MPEG1 and MPEG2 video streams
-          </para>
-          <indexterm zone="libmpeg2 mpeg2dec">
-            <primary sortas="b-mpeg2dec">mpeg2dec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmpeg2-lib">
-        <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">
-            <primary sortas="c-libmpeg2">libmpeg2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmpeg2convert">
-        <term><filename class="libraryfile">libmpeg2convert.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used for color conversions of MPEG
-            video streams
-          </para>
-          <indexterm zone="libmpeg2 libmpeg2convert">
-            <primary sortas="c-libmpeg2convert">libmpeg2convert.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmusicbrainz-download-http "http://ftp.musicbrainz.org/pub/musicbrainz/historical/libmusicbrainz-&libmusicbrainz-version;.tar.gz">
-  <!ENTITY libmusicbrainz-download-ftp  " ">
-  <!ENTITY libmusicbrainz-md5sum        "d5e19bb77edd6ea798ce206bd05ccc5f">
-  <!ENTITY libmusicbrainz-size          "524 KB">
-  <!ENTITY libmusicbrainz-buildsize     "12 MB">
-  <!ENTITY libmusicbrainz-time          "0.4 SBU">
-]>
-
-<sect1 id="libmusicbrainz" xreflabel="libmusicbrainz-&libmusicbrainz-version;">
-  <?dbhtml filename="libmusicbrainz.html"?>
-
-
-  <title>libmusicbrainz-&libmusicbrainz-version;</title>
-
-  <indexterm zone="libmusicbrainz">
-    <primary sortas="a-libmusicbrainz">libmusicbrainz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmusicbrainz</title>
-
-    <para>
-      The <application>libmusicbrainz</application> package contains a library
-      which allows you to access the data held on the MusicBrainz server.
-      This is useful for adding MusicBrainz lookup capabilities to other
-      applications.
-    </para>
-
-    <para>
-      MusicBrainz is a community music metadatabase that attempts to create
-      a comprehensive music information site. You can use the MusicBrainz data
-      either by browsing the web site, or you can access the data from a client
-      program &mdash; for example, a CD player program can use MusicBrainz to
-      identify CDs and provide information about the CD, about the artist or
-      other related information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmusicbrainz-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmusicbrainz-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmusicbrainz-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmusicbrainz-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmusicbrainz-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmusicbrainz-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmusicbrainz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional to Build the Python Bindings</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmusicbrainz</title>
-
-    <para>
-      Install <application>libmusicbrainz</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &amp;&amp;
-
-CXXFLAGS="${CXXFLAGS:--O2 -g} -std=c++98" \
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If <application>Python</application> is installed, build the bindings
-      with the following commands:
-    </para>
-
-<screen><userinput>(cd python &amp;&amp; python2 setup.py build)</userinput></screen>
-
-    <para>
-      This package does not come with a stand-alone test suite (to
-      test you must have <application>Python</application> installed and perform
-      the test after the package is installed).
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D docs/mb_howto.txt \
-    /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;/mb_howto.txt</userinput></screen>
-
-    <para>
-      To test the Python bindings, issue the following:
-      <command>(cd python &amp;&amp; python2 setup.py test)</command>.
-    </para>
-
-    <para>
-      If you built the Python bindings, issue the following commands as
-      the <systemitem class="username">root</systemitem> user to install
-      them:
-    </para>
-
-<screen role="root"><userinput>(cd python &amp;&amp; python2 setup.py install)</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libmusicbrainz.so</seg>
-        <seg>/usr/include/musicbrainz and
-        /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmusicbrainz-lib">
-        <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
-          </para>
-          <indexterm zone="libmusicbrainz libmusicbrainz-lib">
-            <primary sortas="c-libmusicbrainz">libmusicbrainz.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libmusicbrainz5.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmusicbrainz5-download-http "https://github.com/metabrainz/libmusicbrainz/releases/download/release-&libmusicbrainz5-version;/libmusicbrainz-&libmusicbrainz5-version;.tar.gz">
-  <!ENTITY libmusicbrainz5-download-ftp  " ">
-  <!ENTITY libmusicbrainz5-md5sum        "4cc5556aa40ff7ab8f8cb83965535bc3">
-  <!ENTITY libmusicbrainz5-size          "76 KB">
-  <!ENTITY libmusicbrainz5-buildsize     "6.6 MB (additional 4.4 MB for the API documentation)">
-  <!ENTITY libmusicbrainz5-time          "0.1 SBU">
-]>
-
-<sect1 id="libmusicbrainz5" xreflabel="libmusicbrainz-&libmusicbrainz5-version;">
-  <?dbhtml filename="libmusicbrainz5.html"?>
-
-
-  <title>libmusicbrainz-&libmusicbrainz5-version;</title>
-
-  <indexterm zone="libmusicbrainz5">
-    <primary sortas="a-libmusicbrainz5">libmusicbrainz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmusicbrainz</title>
-
-    <para>
-      The <application>libmusicbrainz</application> package contains a library
-      which allows you to access the data held on the MusicBrainz server.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmusicbrainz5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmusicbrainz5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmusicbrainz5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmusicbrainz5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmusicbrainz5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmusicbrainz5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libmusicbrainz-&libmusicbrainz5-version;-cmake_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmusicbrainz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="neon"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmusicbrainz</title>
-
-<!-- No longer works with 3.18 because wildcard support has been removed.
-    <para>
-      First, fix an issue appeared with recent version of cmake:
-    </para>
-
-<screen><userinput>sed -i 's/\*\.inc/"$(echo *.inc)"/' src/CMakeLists.txt</userinput></screen>
--->
-
-    <para>
-      First, fix a problem caused by CMake-3.18.0 and later:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libmusicbrainz-&libmusicbrainz5-version;-cmake_fixes-1.patch</userinput></screen>
-
-    <para>
-      Fix also a problem caused by libxml-2.12.x:
-    </para>
-
-<screen><userinput>sed -e 's/xmlErrorPtr /const xmlError */'     \
-    -i src/xmlParser.cc</userinput></screen>
-
-    <para>
-      Install <application>libmusicbrainz</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 .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="doxygen"/>, optionally build the API
-      documentation:
-    </para>
-
-<screen remap="doc"><userinput>doxygen ../Doxyfile</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>
-
-    <para>
-      If you have built the API documentation, install, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>rm -rf /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version; &amp;&amp;
-cp -vr docs/ /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libmusicbrainz5.so
-        </seg>
-        <seg>
-          /usr/include/libmusicbrainz5 and
-          /usr/share/doc/libmusicbrainz-&libmusicbrainz5-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmusicbrainz5-lib">
-        <term><filename class="libraryfile">libmusicbrainz5.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for accessing the MusicBrainz database
-          </para>
-          <indexterm zone="libmusicbrainz5 libmusicbrainz5-lib">
-            <primary sortas="c-libmusicbrainz5">libmusicbrainz5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/libdriv/libogg.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,142 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libogg" xreflabel="libogg-&libogg-version;">
+<?dbhtml filename="libogg.html" dir="multimedia"?>
+<title>libogg-&libogg-version;</title>
 
-  <!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-size          "420 KB">
-  <!ENTITY libogg-buildsize     "3.5 MB (with tests)">
-  <!ENTITY libogg-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libogg" xreflabel="libogg-&libogg-version;">
-  <?dbhtml filename="libogg.html"?>
-
-
-  <title>libogg-&libogg-version;</title>
-
-  <indexterm zone="libogg">
-    <primary sortas="a-Libogg">Libogg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libogg</title>
-
-    <para>
-      The <application>libogg</application> package contains the Ogg file
-      structure. This is useful for creating (encoding) or playing (decoding) a
-      single physical bit stream.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libogg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libogg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libogg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libogg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libogg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libogg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libogg</title>
-
-    <para>
-      Install <application>libogg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libogg-&libogg-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libogg.so</seg>
-        <seg>/usr/include/ogg and /usr/share/doc/libogg-&libogg-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libogg-lib">
-        <term><filename class="libraryfile">libogg.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions required for programs to
-            read or write Ogg formatted bit streams
-          </para>
-          <indexterm zone="libogg libogg-lib">
-            <primary sortas="c-libogg">libogg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libogg-intro;
+&libogg-inst;
+&libogg-config;
+&libogg-desc;
 
 </sect1>
+
Index: ltimedia/libdriv/libplacebo.xml
===================================================================
--- multimedia/libdriv/libplacebo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libplacebo-download-http "https://github.com/haasn/libplacebo/archive/v&libplacebo-version;/libplacebo-&libplacebo-version;.tar.gz">
-  <!ENTITY libplacebo-download-ftp  " ">
-  <!ENTITY libplacebo-md5sum        "4f5b743ec43c684e6da0d56efed3891c">
-  <!ENTITY libplacebo-size          "824 KB">
-  <!ENTITY libplacebo-buildsize     "34 MB">
-  <!ENTITY libplacebo-time          "0.1 SBU (With tests, both using parallelism=4">
-]>
-
-<sect1 id="libplacebo" xreflabel="libplacebo-&libplacebo-version;">
-  <?dbhtml filename="libplacebo.html"?>
-
-  <title>libplacebo-&libplacebo-version;</title>
-
-  <indexterm zone="libplacebo">
-    <primary sortas="a-libplacebo">libplacebo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libplacebo</title>
-
-    <para>
-      The <application>libplacebo</application> package contains a library for
-      processing image and video primitives and shaders. It also includes a
-      high quality rendering pipeline that supports OpenGL and Vulkan.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libplacebo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libplacebo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libplacebo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libplacebo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libplacebo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libplacebo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libplacebo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ffmpeg"/> and
-      <xref linkend="glad"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glslang"/> and
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lcms2"/>
-      <xref linkend="libunwind"/>,
-      <ulink url="https://github.com/quietvoid/dovi_tool/">dovi_tool</ulink>,
-      <ulink url="https://github.com/Immediate-Mode-UI/Nuklear">Nuklear</ulink>, and
-      <ulink url="https://github.com/Cyan4973/xxHash">xxHash</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libplacebo</title>
-
-    <para>
-      Install <application>libplacebo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dtests=true        \
-      -Ddemos=false       &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      One test, opengl_surfaceless.c, is known to fail.
-    </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>-Ddemos=false</parameter>: This switch disables building
-      the demo programs because building <application>plplay</application> is
-      currently broken.
-    </para>
-
-    <para>
-      <parameter>-Dtests=true</parameter>: This switch enables building the
-      code necessary to run the tests.
-    </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>
-          libplacebo.so
-        </seg>
-        <seg>
-          /usr/include/libplacebo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libplacebo-lib">
-        <term><filename class="libraryfile">libplacebo.so</filename></term>
-        <listitem>
-          <para>
-            processes image and video primitives and shaders and provides a
-            high quality rendering pipeline for OpenGL and Vulkan
-          </para>
-          <indexterm zone="libplacebo libplacebo-lib">
-            <primary sortas="c-libplacebo">libplacebo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: ltimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,358 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libquicktime-download-http "&sourceforge-dl;/libquicktime/libquicktime-&libquicktime-version;.tar.gz">
-  <!ENTITY libquicktime-download-ftp  " ">
-  <!ENTITY libquicktime-md5sum        "81cfcebad9b7ee7e7cfbefc861d6d61b">
-  <!ENTITY libquicktime-size          "1.0 MB">
-  <!ENTITY libquicktime-buildsize     "20 MB">
-  <!ENTITY libquicktime-time          "0.7 SBU (includes building all codec modules)">
-]>
-
-<sect1 id="libquicktime" xreflabel="libquicktime-&libquicktime-version;">
-  <?dbhtml filename="libquicktime.html"?>
-
-
-  <title>libquicktime-&libquicktime-version;</title>
-
-  <indexterm zone="libquicktime">
-    <primary sortas="a-libquicktime">libquicktime</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libquicktime</title>
-
-    <para>
-      The <application>libquicktime</application> package contains the
-      <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
-      writing files in the QuickTime format. The goal of the project is to
-      enhance, while providing compatibility with the
-      <application>Quicktime 4 Linux</application> library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libquicktime-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libquicktime-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libquicktime-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libquicktime-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libquicktime-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libquicktime-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg4-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">libquicktime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="faac"/>,
-      <xref linkend="faad2"/>,
-      <!--<xref linkend="ffmpeg"/>,-->
-      <xref linkend="gtk2"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="libdv"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="x264"/>,
-      <xref linkend="xorg7-lib"/>, and
-      <ulink url="https://launchpad.net/schroedinger">Schroedinger</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libquicktime</title>
-
-    <para>
-      Install <application>libquicktime</application> by running the
-      following commands:
-    </para>
-    <!--
-<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg4-1.patch &amp;&amp;
-    -->
-<screen><userinput>./configure --prefix=/usr     \
-            --enable-gpl      \
-            --without-doxygen \
-            --without-ffmpeg  \
-            --docdir=/usr/share/doc/libquicktime-&libquicktime-version;
-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;
-
-install -v -m755 -d /usr/share/doc/libquicktime-&libquicktime-version; &amp;&amp;
-install -v -m644    README doc/{*.txt,*.html,mainpage.incl} \
-                    /usr/share/doc/libquicktime-&libquicktime-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-gpl</parameter>: Changes the licence to GPL. This
-      enables some extra plugins, such as FAAC, FAAD2, and x264.
-    </para>
-
-    <para>
-      <parameter>--without-doxygen</parameter>: This is necessary if you do not
-      have <application>Doxygen</application>, omit this if it is installed and
-      you wish the API documentation installed.
-    </para>
-
-    <para>
-      <parameter>--without-ffmpeg</parameter>: This switch disables ffmpeg
-      support because it is incompatible with ffmpeg-5.
-    </para>
-
-    <para>
-      <option>--with-libdv</option>: Build with libdv support.
-      Not enabled by default.
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libquicktime_config, lqtplay, lqtremux, lqt_transcode,
-          qt2text, qtdechunk, qtdump, qtinfo, qtrechunk, qtstreamize, and
-          qtyuv4toyuv
-        </seg>
-        <seg>
-          libquicktime.so and several plugin codec libraries
-        </seg>
-        <seg>
-          /usr/include/lqt,
-          /usr/lib/libquicktime, and
-          /usr/share/doc/libquicktime-&libquicktime-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libquicktime_config">
-        <term><command>libquicktime_config</command></term>
-        <listitem>
-          <para>
-            is a graphical front end to examine and configure the available
-            <application>libquicktime</application> audio and video codecs
-          </para>
-          <indexterm zone="libquicktime libquicktime_config">
-            <primary sortas="b-libquicktime_config">libquicktime_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lqtplay">
-        <term><command>lqtplay</command></term>
-        <listitem>
-          <para>
-            is a simple QuickTime movie player for X Window System
-          </para>
-          <indexterm zone="libquicktime lqtplay">
-            <primary sortas="b-lqtplay">lqtplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="lqtremux">
-        <term><command>lqtremux</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="libquicktime lqtremux">
-            <primary sortas="b-lqtremux">lqtremux</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="lqt_transcode">
-        <term><command>lqt_transcode</command></term>
-        <listitem>
-          <para>
-            is a command-line program used to encode video and/or audio
-            files from one format to another
-          </para>
-          <indexterm zone="libquicktime lqt_transcode">
-            <primary sortas="b-lqt_transcode">lqt_transcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qt2text">
-        <term><command>qt2text</command></term>
-        <listitem>
-          <para>
-            is used to dump all text strings from a quicktime file
-          </para>
-          <indexterm zone="libquicktime qt2text">
-            <primary sortas="b-qt2text">qt2text</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdechunk">
-        <term><command>qtdechunk</command></term>
-        <listitem>
-          <para>
-            can take movies containing rgb frames and write them out as
-            ppm images
-          </para>
-          <indexterm zone="libquicktime qtdechunk">
-            <primary sortas="b-qtdechunk">qtdechunk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdump">
-        <term><command>qtdump</command></term>
-        <listitem>
-          <para>
-            displays the parsed contents of the provided file
-          </para>
-          <indexterm zone="libquicktime qtdump">
-            <primary sortas="b-qtdump">qtdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtinfo">
-        <term><command>qtinfo</command></term>
-        <listitem>
-          <para>
-            prints various pieces of metadata parsed by the libquicktime
-            library for the provided file
-          </para>
-          <indexterm zone="libquicktime qtinfo">
-            <primary sortas="b-qtinfo">qtinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtrechunk">
-        <term><command>qtrechunk</command></term>
-        <listitem>
-          <para>
-            concatenates input frames into a QuickTime movie
-          </para>
-          <indexterm zone="libquicktime qtrechunk">
-            <primary sortas="b-qtrechunk">qtrechunk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtstreamize">
-        <term><command>qtstreamize</command></term>
-        <listitem>
-          <para>
-            is used to make a file streamable by placing the moov header at the
-            beginning of the file
-          </para>
-          <indexterm zone="libquicktime qtstreamize">
-            <primary sortas="b-qtstreamize">qtstreamize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtyuv4toyuv">
-        <term><command>qtyuv4toyuv</command></term>
-        <listitem>
-          <para>
-            is used to write a YUV4 encoded movie as a planar YUV 4:2:0
-            file
-          </para>
-          <indexterm zone="libquicktime qtyuv4toyuv">
-            <primary sortas="b-qtyuv4toyuv">qtyuv4toyuv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libquicktime-lib">
-        <term><filename class="libraryfile">libquicktime.so</filename></term>
-        <listitem>
-          <para>
-            is a library for reading and writing QuickTime files. It provides
-            convenient access to QuickTime files with a variety of supported
-            codecs. The library contains new functions integrated with all the
-            original QuickTime 4 Linux library functions used to encode and
-            decode QuickTime files
-          </para>
-          <indexterm zone="libquicktime libquicktime-lib">
-            <primary sortas="c-libquicktime">libquicktime.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libsamplerate.xml
===================================================================
--- multimedia/libdriv/libsamplerate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsamplerate-download-http
-  "https://github.com/libsndfile/libsamplerate/releases/download/&libsamplerate-version;/libsamplerate-&libsamplerate-version;.tar.xz">
-  <!ENTITY libsamplerate-download-ftp  " ">
-  <!ENTITY libsamplerate-md5sum        "97c010fc25156c33cddc272c1935afab">
-  <!ENTITY libsamplerate-size          "3.2 MB">
-  <!ENTITY libsamplerate-buildsize     "15 MB (add 2 MB for tests)">
-  <!ENTITY libsamplerate-time          "less than 0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libsamplerate" xreflabel="libsamplerate-&libsamplerate-version;">
-  <?dbhtml filename="libsamplerate.html"?>
-
-
-  <title>libsamplerate-&libsamplerate-version;</title>
-
-  <indexterm zone="libsamplerate">
-    <primary sortas="a-libsamplerate">libsamplerate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsamplerate</title>
-
-    <para>
-      <application>libsamplerate</application> is a sample rate converter
-      for audio.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsamplerate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsamplerate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsamplerate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsamplerate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsamplerate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsamplerate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsamplerate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-       <xref linkend="alsa-lib"/>,
-       <xref linkend='libsndfile'/>, and
-       <xref linkend="fftw"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsamplerate</title>
-
-    <para>
-      Install <application>libsamplerate</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libsamplerate-&libsamplerate-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libsamplerate.so</seg>
-        <seg>/usr/share/doc/libsamplerate-&libsamplerate-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sndfile-resample">
-        <term><command>sndfile-resample</command></term>
-        <listitem>
-          <para>
-            is a sample rate converter using libsndfile for file I/O.
-          </para>
-          <indexterm zone="libsamplerate sndfile-resample">
-            <primary sortas="b-sndfile-resample">sndfile-resample</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>-->
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libsndfile.xml
===================================================================
--- multimedia/libdriv/libsndfile.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,289 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsndfile-download-http
-    "https://github.com/libsndfile/libsndfile/releases/download/&libsndfile-version;/libsndfile-&libsndfile-version;.tar.xz">
-  <!ENTITY libsndfile-download-ftp  " ">
-  <!ENTITY libsndfile-md5sum        "04e2e6f726da7c5dc87f8cf72f250d04">
-  <!ENTITY libsndfile-size          "716 KB">
-  <!ENTITY libsndfile-buildsize     "12 MB (add 10 MB for tests)">
-  <!ENTITY libsndfile-time          "0.3 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libsndfile" xreflabel="libsndfile-&libsndfile-version;">
-  <?dbhtml filename="libsndfile.html"?>
-
-
-  <title>libsndfile-&libsndfile-version;</title>
-
-  <indexterm zone="libsndfile">
-    <primary sortas="a-libsndfile">libsndfile</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsndfile</title>
-
-    <para>
-      <application>Libsndfile</application> is a library of C routines for
-      reading and writing files containing sampled audio data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsndfile-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsndfile-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsndfile-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsndfile-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsndfile-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsndfile-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsndfile Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="flac"/>,
-      <xref linkend="opus"/>, and
-      <xref linkend="libvorbis"/><!-- brings in libogg -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="mpg123"/>,
-      <xref linkend="speex"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsndfile</title>
-
-    <para>
-      Install <application>libsndfile</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --docdir=/usr/share/doc/libsndfile-&libsndfile-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          sndfile-cmp,
-          sndfile-concat,
-          sndfile-convert,
-          sndfile-deinterleave,
-          sndfile-info,
-          sndfile-interleave,
-          sndfile-metadata-get,
-          sndfile-metadata-set,
-          sndfile-play, and
-          sndfile-salvage
-        </seg>
-        <seg>libsndfile.so</seg>
-        <seg>/usr/share/doc/libsndfile-&libsndfile-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sndfile-cmp">
-        <term><command>sndfile-cmp</command></term>
-        <listitem>
-          <para>
-            compares two audio files
-          </para>
-          <indexterm zone="libsndfile sndfile-cmp">
-            <primary sortas="b-sndfile-cmp">sndfile-cmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-concat">
-        <term><command>sndfile-concat</command></term>
-        <listitem>
-          <para>
-            concatenates two or more audio files
-          </para>
-          <indexterm zone="libsndfile sndfile-concat">
-            <primary sortas="b-sndfile-concat">sndfile-concat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-convert">
-        <term><command>sndfile-convert</command></term>
-        <listitem>
-          <para>
-            converts a sound file from one format to another
-          </para>
-          <indexterm zone="libsndfile sndfile-convert">
-            <primary sortas="b-sndfile-convert">sndfile-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-deinterleave">
-        <term><command>sndfile-deinterleave</command></term>
-        <listitem>
-          <para>
-            splits a multi-channel into multiple single channel files
-          </para>
-          <indexterm zone="libsndfile sndfile-deinterleave">
-            <primary sortas="b-sndfile-deinterleave">sndfile-deinterleave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-info">
-        <term><command>sndfile-info</command></term>
-        <listitem>
-          <para>
-            displays information about a sound file
-          </para>
-          <indexterm zone="libsndfile sndfile-info">
-            <primary sortas="b-sndfile-info">sndfile-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-interleave">
-        <term><command>sndfile-interleave</command></term>
-        <listitem>
-          <para>
-            converts multiple single channel files into a multi-channel file
-          </para>
-          <indexterm zone="libsndfile sndfile-interleave">
-            <primary sortas="b-sndfile-interleave">sndfile-interleave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-metadata-get">
-        <term><command>sndfile-metadata-get</command></term>
-        <listitem>
-          <para>
-            retrieves metadata from a sound file
-          </para>
-          <indexterm zone="libsndfile sndfile-metadata-get">
-            <primary sortas="b-sndfile-metadata-get">sndfile-metadata-get</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-metadata-set">
-        <term><command>sndfile-metadata-set</command></term>
-        <listitem>
-          <para>
-            sets metadata in a sound file
-          </para>
-          <indexterm zone="libsndfile sndfile-metadata-set">
-            <primary sortas="b-sndfile-metadata-set">sndfile-metadata-set</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-play">
-        <term><command>sndfile-play</command></term>
-        <listitem>
-          <para>
-            plays a sound file
-          </para>
-          <indexterm zone="libsndfile sndfile-play">
-            <primary sortas="b-sndfile-play">sndfile-play</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sndfile-salvage">
-        <term><command>sndfile-salvage</command></term>
-        <listitem>
-          <para>
-            salvages the audio data from WAV files which are more than
-            4GB in size
-          </para>
-          <indexterm zone="libsndfile sndfile-salvage">
-            <primary sortas="b-sndfile-salvage">sndfile-salvage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsndfile-lib">
-        <term><filename class="libraryfile">libsndfile.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libsndfile</application> API functions
-          </para>
-          <indexterm zone="libsndfile libsndfile-lib">
-            <primary sortas="c-libsndfile">libsndfile.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libva.xml
===================================================================
--- multimedia/libdriv/libva.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,203 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libva-version                "2.21.0">
-
-  <!ENTITY libva-download-http "https://github.com/intel/libva/archive/&libva-version;/libva-&libva-version;.tar.gz">
-  <!ENTITY libva-download-ftp  " ">
-  <!ENTITY libva-md5sum        "2038f5b79612c1767ecd9bc281cd4189">
-  <!ENTITY libva-size          "275 KB">
-  <!ENTITY libva-buildsize     "2.9 MB">
-  <!ENTITY libva-time          "less than 0.1 SBU">
-]>
-
-  <sect1 id="libva" xreflabel="libva-&libva-version;">
-  <?dbhtml filename="libva.html"?>
-
-    <sect1info>
-      <date>$Date$</date>
-    </sect1info>
-
-    <title>libva-&libva-version;</title>
-
-    <indexterm zone="libva">
-      <primary sortas="a-libva">libva</primary>
-    </indexterm>
-
-    <sect2 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>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect3">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="sect3">libva Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-env"/> and
-        <xref linkend="libdrm"/>
-      </para>
-
-      <bridgehead renderas="sect4">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="mesa"/>
-      </para>
-
-      <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-      <!-- "nodep" to prevent BLFS tool from blindly installing all the
-           drivers -->
-      <para role='nodep'>
-        The VA API driver suitable for the hardware in your system:
-        <xref linkend='intel-vaapi-driver'/> (for Intel GPUs provided with
-        Haswell CPUs or earlier),
-        <xref linkend='intel-media'/> (for Intel GPUs provided with
-        Broadwell CPUs or later), and
-        <xref linkend='mesa'/> (providing the <literal>r600</literal>,
-        <literal>radeonsi</literal>, and <literal>nouveau</literal> VA API
-        drivers, for the ATI/AMD Radeon HD 2xxx GPUs and later, and
-        <ulink url='https://nouveau.freedesktop.org/VideoAcceleration.html'>
-supported
-        NVIDIA GPUs</ulink>; there is a circular dependency, read the Mesa page
-        for information on how to break it)
-      </para>
-
-      <bridgehead renderas="sect4">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>
-
-    </sect2>
-
-    <sect2 role="installation">
-      <title>Installation of libva</title>
-      <!-- libva*.so.2 have been around for a long time...
-      <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>
-
-<screen><userinput>cd build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX --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="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</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>
-            $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>
-
-    </sect2>
-
-  </sect1>
Index: ltimedia/libdriv/libvdpau-va-gl.xml
===================================================================
--- multimedia/libdriv/libvdpau-va-gl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,191 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libvdpau-va-gl-version       "0.4.2">
-
-  <!ENTITY libvdpau-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/archive/v&libvdpau-va-gl-version;/libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz">
-  <!ENTITY libvdpau-va-gl-download-ftp  " ">
-  <!ENTITY libvdpau-va-gl-md5sum        "8db21dcfd5cd14c6ec51b992e20369dc">
-  <!ENTITY libvdpau-va-gl-size          "120 KB">
-  <!ENTITY libvdpau-va-gl-buildsize     "4.9 MB">
-  <!ENTITY libvdpau-va-gl-time          "less than 0.1 SBU (add 1.1 SBU for tests)">
-]>
-
-  <sect1 id="libvdpau-va-gl" xreflabel="libvdpau-va-gl-&libvdpau-va-gl-version;">
-  <?dbhtml filename="libvdpau-va-gl.html"?>
-
-    <sect1info>
-      <date>$Date$</date>
-    </sect1info>
-
-    <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>
-
-    <sect2 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>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect3">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="sect3">libvdpau-va-gl Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cmake"/>,
-        <xref linkend="libvdpau"/>,
-        <xref linkend="libva"/>, and
-        <xref linkend="mesa"/>
-      </para>
-
-      <bridgehead renderas="sect4">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>,
-        <xref linkend="graphviz"/>, and
-        <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
-      </para>
-
-    </sect2>
-
-    <sect2 role="installation">
-      <title>Installation of libvdpau-va-gl</title>
-
-      <para>
-        Install <application>libvdpau-va-gl</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$XORG_PREFIX .. &amp;&amp;
-make</userinput></screen>
-
-      <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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect2>
-
-<!--
-    <sect2 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -e '/#include &lt;stdlib.h&gt;/a #include &lt;string&gt;' ...</command>:
-        fix the build for the C++ Standard Library header changes in gcc-13.
-      </para>
-
-    </sect2>
--->
-
-    <sect2 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>
-
-<screen role="root"><userinput>echo "export VDPAU_DRIVER=va_gl" >> /etc/profile.d/xorg.sh</userinput></screen>
-
-    </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>
-            libvdpau_va_gl.so
-          </seg>
-          <seg>
-            None
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect2">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <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>
-
-    </sect2>
-
-  </sect1>
Index: ltimedia/libdriv/libvdpau.xml
===================================================================
--- multimedia/libdriv/libvdpau.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,205 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libvdpau-version        "1.5">
-
-  <!ENTITY libvdpau-download-http "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/&libvdpau-version;/libvdpau-&libvdpau-version;.tar.bz2">
-  <!ENTITY libvdpau-download-ftp  " ">
-  <!ENTITY libvdpau-md5sum        "148a192110e7a49d62c0bf9ef916c099">
-  <!ENTITY libvdpau-size          "140 KB">
-  <!ENTITY libvdpau-buildsize     "4.6 MB (with tests)">
-  <!ENTITY libvdpau-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect1 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
-  <?dbhtml filename="libvdpau.html"?>
-
-    <sect1info>
-      <date>$Date$</date>
-    </sect1info>
-
-    <title>libvdpau-&libvdpau-version;</title>
-
-    <indexterm zone="libvdpau">
-      <primary sortas="a-libvdpau">libvdpau</primary>
-    </indexterm>
-
-    <sect2 role="package">
-      <title>Introduction to libvdpau</title>
-
-      <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>
-        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>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect3">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="sect3">libvdpau Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg7-lib"/>
-      </para>
-
-      <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-      <!-- "nodep" to prevent BLFS tool from blindly installing all the
-           drivers -->
-      <para role='nodep'>
-        The VDPAU driver suitable for the hardware in your system:
-        <xref linkend='libvdpau-va-gl'/> (for Intel GPUs) and
-        <xref linkend='mesa'/> (providing the <literal>r600</literal>,
-        <literal>radeonsi</literal>, and <literal>nouveau</literal> VDPAU
-        drivers, for the ATI/AMD Radeon HD 2xxx GPUs and later, and
-        <ulink url='https://nouveau.freedesktop.org/VideoAcceleration.html'>
-supported
-        NVIDIA GPUs</ulink>; Mesa must be built after this package for these
-        drivers)
-      </para>
-
-      <bridgehead renderas="sect4">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>,
-        <xref linkend="graphviz"/>, and
-        <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
-      </para>
-
-    </sect2>
-
-    <sect2 role="installation">
-      <title>Installation of libvdpau</title>
-
-      <para>
-        Install <application>libvdpau</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX .. &amp;&amp;
-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>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-      <para>
-        If <application>doxygen</application> is present at build time
-        place the documentation in a versioned directory as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>[ -e $XORG_PREFIX/share/doc/libvdpau ] &amp;&amp; mv -v $XORG_PREFIX/share/doc/libvdpau{,&libvdpau-version;}</userinput></screen>
-
-    </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>
-            libvdpau.so
-          </seg>
-          <seg>
-            $XORG_PREFIX/{include,lib}/vdpau
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect2">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>
-
-      </variablelist>
-
-    </sect2>
-
-  </sect1>
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/libdriv/libvorbis.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,173 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="libvorbis" xreflabel="libvorbis-&libvorbis-version;">
+<?dbhtml filename="libvorbis.html" dir="multimedia"?>
+<title>libvorbis-&libvorbis-version;</title>
 
-  <!ENTITY libvorbis-download-http "https://downloads.xiph.org/releases/vorbis/libvorbis-&libvorbis-version;.tar.xz">
-  <!ENTITY libvorbis-download-ftp  " ">
-  <!ENTITY libvorbis-md5sum        "50902641d358135f06a8392e61c9ac77">
-  <!ENTITY libvorbis-size          "1.1 MB">
-  <!ENTITY libvorbis-buildsize     "15 MB">
-  <!ENTITY libvorbis-time          "0.1 SBU">
-]>
-
-<sect1 id="libvorbis" xreflabel="libvorbis-&libvorbis-version;">
-  <?dbhtml filename="libvorbis.html"?>
-
-
-  <title>libvorbis-&libvorbis-version;</title>
-
-  <indexterm zone="libvorbis">
-    <primary sortas="a-Libvorbis">Libvorbis</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libvorbis</title>
-
-    <para>
-      The <application>libvorbis</application> package contains a general
-      purpose audio and music encoding format. This is useful for creating
-      (encoding) and playing (decoding) sound in an open (patent free)
-      format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvorbis-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvorbis-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvorbis-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvorbis-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvorbis-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvorbis-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libvorbis Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libogg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      (specifically, pdflatex and htlatex) to build the PDF documentation
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libvorbis</title>
-<!--
-    <para>
-      Optionally fix installation of the package when
-      <command>- -enable-docs</command> is added to the configure switches:
-    </para>
-
-<screen><userinput>sed -i '/components.png \\/{n;d}' doc/Makefile.in</userinput></screen>
--->
-    <para>
-      Install <application>libvorbis</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 doc/Vorbis* /usr/share/doc/libvorbis-&libvorbis-version;</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>
-      <option>--enable-docs</option>: This switch enables building the
-      documentation in formats other than the supplied html.
-    </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>
-          libvorbis.so, libvorbisenc.so and libvorbisfile.so
-        </seg>
-        <seg>
-          /usr/include/vorbis and /usr/share/doc/libvorbis-&libvorbis-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvorbis-lib">
-        <term><filename class="libraryfile">libvorbis.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to read and write sound files
-          </para>
-          <indexterm zone="libvorbis libvorbis-lib">
-            <primary sortas="c-libvorbis">libvorbis.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libvorbis-intro;
+&libvorbis-inst;
+&libvorbis-config;
+&libvorbis-desc;
 
 </sect1>
Index: ltimedia/libdriv/libvpx.xml
===================================================================
--- multimedia/libdriv/libvpx.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,222 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libvpx-download-http "https://github.com/webmproject/libvpx/archive/v&libvpx-version;/libvpx-&libvpx-version;.tar.gz">
-  <!ENTITY libvpx-download-ftp  " ">
-  <!ENTITY libvpx-md5sum        "026bc289d916624dabdfd713c1c5b69a">
-  <!ENTITY libvpx-size          "5.3 MB">
-  <!ENTITY libvpx-buildsize     "67 MB (add 1.6 GB for tests)">
-  <!ENTITY libvpx-time          "0.5 SBU (Using parallelism=4; add approx 13 SBU for tests using parallelism=4, including download time)">
-]>
-
-<sect1 id="libvpx" xreflabel="libvpx-&libvpx-version;">
-  <?dbhtml filename="libvpx.html"?>
-
-
-  <title>libvpx-&libvpx-version;</title>
-
-  <indexterm zone="libvpx">
-    <primary sortas="a-libvpx">libvpx</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libvpx</title>
-
-    <para>
-      This package, from the WebM project, provides the reference
-      implementations of the VP8 Codec, used in most current html5 video,
-      and of the next-generation VP9 Codec.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvpx-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvpx-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvpx-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvpx-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvpx-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvpx-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libvpx Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="yasm"/> or <xref role="nodep" linkend="nasm"/>, and
-      <xref linkend="which"/> (so <command>configure</command> can find yasm)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/> (to download test files) and
-      <xref linkend="doxygen"/> (to build documentation)
-    </para>
-
-    &test-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libvpx</title>
-
-    <para>
-      Install <application>libvpx</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's/cp -p/cp/' build/make/Makefile &amp;&amp;
-
-mkdir libvpx-build            &amp;&amp;
-cd    libvpx-build            &amp;&amp;
-
-../configure --prefix=/usr    \
-             --enable-shared  \
-             --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>LD_LIBRARY_PATH=. make test</command>.
-      The test suite downloads many files as part of its test process.
-      A few parts of it will use all available cores.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... </command>: This command
-      corrects ownership and permissions of installed files.
-    </para>
-
-    <para>
-      <command>mkdir libvpx-build &amp;&amp; cd libvpx-build</command>:
-      The <application>libvpx</application> developers
-      recommend building in a dedicated build directory.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--disable-vp8</option>: This switch prevents building of VP8
-      codec support.
-    </para>
-
-    <para>
-      <option>--disable-vp9</option>: This switch prevents building of VP9
-      codec support.
-    </para>
-
-    <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 test suite
-      to use the library that was just built.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>vpxdec and vpxenc</seg>
-        <seg>libvpx.so</seg>
-        <seg>/usr/include/vpx</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vpxdec">
-        <term><command>vpxdec</command></term>
-        <listitem>
-          <para>
-            is the WebM Project VP8 and VP9 decoder
-          </para>
-          <indexterm zone="libvpx vpxdec">
-            <primary sortas="b-vpxdec">vpxdec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vpxenc">
-        <term><command>vpxenc</command></term>
-        <listitem>
-          <para>
-            is the WebM project VP8 and VP9 encoder
-          </para>
-          <indexterm zone="libvpx vpxenc">
-            <primary sortas="b-vpxenc">vpxenc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvpx-lib">
-        <term><filename class="libraryfile">libvpx.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to use the VP8 and VP9 video codecs
-          </para>
-          <indexterm zone="libvpx libvpx-lib">
-            <primary sortas="c-libvpx">libvpx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/mlt.xml
===================================================================
--- multimedia/libdriv/mlt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "9f747ae1b7388937be6328b4c234431b">
-  <!ENTITY mlt-size          "1.6 MB">
-  <!ENTITY mlt-buildsize     "30 MB">
-  <!ENTITY mlt-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="mlt" xreflabel="mlt-&mlt-version;">
-  <?dbhtml filename="mlt.html"?>
-
-
-  <title>MLT-&mlt-version;</title>
-
-  <indexterm zone="mlt">
-    <primary sortas="a-mlt">MLT</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MLT</title>
-
-    <para>
-      <application>MLT</application> package is the Media Lovin Toolkit.
-      It is an open source multimedia framework, designed and developed for
-      television broadcasting. It provides a toolkit for broadcasters, video
-      editors, media players, transcoders, web streamers and many more types of
-      applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mlt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mlt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mlt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mlt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mlt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mlt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MLT Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para>
-      <xref linkend='frei0r'/> and
-      &qt5-deps;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>
-      <xref linkend='doxygen'/>,
-      <xref linkend='fftw'/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="sdl2"/>,
-      <ulink url="https://jackaudio.org">JACK</ulink>,
-      <ulink url="https://www.ipswitch.com/moveit/">MOVEit</ulink>,
-      <ulink url="https://sox.sourceforge.net/">SoX</ulink>, and
-      <ulink url="http://public.hronopik.de/vid.stab/">vid.stab</ulink>
-
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MLT</title>
-
-    <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;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite. However a test .mp4
-      file can be played in a local graphical environment with
-      <command>./out/bin/melt &lt;filename&gt;.mp4</command>.
-    </para>
-
-    <note>
-      <para>
-        This application uses advanced graphical capabilities.  In
-        some cases, firmware for your specific graphics adaptor may be needed.
-        See <xref linkend="video-firmware"/> for more information.
-      </para>
-    </note>
-
-    <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>melt-7 and
-             melt (symlink to melt-7)</seg>
-        <seg>libmlt-7.so,
-             libmlt++-7.so, and
-             over twenty plugins</seg>
-        <seg>/usr/include/mlt-7,
-          <!-- Now in /usr/include/mlt-7, it seems
-             /usr/include/melt-7/mlt++,
-             /usr/include/melt-7/framework,-->
-             /usr/lib/mlt-7,
-             /usr/lib/cmake/Mlt7, and
-             /usr/share/mlt-7
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="melt">
-        <term><command>melt</command></term>
-        <listitem>
-          <para>
-            is a test tool for MLT
-          </para>
-          <indexterm zone="mlt melt">
-            <primary sortas="b-melt">melt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/opus.xml
===================================================================
--- multimedia/libdriv/opus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 opus-download-http "https://downloads.xiph.org/releases/opus/opus-&opus-version;.tar.gz">
-  <!ENTITY opus-download-ftp  " ">
-  <!ENTITY opus-md5sum        "c40b3a1fbdbb9a7aa178600b88200c76">
-  <!ENTITY opus-size          "7.4 MB">
-  <!ENTITY opus-buildsize     "33 MB (with tests)">
-  <!ENTITY opus-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="opus" xreflabel="Opus-&opus-version;">
-  <?dbhtml filename="opus.html"?>
-
-
-  <title>Opus-&opus-version;</title>
-
-  <indexterm zone="opus">
-    <primary sortas="a-Opus">Opus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Opus</title>
-
-    <para>
-      <application>Opus</application> is a lossy audio compression format
-      developed by the Internet Engineering Task Force (IETF) that is
-      particularly suitable for interactive speech and audio transmission over
-      the Internet. This package provides the Opus development library and
-      headers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Opus</title>
-
-    <para>
-      Install <application>Opus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr        \
-            --buildtype=release  \
-            -Ddocdir=/usr/share/doc/opus-&opus-version; &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>
-
-    <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 Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libopus.so
-        </seg>
-        <seg>
-          /usr/include/opus and /usr/share/doc/opus-&opus-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libopus">
-        <term><filename class="libraryfile">libopus.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to read and write Opus format
-          </para>
-          <indexterm zone="opus libopus">
-            <primary sortas="c-libopus">libopus.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/pipewire.xml
===================================================================
--- multimedia/libdriv/pipewire.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,608 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pipewire-download-http "https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/&pipewire-version;/pipewire-&pipewire-version;.tar.bz2">
-  <!ENTITY pipewire-download-ftp  " ">
-  <!ENTITY pipewire-md5sum        "c60c630dd31d0213a78bcebf06dfc6ed">
-  <!ENTITY pipewire-size          "1.6 MB">
-  <!ENTITY pipewire-buildsize     "75 MB (with tests)">
-  <!ENTITY pipewire-time          "0.6 SBU (with tests, both using parallelism=4)">
-]>
-
-<sect1 id="pipewire" xreflabel="pipewire-&pipewire-version;">
-  <?dbhtml filename="pipewire.html"?>
-
-
-  <title>Pipewire-&pipewire-version;</title>
-
-  <indexterm zone="pipewire">
-    <primary sortas="a-pipewire">pipewire</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pipewire</title>
-
-    <para>
-      The <application>pipewire</application> package contains a server and
-      userspace API to handle multimedia pipelines. This includes a universal
-      API to connect to multimedia devices, as well as sharing multimedia
-      files between applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pipewire-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pipewire-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pipewire-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pipewire-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pipewire-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pipewire-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/pipewire-&pipewire-version;-upstream_fix-1.patch"/>
-          (required to fix <quote>could not play camera stream</quote> error
-          from <xref linkend='snapshot'/>)
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Pipewire Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bluez"/>,
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="gstreamer10"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sbc"/>,
-      <xref linkend="v4l-utils"/>, and
-      <xref role="runtime" linkend="wireplumber"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="avahi"/>,
-      <xref linkend="fdk-aac"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libdrm"/> (for one example and libcamera support),
-      <xref linkend="libxcb"/>,
-      <xref linkend="libsndfile"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="opus"/>,
-      <xref linkend="sdl2"/> (for some examples),
-      <xref linkend="valgrind"/>,
-      <xref linkend="vulkan-loader"/>,
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="doxygen"/> and
-      <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://github.com/hoene/libmysofa">libmysofa</ulink>, and
-      <!--<ulink url="https://vulkan.lunarg.com/sdk/home/">Vulkan</ulink>, and-->
-      <ulink url="https://sourceforge.net/projects/xmltoman/">xmltoman</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/pipewire"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pipewire</title>
-
-<!--
-    <para>
-      If building <xref linkend='snapshot'/>, apply a patch to fix an issue
-      causing <xref linkend='snapshot'/> fail to play stream from some
-      cameras:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../pipewire-&pipewire-version;-upstream_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>pipewire</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                \
-      --prefix=/usr           \
-      --buildtype=release     \
-      -Dsession-managers="[]" &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the result, issue: <command>ninja test</command>.
-    </para>
-    <!--
-    <para>
-      If upgrading from an earlier release of Pipewire, it's needed to
-      remove any old binary executables that interfere with the
-      installation.  As the &root; user:
-    </para>
-
-<screen role='root'><userinput>rm -vf /usr/bin/pipewire-*</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"/>
-
-    <para>
-      <parameter>-Dsession-managers="[]"</parameter>: This switch
-      allows specifying the session managers to build as subprojects.
-      We specify an empty list to prevent <command>meson</command> from
-      downloading any external copy of the session managers. A Pipewire
-      session manager recommended by the PipeWire developers for general
-      use, <xref linkend="wireplumber" role="nodep"/>, is available as a
-      separate BLFS package.  Build it after installing Pipewire if you
-      need to run the Pipewire daemon (for example in order to support
-      <xref linkend="snapshot" role="nodep"/>).
-    </para>
-
-    <para>
-      <option>-Ddocs=true</option>: This switch enables the generation of HTML
-      documentation. The optional dependencies for documentation need to be
-      installed for this to work.
-    </para>
-
-    <para>
-      <option>-Dman=true</option>: This switch enables the generation of manual
-      pages. The optional dependencies for documentation need to be installed
-      for this to work.
-    </para>
-
-    <para>
-      <option>-Dffmpeg=enabled</option>: This switch enables using ffmpeg for
-      audio conversion as a SPA backend.
-    </para>
-
-    <para>
-      <option>-Dvulkan=enabled</option>: This switch enables using Vulkan for
-      video rendering as a SPA backend.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pipewire,
-          pw-cat,
-          pw-cli,
-          pw-config,
-          pw-dot,
-          pw-dump,
-          pw-jack,
-          pw-link,
-          pw-loopback,
-          pw-metadata,
-          pw-mididump,
-          pw-mon,
-          pw-profiler,
-          pw-reserve,
-          pw-top,
-          pw-v4l2,
-          spa-acp-tool,
-          spa-inspect,
-          spa-json-dump,
-          spa-monitor,
-          spa-resample, and
-          pipewire-aes67, pipewire-avb, pipewire-pulse (symlinks to pipewire),
-          pw-dsdplay, pw-encplay, pw-midiplay, pw-midirecord, pw-play,
-          pw-record (symlinks to pw-cat)
-        </seg>
-        <seg>
-          libpipewire-0.3.so and
-          60 modules below /usr/lib/pipewire-0.3 and /usr/lib/spa-0.2
-        </seg>
-        <seg>
-          /usr/include/pipewire-0.3,
-          /usr/include/spa-0.2,
-          /usr/lib/alsa-lib,
-          <!--/usr/lib/gstreamer-1.0, already installed by gstreamer-->
-          /usr/lib/pipewire-0.3,
-          /usr/lib/spa-0.2,
-          /usr/share/alsa-card-profile,
-          /usr/share/pipewire, and
-          /usr/share/spa-0.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pipewire-prog">
-        <term><command>pipewire</command></term>
-        <listitem>
-          <para>
-            is a service that allows access to multimedia devices and allows
-            sharing of multimedia files between applications
-          </para>
-          <indexterm zone="pipewire pipewire-prog">
-            <primary sortas="b-pipewire">pipewire</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pipewire-pulse">
-        <term><command>pipewire-pulse</command></term>
-        <listitem>
-          <para>
-            starts a Pulseaudio-compatible version of
-            the pipewire service
-          </para>
-          <indexterm zone="pipewire pipewire-pulse">
-            <primary sortas="b-pipewire-pulse">pipewire-pulse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-cat">
-        <term><command>pw-cat</command></term>
-        <listitem>
-          <para>
-            allows you to play or record media using a pipewire instance
-          </para>
-          <indexterm zone="pipewire pw-cat">
-            <primary sortas="b-pw-cat">pw-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-cli">
-        <term><command>pw-cli</command></term>
-        <listitem>
-          <para>
-            allows you to interact with a pipewire instance
-          </para>
-          <indexterm zone="pipewire pw-cli">
-            <primary sortas="b-pw-cli">pw-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-config">
-        <term><command>pw-config</command></term>
-        <listitem>
-          <para>
-            allows you to interact with pipewire's configuration system
-            for debugging purposes or syntax checking
-          </para>
-          <indexterm zone="pipewire pw-config">
-            <primary sortas="b-pw-config">pw-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-dot">
-        <term><command>pw-dot</command></term>
-        <listitem>
-          <para>
-            lists all of the daemons and objects in use by pipewire
-          </para>
-          <indexterm zone="pipewire pw-dot">
-            <primary sortas="b-pw-dot">pw-dot</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="pipewire pw-metadata">
-            <primary sortas="b-pw-metadata">pw-metadata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-mididump">
-        <term><command>pw-mididump</command></term>
-        <listitem>
-          <para>
-            dumps MIDI messages from a file to the screen
-          </para>
-          <indexterm zone="pipewire pw-mididump">
-            <primary sortas="b-pw-mididump">pw-mididump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-mon">
-        <term><command>pw-mon</command></term>
-        <listitem>
-          <para>
-            allows you to monitor pipewire instances
-          </para>
-          <indexterm zone="pipewire pw-mon">
-            <primary sortas="b-pw-mon">pw-mon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-profiler">
-        <term><command>pw-profiler</command></term>
-        <listitem>
-          <para>
-            tracks memory usage and API calls used by pipewire
-          </para>
-          <indexterm zone="pipewire pw-profiler">
-            <primary sortas="b-pw-profiler">pw-profiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pw-reserve">
-        <term><command>pw-reserve</command></term>
-        <listitem>
-          <para>
-            reserves or monitors a device via D-Bus
-          </para>
-          <indexterm zone="pipewire pw-reserve">
-            <primary sortas="b-pw-reserve">pw-reserve</primary>
-          </indexterm>
-        </listitem>
-      </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="pw-v4l2">
-        <term><command>pw-v4l2</command></term>
-        <listitem>
-          <para>
-            runs v4l2 applications on a pipewire instance
-          </para>
-          <indexterm zone="pipewire pw-v4l2">
-            <primary sortas="b-pw-v4l2">pw-v4l2</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
-          </para>
-          <indexterm zone="pipewire spa-acp-tool">
-            <primary sortas="b-spa-acp-tool">spa-acp-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spa-inspect">
-        <term><command>spa-inspect</command></term>
-        <listitem>
-          <para>
-            allows you to inspect pipewire plugins
-          </para>
-          <indexterm zone="pipewire spa-inspect">
-            <primary sortas="b-spa-inspect">spa-inspect</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="pipewire spa-monitor">
-            <primary sortas="b-spa-monitor">spa-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spa-resample">
-        <term><command>spa-resample</command></term>
-        <listitem>
-          <para>
-            resamples a given file
-          </para>
-          <indexterm zone="pipewire spa-resample">
-            <primary sortas="b-spa-resample">spa-resample</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpipewire">
-        <term><filename class="libraryfile">libpipewire-0.3.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling multimedia pipelines
-          </para>
-          <indexterm zone="pipewire libpipewire">
-            <primary sortas="c-libpipewire">libpipewire-0.3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!-- not in /usr/lib
-      <varlistentry id="libpulse">
-        <term><filename class="libraryfile">libpulse.so</filename></term>
-        <listitem>
-          <para>
-            is a pipewire plugin for pulseaudio.
-          </para>
-          <indexterm zone="pipewire libpulse">
-            <primary sortas="c-libpulse">libpulse.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpulse-simple">
-        <term><filename class="libraryfile">libpulse-simple.so</filename></term>
-        <listitem>
-          <para>
-            is a simplified version of the pulseaudio plugin for pipewire.
-          </para>
-          <indexterm zone="pipewire libpulse-simple">
-            <primary sortas="c-libpulse-simple">libpulse-simple.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasound_module_pcm_pipewire">
-        <term><filename class="libraryfile">libasound_module_pcm_pipewire.so</filename></term>
-        <listitem>
-          <para>
-            is an ALSA plugin for pipewire.
-          </para>
-          <indexterm zone="pipewire libasound_module_pcm_pipewire">
-            <primary sortas="c-libasound_module_pcm_pipewire">libasound_module_pcm_pipewire.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgstpipewire">
-        <term><filename class="libraryfile">libgstpipewire.so</filename></term>
-        <listitem>
-          <para>
-            is a Gstreamer plugin for pipewire.
-          </para>
-          <indexterm zone="pipewire libgstpipewire">
-            <primary sortas="c-libgstpipewire">libgstpipewire.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,530 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pulseaudio-download-http
-           "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-&pulseaudio-version;.tar.xz">
-  <!ENTITY pulseaudio-download-ftp  " ">
-  <!ENTITY pulseaudio-md5sum        "c4a3596a26ff4b9dcd0c394dd1d4f8ee">
-  <!ENTITY pulseaudio-size          "1.5 MB">
-  <!ENTITY pulseaudio-buildsize     "42 MB (with tests)">
-  <!ENTITY pulseaudio-time          "0.2 SBU (Using parallelism=4; add 0.2 SBU for tests)">
-]>
-
-<sect1 id="pulseaudio" xreflabel="PulseAudio-&pulseaudio-version;">
-  <?dbhtml filename="pulseaudio.html"?>
-
-
-  <title>PulseAudio-&pulseaudio-version;</title>
-
-  <indexterm zone="pulseaudio">
-    <primary sortas="a-PulseAudio">PulseAudio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PulseAudio</title>
-
-    <para>
-      <application>PulseAudio</application> is a sound system for POSIX OSes,
-      meaning that it is a proxy for sound applications. It allows you to do
-      advanced operations on your sound data as it passes between your
-      application and your hardware. Things like transferring the audio to a
-      different machine, changing the sample format or channel count and mixing
-      several sounds into one are easily achieved using a sound server.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pulseaudio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pulseaudio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pulseaudio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pulseaudio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pulseaudio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pulseaudio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PulseAudio Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsndfile"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="dbus"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="glib2"/>,
-      <xref linkend="speex"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="bluez"/>,
-      <xref linkend="doxygen"/> (for documentation),
-      <xref linkend="fftw"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libsamplerate"/>,
-      <xref linkend="sbc"/> (Bluetooth support),
-      <xref linkend="valgrind"/>,
-      <ulink url="https://jackaudio.org/">JACK</ulink>,
-      <ulink url="https://0pointer.de/lennart/projects/libasyncns/">libasyncns</ulink>,
-      <ulink url="https://www.lirc.org/">LIRC</ulink>,
-      <ulink url="https://gstreamer.freedesktop.org/src/orc/">ORC</ulink>,
-      <ulink url="https://sourceforge.net/projects/soxr/">soxr</ulink>,
-      <ulink url="https://tdb.samba.org/">TDB</ulink>, and
-      <ulink url="https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/">
-      WebRTC AudioProcessing</ulink>
-      <!--<ulink url="http://www.xenproject.org/">XEN</ulink>-->
-    </para>
-
-  </sect2>
-
-  <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
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Ddatabase=gdbm     \
-            -Ddoxygen=false     \
-            -Dbluez5=disabled   \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. One test
-      fails if the tests are not run as the root user, but this can be ignored.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <!-- 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.
-      While still as the <systemitem class="username">root</systemitem>
-      user, remove the <application>D-Bus</application> configuration file
-      for the system wide daemon to avoid creating unnecessary system
-      users and groups:
-    </para>
-
-<screen role="root"><userinput>rm /usr/share/dbus-1/system.d/pulseaudio-system.conf</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>-Dbluez5=disabled</parameter>: This switch prevents
-      a runtime error if <xref linkend="dbus"/> and <xref linkend="sbc"/>
-      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>
-<!--
-    <para>
-      <parameter>- -disable-rpath</parameter>: This switch prevents
-      linker from adding a hardcoded runtime path to the installed
-      programs and libraries.
-    </para>-->
-
-  </sect2>
-  <sect2 role="configuration">
-    <title>Configuring PulseAudio</title>
-
-    <sect3 id="pulseaudio-config">
-      <title>Config Files</title>
-      <para>
-        There are system wide configuration files:
-        <filename>/etc/pulse/daemon.conf</filename>,
-        <filename>/etc/pulse/client.conf</filename>,
-        <filename>/etc/pulse/default.pa</filename>, and user configuration
-        files with the same names in
-        <filename class="directory">~/.config/pulse</filename>. User
-        configuration files take precedence over system wide ones.
-      </para>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary sortas="e-AA.config-pulse">~/.config/pulse</primary>
-      </indexterm>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary
-        sortas="e-etc-pulse-daemon.conf">/etc/pulse/daemon.conf</primary>
-      </indexterm>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary
-        sortas="e-etc-pulse-client.conf">/etc/pulse/client.conf</primary>
-      </indexterm>
-
-      <indexterm zone="pulseaudio pulseaudio-config">
-        <primary
-        sortas="e-etc-pulse-default.pa">/etc/pulse/default.pa</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-<!--
-      <para>
-        The default configuration files allow setting up a working installation.
-        However, a reference to Console-Kit needs to be removed.
-        Issue the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i '/load-module module-console-kit/s/^/#/' /etc/pulse/default.pa</userinput></screen>
-
-       In 13.0 this is protected via .ifexists module-console-kit.so
--->
-      <para>
-        You may have to configure the audio system. You can start
-        <application>pulseaudio</application> in command line mode using
-        <command>pulseaudio -C</command> and then list various
-        information and change settings. See
-        <command>man pulse-cli-syntax</command>.
-      </para>
-
-      <para>
-        If <application>pulseaudio</application> was working but you no-longer
-        have sound, after checking for hardware issues (speakers or headphones
-        not connected, external amplifier not connected) you may need to fix it.
-      </para>
-
-      <para>
-        One suggestion is to close the application, such as
-        <application>firefox</application> where sound has stopped working, then
-        run: <command>pactl list short sinks</command> followed by:
-        <command>pacmd set-default-sink &lt;sink #&gt;</command> and then
-        restart the application.
-      </para>
-
-      <para>
-        If that does not work, a more drastic approach often works. After closing
-        the application, close pulseaudio, either using <command>pulseaudio
-        --kill</command> or, if that fails, <command>killall -KILL
-        pulseaudio</command> and then <command>rm -rf
-        ~/.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
-        --verbose</command> to restart it. If the daemon starts, restart the
-        application. See <command>man pulseaudio</command> for more options.
-      </para>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <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
-          <!-- it looks like the equalizer needs FFTW: qpaeq, -->
-          start-pulseaudio-x11
-        </seg>
-        <seg>
-          libpulse.so,
-          libpulse-mainloop-glib.so,
-          libpulse-simple.so,
-          libpulsecommon-&pulseaudio-major-version;.so,
-          libpulsecore-&pulseaudio-major-version;.so, and
-          libpulsedsp.so
-        </seg>
-        <seg>
-          /etc/pulse,
-          /usr/include/pulse,
-          /usr/lib/cmake/PulseAudio,
-          /usr/lib/{pulseaudio,pulse-&pulseaudio-major-version;},
-          /usr/libexec/pulse, and
-          /usr/share/pulseaudio
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--
-      <varlistentry id="esdcompat">
-        <term><command>esdcompat</command></term>
-        <listitem>
-          <para>
-            is the <application>PulseAudio</application> ESD wrapper script.
-          </para>
-          <indexterm zone="pulseaudio esdcompat">
-            <primary sortas="b-esdcompat">esdcompat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="pacat">
-        <term><command>pacat</command></term>
-        <listitem>
-          <para>
-            plays back or records raw or encoded audio streams on a
-            <application>PulseAudio</application> sound server
-          </para>
-          <indexterm zone="pulseaudio pacat">
-            <primary sortas="b-pacat">pacat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pacmd">
-        <term><command>pacmd</command></term>
-        <listitem>
-          <para>
-            is a tool used to reconfigure a <application>PulseAudio</application>
-            sound server during runtime
-          </para>
-          <indexterm zone="pulseaudio pacmd">
-            <primary sortas="b-pacmd">pacmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pactl">
-        <term><command>pactl</command></term>
-        <listitem>
-          <para>
-            is used to control a running <application>PulseAudio</application>
-            sound server
-          </para>
-          <indexterm zone="pulseaudio pactl">
-            <primary sortas="b-pactl">pactl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="padsp">
-        <term><command>padsp</command></term>
-        <listitem>
-          <para>
-            is the <application>PulseAudio</application> OSS Wrapper
-          </para>
-          <indexterm zone="pulseaudio padsp">
-            <primary sortas="b-padsp">padsp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pamon">
-        <term><command>pamon</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>pacat</command>
-           </para>
-          <indexterm zone="pulseaudio pamon">
-            <primary sortas="b-pamon">pamon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paplay">
-        <term><command>paplay</command></term>
-        <listitem>
-          <para>
-            is used to play audio files on a
-            <application>PulseAudio</application> sound server
-          </para>
-          <indexterm zone="pulseaudio paplay">
-            <primary sortas="b-paplay">paplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="parec">
-        <term><command>parec</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>pacat</command>
-          </para>
-          <indexterm zone="pulseaudio parec">
-            <primary sortas="b-parec">parec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="parecord">
-        <term><command>parecord</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>pacat</command>
-          </para>
-          <indexterm zone="pulseaudio parecord">
-            <primary sortas="b-parecord">parecord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pasuspender">
-        <term><command>pasuspender</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to tell a local
-            <application>PulseAudio</application> sound server to temporarily
-            suspend access to the audio devices, to allow other applications
-            to access them directly
-          </para>
-          <indexterm zone="pulseaudio pasuspender">
-            <primary sortas="b-pasuspender">pasuspender</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pax11publish">
-        <term><command>pax11publish</command></term>
-        <listitem>
-          <para>
-            is the <application>PulseAudio</application>
-            X11 Credential Utility
-          </para>
-          <indexterm zone="pulseaudio pax11publish">
-            <primary sortas="b-pax11publish">pax11publish</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="pulseaudio pulseaudio-prog">
-            <primary sortas="b-pulseaudio">pulseaudio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- only installed if FFTW is present -->
-      <varlistentry id="qpaeq">
-        <term><command>qpaeq</command></term>
-        <listitem>
-          <para>
-            is an equalizer interface for
-            <application>PulseAudio</application> equalizer sinks
-            (Requires <xref linkend="fftw"/> at build time)
-          </para>
-          <indexterm zone="pulseaudio qpaeq">
-            <primary sortas="b-qpaeq">qpaeq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Not found in PA 7.0
-      <varlistentry id="start-pulseaudio-kde">
-        <term><command>start-pulseaudio-kde</command></term>
-        <listitem>
-          <para>
-            Starts <application>PulseAudio</application> and loads
-            module-device-manager to use KDE routing policies.
-          </para>
-          <indexterm zone="pulseaudio start-pulseaudio-kde">
-            <primary sortas="b-start-pulseaudio-kde">start-pulseaudio-kde</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="start-pulseaudio-x11">
-        <term><command>start-pulseaudio-x11</command></term>
-        <listitem>
-          <para>
-            starts <application>PulseAudio</application> and registers it to
-            the X11 session manager
-          </para>
-          <indexterm zone="pulseaudio start-pulseaudio-x11">
-            <primary sortas="b-start-pulseaudio-x11">start-pulseaudio-x11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/sbc.xml
===================================================================
--- multimedia/libdriv/sbc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sbc-download-http "&kernel-dl;/linux/bluetooth/sbc-&sbc-version;.tar.xz">
-  <!ENTITY sbc-download-ftp  " ">
-  <!ENTITY sbc-md5sum        "5613357181daeffd71e971c6f8470f8d">
-  <!ENTITY sbc-size          "268 KB">
-  <!ENTITY sbc-buildsize     "2.8 MB">
-  <!ENTITY sbc-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sbc" xreflabel="SBC-&sbc-version;">
-  <?dbhtml filename="sbc.html"?>
-
-
-  <title>SBC-&sbc-version;</title>
-
-  <indexterm zone="sbc">
-    <primary sortas="a-SBC">SBC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SBC</title>
-
-    <para>
-      The <application>SBC</application> is a digital audio encoder and decoder used to
-      transfer data to Bluetooth audio output devices like headphones or loudspeakers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SBC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libsndfile"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SBC</title>
-
-    <para>
-      Install <application>SBC</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static --disable-tester &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-tester</parameter>: This disables
-      the SBC tester. Remove it if you have installed
-      <xref linkend="libsndfile"/>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          sbcdec, sbcenc, and sbcinfo
-        </seg>
-        <seg>
-          libsbc.so
-        </seg>
-        <seg>
-          /usr/include/sbc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sbcdec">
-        <term><command>sbcdec</command></term>
-        <listitem>
-          <para>
-            is a SBC decoder utility
-          </para>
-          <indexterm zone="sbc sbcdec">
-            <primary sortas="b-sbcdec">sbcdec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sbcenc">
-        <term><command>sbcenc</command></term>
-        <listitem>
-          <para>
-            is a SBC encoder utility
-          </para>
-          <indexterm zone="sbc sbcenc">
-            <primary sortas="b-sbcenc">sbcenc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sbcinfo">
-        <term><command>sbcinfo</command></term>
-        <listitem>
-          <para>
-            is a subband codec (SBC) analyzer
-          </para>
-          <indexterm zone="sbc sbcinfo">
-            <primary sortas="b-sbcinfo">sbcinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsbc">
-        <term><filename class="libraryfile">libsbc.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>SBC</application> API functions
-          </para>
-          <indexterm zone="sbc libsbc">
-            <primary sortas="c-libsbc">libsbc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sdl-download-http "https://github.com/libsdl-org/sdl12-compat/archive/release-&sdl-version;/sdl12-compat-release-&sdl-version;.tar.gz">
-  <!ENTITY sdl-download-ftp  " ">
-  <!ENTITY sdl-md5sum        "04ed17494dad2131b37e0300f8af31ec">
-  <!ENTITY sdl-size          "452 KB">
-  <!ENTITY sdl-buildsize     "7.1 MB">
-  <!ENTITY sdl-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sdl" xreflabel="sdl12-compat-&sdl-version;">
-  <?dbhtml filename="sdl.html"?>
-
-
-  <title>sdl12-compat-&sdl-version;</title>
-
-  <indexterm zone="sdl">
-    <primary sortas="a-SDL">SDL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sdl12-compat</title>
-
-    <para>
-      The Simple DirectMedia Layer (<application>SDL</application>
-      for short) is a cross-platform library designed to make it easy to write
-      multimedia software, such as games and emulators.  This code is a
-      compatibility layer; it provides a binary and source compatible API
-      for programs written against SDL 1.2, but it uses SDL 2.0 behind the scenes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sdl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sdl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sdl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sdl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sdl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sdl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SDL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="glu"/>, and
-      <xref linkend="sdl2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sdl12-compat</title>
-
-    <para>
-      Install <application>sdl12-compat</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  \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -vf /usr/lib/libSDLmain.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing SDL</title>
-
-    <para>
-      If you wish, test the <application>sdlcompat</application> package
-      using the included test programs. It is not required to install any of
-      the resulting binaries to validate the installation.
-    </para>
-
-    <para>
-      You'll need to manually run all the test programs (they are listed in
-      the <filename>README</filename> file in this directory).  Many of them
-      will need to be manually killed, and you'll need to turn your speakers
-      on with the volume at a suitable level.
-    </para>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>- -disable-x11-shared</option>: This switch disables
-      dynamically loading X11 shared libraries.
-    </para>
-
-  </sect2>
--->
-<!--
-  <sect2 role="configuration">
-    <title>Configuring SDL</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/lib-config.xml"/>
-
-    </sect3>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>sdl-config</seg>
-        <seg>libSDL.so</seg>
-        <seg>/usr/include/SDL</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sdl-config">
-        <term><command>sdl-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use
-            <filename class="libraryfile">libSDL</filename>
-          </para>
-          <indexterm zone="sdl sdl-config">
-            <primary sortas="b-sdl-config">sdl-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsdl">
-        <term><filename class="libraryfile">libSDL.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide compatibility links to SDL2
-            low level functions for audio,
-            keyboard, mouse, joystick, 3D hardware via OpenGL, and
-            2D frame buffer across multiple platforms
-          </para>
-          <indexterm zone="sdl libsdl">
-            <primary sortas="c-libsdl">libSDL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/sdl/SDL-config.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/sdl/SDL-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring SDL</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: multimedia/libdriv/sdl/SDL-desc.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/sdl/SDL-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The SDL package contains the <userinput>Simple DirectMedia 
+Layer</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>Simple DirectMedia Layer</title>
+<para>The Simple DirectMedia Layer is a generic API that provides low level
+access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 
+2D framebuffer across multiple platforms.</para></sect3>
+
+</sect2>
Index: multimedia/libdriv/sdl/SDL-exp.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/sdl/SDL-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><userinput>./configure --prefix=/usr --disable-debug </userinput>
+</screen>This command configures SDL to build with aggressive
+optimizations.</para>
+</sect2>
+
Index: multimedia/libdriv/sdl/SDL-inst.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/sdl/SDL-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of SDL</title>
+
+<para>Install SDL by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --disable-debug &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/libdriv/sdl/SDL-intro.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/sdl/SDL-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to SDL</title>
+
+<screen>Download location:              &SDL-download;
+Version used:                   &SDL-version;
+Package size:                   &SDL-size;
+Estimated Disk space required:  &SDL-buildsize;</screen>
+
+<para>The Simple DirectMedia Layer (SDL for short) is a cross-platform library
+designed to make it easy to write multimedia software, such as games and
+emulators.</para>
+
+<screen>SDL will utilize oss, alsa, esd, arts, nas, nasm, x11 and directfb by
+default if installed prior to SDL. </screen>
+
+</sect2>
Index: multimedia/libdriv/sdl/sdl.ent
===================================================================
--- multimedia/libdriv/sdl/sdl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/libdriv/sdl/sdl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY SDL SYSTEM "../SDL.xml">
+<!ENTITY SDL-intro SYSTEM "SDL-intro.xml">
+<!ENTITY SDL-inst SYSTEM "SDL-inst.xml">
+<!ENTITY SDL-exp SYSTEM "SDL-exp.xml">
+<!ENTITY SDL-desc SYSTEM "SDL-desc.xml">
+<!ENTITY SDL-config SYSTEM "SDL-config.xml">
+<!ENTITY SDL-buildsize "12 MB">
+<!ENTITY SDL-version "1.2.4">
+<!ENTITY SDL-download "http://www.libsdl.org/release/SDL-1.2.4.tar.gz">
+<!ENTITY SDL-size "1.7 MB">
Index: ltimedia/libdriv/sdl2.xml
===================================================================
--- multimedia/libdriv/sdl2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,279 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sdl2-download-http "https://www.libsdl.org/release/SDL2-&sdl2-version;.tar.gz">
-  <!ENTITY sdl2-download-ftp  " ">
-  <!ENTITY sdl2-md5sum        "a28514e50ef4bb5cc2e1e8c70553425d">
-  <!ENTITY sdl2-size          "7.1 MB">
-  <!ENTITY sdl2-buildsize     "155 MB (with docs)">
-  <!ENTITY sdl2-time          "0.6 SBU (using parallelism=4; with docs)">
-]>
-
-<sect1 id="sdl2" xreflabel="SDL2-&sdl2-version;">
-  <?dbhtml filename="sdl2.html"?>
-
-
-  <title>SDL2-&sdl2-version;</title>
-
-  <indexterm zone="sdl2">
-    <primary sortas="a-SDL2">SDL2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SDL2</title>
-
-    <para>
-      The Simple DirectMedia Layer Version 2 (<application>SDL2</application>
-      for short) is a cross-platform library designed to make it easy to write
-      multimedia software, such as games and emulators.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sdl2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sdl2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sdl2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sdl2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sdl2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sdl2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch (for i686 systems):
-           <ulink url="&patch-root;/SDL2-&sdl2-version;-opengl_include_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">SDL2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="wayland-protocols"/>, and
-      <xref linkend="xorg7-lib"/> (if those are not present, the corresponding modules are not built)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="doxygen"/> (to create documentation),
-      <xref linkend="ibus"/>,
-      <xref linkend="libsamplerate"/>,
-      <xref linkend="nasm"/>,
-      <xref linkend="pipewire"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="x-window-system"/>,
-      <ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>,
-      <ulink url="https://fcitx-im.org/">fcitx</ulink>,
-      <ulink url="https://jackaudio.org/">jack</ulink>, and
-      <ulink url="https://sndio.org/">sndio</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SDL2</title>
-
-<!--
-    <para>
-      First, fix an overly restrictive build option:
-    </para>
-
-<screen><userinput remap="pre">sed -i "s/-Werror=declaration-after-statement//" configure</userinput></screen>
--->
-
-    <para>
-      Install <application>SDL2</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and want to build the
-      html documentation, run the following commands:
-    </para>
-
-<screen remap="doc"><userinput>pushd docs  &amp;&amp;
-  doxygen   &amp;&amp;
-popd</userinput></screen>
-
-    <note>
-      <para>
-        If you wish to build and run the package regression
-        tests, do not delete the static libraries below until after
-        the tests are built.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install              &amp;&amp;
-rm -v /usr/lib/libSDL2*.a</userinput></screen>
-
-    <para>
-      If you built the documentation, install it as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d        /usr/share/doc/SDL2-&sdl2-version;/html &amp;&amp;
-cp -Rv  docs/output/html/* /usr/share/doc/SDL2-&sdl2-version;/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing SDL2</title>
-
-    <para>
-      If you wish to, test the installation of <application>SDL2</application>
-      using the included test programs.  None of the resulting binaries need
-      to be installed.  Issue the following commands to build the test
-      programs:
-    </para>
-
-<screen><userinput>cd test &amp;&amp;
-./configure &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Each of the test programs (they are listed in the
-      <filename>README</filename> file in this directory) will need to be run
-      individually.  Many of them will need to be manually killed. Additionally,
-      speakers need to be on with the volume at a suitable level.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>rm -v /usr/lib/libSDL2*.a</command>: Normally
-      static libraries can be disabled with a <option>--disable-static</option>
-      option to configure, but that breaks the build in this package.
-    </para>
-
-    <para>
-      <option>--disable-alsa-shared</option>: This switch disables
-      dynamically loading ALSA shared libraries.
-    </para>
-
-    <para>
-      <option>--disable-sdl-dlopen</option>: This switch disables using
-      dlopen for shared object loading. Loading image backend libraries like
-      libpng dynamically on the fly does not work.
-    </para>
-
-    <para>
-      <option>--disable-x11-shared</option>: This switch disables
-      dynamically loading X11 shared libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SDL2</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/lib-config.xml"/>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>sdl2-config</seg>
-        <seg>libSDL2.so</seg>
-        <seg>/usr/include/SDL2,
-             /usr/lib/cmake/SDL2, and
-             /usr/share/doc/SDL-&sdl2-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sdl2-config">
-        <term><command>sdl2-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use
-            <filename class="libraryfile">libSDL2</filename>
-          </para>
-          <indexterm zone="sdl2 sdl2-config">
-            <primary sortas="b-sdl2-config">sdl2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsdl2">
-        <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
-          </para>
-          <indexterm zone="sdl2 libsdl2">
-            <primary sortas="c-libsdl2">libSDL2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/sound-theme-freedesktop.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sound-theme-freedesktop-download-http
-           "https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-&sound-theme-freedesktop-version;.tar.bz2">
-  <!ENTITY sound-theme-freedesktop-download-ftp  " ">
-  <!ENTITY sound-theme-freedesktop-md5sum        "d7387912cfd275282d1ec94483cb2f62">
-  <!ENTITY sound-theme-freedesktop-size          "472 KB">
-  <!ENTITY sound-theme-freedesktop-buildsize     "2 MB">
-  <!ENTITY sound-theme-freedesktop-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sound-theme-freedesktop" xreflabel="sound-theme-freedesktop-&sound-theme-freedesktop-version;">
-  <?dbhtml filename="sound-theme-freedesktop.html"?>
-
-
-  <title>sound-theme-freedesktop-&sound-theme-freedesktop-version;</title>
-
-  <indexterm zone="sound-theme-freedesktop">
-    <primary sortas="a-sound-theme-freedesktop">sound-theme-freedesktop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sound Theme Freedesktop</title>
-
-    <para>
-      The <application>Sound Theme Freedesktop</application> package
-      contains sound themes for the desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sound-theme-freedesktop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sound-theme-freedesktop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sound-theme-freedesktop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sound-theme-freedesktop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sound-theme-freedesktop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sound-theme-freedesktop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sound Theme Freedesktop</title>
-
-    <para>
-      Install <application>Sound Theme Freedesktop</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/sounds/freedesktop
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/soundtouch.xml
===================================================================
--- multimedia/libdriv/soundtouch.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 soundtouch-download-http "https://www.surina.net/soundtouch/soundtouch-&soundtouch-version;.tar.gz">
-  <!ENTITY soundtouch-download-ftp  " ">
-  <!ENTITY soundtouch-md5sum        "489c1050315965f69a9c0ad949744d73">
-  <!ENTITY soundtouch-size          "596 KB">
-  <!ENTITY soundtouch-buildsize     "7.6 MB">
-  <!ENTITY soundtouch-time          "0.2 SBU">
-]>
-
-<sect1 id="soundtouch" xreflabel="SoundTouch-&soundtouch-version;">
-  <?dbhtml filename="soundtouch.html"?>
-
-
-  <title>SoundTouch-&soundtouch-version;</title>
-
-  <indexterm zone="soundtouch">
-    <primary sortas="a-SoundTouch">SoundTouch</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SoundTouch</title>
-
-    <para>
-      The <application>SoundTouch</application> package contains an open-source audio
-      processing library that allows changing the sound tempo, pitch and playback
-      rate parameters independently from each other.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&soundtouch-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&soundtouch-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &soundtouch-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &soundtouch-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &soundtouch-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &soundtouch-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SoundTouch</title>
-
-    <note>
-      <para>The tarball expands to 'soundtouch' instead of the expected
-      'soundtouch-&soundtouch-version;'</para>
-    </note>
-
-    <para>
-      Install <application>SoundTouch</application> by running the following
-      commands:
-    </para>
-
-    <caution>
-      <para>
-        The <command>bootstrap</command> command below fails if the ACLOCAL
-        environment variable is set as specified in <xref linkend="xorg7"/>.
-        If it is used, ACLOCAL needs to be unset for this package and then
-        reset for other packages.
-      </para>
-    </caution>
-
-<screen><userinput>./bootstrap &amp;&amp;
-./configure --prefix=/usr \
-            --docdir=/usr/share/doc/soundtouch-&soundtouch-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install </userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-openmp</option>: This switch adds support for running
-      the algorithms in parallel across several processor cores using OpenMP
-      implementation provided by GCC.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          soundstretch
-        </seg>
-        <seg>
-          libSoundTouch.so
-        </seg>
-        <seg>
-          /usr/include/soundtouch and
-          /usr/share/doc/soundtouch-&soundtouch-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="soundstretch">
-        <term><command>soundstretch</command></term>
-        <listitem>
-          <para>
-            is a program for processing WAV audio files by modifying
-            sound tempo, pitch and playback rate properties independently
-            from each other
-          </para>
-          <indexterm zone="soundtouch soundstretch">
-            <primary sortas="b-soundstretch">soundstretch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSoundTouch">
-        <term><filename class="libraryfile">libSoundTouch.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>SoundTouch</application> API functions
-          </para>
-          <indexterm zone="soundtouch libSoundTouch">
-            <primary sortas="c-libSoundTouch">libSoundTouch.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,278 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 speex-download-http "https://downloads.xiph.org/releases/speex/speex-&speex-version;.tar.gz">
-  <!ENTITY speex-download-ftp  " ">
-  <!ENTITY speex-md5sum        "fe7bf610883ff202092b92c72fe0fe3e">
-  <!ENTITY speex-size          "1020 KB">
-  <!ENTITY speex-buildsize     "7.8 MB">
-  <!ENTITY speex-time          "less than 0.1 SBU">
-
-  <!ENTITY speexdsp-download-http "https://downloads.xiph.org/releases/speex/speexdsp-&speexdsp-version;.tar.gz">
-  <!ENTITY speexdsp-download-ftp  " ">
-  <!ENTITY speexdsp-md5sum        "e6eb5ddef743a362c8018f260b91dca5">
-  <!ENTITY speexdsp-size          "904 KB">
-  <!ENTITY speexdsp-buildsize     "5.5 MB">
-  <!ENTITY speexdsp-time          "less than 0.1 SBU">
-
-]>
-
-<sect1 id="speex" xreflabel="Speex-&speex-version;">
-  <?dbhtml filename="speex.html"?>
-
-
-  <title>Speex-&speex-version;</title>
-
-  <indexterm zone="speex">
-    <primary sortas="a-Speex">Speex</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Speex</title>
-
-    <para>
-      <application>Speex</application> is an audio compression format
-      designed specifically for speech. It is well-adapted to internet
-      applications and provides useful features that are not present in most
-      other CODECs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&speex-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&speex-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &speex-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &speex-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &speex-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &speex-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&speexdsp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&speexdsp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &speexdsp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &speexdsp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &speexdsp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &speexdsp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-   <bridgehead renderas="sect3">Additional Download</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/speexdsp-&speex-version;-build_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">Speex Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libogg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Speex</title>
-
-    <para>
-      This package consists of two separate tarballs.
-      They need to be extracted and built independently.
-    </para>
-
-    <para>
-      Install <application>Speex</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/speex-&speex-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Now extract and install the speexdsp package:
-    </para>
-
-<screen><userinput>cd ..                          &amp;&amp;
-tar -xf speexdsp-&speexdsp-version;.tar.gz &amp;&amp;
-cd speexdsp-&speexdsp-version;             &amp;&amp;
-
-./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/speexdsp-&speexdsp-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Again, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-<!-- Included by default as of 1.2.1
-    <para>
-      <option>- -enable-binaries</option>: Builds two binaries to encode and
-      decode to and from the speex format.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>speexenc and speexdec</seg>
-        <seg>libspeex.so and libspeexdsp.so</seg>
-        <seg>
-          /usr/include/speex and
-          /usr/share/doc/speex-&speex-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="speexdec">
-        <term><command>speexdec</command></term>
-        <listitem>
-          <para>
-            decodes a <application>Speex</application> file and
-            produces a WAV or raw file
-          </para>
-          <indexterm zone="speex speexdec">
-            <primary sortas="b-speexdec">speexdec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="speexenc">
-        <term><command>speexenc</command></term>
-        <listitem>
-          <para>
-            encodes a WAV or raw file using <application>Speex</application>
-          </para>
-          <indexterm zone="speex speexenc">
-            <primary sortas="b-speexenc">speexenc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libspeex">
-        <term><filename class="libraryfile">libspeex.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for the audio encoding/decoding programs
-          </para>
-          <indexterm zone="speex libspeex">
-            <primary sortas="c-libspeex">libspeex.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libspeexdsp">
-        <term><filename class="libraryfile">libspeexdsp.so</filename></term>
-        <listitem>
-          <para>
-            is a speech processing library that goes along with the
-            <application>Speex</application> codec
-          </para>
-          <indexterm zone="speex libspeexdsp">
-            <primary sortas="c-libspeexdsp">libspeexdsp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/taglib.xml
===================================================================
--- multimedia/libdriv/taglib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 taglib-download-http "https://taglib.org/releases/taglib-&taglib-version;.tar.gz">
-  <!ENTITY taglib-download-ftp  " ">
-  <!ENTITY taglib-md5sum        "e1f2ef858bddf65eb17e43043c3da10b">
-  <!ENTITY taglib-size          "1.4 MB">
-  <!ENTITY taglib-buildsize     "16 MB">
-  <!ENTITY taglib-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="taglib" xreflabel="taglib-&taglib-version;">
-  <?dbhtml filename="taglib.html"?>
-
-
-  <title>Taglib-&taglib-version;</title>
-
-  <indexterm zone="taglib">
-    <primary sortas="a-Taglib">Taglib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Taglib</title>
-
-    <para>
-      <application>Taglib</application> is a library used for reading,
-      writing and manipulating audio file tags and is used by applications
-      such as <application>Amarok</application> and
-      <application>VLC</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&taglib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&taglib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &taglib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &taglib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &taglib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &taglib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Taglib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="utfcpp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for tests)</bridgehead>
-    <para role="optional">
-      <ulink url='https://freedesktop.org/wiki/Software/cppunit/'>Cppunit</ulink>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Taglib</title>
-
-    <para>
-      Install <application>Taglib</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  \
-      -DBUILD_SHARED_LIBS=ON \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite requires <application>Cppunit</application> but it's
-      not a BLFS package.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          taglib-config
-        </seg>
-        <seg>
-          libtag.so and libtag_c.so
-        </seg>
-        <seg>
-          /usr/include/taglib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="taglib-config">
-        <term><command>taglib-config</command></term>
-        <listitem>
-          <para>
-            is a tool used to print information about the taglib installation
-          </para>
-          <indexterm zone="taglib taglib-config">
-            <primary sortas="b-taglib-config">taglib-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/v4l-utils.xml
===================================================================
--- multimedia/libdriv/v4l-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,454 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 v4l-download-http "https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-&v4l-utils-version;.tar.xz">
-  <!ENTITY v4l-download-ftp  " ">
-  <!ENTITY v4l-md5sum        "a3565a8ccc427dcce52845c2b8880c28">
-  <!ENTITY v4l-size          "1.2 MB">
-  <!ENTITY v4l-buildsize     "32 MB">
-  <!ENTITY v4l-time          "1.1 SBU (using parallelism=4)">
-]>
-
-<sect1 id="v4l-utils" xreflabel="v4l-utils-&v4l-utils-version;">
-  <?dbhtml filename="v4l-utils.html" ?>
-
-
-  <title>v4l-utils-&v4l-utils-version;</title>
-
-  <indexterm zone="v4l-utils">
-    <primary sortas="a-v4l-utils">v4l-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to v4l-utils</title>
-
-    <para>
-      <application>v4l-utils</application> provides a series of utilities for
-      media devices, allowing the ability to handle the proprietary formats 
-      available from most webcams (libv4l), and providing tools to test V4L devices.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&v4l-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&v4l-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &v4l-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &v4l-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &v4l-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &v4l-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/v4l-utils-&v4l-utils-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">v4l-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="libjpeg"/>, and
-      &qt5-deps;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="sdl2"/>,
-      both <xref linkend="llvm"/> (with Clang and target BPF)
-      and <ulink url='https://github.com/libbpf/libbpf'>libbpf</ulink>
-      (for infrared remote control decoders based on BPF), and
-      <ulink url="https://github.com/libsdl-org/SDL_image">SDL_image</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of v4l-utils</title>
-
-    <note>
-      <para>
-        If you've installed both LLVM and libbpf (not in BLFS), either
-        enable the BPF target (via
-        <option>-DLLVM_TARGETS_TO_BUILD=</option>) building LLVM, or disable
-        the infrared remote control decoders based on BPF:
-      </para>
-
-      <!-- not "nodump" because it's harmless for BLFS anyway -->
-      <screen><userinput>sed '/^ir_bpf_enabled/s/=.*/= false/' \
-    -i utils/keytable/meson.build</userinput></screen>
-    </note>
-
-    <para>
-      Install <application>v4l-utils</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            -Ddoxygen-doc=disabled \
-            -Dgconv=disabled       \
-            --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>
-
-    <para>
-      If you also wish to install the contrib programs, add:
-    </para>
-
-<screen role="root"><userinput>for prog in v4l2gl v4l2grab
-do
-   cp -v contrib/test/$prog /usr/bin
-done</userinput></screen>
-
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dgconv=disabled</parameter>: This switch disables
-      the erroneous installation of gconv-modules that would break glibc.
-    </para>
-
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cec-compliance,
-          cec-ctl,
-          cec-follower,
-          cx18-ctl,
-          decode_tm6000,
-          dvb-fe-tool,
-          dvb-format-convert,
-          dvbv5-daemon,
-          dvbv5-scan,
-          dvbv5-zap,
-          ir-ctl,
-          ir-keytable,
-          ivtv-ctl,
-          media-ctl,
-          qv4l2,
-          qvidcap,
-          rds-ctl,
-          v4l2-compliance,
-          v4l2-ctl,
-          v4l2-dbg,
-          v4l2gl,
-          v4l2grab, and
-          v4l2-sysfs-path
-        </seg>
-        <seg>
-          libdvbv5.so,
-          libv4l1.so,
-          libv4l2.so,
-          libv4l2rds.so,
-          libv4lconvert.so,
-          v4l1compat.so, and
-          v4l2convert.so
-        </seg>
-        <seg>
-          /etc/rc_keymaps,
-          /lib/udev/rc_keymaps,
-          /usr/include/libdvbv5, and
-          /usr/lib/libv4l
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cx18-ctl">
-        <term><command>cx18-ctl</command></term>
-        <listitem>
-          <para>
-            is a tool to handle cx18 based devices
-          </para>
-          <indexterm zone="v4l-utils cx18-ctl">
-            <primary sortas="b-cx18-ctl">cx18-ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="decode_tm6000">
-        <term><command>decode_tm6000</command></term>
-        <listitem>
-          <para>
-            decodes multiplexed formats from TM5600/TM6000 USB devices
-          </para>
-          <indexterm zone="v4l-utils decode_tm6000">
-            <primary sortas="b-decode_tm6000">decode_tm6000</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvb-fe-tool">
-        <term><command>dvb-fe-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool for digital TV services
-          </para>
-          <indexterm zone="v4l-utils dvb-fe-tool">
-            <primary sortas="b-dvb-fe-tool">dvb-fe-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvb-format-convert">
-        <term><command>dvb-format-convert</command></term>
-        <listitem>
-          <para>
-            is a tool meant to convert among different file formats.  It is
-            compliant with version 5 of the DVB API
-          </para>
-          <indexterm zone="v4l-utils dvb-format-convert">
-            <primary sortas="b-dvb-format-convert">dvb-format-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvbv5-scan">
-        <term><command>dvbv5-scan</command></term>
-        <listitem>
-          <para>
-            is a command line frequency scanning tool for digital TV
-            services that are compliant with version 5 of the DVB API
-          </para>
-          <indexterm zone="v4l-utils dvbv5-scan">
-            <primary sortas="b-dvbv5-scan">dvbv5-scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dvbv5-zap">
-        <term><command>dvbv5-zap</command></term>
-        <listitem>
-          <para>
-            is a command line tuning tool for digital TV services
-            that is compliant with version 5 of the DVB API
-          </para>
-          <indexterm zone="v4l-utils dvbv5-zap">
-            <primary sortas="b-dvbv5-zap">dvbv5-zap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ir-keytable">
-        <term><command>ir-keytable</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="v4l-utils ir-keytable">
-            <primary sortas="b-ir-keytable">ir-keytable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ivtv-ctl">
-        <term><command>ivtv-ctl</command></term>
-        <listitem>
-          <para>
-            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)
-          </para>
-          <indexterm zone="v4l-utils ivtv-ctl">
-            <primary sortas="b-ivtv-ctl">ivtv-ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="media-ctl">
-        <term><command>media-ctl</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure V4L2 devices
-          </para>
-          <indexterm zone="v4l-utils media-ctl">
-            <primary sortas="b-media-ctl">media-ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qv4l2">
-        <term><command>qv4l2</command></term>
-        <listitem>
-          <para>
-            is used to test video4linux capture devices
-          </para>
-          <indexterm zone="v4l-utils qv4l2">
-            <primary sortas="b-qv4l2">qv4l2</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            is a utility for decoding raw RDS data from V4L2 Radio devices
-            and offers simple ways to access the received RDS information
-          </para>
-          <indexterm zone="v4l-utils rds-ctl">
-            <primary sortas="b-rds-ctl">rds-ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l2-compliance">
-        <term><command>v4l2-compliance</command></term>
-        <listitem>
-          <para>
-            is a compliance test tool
-          </para>
-          <indexterm zone="v4l-utils v4l2-compliance">
-            <primary sortas="b-v4l2-compliance">v4l2-compliance</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l2-ctl">
-        <term><command>v4l2-ctl</command></term>
-        <listitem>
-          <para>
-            is a tool to control v4l2 controls from the cmdline
-          </para>
-          <indexterm zone="v4l-utils v4l2-ctl">
-            <primary sortas="b-v4l2-ctl">v4l2-ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l2-dbg">
-        <term><command>v4l2-dbg</command></term>
-        <listitem>
-          <para>
-            is a tool to directly get and set registers of v4l2 devices
-          </para>
-          <indexterm zone="v4l-utils v4l2-dbg">
-            <primary sortas="b-v4l2-dbg">v4l2-dbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l2gl">
-        <term><command>v4l2gl</command></term>
-        <listitem>
-          <para>
-            captures images using libv4l and stores them as PPM files
-          </para>
-          <indexterm zone="v4l-utils v4l2gl">
-            <primary sortas="b-v4l2gl">v4l2gl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l2grab">
-        <term><command>v4l2grab</command></term>
-        <listitem>
-          <para>
-            captures images using libv4l and stores them as PPM files, while
-            also allowing for additional options such as setting the amount of
-            frames captured and saving the file as a RAW file
-          </para>
-          <indexterm zone="v4l-utils v4l2grab">
-            <primary sortas="b-v4l2grab">v4l2grab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l2-sysfs-path">
-        <term><command>v4l2-sysfs-path</command></term>
-        <listitem>
-          <para>
-            checks the media devices installed on a machine and the
-            corresponding device nodes
-          </para>
-          <indexterm zone="v4l-utils v4l2-sysfs-path">
-            <primary sortas="b-v4l2-sysfs-path">v4l2-sysfs-path</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/wireplumber.xml
===================================================================
--- multimedia/libdriv/wireplumber.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,286 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wireplumber-download-http "https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/&wireplumber-version;/wireplumber-&wireplumber-version;.tar.bz2">
-  <!ENTITY wireplumber-download-ftp  " ">
-  <!ENTITY wireplumber-md5sum        "6893d7bd1a3ef28781ed8be23fcd1432">
-  <!ENTITY wireplumber-size          "400 KB">
-  <!ENTITY wireplumber-buildsize     "88 MB (with tests)">
-  <!ENTITY wireplumber-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="wireplumber" xreflabel="Wireplumber-&wireplumber-version;">
-  <?dbhtml filename="wireplumber.html"?>
-
-  <title>Wireplumber-&wireplumber-version;</title>
-
-  <indexterm zone="wireplumber">
-    <primary sortas="a-wireplumber">Wireplumber</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wireplumber</title>
-
-    <para>
-      The <application>Wireplumber</application> package contains a session and
-      policy manager for <application>Pipewire</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wireplumber-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wireplumber-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wireplumber-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wireplumber-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wireplumber-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wireplumber-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wireplumber Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="glib2"/>, <phrase revision="sysv">and</phrase>
-      <xref linkend="pipewire"/><phrase revision="systemd">, and
-        <xref role="runtime" linkend="systemd"/> (runtime, rebuilt with
-        <xref role="nodep" linkend="linux-pam"/>)
-      </phrase>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lua"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="lxml"/>,
-      <xref linkend="sphinx"/>,
-      <xref linkend="sphinx_rtd_theme"/>, and
-      <ulink url="https://pypi.org/project/breathe/">Breathe</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wireplumber</title>
-
-    <para>
-      Install <application>Wireplumber</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dsystem-lua=true .. &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dsystem-lua=true</parameter>: This switch enables using the
-      system version of Lua. Omit this switch if you have not installed Lua,
-      but note that <application>meson</application> will download and install
-      it's own version.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Wireplumber</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        In order for Wireplumber to be used by Pipewire, Wireplumber must be
-        configured to start when a desktop environment is started.
-      </para>
-
-      <para revision="systemd">
-        To configure Wireplumber to start when a desktop environment is
-        started, run the following commands as the &root; user to enable the
-        systemd user units:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable --global pipewire.socket &amp;&amp;
-systemctl enable --global wireplumber</userinput></screen>
-
-      <para revision="sysv">
-        First, create a shell script that will start Wireplumber and Pipewire
-        in the correct order as the &root; user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /usr/bin/pipewire-launcher.sh &lt;&lt; "EOF"
-<literal>#!/bin/sh
-# Begin /usr/bin/pipewire-launcher.sh
-
-# Start Pipewire first.
-exec /usr/bin/pipewire &amp;
-
-# Wait for a second for Pipewire to launch.
-sleep 1
-
-# Start Wireplumber now that Pipewire has been started.
-exec /usr/bin/wireplumber &amp;
-# End /usr/bin/pipewire-launcher.sh</literal>
-EOF</userinput></screen>
-
-    <para revision="sysv">
-      Next, make this shell script executable as the &root; user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>chmod +x /usr/bin/pipewire-launcher.sh</userinput></screen>
-
-    <para revision="sysv">
-      Finally, create an XDG Autostart file that will run
-      <command>/usr/bin/pipewire-launcher.sh</command> when a desktop
-      environment is started, as the &root; user:
-    </para>
-    
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/xdg/autostart/pipewire.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Version=1.0
-Name=Pipewire
-Comment=Starts the Pipewire and Wireplumber daemons
-Exec=/usr/bin/pipewire-launcher.sh
-Terminal=false
-Type=Application</literal>
-EOF</userinput></screen>
-
-    <para>
-      Now that Wireplumber is configured to start when a desktop environment is
-      started, it is recommended that you log out of your session and log back
-      in again.
-    </para>
-    
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wireplumber,
-          wpctl, and
-          wpexec
-        </seg>
-        <seg>
-          libwireplumber-0.5.so
-        </seg>
-        <seg>
-          /usr/include/wireplumber-0.5,
-          /usr/lib/wireplumber-0.5, and
-          /usr/share/wireplumber
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wireplumber-prog">
-        <term><command>wireplumber</command></term>
-        <listitem>
-          <para>
-            is a session and policy manager for Pipewire
-          </para>
-          <indexterm zone="wireplumber wireplumber-prog">
-            <primary sortas="b-wireplumber">wireplumber</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpctl">
-        <term><command>wpctl</command></term>
-        <listitem>
-          <para>
-            controls and queries information from Wireplumber
-          </para>
-          <indexterm zone="wireplumber wpctl">
-            <primary sortas="b-wpctl">wpctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpexec">
-        <term><command>wpexec</command></term>
-        <listitem>
-          <para>
-            executes Wireplumber scripts, which are often written in Lua
-          </para>
-          <indexterm zone="wireplumber wpexec">
-            <primary sortas="b-wpexec">wpexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libwireplumber">
-        <term><filename class="libraryfile">libwireplumber-0.5.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow other programs to control Wireplumber
-          </para>
-          <indexterm zone="wireplumber libwireplumber">
-            <primary sortas="c-libwireplumber">libwireplumber-0.5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: ltimedia/libdriv/x264.xml
===================================================================
--- multimedia/libdriv/x264.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 x264-download-http "&sources-anduin-http;/x264/x264-&x264-version;.tar.xz">
-  <!ENTITY x264-download-ftp  " ">
-  <!ENTITY x264-md5sum        "a80f596383ea12bc3137aad84dfb337b">
-  <!ENTITY x264-size          "728 KB">
-  <!ENTITY x264-buildsize     "12 MB">
-  <!ENTITY x264-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="x264" xreflabel="x264-&x264-version;">
-  <?dbhtml filename="x264.html"?>
-
-
-  <title>x264-&x264-version;</title>
-
-  <indexterm zone="x264">
-    <primary sortas="a-x264">x264</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to x264</title>
-
-    <para>
-      <application>x264</application> package provides a library for encoding
-      video streams into the H.264/MPEG-4 AVC format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&x264-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&x264-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &x264-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &x264-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &x264-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &x264-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">x264 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/FFMS/ffms2">ffms2</ulink>,
-      <ulink url="https://github.com/gpac/gpac/releases/">gpac</ulink> or
-      <ulink url="https://github.com/l-smash/l-smash">liblsmash</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of x264</title>
-
-    <note>
-      <para>
-        This package tarball expands to <filename class='directory'>x264</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>x264</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-shared \
-            --disable-cli &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-cli</parameter>: This switch disables building the
-      command-line encoder which is redundant since it requires FFmpeg for
-      most of the input formats.
-    </para>
-
-    <para>
-      <option>--disable-asm</option>: Use this switch if you didn't install
-      NASM.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libx264.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libx264">
-        <term><filename class="libraryfile">libx264.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to encode video streams into the
-            H.264/MPEG-4 AVC format
-          </para>
-          <indexterm zone="x264 libx264">
-            <primary sortas="c-libx264">libx264.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/x265.xml
===================================================================
--- multimedia/libdriv/x265.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 x265-download-http "&sources-anduin-http;/x265/x265-&x265-version;.tar.xz">
-  <!ENTITY x265-download-ftp  " ">
-  <!ENTITY x265-md5sum        "71144c71b399d7b3d55c9dc1e2377e10">
-  <!ENTITY x265-size          "1.0 MB">
-  <!ENTITY x265-buildsize     "38 MB">
-  <!ENTITY x265-time          "0.5 SBU (using parallelism=4)">
-]>
-
-<sect1 id="x265" xreflabel="x265-&x265-version;">
-  <?dbhtml filename="x265.html"?>
-
-
-  <title>x265-&x265-version;</title>
-
-  <indexterm zone="x265">
-    <primary sortas="a-x265">x265</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to x265</title>
-
-    <para>
-      <application>x265</application> package provides a library for encoding
-      video streams into the H.265/HEVC format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&x265-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&x265-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &x265-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &x265-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &x265-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &x265-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">x265 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/numactl/numactl">numactl</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of x265</title>
-
-    <para>
-      Install <application>x265</application> by running the following
-      commands:
-    </para>
-
-<!-- the default build is Release, no need to specify that -->
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DGIT_ARCHETYPE=1           \
-      -Wno-dev ../source          &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;
-rm -vf /usr/lib/libx265.a </userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>-DGIT_ARCHETYPE=1</parameter>: Upstream no longer provides
-        releases. BLFS is using a git snapshot, but if the builder has not
-        installed <application>git</application> the build will not install
-        the shared library or the pkgconfig file without this switch.
-      </para>
-
-      <para>
-        <parameter>-Wno-dev</parameter>: This switch is used to suppress warnings
-        intended for the package's developers.
-      </para>
-
-      <para>
-        <command>rm -vf /usr/lib/libx265.a</command>: BLFS does not recommend
-        using static libraries.
-      </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          x265
-        </seg>
-        <seg>
-          libx265.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libx265">
-        <term><filename class="libraryfile">libx265.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions used to encode video streams into the
-            H.265/HEVC format
-          </para>
-          <indexterm zone="x265 libx265">
-            <primary sortas="c-libx265">libx265.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,303 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xine-lib-download-http
-    "&sourceforge-dl;/xine/xine-lib-&xine-lib-version;.tar.xz">
-  <!ENTITY xine-lib-download-ftp  "">
-  <!ENTITY xine-lib-md5sum        "9e1be39857b7a3cd7cc0f2b96331ff22">
-  <!ENTITY xine-lib-size          "4.8 MB">
-  <!ENTITY xine-lib-buildsize     "98 MB (with API documentation)">
-  <!ENTITY xine-lib-time          "0.5 SBU (Using parallelism=4; with API documentation)">
-]>
-
-<sect1 id="xine-lib" xreflabel="xine-lib-&xine-lib-version;">
-  <?dbhtml filename="xine-lib.html"?>
-
-
-  <title>xine-lib-&xine-lib-version;</title>
-
-  <indexterm zone="xine-lib">
-    <primary sortas="a-Xine-Libraries">Xine Libraries</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xine Libraries</title>
-
-    <para>
-      The <application>Xine Libraries</application> package contains xine
-      libraries. These are useful for interfacing with external plug-ins that
-      allow the flow of information from the source to the audio and video
-      hardware.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xine-lib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xine-lib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xine-lib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xine-lib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xine-lib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xine-lib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xine Libraries Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="ffmpeg"/>, and at least one of:
-        <xref linkend="alsa-lib"/>,
-        <xref linkend='pulseaudio'/>, or
-        <ulink url="https://jackaudio.org/">JACK</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libdvdnav"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="faad2"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="imagemagick"/>,
-      <xref linkend="liba52"/>,
-      <xref linkend="libdvdcss"/>,
-      <xref linkend="libmad"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libnsl"/>,
-      <!--<xref linkend="libtheora"/>,-->
-      <xref linkend="libva"/> (requires <xref role="nodep" linkend="glu"/>),
-      <xref linkend="libvdpau"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="doxygen"/> (to create the API documentation),
-      <xref linkend="v4l-utils"/>
-      <ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>,
-      <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>,
-      <ulink url="https://www.videolan.org/developers/libdca.html">libdca</ulink>,
-      <ulink url="https://fame.sourceforge.net">libFAME</ulink>,
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
-      <ulink url="https://www.theora.org">libtheora</ulink>,
-      <ulink url="https://www.musepack.net/">musepack</ulink>,
-      <ulink url="&gnu-http;/vcdimager/">VCDImager</ulink>, and
-      <ulink url="https://www.wavpack.com/">WavPack</ulink>,
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xine Libraries</title>
-
-    <!-- See this thread for more details:
-    https://lists.linuxfromscratch.org/sympa/arc/lfs-dev/2022-07/msg00044.html
-    -->
-
-<!--
-    <para>
-      First, fix building this package with ffmpeg-5.1:
-    </para>
-
-<screen><userinput remap="pre">sed -e '/\/avformat.h/i #include &lt;libavcodec/version.h&gt;' \
-    -i src/combined/ffmpeg/demux_avformat.c </userinput></screen>
--->
-<!--<note>
-      <para>This package tarball expands to the directory xine-lib.1.2.13/,
-      not he expected xine-lib-1.2.13/.</para>
-    </note>-->
-
-<!-- Appears to be fixed in 1.2.13
-    <para>
-      First, fix building this package with binutils-2.39:
-    </para>
-
-<screen><userinput remap="pre">sed -e '/xine_set_flags/s/XINE_PROTECTED//' -i include/xine.h</userinput></screen>
--->
-
-    <para>
-      Install <application>Xine Libraries</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --disable-vcd          \
-            --with-external-dvdnav \
-            --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To create the API documentation, <application>Doxygen</application>
-      must be installed and issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/Doxyfile</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>
-
-    <note>
-      <para>
-        When installing, the Makefile does some additional
-        linking.  If you do not have Xorg in /usr, the LIBRARY_PATH
-        variable needs to be defined for the root user.  If
-        using sudo to assume root, use the -E option to pass
-        your current environment variables for the install process.
-      </para>
-    </note>
-
-    <para>
-      If you built the API documentation, issue the following commands as
-      the <systemitem class="username">root</systemitem> user to install it:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/xine-lib-&xine-lib-version;/api &amp;&amp;
-install -v -m644    doc/api/* \
-                    /usr/share/doc/xine-lib-&xine-lib-version;/api</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-vcd</parameter>: This switch is required to compile
-      <application>Xine Lib</application> without <ulink
-      url="&gnu-http;/vcdimager/">VCDImager</ulink> installed.
-      Remove this option if you have installed VCDImager.
-    </para>
-
-    <para>
-      <parameter>--with-external-dvdnav</parameter>: This switch is required,
-      because internal libraries cannot decrypt DVD.
-    </para>
-
-    <para>
-      <parameter>--docdir=/usr/share/doc/xine-lib-&xine-lib-version;</parameter>:
-      This switch causes the documentation to be installed into a versioned
-      directory instead of the default <filename
-      class="directory">/usr/share/doc/xine-lib</filename>.
-    </para>
-
-    <para>
-      <option>--disable-vaapi</option>: use this switch if <xref
-      linkend="libva"/> is installed and <xref linkend="glu"/>
-      is not, to prevent a build failure.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Fonts</segtitle>
-      <segtitle>Installed Directories</segtitle>
-<!-- When updating, check plugins subdir -->
-      <seglistitem>
-        <seg>xine-config and xine-list-1.2</seg>
-        <seg>libxine.so and numerous plugin modules and video extensions under
-          /usr/lib/xine/plugins/2.8</seg>
-        <seg>
-          Output display engine fonts located in /usr/share/xine-lib/fonts
-        </seg>
-        <seg>
-          /usr/include/xine,
-          /usr/lib/xine,
-          /usr/share/xine-lib, and
-          /usr/share/doc/xine-lib-&xine-lib-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xine-config">
-        <term><command>xine-config</command></term>
-        <listitem>
-          <para>
-            provides information to programs trying to link with the
-            <application>xine</application> libraries
-          </para>
-          <indexterm zone="xine-lib xine-config">
-            <primary sortas="b-xine-config">xine-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xine-list-1.2">
-        <term><command>xine-list-1.2</command></term>
-        <listitem>
-          <para>
-            is used to get supported file type information from
-            <application>xine-lib</application>
-          </para>
-          <indexterm zone="xine-lib xine-list-1.2">
-            <primary sortas="b-xine-list-1.2">xine-list-1.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxine">
-        <term><filename class="libraryfile">libxine.so</filename></term>
-        <listitem>
-          <para>
-            provides the API for processing audio/video files
-          </para>
-          <indexterm zone="xine-lib libxine">
-            <primary sortas="c-libxine">libxine.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/xvid.xml
===================================================================
--- multimedia/libdriv/xvid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xvid-download-http "https://downloads.xvid.com/downloads/xvidcore-&xvid-version;.tar.gz">
-  <!ENTITY xvid-download-ftp  " ">
-  <!ENTITY xvid-md5sum        "5c6c19324608ac491485dbb27d4da517">
-  <!ENTITY xvid-size          "804 KB">
-  <!ENTITY xvid-buildsize     "7.1 MB">
-  <!ENTITY xvid-time          "0.1 SBU">
-]>
-
-<sect1 id="xvid" xreflabel="XviD-&xvid-version;">
-  <?dbhtml filename="xvid.html"?>
-
-
-  <title>XviD-&xvid-version;</title>
-
-  <indexterm zone="xvid">
-    <primary sortas="a-XviD">XviD</primary>
-  </indexterm>
-
-<sect2 role="package">
-  <title>Introduction to XviD</title>
-
-    <para>
-      <application>XviD</application> is an MPEG-4 compliant video CODEC.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xvid-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xvid-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xvid-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xvid-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xvid-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xvid-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XviD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="yasm"/> or <xref linkend="nasm"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XviD</title>
-
-    <note>
-      <para>
-      This package tarball expands to <filename
-      class='directory'>xvidcore</filename>, not the expected <filename
-      class='directory'>xvidcore-&xvid-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>XviD</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd build/generic &amp;&amp;
-sed -i 's/^LN_S=@LN_S@/&amp; -f -v/' platform.inc.in &amp;&amp;
-
-./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>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile &amp;&amp;
-make install &amp;&amp;
-
-chmod -v 755 /usr/lib/libxvidcore.so.4.3 &amp;&amp;
-install -v -m755 -d /usr/share/doc/xvidcore-&xvid-version;/examples &amp;&amp;
-install -v -m644 ../../doc/* /usr/share/doc/xvidcore-&xvid-version; &amp;&amp;
-install -v -m644 ../../examples/* \
-    /usr/share/doc/xvidcore-&xvid-version;/examples</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/^LN_S=@LN_S@/&amp; -f -v/' platform.inc.in</command>:
-      Fix error during <command>make install</command> if reinstalling
-      or upgrading.
-    </para>
-
-    <para>
-      <command>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile</command>:
-      This command disables installing the static library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libxvidcore.so</seg>
-        <seg>/usr/share/doc/xvidcore-&xvid-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-    <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="libxvidcore">
-      <term><filename class="libraryfile">libxvidcore.so</filename></term>
-      <listitem>
-        <para>
-          provides functions to encode and decode most
-          MPEG-4 video data
-        </para>
-        <indexterm zone="xvid libxvidcore">
-          <primary sortas="c-libxvidcore">libxvidcore.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/multimedia.ent
===================================================================
--- multimedia/multimedia.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/multimedia.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,48 @@
+<!ENTITY multimedia SYSTEM "multimedia.xml">
+
+<!-- Libraries and drivers -->
+<!ENTITY multimedia-libdriv SYSTEM "libdriv/libdriv.xml">
+<!ENTITY % alsa SYSTEM "libdriv/alsa/alsa.ent">
+<!ENTITY % arts SYSTEM "libdriv/arts/arts.ent">
+<!ENTITY % audiofile SYSTEM "libdriv/audiofile/audiofile.ent">
+<!ENTITY % esound SYSTEM "libdriv/esound/esound.ent">
+<!ENTITY % sdl SYSTEM "libdriv/sdl/sdl.ent">
+<!ENTITY % libao SYSTEM "libdriv/libao/libao.ent">
+<!ENTITY % ogg SYSTEM "libdriv/ogg/ogg.ent">
+%alsa;
+%arts;
+%audiofile;
+%esound;
+%sdl;
+%libao;
+%ogg;
+
+<!-- Audio utilities -->
+<!ENTITY multimedia-audioutils SYSTEM "audioutils/audioutils.xml">
+<!ENTITY % mpg123 SYSTEM "audioutils/mpg123/mpg123.ent">
+<!ENTITY % vorbistools SYSTEM "audioutils/vorbistools/vorbistools.ent">
+<!ENTITY % xmms SYSTEM "audioutils/xmms/xmms.ent">
+<!ENTITY % lame SYSTEM "audioutils/lame/lame.ent">
+<!ENTITY % cdparanoia SYSTEM "audioutils/cdparanoia/cdparanoia.ent">
+%mpg123;
+%vorbistools;
+%xmms;
+%lame;
+%cdparanoia;
+
+<!-- Video utilities -->
+<!ENTITY multimedia-videoutils SYSTEM "videoutils/videoutils.xml">
+<!ENTITY % avifile SYSTEM "videoutils/avifile/avifile.ent">
+<!ENTITY % mplayer SYSTEM "videoutils/mplayer/mplayer.ent">
+<!ENTITY % xine SYSTEM "videoutils/xine/xine.ent">
+%avifile;
+%mplayer;
+%xine;
+
+<!-- CD Writing Utilities -->
+<!ENTITY multimedia-cdwriteutils SYSTEM "cdwriteutils/cdwriteutils.xml">
+<!ENTITY multimedia-cdwriteutils-kernel SYSTEM "cdwriteutils/kernel.xml">
+<!ENTITY % cdrtools SYSTEM "cdwriteutils/cdrtools/cdrtools.ent">
+<!ENTITY % cdrdao SYSTEM "cdwriteutils/cdrdao/cdrdao.ent">
+%cdrtools;
+%cdrdao;
Index: multimedia/multimedia.xml
===================================================================
--- multimedia/multimedia.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/multimedia.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,18 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="multimedia" xreflabel="multimedia">
+<?dbhtml filename="multimedia.html" dir="multimedia"?>
+<title>Multimedia</title>
 
-<part id="multimedia" xreflabel="Multimedia">
-  <?dbhtml filename="multimedia.html" dir="multimedia"?>
-
-  <title>Multimedia</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdriv/libdriv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audioutils/audioutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="videoutils/videoutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdwriteutils/cdwriteutils.xml"/>
+&multimedia-libdriv;
+&multimedia-audioutils;
+&multimedia-videoutils;
+&multimedia-cdwriteutils;
 
 </part>
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/videoutils/avifile.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="avifile" xreflabel="avifile">
+<?dbhtml filename="avifile.html" dir="multimedia"?>
+<title>avifile</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: multimedia/videoutils/avifile/avifile.ent
===================================================================
--- multimedia/videoutils/avifile/avifile.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/videoutils/avifile/avifile.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY avifile SYSTEM "../avifile.xml">
Index: ltimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,671 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ffmpeg-download-http "https://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
-  <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "d2edfc6ec6494c432828876e3102f740">
-  <!ENTITY ffmpeg-size          "11 MB">
-  <!ENTITY ffmpeg-buildsize     "201 MB (add 1.5 GB for the FATE suite/tests, add 792 MB for documentation)">
-  <!ENTITY ffmpeg-time          "1.3 SBU (using parallelism=4; add 3.2 SBU (with THREADS=4) to run the FATE suite after sample files are downloaded; add 0.3 SBU for doxygen docs)">
-]>
-
-<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
-  <?dbhtml filename="ffmpeg.html"?>
-
-
-  <title>FFmpeg-&ffmpeg-version;</title>
-
-  <indexterm zone="ffmpeg">
-    <primary sortas="a-FFmpeg">FFmpeg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FFmpeg</title>
-
-    <para>
-      <application>FFmpeg</application> is a solution to record, convert and
-      stream audio and video. It is a very fast video and audio converter and it
-      can also acquire from a live audio/video source. Designed to be intuitive,
-      the command-line interface (<command>ffmpeg</command>) tries to figure out
-      all the parameters, when possible. <application>FFmpeg</application> can
-      also convert from any sample rate to any other, and resize video on the
-      fly with a high quality polyphase filter.
-      <application>FFmpeg</application> can use a Video4Linux compatible video
-      source and any Open Sound System audio source.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ffmpeg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ffmpeg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ffmpeg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ffmpeg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ffmpeg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ffmpeg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ffmpeg-&ffmpeg-version;-chromium_method-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libaom"/>,
-      <xref linkend="libass"/>,
-      <xref linkend="fdk-aac"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="opus"/>,
-      <xref linkend="x264"/>,
-      <xref linkend="x265"/>, and
-      <xref linkend="nasm"/> or <xref linkend="yasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended for desktop use</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="libva"/>,
-      <xref linkend="libvdpau"/> (with the corresponding driver package), and
-      <xref linkend="sdl2"/>
-    </para>
-
-    <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),
-      <xref linkend="libdrm"/> (for <quote>kmsgrab</quote> input),
-      <!--<xref linkend="libtheora"/>,-->
-      <xref linkend="libjxl"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="opencv"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="texlive"/>
-         (or <xref linkend="tl-installer"/>) for PDF and PS documentation,
-      <xref linkend="v4l-utils"/>,
-      <xref linkend="vulkan-loader"/>,
-      <xref linkend="xvid"/>,
-      <xref linkend="x-window-system"/>,
-      <ulink url="https://code.videolan.org/videolan/dav1d">dav1d</ulink>,
-      <ulink url="https://github.com/festvox/flite">Flite</ulink>,
-      <ulink url="https://www.quut.com/gsm/">GSM</ulink>,
-      <ulink url="https://tipok.org.ua/node/17">libaacplus</ulink>,
-      <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>,
-      <ulink url="https://gitlab.xiph.org/xiph/celt">libcelt</ulink>,
-      <ulink url="https://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="https://github.com/Distrotech/libnut">libnut</ulink> (Git checkout),
-      <ulink url="https://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
-      <ulink url="https://www.libssh.org/">libssh</ulink>,
-      <ulink url="https://www.theora.org">libtheora</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
-      <ulink url="https://github.com/Haivision/srt">Srt</ulink>,
-      <ulink url="https://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
-      <ulink url="https://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="https://vulkan.org/">Vulkan</ulink>, and-->
-      <ulink url="https://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FFmpeg</title>
-
-    <para>
-      First, apply a patch that adds an API necessary for some packages to
-      build:
-      <!-- qtwebengine -->
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../ffmpeg-&ffmpeg-version;-chromium_method-1.patch</userinput></screen>
-
-    <para>
-      Install <application>FFmpeg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --enable-gpl         \
-            --enable-version3    \
-            --enable-nonfree     \
-            --disable-static     \
-            --enable-shared      \
-            --disable-debug      \
-            --enable-libaom      \
-            --enable-libass      \
-            --enable-libfdk-aac  \
-            --enable-libfreetype \
-            --enable-libmp3lame  \
-            --enable-libopus     \
-            --enable-libvorbis   \
-            --enable-libvpx      \
-            --enable-libx264     \
-            --enable-libx265     \
-            --enable-openssl     \
-            --ignore-tests=enhanced-flv-av1 \
-            --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
-
-make &amp;&amp;
-
-gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
-
-    <para>
-      HTML documentation was built in the previous step. If  you have
-      <xref linkend="texlive"/> installed and wish to build PDF and
-      Postscript versions of the documentation, issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>pushd doc &amp;&amp;
-for DOCNAME in `basename -s .html *.html`
-do
-    texi2pdf -b $DOCNAME.texi &amp;&amp;
-    texi2dvi -b $DOCNAME.texi &amp;&amp;
-
-    dvips    -o $DOCNAME.ps   \
-                $DOCNAME.dvi
-done &amp;&amp;
-popd &amp;&amp;
-unset DOCNAME</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed
-      and you wish to build (if --disable-doc was
-      used) or rebuild the html documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
-
-    <para>
-      The fate-suite tests include comparisons with installed files, and should
-      not be run before the package is installed. Therefore, if you desire to
-      run them, instructions are given further below.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755    tools/qt-faststart /usr/bin &amp;&amp;
-install -v -m755 -d           /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
-install -v -m644    doc/*.txt /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
-
-    <para>
-      If the PDF and Postscript documentation was built, issue the following
-      commands, as the <systemitem class="username">root</systemitem> user, to
-      install them:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/*.pdf /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
-install -v -m644 doc/*.ps  /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
-
-    <para>
-      If you used <command>doxygen</command> to manually create the API
-      documentation, install it by issuing the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api                     &amp;&amp;
-cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api                  &amp;&amp;
-find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644 \{} \; &amp;&amp;
-find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755 \{} \;</userinput></screen>
-
-    <para>
-      To properly test the installation you must have <xref linkend="rsync"/>
-      installed and follow the instructions for the <ulink
-      url="https://www.ffmpeg.org/fate.html"> FFmpeg Automated Testing
-      Environment</ulink> (FATE). First, about 1 GB of sample files used to
-      run FATE are downloaded with the command:
-    </para>
-
-<screen remap="test"><userinput>make fate-rsync SAMPLES=fate-suite/</userinput></screen>
-
-    <para>
-      The <filename class="directory">fate-suite</filename> directory is
-      created and the files are downloaded there. That command actually runs an
-      rsync command to obtain the sample files.  You may want to compress and
-      keep this directory for testing again, for testing in another system,
-      or for when a new version of ffmpeg is released. Then, unpack the sample
-      files in the source directory, and run the <command>make fate-rsync
-      ...</command> command above to sync with the upstream repository. The
-      download size and time are drastically reduced by doing this.  Estimated
-      values in "Package Information" do not include the download SBU. Some
-      samples may have been removed in newer versions, so in order to be sure
-      local and server fate samples are identical when you use previously
-      saved samples, run the following command:
-    </para>
-
-<screen role="nodump"><userinput>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
-      rsync://fate-suite.ffmpeg.org/fate-suite/ fate-suite/</userinput></screen>
-
-    <para>
-      Next, execute FATE with the following commands (there are more than 3800
-      tests in the suite):
-    </para>
-
-<screen remap="test"><userinput>make fate THREADS=<replaceable>N</replaceable> SAMPLES=fate-suite/ | tee ../fate.log &amp;&amp;
-grep ^TEST ../fate.log | wc -l</userinput></screen>
-
-    <para>
-      where <replaceable>N</replaceable> is an integer,
-      <replaceable>N</replaceable> &le; number of cores in the system.
-   </para>
-
-   <para>
-     A successful run should return no errors or warnings, just a list of tests
-     and total amount at the end.
-   </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-
-    <para>
-      <command>find ... ;</command>: Fixes permissions of documentation files
-      and directories.
-    </para>
-
-    <para>
-      <parameter>--enable-libfreetype</parameter>: Enables
-      <application>Freetype</application> support.
-    </para>
-
-    <para>
-      <parameter>--enable-gpl</parameter>: Enables the use of GPL code and
-      permits support for postprocessing, swscale and many other features.
-    </para>
-
-    <para>
-      <parameter>--enable-version3</parameter>: Enables the use of (L)GPL
-      version 3 code.
-    </para>
-
-    <para>
-      <parameter>--enable-nonfree</parameter>: Enables the use of nonfree code.
-      Note that the resulting libraries and binaries will be unredistributable.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-shared</parameter>: Enables building shared
-      libraries, otherwise only static libraries are built and installed.
-    </para>
-
-    <para>
-      <parameter>--disable-debug</parameter>: Disables building debugging
-      symbols into the programs and libraries.
-    </para>
-
-    <para>
-      <parameter>--enable-libaom</parameter>: Enables AV1 audio and video
-      decoding via <filename class="libraryfile">libaom</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libass</parameter>: Enables ASS/SSA subtitle format
-      rendering via <filename class="libraryfile">libass</filename>.
-    </para>
-
-    <para>
-      <option>--enable-libdrm</option>: Use this switch if
-      <xref linkend="libdrm"/> is installed to build the <quote>kmsgrab</quote>
-      input module which is useful for screen capturing or streaming.
-    </para>
-
-    <para>
-      <parameter>--enable-libfdk-aac</parameter>: Enables AAC audio encoding via
-      <filename class="libraryfile">libfdk-aac</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libmp3lame</parameter>: Enables MP3 audio encoding
-      via <filename class="libraryfile">libmp3lame</filename>.
-    </para>
-<!--
-    <para>
-      <parameter>- -enable-libvorbis</parameter>
-      <parameter>- -enable-libtheora</parameter>: Enables
-      Theora video encoding via <filename
-      class="libraryfile">libvorbis</filename> and <filename
-      class="libraryfile">libtheora</filename>.
-    </para>
--->
-    <para>
-      <parameter>--enable-libvorbis</parameter>
-      <parameter>--enable-libvpx</parameter>: Enables WebM
-      encoding via <filename class="libraryfile">libvorbis</filename> and
-      <filename class="libraryfile">libvpx</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libx264</parameter>: Enables high-quality
-      H.264/MPEG-4 AVC encoding via <filename
-      class="libraryfile">libx264</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-libx265</parameter>: Enables high-quality
-      H.265/HEVC encoding via <filename
-      class="libraryfile">libx265</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-openssl</parameter>:
-      Enables HTTPS protocol for network streams.
-    </para>
-
-    <!--
-    <para>
-      <parameter>- -disable-vulkan</parameter>: Disables Vulkan for the
-      current version of <xref linkend="vulkan-loader"/> due to
-      an API conflict.
-    </para>
-    -->
-
-    <para>
-      <parameter>--ignore-tests=...</parameter>: Disables tests that fail to
-      run on
-      BLFS without the optional packages. Currently the AV1 test is disabled 
-      as it needs dav1d to do AV1 decoding on the CPU. The test might work if 
-      you have a GPU that can decode AV1, but this was not tested.
-    </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>
-
-    <para>
-      <option>--disable-doc</option>: Disables building html documentation.
-      This is only needed if <xref linkend="doxygen"/> is installed and you
-      do not want to build the html documentation.
-    </para>
-
-    <para>
-      <option>--enable-libpulse</option>: Enables support for
-      <application>Pulseaudio</application> for audio output.
-    </para>
-
-    <para>
-      <command>gcc tools/qt-faststart.c -o tools/qt-faststart</command>: This
-      builds the <command>qt-faststart</command> program which can modify
-      QuickTime formatted movies (<filename class="extension">.mov</filename>
-      or <filename class="extension">.mp4</filename>) so that the header
-      information is located at the beginning of the file instead of the end.
-      This allows the movie file to begin playing before the entire file has
-      been downloaded.
-    </para>
-
-    <note>
-      <para>
-        Support for most of the dependency packages requires using options
-        passed to the <command>configure</command> script. View the output
-        from <command>./configure --help</command> for complete information
-        about enabling dependency packages.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ffmpeg, ffplay, ffprobe, <!--ffserver,--> and qt-faststart
-        </seg>
-        <seg>
-          libavcodec.so, libavdevice.so, libavfilter.so,
-          libavformat.so, libavutil.so, libpostproc.so,
-          libswresample.so, and libswscale.so
-        </seg>
-        <seg>
-          /usr/include/libav{codec,device,filter,format,util},
-          /usr/include/libpostproc,
-          /usr/include/libsw{resample,scale},
-          /usr/share/doc/ffmpeg-&ffmpeg-version;, and
-          /usr/share/ffmpeg
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ffmpeg-prog">
-        <term><command>ffmpeg</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to convert video files, network streams and
-            input from a TV card to several video formats
-          </para>
-          <indexterm zone="ffmpeg ffmpeg-prog">
-            <primary sortas="b-ffmpeg">ffmpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ffplay">
-        <term><command>ffplay</command></term>
-        <listitem>
-          <para>
-            is a very simple and portable media player using the
-            <filename>ffmpeg</filename> libraries and the SDL library
-          </para>
-          <indexterm zone="ffmpeg ffplay">
-            <primary sortas="b-ffplay">ffplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ffprobe">
-        <term><command>ffprobe</command></term>
-        <listitem>
-          <para>
-            gathers information from multimedia streams and prints it in a human
-            and machine-readable fashion
-          </para>
-          <indexterm zone="ffmpeg ffprobe">
-            <primary sortas="b-ffprobe">ffprobe</primary>
-          </indexterm>
-        </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
-          </para>
-          <indexterm zone="ffmpeg qt-faststart">
-            <primary sortas="b-qt-faststart">qt-faststart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavcodec">
-        <term><filename class="libraryfile">libavcodec.so</filename></term>
-        <listitem>
-          <para>
-            is a library containing the <application>FFmpeg</application> codecs
-            (both encoding and decoding)
-          </para>
-          <indexterm zone="ffmpeg libavcodec">
-            <primary sortas="c-libavcodec">libavcodec.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavdevice">
-        <term><filename class="libraryfile">libavdevice.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>FFmpeg</application> device handling library
-          </para>
-          <indexterm zone="ffmpeg libavdevice">
-            <primary sortas="c-libavdevice">libavdevice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavfilter">
-        <term><filename class="libraryfile">libavfilter.so</filename></term>
-        <listitem>
-          <para>
-            is a library of filters that can alter video or audio between the
-            decoder and the encoder (or output)
-          </para>
-          <indexterm zone="ffmpeg libavfilter">
-            <primary sortas="c-libavfilter">libavfilter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavformat">
-        <term><filename class="libraryfile">libavformat.so</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="ffmpeg libavformat">
-            <primary sortas="c-libavformat">libavformat.so</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="ffmpeg libavutil">
-            <primary sortas="c-libavutil">libavutil.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpostproc">
-        <term><filename class="libraryfile">libpostproc.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>FFmpeg</application> post processing library
-          </para>
-          <indexterm zone="ffmpeg libpostproc">
-            <primary sortas="c-libpostproc">libpostproc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libswresample">
-        <term><filename class="libraryfile">libswresample.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>FFmpeg</application> audio rescaling library,
-            it contains functions for converting audio sample formats
-          </para>
-          <indexterm zone="ffmpeg libswresample">
-            <primary sortas="c-libswresample">libswresample.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libswscale">
-        <term><filename class="libraryfile">libswscale.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>FFmpeg</application> image rescaling library
-          </para>
-          <indexterm zone="ffmpeg libswscale">
-            <primary sortas="c-libswscale">libswscale.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/videoutils/mplayer.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,555 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="mplayer" xreflabel="mplayer">
+<?dbhtml filename="mplayer.html" dir="multimedia"?>
+<title>mplayer</title>
 
-
-  <!ENTITY mplayer-download-http "https://mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
-  <!ENTITY mplayer-download-ftp  " ">
-
-<!--  <!ENTITY mplayer-download-http "&sources-anduin-http;/mplayer/mplayer-&mplayer-version;.tar.bz2">
-  <!ENTITY mplayer-download-ftp  " ">
--->
-  <!ENTITY mplayer-md5sum        "0419b64db24b6db0943dbc6afece7c44">
-  <!ENTITY mplayer-size          "15 MB">
-  <!ENTITY mplayer-buildsize     "152 MB">
-  <!ENTITY mplayer-time          "0.4 SBU (Using parallelism=4)">
-
-  <!ENTITY mplayer-skin          "Clearlooks-2.0">
-  <!ENTITY mplayer-skin-download-http "https://mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
-  <!ENTITY mplayer-skin-download-ftp " ">
-  <!ENTITY mplayer-skin-md5sum   "c82d4dbd7f0c36dfecd63dff972807c5">
-  <!ENTITY mplayer-skin-size     "34 KB">
-]>
-
-<sect1 id="mplayer" xreflabel="MPlayer-&mplayer-version;">
-  <?dbhtml filename="mplayer.html"?>
-
-
-  <title>MPlayer-&mplayer-version;</title>
-
-  <indexterm zone="mplayer">
-    <primary sortas="a-MPlayer">MPlayer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MPlayer</title>
-
-    <para>
-      <application>MPlayer</application> is a powerful audio/video player
-      controlled via the command line or a graphical interface that is able to
-      play almost every popular audio and video file format. With supported
-      video hardware and additional drivers, <application>MPlayer</application>
-      can play video files without an <application>X Window System</application>
-      installed.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mplayer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mplayer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mplayer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mplayer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mplayer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mplayer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing='compact'>
-      <title>Required Patches</title>
-      <listitem>
-        <para>
-          <ulink url="&patch-root;/MPlayer-1.5-upstream_ffmpg6_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <ulink url="&patch-root;/ffmpeg-6.0-binutils_2.41-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing='compact'>
-      <title>Skins</title>
-      <listitem>
-        <para>
-          GUI skin (HTTP): <ulink url="&mplayer-skin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          GUI skin (FTP): <ulink url="&mplayer-skin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Skin MD5 sum: &mplayer-skin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Skin size: &mplayer-skin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Alternative skins:
-          <ulink url="https://mplayerhq.hu/MPlayer/skins/"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        Skins are only required in order to use the
-        <application>Gtk+ 2</application> user interface.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">MPlayer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="yasm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!--<xref linkend="ffmpeg"/>,-->
-      <xref linkend="gtk2"/> and
-      <xref linkend="libvdpau"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Input Drivers and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="cdparanoia"/>,
-      <xref linkend="libcdio"/> (to identify and play CDs),
-      <xref linkend="libdvdread"/>,
-      <xref linkend="libdvdnav"/>,
-      <xref linkend="libdvdcss"/>,
-      <xref linkend="samba"/>,
-      <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="http://www.live555.com/">LIVE555 Streaming Media</ulink>,
-      <ulink url="https://rtmpdump.mplayerhq.hu/">RTMPDump</ulink>,
-      <ulink url="https://tivo-mplayer.sourceforge.net/mythtivo.html">TiVo vstream client</ulink>, and
-      <ulink url="https://github.com/xmms2/wiki/wiki">XMMS</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Audio Output Drivers and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl"/>,
-      <ulink url="https://jackaudio.org/">JACK</ulink>,
-      <ulink url="https://www.radscan.com/nas.html">NAS</ulink>, and
-      <ulink url="https://openal.org/">OpenAL</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <ulink url="https://sourceforge.net/projects/openjpeg.mirror/files/">OpenJPEG1</ulink>,
-      <ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>,
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>, and
-      <ulink url="https://www.svgalib.org/">SVGAlib</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional CODECs</bridgehead>
-    <para role="optional">
-      <!-- includes its own version of FFmpeg which is the recommended one by
-      the devs <xref linkend="ffmpeg"/>, -->
-      <xref linkend="faac"/>,
-      <xref linkend="faad2"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="liba52"/>,
-      <xref linkend="libdv"/>,
-      <xref linkend="libmad"/>,
-      <xref linkend="libmpeg2"/>,
-      <!--<xref linkend="libtheora"/>,-->
-      <xref linkend="libvpx"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="mpg123"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="xvid"/>,
-      <xref linkend="x264"/>,
-      <ulink url="https://packages.debian.org/source/buster/crystalhd">CrystalHD</ulink>,
-<!--      <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/dirac/">Dirac</ulink>,
-      <ulink url="https://www.quut.com/gsm/">GSM</ulink>,
-      <ulink url="https://webrtc.github.io/webrtc-org/license/ilbc-freeware/">iLBC</ulink>,
-      <ulink url="https://www.videolan.org/developers/libdca.html">libdca</ulink>,
-      <ulink url="https://wiki.multimedia.cx/index.php?title=NUT">libnut</ulink>,
-      <ulink url="https://www.musepack.net/">libmpcdec</ulink>,
-      <ulink url="https://www.theora.org">libtheora</ulink>,
-      <ulink url="https://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="https://wiki.xiph.org/Tremor">Tremor</ulink>, and
-      <ulink url="https://sourceforge.net/projects/twolame/">TwoLAME</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Miscellaneous Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="fontconfig"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="fribidi"/>,
-      <xref linkend="gnutls"/>,
-      <!-- <xref linkend="openssl"/>, only valid for samba3 at this time -->
-      <xref linkend="opus"/>, and
-      <xref linkend="unrar"/>;
-      <xref linkend="libxslt"/>,
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (all three required to build the HTML documentation); and
-      <ulink url="https://cihar.com/software/enca/">Enca</ulink>,
-      <!--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="https://www.lirc.org/">LIRC</ulink> (and
-      <ulink url="http://www.dolda2000.com/~fredrik/lirccd/">LIRC Client Daemon</ulink>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MPlayer</title>
-
-    <sect3>
-      <title>Main MPlayer Installation</title>
-
-      <para>
-        There are two patches related to <xref linkend="ffmpeg"/>
-        that need to be applied.  Do that now:
-      </para>
-
-<!-- if using "patch -d", the change of directory is done before
-     applying -i, so that the patch is not in "..". Use "<" in this case. -->
-<screen><userinput>patch -Np1 -i ../MPlayer-1.5-upstream_ffmpg6_fixes-1.patch &amp;&amp;
-patch -Np1 -d ffmpeg &lt; ../ffmpeg-6.0-binutils_2.41-1.patch</userinput></screen>
-
-      <note>
-        <para>
-          The package maintainers recommend building without any
-          optimizations.
-        </para>
-      </note>
-
-      <para>
-        You may wish to examine the output from
-        <command>./configure --help</command> to find out what additional
-        parameters to <command>configure</command> are needed to include the
-        dependencies you have installed on your system.
-      </para>
-
-      <para>
-        Install <application>MPlayer</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr                 \
-            --confdir=/etc/mplayer        \
-            --enable-dynamic-plugins      \
-            --disable-libmpeg2-internal   \
-            --enable-menu                 \
-            --enable-runtime-cpudetection \
-            --enable-gui                  &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        If you wish to build the HTML documentation, issue the
-        following command:
-      </para>
-
-<screen><userinput>make doc</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;
-ln -svf ../icons/hicolor/48x48/apps/mplayer.png \
-        /usr/share/pixmaps/mplayer.png</userinput></screen>
-
-      <para>
-        To install the HTML documentation, issue the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/mplayer-&mplayer-version; &amp;&amp;
-install -v -m644    DOCS/HTML/en/* \
-                    /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
-
-      <para>
-        You will only need <filename>codecs.conf</filename> if you want to
-        change its properties, as the main binary contains an internal copy of
-        it. Ensure any changes you make to <filename>codecs.conf</filename>
-        achieve the desired results, as incorrect entries in this file have been
-        known to cause errors and render the player unusable. If necessary,
-        create the file as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="root"><userinput>install -v -m644 etc/codecs.conf /etc/mplayer</userinput></screen>
-
-      <para>
-        You may alternatively want to copy all the default configuration files
-        to <filename class='directory'>/etc/mplayer</filename> for future
-        reference or more customization ability. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -m644 etc/*.conf /etc/mplayer</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Skin Installation (Optional)</title>
-
-      <para>
-        To enable the Gtk+ 2 frontend of <application>MPlayer</application>,
-        you'll need to install at least one skin. Extract the desired skin and
-        create the default location (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>tar -xvf  ../&mplayer-skin;.tar.bz2 \
-    -C    /usr/share/mplayer/skins &amp;&amp;
-ln  -sfvn Clearlooks /usr/share/mplayer/skins/default</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-gui</parameter>: This option builds the GUI interface
-      into <command>mplayer</command>.
-    </para>
-
-    <para>
-      <parameter>--enable-menu</parameter>: This option is set to enable the
-      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 a version of ffmpeg prior to ffmpeg-6.0. This
-      version of MPlayer is incompatible with the latest version of ffmpeg.
-      MPlayer does include 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
-      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>
-
-    <para>
-      <option>--language-doc="<replaceable>&lt;lang&gt;</replaceable>"</option>:
-      This switch sets the language used for the documentation. Use
-      <command>./configure --help</command> for more information.
-    </para>
-
-    <para>
-      <option>--language-man="<replaceable>&lt;lang&gt;</replaceable>"</option>:
-      This switch sets the language used for the man pages. Use
-      <command>./configure --help</command> for more information.
-    </para>
-
-    <para>
-      <option>--language-msg="<replaceable>&lt;lang&gt;</replaceable>"</option>:
-      This switch sets the language used for messages and the GUI. Use
-      <command>./configure --help</command> for more information
-    </para>
-
-    <para>
-      <option>--language="<replaceable>&lt;lang&gt;</replaceable>"</option>:
-      This switch sets the default language used. Use <command>./configure
-      --help</command> for more information.
-    </para>
-
-      <note>
-        <para>
-          Specific options override --language. You can pass a list of
-          languages separated by whitespace or commas instead of a single
-          language. Nonexisting translations will be dropped from each list.
-          All documentation and man page translations available in the list
-          will be installed, for the messages the first available translation
-          will be used. The value "all" will activate all translations. The
-          LINGUAS environment variable is honored. In all cases the fallback is
-          English.  Values listed by <command>./configure --help</command> are
-          not all available, as would normally be expected. You need to build
-          test.
-        </para>
-      </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MPlayer</title>
-
-    <sect3 id="mplayer-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mplayer/*</filename> and
-        <filename>~/.mplayer/*</filename>
-      </para>
-
-      <note>
-        <para>
-          To play a DVD, it may be useful to ensure a /dev/dvd
-          device is created.  You may need to set this up as described in
-          <xref linkend="dev-dvd"/>.
-        </para>
-      </note>
-
-      <indexterm zone="mplayer mplayer-config">
-        <primary sortas="e-AA.mplayer">~/.mplayer/*</primary>
-      </indexterm>
-
-      <indexterm zone="mplayer mplayer-config">
-        <primary sortas="e-etc-mplayer">/etc/mplayer/*</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Typically, there's no configuration required for the system-wide files
-        in <filename class='directory'>/etc/mplayer</filename> (in fact, this
-        directory is empty unless you copied the default files as mentioned
-        above). Configuration can be accomplished by choosing the configuration
-        button located on the <application>MPlayer</application> GUI. Any
-        configuration changes made in the GUI will be saved in the user's
-        <filename class='directory'>~/.mplayer</filename> directory.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gmplayer, mplayer and mencoder
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/mplayer,
-          /usr/share/doc/mplayer-&mplayer-version; and
-          /usr/share/mplayer
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gmplayer">
-        <term><command>gmplayer</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>mplayer</command> which brings up the
-            GTK+ 2 frontend of <application>MPlayer</application>
-          </para>
-          <indexterm zone="mplayer gmplayer">
-            <primary sortas="b-gmplayer">gmplayer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mplayer-prog">
-        <term><command>mplayer</command></term>
-        <listitem>
-          <para>
-            is the main MPlayer video player
-          </para>
-          <indexterm zone="mplayer mplayer-prog">
-            <primary sortas="b-mplayer">mplayer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mencoder">
-        <term><command>mencoder</command></term>
-        <listitem>
-          <para>
-            is a powerful command line video decoding, encoding and filtering
-            tool that is useful for (amongst other things) ripping DVDs to files
-            on your hard disk (see
-            /usr/share/doc/mplayer-&mplayer-version;/mencoder.html)
-          </para>
-          <indexterm zone="mplayer mencoder">
-            <primary sortas="b-mencoder">mencoder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: multimedia/videoutils/mplayer/mplayer.ent
===================================================================
--- multimedia/videoutils/mplayer/mplayer.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/videoutils/mplayer/mplayer.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY mplayer SYSTEM "../mplayer.xml">
Index: ltimedia/videoutils/mpv.xml
===================================================================
--- multimedia/videoutils/mpv.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mpv-download-http "https://github.com/mpv-player/mpv/archive/v&mpv-version;/mpv-&mpv-version;.tar.gz">
-  <!ENTITY mpv-download-ftp  " ">
-  <!ENTITY mpv-md5sum        "7c1a400867e8930f037efc86c1f90a14">
-  <!ENTITY mpv-size          "3.3 MB">
-  <!ENTITY mpv-buildsize     "28 MB">
-  <!ENTITY mpv-time          "0.1 SBU (Using parallelism=4)">
-
-]>
-
-<sect1 id="mpv" xreflabel="mpv-&mpv-version;">
-  <?dbhtml filename="mpv.html"?>
-
-  <title>mpv-&mpv-version;</title>
-
-  <indexterm zone="mpv">
-    <primary sortas="a-mpv">mpv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mpv</title>
-
-    <para>
-      <application>mpv</application> is a free media player for the
-      command line. It supports a wide variety of media file formats,
-      audio and video codecs, and subtitle types.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mpv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mpv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mpv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mpv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mpv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mpv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">mpv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="libass"/>,
-      <xref linkend="libplacebo"/>,
-      <xref linkend="mesa"/>, and
-      <xref linkend="pulseaudio"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libva"/>,
-      <xref linkend="libvdpau"/>,
-      <xref linkend="lua52"/>,
-      <xref linkend="uchardet"/>, and
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Input Drivers and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="libdvdcss"/>,
-      <xref linkend="libdvdread"/>,
-      <xref linkend="libdvdnav"/>, and
-      <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Audio Output Drivers and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="pipewire"/>,
-      <xref linkend="sdl2"/>,
-      <ulink url="https://jackaudio.org/">JACK</ulink>, and
-      <ulink url="https://openal.org/">OpenAL</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink> and
-      <ulink url="https://www.svgalib.org/">SVGAlib</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mpv</title>
-
-      <para>
-        Add a fix to build with FFMpeg &gt; 7.0
-      </para>
-<screen><userinput>sed 's/AV_OPT_TYPE_CHANNEL_LAYOUT/AV_OPT_TYPE_CHLAYOUT/' \
--i filters/f_lavfi.c</userinput></screen>
-
-      <para>
-        Install <application>mpv</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dx11=enabled       \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dx11=enabled</parameter>: allows linking to the X11 libraries.
-    </para>
-
-    <para>
-      <option>-Ddvdnav=enabled</option>: enables support for DVD playback.
-    </para>
-
-    <para>
-      <option>-Dcdda=enabled</option>: enables support for CD Audio.
-    </para>
-
-    <para>
-      <option>-Dsdl2=enabled</option>: enables the usage of SDL2 for
-      audio and video output.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring mpv</title>
-
-    <sect3 id="mpv-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mpv/*</filename> and
-        <filename>~/.config/mpv/*</filename>
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mpv
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/mpv and
-          /usr/share/doc/mpv
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mpv-prog">
-        <term><command>mpv</command></term>
-        <listitem>
-          <para>
-            is the mpv video player
-          </para>
-          <indexterm zone="mpv mpv-prog">
-            <primary sortas="b-mpv">mpv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,460 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 transcode-download-http "https://bitbucket.org/france/transcode-tcforge/downloads/transcode-&transcode-version;.tar.bz2">-->
-  <!ENTITY transcode-download-http "&sources-anduin-http;/transcode/transcode-&transcode-version;.tar.bz2">
-  <!ENTITY transcode-download-ftp  "">
-  <!ENTITY transcode-md5sum        "9bb25a796a8591fb764de46ee87ce505">
-  <!ENTITY transcode-size          "2.1 MB">
-  <!ENTITY transcode-buildsize     "72 MB">
-  <!ENTITY transcode-time          "0.5 SBU">
-]>
-
-<sect1 id="transcode" xreflabel="Transcode-&transcode-version;">
-  <?dbhtml filename="transcode.html"?>
-
-
-  <title>Transcode-&transcode-version;</title>
-
-  <indexterm zone="transcode">
-    <primary sortas="a-Transcode">Transcode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Transcode</title>
-
-    <para>
-      <application>Transcode</application> was a fast, versatile and
-      command-line based audio/video everything to everything converter
-      primarily focused on producing AVI video files with MP3 audio,
-      but also including a program to read all the video and audio streams
-      from a DVD.
-      <!-- 403 Forbidden
-      For a rundown of the features and capabilities, along with usage
-      examples, visit the Transcode Wiki at
-      <ulink url="http://www.transcoding.org/"/>.-->
-    </para>
-
-    <para>
-      Although outdated and no longer maintained, it can still be used to
-      extract items from a DVD using only the required and recommended
-      dependencies, or to recode to AVI files.
-    </para>
-
-    <para>
-      Subjects to the comments below, this package is known to build and
-      minimally work using the current LFS platform.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&transcode-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&transcode-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &transcode-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &transcode-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &transcode-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &transcode-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
- <!--
-      <listitem>
-        <para>
-          Required patch to fix API changes in ffmpeg:
-          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg4-1.patch"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          Required patch to fix some issues exposed by GCC 10 and later:
-          <ulink url="&patch-root;/transcode-&transcode-version;-gcc10_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Transcode Dependencies</bridgehead>
-
-<!-- ffmpeg does not carry libavresample anymore, so we'll work around it.
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ffmpeg"/> (configured with - -enable-avresample)
-    </para>
--->
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="lame"/>,
-      <xref linkend="libdvdread"/>,
-      <xref linkend="libmpeg2"/>, and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="faac"/>,
-      <xref linkend="freetype2"/>,
-      <ulink url="https://legacy.imagemagick.org/script/download.php">ImageMagick-6</ulink>,
-      <xref linkend="liba52"/>,
-      <xref linkend="libdv"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libogg"/>,
-      <xref linkend="libquicktime"/>,
-      <!--<xref linkend="libtheora"/>,-->
-      <xref linkend="libvorbis"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="v4l-utils"/>,
-      <xref linkend="x264"/>,
-      <xref linkend="xvid"/>
-      <ulink url="https://www.theora.org">libtheora</ulink>, 
-      <ulink url="https://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>, and
-      <ulink url="https://netlib.org/pvm3/">PVM3</ulink>,
-    </para>
-
-    <bridgehead renderas="sect4">Optional (at runtime)</bridgehead>
-    <para role="optional">
-      <ulink url="https://sourceforge.net/projects/lsdvd/files/">lsdvd</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/transcode"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Transcode</title>
-
-<!-- ffmpeg5 no longer carries libavresample.
-    <note>
-      <para>
-        The details of how the <application>FFmpeg</application> libraries
-        are used has changed since this version of
-        <application>Transcode</application> was released. The patch allows the
-        package to be compiled, but some or all of the internal calls to
-        <application>FFmpeg</application> may fail at run time (they report an error
-        and processing continues, but without any output).
-      </para>
-
-      <para>
-        For many packages, that would be a critical error. In this case,
-        the main reason to install <application>Transcode</application> is for
-        the <command>tccat</command> program, which works.  Some of the
-        <command>transcode</command> options work - for the others, use
-        <command>ffmpeg</command> directly on the command line.
-      </para>
-    </note>
--->
-
-    <note>
-      <para>
-        Support for most of the dependency packages requires using
-        options passed to the <command>configure</command> script. View the
-        <filename>INSTALL</filename> file and the output from
-        <command>./configure --help</command> for complete information about
-        enabling dependency packages.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Transcode</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's|doc/transcode|&amp;-$(PACKAGE_VERSION)|' \
-       $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
-
-patch -Np1 -i ../transcode-&transcode-version;-gcc10_fix-1.patch &amp;&amp;
-
-./configure --prefix=/usr     \
-            --enable-alsa     \
-            --enable-libmpeg2 \
-            --disable-ffmpeg  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: Fixes install location for documentation.
-    </para>
-
-    <para>
-      <parameter>--disable-ffmpeg</parameter>: This switch disables support for
-      ffmpeg because libavresample was removed in ffmpeg-5.x.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          avifix, aviindex, avimerge, avisplit, avisync, tccat, tcdecode,
-          tcdemux, tcextract, tcmodinfo, tcmp3cut, tcprobe, tcscan, tcxmlcheck,
-          tcxpm2rgb, tcyait, and transcode
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/transcode and
-          /usr/share/doc/transcode-&transcode-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="avifix">
-        <term><command>avifix</command></term>
-        <listitem>
-          <para>
-            fixes the header of an AVI file
-          </para>
-          <indexterm zone="transcode avifix">
-            <primary sortas="b-avifix">avifix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aviindex">
-        <term><command>aviindex</command></term>
-        <listitem>
-          <para>
-            writes a text file describing the index of an AVI file
-          </para>
-          <indexterm zone="transcode aviindex">
-            <primary sortas="b-aviindex">aviindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avimerge">
-        <term><command>avimerge</command></term>
-        <listitem>
-          <para>
-            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!)
-          </para>
-          <indexterm zone="transcode avimerge">
-            <primary sortas="b-avimerge">avimerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avisplit">
-        <term><command>avisplit</command></term>
-        <listitem>
-          <para>
-            splits AVI files into multiple files
-          </para>
-          <indexterm zone="transcode avisplit">
-            <primary sortas="b-avisplit">avisplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avisync">
-        <term><command>avisync</command></term>
-        <listitem>
-          <para>
-            can shift audio in AVI files for better synchronizing
-            of the audio and video data signal
-          </para>
-          <indexterm zone="transcode avisync">
-            <primary sortas="b-avisync">avisync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tccat">
-        <term><command>tccat</command></term>
-        <listitem>
-          <para>
-            concatenates input files using the input plugins of
-            <application>Transcode</application>.  This is useful
-            for extracting VOB (Video OBject) files, either for
-            a whole DVD or for selected Titles or Chapters, which
-            can then be played or recoded
-          </para>
-          <indexterm zone="transcode tccat">
-            <primary sortas="b-tccat">tccat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcdecode">
-        <term><command>tcdecode</command></term>
-        <listitem>
-          <para>
-            is used to decode input files to raw video and PCM
-            audio streams
-          </para>
-          <indexterm zone="transcode tcdecode">
-            <primary sortas="b-tcdecode">tcdecode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcdemux">
-        <term><command>tcdemux</command></term>
-        <listitem>
-          <para>
-            demultiplexes (separates) audio/video input that contains
-            multiple streams, e.g., VOB files
-          </para>
-          <indexterm zone="transcode tcdemux">
-            <primary sortas="b-tcdemux">tcdemux</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcextract">
-        <term><command>tcextract</command></term>
-        <listitem>
-          <para>
-            grabs single streams from a file containing multiple streams
-          </para>
-          <indexterm zone="transcode tcextract">
-            <primary sortas="b-tcextract">tcextract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcmodinfo">
-        <term><command>tcmodinfo</command></term>
-        <listitem>
-          <para>
-            loads a supplied <application>Transcode</application> filter
-            module and prints its parameters
-          </para>
-          <indexterm zone="transcode tcmodinfo">
-            <primary sortas="b-tcmodinfo">tcmodinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcmp3cut">
-        <term><command>tcmp3cut</command></term>
-        <listitem>
-          <para>
-            is a tool which can cut MP3 streams at milliseconds
-            positions
-          </para>
-          <indexterm zone="transcode tcmp3cut">
-            <primary sortas="b-tcmp3cut">tcmp3cut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcprobe">
-        <term><command>tcprobe</command></term>
-        <listitem>
-          <para>
-            prints information about the input file format
-          </para>
-          <indexterm zone="transcode tcprobe">
-            <primary sortas="b-tcprobe">tcprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcscan">
-        <term><command>tcscan</command></term>
-        <listitem>
-          <para>
-            performs several measurements on the given input data
-          </para>
-          <indexterm zone="transcode tcscan">
-            <primary sortas="b-tcscan">tcscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcxmlcheck">
-        <term><command>tcxmlcheck</command></term>
-        <listitem>
-          <para>
-            checks information in a SMIL input file
-          </para>
-          <indexterm zone="transcode tcxmlcheck">
-            <primary sortas="b-tcxmlcheck">tcxmlcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transcode-prog">
-        <term><command>transcode</command></term>
-        <listitem>
-          <para>
-            is the encoder's user interface that handles the plugins and other
-            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
-          </para>
-          <indexterm zone="transcode transcode-prog">
-            <primary sortas="b-transcode">transcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/videoutils/videoutils.xml
===================================================================
--- multimedia/videoutils/videoutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ multimedia/videoutils/videoutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,29 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="multimedia-videoutils">
+<?dbhtml filename="videoutils.html" dir="multimedia"?>
+<title>Video utilities</title>
 
-<chapter id="multimedia-videoutils">
-  <?dbhtml filename="videoutils.html"?>
-
-  <title>Video Utilities</title>
-
-  <para>
-    This chapter always seems to be the favorite chapter. It's
-    probably because there is a lot of satisfaction in playing your first
-    video when you have spent so much time getting to that point. All those
-    libraries, all the configurations and your reward is that you finally get to
-    watch a movie. Not to worry though, there is always one more
-    CODEC to install.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ffmpeg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mplayer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transcode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vlc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xine-ui.xml"/>
+&avifile;
+&mplayer;
+&xine;
 
 </chapter>
Index: ltimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,461 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vlc-download-http "https://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
-  <!ENTITY vlc-download-ftp  " ">
-  <!ENTITY vlc-md5sum        "e8337fcd2df92f3901dad091fb85f545">
-  <!ENTITY vlc-size          "24 MB">
-  <!ENTITY vlc-buildsize     "726 MB">
-  <!ENTITY vlc-time          "1.9 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="vlc" xreflabel="VLC-&vlc-version;">
-  <?dbhtml filename="vlc.html"?>
-
-
-  <title>VLC-&vlc-version;</title>
-
-  <indexterm zone="vlc">
-    <primary sortas="a-VLC">VLC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to VLC</title>
-
-    <para>
-      <application>VLC</application> is a media player, streamer, and encoder.
-      It can play from many inputs, such as files, network streams, capture
-      devices, desktops, or DVD, SVCD, VCD, and audio CD. It can use most audio
-      and video codecs (MPEG 1/2/4, H264, VC-1, DivX, WMV, Vorbis, AC3, AAC,
-      etc.), and it can also convert to different formats and/or send streams
-      through the network.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vlc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vlc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vlc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vlc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vlc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vlc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/vlc-&vlc-version;-taglib-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">VLC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="liba52"/>,
-      <xref linkend="libgcrypt"/>
-      <xref linkend="libmad"/>,
-      <xref linkend="lua52"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional features and packages</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus"/>,
-      <xref linkend="libidn"/>, and
-      <xref linkend="libssh2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional input plugins</bridgehead>
-    <para role="optional">
-      <xref linkend="libarchive"/>,
-      <xref linkend="libcddb"/>,
-      <xref linkend="libdv"/>,
-      <xref linkend="libdvdcss"/>,
-      <xref linkend="libdvdread"/>,
-      <xref linkend="libdvdnav"/>,
-      <xref linkend="opencv"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="v4l-utils"/>,
-      <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
-      <ulink url="https://github.com/sahlberg/libnfs">libnfs</ulink>,
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>,
-      <ulink url="https://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="http://www.live555.com/">Live555</ulink>, and
-      <ulink url="https://www.gnu.org/software/vcdimager/">VCDImager</ulink>
-      (requires <xref linkend="libcdio"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional mux/demux plugins</bridgehead>
-    <para role="optional">
-      <xref linkend="libogg"/>,
-      <ulink url="https://github.com/kode54/Game_Music_Emu">Game Music Emu</ulink>,
-      <ulink url="https://www.videolan.org/developers/libdvbpsi.html">libdvbpsi</ulink>,
-      <ulink url="https://downloads.xiph.org/releases/libshout/">libshout</ulink>,
-      <ulink url="https://dl.matroska.org/downloads/libmatroska/">libmatroska</ulink>
-      (requires <ulink url="https://dl.matroska.org/downloads/libebml/">libebml</ulink>),
-      <ulink url="https://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
-      <ulink url="https://www.musepack.net/">Musepack</ulink>, and
-      <ulink url="https://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional codec plugins</bridgehead>
-    <para role="optional">
-      <xref linkend="faad2"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="libaom"/>,
-      <xref linkend="libass"/>,
-      <xref linkend="libmpeg2"/>,
-      <xref linkend="libpng"/>,
-      <!--<xref linkend="libtheora"/>,-->
-      <xref linkend="libva"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="opus"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="x264"/>,
-      <!--<ulink url="https://aomedia.googlesource.com/aom/">aom</ulink>,-->
-      <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="https://github.com/divideconcept/FluidLite">FluidLite</ulink>,
-      <ulink url="https://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
-      <ulink url="https://www.videolan.org/developers/libdca.html">libdca</ulink>,
-      <ulink url="https://wiki.xiph.org/index.php/OggKate">libkate</ulink>,
-      <ulink url="https://www.theora.org">libthora</ulink>,
-      <ulink url="https://www.khronos.org/openmax/">OpenMAX</ulink>,
-      <ulink url="https://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="https://wiki.xiph.org/Tremor">Tremor</ulink>,
-      <ulink url="https://www.twolame.org/">Twolame</ulink>, and
-      <ulink url="https://sourceforge.net/projects/zapping/">Zapping VBI</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional video plugins</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="fontconfig"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="fribidi"/>,
-      <!-- Using libplacebo is broken due to many API changes. The patch Arch
-      has for this only works on a version of libplacebo from July. VLC has
-      fixed this problem, but only for the upcoming VLC4.
-      https://code.videolan.org/videolan/vlc/-/merge_requests/2233#top -->
-      <xref linkend="libplacebo"/> (currently broken),
-      <xref linkend="librsvg"/>,
-      <xref linkend="libvdpau"/>,
-      <xref linkend="sdl"/>,
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>,
-      <!--<ulink url="http://libplacebo.org/">libplacebo</ulink>, and-->
-      <ulink url="https://github.com/Intel-Media-SDK/MediaSDK">libmfx</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional audio plugins</bridgehead>
-    <para role="optional">
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="libsamplerate"/>,
-      <ulink url="https://github.com/videolabs/libspatialaudio">spatialaudio</ulink>, and
-      <ulink url="https://jackaudio.org/">JACK</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
-    <para role="optional">
-      &qt5-deps; (required for the graphical user interface),
-      <ulink url="https://repo.or.cz/w/libtar.git/">libtar</ulink>,
-      <ulink url="https://libvnc.github.io/">libvncclient</ulink>,
-      <ulink url="https://www.lirc.org/">LIRC</ulink>, and
-      <ulink url="https://www.freerdp.com/">freerdp</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional visualisations and video filter plugins</bridgehead>
-    <para role="optional">
-      <ulink url="https://sourceforge.net/projects/goom/">Goom</ulink>,
-      <ulink url="https://www.vsxu.com">libvsxu</ulink>, and
-      <ulink url="https://sourceforge.net/projects/projectm/">projectM</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional service discovery plugins</bridgehead>
-    <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>
-    </para>
-
-    <bridgehead renderas="sect4">Miscellaneous options</bridgehead>
-    <para role="optional">
-      <xref linkend="gnutls"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="protobuf"/>,
-      <xref linkend="taglib"/>,
-      <xref role="runtime" linkend="xdg-utils"/> (runtime),
-      <ulink url="https://www.team-mediaportal.com/extensions/mp2-plugins/atmolight">AtmoLight</ulink>,
-      <ulink url="https://github.com/videolabs/libmicrodns">libmicrodns</ulink>, and
-      <!--<ulink url="https://developers.google.com/protocol-buffers/">protobuf</ulink>, and-->
-      <ulink url="https://github.com/Haivision/srt">Srt</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of VLC</title>
-
-    <para>
-      First, add a correction for problems of taglib-2.0 and later:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-taglib-1.patch</userinput></screen>
-
-    <para>
-      If you wish to add support for lua extensions, enforce the use of <application>lua52</application>:
-    </para>
-
-<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)"</userinput></screen>
-
-    <para>
-      Install <application>VLC</application> by running the following commands:
-    </para>
-
-<screen><userinput>BUILDCC=gcc ./configure --prefix=/usr --disable-libplacebo &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/vlc-&vlc-version; install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-libplacebo</parameter>: This switch is required to
-      disable support for using libplacebo as a rendering pipeline because VLC
-      is incompatible with the latest version of libplacebo.
-    </para>
-
-    <para>
-      <option>--disable-vpx</option>: Use this switch to disable
-      <application>libvpx</application>.
-    </para>
-
-    <!--<para>
-      <option>- -disable-lua</option>: Use this switch if you don't have
-      <application>Lua</application> installed.
-    </para>-->
-
-    <para>
-      <option>--disable-mad</option>: Use this switch if you don't
-      have <application>libmad</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-avcodec --disable-swscale</option>: Use these switches
-      if you don't have <application>FFmpeg</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-a52</option>: Use this switch if you don't have
-      <application>liba52</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-xcb</option>: Use this switch if you don't have
-      <application>X Window System</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-alsa</option>: Use this switch if you don't have
-      <application>ALSA</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-libgcrypt</option>: Use this switch if you don't
-      have <application>libgcrypt</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-sftp</option>: The default is to build the sftp
-      module if <xref linkend="libssh2"/> is installed. Use this switch
-      if you do not want to build this module.
-    </para>
-
-    <note>
-      <para>
-        There are many options to <application>VLC</application>'s
-        <command>configure</command> command. Check the
-        <command>configure --help</command> output for a complete list.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cvlc, nvlc, qvlc, rvlc, svlc, vlc and vlc-wrapper
-        </seg>
-        <seg>
-          libvlccore.so, libvlc.so, and many plugins in
-          /usr/lib/vlc/plugins
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/vlc,
-          /usr/share/kde4, and
-          /usr/share/doc/vlc-&vlc-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvlc">
-        <term><command>cvlc</command></term>
-        <listitem>
-          <para>
-            is a script to run VLC with the dummy interface
-          </para>
-          <indexterm zone="vlc cvlc">
-            <primary sortas="b-cvlc">cvlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nvlc">
-        <term><command>nvlc</command></term>
-        <listitem>
-          <para>
-            is a script to run VLC with the ncurses interface
-          </para>
-          <indexterm zone="vlc nvlc">
-            <primary sortas="b-nvlc">nvlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qvlc">
-        <term><command>qvlc</command></term>
-        <listitem>
-          <para>
-            is a script to run <application>VLC</application> with the
-            <application>Qt</application> interface
-          </para>
-          <indexterm zone="vlc qvlc">
-            <primary sortas="b-qvlc">qvlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rvlc">
-        <term><command>rvlc</command></term>
-        <listitem>
-          <para>
-            is a script to run <application>VLC</application> with a command
-            line interface
-          </para>
-          <indexterm zone="vlc rvlc">
-            <primary sortas="b-rvlc">rvlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svlc">
-        <term><command>svlc</command></term>
-        <listitem>
-          <para>
-            is a script to run <application>VLC</application> with the skins
-            interface
-          </para>
-          <indexterm zone="vlc svlc">
-            <primary sortas="b-svlc">svlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vlc-prog">
-        <term><command>vlc</command></term>
-        <listitem>
-          <para>
-            is the <application>VLC</application> media player
-          </para>
-          <indexterm zone="vlc vlc-prog">
-            <primary sortas="b-vlc">vlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-       <varlistentry id="vlc-wrapper">
-        <term><command>vlc-wrapper</command></term>
-        <listitem>
-          <para>
-            is a wrapper to drop privileges with <application>VLC</application>
-          </para>
-          <indexterm zone="vlc vlc-wrapper">
-            <primary sortas="b-vlc-wrapper">vlc-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,302 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xine-ui-download-http "&sourceforge-dl;/xine/xine-ui-&xine-ui-version;.tar.xz">
-  <!ENTITY xine-ui-download-ftp  " ">
-  <!ENTITY xine-ui-md5sum        "86a4db9050405a91fcc33b7ad85274f5">
-  <!ENTITY xine-ui-size          "2.1 MB">
-  <!ENTITY xine-ui-buildsize     "23 MB">
-  <!ENTITY xine-ui-time          "0.2 SBU">
-]>
-
-<sect1 id="xine-ui" xreflabel="xine-ui-&xine-ui-version;">
-  <?dbhtml filename="xine-ui.html"?>
-
-
-  <title>xine-ui-&xine-ui-version;</title>
-
-  <indexterm zone="xine-ui">
-    <primary sortas="a-Xine-User-Interface">Xine User Interface</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xine User Interface</title>
-
-    <para>
-      The <application>xine User Interface</application> package contains a
-      multimedia player. It plays back CDs, DVDs and VCDs. It also decodes
-      multimedia files like AVI, MOV, WMV, MPEG and MP3 from local disk drives,
-      and displays multimedia streamed over the Internet.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        Although this version of xine-ui works with most files, it
-        is unable to open encrypted (content-scrambled) DVDs with
-        the current version of libdvdcss.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xine-ui-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xine-ui-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xine-ui-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xine-ui-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xine-ui-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xine-ui-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xine User Interface Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xine-lib"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="aalib"/>,
-      <ulink url="https://www.lirc.org">LIRC</ulink>, and
-      <ulink url="https://github.com/cacalabs/libcaca">libcaca</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xine User Interface</title>
-
-    <para>
-      Install <application>xine User Interface</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 docsdir=/usr/share/doc/xine-ui-&xine-ui-version; install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>docsdir=/usr/share/doc/xine-ui-&xine-ui-version;</parameter>:
-      This parameter causes the <application>Xine UI</application> documentation
-      to be installed in the versioned directory
-      <filename class="directory">/usr/share/doc/xine-ui-&xine-ui-version;</filename>,
-      rather that the default
-      <filename class="directory">/usr/share/doc/xine-ui</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xine User Interface</title>
-
-    <sect3 id="xine-ui-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.xine/config</filename>
-      </para>
-
-      <indexterm zone="xine-ui xine-ui-config">
-        <primary sortas="e-AA.xine-config">~/.xine/config</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The above file is created and maintainable through the
-        <command>xine</command> setup dialog box. The documentation for the
-        configuration settings is located at
-        <filename>/usr/share/doc/xine-ui-&xine-ui-version;/README.config_en</filename>.
-      </para>
-
-      <para>
-        If you have a DVB TV card, you can watch TV with the command
-        <command>xine dvb://</command> and change channels with the scroll wheel
-        on your mouse.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aaxine, cacaxine, fbxine, xine,
-          xine-bugreport, xine-check, and
-          xine-remote
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xine and
-          /usr/share/doc/xine-ui-&xine-ui-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aaxine">
-        <term><command>aaxine</command></term>
-        <listitem>
-          <para>
-            is an ASCII art video player which utilizes
-            <application>AAlib</application> as the frontend for the
-            <application>xine Libraries</application>
-          </para>
-          <indexterm zone="xine-ui aaxine">
-            <primary sortas="b-aaxine">aaxine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cacaxine">
-        <term><command>cacaxine</command></term>
-        <listitem>
-          <para>
-            is a color ASCII art video player which utilizes
-            <application>CACA</application> as the frontend for the
-            <application>xine Libraries</application>
-          </para>
-          <indexterm zone="xine-ui cacaxine">
-            <primary sortas="b-cacaxine">cacaxine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fbxine">
-        <term><command>fbxine</command></term>
-        <listitem>
-          <para>
-            is a frame buffer interface to the
-            <application>xine Libraries</application>
-          </para>
-          <indexterm zone="xine-ui fbxine">
-            <primary sortas="b-fbxine">fbxine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xine">
-        <term><command>xine</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="xine-ui xine">
-            <primary sortas="b-xine">xine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xine-bugreport">
-        <term><command>xine-bugreport</command></term>
-        <listitem>
-          <para>
-            produces a terse system description and guides you through the
-            process of reporting a bug
-          </para>
-          <indexterm zone="xine-ui xine-bugreport">
-            <primary sortas="b-xine-bugreport">xine-bugreport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xine-check">
-        <term><command>xine-check</command></term>
-        <listitem>
-          <para>
-            tests the <command>xine</command> video player installation for
-            common problems. It tests the operating system settings,
-            installation of plugins, CD/DVD drive settings and video support
-            parameters
-          </para>
-          <indexterm zone="xine-ui xine-check">
-            <primary sortas="b-xine-check">xine-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xine-remote">
-        <term><command>xine-remote</command></term>
-        <listitem>
-          <para>
-            is a tool to connect to a <command>xine</command> remote control
-            server
-          </para>
-          <indexterm zone="xine-ui xine-remote">
-            <primary sortas="b-xine-remote">xine-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/videoutils/xine.xml
===================================================================
--- multimedia/videoutils/xine.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ multimedia/videoutils/xine.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="xine" xreflabel="xine">
+<?dbhtml filename="xine.html" dir="multimedia"?>
+<title>xine</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: tworking/connect/advanced-network.xml
===================================================================
--- networking/connect/advanced-network.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="advanced-network" revision="systemd">
-  <?dbhtml filename="advanced-network.html"?>
-
-
-  <title>Advanced Network Setup</title>
-
-  <sect2 id="network-bridge">
-    <title>Network Bridge</title>
-
-    <sect3 role="kernel" id="advanced-network-bridge-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration
-        and recompile the kernel if necessary:
-      </para>
-
-<screen><literal>Networking support: Y
-  Networking options:
-    802.1d Ethernet Bridging: M or Y</literal></screen>
-
-      <indexterm zone="advanced-network advanced-network-bridge-kernel">
-        <primary sortas="d-advanced-network-bridge">Advanced Network Bridge</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Setting up a Network Bridge</title>
-
-      <para>
-        In this section we are going to discuss how to set up a network
-        bridge using <command>systemd-networkd</command>. In the examples
-        below, <replaceable>eth0</replaceable> represents the external
-        interface that is being bridged, while <replaceable>br0</replaceable>
-        represents the bridge interface.
-      </para>
-
-      <para>
-        To create a bridge interface, create the following configuration file
-        by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/systemd/network/50-br0.netdev &lt;&lt; EOF
-<literal>[NetDev]
-Name=<replaceable>br0</replaceable>
-Kind=bridge</literal>
-EOF</userinput></screen>
-
-      <para>
-        To assign a network interface to a bridge, create the following
-        configuration file by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/systemd/network/51-eth0.network &lt;&lt; EOF
-<literal>[Match]
-Name=<replaceable>eth0</replaceable>
-
-[Network]
-Bridge=<replaceable>br0</replaceable></literal>
-EOF</userinput></screen>
-
-      <para>
-        Repeat the process for any other interfaces that need to be bridged.
-        Note that it is important that nothing assigns any addresses to the
-        bridged interfaces. If you are using <xref linkend="NetworkManager"/>,
-        <!--or <xref linkend="wicd"/>i,--> make sure you configure them to ignore
-        the bridged interfaces, as well as the bridge interface itself.
-      </para>
-
-      <para>
-        If you are on a network which uses DHCP for assigning ip addresses,
-        create the following configuration file by running the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/systemd/network/60-br0.network &lt;&lt; EOF
-<literal>[Match]
-Name=<replaceable>br0</replaceable>
-
-[Network]
-DHCP=yes</literal>
-EOF</userinput></screen>
-
-      <para>
-        Alternatively, if using a static ip setup, create the following
-        configuration file by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/systemd/network/60-br0.network &lt;&lt; EOF
-<literal>[Match]
-Name=<replaceable>br0</replaceable>
-
-[Network]
-Address=192.168.0.2/24
-Gateway=192.168.0.1
-DNS=192.168.0.1</literal>
-EOF</userinput></screen>
-
-      <para>
-        To bring up the bridge interface, simply restart the
-        <command>systemd-networkd</command> daemon by running the following
-        command as the  <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>systemctl restart systemd-networkd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <!-- <sect2 id="network-interface-bonding">
-    <title>Network Interface Bonding</title>
-
-    <sect3 role="kernel" id="advanced-network-bonding-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration
-        and recompile the kernel if necessary:
-      </para>
-
-<screen><literal>Device Drivers:
-  Network device support: Y
-    Bonding driver support: M or Y</literal></screen>
-
-      <indexterm zone="advanced-network advanced-network-bonding-kernel">
-        <primary sortas="d-advanced-network-bonding">Advanced Network Bonding</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Setting up Network Interface Bonding</title>
-
-    </sect3>
-
-  </sect2> -->
-
-</sect1>
Index: tworking/connect/connect.xml
===================================================================
--- networking/connect/connect.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
-
-<chapter id="basicnet-connect">
-  <?dbhtml filename="connect.html"?>
-
-  <title>Connecting to a Network</title>
-
-  <para>
-    The LFS book covers setting up networking by connecting to a LAN
-  with a static IP address. There are other methods used to obtain an IP
-  address and connect to a LAN and other networks (such as the Internet).
-  The most popular methods (DHCP and PPP) are covered in this chapter.</para>
-
-  <para>
-    DHCP stands for Dynamic Host Configuration Protocol. It is a protocol used
-    by many sites to automatically provide information such as IP addresses,
-    subnet masks and routing information to computers.  If your network uses
-    DHCP, you will need a DHCP client in order to connect to it.
-  </para>
-<!-- we do not include ppp
-  <para>
-    PPP stands for Point-to-Point Protocol. It is a data link protocol
-    commonly used for establishing authenticated IP connections over
-    a phone line with a modem, or over radio waves with a cellular phone. There
-    is also a variant (PPPoE) that works over Ethernet and is used by cable
-    providers to authenticate the Internet connections.
-  </para>
--->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppp.xml"/> -->
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="advanced-network.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>-->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kea.xml"/>-->
-
-</chapter>
Index: tworking/connect/dhcpcd.xml
===================================================================
--- networking/connect/dhcpcd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,467 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dhcpcd-download-http "https://github.com/NetworkConfiguration/dhcpcd/releases/download/v&dhcpcd-version;/dhcpcd-&dhcpcd-version;.tar.xz">
-  <!ENTITY dhcpcd-download-ftp  " ">
-  <!ENTITY dhcpcd-md5sum        "ef8356d711b17701928ead7206d15234">
-  <!ENTITY dhcpcd-size          "264 KB">
-  <!ENTITY dhcpcd-buildsize     "3.0 MB (with tests)">
-  <!ENTITY dhcpcd-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
-  <?dbhtml filename="dhcpcd.html"?>
-
-
-  <title>dhcpcd-&dhcpcd-version;</title>
-
-  <indexterm zone="dhcpcd">
-    <primary sortas="a-dhcpcd">dhcpcd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dhcpcd</title>
-
-    <para>
-      <application>dhcpcd</application> is an implementation of the
-      DHCP client specified in RFC2131. A DHCP client is useful for connecting
-      your computer to a network which uses DHCP to assign network
-      addresses. dhcpcd strives to be a fully featured, yet very lightweight
-      DHCP client.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dhcpcd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dhcpcd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dhcpcd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dhcpcd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dhcpcd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dhcpcd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dhcpcd-&dhcpcd-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">dhcpcd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="llvm"/> (with Clang),
-      <xref linkend="ntp"/>,
-      <ulink url="https://chrony-project.org/">chronyd</ulink>, and
-      <ulink url="https://github.com/thkukuk/ypbind-mt/">ypbind</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 id='dhcpcd-privsep'>
-    <title>Privilege separation</title>
-
-    <para>
-      Recent releases of <application>dhcpcd</application> optionally support
-      privilege separation. As the practical security benefits of this are
-      unclear for a program like <application>dhcpcd</application> and the
-      setup is more complicated, the book currently defaults to disable it.
-    </para>
-    <para>
-      If you however would like to use privilege separation, additional
-      installation steps are necessary to set up the proper environment. Issue
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install  -v -m700 -d /var/lib/dhcpcd &amp;&amp;
-
-groupadd -g 52 dhcpcd        &amp;&amp;
-useradd  -c 'dhcpcd PrivSep' \
-         -d /var/lib/dhcpcd  \
-         -g dhcpcd           \
-         -s /bin/false       \
-         -u 52 dhcpcd &amp;&amp;
-chown    -v dhcpcd:dhcpcd /var/lib/dhcpcd </userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dhcpcd</title>
-
-<!--
-    <para>
-      First, fix an issue that occurs when running dhcpcd with the '-b' switch:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../dhcpcd-&dhcpcd-version;-upstream_fixes-1.patch</userinput></screen>
-
--->
-    <para>
-      Build <application>dhcpcd</application> without privilege separation
-      by running the following command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --libexecdir=/usr/lib/dhcpcd \
-            --dbdir=/var/lib/dhcpcd      \
-            --runstatedir=/run           \
-            --disable-privsep         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Alternatively, build <application>dhcpcd</application> with privilege
-      separation by running the following commands:
-    </para>
-
-<screen role="nodump"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --libexecdir=/usr/lib/dhcpcd \
-            --dbdir=/var/lib/dhcpcd      \
-            --runstatedir=/run           \
-            --privsepuser=dhcpcd         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-<!--
-    <para>
-      By default, a plain text lease info file isn't created but the
-      <application>dhcpcd</application> provides a hook which can be used for
-      creating such a file. Install the hook by running the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>sed -i "s;/var/lib;/run;g" dhcpcd-hooks/50-dhcpcd-compat &amp;&amp;
-install -v -m 644 dhcpcd-hooks/50-dhcpcd-compat /lib/dhcpcd/dhcpcd-hooks/</userinput></screen>
--->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/dhcpcd</parameter>: This switch sets a
-      better location for the dhcpcd internal libraries.
-    </para>
-
-    <para>
-      <parameter>--dbdir=/var/lib/dhcpcd</parameter>: This switch adjusts the
-      database directory because the default directory,
-      <filename class="directory">/var/db</filename>, is not FHS-compliant.
-    </para>
-
-    <para>
-      <parameter>--runstatedir=/run</parameter>: This switch sets the runtime
-      state directory because the default
-      <filename class="directory">/var/run</filename> is a symbolic
-      link to <filename class="directory">/run</filename>, and using
-      <filename class="directory">/var/run</filename> is deprecated.
-    </para>
-
-    <para>
-      <parameter>--disable-privsep</parameter>: This switch disables privilege
-      separation, which is the default in dhcpcd. This switch is not used in
-      the build configuration where privilege separation is used.
-    </para>
-
-    <para>
-      <parameter>--privsepuser=dhcpcd</parameter>: This switch sets the
-      privilege separation user in the build configuration where privilege
-      escalation is used.
-    </para>
-
-    <para>
-      <option>--with-hook=...</option>: You can optionally install more hooks,
-      for example to install some configuration files such as
-      <filename>ntp.conf</filename>. A set of hooks can be found in the
-      <filename class="directory">dhcpcd-hooks</filename> directory in the
-      build tree.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring dhcpcd</title>
-
-    <sect3 id="dhcpcd-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/dhcpcd.conf</filename>
-      </para>
-
-      <indexterm zone="dhcpcd dhcpcd-config">
-        <primary sortas="e-etc-dhcpcd-dhcpcd-conf">/etc/dhcpcd/dhcpcd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="dhcpcd-init" revision="sysv">
-      <title>General Configuration Information</title>
-
-      <para>
-        To configure <command>dhcpcd</command>, you need to first install
-        the network service script,
-        <filename>/usr/lib/services/dhcpcd</filename>
-        included in the <xref linkend="bootscripts"/> package
-        (as user <systemitem class="username">root</systemitem>):
-      </para>
-
-      <indexterm zone="dhcpcd dhcpcd-init">
-        <primary sortas="f-dhcpcd">dhcpcd (service script)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>make install-service-dhcpcd</userinput></screen>
-
-      <note>
-        <para id="dhcpcd-config3">
-          The default for <command>dhcpcd</command> is to set the hostname
-          and mtu. It also overwrites <filename>/etc/resolv.conf </filename>
-          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>.
-          You can change this behavior by removing or adding hooks from/to
-          that directory. The execution of hooks can be disabled by using
-          the <option>--nohook</option> (<option>-C</option>) command line
-          option or by the <option>nohook</option> option in the
-          <filename>/etc/dhcpcd.conf</filename> file.
-        </para>
-      </note>
-
-      <para id="dhcpcd-config2">
-        Finally, as the <systemitem class="username">root</systemitem> user
-        create the <filename>/etc/sysconfig/ifconfig.eth0</filename>
-        configuration file using the following commands. Adjust appropriately
-        for additional interfaces:
-      </para>
-
-      <indexterm zone="dhcpcd dhcpcd-config2">
-        <primary sortas="e-etc-sysconfig-dhcpcd">/etc/sysconfig/ifconfig.eth0 (dhcpcd)</primary>
-      </indexterm>
-
-<screen role='root'><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhcpcd"
-DHCP_START="-b -q -h $HOSTNAME <replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
-DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <para>
-        For more information on the appropriate <envar>DHCP_START</envar> and
-        <envar>DHCP_STOP</envar> values, examine the man page for
-        <command>dhcpcd</command>.
-      </para>
-
-      <indexterm zone="dhcpcd dhcpcd-config3">
-        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 id="dhcpcd-init2" revision="sysv">
-      <title>Configuration Information: fixed ip</title>
-
-      <para id="dhcpcd-config4">
-        Although not usual, it is possible that you need
-        to configure <application>dhcpcd</application> to use a fixed ip. Here,
-        we give an example. As the
-        <systemitem class="username">root</systemitem> user create the
-        <filename>/etc/sysconfig/ifconfig.eth0</filename> configuration file
-        using the following commands.  Adjust appropriately for additional
-        interfaces and for the actual ip and router you need:
-      </para>
-
-      <indexterm zone="dhcpcd dhcpcd-config4">
-        <primary sortas="e-etc-sysconfig-dhcpcd">/etc/sysconfig/ifconfig.eth0 (dhcpcd)</primary>
-      </indexterm>
-
-<screen role='nodump'><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhcpcd"
-DHCP_START="-b -q -S ip_address=192.168.0.10/24 -S routers=192.168.0.1"
-DHCP_STOP="-k"</literal>
-EOF</userinput></screen>
-
-      <para>
-        You can either use DNS servers in
-        <filename>/etc/resolv.conf</filename> from another system, your
-        preferred servers, or just the example
-        <filename>/etc/resolv.conf.head</filename> file below as is:
-      </para>
-
-<screen role='nodump'><userinput>cat &gt; /etc/resolv.conf.head &lt;&lt; "EOF"
-<literal># OpenDNS servers
-nameserver 208.67.222.222
-nameserver 208.67.220.220</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-   <sect3 id="dhcpcd-init3" revision="systemd">
-      <title>General Configuration Information</title>
-
-      <para>
-        If you want to configure network interfaces at boot using
-        <command>dhcpcd</command>, you need to install the
-        systemd unit included in <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install-dhcpcd</userinput></screen>
-
-      <indexterm zone="dhcpcd dhcpcd-init3">
-        <primary sortas="f-dhcpcd">dhcpcd</primary>
-      </indexterm>
-
-      <note>
-        <para id="dhcpcd-config5">
-          The default behavior of <command>dhcpcd</command> is to set the
-          hostname and the mtu. It also overwrites <filename>/etc/resolv.conf
-          </filename> and <filename>/etc/ntp.conf</filename>. These
-          modifications to system configuration files are done by hooks which
-          are stored in <filename class="directory">
-          /usr/lib/dhcpcd/dhcpcd-hooks</filename>. You can change this behavior
-          by removing or adding hooks from/to that directory. The execution
-          of hooks can be disabled by using the <option>--nohook</option>
-          (<option>-C</option>) command line option or by the
-          <option>nohook</option> option in the <filename>/etc/dhcpcd.conf
-          </filename> file.
-        </para>
-      </note>
-
-      <indexterm zone="dhcpcd dhcpcd-config5">
-        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-      </indexterm>
-
-      <note>
-        <para>
-          Make sure that you disable the <command>systemd-networkd</command>
-          service or configure it not to manage the interfaces you want to
-          manage with <application>dhcpcd</application>.
-        </para>
-      </note>
-
-      <para>
-        At this point you can test if <command>dhcpcd</command> is
-        behaving as expected by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>systemctl start dhcpcd@<replaceable>eth0</replaceable></userinput></screen>
-
-      <para>
-        To start <command>dhcpcd</command> on a specific interface
-        at boot, enable the previously installed systemd unit by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>systemctl enable dhcpcd@<replaceable>eth0</replaceable></userinput></screen>
-
-      <para>
-        Replace <replaceable>eth0</replaceable> with the actual interface name.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>dhcpcd</seg>
-        <seg>/usr/lib/dhcpcd/dev/udev.so</seg>
-        <seg>/{usr,var}/lib/dhcpcd and /usr/share/dhcpcd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dhcpcd-prog">
-        <term><command>dhcpcd</command></term>
-        <listitem>
-          <para>
-            is an implementation of the DHCP client specified in RFC2131
-          </para>
-          <indexterm zone="dhcpcd dhcpcd-prog">
-            <primary sortas="b-dhcpcd">dhcpcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dhcpcd-udev">
-        <term><filename class="libraryfile">udev.so</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="dhcpcd dhcpcd-udev">
-            <primary sortas="c-dhcpcd-udev">udev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,282 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fetchmail-download-http "&sourceforge-dl;/fetchmail/fetchmail-&fetchmail-version;.tar.xz">
-  <!ENTITY fetchmail-download-ftp  " ">
-  <!ENTITY fetchmail-md5sum        "0b833211c628f18607b82ae9add97c40">
-  <!ENTITY fetchmail-size          "1.1 MB">
-  <!ENTITY fetchmail-buildsize     "15 MB including tests">
-  <!ENTITY fetchmail-time          "0.1 SBU including tests">
-]>
-
-<sect1 id="fetchmail" xreflabel="fetchmail-&fetchmail-version;">
-  <?dbhtml filename="fetchmail.html"?>
-
-
-  <title>Fetchmail-&fetchmail-version;</title>
-
-  <indexterm zone="fetchmail">
-    <primary sortas="a-Fetchmail">Fetchmail</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fetchmail</title>
-
-    <para>
-      The <application>Fetchmail</application> package contains a mail
-      retrieval program. It retrieves mail from remote mail servers and
-      forwards it to the local (client) machine's delivery system, so it can
-      then be read by normal mail user agents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fetchmail-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fetchmail-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fetchmail-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fetchmail-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fetchmail-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fetchmail-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Fetchmail Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      a local MDA (<xref linkend="procmail"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/> and
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for running fetchmailconf)</bridgehead>
-    <para role="optional">
-      <xref linkend="python3"/>, built after
-      <xref linkend="tk"/>, with the
-      <ulink url="https://python-future.org/">py-future</ulink> package
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fetchmail</title>
-
-    <para>
-      Create a dedicated user for the fetchmail program.
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>useradd -c "Fetchmail User" -d /dev/null -g nogroup \
-        -s /bin/false -u 38 fetchmail</userinput></screen>
-
-    <para>
-      Install <application>Fetchmail</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 \
-./configure --prefix=/usr \
-            --enable-fallback=procmail &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>make install                                  &amp;&amp;
-chown -v fetchmail:nogroup /usr/bin/fetchmail</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>PYTHON=python3</parameter>: a version of Python is
-      <emphasis>required</emphasis>, but only used to install a module to allow
-      fetchmailconf to be run. That module is unmaintained and should not be
-      used.
-    </para>
-
-    <para>
-      <parameter>--enable-fallback=procmail</parameter>: This tells
-      <application>Fetchmail</application> to hand incoming mail to
-      <application>Procmail</application> for delivery, if the port 25 mail
-      server is not present or not responding.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Fetchmail</title>
-
-    <sect3 id="fetchmail-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.fetchmailrc</filename>
-      </para>
-
-      <indexterm zone="fetchmail fetchmail-config">
-        <primary sortas="e-AA.fetchmailrc">~/.fetchmailrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <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"
-<literal>
-# The logfile needs to exist when fetchmail is invoked, otherwise it will
-# dump the details to the screen. As with all logs, you will need to rotate
-# or clear it from time to time.
-set logfile fetchmail.log
-set no bouncemail
-# You probably want to set your local username as the postmaster
-set postmaster <replaceable>&lt;username&gt;</replaceable>
-
-poll SERVERNAME :
-    user <replaceable>&lt;isp_username&gt;</replaceable> pass <replaceable>&lt;password&gt;</replaceable>;
-    mda "/usr/bin/procmail -f %F -d %T";</literal>
-EOF
-
-touch ~/fetchmail.log       &amp;&amp;
-chmod -v 0600 ~/.fetchmailrc</userinput></screen>
-
-      <para>
-        This is an example configuration that should suffice for most people.
-        You can add as many users and servers as you need using the same syntax.
-      </para>
-
-      <para>
-        <command>man fetchmail</command>: Look for the section near the bottom
-        named <emphasis>CONFIGURATION EXAMPLES</emphasis>. It gives some quick
-        examples. There are countless other configuration options once you get
-        used to it.
-      </para>
-
-      <para>
-        If you expect to receive very little mail you can invoke fetchmail
-        when you wish to receive any incoming mail. More commonly, it is either
-        invoked in daemon mode with the <literal>-d</literal> option either on
-        the command line, or in <filename>.fetchmailrc</filename> (see 'DAEMON
-        MODE' in man fetchmailconf), or alternatively it is invoked from a
-        cron job.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>fetchmail and fetchmailconf</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fetchmail-prog">
-        <term><command>fetchmail</command></term>
-        <listitem>
-          <para>
-            when executed as a user, this will source
-            <filename>~/.fetchmailrc</filename> and download the appropriate
-            mail
-          </para>
-          <indexterm zone="fetchmail fetchmail-prog">
-            <primary sortas="b-fetchmail">fetchmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fetchmailconf">
-        <term><command>fetchmailconf</command></term>
-        <listitem>
-          <para>
-            is intended to assist you in setting up and editing a
-            <filename>~/.fetchmailrc</filename> configuration file, by using
-            a <application>Tk</application> GUI interface. It is written for
-            <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
-          </para>
-          <!-- keep this description commented but fetchmailconf
-               has been updated in the last months (June 2020). It can use
-               Python 3, with the help of the "past" module.
-          <para>
-            is an unmaintained GUI command to assist in creating a
-            <filename>~/.fetchmailrc</filename> configuration file and
-            should not be used.
-          </para>-->
-          <indexterm zone="fetchmail fetchmailconf">
-            <primary sortas="b-fetchmailconf">fetchmailconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/mailnews/mailnews.xml
===================================================================
--- networking/mailnews/mailnews.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="basicnet-mailnews">
-  <?dbhtml filename="mailnews.html"?>
-  <title>Mail/News Clients</title>
-
-  <para>
-    Mail Clients help you retrieve (Fetchmail), sort (Procmail), read and
-    compose responses (Heirloom mailx, Mutt, Pine, Kmail, Balsa, Evolution,
-    SeaMonkey) to email.
-  </para>
-
-  <para>
-    News clients also help you retrieve, sort, read and compose
-    responses, but these messages travel through USENET (a worldwide
-    bulletin board system) using the Network News Transfer Protocol
-    (NNTP).
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpine.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fetchmail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mailx.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mutt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procmail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other.xml"/>
-
-</chapter>
Index: tworking/mailnews/mailx.xml
===================================================================
--- networking/mailnews/mailx.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,296 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- upstream is apparently still using CVS at sourceforge,
-  but not making tarballs.  fedora have a script using CVS, but
-  debian keep a tarball -->
-  <!ENTITY mailx-download-http "&sources-anduin-http;/mailx/heirloom-mailx_&mailx-version;.orig.tar.gz">
-  <!ENTITY mailx-download-ftp  " ">
-  <!ENTITY mailx-md5sum        "29a6033ef1412824d02eb9d9213cb1f2">
-  <!ENTITY mailx-size          "317 KB">
-  <!ENTITY mailx-buildsize     "3.2 MB">
-  <!ENTITY mailx-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mailx" xreflabel="mailx-&mailx-version;">
-  <?dbhtml filename="mailx.html"?>
-
-
-  <title>mailx-&mailx-version;</title>
-
-  <indexterm zone="mailx">
-    <primary sortas="a-Heirloom-mailx">Heirloom mailx</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Heirloom mailx</title>
-
-    <para>
-      The <application>Heirloom mailx</application> package (formerly
-      known as the <application>Nail</application> package) contains
-      <command>mailx</command>, a command-line Mail User Agent derived from
-      Berkeley Mail. It is intended to provide the functionality of the POSIX
-      <command>mailx</command> command with additional support for MIME
-      messages, IMAP (including caching), POP3, SMTP, S/MIME, message
-      threading/sorting, scoring, and filtering. <application>Heirloom
-      mailx</application> is especially useful for writing scripts and batch
-      processing.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mailx-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mailx-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mailx-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mailx-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mailx-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mailx-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/heirloom-mailx-&mailx-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Heirloom mailx Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="openssl10"/> or -->
-      <xref linkend="nss"/>,
-      <xref linkend="mitkrb"/> (for IMAP GSSAPI authentication), and an
-      <xref linkend="server-mail"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Heirloom mailx</title>
-
-   <!-- see r12697 for explanation, and still used by fedora even though it often
-    does work with a parallel make -->
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Heirloom mailx</application> by running the
-      following commands.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../heirloom-mailx-&mailx-version;-fixes-1.patch &amp;&amp;
-
-sed 's@&lt;openssl@&lt;openssl-1.0/openssl@' \
-    -i openssl.c fio.c makeconfig      &amp;&amp;
-
-make -j1 LDFLAGS+="-L /usr/lib/openssl/" \
-         SENDMAIL=/usr/sbin/sendmail</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 PREFIX=/usr UCBINSTALL=/usr/bin/install install &amp;&amp;
-
-ln -v -sf mailx /usr/bin/mail &amp;&amp;
-ln -v -sf mailx /usr/bin/nail &amp;&amp;
-
-install -v -m755 -d     /usr/share/doc/heirloom-mailx-&mailx-version; &amp;&amp;
-install -v -m644 README /usr/share/doc/heirloom-mailx-&mailx-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make SENDMAIL=/usr/sbin/sendmail</command>: This changes the
-      default MTA path of <command>/usr/lib/sendmail</command>.
-    </para>
-
-    <para>
-      <command>make PREFIX=/usr UCBINSTALL=/usr/bin/install
-      install</command>: This changes the default installation path of
-      <filename class='directory'>/usr/local</filename> and the default
-      <command>install</command> command path of
-      <filename class='directory'>/usr/ucb</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Heirloom mailx</title>
-
-    <sect3 id="mailx-config">
-      <title>Config Files</title>
-
-      <para>
-<!-- ~/.nailrc seems not to be supported anymore
-        <filename>/etc/nail.rc</filename>, <filename>~/.mailrc</filename>
-        and <filename>~/.nailrc</filename>
--->
-        <filename>/etc/nail.rc</filename> and <filename>~/.mailrc</filename>
-      </para>
-
-      <indexterm zone="mailx mailx-config">
-        <primary sortas="e-etc-nail.rc">/etc/nail.rc</primary>
-      </indexterm>
-
-      <indexterm zone="mailx mailx-config">
-        <primary sortas="e-AA.mailrc">~/.mailrc</primary>
-      </indexterm>
-<!--
-      <indexterm zone="mailx mailx-config">
-        <primary sortas="e-AA.nailrc">~/.nailrc</primary>
-      </indexterm>
--->
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        For displaying mails, <application>mailx</application>
-        uses a pager program. Since the default of <command>pg</command>
-        is not available on a LFS system, its required to
-        specify which pager is to use. By default, there is
-        <command>more</command> and the more comfortable
-        <command>less</command> installed. If the
-        variable PAGER is not set in <filename>/etc/profile</filename>
-        or <filename>~/.bash_profile</filename>, or if it
-        should be another pager just for reading mails, it can be
-        set system wide in <filename>/etc/nail.rc</filename>:
-      </para>
-
-      <screen role="nodump"><userinput>echo "set PAGER=<replaceable>&lt;more|less&gt;</replaceable>" &gt;&gt; /etc/nail.rc</userinput></screen>
-
-      <para>or individually for the actual user in <filename>~/.mailrc</filename>:</para>
-
-      <screen role="nodump"><userinput>echo "set PAGER=<replaceable>&lt;more|less&gt;</replaceable>" &gt;&gt; ~/.mailrc</userinput></screen>
-
-      <para>
-        Other interesting options to set in the config files might
-        be EDITOR and MAILDIR.
-      </para>
-
-      <para>
-        If not set in the environment for other packages, the
-        default editor can be set by:
-      </para>
-
-      <screen role="nodump"><userinput>echo "set EDITOR=<replaceable>&lt;vim|nano|...&gt;</replaceable>" &gt;&gt; /etc/nail.rc</userinput></screen>
-
-      <para>
-        Depending on which kind of <xref linkend="server-mail"/> is
-        installed, it might be required to set the MAILDIR variable
-        so <application>mailx</application> is able to find the mails:
-      </para>
-
-<screen role="nodump"><userinput>echo "set MAILDIR=Maildir" &gt;&gt; /etc/nail.rc</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>mail, mailx and nail</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mailx-prog">
-        <term><command>mailx</command></term>
-        <listitem>
-          <para>
-            is a command-line mail user agent compatible with the
-            <command>mailx</command> command found on commercial Unix
-            versions
-          </para>
-          <indexterm zone="mailx mailx-prog">
-            <primary sortas="b-mailx">mailx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mail-mailx">
-        <term><command>mail</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>mailx</command>
-          </para>
-          <indexterm zone="mailx mail-mailx">
-            <primary sortas="b-mail">mail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nail-mailx">
-        <term><command>nail</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>mailx</command>
-          </para>
-          <indexterm zone="mailx nail-mailx">
-            <primary sortas="b-nail">nail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,501 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mutt-download-http "https://bitbucket.org/mutt/mutt/downloads/mutt-&mutt-version;.tar.gz">
-  <!ENTITY mutt-download-ftp  " ">
-  <!ENTITY mutt-md5sum        "0d33c808d5556c283c01542c7730ccbd">
-  <!ENTITY mutt-size          "5.3 MB">
-  <!ENTITY mutt-buildsize     "48 MB">
-  <!ENTITY mutt-time          "0.2 SBU">
-]>
-
-<sect1 id="mutt" xreflabel="Mutt-&mutt-version;">
-  <?dbhtml filename="mutt.html"?>
-
-
-  <title>Mutt-&mutt-version;</title>
-
-  <indexterm zone="mutt">
-    <primary sortas="a-mutt">mutt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mutt</title>
-
-    <para>
-      The <application>Mutt</application> package contains a Mail User
-      Agent. This is useful for reading, writing, replying to, saving, and
-      deleting your email.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mutt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mutt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mutt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mutt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mutt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mutt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/mutt-&mutt-version;-memleak-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended (for a text version of the manual)</bridgehead>
-    <para role="recommended">
-      <xref linkend="lynx"/>, or
-      <xref linkend="Links"/> (or
-      <ulink url="&w3m-url;">W3m</ulink>, or
-      <ulink url="&elinks-url;">ELinks</ulink>) - please read the Note.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gdb"/>,
-      <xref linkend="gnupg2"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="libidn"/>,
-      <xref linkend="mitkrb"/>,
-      an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
-      <xref linkend="slang"/>,
-      <xref linkend="sqlite"/>,
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>,
-      <ulink url="https://mixmaster.sourceforge.net/">Mixmaster</ulink>,
-      <!-- from configure: \-\-with-bdb[=DIR] Use BerkeleyDB4 if gdbm is not
-      available but gdbm is installed in LFS, so do not mention BerkeleyDB
-      or -->
-      <ulink url="https://dbmx.net/qdbm/">QDBM</ulink> or
-      <ulink url="https://dbmx.net/tokyocabinet/">Tokyo Cabinet</ulink>
-    </para>
-
-<!--<bridgehead renderas="sect4">Optional (To Generate PDF Manual)</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-dsssl"/>,
-      <xref linkend="openjade"/>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/> with
-      <command>pdfjadetex</command> installed)
-    </para>-->
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/mutt"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mutt</title>
-
-    <note>
-      <para>
-        <application>Mutt</application> ships with an HTML version of its
-        manual, but the text version is no longer provided because differences
-        in the formatting from different text browsers compared to the shipped
-        version caused complaints. To get a text file, the following are used
-        in order of preference: <application>lynx</application> with overstriking
-        (backspaces) for emphasis, <application>w3m</application> or
-        <application>elinks</application>: the latter two apparently provide
-        plain text. Plain text is generally preferred unless reading the HTML
-        manual, so the instructions below use <application>lynx</application>
-        if available, or else <application>links</application> to produce plain
-        text.
-      </para>
-    </note>
-
-    <para>
-      <application>Mutt</application> requires a group named
-      <systemitem class="groupname">mail</systemitem>.  You can
-      add this group, if it does not exist, with this command
-      (as the &root; user):
-    </para>
-<!-- nodump because group mail should have been created in lfs -->
-<screen role="nodump"><userinput>groupadd -g 34 mail</userinput></screen>
-
-    <para>
-      If you did not install an <xref linkend="server-mail"/>, you need to
-      modify the ownership of <filename class="directory">/var/mail</filename>
-      with this command:
-    </para>
-
-<screen role="root"><userinput>chgrp -v mail /var/mail</userinput></screen>
-
-    <para>
-      Install <application>Mutt</application> by running the following
-      commands:
-    </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
-      <application>lynx</application> or to otherwise use
-      <application>links</application> to produce it (instead of
-      <application>elinks</application>), run the following command:
-    </para>
-
-<screen><userinput>sed  -e 's/ -with_backspaces//' \
-     -e 's/elinks/links/'       \
-     -e 's/-no-numbering -no-references//' \
-     -i doc/Makefile.in</userinput></screen>
-
-    <para>
-      Now configure and build the application:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                            \
-            --sysconfdir=/etc                        \
-            --with-docdir=/usr/share/doc/mutt-&mutt-version; \
-            --with-ssl                               \
-            --enable-external-dotlock                \
-            --enable-pop                             \
-            --enable-imap                            \
-            --enable-hcache                          \
-            --enable-sidebar                         &amp;&amp;
-make</userinput></screen>
-
-<!-- PDF broken with 1.14.0
-    <para>
-      To generate the PDF manual with <xref linkend="texlive"/>, run
-      the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc manual.pdf</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>
-
-<!--<para>
-      If you generated the PDF manual, install it
-      by issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root' remap='doc'><userinput>install -v -m644 doc/manual.pdf \
-    /usr/share/doc/mutt-&mutt-version;</userinput></screen>-->
-
-    <note>
-      <para>
-        If you used a DESTDIR method to only install to a temporary location as
-        a regular user (as part of a package management process), you will need
-        to run the following as the <systemitem class="username">root
-        </systemitem> user after completing the real install:
-      </para>
-
-<screen role="nodump"><userinput>chown root:mail /usr/bin/mutt_dotlock &amp;&amp;
-chmod -v 2755 /usr/bin/mutt_dotlock</userinput></screen>
-
-      <para>
-        An info file is now installed, so you will also need to recreate the
-        <filename>/usr/share/info/dir</filename> as described when
-        <application>Texinfo</application> was installed in LFS.
-      </para>
-    </note>
-
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... -e 's/ -with_backspaces//' ...</command>: This turns
-      off the backspaces used for overstriking when <application>lynx</application>
-      is used, resulting in readable plain text when using <command>view</command>.
-    </para>
-
-    <para>
-      <command>sed ... -e 's/elinks/links/' ...</command>: This allows
-      <command>links</command> to be run instead of <command>elinks</command>
-      which is not in the book.
-    </para>
-
-    <para>
-      <command>sed ... -e 's/-no-numbering -no-references//' ...</command>:
-      This removes switches which are not understood by <command>links</command>.
-    </para>
-
-    <para>
-      <parameter>--enable-external-dotlock</parameter>: In some circumstances
-      the mutt-dotlock program is not created. This switch ensures it is always
-      created.
-    </para>
-
-    <para>
-      <parameter>--enable-pop</parameter>: This switch enables POP3 support.
-    </para>
-
-    <para>
-      <parameter>--enable-imap</parameter>: This switch enables IMAP support.
-    </para>
-
-    <para>
-      <parameter>--enable-hcache</parameter>: This switch enables
-      header caching.
-    </para>
-
-    <para>
-      <parameter>--enable-sidebar</parameter>: This switch enables support
-      for the sidebar (a list of mailboxes). It is off by default, but can be
-      turned on by <command>:set sidebar_visible</command> in mutt (and off
-      again with ':unset'), or it can be enabled in <filename>
-      ~/.muttrc</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-ssl</parameter>: This parameter adds SSL/TLS
-      support from openssl in POP3/IMAP/SMTP.
-    </para>
-
-    <para>
-      <option>--enable-autocrypt --with-sqlite3</option>: These two
-      switches add support for passive protection against data collection,
-      using gnupg and gpgme (gpgme is enabled by autocrypt). See <ulink
-      url="http://www.mutt.org/doc/manual/#autocryptdoc">The Manual</ulink>.
-    </para>
-
-    <para>
-      <option>--enable-gpgme</option>: This switch enables GPG support
-      through the GPGME package. Use this switch if you want GPG support in
-      Mutt.
-    </para>
-
-    <para>
-      <option>--enable-smtp</option>: This switch enables
-      SMTP relay support.
-    </para>
-
-    <para>
-      <option>--with-idn2</option>: Use this parameter if both libidn and
-      libidn2 have been installed, and you wish to use libidn2 here.
-    </para>
-
-    <para>
-      <option>--with-sasl</option>: This parameter adds authentication support
-      from <xref linkend="cyrus-sasl"/> in POP3/IMAP/SMTP if they are enabled.
-      Depending on the server configuration, this may not be needed for POP3
-      or IMAP. However, it is needed for SMTP authentication.
-    </para>
-
-    <!-- we do not normally list all possible switches. LFS installs ncurses.
-    <para>
-      <option>\-\-with-slang</option>: Use <application>S-Lang
-      </application> instead of <application>Ncurses</application>.
-    </para> -->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Mutt</title>
-
-    <sect3 id="mutt-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/Muttrc</filename>,
-        <filename>~/.muttrc</filename>,
-        <filename>/etc/mime.types</filename>, and
-        <filename>~/.mime.types</filename>
-      </para>
-
-      <indexterm zone="mutt mutt-config">
-        <primary sortas="e-etc-Muttrc">/etc/Muttrc</primary>
-      </indexterm>
-
-      <indexterm zone="mutt mutt-config">
-        <primary sortas="e-AA.muttrc">~/.muttrc</primary>
-      </indexterm>
-
-      <indexterm zone="mutt mutt-config">
-        <primary sortas="e-etc-mime.types">/etc/mime.types</primary>
-      </indexterm>
-
-      <indexterm zone="mutt mutt-config">
-        <primary sortas="e-AA.mime.types">~/.mime.types</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        No changes in these files are necessary to begin using
-        <application>Mutt</application>.  When you are ready to make changes,
-        the man page for <filename>muttrc</filename> is a good starting place.
-      </para>
-
-      <para>
-        In order to utilize <application>GnuPG</application>, use the following
-        command:
-      </para>
-
-<screen><userinput>cat /usr/share/doc/mutt-&mutt-version;/samples/gpg.rc &gt;&gt; ~/.muttrc</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>flea, mutt, mutt_dotlock, muttbug, pgpewrap, mutt_pgpring, and
-        smime_keys</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/mutt-&mutt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="flea">
-        <term><command>flea</command></term>
-        <listitem>
-          <para>
-            is a script showing where to report bugs
-          </para>
-          <indexterm zone="mutt flea">
-            <primary sortas="b-flea">flea</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutt-prog">
-        <term><command>mutt</command></term>
-        <listitem>
-          <para>
-            is a Mail User Agent (MUA) which enables you to read, write
-            and delete your email
-          </para>
-          <indexterm zone="mutt mutt-prog">
-            <primary sortas="b-mutt">mutt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutt_dotlock">
-        <term><command>mutt_dotlock</command></term>
-        <listitem>
-          <para>
-            implements the mail spool file lock
-          </para>
-          <indexterm zone="mutt mutt_dotlock">
-            <primary sortas="b-mutt_dotlock">mutt_dotlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="muttbug">
-        <term><command>muttbug</command></term>
-        <listitem>
-          <para>
-            is a script identical to <command>flea</command>
-          </para>
-          <indexterm zone="mutt muttbug">
-            <primary sortas="b-muttbug">muttbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgpewrap">
-        <term><command>pgpewrap</command></term>
-        <listitem>
-          <para>
-            prepares a command line for the <xref linkend="gnupg2"/> utilities
-          </para>
-          <indexterm zone="mutt pgpewrap">
-            <primary sortas="b-pgpewrap">pgpewrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutt_pgpring">
-        <term><command>pgpring</command></term>
-        <listitem>
-          <para>
-            is a key ring dumper for
-            <ulink url="https://www.openpgp.org/about/">PGP</ulink>. It is not
-            needed for <xref linkend="gnupg2"/>
-          </para>
-          <indexterm zone="mutt mutt_pgpring">
-            <primary sortas="b-mutt_pgpring">mutt_pgpring</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smime_keys">
-        <term><command>smime_keys</command></term>
-        <listitem>
-          <para>
-            manages a keystore for S/MIME certificates
-          </para>
-          <indexterm zone="mutt smime_keys">
-            <primary sortas="b-smime_keys">smime_keys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/mailnews/other.xml
===================================================================
--- networking/mailnews/other.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="basicnet-mailnews-other">
-  <?dbhtml filename="othermn.html"?>
-
-
-  <title>Other Mail and News Programs</title>
-  <!--
-  <para>
-    <xref linkend="pan"/> is a GTK2 based newsreader program.
-  </para>
-  -->
-  <!--
-  <para>
-    <command>knode</command> is a <application>Qt</application> based
-    newseader program from <xref linkend="kdepim"/>.
-  </para>
-  -->
-  <!--
-  <para>
-    <command>kmail</command> is a <application>Qt</application> based mail
-    client from <xref linkend="kdepim"/>.
-  </para>
-  -->
-  <para>
-    <xref linkend="balsa"/> is a GTK2 based mail client.
-  </para>
-
-  <para>
-    <xref linkend="seamonkey"/> includes both a mail client and newsreader in
-    its installation.
-  </para>
-
-  <para>
-    <xref linkend="thunderbird"/> is a mail/news client based on the
-    <application>Mozilla</application> code base.
-  </para>
-
-  <para>
-    <xref linkend="evolution"/> is a mail client and organizer from the
-    <application>GNOME</application> desktop.
-  </para>
-
-</sect1>
Index: tworking/mailnews/procmail.xml
===================================================================
--- networking/mailnews/procmail.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-ftp  " ">
-  <!ENTITY procmail-md5sum        "1678ea99b973eb77eda4ecf6acae53f1">
-  <!ENTITY procmail-size          "226 KB">
-  <!ENTITY procmail-buildsize     "1.7 MB">
-  <!ENTITY procmail-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="procmail" xreflabel="Procmail-&procmail-version;">
-  <?dbhtml filename="procmail.html"?>
-
-
-  <title>Procmail-&procmail-version;</title>
-
-  <indexterm zone="procmail">
-    <primary sortas="a-Procmail">Procmail</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Procmail</title>
-
-    <para>
-      The <application>Procmail</application> package contains an autonomous
-      mail processor. This is useful for filtering and sorting incoming mail.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&procmail-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&procmail-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &procmail-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &procmail-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &procmail-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &procmail-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/procmail-&procmail-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Procmail Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       A <xref linkend="server-mail"/> that installs sendmail
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Procmail</title>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Install <application>Procmail</application> by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>sed -i 's/getline/get_line/' src/*.[ch]                   &amp;&amp;
-patch -Np1 -i ../procmail-&procmail-version;-consolidated_fixes-1.patch &amp;&amp;
-
-make LOCKINGTEST=/tmp MANDIR=/usr/share/man install       &amp;&amp;
-make install-suid</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/getline/get_line/' src/*.[ch]</command>: This renames
-      procmail's getline function to avoid conflict with the getline function
-      from <application>glibc</application>.
-    </para>
-
-    <para>
-      <command>make LOCKINGTEST=/tmp install</command>: This prevents
-      <command>make</command> from asking you where to test file-locking
-      patterns.
-    </para>
-
-    <para>
-      <command>make install-suid</command>: Modifies permissions of
-      the installed files.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Procmail</title>
-
-    <sect3 id="procmail-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/procmailrc</filename> and
-        <filename>~/.procmailrc</filename>
-      </para>
-
-      <indexterm zone="procmail procmail-config">
-        <primary sortas="e-AA.procmailrc">~/.procmailrc</primary>
-      </indexterm>
-
-      <indexterm zone="procmail procmail-config">
-        <primary sortas="e-etc-procmailrc">/etc/procmailrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Recipes have to be written and placed in
-        <filename>~/.procmailrc</filename> for execution. The procmailex man
-        page is the starting place to learn how to write recipes.
-        For additional information, see also
-        <ulink url="https://pm-doc.sourceforge.net/"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>formail, lockfile, mailstat and procmail</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="formail">
-        <term><command>formail</command></term>
-        <listitem>
-          <para>
-            is a filter that can be used to format mail into mailbox format
-          </para>
-          <indexterm zone="procmail formail">
-            <primary sortas="b-formail">formail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lockfile">
-        <term><command>lockfile</command></term>
-        <listitem>
-          <para>
-            is a utility that can lock a file for single use interactively or
-            in a script
-          </para>
-          <indexterm zone="procmail lockfile">
-            <primary sortas="b-lockfile">lockfile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailstat">
-        <term><command>mailstat</command></term>
-        <listitem>
-          <para>
-            prints a summary report of mail that has been filtered by
-            <command>procmail</command> since the last time
-            <command>mailstat</command> was ran
-          </para>
-          <indexterm zone="procmail mailstat">
-            <primary sortas="b-mailstat">mailstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="procmail-prog">
-        <term><command>procmail</command></term>
-        <listitem>
-          <para>
-            is an autonomous mail processor. It performs all the functions
-            of an MDA (Mail Delivery Agent)
-          </para>
-          <indexterm zone="procmail procmail-prog">
-            <primary sortas="b-procmail">procmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/c-ares.xml
===================================================================
--- networking/netlibs/c-ares.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "2b0f0df7491538a0d10f3310e13d4b5f">
-  <!ENTITY c-ares-size          "1.2 MB">
-  <!ENTITY c-ares-buildsize     "11 MB">
-  <!ENTITY c-ares-time          "0.1 SBU">
-]>
-
-<sect1 id="c-ares" xreflabel="c-ares-&c-ares-version;">
-  <?dbhtml filename="c-ares.html"?>
-
-
-  <title>c-ares-&c-ares-version;</title>
-
-  <indexterm zone="c-ares">
-    <primary sortas="a-c-ares">c-ares</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to c-ares</title>
-
-    <para>
-      <application>c-ares</application> is a C library for asynchronous DNS
-      requests.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&c-ares-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&c-ares-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &c-ares-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &c-ares-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &c-ares-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &c-ares-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">c-ares Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of c-ares</title>
-
-    <para>
-      Install <application>c-ares</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake  -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not include a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-<!-- Since moving to CMake, we don't need this anymore.
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          adig and ahost
-        </seg>
-        <seg>
-          libcares.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!-- Removed in 1.20.0 since the website it used is no longer available.
-      <varlistentry id="acountry">
-        <term><command>acountry</command></term>
-        <listitem>
-          <para>
-            prints the country where an IPv4 address or host is located
-          </para>
-          <indexterm zone="c-ares acountry">
-            <primary sortas="b-acountry">acountry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="adig">
-        <term><command>adig</command></term>
-        <listitem>
-          <para>
-            queries information from DNS servers
-          </para>
-          <indexterm zone="c-ares adig">
-            <primary sortas="b-adig">adig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ahost">
-        <term><command>ahost</command></term>
-        <listitem>
-          <para>
-            prints the A or AAAA record associated with a hostname
-            or IP address
-          </para>
-          <indexterm zone="c-ares ahost">
-            <primary sortas="b-ahost">ahost</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-ares-lib">
-        <term><filename class="libraryfile">libcares.so</filename></term>
-        <listitem>
-          <para>
-            is a C library for asynchronous DNS requests
-          </para>
-          <indexterm zone="c-ares c-ares-lib">
-            <primary sortas="c-c-ares">c-ares.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,578 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 curl-download-http "https://curl.se/download/curl-&curl-version;.tar.xz">
-  <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "f4f37253c5f1ad9ee85fa6215fdfeb42">
-  <!ENTITY curl-size          "2.6 MB">
-  <!ENTITY curl-buildsize     "42 MB (add 18 MB for tests)">
-  <!ENTITY curl-time          "0.2 SBU (with parallelism=4; add 4.1 SBU for tests (without valgrind, add 36 SBU with valgrind))">
-]>
-
-<sect1 id="curl" xreflabel="cURL-&curl-version;">
-  <?dbhtml filename="curl.html"?>
-
-
-  <title>cURL-&curl-version;</title>
-
-  <indexterm zone="curl">
-    <primary sortas="a-cURL">cURL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cURL</title>
-
-    <para>
-      The <application>cURL</application> package contains an utility
-      and a library used for transferring files with URL syntax to any of
-      the following protocols: DICT, FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP,
-      HTTPS, IMAP, IMAPS, LDAP, LDAPS, MQTT, POP3, POP3S, RTSP, SMB, SMBS,
-      SMTP, SMPTS, TELNET, and TFTP. Its ability to both download
-      and upload files can be incorporated into other programs to support
-      functions like streaming media.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&curl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&curl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &curl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &curl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &curl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &curl-time;
-        </para>
-      </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>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libpsl"/>
-    </para>
-
-    <note>
-      <para>
-        While there is an option to build the package without libpsl, both
-        the upstream developers and the BLFS editors alike highly recommend
-        not disabling support for libpsl due to severe security implications.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Recommended at runtime</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="make-ca"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="brotli"/>,
-      <xref linkend="c-ares"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libidn2"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="nghttp2"/>,
-      <xref linkend="openldap"/>,
-      <!-- cURL implements the SMB client with own code.  Samba is only
-           used for /usr/bin/ntlm_auth helper.  The path is correctly
-           guessed even if Samba is not installed, so "runtime".  -->
-      <xref role='runtime' linkend="samba"/>
-      (runtime, for NTLM authentication),
-      <ulink url="https://www.gnu.org/software/gsasl/">gsasl</ulink>,
-      <ulink url="https://www.secureauth.com/labs/open-source-tools/impacket/">impacket</ulink>,
-      <ulink url="https://launchpad.net/libmetalink/">libmetalink</ulink>,
-      <ulink url="https://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
-      <ulink url="https://github.com/ngtcp2/ngtcp2/">ngtcp2</ulink>,
-      <!--<ulink url="https://tls.mbed.org/">mbed TLS</ulink> (formerly known as
-      PolarSSL), and -->
-      <!-- mbedTLS/PolarSSL support was removed in 7.65.1 -->
-      <ulink url="https://github.com/cloudflare/quiche">quiche</ulink>, and
-      <ulink url="https://spnego.sourceforge.net/">SPNEGO</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional if Running the Test Suite</bridgehead>
-    <para role="optional">
-      <!-- stunnel is still listed in the docs as required, but 7.58.0
-       tests completed happily without it, although the test for unit1323
-       reported that the tool set in the test case does not exist - ken -->
-      <xref linkend="apache"/> and
-      <xref linkend="stunnel"/> (for the HTTPS and FTPS tests),
-      <xref linkend="openssh"/>, and
-      <xref linkend="valgrind"/> (this will slow the tests down and may cause failures.)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cURL</title>
-
-    <para>
-      Install <application>cURL</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                           \
-            --disable-static                        \
-            --with-openssl                          \
-            --enable-threaded-resolver              \
-            --with-ca-path=/etc/ssl/certs &amp;&amp;
-make</userinput></screen>
-
-<!--
-   For version 7.54.1 I got:
-   TESTDONE: 869 tests out of 869 reported OK: 100%
-   TESTDONE: 1092 tests were considered during 1080 seconds
-
-    <para>
-      Running the test suite is optional. About 2% of the tests fail. Increase
-      in test time by each failed test is about 10%. Tests SBU above was
-      obtained disabling failing tests, with:
-    </para>
-
-    2017-10-29 - bdubbs
-    For version 7.56.1 I had a lot of test failures which included long
-    timeouts.  Could not determine the cause of the timeouts or failures,
-    but I was missing c-ares, MIT Kerberos, ldap, samba, and the six
-    external packages.
-
-    2017-12-01 - bdubbs
-    Still a lot of test failures.  I did have c-ares, Kerberos, and ldap
-    installed this time.  Best guess is that servers are not available.
-
-    2018-08-01 - renodr
-    No test failures, but I didn't have any of the optional dependencies except
-    for c-ares and libidn2. I might re-run this test suite before release with
-    all of the optional deps, but right now, it isn't a priority - rather
-    the security fix is.
--->
-
-    <para>
-       To run the test suite, issue: <command>make test</command>.
-       <!--One test, <filename>1477</filename>, is known to fail due to 
-       a missing file in the curl tarball.--> Some tests are flaky, 
-       so if some tests have failed it's possible to
-       run a test again with: <command>(cd tests; ./runtests.pl
-       <replaceable>&lt;test ID&gt;</replaceable>)</command> (the ID of
-       failed tests are shown in the <quote><computeroutput>These test cases
-       failed:</computeroutput></quote> message). If you run the tests after
-       the package has been installed, some tests may fail because the man
-       pages were deleted by the 'find' command in the installation instructions
-       below.
-    </para>
-<!-- Two (of 857) tests
-fail for unknown reasons, and all tests fail is valgrind is installed. Moving
-valgrind out of $PATH is recommended if you wish to run the test suite while
-it is installed.
-
-Added by Pierre for curl-7.59.0:
-no stunnel, no valgrind, no options
-Warning: smb server unexpectedly alive
-Warning: dict server unexpectedly alive
-TESTDONE: 950 tests out of 951 reported OK: 99%
-TESTFAIL: These test cases failed: 1148
-TESTDONE: 1189 tests were considered during 362 seconds.
-__________
-
-         if stunnel and valgrind are not installed, and also most options
-         (I had rtmpdump), the tests complete without problems.
-Warning: smb server unexpectedly alive
-Warning: dict server unexpectedly alive
-TESTDONE: 938 tests out of 938 reported OK: 100%
-TESTDONE: 1175 tests were considered during 355 seconds.
-         and no. I don't have smb - so commenting the rest of this:
-      To run the test suite, issue: <command>make test</command>. Many tests
-      may fail that depend on optional dependencies that may not be installed
-      or upstream servers that may not be available, especially for tests
-      numbered 700 and above.
-      Test time may be significantly increase due to hanging tests that fail.
-__________
-Added by Bruce for curl-7.60.0:
-TESTDONE: 957 tests out of 959 reported OK: 99%
-TESTFAIL: These test cases failed: 1139 1140
-TESTDONE: 1196 tests were considered during 1184 seconds.
-From the logs, both appear to be ipv6 releated.
-
-==========
-Added by Douglas for curl-7.61.0:
-TESTDONE: 961 tests out of 961 reported OK: 100%
-TESTDONE: 1202 tests were considered during 338 seconds.
-I only have c-ares and libidn2 installed, I will likely try before release
-with all optional dependencies in the book installed.
-
-=========
-7.61.1 NOTE: The test suite is extremely noisy, complaining about verification errors.
-It's possible this is due to openssl-1.1.1, BUT 79/79 tests report as 100% OK. I had
-c-ares, libpsl, and libidn1/2 installed. - Doug
-
-========
-7.62.0: All tests passed. libpsl, c-ares, libssh2, libidn2 installed.
-All 1098 tests report OK.
-
-=======
-Added by Douglas for curl-7.64.0:
-TESTDONE: 1022 tests out of 1023 reported OK: 99%
-TESTFAIL: These tests cases failed: 323
-TESTDONE: 1235 tests were considered during 1279 seconds.
-For dependencies, I had c-ares, gnutls, libidn2, libpsl, krb5, libssh2, nghttp2,
-OpenLDAP, Samba, stunnel, and Valgrind installed.
-=======
-Added by bdubbs for curl-7.64.1:
-TESTDONE: 1022 tests out of 1025 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140
-TESTDONE: 1242 tests were considered during 1483 seconds
-
-=======
-Added by renodr for curl-7.65.1:
-TESTDONE: 996 tests out of 997 reported OK: 99%
-TESTFAIL: These test cases failed: 1560
-TESTDONE: 1249 tests were considered during 1091 seconds.
-All dependencies except for externals installed.
-=======
-Added by bdubbs for curl-7.65.2:
-TESTDONE: 1034 tests out of 1036 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1560
-TESTDONE: 1254 tests were considered during 1362 seconds.
-Time above does not include test build time.
-All dependencies except for externals installed.
-=======
-Added by bdubbs for curl-7.65.3:
-TESTDONE: 1031 tests out of 1036 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140 1173 1560
-TESTDONE: 1254 tests were considered during 1364 seconds.
-
-The tests that fail seem to be somewhat random.  What happened between
-yesterday and today that that tests 1139 1140 1173 now fail?
-
-=======
-Added by bdubbs for curl-7.68.0:
-TESTDONE: 1066 tests out of 1071 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140 1173 1560
-TESTDONE: 1290 tests were considered during 1515 seconds.
-
-=======
-Added by bdubbs for curl-7.69.0:
-TESTDONE: 074 tests out of 1079 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140 1173 1560
-TESTDONE: 1320 tests were considered during 1514 seconds.
-
-For curl-7.69.1, 1082 tests out of 1086 reported OK.  1560 now passes.
-1330 tests were considered during 1528 seconds.
-
-======
-Added by renodr for curl-7.70.0:
-TESTDONE: 1062 tests out of 1062 reported OK: 100%
-TESTDONE: 1352 tests were considered during 1218 seconds.
-Tests were ran with all dependencies present except for stunnel.
-impacket only seems to add one extra test to the mix as well.
-
-======
-Added by renodr for curl-7.71.0:
-TESTDONE: 1072 tests out of 1072 reported OK: 100%
-TESTDONE: 1364 tests were considered during 1202 seconds.
-Tests were run similarly to 7.70.0 - all deps except for stunnel.
-
-======
-Added by renodr for curl-7.71.1:
-TESTDONE: 1076 tests out of 1076 reported OK: 100%
-TESTDONE: 1368 tests were considered during 1207 seconds.
-Tests were run similarly to 7.71.0, including impacket, but no stunnel.
-
-======
-Added by renodr for curl-7.72.0:
-TESTDONE: 1094 tests out of 1097 reported OK: 99%
-TESTFAIL: These test cases failed: 1700 1701 1702
-TESTDONE: 1374 tests were considered during 1285 seconds.
-Tests have all BLFS dependencies with the exception of stunnel;
-and the optional impacket python module was installed.
-Tests seem to be failing due to a missing 'nghttpx' executable
-used to start a test server.
-
-======
-Added by renodr for curl-7.73.0:
-TESTDONE: 1121 tests out of 1121 reported OK: 100%
-TESTDONE: 1387 tests were considered during 1303 seconds.
-Tests have all BLFS dependencies installed with the exception of stunnel,
-as well as the optional impacket installed.
-
-======
-Added by renodr for curl-7.74.0:
-TESTDONE: 1119 tests out of 1119 reported OK: 100%
-TESTDONE: 1388 tests were considered during 1370 seconds.
-Tests have all BLFS dependencies installed, as well as impacket.
-stunnel not installed.
-
-======
-Added by bdubbs for curl-7.79.0:
-TESTDONE: 1432 tests were considered during 1543 seconds.
-TESTDONE: 1208 tests out of 1212 reported OK: 99%
-
-Tests have all BLFS dependencies installed but without impacket.
-
-======
-Added by plabs for curl-7.79.1:
-TESTDONE: 1434 tests were considered during 1652 seconds.
-TESTDONE: 1171 tests out of 1171 reported OK: 100%
-Tests have all BLFS dependencies installed except stunnel but without impacket.
-====
-bdubbs curl-7.83.0  2022-04-28
-TESTDONE: 1497 tests were considered during 1666 seconds.
-TESTDONE: 1252 tests out of 1256 reported OK: 99%
-TESTFAIL: These test cases failed: 1139 1140 1173 1177
-====
-Added by xry111 for curl-7.85.0 on 2022-09-01:
-With:
-  all BLFS dependencies but stunnel installed
-  libssh2-2.10.0 patched with libssh2-1.10.0-upstream_fix-1.patch
-  with-{gssapi,libssh2} enable-threaded-resolver
-TESTDONE: 1520 tests were considered during 508 seconds.
-TESTDONE: 1327 tests out of 1328 reported OK: 99%
-TESTFAIL: These test cases failed: 1459
-  It is a SCP test for bad .known_hosts file and fails because of a mismatch
-  of error codes, I don't think it indicated a serious issue.
-[renodr] - Test results for 7.85.0 (2022-09-03), no libssh2 enabled or gssapi
-TESTDONE: 1528 tests were considered during 2041 seconds.
-TESTDONE: 1326 tests out of 1326 reported OK: 100%
-
-[renodr] - Test results for 7.87.0 (2022-12-30)
-TESTDONE: 1559 tests were considered during 2112 seconds.
-TESTDONE: 1342 tests out of 1342 reported OK: 100%
-libssh2 installed and enabled
-
-[renodr] - Test results for 8.0.1 (2023-03-27)
-TESTDONE: 1593 tests were considered during 4761 seconds.
-TESTDONE: 1356 tests out of 1356 reported OK: 100%
-All BLFS dependencies installed.
-Note that if I move /usr/bin/valgrind to a place where it can't be found, I get
-TESTDONE: 1593 tests were considered during 595 seconds.
-TESTDONE: 1356 tests out of 1356 reported OK: 100%
-It appears that every test is now run under valgrind.
-
-[renodr] - Test results for 8.2.1 (2023-07-26)
-TESTDONE: 1611 tests were considered during 2129 seconds.
-TESTDONE: 1369 tests out of 1369 reported OK: 100%
-All BLFS dependencies installed, and run under valgrind.
-
-[renodr] - Test results for 8.3.0 (2023-09-14)
-TESTDONE: 1635 tests were considered during 4068 seconds.
-TESTDONE: 1386 tests out of 1387 reported OK: 99%
-TESTFAIL: These test cases failed: 1474
-All BLFS dependencies installed, and run under valgrind. Test 1474 is flaky.
-
-[renodr] - Test results for 8.4.0 (2023-10-11)
-TESTDONE: 1646 tests were considered during 2290 seconds.
-TESTDONE: 1449 tests out of 1452 reported OK: 99%
-TESTFAIL: These test cases failed: 1474 3021 3022
-All BLFS dependencies are installed, and the tests were run with Valgrind
-installed as well. Test 3021 and 3022 fails due to incompatibilities with
-our version of SSH. See https://github.com/curl/curl/issues/12096
-Test 1474 is still flaky.
-
-[bdubbs] - Test results for 8.6.0 (2024-02-01)
-TESTDONE: 1673 tests were considered during 395 seconds.
-TESTDONE: 1355 tests out of 1360 reported OK: 99%
-TESTFAIL: These test cases failed: 1139 1140 1173 1177 1477
-Run without valgrind.
-Tests seem to looking for man pages that are missing.
-- renodr: this is because tests were run after the man pages were deleted by
-  the find command after 'make install'
--->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-rm -rf docs/examples/.deps &amp;&amp;
-
-find docs \( -name Makefile\* -o  \
-             -name \*.1       -o  \
-             -name \*.3       -o  \
-             -name CMakeLists.txt \) -delete &amp;&amp;
-
-cp -v -R docs -T /usr/share/doc/curl-&curl-version;</userinput></screen>
-
-    <para>
-      To run some simple verification tests on the newly installed
-      <command>curl</command>, issue the following commands:
-      <command>curl --trace-ascii debugdump.txt https://www.example.com/</command>
-      and
-      <command>curl --trace-ascii d.txt --trace-time https://example.com/</command>.
-      Inspect the locally created trace files <filename>debugdump.txt</filename>
-      and <filename>d.txt</filename>, which contains version information,
-      downloaded files information, etc. One file has the time for each action logged.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-threaded-resolver</parameter>: This switch enables
-      <application>cURL</application>'s builtin threaded DNS resolver.
-    </para>
-
-    <para>
-      <parameter>--with-ca-path=/etc/ssl/certs</parameter>: This
-      switch sets the location of the BLFS Certificate Authority store.
-    </para>
-
-    <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
-      <filename class="libraryfile">libcurl</filename>.
-    </para>
-
-    <para>
-      <option>--without-ssl --with-gnutls</option>: Use this switch to
-      build with <application>GnuTLS</application> support
-      instead of <application>OpenSSL</application> for SSL/TLS.
-    </para>
-
-    <para>
-      <option>--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt</option>: Use
-      this switch instead of <parameter>--with-ca-path</parameter> if
-      building with <application>GnuTLS</application> support
-      instead of <application>OpenSSL</application> for SSL/TLS.
-    </para>
-
-    <para>
-      <option>--with-libssh2</option>: This parameter adds
-      <application>SSH</application> support to cURL. This is disabled
-      by default.
-    </para>
-
-    <para>
-      <option>--enable-ares</option>: This parameter adds
-      support for DNS resolution through the c-ares library. It overrides
-      <parameter>--enable-threaded-resolver</parameter> and is not widely
-      tested by the editors.
-    </para>
-
-    <para>
-      <command>find docs ... -exec rm {} \;</command>: This command removes
-      <filename>Makefiles</filename> and man files from the documentation
-      directory that would otherwise be installed by the commands that follow.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-           curl and curl-config
-        </seg>
-        <seg>
-           libcurl.so
-        </seg>
-        <seg>
-          /usr/include/curl and
-          /usr/share/doc/curl-&curl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="curl-prog">
-        <term><command>curl</command></term>
-        <listitem>
-         <para>
-           is a command line tool for transferring files with URL syntax
-         </para>
-          <indexterm zone="curl curl-prog">
-            <primary sortas="b-curl">curl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="curl-config">
-        <term><command>curl-config</command></term>
-        <listitem>
-          <para>
-            prints information about the last compile, like libraries
-            linked to and prefix setting
-          </para>
-          <indexterm zone="curl curl-config">
-            <primary sortas="b-curl-config">curl-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcurl">
-        <term><filename class="libraryfile">libcurl.so</filename></term>
-        <listitem>
-          <para>
-            provides the API functions required by
-            <command>curl</command> and other programs
-          </para>
-          <indexterm zone="curl libcurl">
-            <primary sortas="c-libcurl">libcurl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/geoclue2.xml
===================================================================
--- networking/netlibs/geoclue2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 geoclue2-download-http
-  "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/&geoclue2-version;/geoclue-&geoclue2-version;.tar.bz2">
-  <!ENTITY geoclue2-download-ftp  " ">
-  <!ENTITY geoclue2-md5sum        "08bacd3b45311ee6c20e4240be7bc348">
-  <!ENTITY geoclue2-size          "104 KB">
-  <!ENTITY geoclue2-buildsize     "6.9 MB">
-  <!ENTITY geoclue2-time          "0.1 SBU">
-]>
-
-<sect1 id="geoclue2" xreflabel="GeoClue-&geoclue2-version;">
-  <?dbhtml filename="geoclue2.html"?>
-
-
-  <title>GeoClue-&geoclue2-version;</title>
-
-  <indexterm zone="geoclue2">
-    <primary sortas="a-geoclue">GeoClue</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GeoClue</title>
-
-    <para>
-      <application>GeoClue</application> is a modular geoinformation service
-      built on top of the <application>D-Bus</application> messaging system. The
-      goal of the <application>GeoClue</application> project is to make creating
-      location-aware applications as simple as possible.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&geoclue2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&geoclue2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &geoclue2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &geoclue2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &geoclue2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &geoclue2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GeoClue Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/> and
-      <xref linkend="libsoup3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="avahi"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="ModemManager"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GeoClue</title>
-
-    <para>
-      Install <application>GeoClue</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk-doc=false     \
-            ..                  &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"/>
-
-    <para>
-      <option>-D3g-source=false</option>: This switch disables
-      the 3G backend. Use it if you have not installed the
-      <application>ModemManager</application> package.
-    </para>
-
-    <para>
-      <option>-Dmodem-gps-source=false</option>: This switch disables
-      the modem GPS backend. Use it if you have not installed the
-      <application>ModemManager</application> package.
-    </para>
-
-    <para>
-      <option>-Dcdma-source=false</option>: This switch disables the
-      CDMA source backend. Use it if you have not installed the
-      <application>ModemManager</application> package.
-    </para>
-
-    <para>
-      <option>-Dnmea-source=false</option>: This switch disables the
-      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>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GeoClue</title>
-
-    <sect3 id="geoclue2-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/geoclue/conf.d/90-lfs-google.conf</filename>
-      </para>
-
-      <indexterm zone="geoclue2 geoclue2-config">
-        <primary sortas="etc-geoclue-conf.d-90-lfs-google.conf">/etc/geoclue/conf.d/90-lfs-google.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        In March of 2024, Mozilla announced the shutdown of the Mozilla Location
-        Service. Geoclue uses this service for determining a user's location
-        when requested by other applications. The only supported alternative by
-        upstream is to use Google's Geolocation Service.
-      </para>
-
-      <para>
-        To use Google's Geolocation Service, an API key must be used, and a
-        configuration file must be created. <emphasis role="bold">This API key
-        is only intended for use with LFS. Please do not use this API key if you
-        are building for another distro or distributing binary copies. If you
-        need an API key, you can request one at
-        <ulink url="https://www.chromium.org/developers/how-tos/api-keys"/>.</emphasis>
-      </para>
-
-      <para>
-        Create the configuration needed for using Google's Geolocation Service
-        as the &root; user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/geoclue/conf.d/90-lfs-google.conf &lt;&lt; "EOF"
-<literal># Begin /etc/geoclue/conf.d/90-lfs-google.conf
-
-# This configuration applies for the WiFi source.
-[wifi]
-
-# Set the URL to Google's Geolocation Service.
-url=https://www.googleapis.com/geolocation/v1/geolocate?key=AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ
-
-# End /etc/geoclue/conf.d/90-lfs-google.conf</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you do not wish to request your location from a Geolocation service,
-        you can hardcode your location in <filename>/etc/geolocation</filename>
-        using the format described in
-        <ulink role='man' url='&man;geoclue'>geoclue(5)</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>
-          None
-        </seg>
-        <seg>
-          libgeoclue-2.so
-        </seg>
-        <seg>
-          /etc/geoclue,
-          /usr/include/libgeoclue-2.0,
-          /usr/libexec/geoclue-2.0, and
-          /usr/share/gtk-doc/html/{geoclue,libgeoclue}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glib-networking-download-http
-    "&gnome-download-http;/glib-networking/&glib-networking-minor;/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-download-ftp  " ">
-  <!ENTITY glib-networking-md5sum        "8e13b80148e28adc9e4cf681c0b30402">
-  <!ENTITY glib-networking-size          "284 KB">
-  <!ENTITY glib-networking-buildsize     "5.6 MB (with tests)">
-  <!ENTITY glib-networking-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="glib-networking" xreflabel="glib-networking-&glib-networking-version;">
-  <?dbhtml filename="glib-networking.html"?>
-
-
-  <title>glib-networking-&glib-networking-version;</title>
-
-  <indexterm zone="glib-networking">
-    <primary sortas="a-glib-networking">glib-networking</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLib Networking</title>
-
-    <para>
-      The <application>GLib Networking</application> package contains
-      Network related gio modules for <application>GLib</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glib-networking-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glib-networking-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glib-networking-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glib-networking-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glib-networking-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glib-networking-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/glib-networking-&glib-networking-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">GLib Networking Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="gnutls"/>
-    </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 -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLib Networking</title>
-
-    <!-- 2.60.0 of glib-networking introduced an experimental OpenSSL backend.
-    Since it is not tested well upstream yet, and it is recommended by upstream
-    to use the GnuTLS backend on Linux, we will continue using the GnuTLS
-    backend and not mention the OpenSSL backend to prevent confusion. -->
-
-    <para>
-      Install <application>GLib Networking</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup            \
-   --prefix=/usr       \
-   --buildtype=release \
-   -Dlibproxy=disabled \
-   .. &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>
-
-    <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 Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgiognomeproxy.so
-          and libgiognutls.so (GIO Modules installed in
-          <filename class="directory">/usr/lib/gio/modules</filename>)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/kdsoap.xml
===================================================================
--- networking/netlibs/kdsoap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kdsoap-download-http
-           "https://github.com/KDAB/KDSoap/releases/download/kdsoap-&kdsoap-version;/kdsoap-&kdsoap-version;.tar.gz">
-  <!ENTITY kdsoap-download-ftp " ">
-  <!ENTITY kdsoap-md5sum        "a4ef201402aaa1500439a2ed4359c0f3">
-  <!ENTITY kdsoap-size          "11 MB">
-  <!ENTITY kdsoap-buildsize     "49 MB">
-  <!ENTITY kdsoap-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="kdsoap" xreflabel="kdsoap-&kdsoap-version;">
-  <?dbhtml filename="kdsoap.html"?>
-
-  <title>kdsoap-&kdsoap-version;</title>
-
-  <indexterm zone="kdsoap">
-    <primary sortas="a-kdsoap">kdsoap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kdsoap</title>
-
-    <para>
-      The <application>kdsoap</application> is Qt-based client-side and
-      server-side SOAP component. It can be used to create client applications
-      for web services and also provides the means to create web services
-      without the need for any further component such as a dedicated web server.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kdsoap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kdsoap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kdsoap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kdsoap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kdsoap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kdsoap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kdsoap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &qt5-deps;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kdsoap</title>
-
-    <para>
-      Install <application>kdsoap</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  \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/kdsoap-&kdsoap-version; \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kdwsdl2cpp
-        </seg>
-        <seg>
-          libkdsoap.so and
-          libkdsoap-server.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/KDSoap,
-          /usr/share/doc/kdsoap-&kdsoap-version;,
-          /usr/include/KDSoapClient. and
-          /usr/include/KDSoapServer
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,231 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ldns-download-http "https://www.nlnetlabs.nl/downloads/ldns/ldns-&ldns-version;.tar.gz">
-  <!ENTITY ldns-download-ftp  " ">
-  <!ENTITY ldns-md5sum        "429b93dacb2d6ecc5ed63788b14c38e6">
-  <!ENTITY ldns-size          "1.2 MB">
-  <!ENTITY ldns-buildsize     "30 MB (with docs)">
-  <!ENTITY ldns-time          "0.2 SBU (with docs)">
-]>
-
-<sect1 id="ldns" xreflabel="ldns-&ldns-version;">
-  <?dbhtml filename="ldns.html"?>
-
-
-  <title>ldns-&ldns-version;</title>
-
-  <indexterm zone="ldns">
-    <primary sortas="a-ldns">ldns</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ldns</title>
-
-    <para>
-      <application>ldns</application> is a fast DNS library with the goal to
-      simplify DNS programming and to allow developers to easily create software
-      conforming to current RFCs and Internet drafts. This packages also
-      includes the <command>drill</command> tool.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ldns-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ldns-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ldns-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ldns-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ldns-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ldns-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ldns Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="make-ca"/> and
-      <xref linkend="libpcap"/> (for example programs),
-      <xref linkend="python2"/> and
-      <xref linkend="swig"/> (for Python bindings), and
-      <xref linkend="doxygen"/> (for html documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ldns</title>
-
-    <para>
-      Install <application>ldns</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --disable-static        \
-            --with-drill            &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and want to build
-      html documentation, run the following command:
-    </para>
-
-<screen remap="doc"><userinput>make doc</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built 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 -m755 -d /usr/share/doc/ldns-&ldns-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/ldns-&ldns-version;</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>
-      <parameter>--with-drill</parameter>: This option enables building of the
-      <command>drill</command> tool (used for obtaining debug information
-      from DNS(SEC))
-    </para>
-
-    <para>
-      <option>--disable-dane-ta-usage</option>: This option disables DANE-TA
-      (DNS-Based Authentication of Named Entities) support.  It is only needed
-      if OpenSSL-1.1.0 or later is not installed.
-    </para>
-
-    <para>
-      <option>--with-examples</option>: This option enables building of the
-      example programs.
-    </para>
-
-    <para>
-      <option>--with-pyldns</option>: This option enables building of the Python
-      bindings.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          drill and ldns-config
-        </seg>
-        <seg>
-          libldns.so and
-          /usr/lib/python&python2-majorver;/site-packages/_ldns.so
-        </seg>
-        <seg>
-          /usr/include/ldns and /usr/share/doc/ldns-&ldns-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="drill">
-        <term><command>drill</command></term>
-        <listitem>
-          <para>
-            is a tool like <command>dig</command> from
-            <xref linkend="bind-utils"/> designed to get all sorts of
-            information out of the DNS
-          </para>
-          <indexterm zone="ldns drill">
-            <primary sortas="b-drill">drill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldns-config">
-        <term><command>ldns-config</command></term>
-        <listitem>
-          <para>
-            shows compiler and linker flags for ldns usage
-          </para>
-          <indexterm zone="ldns ldns-config">
-            <primary sortas="b-ldns-config">ldns-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libldns">
-        <term><filename class="libraryfile">libldns.so</filename></term>
-        <listitem>
-          <para>
-            provides the <application>ldns</application> API functions to
-            programs
-          </para>
-          <indexterm zone="ldns libldns">
-            <primary sortas="c-libldns">libldns.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libevent.xml
===================================================================
--- networking/netlibs/libevent.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,265 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libevent-source "https://github.com/libevent/libevent/releases/download">
-
-  <!ENTITY libevent-download-http "&libevent-source;/release-&libevent-version;-stable/libevent-&libevent-version;-stable.tar.gz">
-  <!ENTITY libevent-download-ftp  " ">
-  <!ENTITY libevent-md5sum        "b5333f021f880fe76490d8a799cd79f4">
-  <!ENTITY libevent-size          "1.0 MB">
-  <!ENTITY libevent-buildsize     "20 MB (add 4 MB for tests and 4 MB for API docs)">
-  <!ENTITY libevent-time          "0.3 SBU (add 11 SBU for tests)">
-]>
-
-<sect1 id="libevent" xreflabel="libevent-&libevent-version;">
-  <?dbhtml filename="libevent.html"?>
-
-
-  <title>libevent-&libevent-version;</title>
-
-  <indexterm zone="libevent">
-    <primary sortas="a-libevent">libevent</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libevent</title>
-
-    <para>
-      <application>libevent</application> is an asynchronous event notification
-      software library. The <application>libevent</application> API provides a
-      mechanism to execute a callback function when a specific event occurs on
-      a file descriptor or after a timeout has been reached. Furthermore,
-      <application>libevent</application> also supports callbacks due to
-      signals or regular timeouts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libevent-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libevent-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libevent-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libevent-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libevent-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libevent-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libevent Dependencies</bridgehead>
-    <!-- Python3 ports of the rpcgen_event.py file were produced in 2.1.9 -->
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for API documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libevent</title>
-
-    <para>
-      First, fix an issue that prevents event_rpcgen.py from working:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/python/&amp;3/' event_rpcgen.py</userinput></screen>
-
-    <para>
-      Install <application>libevent</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and wish to build API
-      documentation, issue :
-    </para>
-
-<screen remap="doc"><userinput>doxygen Doxyfile</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make verify</command>. Six tests in
-      every suite related to <filename>regress_ssl.c</filename> and
-      <filename>regress_http.c</filename> are known to fail due to
-      incompatibilities with OpenSSL-3. Some tests that are related to
-      <filename>regress_dns.c</filename> are also known to fail intermittently
-      due to insufficient test timeouts.
-      <!-- https://github.com/libevent/libevent/issues/1271 and
-      https://github.com/libevent/libevent/issues/1304. There are three commits
-      that we could apply, but since they just touch the tests it's probably
-      not necessary to fix it. The relevant PRs are #1305, #1045, and the commit
-      linked in #1271. This should be fixed in libevent-2.2.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it by issuing the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libevent-&libevent-version;/api &amp;&amp;
-cp      -v -R       doxygen/html/* \
-                    /usr/share/doc/libevent-&libevent-version;/api</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          event_rpcgen.py
-        </seg>
-        <seg>
-          libevent_core.so,
-          libevent_extra.so,
-          libevent_openssl.so,
-          libevent_pthreads.so and
-          libevent.so
-        </seg>
-        <seg>
-         /usr/include/event2 and
-         /usr/share/doc/libevent-&libevent-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!-- Who knows what these things do?
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="event_rpcgen.py">
-        <term><command>event_rpcgen.py</command></term>
-        <listitem>
-          <para>
-            does this .....
-          </para>
-          <indexterm zone="libevent event_rpcgen.py">
-            <primary sortas="b-event_rpcgen.py">event_rpcgen.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libevent_core">
-        <term><filename class="libraryfile">libevent_core.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="libevent libevent_core">
-            <primary sortas="c-libevent_core">libevent_core.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-      <varlistentry id="libevent_extra">
-        <term><filename class="libraryfile">libevent_extra.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="libevent libevent_extra">
-            <primary sortas="c-libevent_extra">libevent_extra.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-      <varlistentry id="libevent_openssl">
-        <term><filename class="libraryfile">libevent_openssl.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="libevent libevent_openssl">
-            <primary sortas="c-libevent_openssl">libevent_openssl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-      <varlistentry id="libevent_pthreads">
-        <term><filename class="libraryfile">libevent_pthreads.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="libevent libevent_pthreads">
-            <primary sortas="c-libevent_pthreads">libevent_pthreads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-      <varlistentry id="libevent-lib">
-        <term><filename class="libraryfile">libevent.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="libevent libevent-lib">
-            <primary sortas="c-libevent">libevent.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist> -->
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libmnl.xml
===================================================================
--- networking/netlibs/libmnl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmnl-download-http "https://netfilter.org/projects/libmnl/files/libmnl-&libmnl-version;.tar.bz2">
-  <!ENTITY libmnl-download-ftp  " ">
-  <!ENTITY libmnl-md5sum        "0bbb70573119ec5d49435114583e7a49">
-  <!ENTITY libmnl-size          "308 KB">
-  <!ENTITY libmnl-buildsize     "2.9 MB">
-  <!ENTITY libmnl-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libmnl" xreflabel="libmnl-&libmnl-version;">
-  <?dbhtml filename="libmnl.html"?>
-
-
-  <title>libmnl-&libmnl-version;</title>
-
-  <indexterm zone="libmnl">
-    <primary sortas="a-libmnl">libmnl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmnl</title>
-
-    <para>
-      The <application>libmnl</application> library provides a minimalistic
-      userspace library oriented to Netlink developers. There are a lot of
-      common tasks in the parsing, validating, and constructing of both the Netlink
-      header and TLVs that are repetitive and easy to get wrong. This library
-      aims to provide simple helpers that allow you to re-use code and to
-      avoid re-inventing the wheel.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmnl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmnl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmnl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmnl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmnl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmnl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnma Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmnl</title>
-
-    <para>
-      Install <application>libmnl</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 Library</segtitle>
-
-      <seglistitem>
-        <seg>
-          libmnl.so
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmnl-lib">
-        <term><filename class="libraryfile">libmnl.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for parsing, validating, constructing of both
-            the Netlink header and TLVs
-          </para>
-          <indexterm zone="libmnl libmnl-lib">
-            <primary sortas="c-libmnl">libmnl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libndp.xml
===================================================================
--- networking/netlibs/libndp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libndp" xreflabel="libndp-&libndp-version;">
-  <?dbhtml filename="libndp.html"?>
-
-
-  <title>libndp-&libndp-version;</title>
-
-  <indexterm zone="libndp">
-    <primary sortas="a-libndp">libndp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libndp</title>
-
-    <para>
-      The <application>libndp</application> package provides a wrapper for IPv6
-      Neighbor Discovery Protocol. It also provides a tool named ndptool for
-      sending and receiving NDP messages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libndp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libndp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libndp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libndp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libndp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libndp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libndp</title>
-
-    <para>
-      Install <application>libndp</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-static     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg> ndptool </seg>
-        <seg> libndp.so </seg>
-        <seg> None </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ndptool">
-        <term><command>ndptool</command></term>
-        <listitem>
-          <para>
-            is a tool for sending and receiving NDP messages
-          </para>
-          <indexterm zone="libndp ndptool">
-            <primary sortas="b-ndptool">ndptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libndp-lib">
-        <term><filename class="libraryfile">libndp.so</filename></term>
-        <listitem>
-          <para>
-            provides a wrapper for the IPv6 Neighbor Discovery Protocol
-          </para>
-          <indexterm zone="libndp libndp-lib">
-            <primary sortas="b-libndp-lib">libndp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libnl-test-kernel.xml
===================================================================
--- networking/netlibs/libnl-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    [*] <emphasis role='blue'>U</emphasis>ser namespace                                                 [USER_NS]
-    [*] N<emphasis role='blue'>e</emphasis>twork namespace                                               [NET_NS]
-
-[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    [*]   <emphasis role='blue'>T</emphasis>CP/IP networking                                               [INET]
-    [*]     <emphasis role='blue'>I</emphasis>P: advanced router                             [IP_ADVANCED_ROUTER]
-    [*]       <emphasis role='blue'>I</emphasis>P: policy routing                            [IP_MULTIPLE_TABLES]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P: tunneling                                             [NET_IPIP]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P: GRE demultiplexer                              [NET_IPGRE_DEMUX]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P: GRE tunnels over IP                                  [NET_IPGRE]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual (secure) IP: tunneling                           [NET_IPVTI]
-    &lt;*&gt;     <emphasis role='blue'>T</emphasis>he IPv6 protocol ---&gt;                                        [IPV6]
-      &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>Pv6: IPv6-in-IPv4 tunnel (SIT driver)                  [IPV6_SIT]
-      &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>Pv6: IP-in-IPv6 tunnel (RFC2473)                    [IPV6_TUNNEL]
-      [*]     <emphasis role='blue'>I</emphasis>Pv6: Multiple Routing Tables               [IPV6_MULTIPLE_TABLES]
-    [*]   N<emphasis role='blue'>e</emphasis>twork packet filtering framework (Netfilter) ---&gt;        [NETFILTER]
-      <emphasis role='blue'>C</emphasis>ore Netfilter Configuration ---&gt;
-        &lt;*/M&gt; N<emphasis role='blue'>e</emphasis>tfilter nf_tables support                            [NF_TABLES]
-        [*]     N<emphasis role='blue'>e</emphasis>tfilter nf_tables netdev tables support     [NF_TABLES_NETDEV]
-        {*/M}   N<emphasis role='blue'>e</emphasis>tfilter packet duplication support             [NF_DUP_NETDEV]
-        &lt;*/M&gt;   N<emphasis role='blue'>e</emphasis>tfilter nf_tables netdev packet forwarding support
-                                                           ...  [NFT_FWD_NETDEV]
-    &lt;*/M&gt; 802.1<emphasis role='blue'>d</emphasis> Ethernet Bridging                                      [BRIDGE]
-    &lt;*/M&gt; 802.1<emphasis role='blue'>Q</emphasis>/802.1ad VLAN Support                               [VLAN_8021Q]
-    -*-   <emphasis role='blue'>L</emphasis>3 Master device support                           [NET_L3_MASTER_DEV]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork device support ---&gt;                                   [NETDEVICES]
-    [*]   N<emphasis role='blue'>e</emphasis>twork core driver support                                 [NET_CORE]
-    &lt;*/M&gt;   <emphasis role='blue'>B</emphasis>onding driver support                                     [BONDING]
-    &lt;*/M&gt;   <emphasis role='blue'>D</emphasis>ummy net driver support                                     [DUMMY]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>ntermediate Functional Block support                          [IFB]
-    &lt;*/M&gt;   M<emphasis role='blue'>A</emphasis>C-VLAN support                                           [MACVLAN]
-    &lt;*/M&gt;     M<emphasis role='blue'>A</emphasis>C-VLAN based tap driver                                [MACVTAP]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P-VLAN support                                             [IPVLAN]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual eXtensible Local Area Network (VXLAN)                [VXLAN]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>EEE 802.1AE MAC-level encryption (MACsec)                  [MACSEC]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual ethernet pair device                                  [VETH]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual Routing and Forwarding (Lite)                      [NET_VRF]</screen>
Index: tworking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,415 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libnl-download-http "https://github.com/thom311/libnl/releases/download/libnl&libnl-dl-version;/libnl-&libnl-version;.tar.gz">
-  <!ENTITY libnl-download-ftp  " ">
-  <!ENTITY libnl-md5sum        "27bffaccbb22ab9d8cff377b320f6014">
-  <!ENTITY libnl-size          "1.1 MB">
-  <!ENTITY libnl-buildsize     "74 MB (with API documentation)">
-  <!ENTITY libnl-time          "0.6 SBU (with API documentation)">
-
-
-  <!ENTITY libnl-doc-download-http "https://github.com/thom311/libnl/releases/download/libnl&libnl-dl-version;/libnl-doc-&libnl-version;.tar.gz">
-  <!ENTITY libnl-doc-download-ftp  " ">
-  <!ENTITY libnl-doc-md5sum        "3259c70458712f34a40b8345f405f5ac">
-  <!ENTITY libnl-doc-size          "3.8 MB">
-]>
-
-<sect1 id="libnl" xreflabel="libnl-&libnl-version;">
-  <?dbhtml filename="libnl.html"?>
-
-  <title>libnl-&libnl-version;</title>
-
-  <indexterm zone="libnl">
-    <primary sortas="a-libnl">libnl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnl</title>
-
-    <para>
-      The <application>libnl</application> suite is a collection of libraries
-      providing APIs to netlink protocol based Linux kernel interfaces.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Optional Download</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnl-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnl-doc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Optional patch: <ulink
-          url="&patch-root;/libnl-&libnl-version;-upstream_test_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnl</title>
-<!--
-    <para>
-      If you are going to run the package tests apply this patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libnl-&libnl-version;-upstream_test_fix-1.patch
-autoreconf -fi</userinput></screen>
--->
-    <para>
-      Install <application>libnl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <!-- "keyboard inputs not displayed at all" highly reproducible in
-         a QEMU VM with -j8 under Linux console.  In xterm I've seen "all
-         texts blinking".  I'd considered this caused by my CFLAGS, but
-         this time I've not deviated from the book at all.  -->
-    <note>
-      <para>
-        If the <command>make</command> command was executed with
-        multiple parallel jobs enabled, it might disrupt the terminal mode
-        and cause some <quote>amusing</quote> visual effects.  In the
-        worst case, this issue may cause keyboard inputs not
-        displayed on the screen at all (but you can still run any command
-        if you can type it correctly).  Run the <command>reset</command>
-        to fix such an issue.
-      </para>
-    </note>
-
-    <para>
-      If you wish to run the tests, check that the following options
-      are enabled in the kernel configuration and recompile the kernel
-      if necessary.  Some of them may not be strictly needed, but they
-      should support a complete test coverage.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="libnl-test-kernel.xml"/>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you wish to install the API documentation, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -vp /usr/share/doc/libnl-&libnl-version; &amp;&amp;
-tar -xf ../libnl-doc-&libnl-version;.tar.gz --strip-components=1 --no-same-owner \
-    -C  /usr/share/doc/libnl-&libnl-version;</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>
-      <option>--disable-cli</option>: Use this parameter if you
-      don't want to install cli tools provided by the package.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          genl-ctrl-list,
-          idiag-socket-details,
-          nl-class-add,
-          nl-class-delete,
-          nl-classid-lookup,
-          nl-class-list,
-          nl-cls-add,
-          nl-cls-delete,
-          nl-cls-list,
-          nl-link-list,
-          nl-pktloc-lookup,
-          nl-qdisc-add,
-          nl-qdisc-delete,
-          nl-qdisc-list, and 48 other helper programs with nl- and nf- prefixes
-        </seg>
-        <seg>
-          libnl-3.so,
-          libnl-cli-3.so,
-          libnl-genl-3.so,
-          libnl-idiag-3.so,
-          libnl-nf-3.so,
-          libnl-route-3.so,
-          libnl-xfrm-3.so, and
-          cli modules under /usr/lib/libnl/cli tree
-        </seg>
-        <seg>
-          /etc/libnl,
-          /usr/include/libnl3,
-          /usr/lib/libnl, and
-          /usr/share/doc/libnl-&libnl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="genl-ctrl-list">
-        <term><command>genl-ctrl-list</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="libnl genl-ctrl-list">
-            <primary sortas="b-genl-ctrl-list">genl-ctrl-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-class-add">
-        <term><command>nl-class-add</command></term>
-        <listitem>
-          <para>
-            adds, updates, or replaces Traffic Classes
-          </para>
-          <indexterm zone="libnl nl-class-add">
-            <primary sortas="b-nl-class-add">nl-class-add</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-class-delete">
-        <term><command>nl-class-delete</command></term>
-        <listitem>
-          <para>
-            deletes Traffic Classes
-          </para>
-          <indexterm zone="libnl nl-class-delete">
-            <primary sortas="b-nl-class-delete">nl-class-delete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-classid-lookup">
-        <term><command>nl-classid-lookup</command></term>
-        <listitem>
-          <para>
-            is used to resolve qdisc/class names to classid values and vice
-            versa
-          </para>
-          <indexterm zone="libnl nl-classid-lookup">
-            <primary sortas="b-nl-classid-lookup">nl-classid-lookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-class-list">
-        <term><command>nl-class-list</command></term>
-        <listitem>
-          <para>
-            lists Traffic Classes
-          </para>
-          <indexterm zone="libnl nl-class-list">
-            <primary sortas="b-nl-class-list">nl-class-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-cls-add">
-        <term><command>nl-cls-add</command></term>
-        <listitem>
-          <para>
-            adds a classifier
-          </para>
-          <indexterm zone="libnl nl-cls-add">
-            <primary sortas="b-nl-cls-add">nl-cls-add</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-cls-delete">
-        <term><command>nl-cls-delete</command></term>
-        <listitem>
-          <para>
-            deletes a classifier
-          </para>
-          <indexterm zone="libnl nl-cls-delete">
-            <primary sortas="b-nl-cls-delete">nl-cls-delete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-cls-list">
-        <term><command>nl-cls-list</command></term>
-        <listitem>
-          <para>
-            lists classifiers
-          </para>
-          <indexterm zone="libnl nl-cls-list">
-            <primary sortas="b-nl-cls-list">nl-cls-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-link-list">
-        <term><command>nl-link-list</command></term>
-        <listitem>
-          <para>
-            dumps link attributes
-          </para>
-          <indexterm zone="libnl nl-link-list">
-            <primary sortas="b-nl-link-list">nl-link-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-pktloc-lookup">
-        <term><command>nl-pktloc-lookup</command></term>
-        <listitem>
-          <para>
-            allows the lookup of packet location definitions
-          </para>
-          <indexterm zone="libnl nl-pktloc-lookup">
-            <primary sortas="b-nl-pktloc-lookup">nl-pktloc-lookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-qdisc-add">
-        <term><command>nl-qdisc-add</command></term>
-        <listitem>
-          <para>
-            adds queueing disciplines (qdiscs) in the kernel
-          </para>
-          <indexterm zone="libnl nl-qdisc-add">
-            <primary sortas="b-nl-qdisc-add">nl-qdisc-add</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-qdisc-delete">
-        <term><command>nl-qdisc-delete</command></term>
-        <listitem>
-          <para>
-             deletes queueing disciplines (qdiscs) in the kernel
-          </para>
-          <indexterm zone="libnl nl-qdisc-delete">
-            <primary sortas="b-nl-qdisc-delete">nl-qdisc-delete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="nl-qdisc-list">
-        <term><command>nl-qdisc-list</command></term>
-        <listitem>
-          <para>
-            lists queueing disciplines (qdiscs) in the kernel
-          </para>
-          <indexterm zone="libnl nl-qdisc-list">
-            <primary sortas="b-nl-qdisc-list">nl-qdisc-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnl-lib">
-        <term><filename class="libraryfile">libnl*-3.so</filename></term>
-        <listitem>
-          <para>
-            These libraries contain API functions used to access Netlink
-            interfaces in Linux kernel
-          </para>
-          <indexterm zone="libnl libnl-lib">
-            <primary sortas="c-libnl">libnl*-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libnma.xml
===================================================================
--- networking/netlibs/libnma.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libnma-download-http "&gnome-download-http;/libnma/1.10/libnma-&libnma-version;.tar.xz">
-  <!ENTITY libnma-download-ftp  " ">
-  <!ENTITY libnma-md5sum        "71c7ce674fea1fae8f1368a7fcb6ff43">
-  <!ENTITY libnma-size          "688 KB">
-  <!ENTITY libnma-buildsize     "15 MB">
-  <!ENTITY libnma-time          "0.1 SBU (Using parallelism=4; with test)">
-]>
-
-<sect1 id="libnma" xreflabel="libnma-&libnma-version;">
-  <?dbhtml filename="libnma.html"?>
-
-
-  <title>libnma-&libnma-version;</title>
-
-  <indexterm zone="libnma">
-    <primary sortas="a-libnma">libnma</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnma</title>
-
-    <para>
-      The <application>libnma</application> package contains an implementation
-      of the <application>NetworkManager</application> GUI functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnma-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnma-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnma-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnma-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnma-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnma-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnma Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gcr"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="iso-codes"/>, and
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk4"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&gnome-download-http;/mobile-broadband-provider-info">mobile-broadband-provider-info</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnma</title>
-
-    <para>
-      Install <application>libnma</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                               \
-      --prefix=/usr                          \
-      --buildtype=release                    \
-      -Dgtk_doc=false                        \
-      -Dlibnma_gtk4=true                     \
-      -Dmobile_broadband_provider_info=false &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: This parameter disables
-      generating API documentation using gtk-doc. If you have
-      <xref role="nodep" linkend="gtk-doc"/> installed and wish to
-      generate the API documentation, omit this switch.
-    </para>
-
-    <para>
-      <parameter>-Dlibnma_gtk4=true</parameter>: This parameter builds the
-      GTK-4 version of libnma. It is needed by
-      <xref linkend="gnome-control-center"/>.
-    </para>
-
-    <para>
-      <parameter>-Dmobile_broadband_provider_info=false</parameter>: This
-      switch disables WWAN support because mobile-broadband-provider-info is
-      not in BLFS. Omit this switch if you have it installed and wish to
-      enable WWAN 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>
-          libnma.so and libnma-gtk4.so
-        </seg>
-        <seg>
-          /usr/include/libnma
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnma-lib">
-        <term><filename class="libraryfile">libnma.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>NetworkManager</application> GUI library
-          </para>
-          <indexterm zone="libnma libnma-lib">
-            <primary sortas="c-libnma">libnma.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnma-gtk4">
-        <term><filename class="libraryfile">libnma-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            contains the GTK-4 version of the
-            <application>NetworkManager</application> GUI library
-          </para>
-          <indexterm zone="libnma libnma-gtk4">
-            <primary sortas="c-libnma-gtk4">libnma-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libnsl.xml
===================================================================
--- networking/netlibs/libnsl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,167 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "fb178645dfa85ebab0f1e42e219b42ae">
-  <!ENTITY libnsl-size          "276 KB">
-  <!ENTITY libnsl-buildsize     "3.1 MB">
-  <!ENTITY libnsl-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libnsl" xreflabel="libnsl-&libnsl-version;">
-  <?dbhtml filename="libnsl.html"?>
-
-
-  <title>libnsl-&libnsl-version;</title>
-
-  <indexterm zone="libnsl">
-    <primary sortas="a-libnsl">libnsl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnsl</title>
-
-    <para>
-      The <application>libnsl</application> package contains the public client
-      interface for NIS(YP). It replaces the NIS library that used to
-      be in glibc.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-   Not needed.  I fixed the url.
-
-    <note>
-      <para>
-        The <application>libnsl</application> source tarball shown above
-        downloads with the correct name, libnsl-&libnsl-version;.tar.gz, if
-        using a standard web browser. If you prefer to use a command line
-        program such as wget, you normally would obtain &libnsl-version;.tar.gz.
-        To obtain this package with the proper filename, run:
-
-<screen><userinput>wget -c https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz -O libnsl-&libnsl-version;.tar.gz</userinput></screen>
-      </para>
-    </note>
--->
-    <bridgehead renderas="sect3">libnsl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnsl</title>
-
-    <para>
-      Install <application>libnsl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --sysconfdir=/etc --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libnsl.so
-        </seg>
-        <seg>
-          /usr/include/rpcsvc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnsl-lib">
-        <term><filename class="libraryfile">libnsl.so</filename></term>
-        <listitem>
-          <para>
-            provides the NIS (YP) API functions required by other programs
-          </para>
-          <indexterm zone="libnsl libnsl-lib">
-            <primary sortas="c-libnsl">libnsl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libpcap.xml
===================================================================
--- networking/netlibs/libpcap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpcap-download-http "https://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
-  <!ENTITY libpcap-download-ftp  " ">
-  <!ENTITY libpcap-md5sum        "0322e28dd76cda8066bb6d00fee5969b">
-  <!ENTITY libpcap-size          "932 KB">
-  <!ENTITY libpcap-buildsize     "9.9 MB">
-  <!ENTITY libpcap-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libpcap" xreflabel="libpcap-&libpcap-version;">
-  <?dbhtml filename="libpcap.html"?>
-
-
-  <title>libpcap-&libpcap-version;</title>
-
-  <indexterm zone="libpcap">
-    <primary sortas="a-libpcap">libpcap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpcap</title>
-
-    <para>
-      <application>libpcap</application> provides functions for user-level
-      packet capture, used in low-level network monitoring.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpcap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpcap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpcap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpcap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpcap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpcap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Not needed with 1.10.0
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/libpcap-&libpcap-version;-enable_bluetooth-1.patch"/>
-          (Needed for bluez-5.21)
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">libpcap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="libnl"/>,
-      <xref linkend="libusb"/>,
-      Software distribution for the
-      <ulink url="https://www.endace.com/">DAG</ulink>, and
-      <ulink url="https://www.intel.com/">Septel</ulink> range of passive
-      network monitoring cards.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpcap</title>
-
-    <para>
-      Install <application>libpcap</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>
-      If you want to disable installing the static library, use this sed:
-    </para>
-
-<screen><userinput>sed -i '/INSTALL_DATA.*libpcap.a\|RANLIB.*libpcap.a/ s/^/#/' 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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcap-config
-        </seg>
-        <seg>
-          libpcap.so
-        </seg>
-        <seg>
-          /usr/include/pcap
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="pcap-config">
-        <term><command>pcap-config</command></term>
-      <listitem>
-        <para>
-          provides configuration information for
-          <application>libpcap</application>
-        </para>
-        <indexterm zone="libpcap pcap-config">
-          <primary sortas="c-libpcap">pcap-config</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libpcap-lib">
-        <term><filename class="libraryfile">libpcap.{a,so}</filename></term>
-      <listitem>
-        <para>
-          are libraries used for user-level packet capture
-        </para>
-        <indexterm zone="libpcap libpcap-lib">
-          <primary sortas="c-libpcap">libpcap.{a,so}</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libpsl.xml
===================================================================
--- networking/netlibs/libpsl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpsl-download-http "https://github.com/rockdaboot/libpsl/releases/download/&libpsl-version;/libpsl-&libpsl-version;.tar.gz">
-  <!ENTITY libpsl-download-ftp  " ">
-  <!ENTITY libpsl-md5sum        "870a798ee9860b6e77896548428dba7b">
-  <!ENTITY libpsl-size          "7.3 MB">
-  <!ENTITY libpsl-buildsize     "50 MB">
-  <!ENTITY libpsl-time          "less than 0.1 SBU (including tests)">
-]>
-
-<sect1 id="libpsl" xreflabel="libpsl-&libpsl-version;">
-  <?dbhtml filename="libpsl.html"?>
-
-
-  <title>libpsl-&libpsl-version;</title>
-
-  <indexterm zone="libpsl">
-    <primary sortas="a-libpsl">libpsl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpsl</title>
-
-    <para>
-      The <application>libpsl</application> package provides a library for
-      accessing and resolving information from the Public Suffix List (PSL). The PSL
-      is a set of domain names beyond the standard suffixes, such as .com.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libpsl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libidn2"/> and
-      <xref linkend='libunistring'/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation) and
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpsl</title>
-
-    <para>
-      Install <application>libpsl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          psl
-        </seg>
-        <seg>
-          libpsl.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="psl">
-        <term><command>psl</command></term>
-        <listitem>
-          <para>
-            queries the Public Suffix List
-          </para>
-          <indexterm zone="libpsl psl">
-            <primary sortas="b-psl">psl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpsl-lib">
-        <term><filename class="libraryfile">libpsl.so</filename></term>
-        <listitem>
-          <para>
-            contains a library used to access the Public Suffix List
-          </para>
-          <indexterm zone="libpsl libpsl-lib">
-            <primary sortas="c-libpsl">libpsl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libslirp.xml
===================================================================
--- networking/netlibs/libslirp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libslirp-download-http "https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v&libslirp-version;/libslirp-v&libslirp-version;.tar.bz2">
-  <!ENTITY libslirp-download-ftp  " ">
-  <!ENTITY libslirp-md5sum        "b815c4de99265559caf5ef635a213609">
-  <!ENTITY libslirp-size          "107 KB">
-  <!ENTITY libslirp-buildsize     "3.1 MB">
-  <!ENTITY libslirp-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libslirp" xreflabel="Libslirp-&libslirp-version;">
-  <?dbhtml filename="libslirp.html"?>
-
-  <title>Libslirp-&libslirp-version;</title>
-
-  <indexterm zone="libslirp">
-    <primary sortas="a-libslirp">libslirp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libslirp</title>
-
-    <para>
-      <application>Libslirp</application> is a user-mode networking library
-      used by virtual machines, containers or various tools.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libslirp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libslirp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libslirp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libslirp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libslirp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libslirp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libslirp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libslirp</title>
-
-    <para>
-      Install <application>libslirp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libslirp.so
-        </seg>
-        <seg>
-          /usr/include/slirp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libslirp-lib">
-        <term><filename class="libraryfile">libclirp.so</filename></term>
-        <listitem>
-          <para>
-            contains user-mode TCP-IP emulation functions
-          </para>
-          <indexterm zone="libslirp libslirp-lib">
-            <primary sortas="c-libslirp">libslirp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: tworking/netlibs/libsoup.xml
===================================================================
--- networking/netlibs/libsoup.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,258 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsoup-download-http
-           "&gnome-download-http;/libsoup/&libsoup-minor;/libsoup-&libsoup-version;.tar.xz">
-  <!ENTITY libsoup-download-ftp  " ">
-  <!ENTITY libsoup-md5sum        "8f657fd301a213629204b3320c35d75a">
-  <!ENTITY libsoup-size          "1.4 MB">
-  <!ENTITY libsoup-buildsize     "17 MB (with tests)">
-  <!ENTITY libsoup-time          "0.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libsoup" xreflabel="libsoup-&libsoup-version;">
-  <?dbhtml filename="libsoup.html"?>
-
-
-  <title>libsoup-&libsoup-version;</title>
-
-  <indexterm zone="libsoup">
-    <primary sortas="a-libsoup">libsoup</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsoup</title>
-
-    <para>
-      The <application>libsoup</application> is a HTTP client/server library for
-      <application>GNOME</application>. It uses GObject and the GLib main loop
-      to integrate with <application>GNOME</application> applications and
-      it also has an asynchronous API for use in threaded applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsoup-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsoup-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsoup-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsoup-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsoup-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsoup-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libsoup-&libsoup-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-<!--
-    <warning>
-      <para>
-        You may have noticed newer libsoup releases versioned 3.x.y is
-        available. However, currently some downstream packages support
-        libsoup-3.x, while the others do not.  Installing libsoup-3.x into
-        BLFS is known to cause troubles, even if both libsoup-2.x and 3.x
-        are installed.  So, do <emphasis role='bold'>not</emphasis> install
-        libsoup-3.x into BLFS unless you know what you are doing. We plan
-        to keep using libsoup-2.x for BLFS until GNOME-43 release.
-      </para>
-    </warning>
--->
-    <bridgehead renderas="sect3">libsoup Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib-networking"/>,
-      <xref linkend="libpsl"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/> (required to run the test suite),
-      <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
-      support (only used for the XMLRPC regression tests),
-      <xref linkend="samba"/> (ntlm_auth is required to run the test suite), and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsoup</title>
-
-<!-- fixed in libxml2-2.12.3
-    <para>
-      First, fix a build failure caused by libxml2-2.12.x:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/tree/a #include &lt;libxml/parser.h&gt;' libsoup/soup-xmlrpc*.c</userinput></screen>
--->
-
-    <para>
-      Install <application>libsoup</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dvapi=enabled      \
-            -Dgssapi=disabled   \
-            -Dsysprof=disabled  \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!-- Upstream issue #120.  -->
-      One test named <filename>ssl-test</filename> is known to fail.
-    </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>
-      <option>-Dvapi=disabled</option>: Use this if you have not installed
-      <application>Vala</application>, e.g. because you are not building
-      <application>GNOME</application>.
-    </para>
-
-    <para>
-      <option>-Ddoc=enabled</option>: Use this option if you want to build
-      the documentation. Note that you must have <xref linkend="gtk-doc"/> installed.
-    </para>
-
-    <para>
-      <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 <ulink url="&sysprof-url;">sysprof</ulink> if
-      git is available or use the installed version if it is present on the
-      system.  If you need profiling, remove this option.
-    </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>
-          libsoup-2.4.so and libsoup-gnome-2.4.so
-        </seg>
-        <seg>
-          /usr/include/libsoup-2.4,
-          /usr/include/libsoup-gnome-2.4 and
-          /usr/share/gtk-doc/html/libsoup-2.4 <!-- only installed if -Ddoc=true is
-          passed. -->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsoup-2">
-        <term><filename class="libraryfile">libsoup-2.4.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for asynchronous HTTP connections
-          </para>
-          <indexterm zone="libsoup libsoup-2">
-            <primary sortas="c-libsoup-2">libsoup-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsoup-gnome-2">
-        <term><filename class="libraryfile">libsoup-gnome-2.4.so</filename></term>
-        <listitem>
-          <para>
-            provides <application>GNOME</application> specific features
-          </para>
-          <indexterm zone="libsoup libsoup-gnome-2">
-            <primary sortas="c-libsoup-gnome-2">libsoup-gnome-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libsoup3.xml
===================================================================
--- networking/netlibs/libsoup3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,226 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsoup3-download-http
-           "&gnome-download-http;/libsoup/&libsoup3-minor;/libsoup-&libsoup3-version;.tar.xz">
-  <!ENTITY libsoup3-download-ftp  " ">
-  <!ENTITY libsoup3-md5sum        "a63ea04a9686e9e4470b127ffe1eb96b">
-  <!ENTITY libsoup3-size          "1.5 MB">
-  <!ENTITY libsoup3-buildsize     "38 MB (with tests)">
-  <!ENTITY libsoup3-time          "0.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libsoup3" xreflabel="libsoup-&libsoup3-version;">
-  <?dbhtml filename="libsoup3.html"?>
-
-
-  <title>libsoup-&libsoup3-version;</title>
-
-  <indexterm zone="libsoup3">
-    <primary sortas="a-libsoup3">libsoup3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsoup3</title>
-
-    <para>
-      The <application>libsoup3</application> is a HTTP client/server library for
-      <application>GNOME</application>. It uses GObject and the GLib main loop
-      to integrate with <application>GNOME</application> applications and
-      it also has an asynchronous API for use in threaded applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsoup3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsoup3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsoup3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsoup3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsoup3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsoup3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsoup3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib-networking"/>,
-      <xref linkend="libpsl"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="nghttp2"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/> (required to run the test suite),
-      <xref linkend="brotli"/>,
-      <xref linkend="curl"/> (required to run the test suite),
-      <xref linkend="gi-docgen"/>,
-      <xref linkend="mitkrb"/> (required to run the test suite),
-   <!-- It seems that XMLRPC is part of PHP 5.4.10 -->
-      <xref linkend="php"/> compiled with XMLRPC-EPI
-      support (only used for the XMLRPC regression tests),
-      <xref linkend="samba"/> (ntlm_auth is required to run the test suite),
-      <!--<xref linkend="sysprof"/> (for profiling),-->
-      <ulink url="&sysprof-url;">sysprof</ulink>, and
-      <ulink url="https://github.com/posener/wstest">wstest</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsoup3</title>
-
-    <para>
-      Fix the installation path of API documentation:
-    </para>
-
-<screen><userinput>sed 's/apiversion/soup_version/' -i docs/reference/meson.build</userinput></screen>
-
-    <para>
-      Install <application>libsoup3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            -Dvapi=enabled         \
-            -Dgssapi=disabled      \
-            -Dsysprof=disabled     \
-            --wrap-mode=nofallback \
-            ..                     &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>
-
-    <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-nofallback.xml"/>
-
-    <para>
-      <option>-Dvapi=disabled</option>: Use this if you have not installed
-      <application>Vala</application>, e.g. because you are not building
-      <application>GNOME</application>.
-    </para>
-
-    <para>
-      <option>-Ddocs=enabled</option>: If <xref linkend='gi-docgen'/> is
-      installed, the API documentation will be built and installed no matter
-      if this option is used or not.  This option causes the
-      <command>meson</command> command to fail if
-      <xref linkend='gi-docgen'/> is not installed.
-    </para>
-
-    <para>
-      <parameter>-Dgssapi=disabled</parameter>: libsoup3 defaults to building with GSSAPI support,
-      which requires Kerberos (as does the test suite).
-    </para>
-
-    <para>
-      <parameter>-Dsysprof=disabled</parameter>: libsoup3 will automatically
-      download a git version of <ulink url="&sysprof-url;">sysprof</ulink> if
-      git is available or use the installed version if it is present on the
-      system. If you need profiling, remove this option.
-    </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>
-          libsoup-3.0.so
-        </seg>
-        <seg>
-          /usr/include/libsoup-3.0,
-          /usr/share/doc/libsoup-&libsoup3-version;
-          (only installed if gi-docgen is available)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsoup-3">
-        <term><filename class="libraryfile">libsoup-3.0.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for asynchronous HTTP connections
-          </para>
-          <indexterm zone="libsoup libsoup-3">
-            <primary sortas="c-libsoup-3">libsoup-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,175 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libtirpc-download-http "&sourceforge-dl;/libtirpc/libtirpc-&libtirpc-version;.tar.bz2">
-  <!ENTITY libtirpc-download-ftp  " ">
-  <!ENTITY libtirpc-md5sum        "375dbe7ceb2d0300d173fb40321b49b6">
-  <!ENTITY libtirpc-size          "552 KB">
-  <!ENTITY libtirpc-buildsize     "7.6 MB">
-  <!ENTITY libtirpc-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libtirpc" xreflabel="libtirpc-&libtirpc-version;">
-  <?dbhtml filename="libtirpc.html"?>
-
-
-  <title>libtirpc-&libtirpc-version;</title>
-
-  <indexterm zone="libtirpc">
-    <primary sortas="a-libtirpc">libtirpc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtirpc</title>
-
-    <para>
-      The <application>libtirpc</application> package contains
-      libraries that support programs that use the Remote Procedure Call (RPC)
-      API. It replaces the RPC, but not the NIS library entries that
-      used to be in glibc.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtirpc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtirpc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtirpc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtirpc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtirpc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtirpc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/> for the GSSAPI
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtirpc</title>
-
-    <note>
-      <para>
-        If updating this package, you will also need to update
-        any existing version of <xref linkend='rpcbind'/>
-      </para>
-    </note>
-<!--  Looks like this is incorporated in version 1.0.3
-    <para>
-      Fix a symbol name needed by NIS libraries:
-    </para>
-
-<screen><userinput>sed '/key_secret_is/s/secret/secretkey/' -i src/libtirpc.map</userinput></screen>
-    <para>
-      Install <application>libtirpc</application> by running the following
-      commands:
-    </para>
--->
-<screen><userinput>./configure --prefix=/usr                                   \
-            --sysconfdir=/etc                               \
-            --disable-static                                \
-            --disable-gssapi                                &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-gssapi</parameter>: This switch is needed if
-      no GSSAPI is installed. Remove this switch if you have one
-      installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtirpc.so
-        </seg>
-        <seg>
-          /usr/include/tirpc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtirpc-lib">
-        <term><filename class="libraryfile">libtirpc.so</filename></term>
-        <listitem>
-          <para>
-            provides the Remote Procedure Call (RPC) API functions required by
-            other programs
-          </para>
-          <indexterm zone="libtirpc libtirpc-lib">
-            <primary sortas="c-libtirpc">libtirpc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 neon-download-http "http://www.webdav.org/neon/neon-&neon-version;.tar.gz"> -->
-  <!ENTITY neon-download-http "https://notroj.github.io/neon/neon-&neon-version;.tar.gz">
-  <!ENTITY neon-download-ftp  " ">
-  <!ENTITY neon-md5sum        "f0c6f84835f93892c22750ff60955898">
-  <!ENTITY neon-size          "892 KB">
-  <!ENTITY neon-buildsize     "8.6 MB (additional 53 MB for tests)">
-  <!ENTITY neon-time          "0.1 SBU (add 0.4 SBU for tests)">
-]>
-
-<sect1 id="neon" xreflabel="neon-&neon-version;">
-  <?dbhtml filename="neon.html"?>
-
-
-  <title>neon-&neon-version;</title>
-
-  <indexterm zone="neon">
-    <primary sortas="a-neon">neon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to neon</title>
-
-    <para>
-      <application>neon</application> is an HTTP and WebDAV
-      client library, with a C interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&neon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&neon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &neon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &neon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &neon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &neon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">neon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnutls"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="nss"/> (for some tests),
-      <xref linkend="xmlto"/> (to regenerate the documentation),
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>, and
-      <ulink url="https://www.manyfish.co.uk/pakchois/">PaKChoiS</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of neon</title>
-<!-- Not needed for 0.32.2
-    <para>
-      The build mechanism tries to recreate the documentation even
-      though its included in the archive. Recreating would require
-      <application>xmlto</application> to be installed. Apply the
-      following sed to not recreate the docs:
-    </para>
-
-<screen><userinput>sed 's/\(install-\(html\|man\):\).*/\1/' -i Makefile.in</userinput></screen>
--->
-    <para>
-      Install <application>neon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --with-ssl       \
-            --enable-shared  \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      If you wish to regenerate the documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</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>--with-ssl</parameter>: This switch enables SSL support
-      using <application>OpenSSL</application>.
-      <application>GnuTLS</application> can be used instead, by passing
-      <option>--with-ssl=gnutls</option> and
-      <option>--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt</option> to the
-      <command>configure</command> script.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-<!-- We have Expat in LFS now, so this really isn't applicable anymore.
-    <para>
-      <option>- -with-libxml2</option>: This switch forces the use of
-      <application>libxml2</application> instead of
-      <application>Expat</application>.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          neon-config
-        </seg>
-        <seg>
-          libneon.so
-        </seg>
-        <seg>
-          /usr/include/neon and
-          /usr/share/doc/neon-&neon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="neon-config">
-        <term><command>neon-config</command></term>
-        <listitem>
-          <para>
-            is a script that provides information about an installed copy
-            of the neon library
-          </para>
-          <indexterm zone="neon neon-config">
-            <primary sortas="b-neon-config">neon-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libneon">
-        <term><filename class="libraryfile">libneon.so</filename></term>
-        <listitem>
-          <para>
-            is used as a high-level interface to common HTTP and WebDAV
-            methods
-          </para>
-          <indexterm zone="neon libneon">
-            <primary sortas="c-libneon">libneon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/netlibs.xml
===================================================================
--- networking/netlibs/netlibs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="basicnet-netlibs">
-  <?dbhtml filename="netlibs.html"?>
-
-  <title>Networking Libraries</title>
-
-  <para>
-    These applications are support libraries for other applications in the
-    book. It is unlikely that you would just install these libraries, you
-    will generally find that you will be referred to this chapter to satisfy
-    a dependency of other applications.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="c-ares.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="curl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="geoclue2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib-networking.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdsoap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ldns.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libevent.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmnl.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnftnl.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnma.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libndp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libslirp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtirpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="neon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nghttp2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rpcsvc-proto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="serf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uhttpmock.xml"/>
-</chapter>
Index: tworking/netlibs/nghttp2.xml
===================================================================
--- networking/netlibs/nghttp2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "0bb5661ff08b983487d6683350770c36">
-  <!ENTITY nghttp2-size          "1.6 MB">
-  <!ENTITY nghttp2-buildsize     "19 MB">
-  <!ENTITY nghttp2-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="nghttp2" xreflabel="nghttp2-&nghttp2-version;">
-  <?dbhtml filename="nghttp2.html"?>
-
-
-  <title>nghttp2-&nghttp2-version;</title>
-
-  <indexterm zone="nghttp2">
-    <primary sortas="a-nghttp2">nghttp2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to nghttp2</title>
-
-    <para>
-      <application>nghttp2</application> is an implementation of HTTP/2 and
-      its header compression algorithm, HPACK.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nghttp2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nghttp2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nghttp2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nghttp2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nghttp2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nghttp2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">nghttp2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      The following are only used if building the full package instead of
-      only the main libraries:
-      <xref linkend="boost"/>, <!--required for the C++ asio library)-->
-      <xref linkend="c-ares"/>, <!-- required to build the HPACK tools -->
-      <xref linkend="cython"/>, <!-- required to python bindings -->
-      <xref linkend="jansson"/>, <!-- required to build the HPACK tools -->
-      <xref linkend="libevent"/>, <!--required to build the examples-->
-      <xref linkend="sphinx"/>, <!--required to build documentation-->
-<!--      <ulink url="http://www.digip.org/jansson/">Jansson</ulink>, <!- -required
-      to build the HPACK tools-->
-      <ulink url="https://jemalloc.net/">jemalloc</ulink>,
-      <!--required for the example HTTP server-->
-      <ulink url="http://software.schmorp.de/pkg/libev.html">libev</ulink>,
-      <!--required to build the applications-->
-      <ulink url="https://mruby.org/">mruby</ulink>, and
-      <!--provides ruby support in the sample HTTP server-->
-      <ulink url="https://tatsuhiro-t.github.io/spdylay/">Spdylay</ulink>.
-      <!--provide SPDY functionality-->
-    </para>
-    <!--
-    <para role="optional">
-      <ulink url="https://cunit.sourceforge.net/">CUnit</ulink> is required if
-      you wish to run the test suite.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of nghttp2</title>
-
-    <para>
-      Install <application>nghttp2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --disable-static  \
-            --enable-lib-only \
-            --docdir=/usr/share/doc/nghttp2-&nghttp2-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-lib-only</parameter>: only build libnghttp2. Omit
-      this switch if you'd like to build the example applications, Python
-      bindings, or the C++ asio library.
-    </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>
-          libnghttp2.so
-        </seg>
-        <seg>
-          /usr/include/nghttp2,
-          /usr/share/nghttp2, and
-          /usr/share/doc/nghttp2-&nghttp2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnghttp2">
-        <term><filename class="libraryfile">libnghttp2.so</filename></term>
-        <listitem>
-          <para>
-            an implementation of the Hypertext Transfer Protocol version 2 in C
-          </para>
-          <indexterm zone="nghttp2 libnghttp2">
-            <primary sortas="c-libnghttp2">libnghttp2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/rpcsvc-proto.xml
===================================================================
--- networking/netlibs/rpcsvc-proto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rpcsvc-proto-download-http "https://github.com/thkukuk/rpcsvc-proto/releases/download/v&rpcsvc-proto-version;/rpcsvc-proto-&rpcsvc-proto-version;.tar.xz">
-  <!ENTITY rpcsvc-proto-download-ftp  " ">
-  <!ENTITY rpcsvc-proto-md5sum        "bf908de360308d909e9cc469402ff2ef">
-  <!ENTITY rpcsvc-proto-size          "168 KB">
-  <!ENTITY rpcsvc-proto-buildsize     "2.2 MB">
-  <!ENTITY rpcsvc-proto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="rpcsvc-proto" xreflabel="rpcsvc-proto-&rpcsvc-proto-version;">
-  <?dbhtml filename="rpcsvc-proto.html"?>
-
-
-  <title>rpcsvc-proto-&rpcsvc-proto-version;</title>
-
-  <indexterm zone="rpcsvc-proto">
-    <primary sortas="a-rpcsvc-proto">rpcsvc-proto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rpcsvc-proto</title>
-
-    <para>
-      The <application>rpcsvc-proto</application> package contains the rcpsvc
-      protocol files and headers, formerly included with glibc, that are not
-      included in replacement <xref linkend="libtirpc"/>, along with the rpcgen
-      program.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rpcsvc-proto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rpcsvc-proto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rpcsvc-proto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rpcsvc-proto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rpcsvc-proto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rpcsvc-proto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rpcsvc-proto</title>
-
-    <para>
-      Install <application>rpcsvc-proto</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rpcgen
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/rpcsvc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rpcgen">
-        <term><command>rpcgen</command></term>
-        <listitem>
-          <para>
-            Generates C code to implement the RPC protocol
-          </para>
-          <indexterm zone="rpcsvc-proto rpcgen">
-            <primary sortas="b-rpcgen">rpcgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/serf.xml
===================================================================
--- networking/netlibs/serf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,211 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 serf-download-http "https://archive.apache.org/dist/serf/serf-&serf-version;.tar.bz2">
-  <!ENTITY serf-download-ftp  " ">
-  <!ENTITY serf-md5sum        "5320087299084c297eff8e1dacfab1af">
-  <!ENTITY serf-size          "148 KB">
-  <!ENTITY serf-buildsize     "2.4 MB">
-  <!ENTITY serf-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="serf" xreflabel="Serf-&serf-version;">
-  <?dbhtml filename="serf.html"?>
-
-
-  <title>Serf-&serf-version;</title>
-
-  <indexterm zone="serf">
-    <primary sortas="a-Serf">Serf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Serf</title>
-
-    <para>
-      The <application>Serf</application> package contains a C-based HTTP client
-      library built upon the Apache Portable Runtime (APR) library. It
-      multiplexes connections, running the read/write communication asynchronously.
-      Memory copies and transformations are kept to a minimum to provide high
-      performance operation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&serf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&serf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &serf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &serf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &serf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &serf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/serf-&serf-version;-openssl3_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Serf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="scons"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/> (for GSSAPI support)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Serf</title>
-<!--
-    <para>
-      First, fix an issue that causes compilation issues in other packages
-      when using OpenSSL-3:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../serf-&serf-version;-openssl3_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>Serf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i "/Append/s:RPATH=libdir,::"          SConstruct &amp;&amp;
-sed -i "/Default/s:lib_static,::"           SConstruct &amp;&amp;
-sed -i "/Alias/s:install_static,::"         SConstruct &amp;&amp;
-
-scons PREFIX=/usr</userinput></screen>
-<!--
-sed -i "/  print/{s/print/print(/; s/$/)/}" SConstruct &amp;&amp;
-sed -i "/get_contents()/s/,/.decode()&amp;/"    SConstruct &amp;&amp;
--->
-
-<!-- I did not find this to be needed as of 1.3.9 -renodr
-    <para>
-      If you wish to run the test suite, fix one file:
-    </para>
-
-<screen><userinput>sed -i test/test_buckets.c \
-    -e 's://\(    buf_size = orig_len + (orig_len / 1000) + 12;\):/\*\1\ */:'</userinput></screen>
--->
-
-<!-- With Python 3, check.py is broken. It could be fixed, but since the
-     test suite hangs anyway...
-    <para>
-      To test the results, issue: <command>scons check</command>.
-      The tests currently will cause a hang.
-    </para>
--->
-
-    <para>
-      This package does not come with a functional test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>scons PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "..."</command>: The first command removes the runtime
-      path from a shared library and the next two commands disable building and
-      installing of the static library.  <!--The fourth command corrects for
-      changes in scons-3.x. The last command allows to use <application>
-      Python 3</application>.-->
-    </para>
-
-    <para>
-      <option>GSSAPI=/usr</option>: Use this switch if you have installed a
-      GSSAPI library and you want <application>serf</application> to use it.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libserf-1.so
-        </seg>
-        <seg>
-          /usr/include/serf-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libserf-1">
-        <term><filename class="libraryfile">libserf-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Serf</application> API functions
-          </para>
-          <indexterm zone="serf libserf-1">
-            <primary sortas="c-libserf-1">libserf-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/uhttpmock.xml
===================================================================
--- networking/netlibs/uhttpmock.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 uhttpmock-download-http "https://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-&uhttpmock-version;.tar.xz">
-  <!ENTITY uhttpmock-download-ftp  " ">
-  <!ENTITY uhttpmock-md5sum        "ff303049fb20538f3558164f04986c79">
-  <!ENTITY uhttpmock-size          "48 KB">
-  <!ENTITY uhttpmock-buildsize     "2.1 MB">
-  <!ENTITY uhttpmock-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="uhttpmock" xreflabel="uhttpmock-&uhttpmock-version;">
-  <?dbhtml filename="uhttpmock.html"?>
-
-
-  <title>uhttpmock-&uhttpmock-version;</title>
-
-  <indexterm zone="uhttpmock">
-    <primary sortas="a-uhttpmock">uhttpmock</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to uhttpmock</title>
-
-    <para>
-      The <application>uhttpmock</application> package contains a library
-      for mocking web service APIs which use HTTP or HTTPS.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&uhttpmock-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&uhttpmock-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &uhttpmock-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &uhttpmock-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &uhttpmock-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &uhttpmock-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">uhttpmock Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of uhttpmock</title>
-
-    <para>
-      Install <application>uhttpmock</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <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>
-          libuhttpmock-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libuhttpmock-1.0 and
-          /usr/share/gtk-doc/html/libuhttpmock-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libuhttpmock-1.0">
-        <term><filename class="libraryfile">libuhttpmock-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>uhttpmock</application> API functions
-          </para>
-          <indexterm zone="uhttpmock libuhttpmock-1.0">
-            <primary sortas="c-libuhttpmock-1.0">libuhttpmock-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/bridgeutils-kernel.xml
===================================================================
--- networking/netprogs/bridgeutils-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    &lt;*/M&gt; 802.1<emphasis role='blue'>d</emphasis> Ethernet Bridging                                      [BRIDGE]</screen>
Index: tworking/netprogs/bridgeutils.xml
===================================================================
--- networking/netprogs/bridgeutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,254 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="bridgeutils" xreflabel="bridge-utils-&bridgeutils-version;">
-  <?dbhtml filename="bridge-utils.html"?>
-
-
-  <title>bridge-utils-&bridgeutils-version;</title>
-
-  <indexterm zone="bridgeutils">
-    <primary sortas="a-bridgeutils">bridge-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to bridge-utils</title>
-
-    <para>
-      The <application>bridge-utils</application> package contains a utility
-      needed to create and manage bridge devices.  This is useful in setting up
-      networks for a hosted virtual machine (VM).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bridge-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bridge-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bridge-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bridge-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bridge-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bridge-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">bridge-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (to run tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="net-tools"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id='bridgeutils-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration
-      and recompile the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="bridgeutils-kernel.xml"/>
-
-    <indexterm zone="bridgeutils bridgeutils-kernel">
-      <primary sortas="d-bridgeutils">Bridge Utilities</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of bridge-utils</title>
-
-    <para>
-      Install <application>bridge-utils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoconf                  &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Testing the results requires running the six shell scripts in
-      the <filename class='directory'>tools/</filename> directory.
-      Two of the tests require two ethernet ports.  Some tests
-      will not preserve the current network configuration.  See
-      <filename>tests/README</filename> for details.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration" revision="sysv">
-    <title>Configuring bridge-utils</title>
-
-    <sect3 id='bridgeutils-init'>
-      <title>Configuration Information</title>
-
-      <para>
-        To automate bridge creation and configuration,
-        install the <filename>/usr/lib/services/bridge</filename>
-        service script included in the <xref linkend="bootscripts"/>
-        package.
-      </para>
-
-      <indexterm zone="bridgeutils bridgeutils-init">
-        <primary sortas="f-bridgeutils">bridge-utils</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-service-bridge</userinput></screen>
-
-      <note>
-        <para>
-          The <filename>bridge</filename> script depends
-          on the commands <command>/sbin/ifup</command> and
-          <command>/sbin/ifdown</command> and the service script
-          <emphasis>ipv4-static</emphasis> from the <emphasis>LFS</emphasis>
-          bootscripts dated January 27, 2012 or later.
-        </para>
-      </note>
-
-      <para>
-        The following configuration file will create a bridge device at
-        boot time and attach the eth0 device to it.  If more than one device is
-        desired, use a space separated list of INTERFACE_COMPONENTS.  This
-        configuration is useful when planning to run a virtual machine such as
-        kvm/qemu.
-      </para>
-
-      <para>
-        Other <envar>SERVICE</envar> combinations are possible, for example,
-        <code>SERVICE="bridge dhcp"</code>.  In that case, the address
-        parameters are not needed, but do not interfere if present. The
-        bridge service may also be used alone, but will require
-        additional subsequent configuration.
-      </para>
-
-      <caution>
-        <para>
-          Do not run a parallel configuration for a device in the
-          INTERFACE_COMPONENTS list.  For instance, in the example below, do not
-          configure <filename>/etc/sysconfig/ifconfig.eth0</filename> to run at
-          boot time.  The command <command>ifdown br0</command> followed by
-          command <command>ifup eth0</command> will work, but don't try to have
-          both up at the same time.
-        </para>
-      </caution>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.br0 &lt;&lt; "EOF"
-<literal>ONBOOT=yes
-IFACE=br0
-VIRTINT=yes
-SERVICE="bridge ipv4-static"  # Space separated
-IP=192.168.1.32
-GATEWAY=192.168.1.1
-PREFIX=24
-BROADCAST=192.168.1.255
-CHECK_LINK=no                 # Don't check before bridge is created
-STP=no                        # Spanning tree protocol, default no
-INTERFACE_COMPONENTS="eth0"   # Add to IFACE, space separated devices
-IP_FORWARD=true</literal>
-EOF</userinput></screen>
-
-      <para>
-        All addresses should be changed to meet your circumstance.
-      </para>
-
-    </sect3>
-  </sect2>
-<!-- There is a whole page about bridging for systemd in the "Connecting to
-     a network" chapter
-  <sect2 role="configuration" revision="systemd">
-    <title>Configuring bridge-utils</title>
-
-    <sect3 id='bridgeutils-init-systemd'>
-      <title>Configuration Information</title>
-      <para>
-        TBA
-      </para>
-    </sect3>
-  </sect2>
--->
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>brctl</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="brctl">
-        <term><command>brctl</command></term>
-        <listitem>
-          <para>
-            is a program  used to set up, maintain, and inspect the
-            ethernet bridge configuration in the linux kernel
-          </para>
-          <indexterm zone="bridgeutils brctl">
-            <primary sortas="b-brctl">brctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/cifsutils-kernel.xml
===================================================================
--- networking/netprogs/cifsutils-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork File Systems ---&gt;                            [NETWORK_FILESYSTEMS]
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>MB3 and CIFS support (advanced network filesystem)             [CIFS]</screen>
Index: tworking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,322 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "518431bf43f23e6aacd97e80e2060df7">
-  <!ENTITY cifsutils-size          "412 KB">
-  <!ENTITY cifsutils-buildsize     "4.2 MB">
-  <!ENTITY cifsutils-time          "0.1 SBU">
-]>
-
-<sect1 id="cifsutils" xreflabel="cifs-utils-&cifsutils-version;">
-  <?dbhtml filename="cifsutils.html"?>
-
-
-  <title>cifs-utils-&cifsutils-version;</title>
-
-  <indexterm zone="cifsutils">
-    <primary sortas="a-cifsutils">cifs-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-   <title>Introduction to cifs-utils</title>
-
-    <para>
-      The <application>cifs-utils</application> package provides a means for
-      mounting SMB/CIFS shares on a Linux system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cifsutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cifsutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cifsutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cifsutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cifsutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cifsutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">cifs-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="talloc"/> (required if krb is installed),
-      <xref linkend="mitkrb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (to create the man pages),
-      <xref linkend="keyutils"/> (required to build PAM module),
-      <xref linkend="linux-pam"/>,
-      <xref linkend="samba"/>, and
-      <xref linkend="libcap-pam"/> or
-      <ulink url="https://people.redhat.com/sgrubb/libcap-ng/">
-        libcap-ng
-      </ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id="cifsutils-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="cifsutils-kernel.xml"/>
-
-    <para>
-      Depending on your server configuration, additional kernel options may be
-      required.
-    </para>
-
-    <indexterm zone="cifsutils cifsutils-kernel">
-      <primary sortas="d-cifsutils">cifs-utils</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cifs-utils</title>
-
-    <para>
-      Install <application>cifs-utils</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr \
-            --disable-pam \
-            --disable-systemd &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr \
-            --disable-pam &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>
-
-<!-- Note to editors: You need to define ROOTSBINDIR and man8dir, like this:
-     ROOTSBINDIR=<DESTDIR>/sbin man8dir=<DESTDIR>/usr/share/man/man8
-     This is due to a bug in the makefile for cifs-utils-6.10, since it tries
-     to install symlinks for mount.smb3 without thinking about DESTDIR
-     installations. -->
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-pam</parameter>: Do not build PAM support.
-      Remove it and use <option>--with-pamdir</option> (see below),
-      if <xref linkend="linux-pam"/> is installed and you wish
-      PAM support.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: Disable systemd specific
-      behavior for <command>mount.cifs</command>.
-    </para>
-
-    <para>
-      <option>--with-pamdir=/usr/lib/security</option>: Install the PAM
-      module in <filename class="directory">/usr/lib/security</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg> cifs.idmap, cifs.upcall, cifscreds, getcifsacl,
-          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>
-        <seg>/usr/lib/cifs-utils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cifs.idmap">
-        <term><command>cifs.idmap</command></term>
-        <listitem>
-          <para>
-            is a userspace helper program for the linux CIFS client filesystem.
-            There are a number of activities that the kernel cannot easily do
-            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
-          </para>
-          <indexterm zone="cifsutils cifs.idmap">
-            <primary sortas="b-cifs.idmap">cifs.idmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cifs.upcall">
-        <term><command>cifs.upcall</command></term>
-        <listitem>
-          <para>
-            is a userspace helper program for the linux CIFS client
-            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
-          </para>
-          <indexterm zone="cifsutils cifs.upcall">
-            <primary sortas="b-cifs.upcall">cifs.upcall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cifscreds">
-        <term><command>cifscreds</command></term>
-        <listitem>
-          <para>
-            is a tool for managing credentials (username and password)
-            for the purpose of establishing sessions in multiuser mounts
-          </para>
-          <indexterm zone="cifsutils cifscreds">
-            <primary sortas="b-cifscreds">cifscreds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getcifsacl">
-        <term><command>getcifsacl</command></term>
-        <listitem>
-          <para>
-            is a userspace helper  to display an ACL in a security
-            descriptor for Common Internet File System (CIFS)
-          </para>
-          <indexterm zone="cifsutils getcifsacl">
-            <primary sortas="b-getcifsacl">getcifsacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.cifs">
-        <term><command>mount.cifs</command></term>
-        <listitem>
-          <para>
-            mounts a Linux CIFS filesystem. It is usually invoked
-            indirectly by the <ulink role='man'
-            url='&man;mount.8'>mount(8)</ulink> command when using the
-            <option>-t cifs</option> option
-          </para>
-          <indexterm zone="cifsutils mount.cifs">
-            <primary sortas="b-mount.cifs">mount.cifs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.smb3">
-        <term><command>mount.smb3</command></term>
-        <listitem>
-          <para>
-            mounts a SMB3-based filesystem. It is usually invoked
-            indirectly by the <ulink role='man'
-            url='&man;mount.8'>mount(8)</ulink> command when using the
-            <option>-t smb3</option> option
-          </para>
-          <indexterm zone="cifsutils mount.smb3">
-            <primary sortas="b-mount.smb3">mount.smb3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setcifsacl">
-        <term><command>setcifsacl</command></term>
-        <listitem>
-          <para>
-            is intended to alter an ACL of a security descriptor for a file
-            system object
-          </para>
-          <indexterm zone="cifsutils setcifsacl">
-            <primary sortas="b-setcifsacl">setcifsacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smb2-quota">
-        <term><command>smb3-quota</command></term>
-        <listitem>
-          <para>
-            displays quota information for a SMB filesystem
-          </para>
-          <indexterm zone="cifsutils smb2-quota">
-            <primary sortas="b-smb2-quota">smb2-quota</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbinfo">
-        <term><command>smbinfo</command></term>
-        <listitem>
-          <para>
-            displays SMB-specific file information, such as security
-            descriptors and quotas
-          </para>
-          <indexterm zone="cifsutils smbinfo">
-            <primary sortas="b-smbinfo">smbinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/iw.xml
===================================================================
--- networking/netprogs/iw.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 iw-download-http "https://www.kernel.org/pub/software/network/iw/iw-&iw-version;.tar.xz">
-  <!ENTITY iw-download-ftp  " ">
-  <!ENTITY iw-md5sum        "a63e81b0dcae9caf9ed3a20f2c445a07">
-  <!ENTITY iw-size          "156 KB">
-  <!ENTITY iw-buildsize     "5 MB">
-  <!ENTITY iw-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="iw" xreflabel="iw-&iw-version;">
-  <?dbhtml filename="iw.html"?>
-
-
-  <title>iw-&iw-version;</title>
-
-  <indexterm zone="iw">
-    <primary sortas="a-iw">iw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to iw</title>
-
-    <para>
-      <application>iw</application> is a new nl80211 based CLI configuration
-      utility for wireless devices. It supports all new drivers that have been
-      added to the kernel recently. The old tool
-      <application>iwconfig</application>, which uses Wireless Extensions
-      interface, is deprecated and it's strongly recommended to switch to
-      <application>iw</application> and nl80211.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&iw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&iw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &iw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &iw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &iw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &iw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">iw Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="nodump">
-      <!-- nodump because the section is completely for human -->
-      <xref linkend="wireless-kernel"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id='iw-kernel'>
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="iw iw-kernel">
-      <primary sortas="d-iw-devices">iw</primary>
-    </indexterm>
-
-    <para>
-      To use <application>iw</application>, the kernel must have the
-      appropriate drivers and other support available.  Read
-      <xref linkend='wireless-kernel'/> for details.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of iw</title>
-
-    <para>
-      To install <application>iw</application>,
-      use the following commands:
-    </para>
-
-<screen><userinput>sed -i "/INSTALL.*gz/s/.gz//" Makefile &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: Install uncompressed manual pages
-      in accordance with other man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>iw</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="iw-prog">
-        <term><command>iw</command></term>
-        <listitem>
-          <para>
-            shows / manipulates wireless devices and their configuration
-          </para>
-          <indexterm zone="iw iw-prog">
-            <primary sortas="b-iw">iw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/ncftp.xml
===================================================================
--- networking/netprogs/ncftp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ncftp-download-http "https://www.ncftp.com/downloads/ncftp/ncftp-&ncftp-version;-src.tar.xz">
-  <!ENTITY ncftp-download-ftp  " ">
-  <!ENTITY ncftp-md5sum        "bbcb048d2412f4d62bc798818e703680">
-  <!ENTITY ncftp-size          "416 KB">
-  <!ENTITY ncftp-buildsize     "6.9 MB">
-  <!ENTITY ncftp-time          "0.2 SBU">
-]>
-
-<sect1 id="ncftp" xreflabel="NcFTP-&ncftp-version;">
-  <?dbhtml filename="ncftp.html"?>
-
-
-<title>NcFTP-&ncftp-version;</title>
-
-  <indexterm zone="ncftp">
-    <primary sortas="a-NcFTP">NcFTP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NcFTP</title>
-
-    <para>
-      The <application>NcFTP</application> package contains
-      a powerful and flexible interface to the Internet standard File Transfer
-      Protocol.  It is intended to replace or supplement the stock
-      <command>ftp</command> program.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ncftp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ncftp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ncftp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ncftp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ncftp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ncftp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ncftp-&ncftp-version;-configure_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NcFTP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="llvm"/> (with Clang, used by default if installed)
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NcFTP</title>
-
-    <para>
-      There are two ways to build <application>NcFTP</application>.  The first
-      (and optimal) way builds most of the functionality as a shared library
-      and then builds and installs the program linked against this library.
-      The second method simply links all of the functionality into the binary
-      statically.  This doesn't make the dynamic library available for linking
-      by other applications.  You need to choose which method best suits you.
-      Note that the second method does <emphasis>not</emphasis> create an
-      entirely statically linked binary; only the <filename
-      class="libraryfile">libncftp</filename> parts are statically linked in,
-      in this case. Be aware that building and using the shared library is
-      covered by the Clarified Artistic License; however, developing
-      applications that utilize the shared library is subject to a different
-      license.
-    </para>
-<!--
-    <para>
-      First, fix an issue caused by a change in behavior in GCC-10:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/^Bookmark/extern Bookmark/' sh_util/gpshare.c</userinput></screen>
-
-    <para>
-      Next, update the configure script to use modern C standards:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../ncftp-&ncftp-version;-configure_fixes-1.patch &amp;&amp;
-autoreconf -fiv -I autoconf_local</userinput></screen>
--->
-    <para>
-      To install <application>NcFTP</application> using the
-      first (and optimal) method, run the following commands:
-    </para>
-
-<screen><userinput>CC=/usr/bin/gcc \
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make -C libncftp shared &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 -C libncftp soinstall &amp;&amp;
-make install</userinput></screen>
-
-    <para>
-      To install <application>NcFTP</application> using the
-      second method (with the <filename class="libraryfile">libncftp</filename>
-      functionality linked in statically) run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>./configure --prefix=/usr --sysconfdir=/etc &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="nodump"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>CC=/usr/bin/gcc</envar>. This environment variable ensures
-      that <command>gcc</command> is used if <xref linkend="llvm"/> is
-      installed.  The build procedure is broken if <command>gcc</command>
-      is not used.
-    </para>
-
-    <para>
-      <command>make -C ... &amp;&amp; make -C ...</command>:
-      These commands make and install the dynamic library <filename
-      class="libraryfile">libncftp</filename> which is then used to link
-      against when compiling the main program.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NcFTP</title>
-
-    <sect3 id="ncftp-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/ncftp.*</filename> and
-        <filename>~/.ncftp/*</filename>; especially
-        <filename>/etc/ncftp.prefs_v3</filename> and
-        <filename>~/.ncftp/prefs_v3</filename>
-      </para>
-
-      <indexterm zone="ncftp ncftp-config">
-        <primary sortas="e-AA.ncftp/*">~/.ncftp/*</primary>
-      </indexterm>
-
-      <indexterm zone="ncftp ncftp-config">
-        <primary sortas="e-etc-ncftp.*">/etc/ncftp.*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Most <application>NcFTP</application> configuration is done while in
-        the program, and the configuration files are dealt with automatically.
-        One exception to this is <filename>~/.ncftp/prefs_v3</filename>. There
-        are various options to alter in there, including:
-      </para>
-
-<screen><literal>yes-i-know-about-NcFTPd=yes</literal></screen>
-
-      <para>
-        This disables the splash screen advertising the
-        <application>NcFTPd</application> server.
-      </para>
-
-      <para>
-        There are other options in the <filename>prefs_v3</filename> file.
-        Most of these are self-explanatory. Global defaults can be set in
-        <filename>/etc/ncftp.prefs_v3</filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ncftp, ncftpbatch, ncftpbookmarks, ncftpget,
-        ncftpls, ncftpput, and ncftpspooler</seg>
-        <seg>libncftp.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ncftp-prog">
-        <term><command>ncftp</command></term>
-        <listitem>
-          <para>
-            is a browser program for File Transfer Protocol
-          </para>
-          <indexterm zone="ncftp ncftp-prog">
-            <primary sortas="b-ncftp">ncftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncftpbatch">
-        <term><command>ncftpbatch</command></term>
-        <listitem>
-          <para>
-            is an individual batch FTP job processor
-          </para>
-          <indexterm zone="ncftp ncftpbatch">
-            <primary sortas="b-ncftpbatch">ncftpbatch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncftpbookmarks">
-        <term><command>ncftpbookmarks</command></term>
-        <listitem>
-          <para>
-            is the <application>NcFTP</application> Bookmark Editor
-            (<application>NCurses</application>-based)
-          </para>
-          <indexterm zone="ncftp ncftpbookmarks">
-            <primary sortas="b-ncftpbookmarks">ncftpbookmarks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncftpget">
-        <term><command>ncftpget</command></term>
-        <listitem>
-          <para>
-            is an internet file transfer program for scripts used to
-            retrieve files
-          </para>
-          <indexterm zone="ncftp ncftpget">
-            <primary sortas="b-ncftpget">ncftpget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncftpls">
-        <term><command>ncftpls</command></term>
-        <listitem>
-          <para>
-            is an internet file transfer program for scripts used to
-            list files
-          </para>
-          <indexterm zone="ncftp ncftpls">
-            <primary sortas="b-ncftpls">ncftpls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncftpput">
-        <term><command>ncftpput</command></term>
-        <listitem>
-          <para>
-            is an internet file transfer program for scripts used to
-            transfer files
-          </para>
-          <indexterm zone="ncftp ncftpput">
-            <primary sortas="b-ncftpput">ncftpput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncftpspooler">
-        <term><command>ncftpspooler</command></term>
-        <listitem>
-          <para>
-            is a global batch FTP job processor daemon
-          </para>
-          <indexterm zone="ncftp ncftpspooler">
-            <primary sortas="b-ncftpspooler">ncftpspooler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/net-tools.xml
===================================================================
--- networking/netprogs/net-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,327 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="net-tools" xreflabel="Net-tools-&net-tools-version;">
-  <?dbhtml filename="net-tools.html"?>
-
-
-  <title>Net-tools-&net-tools-version;</title>
-
-  <indexterm zone="net-tools">
-    <primary sortas="a-Net-tools">Net-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Net-tools</title>
-
-    <para>
-      The <application>Net-tools</application> package is a collection
-      of programs for controlling the network subsystem of the Linux kernel.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&net-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&net-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &net-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &net-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &net-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &net-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/net-tools-&net-tools-version;-remove_dups-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Net-tools</title>
-
-    <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.
-      If you wish to run the interactive configuration process (by changing
-      the instruction to just <command>make</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
-      is a bunch of questions about which network protocols you've enabled
-      in your kernel. The default answers will enable the tools from this
-      package to work with the most common protocols: TCP, PPP, and several
-      others. You still need to actually enable these protocols in the
-      kernel&mdash;what you do here is merely tell the package to include
-      support for those protocols in its programs, but it's up to the kernel
-      to make the protocols available.
-    </para>
-
-    <note>
-      <para>
-        This package has several unneeded protocols and hardware device
-        specific functions that are obsolete. To only build the minimum needed
-        for your system, skip the <command>yes</command> command and answer
-        each question interactively.  The minimum needed options are 'UNIX
-        protocol family' and 'INET (TCP/IP) protocol family'.
-      </para>
-    </note>
-
-    <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 -->
-
-    <para>
-      Install <application>Net-tools</application> by running the
-      following commands:
-    </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>
-
-    <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>chown -R root:root install &amp;&amp;
-cp -a install/* /</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-      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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>arp,
-        ipmaddr,
-        iptunnel,
-        mii-tool,
-        nameif,
-        netstat,
-        plipconfig,
-        rarp,
-        route, and
-        slattach
-        </seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="arp">
-        <term><command>arp</command></term>
-        <listitem>
-          <para>
-            is used to manipulate the kernel's ARP cache, usually
-            to add or delete an entry, or to dump the entire cache
-          </para>
-          <indexterm zone="net-tools arp">
-            <primary sortas="b-arp">arp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipmaddr">
-        <term><command>ipmaddr</command></term>
-        <listitem>
-          <para>
-            adds, deletes and shows an interface's multicast addresses
-          </para>
-          <indexterm zone="net-tools ipmaddr">
-            <primary sortas="b-ipmaddr">ipmaddr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iptunnel">
-        <term><command>iptunnel</command></term>
-        <listitem>
-          <para>
-            adds, changes, deletes and shows an interface's tunnels
-          </para>
-          <indexterm zone="net-tools iptunnel">
-            <primary sortas="b-iptunnel">iptunnel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mii-tool">
-        <term><command>mii-tool</command></term>
-        <listitem>
-          <para>
-            checks or sets the status of a network interface's Media
-            Independent Interface (MII) unit
-          </para>
-          <indexterm zone="net-tools mii-tool">
-            <primary sortas="b-mii-tool">mii-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nameif">
-        <term><command>nameif</command></term>
-        <listitem>
-          <para>
-            names network interfaces based on MAC addresses
-          </para>
-          <indexterm zone="net-tools nameif">
-            <primary sortas="b-nameif">nameif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="netstat">
-        <term><command>netstat</command></term>
-        <listitem>
-          <para>
-            is used to report network connections, routing tables, and
-            interface statistics
-          </para>
-          <indexterm zone="net-tools netstat">
-            <primary sortas="b-netstat">netstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="plipconfig">
-        <term><command>plipconfig</command></term>
-        <listitem>
-          <para>
-            is used to fine tune the PLIP device parameters, to
-            improve its performance
-          </para>
-          <indexterm zone="net-tools plipconfig">
-            <primary sortas="b-plipconfig">plipconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rarp">
-        <term><command>rarp</command></term>
-        <listitem>
-          <para>
-            is used to manipulate the kernel's RARP table
-          </para>
-          <indexterm zone="net-tools rarp">
-            <primary sortas="b-rarp">rarp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="route">
-        <term><command>route</command></term>
-        <listitem>
-          <para>
-            is used to manipulate the IP routing table
-          </para>
-          <indexterm zone="net-tools route">
-            <primary sortas="b-route">route</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slattach">
-        <term><command>slattach</command></term>
-        <listitem>
-          <para>
-            attaches a network interface to a serial line. This allows you to
-            use normal terminal lines for point-to-point links to others
-            computers
-          </para>
-          <indexterm zone="net-tools slattach">
-            <primary sortas="b-slattach">slattach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/netfs.xml
===================================================================
--- networking/netprogs/netfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-config-netfs"  xreflabel="Configuring for Network Filesystems" revision="sysv">
-  <?dbhtml filename="netfs.html"?>
-
-
-  <title>Configuring for Network Filesystems</title>
-
-  <!-- Fake the zone for index formatting -->
-  <indexterm zone="postlfs-config-netfs postlfs-config-netfs">
-    <primary sortas="f-netfs">netfs</primary>
-  </indexterm>
-
-  <para>
-    While LFS is capable of mounting network file systems such as NFS,
-    these are not mounted by the <filename>mountfs</filename> init script.
-    Network file systems must be mounted after the networking is activated and
-    unmounted before the network goes down.  The <filename>netfs</filename>
-    bootscript was written to handle both boot-time mounting of network
-    filesystems, if the entry in <filename>/etc/fstab</filename> contains the
-    <option>_netdev</option> option, and unmounting of all network filesystems
-    before the network is brought down.
-  </para>
-
-  <para>
-    As the <systemitem class="username">root</systemitem> user, install the
-    <filename>/etc/rc.d/init.d/netfs</filename> bootscript included with the
-    <xref linkend="bootscripts"/> package.
-  </para>
-
-<screen role='root'><userinput>make install-netfs</userinput></screen>
-
-</sect1>
Index: tworking/netprogs/netprogs.xml
===================================================================
--- networking/netprogs/netprogs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="netprogs">
-  <?dbhtml filename="netprogs.html"?>
-
-  <title>Networking Programs</title>
-
-  <para>
-    These applications are generally client applications used to
-    access the appropriate server across the building or across the world.
-    <application>Tcpwrappers</application> and
-    <application>portmap</application> are support programs for daemons that
-    you may have running on your machine.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bridgeutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cifsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncftp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rpcbind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wget.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless-kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpa_supplicant.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="othernetprogs.xml"/>-->
-
-</chapter>
Index: tworking/netprogs/nfs-utils-kernel.xml
===================================================================
--- networking/netprogs/nfs-utils-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork File Systems ---&gt;                            [NETWORK_FILESYSTEMS]
-    &lt;*/M&gt; N<emphasis role='blue'>F</emphasis>S client support                                            [NFS_FS]
-    &lt;*/M&gt; N<emphasis role='blue'>F</emphasis>S server support                                              [NFSD]</screen>
Index: tworking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,717 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nfs-utils-root "&kernel-dl;/linux/utils/nfs-utils" >
-  <!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        "907f95977ccf7a522ee32af1534f0e4c">
-  <!ENTITY nfs-utils-size          "712 KB">
-  <!ENTITY nfs-utils-buildsize     "18 MB (with tests)">
-  <!ENTITY nfs-utils-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="nfs-utils" xreflabel="nfs-utils-&nfs-utils-version;">
-  <?dbhtml filename="nfs-utils.html"?>
-
-
-  <title>NFS-Utils-&nfs-utils-version;</title>
-
-  <indexterm zone="nfs-utils">
-    <primary sortas="a-Nfs-utils">NFS Utilities</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NFS Utilities</title>
-
-    <para>
-      The <application>NFS Utilities</application> package contains the
-      userspace server and client tools necessary to use the kernel's NFS
-      abilities. NFS is a protocol that allows sharing file systems over the
-      network.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nfs-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nfs-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nfs-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nfs-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nfs-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nfs-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NFS Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>,
-      <xref linkend="libevent"/>,
-      <xref linkend="rpcsvc-proto"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <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="libnsl"/> (for NIS client support),
-      <xref linkend="openldap"/> (for LDAP authentication),
-      <xref linkend="mitkrb"/> or
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">
-        libgssapi
-      </ulink>, and
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">
-        librpcsecgss
-      </ulink> (for GSS and RPC security support), and
-      <xref linkend="libcap-pam"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="rpcbind"/>
-    </para>
-
-<!-- NSS configuration isn't directly related to NFS, but left here in case
-    <bridgehead renderas="sect4">Optional (runtime for NIS clients)</bridgehead>
-    <para role="optional">
-    <ulink url="https://github.com/thkukuk/libnss_compat">libnss_compat</ulink>,
-    <ulink url="https://github.com/thkukuk/libnss_nis">libnss_nis</ulink>, and
-    <ulink url="https://github.com/thkukuk/libnss_nisplus">libnss_nisplus</ulink>
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="kernel" id='nfs-utils-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration
-      (choose client and/or server support as appropriate) and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="nfs-utils-kernel.xml"/>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options
-      are selected.
-    </para>
-
-    <note>
-      <para>
-        In BLFS we assume that nfs v3 will be used. If the
-        <emphasis>server</emphasis> offers nfs v4 (for linux, CONFIG_NFSD_V4)
-        then auto-negotiation for v3 will fail and you will need to add
-        <literal>nfsver=3</literal> to the mount options. This also applies
-        if that option is enabled in the <emphasis>client's</emphasis> kernel,
-        for example in a distro trying to mount from a BLFS v3 server.
-      </para>
-      <para>
-        Even if neither end of the connection supports nfs v4, adding
-        <literal>nfsver=3</literal> is still beneficial because it prevents an
-        error message "NFS: bad mount option value specified: minorversion=1"
-        being logged on every mount.
-      </para>
-    </note>
-
-    <indexterm zone="nfs-utils nfs-utils-kernel">
-      <primary sortas="d-nfs-utils">NFS Utilities</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation" id='nfs-utils-install'
-         xreflabel='NFS Utilities Installation'>
-    <title>Installation of NFS Utilities</title>
-<!--
-    <para>
-      Before you compile the program, ensure that the <systemitem
-      class="username">nobody</systemitem> user and <systemitem
-      class="groupname">nogroup</systemitem> group have been created as done in
-      the current LFS book.  You can add them by running the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>groupadd -g 99 nogroup &amp;&amp;
-useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
-    -s /bin/false -u 99 nobody</userinput></screen>
-
-    <note>
-      <para>
-        The classic uid and gid values are 65534 which is also -2 when
-        interpreted as a signed 16-bit number.  These values impact other files
-        on some filesystems that do not have support for sparse files.  The
-        <systemitem class="username">nobody</systemitem> and <systemitem
-        class="groupname">nogroup</systemitem> values are relatively arbitrary.
-        The impact on a server is nil if the <filename>exports</filename> file
-        is configured correctly. If it is misconfigured, an
-        <command>ls -l</command> or <command>ps</command> listing will show a
-        uid or gid number of 65534 instead of a name. The client uses
-        <systemitem class="username">nobody</systemitem> only as the user
-        running <command>rpc.statd</command>.
-      </para>
-    </note>
--->
-    <para>
-      Install <application>NFS Utilities</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --sbindir=/usr/sbin    \
-            --disable-nfsv4        \
-            --disable-gss          \
-            LIBS="-lsqlite3 -levent_core" &amp;&amp;
-make</userinput></screen>
-
-    <!-- Test breakage: see
-    http://lists.linuxfromscratch.org/pipermail/blfs-book/2017-December/071861.html
-    <para>
-      This package does not come with a working test suite.
-    </para>
-    -->
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<!-- dev note: make statduser=$(whoami) DESTDIR=<DESTDIR> install -->
-
-<screen role='root'><userinput>make install                       &amp;&amp;
-chmod u+w,go+r /usr/sbin/mount.nfs &amp;&amp;
-chown nobody:nogroup /var/lib/nfs</userinput></screen>
-
-    <para>
-      The tests for this package require that the package be installed.
-      In addition, the rpc.statd daemon must not be running and the tests
-      need to be run as the &root; user.
-    </para>
-
-    <para>
-      To test the results, issue, as &root;:
-    </para>
-
-<screen role="root" remap="test"><userinput>make check</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>sed ... support/nsm/rpc.c</command>: This sed it required
-      to fix a build issue with glibc-2.26 and later.
-    </para>
-
-    <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
-      RPCSEC GSS (RPC Security).
-    </para>
-
-    <para>
-      <parameter>LIBS="-lsqlite3 -levent_core"</parameter>: is required for
-      the fsidd program.
-    </para>
-
-    <para>
-      <command>chown nobody:nogroup /var/lib/nfs</command>: The
-      rpc.statd program uses the ownership of this directory to set
-      it's UID and GID.  This command sets those to unprivileged entries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NFS Utilities</title>
-
-    <sect3 id='nfs-utils-server-config'>
-      <title>Server Configuration</title>
-
-      <para>
-        <filename>/etc/exports</filename> contains the exported directories
-        on NFS servers. Refer to the <filename>exports.5</filename> manual page
-        for the syntax of this file. Also refer to the "NFS HowTo" available at
-        <ulink url="https://nfs.sourceforge.net/nfs-howto/"/> for information on
-        how to configure the servers and clients in a secure manner. For
-        example, for sharing the <filename class="directory">/home</filename>
-        directory over the local network, the following line may be added:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt;&gt; /etc/exports &lt;&lt; EOF
-<replaceable>/home 192.168.0.0/24</replaceable>(rw,subtree_check,anonuid=99,anongid=99)
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          Be sure to replace the directory, network address. and prefix above
-          to match your network.  The only space in the line above should be
-          between the directory and the network address.
-        </para>
-      </note>
-
-      <indexterm zone="nfs-utils nfs-utils-server-config">
-        <primary sortas="e-etc-exportfs">/etc/exportfs</primary>
-      </indexterm>
-
-      <sect4 id="nfs-utils-server-init">
-        <title><phrase revision="sysv">Boot Script</phrase>
-               <phrase revision="systemd">Systemd Units</phrase></title>
-
-        <para>
-          Install the
-          <phrase revision="sysv">
-            <filename>/etc/rc.d/init.d/nfs-server</filename>
-            init script
-          </phrase>
-          <phrase revision="systemd">NFSv4 server units</phrase>
-          included in the <xref linkend="bootscripts" revision="sysv"/>
-          <xref linkend="systemd-units" revision="systemd"/> package
-          to start the server at boot.
-        </para>
-
-<screen role="root" revision="systemd"><userinput>make install-nfsv4-server</userinput></screen>
-
-        <para revision="systemd">
-          If you have disabled NFSv4 support, run the following command as the
-          <systemitem class="username">root</systemitem> user to omit the NFSv4
-          specific systemd units:
-        </para>
-
-<!-- both -->
-<screen role="root"><userinput>make install-nfs-server</userinput></screen>
-
-        <indexterm zone="nfs-utils nfs-utils-server-init" revision="sysv">
-          <primary sortas="f-nfs-server">nfs-server</primary>
-        </indexterm>
-
-        <para revision="sysv">
-          Now create the
-          <filename>/etc/sysconfig/nfs-server</filename> configuration file:
-        </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"
-<literal>PORT="2049"
-PROCESSES="8"
-KILLDELAY="10"</literal>
-EOF</userinput></screen>
-
-        <note revision="sysv">
-          <para>
-            The above parameters may be optionally placed in
-            <filename>/etc/sysconfig/rc.site</filename>.
-          </para>
-        </note>
-
-        <indexterm zone="nfs-utils nfs-utils-server-init" revision="sysv">
-          <primary
-          sortas="e-etc-sysconfig-nfs-server">/etc/sysconfig/nfs-server</primary>
-        </indexterm>
-
-        <para revision="systemd">
-          You can edit the <filename>/etc/default/nfs-utils</filename>
-          file to change the startup options for NFS daemons. Defaults
-          should be fine for most use cases.
-        </para>
-
-        <indexterm zone="nfs-utils nfs-utils-server-init" revision="systemd">
-          <primary sortas="e-etc-default-nfs-utils">/etc/default/nfs-utils</primary>
-        </indexterm>
-
-      </sect4>
-
-    </sect3>
-
-    <sect3 id='nfs-utils-client-config'>
-      <title>Client Configuration</title>
-
-      <para>
-        <filename>/etc/fstab</filename> contains the directories that
-        are to be mounted on the client. Alternately the partitions can be
-        mounted by using the <command>mount</command> command with the proper
-        options. To mount the <filename class="directory">/home</filename>
-        and <filename class="directory">/usr</filename> partitions, add the
-        following to the <filename>/etc/fstab</filename>:
-      </para>
-
-<screen role="nodump"><userinput><replaceable>&lt;server-name&gt;</replaceable>:/home  /home nfs   rw,_netdev 0 0
-<replaceable>&lt;server-name&gt;</replaceable>:/usr   /usr  nfs   ro,_netdev 0 0</userinput></screen>
-
-      <para>
-        The options which can be used are specified in <command>man 5 nfs
-        </command>. If both the client and server are running recent versions
-        of linux, most of the options will be negotiated (but see the Note
-        above on nfsver=3). You can specify either <literal>rw</literal> or
-        <literal>ro</literal>, <literal>_netdev</literal> if the filesystem is
-        to be automatically mounted at boot, or <literal>noauto</literal> (and
-        perhaps <literal>user</literal>) for other filesystems.
-      </para>
-
-      <para>
-        If the fileserver is not running a recent version of linux, you may
-        need to specify other options.
-      </para>
-
-      <para revision="systemd">
-        You may need to enable autofs v4 in your kernel, and add the option
-        <literal>comment=systemd.automount</literal>. Some machines may need
-        this because systemd tries to mount the external filesystems before
-        the network is up. An alternative is to run <command>mount -a</command>
-        as the <systemitem class="username">root</systemitem> user after the
-        system has started.
-      </para>
-
-      <indexterm zone="nfs-utils nfs-utils-client-config">
-        <primary sortas="e-etc-fstab">/etc/fstab</primary>
-      </indexterm>
-
-      <sect4  id="nfs-utils-client-init">
-        <title><phrase revision="sysv">Boot Script</phrase>
-               <phrase revision="systemd">Systemd Units</phrase></title>
-
-        <note>
-          <para>
-            The following <phrase revision="sysv">boot script is</phrase>
-            <phrase revision="systemd">systemd units are</phrase> not required
-            if the nfs-server <phrase revision="sysv">script is</phrase>
-            <phrase revision="systemd">units are</phrase> installed.
-          </para>
-        </note>
-
-        <para>
-          Install the
-          <phrase revision="sysv">
-            <filename>/etc/rc.d/init.d/nfs-client</filename> init script
-          </phrase>
-          <phrase revision="systemd">units</phrase> included in the
-          <xref linkend="bootscripts" revision="sysv"/>
-          <xref linkend="systemd-units" revision="systemd"/> package to start
-          the client services at boot.
-        </para>
-
-<screen role="root"><userinput>make install-nfs-client</userinput></screen>
-
-        <indexterm zone="nfs-utils nfs-utils-client-config">
-          <primary sortas="f-nfs-client">nfs-client</primary>
-        </indexterm>
-
-        <para revision="sysv">
-          To automatically mount <systemitem class="filesystem">nfs
-          </systemitem> filesystems, clients will also need to install the
-          <filename>netfs</filename> bootscript as described in <xref
-          linkend="postlfs-config-netfs"/>.
-        </para>
-
-        <indexterm zone="nfs-utils nfs-utils-client-config" revision="sysv">
-          <primary sortas="f-netfs">netfs</primary>
-        </indexterm>
-
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>exportfs, fsidd, mountstats, mount.nfs, mount.nfs4 (link to mount.nfs),
-        nfsconf, nfsdclnts, nfsiostat, nfsstat, rpc.mountd, rpc.nfsd, rpc.statd,
-        rpcdebug, showmount, sm-notify, start-statd,
-        umount.nfs (link to mount.nfs), and umount.nfs4 (link to mount.nfs)</seg>
-        <seg>None</seg>
-        <seg>/var/lib/nfs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exportfs">
-        <term><command>exportfs</command></term>
-        <listitem>
-          <para>
-            maintains a list of NFS exported file systems
-          </para>
-          <indexterm zone="nfs-utils exportfs">
-            <primary sortas="b-exportfs">exportfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsidd">
-        <term><command>fsidd</command></term>
-        <listitem>
-          <para>
-            offers a local UNIX domain socket interface
-            for all NFS userspace to query the reexport database
-          </para>
-          <indexterm zone="nfs-utils fsidd">
-            <primary sortas="b-fsidd">fsidd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountstats">
-        <term><command>mountstats</command></term>
-        <listitem>
-          <para>
-            displays NFS client per-mount statistics
-          </para>
-          <indexterm zone="nfs-utils mountstats">
-            <primary sortas="b-mountstats">mountstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.nfs">
-        <term><command>mount.nfs</command></term>
-        <listitem>
-          <para>
-            is used to mount a network share using NFS
-          </para>
-          <indexterm zone="nfs-utils mount.nfs">
-            <primary sortas="b-mount.nfs">mount.nfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.nfs4">
-        <term><command>mount.nfs4</command></term>
-        <listitem>
-          <para>
-            is used to mount a network share using NFSv4
-          </para>
-          <indexterm zone="nfs-utils mount.nfs4">
-            <primary sortas="b-mount.nfs4">mount.nfs4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsconf">
-        <term><command>nfsconf</command></term>
-        <listitem>
-          <para>
-            can be used to test for and retrieve configuration settings from
-            a range of nfs-utils configuration files
-          </para>
-          <indexterm zone="nfs-utils nfsconf">
-            <primary sortas="b-nfsconf">nfsconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsdclnts">
-        <term><command>nfsdclnts</command></term>
-        <listitem>
-          <para>
-            prints information about NFS clients
-          </para>
-          <indexterm zone="nfs-utils nfsdclnts">
-            <primary sortas="b-nfsdclnts">nfsdclnts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsiostat-nfs-utils">
-        <term><command>nfsiostat</command></term>
-        <listitem>
-          <para>
-            reports input/output statistics for network filesystems
-          </para>
-          <indexterm zone="nfs-utils nfsiostat-nfs-utils">
-            <primary sortas="b-nfsiostat-nfs-utils">nfsiostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsstat">
-        <term><command>nfsstat</command></term>
-        <listitem>
-          <para>
-            displays statistics kept about NFS client and server activity
-          </para>
-          <indexterm zone="nfs-utils nfsstat">
-            <primary sortas="b-nfsstat">nfsstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  osd_login seems to no longer exist.
-      <varlistentry id="osd_login">
-        <term><command>osd_login</command></term>
-        <listitem>
-          <para>
-            is a script that is a part of the autologin feature
-            mandated by the pnfs-objects standard.
-          </para>
-          <indexterm zone="nfs-utils osd_login">
-            <primary sortas="b-osd_login">osd_login</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-
-      <varlistentry id="rpc.mountd">
-        <term><command>rpc.mountd</command></term>
-        <listitem>
-          <para>
-            implements the NFS mount protocol on an NFS server
-          </para>
-          <indexterm zone="nfs-utils rpc.mountd">
-            <primary sortas="b-rpc.mountd">rpc.mountd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpc.nfsd">
-        <term><command>rpc.nfsd</command></term>
-        <listitem>
-          <para>
-            implements the user level part of the NFS
-            service on the server
-          </para>
-          <indexterm zone="nfs-utils rpc.nfsd">
-            <primary sortas="b-rpc.nfsd">rpc.nfsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpc.statd">
-        <term><command>rpc.statd</command></term>
-        <listitem>
-          <para>
-            is used by the NFS file locking service. Run on both sides,
-            client as well as server, when you want file locking enabled
-          </para>
-          <indexterm zone="nfs-utils rpc.statd">
-            <primary sortas="b-rpc.statd">rpc.statd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcdebug">
-        <term><command>rpcdebug</command></term>
-        <listitem>
-          <para>
-            sets or clears the kernel's NFS client and server debug flags
-          </para>
-          <indexterm zone="nfs-utils rpcdebug">
-            <primary sortas="b-rpcdebug">rpcdebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showmount">
-        <term><command>showmount</command></term>
-        <listitem>
-          <para>
-            displays mount information for an NFS server
-          </para>
-          <indexterm zone="nfs-utils showmount">
-            <primary sortas="b-showmount">showmount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sm-notify">
-        <term><command>sm-notify</command></term>
-        <listitem>
-          <para>
-            is used to send Network Status Monitor reboot messages
-          </para>
-          <indexterm zone="nfs-utils sm-notify">
-            <primary sortas="b-sm-notify">sm-notify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="start-statd">
-        <term><command>start-statd</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="nfs-utils start-statd">
-            <primary sortas="b-start-statd">start-statd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umount.nfs">
-        <term><command>umount.nfs</command></term>
-        <listitem>
-          <para>
-            is used to unmount a network share using NFS
-          </para>
-          <indexterm zone="nfs-utils umount.nfs">
-            <primary sortas="b-umount.nfs">umount.nfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umount.nfs4">
-        <term><command>umount.nfs4</command></term>
-        <listitem>
-          <para>
-            is used to unmount a network share using NFSv4
-          </para>
-          <indexterm zone="nfs-utils umount.nfs4">
-            <primary sortas="b-umount.nfs4">umount.nfs4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,500 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ntp-download-http "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-&ntp-version;.tar.gz">
-  <!ENTITY ntp-download-ftp  " ">
-  <!ENTITY ntp-md5sum        "a15558df580bd1b955a105a8b91c078f">
-  <!ENTITY ntp-size          "6.8 MB">
-  <!ENTITY ntp-buildsize     "99 MB (with tests)">
-  <!ENTITY ntp-time          "0.8 SBU (With tests; both using parallelism=4)">
-]>
-
-<sect1 id="ntp" xreflabel="ntp-&ntp-version;">
-  <?dbhtml filename="ntp.html"?>
-
-
-  <title>ntp-&ntp-version;</title>
-
-  <indexterm zone="ntp">
-    <primary sortas="a-ntp">ntp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ntp</title>
-
-    <para>
-      The <application>ntp</application> package contains a client and server
-      to keep the time synchronized between various computers over
-      a network. This package is the official reference implementation of the
-      NTP protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ntp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ntp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ntp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ntp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ntp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ntp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="perl-io-socket-ssl"/>
-    </para>
-
-<!-- Tested 4.2.8p11 with neither wget nor lynx on system: Not required.
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="wget"/> (runtime, for
-      <command>update-leap</command>)
-<!- - The download code for update-leap uses the File::Fetch perl module,
-      which may use wget, or lynx, or some core perl modules, so maybe move
-      to optional - ->
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libevent"/>,
-      <ulink url="https://www.thrysoee.dk/editline/">libedit</ulink>, and
-      <ulink url="https://www.gnu.org/software/autogen/">libopts from AutoGen</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/ntp"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ntp</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>ntpd</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 87 ntp &amp;&amp;
-useradd -c "Network Time Protocol" -d /var/lib/ntp -u 87 \
-        -g ntp -s /bin/false ntp</userinput></screen>
-
-<!-- At least one of the issues has been reported upstream. The next para
-     is valid for 4.8.2p10.
-
-     Leap secongs have been deprecated as of November 2022.
-     https://en.wikipedia.org/wiki/Leap_second
-
-    <para>
-      The <command>update-leap</command> command needs to be fixed in order
-      to run properly:
-    </para>
-
-<screen><userinput>sed -e 's/"(\\S+)"/"?([^\\s"]+)"?/' \
-    -i scripts/update-leap/update-leap.in</userinput></screen>
--->
-
-    <para>
-      Install <application>ntp</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr         \
-            --bindir=/usr/sbin    \
-            --sysconfdir=/etc     \
-            --enable-linuxcaps    \
-            --with-lineeditlibs=readline \
-            --docdir=/usr/share/doc/ntp-&ntp-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -o ntp -g ntp -d /var/lib/ntp</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--bindir=/usr/sbin</parameter>: This parameter places
-      the administrative programs in <filename
-      class="directory">/usr/sbin</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-linuxcaps</parameter>: ntpd is run as user
-      ntp, so use Linux capabilities for non-root clock control.
-    </para>
-
-    <para>
-      <parameter>--with-lineeditlibs=readline</parameter>: This switch
-      enables <application>Readline</application> support for
-      <command>ntpdc</command> and <command>ntpq</command> programs. If omitted,
-      <application>libedit</application> will be used if installed, otherwise no
-      readline capabilities will be compiled.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ntp</title>
-
-    <sect3 id="ntp-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/ntp.conf</filename>
-      </para>
-
-      <indexterm zone="ntp ntp-config">
-        <primary sortas="e-etc-ntp.conf">/etc/ntp.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The following configuration file first defines various ntp
-        servers with open access from different continents. Second, it
-        creates a drift file where <command>ntpd</command> stores the
-        frequency offset and a pid file to store the
-        <command>ntpd</command> process ID. <!--Third, it defines the location
-        for the leap-second definition file
-        <filename>/etc/ntp.leapseconds</filename>, that the
-        <command>update-leap</command> script checks and updates, when
-        necessary. This script can be run as a cron job and the
-        <application>ntp</application> developers recommend a frequency of
-        about three weeks for the updates.--> Since the documentation included
-        with the package is sparse, visit the ntp website at
-        <ulink url="https://www.ntp.org/"/> and
-        <ulink url="https://www.ntppool.org/"/> for more information.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/ntp.conf &lt;&lt; "EOF"
-<literal># Asia
-server 0.asia.pool.ntp.org
-
-# Australia
-server 0.oceania.pool.ntp.org
-
-# Europe
-server 0.europe.pool.ntp.org
-
-# North America
-server 0.north-america.pool.ntp.org
-
-# South America
-server 2.south-america.pool.ntp.org
-
-driftfile /var/lib/ntp/ntp.drift
-pidfile   /run/ntpd.pid</literal>
-EOF</userinput></screen>
-
-      <para>
-        You may wish to add a <quote>Security session</quote>. For
-        explanations, see <ulink url=
-        "https://www.eecis.udel.edu/~mills/ntp/html/accopt.html#restrict"/>.
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ntp.conf &lt;&lt; "EOF"
-<literal># Security session
-restrict    default limited kod nomodify notrap nopeer noquery
-restrict -6 default limited kod nomodify notrap nopeer noquery
-
-restrict 127.0.0.1
-restrict ::1</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="ntp-init">
-      <title>Synchronizing the Time</title>
-
-      <para>
-        There are two options. Option one is to run <command>ntpd</command>
-        continuously and allow it to synchronize the time in a gradual manner.
-        The other option is to run <command>ntpd</command> periodically (using
-        cron) and update the time each time <command>ntpd</command> is
-        scheduled.
-      </para>
-
-      <para>
-        If you choose Option one, then install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/ntp</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>ntpd.service</filename>
-        unit</phrase>
-        included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
-      </para>
-
-      <indexterm zone="ntp ntp-init" revision="sysv">
-        <primary sortas="f-ntp">ntp</primary>
-      </indexterm>
-
-      <indexterm zone="ntp ntp-init" revision="systemd">
-        <primary sortas="f-ntpd">ntpd.service</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-ntpd</userinput></screen>
-
-      <para>
-        If you prefer to run <command>ntpd</command> periodically, add the
-        following command to <systemitem class="username">root</systemitem>'s
-        <filename>crontab</filename>:
-      </para>
-
-<screen><literal>ntpd -q</literal></screen>
-
-      <para revision="sysv">
-        Execute the following command if you would like to set the hardware
-        clock to the current system time at shutdown and reboot:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>ln -v -sf ../init.d/setclock /etc/rc.d/rc0.d/K46setclock &amp;&amp;
-ln -v -sf ../init.d/setclock /etc/rc.d/rc6.d/K46setclock</userinput></screen>
-
-      <para revision="sysv">
-        The other way around is already set up by LFS.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>calc_tickadj, ntp-keygen, ntp-wait, ntpd, ntpdate, ntpdc, ntpq,
-        ntptime, ntptrace, sntp, tickadj, and update-leap</seg>
-        <seg>None</seg>
-        <seg>/usr/share/ntp,
-        /usr/share/doc/ntp-4.2.8 and
-        /var/lib/ntp</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="calc_tickadj">
-        <term><command>calc_tickadj</command></term>
-        <listitem>
-          <para>
-            calculates optimal value for tick given ntp drift file
-          </para>
-          <indexterm zone="ntp calc_tickadj">
-            <primary sortas="b-calc_tickadj">calc_tickadj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntp-keygen">
-        <term><command>ntp-keygen</command></term>
-        <listitem>
-          <para>
-            generates cryptographic data files used by the NTPv4 authentication
-            and identification schemes
-          </para>
-          <indexterm zone="ntp ntp-keygen">
-            <primary sortas="b-ntp-keygen">ntp-keygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntp-wait">
-        <term><command>ntp-wait</command></term>
-        <listitem>
-          <para>
-            is useful at boot time, to delay the boot sequence until
-            <command>ntpd</command> has set the time
-          </para>
-          <indexterm zone="ntp ntp-wait">
-            <primary sortas="b-ntp-wait">ntp-wait</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpd">
-        <term><command>ntpd</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="ntp ntpd">
-            <primary sortas="b-ntpd">ntpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpdate">
-        <term><command>ntpdate</command></term>
-        <listitem>
-          <para>
-            is a client program that sets the date and time based on
-            the response from an ntp server. This command is deprecated
-          </para>
-          <indexterm zone="ntp ntpdate">
-            <primary sortas="b-ntpdate">ntpdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpdc">
-        <term><command>ntpdc</command></term>
-        <listitem>
-          <para>
-            is used to query the ntp daemon about its current state
-            and to request changes in that state
-          </para>
-          <indexterm zone="ntp ntpdc">
-            <primary sortas="b-ntpdc">ntpdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpq">
-        <term><command>ntpq</command></term>
-        <listitem>
-          <para>
-            is a utility program used to monitor <command>ntpd</command>
-            operations and determine performance
-          </para>
-          <indexterm zone="ntp ntpq">
-            <primary sortas="b-ntpq">ntpq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntptime">
-        <term><command>ntptime</command></term>
-        <listitem>
-          <para>
-            reads and displays time-related kernel variables
-          </para>
-          <indexterm zone="ntp ntptime">
-            <primary sortas="b-ntptime">ntptime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntptrace">
-        <term><command>ntptrace</command></term>
-        <listitem>
-          <para>
-            traces a chain of ntp servers back to the primary source
-          </para>
-          <indexterm zone="ntp ntptrace">
-            <primary sortas="b-ntptrace">ntptrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sntp">
-        <term><command>sntp</command></term>
-        <listitem>
-          <para>
-            is a Simple Network Time Protocol (SNTP) client
-          </para>
-          <indexterm zone="ntp sntp">
-            <primary sortas="b-sntp">sntp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tickadj">
-        <term><command>tickadj</command></term>
-        <listitem>
-          <para>
-            reads, and optionally modifies, several timekeeping-related
-            variables in older kernels that do not have support for precision
-            timekeeping
-          </para>
-          <indexterm zone="ntp tickadj">
-            <primary sortas="b-tickadj">tickadj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="update-leap">
-        <term><command>update-leap</command></term>
-        <listitem>
-          <para>
-            is a script to verify and, if necessary, update the leap-second
-            definition file.  
-
-            <note>
-              <para>
-                 In November 2022, at the 27th General Conference on Weights and 
-                 Measures, it was decided to abandon the leap second.  In addition
-                 this script hardcodes a URL for an update file that no longer
-                 exists.  The last time a leap second was declared was January 2017.
-                 This script will probably be removed in a future release.
-              </para>
-            </note>
-          </para>
-          <indexterm zone="ntp update-leap">
-            <primary sortas="b-update-leap">update-leap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,254 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rpcbind-download-http "&sourceforge-dl;/rpcbind/rpcbind-&rpcbind-version;.tar.bz2">
-  <!ENTITY rpcbind-download-ftp  " ">
-  <!ENTITY rpcbind-md5sum        "2d84ebbb7d6fb1fc3566d2d4b37f214b">
-  <!ENTITY rpcbind-size          "124 KB">
-  <!ENTITY rpcbind-buildsize     "1.6 MB">
-  <!ENTITY rpcbind-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="rpcbind" xreflabel="rpcbind-&rpcbind-version;">
-  <?dbhtml filename="rpcbind.html"?>
-
-
-  <title>rpcbind-&rpcbind-version;</title>
-
-  <indexterm zone="rpcbind">
-    <primary sortas="a-rpcbind">rpcbind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rpcbind</title>
-
-    <para>
-      The <application>rpcbind</application> program is a replacement for
-      <application>portmap</application>.  It is required for import or export
-      of Network File System (NFS) shared directories.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rpcbind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rpcbind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rpcbind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rpcbind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rpcbind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rpcbind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/rpcbind-&rpcbind-version;-vulnerability_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rpcbind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rpcbind</title>
-
-    <para revision="systemd">
-      There should be a dedicated user and group to take control
-      of the <command>rpcbind</command> daemon after it is started.
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>groupadd -g 28 rpc &amp;&amp;
-useradd -c "RPC Bind Daemon Owner" -d /dev/null -g rpc \
-        -s /bin/false -u 28 rpc</userinput></screen>
-
-    <!-- Packages should adapt to standards, not the other way around -->
-    <para>
-      In order to get <application>rpcbind</application> to work
-      properly, first fix the package to use correct service name:
-    </para>
-
-<screen><userinput>sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c</userinput></screen>
-
-    <para>
-      Install <application>rpcbind</application> by running the following
-      commands:
-    </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                             \
-            --with-rpcuser=root                            \
-            --enable-warmstarts                            \
-            --without-systemdsystemunitdir                 &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>patch -Np1 -i ../rpcbind-&rpcbind-version;-vulnerability_fixes-1.patch &amp;&amp;
-
-./configure --prefix=/usr       \
-            --bindir=/usr/sbin  \
-            --enable-warmstarts \
-            --with-rpcuser=rpc  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para revision="sysv">
-      <command>--with-rpcuser=root</command>: This works
-      around an error in the configure script.
-    </para>
-
-    <para revision="sysv">
-      <command>--without-systemdsystemunitdir</command>:
-      This version of BLFS does not support systemd.
-    </para>
-
-    <para revision="systemd">
-      <parameter>--with-rpcuser=rpc</parameter>:
-      This switch is used so the <command>rpcbind</command> daemon will
-      run as an unprivileged user instead of the
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rpcbind</title>
-
-    <sect3 id="rpcbind-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        Install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/rpcbind</filename>
-        init script</phrase> included in the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-         Enable the systemd unit installed with the package:
-      </para>
-
-      <indexterm zone="rpcbind rpcbind-init" revision="sysv">
-        <primary sortas="f-rpcbind">rpcbind</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-rpcbind</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable rpcbind</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rpcbind and rpcinfo</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rpcbind-prog">
-        <term><command>rpcbind</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="rpcbind rpcbind-prog">
-            <primary sortas="b-rpcbind">rpcbind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcinfo">
-        <term><command>rpcinfo</command></term>
-        <listitem>
-          <para>
-            makes an RPC call to an RPC server and reports data according
-            to the requested options
-          </para>
-          <indexterm zone="rpcbind rpcinfo">
-            <primary sortas="b-rpcinfo">rpcinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,326 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rsync-download-http "https://www.samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-download-ftp  " ">
-  <!ENTITY rsync-md5sum        "f5c17f9c9164ef9e60d9d8c96b23da06">
-  <!ENTITY rsync-size          "1.2 MB">
-  <!ENTITY rsync-buildsize     "9.2 MB (with tests; add 24 MB for HTML API documentation)">
-  <!ENTITY rsync-time          "0.7 SBU (with tests)">
-]>
-
-<sect1 id="rsync" xreflabel="rsync-&rsync-version;">
-  <?dbhtml filename="rsync.html"?>
-
-
-  <title>rsync-&rsync-version;</title>
-
-  <indexterm zone="rsync">
-    <primary sortas="a-rsync">rsync</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rsync</title>
-
-    <para>
-      The <application>rsync</application> package contains the
-      <command>rsync</command> utility. This is useful for synchronizing large
-      file archives over a network.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rsync-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rsync-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rsync-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rsync-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rsync-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rsync-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rsync Dependencies</bridgehead>
-
-    <!-- This now uses LZ4, OpenSSL, and zstd from LFS. -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <ulink url="https://cyan4973.github.io/xxHash/">xxhash</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rsync</title>
-
-    <para>
-      For security reasons, running the <application>rsync</application>
-      server as an unprivileged user and group is encouraged. If you intend to
-      run <command>rsync</command> as a daemon, create the
-      <systemitem class="username">rsyncd</systemitem> user and group
-      with the following commands issued by the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 48 rsyncd &amp;&amp;
-useradd -c "rsyncd Daemon" -m -d /home/rsync -g rsyncd \
-    -s /bin/false -u 48 rsyncd</userinput></screen>
-
-    <para>
-      Install <application>rsync</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-xxhash \
-            --without-included-zlib &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and wish to
-      build HTML API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>doxygen</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it using the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'
-        remap="doc"><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &amp;&amp;
-install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-xxhash</parameter>: This switch disables advanced
-      xxhash checksum support. Remove this switch if you have installed
-      <ulink url="https://cyan4973.github.io/xxHash/">xxhash</ulink>.
-    </para>
-
-    <para>
-      <parameter>--without-included-zlib</parameter>: This switch enables
-      compilation with the system-installed zlib library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rsync</title>
-
-    <sect3 id="rsync-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/rsyncd.conf</filename>
-      </para>
-
-      <indexterm zone="rsync rsync-config">
-        <primary sortas="e-etc-rsyncd.conf">/etc/rsyncd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        For client access to remote files, you may need to install the
-        <xref linkend="openssh"/> package to connect to the remote server.
-      </para>
-
-      <para>
-        This is a simple download-only configuration to set up running
-        <command>rsync</command> as a server. See the <ulink role='man'
-        url='&man;rsyncd.conf.5'>rsyncd.conf(5)</ulink>
-        man-page for additional options (i.e., user authentication).
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/rsyncd.conf &lt;&lt; "EOF"
-<literal># This is a basic rsync configuration file
-# It exports a single module without user authentication.
-
-motd file = /home/rsync/welcome.msg
-use chroot = yes
-
-[localhost]
-    path = /home/rsync
-    comment = Default rsync module
-    read only = yes
-    list = yes
-    uid = rsyncd
-    gid = rsyncd
-</literal>
-EOF</userinput></screen>
-
-      <para>
-        You can find additional configuration information and general
-        documentation about <command>rsync</command> at
-        <ulink url="https://rsync.samba.org/documentation.html"/>.
-      </para>
-
-    </sect3>
-
-    <sect3 id="rsync-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        Note that you only need to start the
-        <application>rsync</application> server if you want to provide an
-        <application>rsync</application> archive on your local machine.
-        You don't need this <phrase revision="sysv">script</phrase>
-        <phrase revision="systemd">unit</phrase> to run the
-        <application>rsync</application> client.
-      </para>
-
-      <para>
-        Install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/rsyncd</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>rsyncd.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
-      </para>
-
-<screen role="root"><userinput>make install-rsyncd</userinput></screen>
-
-      <note revision="systemd">
-        <para>
-          This package comes with two types of units: A service file and a
-          socket file. The service file will start rsync daemon once at boot
-          and it will keep running until the system shuts down. The socket file
-          will make systemd listen on rsync port (Default 873, needs to be
-          edited for anything else) and will start rsync daemon when something
-          tries to connect to that port and stop the daemon when the connection
-          is terminated. This is called socket activation and is analogous to
-          using <application>{,x}inetd</application> on a SysVinit based
-          system.
-        </para>
-
-        <para>
-          By default, the first method is used - rsync daemon is started
-          at boot and stopped at shutdown. If the socket method is desired, you
-          need to run as the
-          <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="nodump"><userinput>systemctl stop rsyncd &amp;&amp;
-systemctl disable rsyncd &amp;&amp;
-systemctl enable rsyncd.socket &amp;&amp;
-systemctl start rsyncd.socket</userinput></screen>
-
-        <para>
-          Note that socket method is only useful for remote backups. For
-          local backups you'll need the service method.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rsync and rsync-ssl</seg>
-        <seg>None</seg>
-        <seg>Optionally, /usr/share/doc/rsync-&rsync-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsync-prog">
-        <term><command>rsync</command></term>
-        <listitem>
-          <para>
-            is a replacement for <command>rcp</command> (and
-            <command>scp</command>) that has many more features. It uses the
-            <quote>rsync algorithm</quote> which provides a very fast method of
-            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
-          </para>
-          <indexterm zone="rsync rsync-prog">
-            <primary sortas="b-rsync">rsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rsync-ssl">
-        <term><command>rsync-ssl</command></term>
-        <listitem>
-          <para>
-            is a helper script used when connecting to an rsync daemon that
-            has SSL support built in
-          </para>
-          <indexterm zone="rsync rsync-ssl">
-            <primary sortas="b-rsync-ssl">rsync-ssl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1412 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
-  <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "3563da3ffc17f3f2b37572c15f37a0b4">
-  <!ENTITY samba-size          "41 MB">
-  <!ENTITY samba-buildsize     "615 MB (add 64 MB for quicktest)">
-  <!ENTITY samba-time          "2.1 SBU (using parallelism=4; add 0.4 SBU for quicktest)">
-]>
-
-<sect1 id="samba" xreflabel="Samba-&samba-version;">
-  <?dbhtml filename="samba.html"?>
-
-
-  <title>Samba-&samba-version;</title>
-
-  <indexterm zone="samba">
-    <primary sortas="a-Samba">Samba</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Samba</title>
-
-    <para>
-      The <application>Samba</application> package provides file and print
-      services to SMB/CIFS clients and Windows networking to Linux clients.
-      <application>Samba</application> can also be configured as a Windows
-      Domain Controller replacement, a file/print server acting as a member
-      of a Windows Active Directory domain and a NetBIOS (RFC1001/1002)
-      nameserver (which among other things provides LAN browsing support).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&samba-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&samba-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &samba-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &samba-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &samba-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &samba-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Samba Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>,
-      <xref linkend="jansson"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="perl-parse-yapp"/>, and
-      <xref linkend="rpcsvc-proto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend="dbus"/> (for vfs_snapper, which is
-      useful on systems that support Volume Shadow Copies on Windows),</phrase>
-      <xref linkend="fuse3"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libtasn1"/>,
-      <xref linkend="libxslt"/> (for documentation),
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>, and
-      <xref linkend="openldap"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="bind"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="gdb"/>,
-      <xref linkend="git"/>,
-      <xref linkend="gnupg2"/> (required for ADS and the test suite),
-      <xref linkend="libaio"/>,
-      <xref linkend="libarchive"/> (for tar in smbclient),
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libunwind"/>,
-      <xref linkend="lmdb"/>,
-      <xref linkend="markdown"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="popt"/>,
-      <xref linkend="talloc"/> (included),
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/> (optionally used by the test suite),
-      <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/bullseye/fam">FAM</ulink>,
-      <ulink url="https://packages.debian.org/sid/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="https://ldb.samba.org/">ldb</ulink> (included),
-      <ulink url="https://www.openafs.org/">OpenAFS</ulink>,
-      <ulink url="https://github.com/python-poetry/poetry-core">poetry-core (required for ADS)</ulink>,
-      <ulink url="https://pypi.org/project/pyasn1/">pyasn1</ulink>,
-      <ulink url="https://tevent.samba.org/">tevent</ulink> (included),
-      <ulink url="https://tdb.samba.org/">tdb</ulink> (included), and
-      <ulink url="https://download.gnome.org/sources/tracker/2.3/">tracker-2</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for the Developer Test Suite)</bridgehead>
-    <para role="optional">
-      Install in listed order:
-      <xref linkend="six"/>,
-      <xref linkend="pytest"/>,
-      <ulink url="&pypi;/argparse/">argparse</ulink>,
-      <ulink url="&pypi;/testtools/">testtools</ulink>,
-      <ulink url="&pypi;/testscenarios/">testscenarios</ulink>, and
-      <ulink url="&pypi;/python-subunit/">python-subunit</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/samba4"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Samba</title>
-
-    <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>
-
-    <para>
-      Install <application>Samba</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>PYTHON=$PWD/pyvenv/bin/python3             \
-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                      \
-    --with-system-mitkrb5                  \
-    --enable-selftest                      &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>PYTHON=$PWD/pyvenv/bin/python3             \
-./configure                                \
-    --prefix=/usr                          \
-    --sysconfdir=/etc                      \
-    --localstatedir=/var                   \
-    --with-piddir=/run/samba               \
-    --with-pammodulesdir=/usr/lib/security \
-    --enable-fhs                           \
-    --without-ad-dc                        \
-    --with-system-mitkrb5                  \
-    --enable-selftest                      &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, 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>.
-    </para>
-
-    <!--
-      If doing a security update or a new minor version (point releases do not
-      apply here), run 'make testenv' before running 'make test' and 'make
-      subunit-test'. This will set up the test environment and make the tests
-      run faster, as well as point out any glaring issues that might affect
-      the new Samba installation. With 4.10.4, I got 236 failures, 73 errors,
-      and 2 unexpected successes. These were all known upstream, and you can
-      find them in the knownfail list in their git repo. This is per
-      Upstream's recommendation over IRC.
-    -->
-
-    <note>
-      <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
-        <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
-        should expect ~73 errors and ~30 failures from the 3000+ tests.
-      </para>
-    </note>
-
-    <para>
-      Fix hard coded paths to Python 3 interpreter:
-    </para>
-
-<screen><userinput>sed '1s@^.*$@#!/usr/bin/python3@' \
-    -i ./bin/default/source4/scripting/bin/*.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:
-    </para>
-
-<screen role="root"><userinput>make install &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;
-
-install -v -m644    examples/LDAP/README              \
-                    /etc/openldap/schema/README.samba &amp;&amp;
-
-install -v -m644    examples/LDAP/samba*              \
-                    /etc/openldap/schema              &amp;&amp;
-
-install -v -m755    examples/LDAP/{get*,ol*} \
-                    /etc/openldap/schema</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-fhs</parameter>: Assigns all other file paths in
-      a manner compliant with the Filesystem Hierarchy Standard (FHS).
-    </para>
-
-    <para revision="sysv">
-      <parameter>--without-systemd</parameter>: Disable
-      <application>systemd</application> integration, since it is not built
-      in the System V version of LFS/BLFS.
-    </para>
-
-    <para revision="sysv">
-      <option>--with-shared-modules='!vfs_snapper'</option>: Disable
-      the vfs_snapper module if you want to build samba without <application>dbus</application> support, for setups without graphical user intefaces.
-    </para>
-
-    <para>
-      <parameter>--without-ad-dc</parameter>: Disables
-      Active Directory Domain Controller functionality. See <ulink url=
-      "https://wiki.samba.org/index.php/Setup_a_Samba_Active_Directory_Domain_Controller">
-      Set up a Samba Active Directory Domain Controller</ulink> for detailed
-      information. Remove this switch if you've installed the Python modules
-      needed for ADS support. Note that BLFS does not provide a samba bootscript
-      or systemd unit for an Active Directory domain controller.
-    </para>
-
-    <para>
-      <parameter>--with-system-mitkrb5</parameter>: Enables
-      building with the system version of Kerberos. This
-      mitigates security vulnerabilities and reduces build time.
-      Remove this if you do not have <xref linkend="mitkrb"/> installed.
-    </para>
-
-    <para>
-      <option>--with-selftest-prefix=SELFTEST_PREFIX</option>: This option
-      specifies the test suite work directory (default=./st).
-    </para>
-
-    <para>
-      <command>install -v -m644 examples/LDAP/* /etc/openldap/schema</command>:
-      These commands are used to copy sample Samba schemas to the OpenLDAP
-      <filename class='directory'>schema</filename> directory.
-    </para>
-
-    <para>
-      <command>install -v -m644 ../examples/smb.conf.default
-      /etc/samba</command>: This copies a default <filename>smb.conf</filename>
-      file into <filename>/etc/samba</filename>. This sample configuration will
-      not work until you copy it to <filename>/etc/samba/smb.conf</filename> and
-      make the appropriate changes for your installation. See the configuration
-      section for minimum values which must be set.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Samba</title>
-
-    <sect3 id="samba-config">
-      <title>Config Files</title>
-
-      <para>
-        /etc/samba/smb.conf
-      </para>
-
-      <indexterm zone="samba samba-config">
-        <primary sortas="e-etc-samba-smb.conf">/etc/samba/smb.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Printing to SMB Clients</title>
-
-      <para>
-        If you use <application>CUPS</application> for print services, and you
-        wish to print to a printer attached to an SMB client, you need to
-        create an SMB backend device. To create the device, issue the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -dvm 755 /usr/lib/cups/backend &amp;&amp;
-ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Due to the complexity and the many various uses for
-        <application>Samba</application>, complete configuration for all the
-        package's capabilities is well beyond the scope of the BLFS book. This
-        section provides instructions to configure the
-        <filename>/etc/samba/smb.conf</filename> file for two common scenarios.
-        The complete contents of <filename>/etc/samba/smb.conf</filename> will
-        depend on the purpose of <application>Samba</application>
-        installation.
-      </para>
-
-      <note>
-        <para>
-          You may find it easier to copy the configuration parameters shown
-          below into an empty <filename>/etc/samba/smb.conf</filename> file
-          instead of copying and editing the default file as mentioned in the
-          <quote>Command Explanations</quote> section. How you create/edit the
-          <filename>/etc/samba/smb.conf</filename> file will be left up to
-          you. Do ensure the file is only writable by the
-          <systemitem class="username">root</systemitem> user (mode 644).
-        </para>
-      </note>
-
-      <sect4>
-        <title>Scenario 1: Minimal Standalone Client-Only Installation</title>
-
-        <para>
-          Choose this variant if you only want to transfer files using
-          <command>smbclient</command>, mount Windows shares and print to
-          Windows printers, and don't want to share your files and printers to
-          Windows machines.
-        </para>
-
-        <para>
-          A <filename>/etc/samba/smb.conf</filename> file with the following
-          three parameters is sufficient:
-        </para>
-
-<screen role='root'><literal>[global]
-    workgroup = <replaceable>WORKGROUP</replaceable>
-    dos charset = <replaceable>cp850</replaceable>
-    unix charset = <replaceable>ISO-8859-1</replaceable></literal></screen>
-
-        <para>
-          The values in this example specify that the computer belongs to a
-          Windows workgroup named
-          <quote><replaceable>WORKGROUP</replaceable></quote>, uses the
-          <quote><replaceable>cp850</replaceable></quote> character set on the
-          wire when talking to MS-DOS and MS Windows 9x, and that the filenames
-          are stored in the <quote><replaceable>ISO-8859-1</replaceable></quote>
-          encoding on the disk. Adjust these values appropriately for your
-          installation. The <quote>unix charset</quote> value must be the same
-          as the output of <command>locale charmap</command> when executed with
-          the <envar>LANG</envar> variable set to your preferred locale,
-          otherwise the <command>ls</command> command may not display correct
-          filenames of downloaded files.
-        </para>
-
-        <para>
-          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>
-        </para>
-
-      </sect4>
-
-      <sect4>
-        <title>Scenario 2: Standalone File/Print Server</title>
-
-        <para>
-          Choose this variant if you want to share your files and printers
-          to Windows machines in your workgroup in addition to the capabilities
-          described in Scenario 1.
-        </para>
-
-        <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
-          <quote>dos charset</quote> and <quote>unix charset</quote> parameters
-          to the <quote>[global]</quote> section as described in Scenario 1 in
-          order to prevent filename corruption. For security reasons, you may
-          wish to define
-          <replaceable>path = /home/alice/shared-files</replaceable>,
-          assuming your user name is <replaceable>alice</replaceable> and you
-          only want to share the files in that directory, instead of your entire
-          home. Then, replace <replaceable>homes</replaceable> by
-          <replaceable>shared-files</replaceable> and change also the
-          <quote><literal>comment</literal></quote> if used the configuration
-          file below or the <filename>/etc/samba/smb.conf.default</filename>
-          to create yours.
-        </para>
-
-        <para>
-          The following configuration file creates a separate share for each
-          user's home directory and also makes all printers available to Windows
-          machines:
-        </para>
-
-<screen role='root'><literal>[global]
-    workgroup = <replaceable>WORKGROUP</replaceable>
-    dos charset = <replaceable>cp850</replaceable>
-    unix charset = <replaceable>ISO-8859-1</replaceable>
-
-[homes]
-    comment = Home Directories
-    browseable = no
-    writable = yes
-
-[printers]
-    comment = All Printers
-    path = /var/spool/samba
-    browseable = no
-    guest ok = no
-    printable = yes</literal></screen>
-
-        <para>
-          Other parameters you may wish to customize in the
-          <quote>[global]</quote> section include:
-        </para>
-
-<screen role='root'><literal>    server string =
-    security =
-    hosts allow =
-    load printers =
-    log file =
-    max log size =
-    socket options =
-    local master =</literal></screen>
-
-        <para>
-          Reference the comments in the
-          <filename>/etc/samba/smb.conf.default</filename> file for information
-          regarding these parameters.
-        </para>
-
-        <para>
-          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
-          <option>-a</option> option to add users) to enable and set passwords
-          for all accounts that need <application>Samba</application> access.
-          Using the default <application>Samba</application> passdb backend,
-          any user you attempt to add will also be required to exist in the
-          <filename>/etc/passwd</filename> file.
-        </para>
-
-      </sect4>
-
-      <sect4>
-        <title>Advanced Requirements</title>
-
-        <para>
-          More complex scenarios involving domain control or membership are
-          possible. Such setups are advanced topics and cannot be adequately
-          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.
-        </para>
-
-      </sect4>
-
-      <sect4>
-        <title>Guest account</title>
-
-        <para>
-          The default <application>Samba</application> installation uses the
-          <systemitem class='username'>nobody</systemitem> user for guest
-          access to the server. This can be overridden by setting the
-          <option>guest account =</option> parameter in the
-          <filename>/etc/samba/smb.conf</filename> file. If you utilize the
-          <option>guest account =</option> parameter, ensure this user exists
-          in the <filename>/etc/passwd</filename> file.
-        </para>
-
-      </sect4>
-
-      <sect4 id="samba-init" revision="sysv">
-        <title>Boot Script</title>
-
-        <para>
-          For your convenience, boot scripts have been provided for
-          <application>Samba</application>. There are two included in the
-          <xref linkend="bootscripts"/> package. The first,
-          <filename>samba</filename>, will start the <command>smbd</command>
-          and <command>nmbd</command> daemons needed to provide SMB/CIFS
-          services. The second script, <filename>winbind</filename>, starts
-          the <command>winbindd</command> daemon, used for providing Windows
-          domain services to Linux clients.
-        </para>
-
-        <indexterm zone="samba samba-init">
-          <primary sortas="f-samba">samba</primary>
-        </indexterm>
-
-        <indexterm zone="samba samba-init">
-          <primary sortas="f-winbind">winbind</primary>
-        </indexterm>
-
-<screen role="root"><userinput>make install-samba</userinput></screen>
-
-<screen role="root"><userinput>make install-winbindd</userinput></screen>
-
-      </sect4>
-
-      <sect4 id="samba-init-sysd" revision="systemd">
-        <title>Systemd Units</title>
-
-        <para>
-          To start the <application>Samba</application> daemons at boot,
-          install the systemd units from the <xref linkend="systemd-units"/>
-          package by running the following command as the
-          <systemitem class="username">root</systemitem> user:
-        </para>
-
-        <indexterm zone="samba samba-init-sysd">
-          <primary sortas="f-samba">samba</primary>
-        </indexterm>
-
-<screen role="root"><userinput>make install-samba</userinput></screen>
-
-        <para>
-          To start the <command>winbindd</command> daemon at boot,
-          install the systemd unit from the <xref linkend="systemd-units"/>
-          package by running the following command as the
-          <systemitem class="username">root</systemitem> user:
-        </para>
-
-        <indexterm zone="samba samba-init-sysd">
-          <primary sortas="f-winbindd">winbindd</primary>
-        </indexterm>
-
-<screen role="root"><userinput>make install-winbindd</userinput></screen>
-
-        <note>
-          <para>
-            This package comes with two types of units: A service file and a
-            socket file. The service file will start the smbd daemon once at
-            boot and it will keep running until the system shuts down. The
-            socket file will make systemd listen on the smbd port (Default 445,
-            needs to be edited for anything else) and will start the smbd
-            daemon when something tries to connect to that port and stop the
-            daemon when the connection is terminated. This is called socket
-            activation and is analogous to using
-            <application>{,x}inetd</application> on a SysVinit based system.
-          </para>
-
-          <para>
-            By default, the first method is used - the smbd daemon is started
-            at boot and stopped at shutdown. If the socket method is desired,
-            you need to run the following commands as the <systemitem
-            class="username">root</systemitem> user:
-          </para>
-
-<screen role="root"><userinput>systemctl stop smbd &amp;&amp;
-systemctl disable smbd &amp;&amp;
-systemctl enable smbd.socket &amp;&amp;
-systemctl start smbd.socket</userinput></screen>
-
-          <para>
-            Note that only the smbd daemon can be socket activated.
-          </para>
-        </note>
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-
-        <seg>
-          cifsdd, dbwrap_tool, dumpmscat, eventlogadm, gentest,
-          ldbadd, ldbdel, ldbedit, ldbmodify, ldbrename, ldbsearch, locktest,
-          masktest, mdsearch, mvxattr, ndrdump, net, nmbd, nmblookup, ntlm_auth,
-          oLschema2ldif, pdbedit, profiles, regdiff, regpatch, regshell,
-          regtree, rpcclient, samba-log-parser, samba-gpupdate, samba-regedit,
-          samba-tool, sharesec, smbcacls, smbclient, smbcontrol, smbcquotas,
-          smbd, smbget, smbpasswd, smbspool, smbstatus, smbtar, smbtorture,
-          smbtree, tdbbackup, tdbdump, tdbrestore, tdbtool, testparm, wbinfo,
-          and winbindd
-        </seg>
-
-        <seg>
-          libdcerpc-binding.so, libdcerpc-samr.so,
-          libdcerpc-server-core.so, libdcerpc.so,
-          libndr-krb5pac.so, libndr-nbt.so, libndr.so,
-          libndr-standard.so, libnetapi.so, libnss_winbind.so, libnss_wins.so,
-          libsamba-credentials.so, libsamba-errors.so,
-          libsamba-hostconfig.so, libsamba-passdb.so,
-          libsamba-policy.cpython-311-x86_64-linux-gnu.so, libsamba-util.so,
-          libsamdb.so, libsmbclient.so,
-          libsmbconf.so, libsmbldap.so, libtevent-util.so,
-          libwbclient.so, and filesystem and support modules under
-          /usr/lib/{python&python3-majorver;,samba}
-        </seg>
-
-        <seg>
-          /etc/samba, /run/samba, /usr/include/samba-4.0,
-          /usr/lib/python&python3-majorver;/site-packages/samba,
-          /usr/{lib,libexec,share}/samba,
-          and /var/{cache,lib,lock,log,run}/samba
-        </seg>
-
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cifsdd">
-        <term><command>cifsdd</command></term>
-        <listitem>
-          <para>
-            is the dd command for SMB
-          </para>
-          <indexterm zone="samba cifsdd">
-            <primary sortas="b-cifsdd">cifsdd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbwrap_tool">
-        <term><command>dbwrap_tool</command></term>
-        <listitem>
-          <para>
-            is used to read and manipulate TDB/CTDB databases using
-            the dbwrap interface
-          </para>
-          <indexterm zone="samba dbwrap_tool">
-            <primary sortas="b-dbwrap_tool">dbwrap_tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpmscat">
-        <term><command>dumpmscat</command></term>
-        <listitem>
-          <para>
-            dumps the content of MS catalog files
-          </para>
-          <indexterm zone="samba dumpmscat">
-            <primary sortas="b-dumpmscat">dumpmscat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eventlogadm">
-        <term><command>eventlogadm</command></term>
-        <listitem>
-          <para>
-            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>)
-          </para>
-          <indexterm zone="samba eventlogadm">
-            <primary sortas="b-eventlogadm">eventlogadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gentest">
-        <term><command>gentest</command></term>
-        <listitem>
-          <para>
-            is used to run random generic SMB operations against two
-            SMB servers and show the differences in behavior
-          </para>
-          <indexterm zone="samba gentest">
-            <primary sortas="b-gentest">gentest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbadd">
-        <term><command>ldbadd</command></term>
-        <listitem>
-          <para>
-            is a command-line utility for adding records to an LDB
-            database
-          </para>
-          <indexterm zone="samba ldbadd">
-            <primary sortas="b-ldbadd">ldbadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbdel">
-        <term><command>ldbdel</command></term>
-        <listitem>
-          <para>
-            is a command-line utility for deleting LDB database records
-          </para>
-          <indexterm zone="samba ldbdel">
-            <primary sortas="b-ldbdel">ldbdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbedit">
-        <term><command>ldbedit</command></term>
-        <listitem>
-          <para>
-            allows you to edit LDB databases using your preferred editor
-          </para>
-          <indexterm zone="samba ldbedit">
-            <primary sortas="b-ldbedit">ldbedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbmodify">
-        <term><command>ldbmodify</command></term>
-        <listitem>
-          <para>
-            allows you to modify records in an LDB database
-          </para>
-          <indexterm zone="samba ldbmodify">
-            <primary sortas="b-ldbmodify">ldbmodify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbrename">
-        <term><command>ldbrename</command></term>
-        <listitem>
-          <para>
-            allows you to rename LDB databases
-          </para>
-          <indexterm zone="samba ldbrename">
-            <primary sortas="b-ldbrename">ldbrename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbsearch">
-        <term><command>ldbsearch</command></term>
-        <listitem>
-          <para>
-            searches an LDB database for records matching a specified
-            expression
-          </para>
-          <indexterm zone="samba ldbsearch">
-            <primary sortas="b-ldbsearch">ldbsearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locktest">
-        <term><command>locktest</command></term>
-        <listitem>
-          <para>
-            is used to find differences in locking between two SMB servers
-          </para>
-          <indexterm zone="samba locktest">
-            <primary sortas="b-locktest">locktest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="masktest">
-        <term><command>masktest</command></term>
-        <listitem>
-          <para>
-            is used to find differences in wildcard matching between
-            Samba's implementation and that of a remote server
-          </para>
-          <indexterm zone="samba masktest">
-            <primary sortas="b-masktest">masktest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdsearch">
-        <term><command>mdsearch</command></term>
-        <listitem>
-          <para>
-            runs <application>Spotlight</application> searches against a SMB
-            server
-          </para>
-          <indexterm zone="samba mdsearch">
-            <primary sortas="b-mdsearch">mdsearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mvxattr">
-        <term><command>mvxattr</command></term>
-        <listitem>
-          <para>
-            is used to recursively rename extended attributes
-          </para>
-          <indexterm zone="samba mvxattr">
-            <primary sortas="b-mvxattr">mvxattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ndrdump">
-        <term><command>ndrdump</command></term>
-        <listitem>
-          <para>
-            is a DCE/RPC Packet Parser and Dumper
-          </para>
-          <indexterm zone="samba ndrdump">
-            <primary sortas="b-ndrdump">ndrdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="net">
-        <term><command>net</command></term>
-        <listitem>
-          <para>
-            is a tool for administration of <application>Samba</application>
-            and remote CIFS servers, similar to the <command>net</command>
-            utility for DOS/Windows
-          </para>
-          <indexterm zone="samba net">
-            <primary sortas="b-net">net</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmbd">
-        <term><command>nmbd</command></term>
-        <listitem>
-          <para>
-            is the <application>Samba</application> NetBIOS name server
-          </para>
-          <indexterm zone="samba nmbd">
-            <primary sortas="b-nmbd">nmbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmblookup">
-        <term><command>nmblookup</command></term>
-        <listitem>
-          <para>
-            is used to query NetBIOS names and map them to IP addresses
-          </para>
-          <indexterm zone="samba nmblookup">
-            <primary sortas="b-nmblookup">nmblookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntlm_auth">
-        <term><command>ntlm_auth</command></term>
-        <listitem>
-          <para>
-            is a tool to allow external access to Winbind's
-            NTLM authentication function
-          </para>
-          <indexterm zone="samba ntlm_auth">
-            <primary sortas="b-ntlm_auth">ntlm_auth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oLschema2ldif">
-        <term><command>oLschema2ldif</command></term>
-        <listitem>
-          <para>
-            converts LDAP schema's to LDB-compatible LDIF
-          </para>
-          <indexterm zone="samba oLschema2ldif">
-            <primary sortas="b-oLschema2ldif">oLschema2ldif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdbedit">
-        <term><command>pdbedit</command></term>
-        <listitem>
-          <para>
-            is a tool used to manage the SAM database
-          </para>
-          <indexterm zone="samba pdbedit">
-            <primary sortas="b-pdbedit">pdbedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="profiles">
-        <term><command>profiles</command></term>
-        <listitem>
-          <para>
-            is a utility that reports and changes SIDs in Windows
-            registry files
-          </para>
-          <indexterm zone="samba profiles">
-            <primary sortas="b-profiles">profiles</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="regdiff">
-        <term><command>regdiff</command></term>
-        <listitem>
-          <para>
-            is a Diff program for Windows registry files
-          </para>
-          <indexterm zone="samba regdiff">
-            <primary sortas="b-regdiff">regdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="regpatch">
-        <term><command>regpatch</command></term>
-        <listitem>
-          <para>
-            applies registry patches to registry files
-          </para>
-          <indexterm zone="samba regpatch">
-            <primary sortas="b-regpatch">regpatch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="regshell">
-        <term><command>regshell</command></term>
-        <listitem>
-          <para>
-            is a Windows registry file browser using readline
-          </para>
-          <indexterm zone="samba regshell">
-            <primary sortas="b-regshell">regshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="regtree">
-        <term><command>regtree</command></term>
-        <listitem>
-          <para>
-            is a text-mode registry viewer
-          </para>
-          <indexterm zone="samba regtree">
-            <primary sortas="b-regtree">regtree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcclient">
-        <term><command>rpcclient</command></term>
-        <listitem>
-          <para>
-            is used to execute MS-RPC client side functions
-          </para>
-          <indexterm zone="samba rpcclient">
-            <primary sortas="b-rpcclient">rpcclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="samba-log-parser">
-        <term><command>samba-log-parser</command></term>
-        <listitem>
-          <para>
-            parses winbind logs generated by Samba
-          </para>
-          <indexterm zone="samba samba-log-parser">
-            <primary sortas="b-samba-log-parser">samba-log-parser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="samba-gpupdate">
-        <term><command>samba-gpupdate</command></term>
-        <listitem>
-          <para>
-            allows you to edit Microsoft Group Policy Objects (GPOs)
-          </para>
-          <indexterm zone="samba samba-gpupdate">
-            <primary sortas="b-samba-gpupdate">samba-gpupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="samba-regedit">
-        <term><command>samba-regedit</command></term>
-        <listitem>
-          <para>
-            is a ncurses based tool to manage the Samba registry
-          </para>
-          <indexterm zone="samba samba-regedit">
-            <primary sortas="b-samba-regedit">samba-regedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="samba-tool">
-        <term><command>samba-tool</command></term>
-        <listitem>
-          <para>
-            is the main Samba administration tool
-          </para>
-          <indexterm zone="samba samba-tool">
-            <primary sortas="b-samba-tool">samba-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sharesec">
-        <term><command>sharesec</command></term>
-        <listitem>
-          <para>
-            manipulates share ACL permissions on SMB file shares
-          </para>
-          <indexterm zone="samba sharesec">
-            <primary sortas="b-sharesec">sharesec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbcacls">
-        <term><command>smbcacls</command></term>
-        <listitem>
-          <para>
-            is used to manipulate Windows NT access control lists
-          </para>
-          <indexterm zone="samba smbcacls">
-            <primary sortas="b-smbcacls">smbcacls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbclient">
-        <term><command>smbclient</command></term>
-        <listitem>
-          <para>
-            is a SMB/CIFS access utility, similar to FTP
-          </para>
-          <indexterm zone="samba smbclient">
-            <primary sortas="b-smbclient">smbclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbcontrol">
-        <term><command>smbcontrol</command></term>
-        <listitem>
-          <para>
-            is used to control running <command>smbd</command>,
-            <command>nmbd</command> and <command>winbindd</command> daemons
-          </para>
-          <indexterm zone="samba smbcontrol">
-            <primary sortas="b-smbcontrol">smbcontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbcquotas">
-        <term><command>smbcquotas</command></term>
-        <listitem>
-          <para>
-            is used to manipulate Windows NT quotas on SMB file shares
-          </para>
-          <indexterm zone="samba smbcquotas">
-            <primary sortas="b-smbcquotas">smbcquotas</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbd">
-        <term><command>smbd</command></term>
-        <listitem>
-          <para>
-            is the main <application>Samba</application> daemon which
-            provides SMB/CIFS services to clients
-          </para>
-          <indexterm zone="samba smbd">
-            <primary sortas="b-smbd">smbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbget">
-        <term><command>smbget</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="samba smbget">
-            <primary sortas="b-smbget">smbget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbpasswd">
-        <term><command>smbpasswd</command></term>
-        <listitem>
-          <para>
-            changes a user's <application>Samba</application> password
-          </para>
-          <indexterm zone="samba smbpasswd">
-            <primary sortas="b-smbpasswd">smbpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbspool">
-        <term><command>smbspool</command></term>
-        <listitem>
-          <para>
-            sends a print job to a SMB printer
-          </para>
-          <indexterm zone="samba smbspool">
-            <primary sortas="b-smbspool">smbspool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbstatus">
-        <term><command>smbstatus</command></term>
-        <listitem>
-          <para>
-            reports current <application>Samba</application> connections
-          </para>
-          <indexterm zone="samba smbstatus">
-            <primary sortas="b-smbstatus">smbstatus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbtar">
-        <term><command>smbtar</command></term>
-        <listitem>
-          <para>
-            is a shell script used for backing up SMB/CIFS shares
-            directly to Linux tape drives or to a file
-          </para>
-          <indexterm zone="samba smbtar">
-            <primary sortas="b-smbtar">smbtar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbtorture">
-        <term><command>smbtorture</command></term>
-        <listitem>
-          <para>
-            is  a test suite that runs several tests against a SMB server
-          </para>
-          <indexterm zone="samba smbtorture">
-            <primary sortas="b-smbtorture">smbtorture</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbtree">
-        <term><command>smbtree</command></term>
-        <listitem>
-          <para>
-            is a text-based SMB network browser
-          </para>
-          <indexterm zone="samba smbtree">
-            <primary sortas="b-smbtree">smbtree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbbackup">
-        <term><command>tdbbackup</command></term>
-        <listitem>
-          <para>
-            is a tool for backing up or validating the integrity of
-            <application>Samba</application> <filename>.tdb</filename> files
-          </para>
-          <indexterm zone="samba tdbbackup">
-            <primary sortas="b-tdbbackup">tdbbackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbdump">
-        <term><command>tdbdump</command></term>
-        <listitem>
-          <para>
-            is a tool used to print the contents of a
-            <application>Samba</application> <filename>.tdb</filename> file
-          </para>
-          <indexterm zone="samba tdbdump">
-            <primary sortas="b-tdbdump">tdbdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbrestore">
-        <term><command>tdbrestore</command></term>
-        <listitem>
-          <para>
-            is a tool for creating a <application>Samba</application>
-            <filename>.tdb</filename> file out of a ntdbdump
-          </para>
-          <indexterm zone="samba tdbrestore">
-            <primary sortas="b-tdbrestore">tdbrestore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbtool">
-        <term><command>tdbtool</command></term>
-        <listitem>
-          <para>
-            is a tool which allows simple database manipulation from the
-            command line
-          </para>
-          <indexterm zone="samba tdbtool">
-            <primary sortas="b-tdbtool">tdbtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="testparm">
-        <term><command>testparm</command></term>
-        <listitem>
-          <para>
-            checks a <filename>smb.conf</filename> file for proper syntax
-          </para>
-          <indexterm zone="samba testparm">
-            <primary sortas="b-testparm">testparm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wbinfo">
-        <term><command>wbinfo</command></term>
-        <listitem>
-          <para>
-            queries a running <command>winbindd</command> daemon
-          </para>
-          <indexterm zone="samba wbinfo">
-            <primary sortas="b-wbinfo">wbinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="winbindd">
-        <term><command>winbindd</command></term>
-        <listitem>
-          <para>
-            resolves names from Windows NT servers
-          </para>
-          <indexterm zone="samba winbindd">
-            <primary sortas="b-winbindd">winbindd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss_winbind">
-        <term><filename class="libraryfile">libnss_winbind.so</filename></term>
-        <listitem>
-          <para>
-            provides Name Service Switch API functions for resolving names
-            from NT servers
-          </para>
-          <indexterm zone="samba libnss_winbind">
-            <primary sortas="c-libnss_winbind">libnss_winbind.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss_wins">
-        <term><filename class="libraryfile">libnss_wins.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for Samba's implementation of the
-            Windows Internet Naming Service
-          </para>
-          <indexterm zone="samba libnss_wins">
-            <primary sortas="c-libnss_wins">libnss_wins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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
-          </para>
-          <indexterm zone="samba libnetapi">
-            <primary sortas="c-libnetapi">libnetapi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsmbclient">
-        <term><filename class="libraryfile">libsmbclient.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for the Samba SMB client tools
-          </para>
-          <indexterm zone="samba libsmbclient">
-            <primary sortas="c-libsmbclient">libsmbclient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="libsmbsharemodes">
-        <term><filename class="libraryfile">libsmbsharemodes.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for accessing SMB share modes (locks etc.)
-          </para>
-          <indexterm zone="samba libsmbsharemodes">
-            <primary sortas="c-libsmbsharemodes">libsmbsharemodes.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libwbclient">
-        <term><filename class="libraryfile">libwbclient.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for Windows domain client services
-          </para>
-          <indexterm zone="samba libwbclient">
-            <primary sortas="c-libwbclient">libwbclient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wget-download-http
-           "&gnu-http;/wget/wget-&wget-version;.tar.gz">
-  <!ENTITY wget-download-ftp  " ">
-  <!ENTITY wget-md5sum        "271bf949384d0858c2c3d419f6311365">
-  <!ENTITY wget-size          "4.9 MB">
-  <!ENTITY wget-buildsize     "36 MB (add 27 MB for tests)">
-  <!ENTITY wget-time          "0.3 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="wget" xreflabel="Wget-&wget-version;">
-  <?dbhtml filename="wget.html"?>
-
-
-  <title>Wget-&wget-version;</title>
-
-  <indexterm zone="wget">
-    <primary sortas="a-Wget">Wget</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wget</title>
-
-    <para>
-      The <application>Wget</application> package contains a utility useful for
-      non-interactive downloading of files from the Web.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wget-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wget-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wget-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wget-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wget-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wget-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wget Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libpsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended at runtime</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="make-ca"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnutls"/>,
-      <xref linkend="perl-http-daemon"/> (for the test suite),
-      <xref linkend="perl-io-socket-ssl"/> (for the test suite),
-      <xref linkend="libidn2"/>,
-      <xref linkend="pcre2"/>, and
-      <xref linkend="valgrind"/> (for the test suite)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wget</title>
-
-    <para>
-      Install <application>Wget</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --sysconfdir=/etc  \
-            --with-ssl=openssl &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <!-- libwww-perl/HTTP-Daemon/#21
-         Removing, since IO::Socket//INET6 has been deprecated
-         and replaced with IO::Socket::IP, which fixes the
-         problem
-    <para>
-      HTTPS tests are known to fail if Perl module IO::Socket::INET6
-      is installed.
-    </para>
--->
-    <para>
-      Some tests may fail when Valgrind tests are enabled.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This relocates the configuration
-      file from <filename class="directory">/usr/etc</filename> to
-      <filename class="directory">/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-ssl=openssl</parameter>: This allows the program to use
-      openssl instead of <xref linkend="gnutls"/>.
-    </para>
-
-    <para>
-      <option>--enable-valgrind-tests</option>: This allows the tests to be
-      run under valgrind.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Wget</title>
-
-    <sect3 id="wget-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/wgetrc</filename> and
-        <filename>~/.wgetrc</filename>
-      </para>
-
-      <indexterm zone="wget wget-config">
-        <primary sortas="e-AA.wgetrc">~/.wgetrc</primary>
-      </indexterm>
-
-      <indexterm zone="wget wget-config">
-        <primary sortas="e-etc-wgetrc">/etc/wgetrc</primary>
-      </indexterm>
-
-<!--
-      <para>
-        If you have installed <xref linkend="make-ca"/> and you want
-        <application>Wget</application> to use them, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo ca-directory=/etc/ssl/certs >> /etc/wgetrc</userinput></screen>
--->
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wget
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wget-prog">
-        <term><command>wget</command></term>
-        <listitem>
-          <para>
-            retrieves files from the Web using the HTTP, HTTPS and FTP
-            protocols.  It is designed to be non-interactive, for background or
-            unattended operations
-          </para>
-          <indexterm zone="wget wget-prog">
-            <primary sortas="b-wget">wget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/wireless-kernel-kernel.xml
===================================================================
--- networking/netprogs/wireless-kernel-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  [*] <emphasis role='blue'>W</emphasis>ireless ---&gt;                                                   [WIRELESS]
-    &lt;*/M&gt;   <emphasis role='blue'>c</emphasis>fg80211 - wireless configuration API                     [CFG80211]
-    &lt; /*/M&gt; <emphasis role='blue'>G</emphasis>eneric IEEE 802.11 Networking Stack (mac80211)           [MAC80211]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork device support ---&gt;                                   [NETDEVICES]
-    [*] <emphasis role='blue'>W</emphasis>ireless LAN ---&gt;                                                 [WLAN]</screen>
Index: tworking/netprogs/wireless-kernel.xml
===================================================================
--- networking/netprogs/wireless-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="wireless-kernel" xreflabel="Configuring the Linux Kernel for Wireless">
-  <?dbhtml filename="wireless-kernel.html"?>
-
-
-  <title>Configuring the Linux Kernel for Wireless</title>
-
-  <para>
-    Before using any userspace tools for connecting to a wireless AP,
-    the Linux kernel must be configured to drive the wireless NIC properly.
-    Enable the following options in the kernel configuration as well as
-    specific device drivers for your hardware and recompile the kernel if
-    necessary:
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="wireless-kernel-kernel.xml"/>
-
-  <para>
-    Open the <quote>Wireless LAN</quote> submenu and select the options that
-    support your hardware. <command>lspci</command> from
-    <xref linkend="pciutils"/> or <command>lsusb</command> from
-    <xref linkend="usbutils"/> can be used to
-    view your hardware configuration.  Note that many (though not all)
-    options for the wireless NICs depend on
-    <parameter>CONFIG_MAC80211</parameter>. After the correct drivers are
-    loaded, the interface will appear in
-    <filename>/sys/class/net</filename>, or in the output of the
-    <command>ip link</command> command.
-  </para>
-
-  <para>
-    Many wireless NIC drivers require firmware. If you've enabled the
-    correct driver in the kernel configuration but it fails to load (with
-    messages like <quote><computeroutput>Direct firmware load for
-    <replaceable>&lt;filename</replaceable>&gt; failed with error
-    -2</computeroutput></quote>, it means that you need to install the firmware
-    or the wireless NIC won't work. Read <xref linkend='postlfs-firmware'/>
-    for more details.
-  </para>
-
-</sect1>
Index: tworking/netprogs/wireless-tools-kernel.xml
===================================================================
--- networking/netprogs/wireless-tools-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  [*] <emphasis role='blue'>W</emphasis>ireless ---&gt;                                                   [WIRELESS]
-    &lt;*/M&gt; <emphasis role='blue'>c</emphasis>fg80211 - wireless configuration API                       [CFG80211]
-    [*]     <emphasis role='blue'>c</emphasis>fg80211 wireless extensions compatibility           [CFG80211_WEXT]</screen>
Index: tworking/netprogs/wireless-tools.xml
===================================================================
--- networking/netprogs/wireless-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,282 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wireless-download-http "https://hewlettpackard.github.io/wireless-tools/wireless_tools.&wireless-tools-version;.tar.gz">
-  <!ENTITY wireless-download-ftp  " ">
-  <!ENTITY wireless-md5sum        "e06c222e186f7cc013fd272d023710cb">
-  <!ENTITY wireless-size          "288 KB">
-  <!ENTITY wireless-buildsize     "2.0 MB">
-  <!ENTITY wireless-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="wireless_tools" xreflabel="Wireless Tools-&wireless-tools-version;">
-  <?dbhtml filename="wireless_tools.html"?>
-
-
-  <title>Wireless Tools-&wireless-tools-version;</title>
-
-  <indexterm zone="wireless_tools">
-    <primary sortas="a-WirelessTools">Wireless Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wireless Tools</title>
-
-    <para>
-      The Wireless Extension (WE) is a generic API in the Linux kernel allowing
-      a driver to expose configuration and statistics specific to common
-      Wireless LANs to userspace. A single set of tools can support all the
-      variations of Wireless LANs, regardless of their type, as long as the
-      driver supports Wireless Extensions. WE parameters may also be changed on
-      the fly without restarting the driver (or Linux).
-    </para>
-
-    <para>
-      The <application>Wireless Tools</application> (WT) package is a set
-      of tools allowing  manipulation of the Wireless Extensions. They use a
-      textual interface to support the full Wireless Extension.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wireless-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wireless-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wireless-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wireless-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wireless-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wireless-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/wireless_tools-&wireless-tools-version;-fix_iwlist_scanning-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wireless Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="nodump">
-      <xref linkend="wireless-kernel"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='wireless-tools-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      To use <application>Wireless Tools</application>, the kernel must have
-      the appropriate drivers and other support available.  Besides the
-      configurations mentioned by <xref linkend='wireless-kernel'/>, it's
-      also needed to enable the following options in the kernel
-      configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="wireless-tools-kernel.xml"/>
-
-    <indexterm zone="wireless_tools wireless-tools-kernel">
-      <primary sortas="d-wireless_tools">Wireless Tools</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wireless Tools</title>
-
-    <para>
-      First, apply a patch that fixes a problem when numerous
-      networks are available:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../wireless_tools-&wireless-tools-version;-fix_iwlist_scanning-1.patch</userinput></screen>
-
-    <para>
-      To install <application>Wireless Tools</application>,
-      use the following commands:
-    </para>
-
-<screen><userinput>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 PREFIX=/usr INSTALL_MAN=/usr/share/man install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>INSTALL_MAN=/usr/share/man</command>: Install manual pages
-      in <filename class="directory">/usr/share/man</filename> instead of
-      <filename class="directory">/usr/man</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ifrename, iwconfig, iwevent, iwgetid, iwlist, iwpriv,
-             and iwspy</seg>
-        <seg>libiw.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ifrename">
-        <term><command>ifrename</command></term>
-        <listitem>
-          <para>
-            renames network interfaces based on various static criteria
-          </para>
-          <indexterm zone="wireless_tools ifrename">
-            <primary sortas="b-ifrename">ifrename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iwconfig">
-        <term><command>iwconfig</command></term>
-        <listitem>
-          <para>
-            configures a wireless network interface
-          </para>
-          <indexterm zone="wireless_tools iwconfig">
-            <primary sortas="b-iwconfig">iwconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iwevent">
-        <term><command>iwevent</command></term>
-        <listitem>
-          <para>
-            displays wireless events generated by drivers and setting changes
-          </para>
-          <indexterm zone="wireless_tools iwevent">
-            <primary sortas="b-iwevent">iwevent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iwgetid">
-        <term><command>iwgetid</command></term>
-        <listitem>
-          <para>
-            reports ESSID, NWID or AP/Cell Address of wireless networks
-          </para>
-          <indexterm zone="wireless_tools iwgetid">
-            <primary sortas="b-iwgetid">iwgetid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iwlist">
-        <term><command>iwlist</command></term>
-        <listitem>
-          <para>
-            gets detailed wireless information from a wireless interface
-          </para>
-          <indexterm zone="wireless_tools iwlist">
-            <primary sortas="b-iwlist">iwlist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iwpriv">
-        <term><command>iwpriv</command></term>
-        <listitem>
-          <para>
-            configures optional (private) parameters of a wireless network
-             interface
-          </para>
-          <indexterm zone="wireless_tools iwpriv">
-            <primary sortas="b-iwpriv">iwpriv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iwspy">
-        <term><command>iwspy</command></term>
-        <listitem>
-          <para>
-            gets wireless statistics from specific node
-          </para>
-          <indexterm zone="wireless_tools iwspy">
-            <primary sortas="b-iwspy">iwspy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiw">
-        <term><filename class="libraryfile">libiw.so</filename></term>
-        <listitem>
-          <para>
-            contains functions required by the wireless programs and
-            provides an API for other programs
-          </para>
-          <indexterm zone="wireless_tools libiw">
-            <primary sortas="c-libiw">libiw.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,609 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wpa_supplicant-download-http
-           "https://w1.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
-  <!ENTITY wpa_supplicant-download-ftp  " ">
-  <!ENTITY wpa_supplicant-md5sum        "d26797fcb002898d4ee989179346e1cc">
-  <!ENTITY wpa_supplicant-size          "3.4 MB">
-  <!ENTITY wpa_supplicant-buildsize     "37 MB">
-  <!ENTITY wpa_supplicant-time          "0.5 SBU (with optional gui)">
-]>
-
-<sect1 id="wpa_supplicant" xreflabel="wpa_supplicant-&wpa_supplicant-version;">
-  <?dbhtml filename="wpa_supplicant.html"?>
-
-
-  <title>wpa_supplicant-&wpa_supplicant-version;</title>
-
-  <indexterm zone="wpa_supplicant">
-    <primary sortas="a-wpa_supplicant">wpa_supplicant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WPA Supplicant</title>
-
-    <para>
-      <application>WPA Supplicant</application> is a Wi-Fi Protected Access
-      (WPA) client and IEEE 802.1X supplicant. It implements WPA key negotiation
-      with a WPA Authenticator and Extensible Authentication Protocol (EAP)
-      authentication with an Authentication Server. In addition, it controls the
-      roaming and IEEE 802.11 authentication/association of the wireless LAN
-      driver. This is useful for connecting to a password protected wireless
-      access point.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wpa_supplicant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wpa_supplicant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wpa_supplicant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wpa_supplicant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wpa_supplicant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wpa_supplicant-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/wpa_supplicant-&wpa_supplicant-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WPA Supplicant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="nodump">
-      <xref linkend="wireless-kernel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/> (for running
-        <command>update-desktop-database</command>) and
-      <xref linkend="libnl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="libxml2"/>, and
-      &qt5-deps;
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id="wpa_supplicant-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      To use <application>wpa_supplicant</application>, the kernel must have
-      the appropriate drivers and other support available.  Read
-      <xref linkend='wireless-kernel'/> for details.
-    </para>
-
-    <indexterm zone="wpa_supplicant wpa_supplicant-kernel">
-      <primary sortas="d-wpa_supplicant">wpa_supplicant</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WPA Supplicant</title>
-
-    <para>
-      First you will need to create an initial configuration file for the
-      build process. You can read <filename>wpa_supplicant/README</filename>
-      and <filename>wpa_supplicant/defconfig</filename> for the explanation
-      of the following options as well as other options that can be used.
-      Create a build configuration file that should work for standard WiFi
-      setups by running the following command:
-    </para>
-
-<screen><userinput>cat &gt; wpa_supplicant/.config &lt;&lt; "EOF"
-<literal>CONFIG_BACKEND=file
-CONFIG_CTRL_IFACE=y
-CONFIG_DEBUG_FILE=y
-CONFIG_DEBUG_SYSLOG=y
-CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
-CONFIG_DRIVER_NL80211=y
-CONFIG_DRIVER_WEXT=y
-CONFIG_DRIVER_WIRED=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_LEAP=y
-CONFIG_EAP_MD5=y
-CONFIG_EAP_MSCHAPV2=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_PEAP=y
-CONFIG_EAP_TLS=y
-CONFIG_EAP_TTLS=y
-CONFIG_IEEE8021X_EAPOL=y
-CONFIG_IPV6=y
-CONFIG_LIBNL32=y
-CONFIG_PEERKEY=y
-CONFIG_PKCS12=y
-CONFIG_READLINE=y
-CONFIG_SMARTCARD=y
-CONFIG_WPS=y
-CFLAGS += -I/usr/include/libnl3</literal>
-EOF</userinput></screen>
-
-    <para>
-      If you wish to use <application>WPA Supplicant</application> with
-      <xref linkend="NetworkManager"/>, make sure that you have installed
-      <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add the
-      following options to the <application>WPA Supplicant</application>
-      build configuration file by running the following command:
-    </para>
-
-<screen><userinput>cat &gt;&gt; wpa_supplicant/.config &lt;&lt; "EOF"
-<literal>CONFIG_CTRL_IFACE_DBUS=y
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-CONFIG_CTRL_IFACE_DBUS_INTRO=y</literal>
-EOF</userinput></screen>
-
-    <para>
-      Next, patch a security vulnerability that occurs when connecting to some
-      networks:
-      <!-- CVE-2023-52160, see Ticket #19304. -->
-    </para>
-
-<screen><userinput>patch -Np1 -i ../wpa_supplicant-&wpa_supplicant-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>WPA Supplicant</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>cd wpa_supplicant &amp;&amp;
-make BINDIR=/usr/sbin LIBDIR=/usr/lib</userinput></screen>
-
-    <para>
-      If you have installed &qt5-deps; and wish to build
-      the <application>WPA Supplicant</application> GUI program, run
-      the following commands:
-    </para>
-
-    <note>
-      <para>
-        The following directory name is labelled qt4, but
-        is compatible with &qt5-deps;.
-      </para>
-    </note>
-
-<screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
-qmake wpa_gui.pro &amp;&amp;
-make &amp;&amp;
-popd</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>install -v -m755 wpa_{cli,passphrase,supplicant} /usr/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>
-
-    <para revision="systemd">
-      Install the <application>systemd</application> support files by
-      running the following command as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -v -m644 systemd/*.service /usr/lib/systemd/system/</userinput></screen>
-
-    <para>
-      If you have built <application>WPA Supplicant</application> with
-      <application>D-Bus</application> support, you will need to install
-      <application>D-Bus</application> configuration files. Install them
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 dbus/fi.w1.wpa_supplicant1.service \
-                 /usr/share/dbus-1/system-services/ &amp;&amp;
-install -v -d -m755 /etc/dbus-1/system.d &amp;&amp;
-install -v -m644 dbus/dbus-wpa_supplicant.conf \
-                 /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>
-
-    <para>
-      If you have built the <application>WPA Supplicant</application> GUI
-      program, install it by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 wpa_gui-qt4/wpa_gui /usr/bin/ &amp;&amp;
-install -v -m644 doc/docbook/wpa_gui.8 /usr/share/man/man8/ &amp;&amp;
-install -v -m644 wpa_gui-qt4/wpa_gui.desktop /usr/share/applications/ &amp;&amp;
-install -v -m644 wpa_gui-qt4/icons/wpa_gui.svg /usr/share/pixmaps/</userinput></screen>
-
-    <note>
-      <para>
-        You will need to restart the system <application>D-Bus</application> daemon
-        before you can use the <application>WPA Supplicant</application>
-        <application>D-Bus</application> interface.
-      </para>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-desktop-database.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring wpa_supplicant</title>
-
-    <important>
-      <para>
-        If you are using WPA Supplicant with
-        <xref linkend='NetworkManager'/> (or anything communicating with
-        WPA Supplicant via D-Bus), this section should be skipped.  Running
-        a D-Bus connected WPA Supplicant instance and another WPA supplicant
-        instance configured following this section simultaneously can cause
-        subtle issues.
-      </para>
-    </important>
-
-    <sect3 id="wpa_supplicant-config">
-      <title>Config File</title>
-
-      <para revision="sysv">
-        <filename>/etc/sysconfig/wpa_supplicant-*.conf</filename>
-      </para>
-
-      <para revision="systemd">
-        <filename>/etc/wpa_supplicant/wpa_supplicant-*.conf</filename>
-      </para>
-
-      <indexterm zone="wpa_supplicant wpa_supplicant-config" revision="sysv">
-        <primary
-        sortas="e-etc-sysconfig-wpa_supplicant-star.conf">/etc/sysconfig/wpa_supplicant-*.conf</primary>
-      </indexterm>
-
-      <indexterm zone="wpa_supplicant wpa_supplicant-config" revision="systemd">
-        <primary
-        sortas="e-etc-wpa_supplicant-wpa_supplicant-star.conf">/etc/wpa_supplicant/wpa_supplicant-*.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        To connect to an access point that uses a password, you need to put
-        the pre-shared key in
-        <phrase revision="sysv">
-          <filename>
- /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
-        </phrase>
-        <phrase revision="systemd">
-          <filename>
- /etc/wpa_supplicant/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
-        </phrase>
-        SSID is the string that the access point/router transmits to
-        identify itself. Run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump" revision="sysv"><userinput>wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
-
-<screen role="nodump" revision="systemd"><userinput>install -v -dm755 /etc/wpa_supplicant &amp;&amp;
-wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/wpa_supplicant/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
-
-      <para>
-        <phrase revision="sysv">
-          <filename>
-            /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf
-          </filename>
-        </phrase>
-        <phrase revision="systemd">
-          <filename>
-            /etc/wpa_supplicant/wpa_supplicant-<replaceable>wifi0</replaceable>.conf
-          </filename>
-        </phrase>
-        can hold the details of several access points. When
-        <command>wpa_supplicant</command> is started, it will scan for the
-        SSIDs it can see and choose the appropriate password to connect.
-      </para>
-
-      <para>
-        If you want to connect to an access point that isn't password
-        protected, put an entry like this in
-        <phrase revision="sysv">
-          <filename>
-/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
-        </phrase>
-        <phrase revision="systemd">
-          <filename>
-/etc/wpa_supplicant/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
-        </phrase>
-        Replace "Some-SSID" with the SSID of the access point/router.
-      </para>
-
-<screen>network={
-  ssid="<replaceable>Some-SSID</replaceable>"
-  key_mgmt=NONE
-}</screen>
-
-      <para>
-        Connecting to a new access point that is not in the configuration
-        file can be accomplished manually via the command line or GUI, but it
-        must be done via a privileged user. To do that, add the following to
-        the configuration file:
-      </para>
-
-<screen>ctrl_interface=DIR=/run/wpa_supplicant GROUP=&lt;privileged group&gt;
-update_config=1</screen>
-
-      <para>
-        Replace the &lt;privileged group&gt; above with a system group where
-        members have the ability to connect to a wireless access point.
-      </para>
-
-      <para>
-        There are many options that you could use to tweak how you connect
-        to each access point. They are described in some detail in the
-        <filename>wpa_supplicant/wpa_supplicant.conf</filename> file in the
-        source tree.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Connecting to an Access Point</title>
-
-      <para id="wpa-service" revision="sysv">
-        If you want to configure network interfaces at boot using
-        <command>wpa_supplicant</command>, you need to install the
-        <filename>/lib/services/wpa</filename> script
-        included in <xref linkend="bootscripts"/> package:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-service-wpa</userinput></screen>
-
-      <indexterm zone="wpa_supplicant wpa-service" revision="sysv">
-        <primary sortas="f-wpa">wpa</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        If your router/access point uses DHCP to allocate IP addresses, you
-        can install <xref linkend="dhcpcd" role="nodep"/> and use it to
-        automatically obtain network addresses. Create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
-        </filename> by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
-SERVICE="wpa"
-
-# Additional arguments to wpa_supplicant
-WPA_ARGS=""
-
-WPA_SERVICE="dhcpcd"
-DHCP_START="-b -q <replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
-DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <para revision="sysv">
-        Alternatively, if you use static addresses on your local network,
-        then create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
-        </filename> by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
-SERVICE="wpa"
-
-# Additional arguments to wpa_supplicant
-WPA_ARGS=""
-
-WPA_SERVICE="ipv4-static"
-IP="192.168.1.1"
-GATEWAY="192.168.1.2"
-PREFIX="24"
-BROADCAST="192.168.1.255"</literal>
-EOF</userinput></screen>
-
-      <para revision="systemd">
-        There are 3 types of <application>systemd</application> units
-        that were installed:
-      </para>
-
-      <itemizedlist spacing="compact" revision="systemd">
-        <listitem>
-          <para>
-            wpa_supplicant@.service
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            wpa_supplicant-nl80211@.service
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            wpa_supplicant-wired@.service
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para revision="systemd">
-        The only difference between 3 of them is what driver
-        is used for connecting (-D option). The first one uses
-        the default driver, the second one uses the nl80211
-        driver and the third one uses the wired driver.
-      </para>
-
-      <para>
-        You can connect to the wireless access point by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>ifup <replaceable>wifi0</replaceable></userinput></screen>
-
-      <para revision="sysv">
-        Replace <replaceable>wlan0</replaceable> with the correct
-        wireless interface and <replaceable>wifi0</replaceable>
-        with desired name for the configuration file. Please note
-        that <filename>wpa_supplicant-*.conf</filename> and
-        <filename>ifconfig.*</filename> configuration files need
-        to have identical names, ie both contain
-        <replaceable>wifi0</replaceable> in their name.
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl start wpa_supplicant@<replaceable>wlan0</replaceable></userinput></screen>
-
-      <para revision="systemd">
-        To connect to the wireless access point at
-        boot, simply enable the appropriate
-        <command>wpa_supplicant</command> service
-        by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable wpa_supplicant@<replaceable>wlan0</replaceable></userinput></screen>
-
-      <para revision="systemd">
-        Depending on your setup, you can replace the
-        <filename>wpa_supplicant@.service</filename>
-        with any other listed above.
-      </para>
-
-      <para revision="systemd">
-        To assign a network address to your wireless interface, consult the
-        <ulink url="&lfs-root;/chapter09/network.html">General Network Configuration</ulink>
-        page in LFS.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wpa_gui, wpa_supplicant, wpa_passphrase and wpa_cli
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wpa_gui">
-        <term><command>wpa_gui</command></term>
-        <listitem>
-          <para>
-            is a graphical frontend program for interacting with
-            <application>wpa_supplicant</application>
-          </para>
-          <indexterm zone="wpa_supplicant wpa_gui">
-            <primary sortas="b-wpa_gui">wpa_gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpa_supplicant-prog">
-        <term><command>wpa_supplicant</command></term>
-        <listitem>
-          <para>
-            is a daemon that can connect to a password protected wireless
-            access point
-          </para>
-          <indexterm zone="wpa_supplicant wpa_supplicant-prog">
-            <primary sortas="b-wpa_supplicant">wpa_supplicant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpa_passphrase">
-        <term><command>wpa_passphrase</command></term>
-        <listitem>
-          <para>
-            takes an SSID and a password and generates a simple
-            configuration that <command>wpa_supplicant</command> can
-            understand
-          </para>
-          <indexterm zone="wpa_supplicant wpa_passphrase">
-            <primary sortas="b-wpa_passphrase">wpa_passphrase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpa_cli">
-        <term><command>wpa_cli</command></term>
-        <listitem>
-          <para>
-            is a command line interface used to control a running
-            <command>wpa_supplicant</command> daemon
-          </para>
-          <indexterm zone="wpa_supplicant wpa_cli">
-            <primary sortas="b-wpa_cli">wpa_cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,708 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 avahi-download-http "https://github.com/lathiat/avahi/releases/download/v&avahi-version;/avahi-&avahi-version;.tar.gz">
-  <!ENTITY avahi-download-ftp  " ">
-  <!ENTITY avahi-md5sum        "229c6aa30674fc43c202b22c5f8c2be7">
-  <!ENTITY avahi-size          "1.5 MB">
-  <!ENTITY avahi-buildsize     "32 MB">
-  <!ENTITY avahi-time          "0.3 SBU">
-]>
-
-<sect1 id="avahi" xreflabel="Avahi-&avahi-version;">
-  <?dbhtml filename="avahi.html"?>
-
-
-  <title>Avahi-&avahi-version;</title>
-
-  <indexterm zone="avahi">
-    <primary sortas="a-Avahi">Avahi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Avahi</title>
-
-    <para>
-      The <application>Avahi</application> package is a system which
-      facilitates service discovery on a local network.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&avahi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&avahi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &avahi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &avahi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &avahi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &avahi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/avahi-&avahi-version;-ipv6_race_condition_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Avahi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libdaemon"/>, and
-      &qt5-deps;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="gtk2"/> (deprecated),
-      <xref linkend="libevent"/>,
-      <xref linkend="doxygen"/> and
-      <ulink url="https://sourceforge.net/projects/xmltoman/">xmltoman</ulink>
-      (for generating documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Avahi</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>avahi-daemon</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -fg 84 avahi &amp;&amp;
-useradd -c "Avahi Daemon Owner" -d /run/avahi-daemon -u 84 \
-        -g avahi -s /bin/false avahi</userinput></screen>
-
-    <para>
-      There should also be a dedicated privileged access group for
-      <application>Avahi</application> clients. Issue the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -fg 86 netdev</userinput></screen>
-
-    <para>
-      Fix a regression that results in a race condition when IPv6 is in use
-      and multiple network adapters are present on the system:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../avahi-&avahi-version;-ipv6_race_condition_fix-1.patch</userinput></screen>
-
-    <para>
-      Fix a security vulnerability 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:
-    </para>
-
-<screen revision="sysv"><userinput>./configure \
-    --prefix=/usr                  \
-    --sysconfdir=/etc              \
-    --localstatedir=/var           \
-    --disable-static               \
-    --disable-libevent             \
-    --disable-mono                 \
-    --disable-monodoc              \
-    --disable-python               \
-    --disable-qt3                  \
-    --disable-qt4                  \
-    --enable-core-docs             \
-    --with-distro=none             \
-    --with-systemdsystemunitdir=no \
-    --with-dbus-system-address='unix:path=/run/dbus/system_bus_socket' &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure \
-    --prefix=/usr        \
-    --sysconfdir=/etc    \
-    --localstatedir=/var \
-    --disable-static     \
-    --disable-libevent   \
-    --disable-mono       \
-    --disable-monodoc    \
-    --disable-python     \
-    --disable-qt3        \
-    --disable-qt4        \
-    --enable-core-docs   \
-    --with-distro=none   \
-    --with-dbus-system-address='unix:path=/run/dbus/system_bus_socket' &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-libevent</parameter>: This parameter disables the
-      use of <xref linkend="libevent"/>. Remove if you have it installed.
-    </para>
-
-    <para>
-      <parameter>--disable-mono</parameter>: This parameter disables the
-      <application>Mono</application> bindings.
-    </para>
-
-    <para>
-      <parameter>--disable-monodoc</parameter>: This parameter disables
-      documentation for the <application>Mono</application> bindings.
-    </para>
-
-    <para>
-      <parameter>--disable-python</parameter>: This parameter disables the
-      scripts that depend on <application>Python</application>. It also
-      allows a regular install to complete successfully.
-    </para>
-
-    <para>
-      <parameter>--disable-qt3</parameter>: This parameter disables the
-      attempt to build the obsolete <application>Qt3</application>
-      portions of the package.
-    </para>
-
-    <para>
-      <parameter>--disable-qt4</parameter>: This parameter disables the
-      attempt to build the obsolete <application>Qt4Core</application>
-      portions of the package.
-    </para>
-
-    <para>
-      <parameter>--enable-core-docs</parameter>: This parameter enables the
-      building of documentation.
-    </para>
-
-    <para>
-      <parameter>--with-distro=none</parameter>: There is an obsolete
-      boot script in the distribution for LFS. This option disables it.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-systemdsystemunitdir=no</parameter>: Without it, the
-      daemon fails to start in BLFS, which does not support
-      <application>systemd</application>.
-    </para>
-
-    <para>
-      <parameter>--with-dbus-system-address=</parameter>: This option
-      prevents the package from referring to the deprecated
-      <filename class='directory'>/var/run</filename> directory.
-    </para>
-
-    <para>
-      <option>--disable-dbus</option>: This parameter disables the use
-      of <application>D-Bus</application>.
-    </para>
-
-    <para>
-      <option>--disable-gtk</option>: This parameter disables the use
-      of <application>GTK+2</application>.
-    </para>
-
-    <para>
-      <option>--disable-gtk3</option>: This parameter disables the use
-      of <application>GTK+3</application>.
-    </para>
-
-    <para>
-      <option>--disable-qt5</option>: This parameter disables the use
-      of <application>Qt5</application>, and allows building without it.
-    </para>
-
-    <para>
-      <option>--disable-libdaemon</option>: This parameter disables the use
-      of <application>libdaemon</application>. If you use this option,
-      <command>avahi-daemon</command> won't be built.
-    </para>
-
-    <para>
-      <option>--enable-tests</option>: This option enables the building of
-      tests and examples.
-    </para>
-
-    <para>
-      <option>--enable-compat-howl</option>: This option enables the
-      compatibility layer for <application>HOWL</application>.
-    </para>
-
-    <para>
-      <option>--enable-compat-libdns_sd</option>: This option enables the
-      compatibility layer for <application>libdns_sd</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring avahi</title>
-
-    <sect3  id="avahi-init">
-      <title>Boot Script</title>
-
-      <para revision="sysv">
-        To automatically start the <command>avahi-daemon</command>
-        when the system is rebooted, install the
-        <filename>/etc/rc.d/init.d/avahi</filename> bootscript from
-        the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>avahi-daemon</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="avahi avahi-init">
-        <primary sortas="f-avahi">avahi</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-avahi</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable avahi-daemon</userinput></screen>
-
-      <para revision="systemd">
-        To start the <command>avahi-dnsconfd</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable avahi-dnsconfd</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>avahi-autoipd, avahi-browse, avahi-browse-domains,
-        avahi-daemon, avahi-discover-standalone, avahi-dnsconfd,
-        avahi-publish, avahi-publish-address, avahi-publish-service,
-        avahi-resolve, avahi-resolve-address, avahi-resolve-host-name,
-        avahi-set-host-name, bshell, bssh, and bvnc</seg>
-        <seg>libavahi-client.so, libavahi-common.so, libavahi-core.so,
-        libavahi-glib.so, libavahi-gobject.so, libavahi-libevent.so
-        libavahi-ui-gtk3.so, libavahi-qt5, libavahi-ui.so, libdns_sd.so, and
-        libhowl.so,</seg>
-        <seg>/etc/avahi/services, /usr/include/{avahi-client,avahi-common,
-        avahi-compat-howl, avahi-compat-libdns_sd, avahi-core, avahi-glib,
-        avahi-gobject, avahi-libevent, avahi-qt5, avahi-ui},
-        /usr/lib/avahi, /usr/share/avahi</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="avahi-autoipd">
-        <term><command>avahi-autoipd</command></term>
-        <listitem>
-          <para>
-            is a IPv4LL network address configuration daemon
-          </para>
-          <indexterm zone="avahi avahi-autoipd">
-            <primary sortas="b-avahi-autoipd">avahi-autoipd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="avahi-bookmarks">
-        <term><command>avahi-bookmarks</command></term>
-        <listitem>
-          <para>
-            is a Web service showing mDNS/DNS-SD announced HTTP services
-            using the <application>Avahi</application> daemon.
-          </para>
-          <indexterm zone="avahi avahi-bookmarks">
-            <primary sortas="b-avahi-bookmarks">avahi-bookmarks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="avahi-browse">
-        <term><command>avahi-browse</command></term>
-        <listitem>
-          <para>
-            browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon
-          </para>
-          <indexterm zone="avahi avahi-browse">
-            <primary sortas="b-avahi-browse">avahi-browse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-browse-domains">
-        <term><command>avahi-browse-domains</command></term>
-        <listitem>
-          <para>
-            browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon
-          </para>
-          <indexterm zone="avahi avahi-browse-domains">
-            <primary sortas="b-avahi-browse-domains">avahi-browse-domains</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-daemon">
-        <term><command>avahi-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>Avahi</application> mDNS/DNS-SD daemon
-          </para>
-          <indexterm zone="avahi avahi-daemon">
-            <primary sortas="b-avahi-daemon">avahi-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="avahi-discover">
-        <term><command>avahi-discover</command></term>
-        <listitem>
-          <para>
-            browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon.
-          </para>
-          <indexterm zone="avahi avahi-discover">
-            <primary sortas="b-avahi-discover">avahi-discover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="avahi-discover-standalone">
-        <term><command>avahi-discover-standalone</command></term>
-        <listitem>
-          <para>
-            browses for mDNS/DNS-SD services using the
-            <application>Avahi</application> daemon
-          </para>
-          <indexterm zone="avahi avahi-discover-standalone">
-            <primary sortas="b-avahi-discover-standalone">avahi-discover-standalone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-dnsconfd">
-        <term><command>avahi-dnsconfd</command></term>
-        <listitem>
-          <para>
-            is a Unicast DNS server from mDNS/DNS-SD configuration daemon
-          </para>
-          <indexterm zone="avahi avahi-dnsconfd">
-            <primary sortas="b-avahi-dnsconfd">avahi-dnsconfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-publish">
-        <term><command>avahi-publish</command></term>
-        <listitem>
-          <para>
-            registers a mDNS/DNS-SD service or host name or address mapping
-            using the <application>Avahi</application> daemon
-          </para>
-          <indexterm zone="avahi avahi-publish">
-            <primary sortas="b-avahi-publish">avahi-publish</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-publish-address">
-        <term><command>avahi-publish-address</command></term>
-        <listitem>
-          <para>
-            registers a mDNS/DNS-SD service or host name or address mapping
-            using the <application>Avahi</application> daemon
-          </para>
-          <indexterm zone="avahi avahi-publish-address">
-            <primary sortas="b-avahi-publish-address">avahi-publish-address</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-publish-service">
-        <term><command>avahi-publish-service</command></term>
-        <listitem>
-          <para>
-            registers a mDNS/DNS-SD service or host name or address mapping
-            using the <application>Avahi</application> daemon
-          </para>
-          <indexterm zone="avahi avahi-publish-service">
-            <primary sortas="b-avahi-publish-service">avahi-publish-service</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-resolve">
-        <term><command>avahi-resolve</command></term>
-        <listitem>
-          <para>
-            resolves one or more mDNS/DNS host name(s) to IP address(es)
-            (and vice versa) using the <application>Avahi</application>
-            daemon
-          </para>
-          <indexterm zone="avahi avahi-resolve">
-            <primary sortas="b-avahi-resolve">avahi-resolve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-resolve-address">
-        <term><command>avahi-resolve-address</command></term>
-        <listitem>
-          <para>
-            resolves one or more mDNS/DNS host name(s) to IP address(es)
-            (and vice versa) using the <application>Avahi</application>
-            daemon
-          </para>
-          <indexterm zone="avahi avahi-resolve-address">
-            <primary sortas="b-avahi-resolve-address">avahi-resolve-address</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-resolve-host-name">
-        <term><command>avahi-resolve-host-name</command></term>
-        <listitem>
-          <para>
-            resolves one or more mDNS/DNS host name(s) to IP address(es)
-            (and vice versa) using the <application>Avahi</application>
-            daemon
-          </para>
-          <indexterm zone="avahi avahi-resolve-host-name">
-            <primary sortas="b-avahi-resolve-host-name">avahi-resolve-host-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="avahi-set-host-name">
-        <term><command>avahi-set-host-name</command></term>
-        <listitem>
-          <para>
-            changes the mDNS host name
-          </para>
-          <indexterm zone="avahi avahi-set-host-name">
-            <primary sortas="b-avahi-set-host-name">avahi-set-host-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--<varlistentry id="bshell">
-        <term><command>bshell</command></term>
-        <listitem>
-          <para>
-            does this .....
-          </para>
-          <indexterm zone="avahi bshell">
-            <primary sortas="b-bshell">bshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="bssh">
-        <term><command>bssh</command></term>
-        <listitem>
-          <para>
-            browses for SSH servers on the local network
-          </para>
-          <indexterm zone="avahi bssh">
-            <primary sortas="b-bssh">bssh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bvnc">
-        <term><command>bvnc</command></term>
-        <listitem>
-          <para>
-            browses for VNC servers on the local network
-          </para>
-          <indexterm zone="avahi bvnc">
-            <primary sortas="b-bvnc">bvnc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--<varlistentry id="libavahi-client">
-        <term><filename class='libraryfile'>libavahi-client.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-client">
-            <primary sortas="c-libavahi-client">libavahi-client.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavahi-common">
-        <term><filename class='libraryfile'>libavahi-common.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-common">
-            <primary sortas="c-libavahi-common">libavahi-common.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavahi-core">
-        <term><filename class='libraryfile'>libavahi-core.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-core">
-            <primary sortas="c-libavahi-core">libavahi-core.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavahi-glib">
-        <term><filename class='libraryfile'>libavahi-glib.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-glib">
-            <primary sortas="c-libavahi-glib">libavahi-glib.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavahi-gobject">
-        <term><filename class='libraryfile'>libavahi-gobject.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-gobject">
-            <primary sortas="c-libavahi-gobject">libavahi-gobject.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavahi-ui-gtk3">
-        <term><filename class='libraryfile'>libavahi-ui-gtk3.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-ui-gtk3">
-            <primary sortas="c-libavahi-ui-gtk3">libavahi-ui-gtk3.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libavahi-ui">
-        <term><filename class='libraryfile'>libavahi-ui.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libavahi-ui">
-            <primary sortas="c-libavahi-ui">libavahi-ui.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdns_sd">
-        <term><filename class='libraryfile'>libdns_sd.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libdns_sd">
-            <primary sortas="c-libdns_sd">libdns_sd.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhowl">
-        <term><filename class='libraryfile'>libhowl.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="avahi libhowl">
-            <primary sortas="c-libhowl">libhowl.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bind-download-http   "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-download-ftp    " ">
-  <!ENTITY bind-md5sum          "&bind-md5;">
-  <!ENTITY bind-size            "5.3 MB">
-  <!ENTITY bind-utils-buildsize "94 MB">
-  <!ENTITY bind-utils-time      "0.3 SBU (using parallelism=4)">
-]>
-
-<sect1 id="bind-utils" xreflabel="BIND Utilities-&bind-version;">
-  <?dbhtml filename="bind-utils.html"?>
-
-
-  <title>BIND Utilities-&bind-version;</title>
-
-  <indexterm zone="bind-utils">
-    <primary sortas="a-BIND-Utilities">BIND Utilities</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to BIND Utilities</title>
-
-    <para>
-      <application>BIND Utilities</application> is not a separate
-      package, it is a collection of the client side programs that are included
-      with <xref linkend="bind"/>. The <application>BIND</application>
-      package includes the client side programs <command>nslookup</command>,
-      <command>dig</command> and <command>host</command>. If you install
-      <application>BIND</application> server, these programs will be installed
-      automatically. This section is for those users who don't need the complete
-      <application>BIND</application> server, but need these
-      client side applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bind-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bind-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bind-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bind-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bind-utils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bind-utils-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">BIND Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libuv"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="json-c"/> and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="sphinx"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of BIND Utilities</title>
-
-    <para>
-      Install <application>BIND Utilities</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make -C lib/isc    &amp;&amp;
-make -C lib/dns    &amp;&amp;
-make -C lib/ns     &amp;&amp;
-make -C lib/isccfg &amp;&amp;
-make -C lib/bind9  &amp;&amp;
-make -C lib/irs    &amp;&amp;
-make -C bin/dig    &amp;&amp;
-make -C doc</userinput></screen>
-
-    <para>
-      This portion of the 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 -C lib/isc    install &amp;&amp;
-make -C lib/dns    install &amp;&amp;
-make -C lib/ns     install &amp;&amp;
-make -C lib/isccfg install &amp;&amp;
-make -C lib/bind9  install &amp;&amp;
-make -C lib/irs    install &amp;&amp;
-make -C bin/dig    install &amp;&amp;
-cp -v doc/man/{dig.1,host.1,nslookup.1} /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-doh</option>: Use this option if you have not installed
-      <xref linkend="nghttp2" role="nodep"/> and you don't need DNS over HTTPS
-      support.
-    </para>
-
-    <para>
-      <command>make -C lib/...</command>: These commands build the
-      libraries that are needed for the client programs.
-    </para>
-
-    <para>
-      <command>make -C bin/dig</command>: This command builds the
-      client programs.
-    </para>
-
-    <para>
-      <command>make -C doc</command>: This command builds the
-      manual pages if the optional Python module
-      <xref linkend="sphinx"/> is installed.
-    </para>
-
-    <para>
-      Use <command>cp -v doc/man/{dig.1,host.1,nslookup.1} /usr/share/man/man1</command>
-      to install the manual pages if they have been built.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dig, host, and nslookup</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-
-    <para>
-      See the program descriptions in the <xref linkend="bind"/> section.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/netutils.xml
===================================================================
--- networking/netutils/netutils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="netutils">
-  <?dbhtml filename="netutils.html"?>
-
-  <title>Networking Utilities</title>
-
-  <para>
-    This chapter contains some tools that come in handy when the network
-    needs investigating.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="avahi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkmanager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="traceroute.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whois.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wicd.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireshark.xml"/>
-
-</chapter>
Index: tworking/netutils/network-manager-applet.xml
===================================================================
--- networking/netutils/network-manager-applet.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,255 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 network-manager-applet-download-http
-           "&gnome-download-http;/network-manager-applet/&network-manager-applet-minor;/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-download-ftp " ">
-  <!ENTITY network-manager-applet-md5sum    "83ff059aff3a691766d5f0079209e5af">
-  <!ENTITY network-manager-applet-size      "1.9 MB">
-  <!ENTITY network-manager-applet-buildsize "46 MB (with tests)">
-  <!ENTITY network-manager-applet-time      "0.4 SBU (with tests)">
-]>
-
-<sect1 id="network-manager-applet" xreflabel="network-manager-applet-&network-manager-applet-version;">
-  <?dbhtml filename="network-manager-applet.html"?>
-
-
-  <title>network-manager-applet-&network-manager-applet-version;</title>
-
-  <indexterm zone="network-manager-applet">
-    <primary sortas="a-network-manager-applet">network-manager-applet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NetworkManager Applet</title>
-
-    <para>
-      The <application>NetworkManager Applet</application> provides a tool and
-      a panel applet used to configure wired and wireless network connections
-      through GUI. It's designed for use with any desktop environment that uses
-      <application>GTK+</application>, such as <application>Xfce</application>
-       and <application>LXDE</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&network-manager-applet-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&network-manager-applet-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &network-manager-applet-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &network-manager-applet-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &network-manager-applet-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &network-manager-applet-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NetworkManager Applet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libnma"/>, and
-      <!--<xref linkend="libnotify"/>, and-->
-      <xref linkend="libsecret"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="ModemManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      Since this package uses
-      <xref role="nodep" linkend="polkit"/> for authorization,
-      one <xref role="runtime" linkend="polkit-agent"/> should be
-      running when the functionality of this package is used.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnome-bluetooth"/> and
-      <ulink url="https://launchpad.net/libappindicator">libindicator</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NetworkManager Applet</title>
-
-    <para>
-      Install <application>NetworkManager Applet</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dappindicator=no   \
-      -Dselinux=false     &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>
-      <parameter>-Dappindicator=no</parameter>: This switch disables
-      AppIndicator support in network-manager-applet because it
-      requires libindicator, which is not in BLFS. The build will fail
-      without this option.
-    </para>
-
-    <!-- Jansson is now included in NM as Required
-    <para>
-      <parameter>-Dteam=false</parameter>: This switch disables the team
-      configuration editor since it requires <xref linkend="jansson"/>. If
-      you have Jansson installed, remove this option or set it to "true".
-    </para>
-    -->
-
-    <para>
-      <parameter>-Dselinux=false</parameter>: This switch forcibly
-      disables <application>SELinux</application> support since it is not
-      currently in BLFS and the build will fail without it.
-    </para>
-
-    <!-- no longer needed as of 1.16.0
-    <para>
-      <parameter>-Dmobile_broadband_provider_info=false</parameter>: This
-      switch forcibly disables Mobile Broadband Provider support because it
-      is not currently available in BLFS.
-    </para>
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Remove this if you have
-      <xref linkend="gtk-doc"/> installed and want to rebuild the
-      documentation with it.
-    </para>
-    -->
-
-    <para>
-      <option>-Dwwan=false</option>: This switch disables WWAN support.
-      Use this if you do not have <xref linkend="ModemManager"/> installed.
-   </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nm-applet and nm-connection-editor
-        </seg>
-        <seg>
-          <!--libnma.so-->
-          None
-        </seg>
-        <seg>
-          <!--/usr/include/{libnma,libnm-gtk},-->
-          <!--/usr/include/libnma and /usr/share/gtk-doc/libnma-->
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nm-connection-editor">
-        <term><command>nm-connection-editor</command></term>
-        <listitem>
-          <para>
-            allows users to view and edit network connection settings
-          </para>
-          <indexterm zone="network-manager-applet nm-connection-editor">
-            <primary sortas="b-nm-connection-editor">nm-connection-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!--
-      <varlistentry id="libnma">
-        <term><filename class="libraryfile">libnma.so</filename></term>
-        <listitem>
-          <para>
-            contains internal functions for the
-            <application>Network Manager GTK+ Interface</application>.
-          </para>
-          <indexterm zone="network-manager-applet libnma">
-            <primary sortas="c-libnma">libnma.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-Moved to a separate library, libnma, in 1.16.0
--->
-<!--
-      <varlistentry id="libnm-gtk">
-        <term><filename class="libraryfile">libnm-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>NetworkManager</application>
-            <application>GTK+</application> bindings.
-          </para>
-          <indexterm zone="network-manager-applet libnm-gtk">
-            <primary sortas="c-libnm-gtk">libnm-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/networkmanager-test-kernel.xml
===================================================================
--- networking/netutils/networkmanager-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    [*]   <emphasis role='blue'>T</emphasis>CP/IP networking                                               [INET]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P: tunneling                                             [NET_IPIP]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P: GRE demultiplexer                              [NET_IPGRE_DEMUX]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P: GRE tunnels over IP                                  [NET_IPGRE]
-    &lt;*&gt;     <emphasis role='blue'>T</emphasis>he IPv6 protocol ---&gt;                                        [IPV6]
-      &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>Pv6: IPv6-in-IPv4 tunnel (SIT driver)                  [IPV6_SIT]
-      &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>Pv6: GRE tunnel                                        [IPV6_GRE]
-      [*]     <emphasis role='blue'>I</emphasis>Pv6: Multiple Routing Tables               [IPV6_MULTIPLE_TABLES]
-    [*]     M<emphasis role='blue'>P</emphasis>TCP: Multipath TCP                                         [MPTCP]
-    [*]       M<emphasis role='blue'>P</emphasis>TCP: IPv6 support for Multipath TCP                 [MPTCP_IPV6]
-    &lt;*/M&gt; 802.1<emphasis role='blue'>Q</emphasis>/802.1ad VLAN Support                               [VLAN_8021Q]
-    [*]   <emphasis role='blue'>Q</emphasis>oS and/or fair queueing ---&gt;                              [NET_SCHED]
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>tochastic Fairness Queueing (SFQ)                       [NET_SCH_SFQ]
-      &lt;*&gt; <emphasis role='blue'>T</emphasis>oken Bucket Filter (TBF)                                [NET_SCH_TBF]
-      &lt;*&gt; <emphasis role='blue'>F</emphasis>air Queue Controlled Delay AQM (FQ_CODEL)          [NET_SCH_FQ_CODEL]
-      &lt;*&gt; <emphasis role='blue'>I</emphasis>ngress/classifier-action Qdisc                      [NET_SCH_INGRESS]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork device support ---&gt;                                   [NETDEVICES]
-    [*]   N<emphasis role='blue'>e</emphasis>twork core driver support                                 [NET_CORE]
-    &lt;*/M&gt;   <emphasis role='blue'>B</emphasis>onding driver support                                     [BONDING]
-    &lt;*/M&gt;   <emphasis role='blue'>D</emphasis>ummy net driver support                                     [DUMMY]
-    &lt;*/M&gt;   <emphasis role='blue'>E</emphasis>thernet team driver support ---&gt;                         [NET_TEAM]
-    &lt;*/M&gt;   M<emphasis role='blue'>A</emphasis>C-VLAN support                                           [MACVLAN]
-    &lt;*/M&gt;     M<emphasis role='blue'>A</emphasis>C-VLAN based tap driver                                [MACVTAP]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>P-VLAN support                                             [IPVLAN]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual eXtensible Local Area Network (VXLAN)                [VXLAN]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual ethernet pair device                                  [VETH]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>irtual Routing and Forwarding (Lite)                      [NET_VRF]</screen>
Index: tworking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,673 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 NetworkManager-download-http
-"&gnome-download-http;/NetworkManager/&NetworkManager-minor;/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-download-ftp  " ">
-  <!ENTITY NetworkManager-md5sum        "0594a237e7182341dd39cf465b1b60fe">
-  <!ENTITY NetworkManager-size          "6.7 MB">
-  <!ENTITY NetworkManager-buildsize     "936 MB (with tests and documentation)">
-  <!ENTITY NetworkManager-time          "0.8 SBU (with tests, using parallelism=4)">
-]>
-
-<sect1 id="NetworkManager" xreflabel="NetworkManager-&NetworkManager-version;">
-  <?dbhtml filename="networkmanager.html"?>
-
-
-  <title>NetworkManager-&NetworkManager-version;</title>
-
-  <indexterm zone="NetworkManager">
-    <primary sortas="a-NetworkManager">NetworkManager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NetworkManager</title>
-
-    <para>
-      <application>NetworkManager</application> is a set of co-operative
-      tools that make networking simple and straightforward. Whether you use WiFi,
-      wired, 3G, or Bluetooth, NetworkManager allows you to quickly move from
-      one network to another: Once a network has been configured and joined
-      once, it can be detected and re-joined automatically the next time it's
-      available.
-    </para>
-
-    &lfs121_checked;
-
-    <note revision="systemd">
-      <para>
-        Make sure that you disable the <command>systemd-networkd</command>
-        service or configure it not to manage the interfaces you want to manage
-        with <application>NetworkManager</application>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&NetworkManager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&NetworkManager-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &NetworkManager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &NetworkManager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &NetworkManager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &NetworkManager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NetworkManager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libndp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>,
-      <xref linkend="dhcpcd"/>,
-      &gobject-introspection;,
-      <xref linkend="iptables"/>,
-      <xref linkend="libpsl"/>,
-      <xref linkend="newt"/> (for <command>nmtui</command>),
-      <xref linkend="nss"/>,
-      <xref role='runtime' linkend="polkit"/> (runtime),
-      <xref linkend="pygobject3"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <phrase revision="systemd"><xref linkend="systemd"/>,</phrase>
-      <xref linkend="vala"/>, and
-      <xref linkend="wpa_supplicant"/> (runtime, built with D-Bus support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="dbus-python"/> (for the test suite),
-      <!-- <xref linkend="firewalld"/> (For whenever firewalld is reintroduced) -->
-      <xref linkend="gnutls"/> (can be used instead of <xref linkend="nss"/>),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="jansson"/>,
-      <xref linkend="ModemManager"/>,
-      (<xref linkend="qt5"/> or
-       <xref role="node" linkend="qt5-components"/> with qtdoc) (for examples),
-      <xref linkend="upower"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</ulink>,
-      <ulink url="https://firewalld.org/">firewalld</ulink>,
-      <ulink url="https://github.com/Distrotech/libaudit">libaudit</ulink>,
-      <ulink url="https://github.com/jpirko/libteam">libteam</ulink>,
-      <ulink url="&gnome-download-http;/mobile-broadband-provider-info/">mobile-broadband-provider-info</ulink>,
-      <ulink url="https://www.samba.org/ftp/ppp/">PPP</ulink>, and
-      <ulink url="https://dianne.skoll.ca/projects/rp-pppoe/">RP-PPPoE</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="NetworkManager-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If you wish to run the tests, check that at least the following options
-      are enabled in the kernel configuration. Those options have been
-      determined to be necessary, but may not be sufficient. Recompile the
-      kernel if necessary:
-    </para>
-
-    <!-- Ethernet Teaming support is potentially optional, but I didn't
-         run the tests again to test that. It was needed to convince one of
-         the Linux Platform tests to move farther along because otherwise
-         RTNETLINK would respond with an Error 95 - unknown device type.
-         This would cause the test to fail early on in the process.
-
-         [pierre, Nov 2022]: I cannot tell whether these options are
-         the only ones that are needed. They are the options I had to add
-         in order to have some tests pass. But I already had some other
-         options set for packet filtering (iptables), that may not be
-         available by default and may be necessary. Even with the options
-         below still one test (test-route) fails.-->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="networkmanager-test-kernel.xml"/>
-
-    <indexterm zone="NetworkManager NetworkManager-kernel">
-      <primary sortas="d-NetworkManager">NetworkManager (test)</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NetworkManager</title>
-
-    <para>
-      If <xref linkend="qt5"/> is installed and the Qt based
-      examples are desired, fix two meson.build files:
-    </para>
-
-<screen><userinput>sed -e 's/-qt4/-qt5/'              \
-    -e 's/moc_location/host_bins/' \
-    -i examples/C/qt/meson.build   &amp;&amp;
-
-sed -e 's/Qt/&amp;5/'                  \
-    -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>
--->
-
-    <para>
-      Fix the python scripts so that they use <application>Python
-      3</application>:
-    </para>
-
-<screen><userinput>grep -rl '^#!.*python$' | xargs sed -i '1s/python/&amp;3/'</userinput></screen>
-
-    <para>
-      Install <application>NetworkManager</application> by running the
-      following commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-CXXFLAGS+="-O2 -fPIC"            \
-meson setup ..                   \
-      --prefix=/usr              \
-      --buildtype=release        \
-      -Dlibaudit=no              \
-      -Dnmtui=true               \
-      -Dovs=false                \
-      -Dppp=false                \
-      -Dselinux=false            \
-      -Dsession_tracking=elogind \
-      -Dmodem_manager=false      \
-      -Dsystemdsystemunitdir=no  \
-      -Dsystemd_journal=false    \
-      -Dqt=false                 &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build    &amp;&amp;
-
-CXXFLAGS+="-O2 -fPIC"            \
-meson setup ..                   \
-      --prefix=/usr              \
-      --buildtype=release        \
-      -Dlibaudit=no              \
-      -Dnmtui=true               \
-      -Dovs=false                \
-      -Dppp=false                \
-      -Dselinux=false            \
-      -Dqt=false                 \
-      -Dsession_tracking=systemd \
-      -Dmodem_manager=false      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      An already active graphical session with a bus address is necessary
-      to run the tests. To test the results, issue
-      <command>ninja test</command>.
-    </para>
-
-    <para>
-      A few tests may fail, depending on enabled kernel options.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-mv -v /usr/share/doc/NetworkManager{,-&NetworkManager-version;}</userinput></screen>
-
-    <para>
-      If you have not passed the <option>-Ddocs=true</option> option to
-      <command>meson</command>, you can install the pregenerated manual pages
-      with (as the &root; user):
-    </para>
-
-<screen role="root"><userinput>for file in $(echo ../man/*.[1578]); do
-    section=${file##*.} &amp;&amp;
-    install -vdm 755 /usr/share/man/man$section
-    install -vm 644 $file /usr/share/man/man$section/
-done</userinput></screen>
-
-    <para>
-      If you have not used <option>-Ddocs=true</option>, the
-      pregenerated HTML documentation can also be installed with (as
-      the &root; user):
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>cp -Rv ../docs/{api,libnm} /usr/share/doc/NetworkManager-&NetworkManager-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>CXXFLAGS="-O2 -fPIC"</envar>: These compiler options are
-      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>
-      <option>-Ddocs=true</option>: Use this switch to enable building
-      man pages and documentation if <xref linkend="gtk-doc"/> is installed.
-    </para>
-
-    <para>
-      <parameter>-Dnmtui=true</parameter>: This switch enables building
-      <command>nmtui</command>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemdsystemunitdir=no</parameter> and
-      <parameter>-Dsystemd_journal=false</parameter>: systemd is not
-      used for sysv init systems, so prevent installing units and using the
-      systemd journal.
-    </para>
-
-    <para>
-      <parameter>-Dovs=false</parameter>: This switch disable the Open
-      vSwitch integration because it needs <xref linkend='jansson'/>.
-      Remove it if you have <xref linkend='jansson'/> installed on your
-      system.
-    </para>
-
-    <para>
-      <parameter>-Dmodem_manager=false</parameter>: This switch is required if
-      <application>ModemManager</application> is not installed. Omit this switch
-      if you have built <application>ModemManager</application> and
-      <application>mobile-broadband-provider-info</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsession_tracking=elogind</parameter>: This switch
-      is used to set <command>elogind</command> as the default
-      program for session tracking.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-Dsession_tracking=systemd</parameter>: This switch
-      is used to set <command>systemd-logind</command> as the default
-      program for session tracking.
-    </para>
-<!-- not in instrucitons anymore
-    <para revision="systemd">
-      <parameter>-Dsystemdsystemunitdir=/lib/systemd/system</parameter>:
-      This switch is used to set the correct installation directory for
-      systemd units.
-    </para>
--->
-    <para>
-      <parameter>-Dppp=false</parameter>: This switch disables
-      <application>PPP</application> support in
-      <application>NetworkManager</application> since the programs necessary
-      for it are not installed. Remove this switch if you need PPP support and
-      have <application>PPP</application> installed.
-    </para>
-
-    <para>
-      <parameter>-Dlibaudit=no</parameter> and
-      <parameter>-Dselinux=false</parameter>: This switch disables support for
-      libaudit and SELinux since they are not used in BLFS.
-    </para>
-
-    <para>
-      <parameter>-Dqt=false</parameter>: This switch disables the
-      <application>Qt</application> examples. Omit if you have
-      <application>Qt</application> available and wish to install the examples.
-    </para>
-
-    <para>
-      <option>-Dcrypto=gnutls</option>: Use this switch if you have GnuTLS
-      installed and want to use it for certificate and key operations in
-      NetworkManager, instead of using NSS (the default).
-    </para>
-
-    <para>
-      <option>-Dcrypto=null</option>: Use this switch if neither NSS nor
-      GnuTLS is installed but you want to build NetworkManager anyway.  This
-      switch will make NetworkManager lack some features (for example
-      802.1X).
-    </para>
-
-    <para>
-      <option>-Dsuspend_resume=upower</option>: Use this switch if
-      you have <xref linkend='upower'/> installed and want to use it
-      (instead of &logind;) for suspend and resume support.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NetworkManager</title>
-
-    <sect3 id="NetworkManager-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/NetworkManager/NetworkManager.conf</filename>
-      </para>
-
-      <indexterm zone="NetworkManager NetworkManager-config">
-        <primary
-        sortas="e-etc-NetworkManager-NetworkManager.conf">
-        /etc/NetworkManager/NetworkManager.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        For <application>NetworkManager</application> to work, at least
-        a minimal configuration file must be present. Such a file is not
-        installed with <command>make install</command>. Issue the following
-        command as the <systemitem class="username">root</systemitem> user to
-        create a minimal <filename>NetworkManager.conf</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/NetworkManager/NetworkManager.conf &lt;&lt; "EOF"
-<literal>[main]
-plugins=keyfile</literal>
-EOF</userinput></screen>
-
-      <para>
-        This file should not be modified directly by users of the system.
-        Instead, system specific changes should be made using configuration
-        files in the
-        <filename class="directory">/etc/NetworkManager/conf.d</filename>
-        directory.
-      </para>
-
-      <para>
-        To allow polkit to manage authorizations, add the following
-        configuration file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/NetworkManager/conf.d/polkit.conf &lt;&lt; "EOF"
-<literal>[main]
-auth-polkit=true</literal>
-EOF</userinput></screen>
-
-      <para>
-        To use something other than the built-in dhcp client (recommended if
-        using only <command>nmcli</command>), use the following configuration
-        (valid values include either dhcpcd or internal):
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/NetworkManager/conf.d/dhcp.conf &lt;&lt; "EOF"
-<literal>[main]
-dhcp=</literal><replaceable>dhcpcd</replaceable>
-EOF</userinput></screen>
-
-      <para>
-        To prevent <application>NetworkManager</application> from updating the
-        <filename>/etc/resolv.conf</filename> file, add the following
-        configuration file:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/NetworkManager/conf.d/no-dns-update.conf &lt;&lt; "EOF"
-<literal>[main]
-dns=none</literal>
-EOF</userinput></screen>
-
-      <para>
-        For additional configuration options, see
-        <command>man 5 NetworkManager.conf</command>.
-      </para>
-
-      <para>
-        To allow regular users to configure network connections,
-        you should add them to the
-        <systemitem class="groupname">netdev</systemitem>
-        group, and create a <application>polkit</application> rule that grants
-        access. Run the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>groupadd -fg 86 netdev &amp;&amp;
-/usr/sbin/usermod -a -G netdev <replaceable>&lt;username&gt;</replaceable>
-
-cat &gt; /usr/share/polkit-1/rules.d/org.freedesktop.NetworkManager.rules &lt;&lt; "EOF"
-<literal>polkit.addRule(function(action, subject) {
-    if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 &amp;&amp; subject.isInGroup("netdev")) {
-        return polkit.Result.YES;
-    }
-});</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="NetworkManager-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To automatically start the <command>NetworkManager</command> daemon
-        when the system is rebooted, install the
-        <filename>/etc/rc.d/init.d/networkmanager</filename>bootscript from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>NetworkManager</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <note>
-        <para>
-          If using <application>Network Manager</application> to manage
-          an interface, any previous configuration for that interface should be
-          removed, and the interface brought down prior to starting
-          <application>Network Manager</application>.
-        </para>
-      </note>
-
-      <indexterm zone="NetworkManager NetworkManager-init">
-        <primary sortas="f-NetworkManager">NetworkManager</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-networkmanager</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable NetworkManager</userinput></screen>
-<!-- The below instruction is obsolete. NetworkManager-wait-online is now
-     enabled by default when enabling NetworkManager. -->
-<!--
-      <para revision="systemd">
-        <application>NetworkManager</application> also ships a systemd unit
-        called <filename>NetworkManager-wait-online.service</filename> which
-        can be used to prevent services that require network connectivity
-        from starting until <application>NetworkManager</application> has
-        established the connection. To enable it, run the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable NetworkManager-wait-online</userinput></screen>
-   -->
-      <!-- As such, let's now provide instructions on how to disable that
-           behavior, for those who wish to do so. -->
-      <para revision="systemd">
-        Starting in version 1.11.2 of <application>NetworkManager</application>,
-        a systemd unit named <filename>NetworkManager-wait-online.service</filename>
-        is enabled, which is used to prevent services that require network
-        connectivity from starting until <application>NetworkManager</application>
-        establishes a connection. To disable this behavior, run the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl disable NetworkManager-wait-online</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>
-          NetworkManager, nmcli, nm-online, nmtui, and, symlinked to nmtui:
-          nmtui-connect, nmtui-edit, and nmtui-hostname
-        </seg>
-        <seg>
-          libnm.so
-          and several modules under /usr/lib/NetworkManager
-        </seg>
-        <seg>
-          /etc/NetworkManager,
-          /usr/include/libnm,
-          /usr/lib/NetworkManager,
-          /usr/share/doc/NetworkManager-&NetworkManager-version;,
-          /usr/share/gtk-doc/html/{libnm,NetworkManager}
-          (if the documentation is built),
-          and
-          /var/lib/NetworkManager
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nmcli">
-        <term><command>nmcli</command></term>
-        <listitem>
-          <para>
-            is a command-line tool for controlling
-            <application>NetworkManager</application>
-            and getting its status
-          </para>
-          <indexterm zone="NetworkManager nmcli">
-            <primary sortas="b-nmcli">nmcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nm-online">
-        <term><command>nm-online</command></term>
-        <listitem>
-          <para>
-            is an utility to determine whether you are online
-          </para>
-          <indexterm zone="NetworkManager nm-online">
-            <primary sortas="b-nm-online">nm-online</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmtui">
-        <term><command>nmtui</command></term>
-        <listitem>
-          <para>
-            is an interactive ncurses-based user interface for
-            <application>nmcli</application>
-          </para>
-          <indexterm zone="NetworkManager nmtui">
-            <primary sortas="b-nmtui">nmtui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmtui-connect">
-        <term><command>nmtui-connect</command></term>
-        <listitem>
-          <para>
-            is an interactive ncurses-based user interface to
-            activate/deactivate connections
-          </para>
-          <indexterm zone="NetworkManager nmtui-connect">
-            <primary sortas="b-nmtui-connect">nmtui-connect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmtui-edit">
-        <term><command>nmtui-edit</command></term>
-        <listitem>
-          <para>
-            is an interactive ncurses-based user interface to edit connections
-          </para>
-          <indexterm zone="NetworkManager nmtui-edit">
-            <primary sortas="b-nmtui-edit">nmtui-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmtui-hostname">
-        <term><command>nmtui-hostname</command></term>
-        <listitem>
-          <para>
-            is an interactive ncurses-based user interface to edit the hostname
-          </para>
-          <indexterm zone="NetworkManager nmtui-hostname">
-            <primary sortas="b-nmtui-hostname">nmtui-hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="NetworkManager-prog">
-        <term><command>NetworkManager</command></term>
-        <listitem>
-          <para>
-            is the network management daemon
-          </para>
-          <indexterm zone="NetworkManager NetworkManager-prog">
-            <primary sortas="b-NetworkManager">NetworkManager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnm">
-        <term><filename class="libraryfile">libnm.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by <application>NetworkManager</application>
-          </para>
-          <indexterm zone="NetworkManager libnm">
-            <primary sortas="c-libnm">libnm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,282 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nmap-download-http "https://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
-  <!ENTITY nmap-download-ftp  " ">
-  <!ENTITY nmap-md5sum        "b481d293e53b20278d5370458da9a950">
-  <!ENTITY nmap-size          "11 MB">
-  <!ENTITY nmap-buildsize     "116 MB (add 38 MB for tests)">
-  <!ENTITY nmap-time          "0.4 SBU (Using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="nmap" xreflabel="Nmap-&nmap-version;">
-  <?dbhtml filename="nmap.html"?>
-
-
-  <title>Nmap-&nmap-version;</title>
-
-  <indexterm zone="nmap">
-    <primary sortas="a-Nmap">Nmap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nmap</title>
-
-    <para>
-      <application>Nmap</application> is a utility for network exploration
-      and security auditing. It supports ping scanning, port scanning and
-      TCP/IP fingerprinting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nmap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nmap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nmap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nmap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nmap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nmap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Recommended patch: <ulink url=
-            "&patch-root;/nmap-&nmap-version;-pcre_2-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Nmap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <note>
-      <para>
-        These packages are recommended because if they're not installed, the
-        build process will compile and link against its own (often older)
-        version.
-      </para>
-    </note>
-
-    <para role="recommended">
-      <xref linkend="liblinear"/>,
-      <xref linkend="libpcap"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="pcre2"/>, and
-      <xref linkend="pygobject3"/>
-<!--  libdnet is not recommended, see:
-      http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
--->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://code.google.com/p/libdnet/">libdnet</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nmap</title>
-
-    <para>
-      First, if it is not already installed, add a needed Python module.
-      As the &root; user:
-    </para>
-
-<screen role="root"><userinput>pip3 install build</userinput></screen>
-
-    <para>
-      Install <application>Nmap</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the test suite, run the following command:
-    </para>
-
-    <screen><userinput>sed -e '/import imp/d'                \
-    -e 's/^ndiff = .*$/import ndiff/' \
-    -i ndiff/ndifftest.py</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command> as the
-      <systemitem class="username">root</systemitem> user. Tests need a
-      graphical session.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ncat, ndiff, nmap, nping, uninstall_ndiff, uninstall_zenmap,
-          zenmap, and 2 symlinks to zenmap: nmapfe and xnmap
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/{radialnet,zenmapCore,zenmapGUI,zenmap-&nmap-version;-py&python3-majorver;.egg-info},
-          and /usr/share/{ncat,nmap,zenmap}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ncat">
-        <term><command>ncat</command></term>
-        <listitem>
-          <para>
-            is a utility for reading and writing data across networks from
-            the command line
-          </para>
-          <indexterm zone="nmap ncat">
-            <primary sortas="b-ncat">ncat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ndiff">
-        <term><command>ndiff</command></term>
-        <listitem>
-          <para>
-            is a tool to aid in the comparison of Nmap scans
-          </para>
-          <indexterm zone="nmap ndiff">
-            <primary sortas="b-ndiff">ndiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmap-prog">
-        <term><command>nmap</command></term>
-        <listitem>
-          <para>
-            is a utility for network exploration and security auditing. It
-            supports ping scanning, port scanning and TCP/IP fingerprinting
-          </para>
-          <indexterm zone="nmap nmap-prog">
-            <primary sortas="b-nmap">nmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- removed in 7.90, see CHANGELOG
-      <varlistentry id="nmap-update">
-        <term><command>nmap-update</command></term>
-        <listitem>
-          <para>
-            is an updater for Nmap architecture-independent files.
-          </para>
-          <indexterm zone="nmap nmap-update">
-            <primary sortas="b-nmap-update">nmap-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="nping">
-        <term><command>nping</command></term>
-        <listitem>
-          <para>
-            is an open-source tool for network packet generation, response
-            analysis and response time measurement
-          </para>
-          <indexterm zone="nmap nping">
-            <primary sortas="b-nping">nping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uninstall_ndiff">
-        <term><command>uninstall_ndiff</command></term>
-        <listitem>
-          <para>
-            is a Python script to uninstall <command>ndiff</command>
-          </para>
-          <indexterm zone="nmap uninstall_ndiff">
-            <primary sortas="b-uninstall_ndiff">uninstall_ndiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uninstall_zenmap">
-        <term><command>uninstall_zenmap</command></term>
-        <listitem>
-          <para>
-            is a Python script to uninstall <command>zenmap</command>
-          </para>
-          <indexterm zone="nmap uninstall_zenmap">
-            <primary sortas="b-uninstall_zenmap">uninstall_zenmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zenmap">
-        <term><command>zenmap</command></term>
-        <listitem>
-          <para>
-            is a Python based graphical nmap frontend viewer
-          </para>
-          <indexterm zone="nmap zenmap">
-            <primary sortas="f-zenmap">zenmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/traceroute.xml
===================================================================
--- networking/netutils/traceroute.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 traceroute-download-http "&sourceforge-dl;/traceroute/traceroute-&traceroute-version;.tar.gz">
-  <!ENTITY traceroute-download-ftp  " ">
-  <!ENTITY traceroute-md5sum        "6599a83531ecb31275ff7906349c0970">
-  <!ENTITY traceroute-size          "76 KB">
-  <!ENTITY traceroute-buildsize     "624 KB">
-  <!ENTITY traceroute-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="traceroute" xreflabel="Traceroute-&traceroute-version;">
-  <?dbhtml filename="traceroute.html"?>
-
-
-  <title>Traceroute-&traceroute-version;</title>
-
-  <indexterm zone="traceroute">
-    <primary sortas="a-Traceroute">Traceroute</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Traceroute</title>
-
-    <para>
-      The <application>Traceroute</application> package contains a program
-      which is used to display the network route that packets take to reach a
-      specified host. This is a standard network troubleshooting tool. If you
-      find yourself unable to connect to another system, traceroute can help
-      pinpoint the problem.
-    </para>
-
-    <note>
-      <para>
-        This package overwrites the version of <command>traceroute</command>
-        that was installed in the inetutils package in LFS. This version is
-        more powerful and allows many more options than the standard version.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&traceroute-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&traceroute-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &traceroute-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &traceroute-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &traceroute-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &traceroute-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Traceroute</title>
-
-    <para>
-      Install <application>Traceroute</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>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 prefix=/usr install                                 &amp;&amp;
-ln -sv -f traceroute /usr/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>
-
-    <para>
-      The traceroute.1 file that was installed in LFS
-      by inetutils is no longer relevant.  This package overwrites
-      that version of traceroute and installs the man page in man
-      chapter 8.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>traceroute and traceroute6 (symlink)</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="traceroute-prog">
-        <term><command>traceroute</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="traceroute traceroute-prog">
-            <primary sortas="b-traceroute">traceroute</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="traceroute6-prog">
-        <term><command>traceroute6</command></term>
-        <listitem>
-          <para>
-            is equivalent to <command>traceroute -6</command>
-          </para>
-          <indexterm zone="traceroute traceroute6-prog">
-            <primary sortas="b-traceroute6">traceroute6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/whois.xml
===================================================================
--- networking/netutils/whois.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 whois-download-http "https://github.com/rfc1036/whois/archive/v&whois-version;/whois-&whois-version;.tar.gz">
-  <!ENTITY whois-download-ftp  " ">
-  <!ENTITY whois-md5sum        "381dce8db7c6e38ef013b5d6527f494c">
-  <!ENTITY whois-size          "100 KB">
-  <!ENTITY whois-buildsize     "1.2 MB">
-  <!ENTITY whois-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="whois" xreflabel="Whois-&whois-version;">
-  <?dbhtml filename="whois.html"?>
-
-
-  <title>Whois-&whois-version;</title>
-
-  <indexterm zone="whois">
-    <primary sortas="a-Whois">Whois</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Whois</title>
-
-    <para>
-      <application>Whois</application> is a client-side application which
-      queries the whois directory service for information pertaining to a
-      particular domain name. This package will install two programs by default:
-      <command>whois</command> and <command>mkpasswd</command>. The
-      <command>mkpasswd</command> command is also installed by the
-      expect package in LFS.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&whois-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&whois-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &whois-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &whois-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &whois-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &whois-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Whois Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libidn"/> or
-      <xref linkend="libidn2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Whois</title>
-
-    <para>
-      Build the application with:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      You can install the <command>whois</command> program, the
-      <command>mkpasswd</command> program, and the locale files independently.
-      Control your choice of what is installed with the following commands
-      issued as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <note>
-      <para>
-        Installing this version of <command>mkpasswd</command> will
-        overwrite the same command installed in LFS.
-      </para>
-    </note>
-
-<!-- dev note: make BASEDIR=<DESTDIR> prefix=/usr install-whois -->
-
-<screen role="root"><userinput>make prefix=/usr install-whois
-make prefix=/usr install-mkpasswd
-make prefix=/usr install-pos</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>whois and mkpasswd</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="whois-prog">
-        <term><command>whois</command></term>
-        <listitem>
-          <para>
-            is a client-side application which queries the whois directory
-            service for information pertaining to a particular domain name
-          </para>
-          <indexterm zone="whois whois-prog">
-            <primary sortas="b-whois">whois</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="mkpasswd-whois">
-        <term><command>mkpasswd</command></term>
-        <listitem>
-          <para>
-            generates a new password, and optionally applies it to a user
-          </para>
-          <indexterm zone="whois mkpasswd-whois">
-            <primary sortas="b-mkpasswd-whois">mkpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netutils/wireshark-kernel.xml
===================================================================
--- networking/netutils/wireshark-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>P</emphasis>acket socket                                                 [PACKET]</screen>
Index: tworking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,588 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.xz">
-  <!ENTITY wireshark-download-ftp  " ">
-  <!ENTITY wireshark-md5sum        "cebb012489563a8eb9c3829cdcb0579c">
-  <!ENTITY wireshark-size          "43 MB">
-  <!ENTITY wireshark-buildsize     "910 MB (with all optional dependencies available in the BLFS book; 170 MB installed)">
-  <!ENTITY wireshark-time          "3.3 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
-]>
-
-<!-- Gentle 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;">
-  <?dbhtml filename="wireshark.html"?>
-
-
-  <title>Wireshark-&wireshark-version;</title>
-
-  <indexterm zone="wireshark">
-    <primary sortas="a-Wireshark">Wireshark</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wireshark</title>
-
-    <para>
-      The <application>Wireshark</application> package contains a network
-      protocol analyzer, also known as a <quote>sniffer</quote>. This is useful
-      for analyzing data captured <quote>off the wire</quote> from a live
-      network connection, or data read from a capture file.
-    </para>
-
-    <para>
-      <application>Wireshark</application> provides both a graphical and a
-      TTY-mode front-end for examining captured network packets from over 500
-      protocols, as well as the capability to read capture files from many
-      other popular network analyzers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wireshark-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wireshark-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wireshark-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wireshark-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wireshark-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wireshark-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-    <!--
-      <listitem>
-        <para>
-          Required patch to build with Python-3.12:
-          <ulink url="&patch-root;/wireshark-&wireshark-version;-py_3.12_fix-1.patch"/>
-        </para>
-      </listitem>
-    -->
-      <listitem>
-        <para>
-          Additional Documentation:
-          <ulink url="https://www.wireshark.org/download/docs/"/>
-          (contains links to several different docs in a variety of formats)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wireshark dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="c-ares"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="libgcrypt"/>, 
-      <xref linkend="qt6"/>, and
-      <xref linkend="speex"/>
-    </para>
-
-    <note>
-      <para>
-        <xref linkend="qt6"/> is not strictly required, since it can be
-        replaced with <application>Qt5</application>. See <quote>Command
-        explanations</quote> below.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libpcap"/> (required to capture data)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoctor"/>,
-      <xref linkend="brotli"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="git"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libnl"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lua52"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="nghttp2"/>,
-      (<xref linkend="qt5"/> or
-      <xref role="nodep" linkend="qt5-components"/> with qtmultimedia)
-      (required if <xref role="nodep" linkend="qt6"/> is not installed),
-      <xref linkend="sbc"/>,
-      <ulink url="https://www.linphone.org/technical-corner/bcg729">BCG729</ulink>,
-      <ulink url="https://github.com/TimothyGu/libilbc">libilbc</ulink>,
-      <ulink url="https://www.ibr.cs.tu-bs.de/projects/libsmi/">libsmi</ulink>,
-      <ulink url="https://www.libssh.org/">libssh</ulink>,
-      <ulink url="https://github.com/maxmind/libmaxminddb">MaxMindDB</ulink>,
-      <ulink url="https://www.winimage.com/zLibDll/minizip.html">Minizip</ulink>,
-      <ulink url="https://google.github.io/snappy/">Snappy</ulink>, and
-      <ulink url="https://github.com/freeswitch/spandsp">Spandsp</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="wireshark-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      The kernel must have the Packet protocol enabled for <application>
-      Wireshark</application> to capture live packets from the network:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="wireshark-kernel.xml"/>
-
-    <para>
-      If built as a module, the name is <filename>af_packet.ko</filename>.
-    </para>
-
-    <indexterm zone="wireshark wireshark-kernel">
-      <primary sortas="d-Capturing-network-packets">
-        Capturing network packets
-      </primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wireshark</title>
-
-    <para>
-      <application>Wireshark</application> is a very large and complex
-      application. These instructions provide additional security measures to
-      ensure that only trusted users are allowed to view network traffic. First,
-      set up a system group for wireshark.  As the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 62 wireshark</userinput></screen>
-
-    <para>
-      Continue to install <application>Wireshark</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  \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/wireshark-&wireshark-version; \
-      -G Ninja \
-      .. &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 &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
-install -v -m644    ../README.linux ../doc/README.* ../doc/randpkt.txt \
-                    /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
-
-pushd /usr/share/doc/wireshark-&wireshark-version; &amp;&amp;
-   for FILENAME in ../../wireshark/*.html; do
-      ln -s -v -f $FILENAME .
-   done &amp;&amp;
-popd
-unset FILENAME</userinput></screen>
-
-    <para>
-      If you downloaded any of the documentation files from the page
-      listed in the 'Additional Downloads', install them by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 <replaceable>&lt;Downloaded_Files&gt;</replaceable> \
-                 /usr/share/doc/wireshark-&wireshark-version;</userinput></screen>
-
-    <para>
-      Now, set ownership and permissions of sensitive applications to only
-      allow authorized users.  As the <systemitem class="username">root
-      </systemitem> user:
-    </para>
-
-<screen role="root"><userinput>chown -v root:wireshark /usr/bin/{tshark,dumpcap} &amp;&amp;
-chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
-
-    <para>
-      Finally, add any users to the wireshark group (as <systemitem class=
-      "username">root</systemitem> user):
-    </para>
-
-    <screen role="root"><userinput>usermod -a -G wireshark <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <para>
-      If you are installing wireshark for the first time, it will be necessary
-      to logout of your session and login again. This will put wireshark in your
-      groups, because otherwise Wireshark will not function properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <option>-DUSE_qt6=OFF</option>: Use this switch if
-        <xref linkend="qt6"/> is not available. You'll need
-        <xref linkend="qt5"/> or at least <xref linkend="qt5-components"/>
-        with qtmultimedia in this case.
-      </para>
-<!--
-    <para>
-      <option>- -disable-wireshark</option>: Use this switch if you
-      have <application>Qt</application> installed but do not want to build
-      any of the GUIs.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Wireshark</title>
-
-    <sect3 id="wireshark-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/wireshark.conf</filename> and
-        <filename>~/.config/wireshark/*</filename> (unless there is already
-        <filename>~/.wireshark/*</filename> in the system)
-      </para>
-
-      <indexterm zone="wireshark wireshark-config">
-        <primary sortas="e-AA.wireshark-star">~/.wireshark/*</primary>
-      </indexterm>
-
-      <indexterm zone="wireshark wireshark-config">
-        <primary sortas="e-etc-wireshark.conf">/etc/wireshark.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Though the default configuration parameters are very sane, reference
-        the configuration section of the <ulink url=
-        "https://www.wireshark.org/docs/wsug_html/">Wireshark User's Guide
-        </ulink> for configuration information. Most of <application>Wireshark
-        </application>'s configuration can be accomplished
-        using the menu options of the <command>wireshark</command> graphical
-        interfaces.
-      </para>
-
-      <note>
-        <para>
-          If you want to look at packets, make sure you don't filter them
-          out with <xref linkend="iptables"/>. If you want to exclude certain
-          classes of packets, it is more efficient to do it with
-          <application>iptables</application> than it is with
-          <application>Wireshark</application>.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          capinfos, captype, dumpcap, editcap, idl2wrs,
-          mergecap, randpkt, rawshark, reordercap, sharkd,
-          text2pcap, tshark, and wireshark
-        </seg>
-        <seg>
-          libwireshark.so, libwiretap.so,
-          libwsutil.so, and numerous modules under /usr/lib/wireshark/plugins
-        </seg>
-        <seg>
-          /usr/{lib,share}/wireshark and
-          /usr/share/doc/wireshark-&wireshark-version;
-         </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="capinfos">
-        <term><command>capinfos</command></term>
-        <listitem>
-          <para>
-            reads a saved capture file and returns any or all of several
-            statistics about that file. It is able to detect and read any
-            capture supported by the <application>Wireshark</application>
-            package
-          </para>
-          <indexterm zone="wireshark capinfos">
-            <primary sortas="b-capinfos">capinfos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="captype">
-        <term><command>captype</command></term>
-        <listitem>
-          <para>
-            prints the file types of capture files
-          </para>
-          <indexterm zone="wireshark captype">
-            <primary sortas="b-captype">captype</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpcap">
-        <term><command>dumpcap</command></term>
-        <listitem>
-          <para>
-            is a network traffic dump tool. It lets you capture packet data
-            from a live network and write the packets to a file
-          </para>
-          <indexterm zone="wireshark dumpcap">
-            <primary sortas="b-dumpcap">dumpcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="editcap">
-        <term><command>editcap</command></term>
-        <listitem>
-          <para>
-            edits and/or translates the format of capture files. It knows
-            how to read <application>libpcap</application> capture files,
-            including those of <command>tcpdump</command>,
-            <application>Wireshark</application> and other tools that write
-            captures in that format
-          </para>
-          <indexterm zone="wireshark editcap">
-            <primary sortas="b-editcap">editcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idl2wrs">
-        <term><command>idl2wrs</command></term>
-        <listitem>
-          <para>
-            is a program that takes a user specified CORBA IDL file and
-            generates <quote>C</quote> source code for a
-            <application>Wireshark</application> <quote>plugin</quote>. It
-            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
-          </para>
-          <indexterm zone="wireshark idl2wrs">
-            <primary sortas="b-idl2wrs">idl2wrs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mergecap">
-        <term><command>mergecap</command></term>
-        <listitem>
-          <para>
-            combines multiple saved capture files into a single output file
-          </para>
-          <indexterm zone="wireshark mergecap">
-            <primary sortas="b-mergecap">mergecap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="randpkt">
-        <term><command>randpkt</command></term>
-        <listitem>
-          <para>
-            creates random-packet capture files
-          </para>
-          <indexterm zone="wireshark randpkt">
-            <primary sortas="b-randpkt">randpkt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rawshark">
-        <term><command>rawshark</command></term>
-        <listitem>
-          <para>
-            dumps and analyzes raw libpcap data
-          </para>
-          <indexterm zone="wireshark rawshark">
-            <primary sortas="b-rawshark">rawshark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reordercap">
-        <term><command>reordercap</command></term>
-        <listitem>
-          <para>
-            reorders timestamps of input file frames into an output file
-          </para>
-          <indexterm zone="wireshark reordercap">
-            <primary sortas="b-reordercap">reordercap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sharkd">
-        <term><command>sharkd</command></term>
-        <listitem>
-          <para>
-            is a daemon that listens on UNIX sockets
-          </para>
-          <indexterm zone="wireshark sharkd">
-            <primary sortas="b-sharkd">sharkd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="text2pcap">
-        <term><command>text2pcap</command></term>
-        <listitem>
-          <para>
-            reads in an ASCII hex dump and writes the data described into a
-            <application>libpcap</application>-style capture file
-          </para>
-          <indexterm zone="wireshark text2pcap">
-            <primary sortas="b-text2pcap">text2pcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tshark">
-        <term><command>tshark</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="wireshark tshark">
-            <primary sortas="b-tshark">tshark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wireshark-prog">
-        <term><command>wireshark</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="wireshark wireshark-prog">
-            <primary sortas="b-wireshark">wireshark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- seems to have disappeared
-      <varlistentry id="wireshark-gtk-prog">
-        <term><command>wireshark-gtk</command></term>
-        <listitem>
-          <para>
-            is the Gtk+ GUI network protocol analyzer. It lets you interactively
-            browse packet data from a live network or from a previously saved
-            capture file (optional).
-          </para>
-          <indexterm zone="wireshark wireshark-gtk-prog">
-            <primary sortas="b-wireshark-gtk">wireshark-gtk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="libwireshark">
-        <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
-          </para>
-          <indexterm zone="wireshark libwireshark">
-            <primary sortas="c-libwireshark">libwireshark.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwiretap">
-        <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
-            standard Unix library for packet capturing. For more information,
-            see the <filename>README</filename> file in the source
-            <filename class="directory">wiretap</filename> directory
-          </para>
-          <indexterm zone="wireshark libwiretap">
-            <primary sortas="c-libwiretap">libwiretap.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/networking.xml
===================================================================
--- networking/networking.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
-
-<part id="basicnet" xreflabel="Networking">
-  <?dbhtml filename="basicnet.html" dir="basicnet"?>
-
-  <title>Networking</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="connect/connect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netprogs/netprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netutils/netutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netlibs/netlibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="textweb/textweb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mailnews/mailnews.xml"/>
-
-</part>
Index: tworking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 links-download-http "http://links.twibright.com/download/links-&links-version;.tar.bz2">
-  <!ENTITY links-download-ftp  " ">
-  <!ENTITY links-md5sum        "f60b87ffee090c5d6820951eba710572">
-  <!ENTITY links-size          "6.2 MB">
-  <!ENTITY links-buildsize     "35 MB">
-  <!ENTITY links-time          "0.2 SBU">
-]>
-
-<sect1 id="Links" xreflabel="Links-&links-version;">
-  <?dbhtml filename="links.html"?>
-
-
-  <title>Links-&links-version;</title>
-
-  <indexterm zone="Links">
-    <primary sortas="a-Links">Links</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Links</title>
-
-    <para>
-      <application>Links</application> is a text and graphics mode
-      WWW browser. It includes support for rendering
-      tables and frames, features background downloads, can display colors
-      and has many other features.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&links-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&links-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &links-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &links-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &links-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &links-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Links Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libevent"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      Graphics mode requires at least one of
-      <xref linkend="gpm"/> (mouse support to be used with a framebuffer-based
-      console),
-      <ulink url="https://www.svgalib.org/">SVGAlib</ulink>,
-      <ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">
-        DirectFB
-      </ulink>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <para role="optional">
-      For decoding various image formats <application>Links</application>
-      can utilize
-      <xref linkend="libavif"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="librsvg"/>, and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <para role="optional">
-      For decompressing web pages that are compressed with Brotli,
-      <application>Links</application> can utilize
-      <xref linkend="brotli"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Links</title>
-
-    <para>
-      Install <application>Links</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &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;
-install -v -d -m755 /usr/share/doc/links-&links-version; &amp;&amp;
-install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
-    /usr/share/doc/links-&links-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-graphics</option>: This switch enables support
-      for graphics mode.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Links</title>
-
-    <sect3 id="links-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.links/*</filename>
-      </para>
-
-      <indexterm zone="Links links-config">
-        <primary sortas="e-AA.links/*">~/.links/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>Links</application> stores its configuration in per-user
-        files in the <filename class="directory">~/.links</filename> directory.
-        These files are created automatically when <command>links</command> is
-        run for the first time.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>links</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/links-&links-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="links">
-        <term><command>links</command></term>
-        <listitem>
-          <para>
-            is a text and graphics mode WWW browser
-          </para>
-          <indexterm zone="Links links">
-            <primary sortas="b-links">links</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/textweb/lynx.xml
===================================================================
--- networking/textweb/lynx.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lynx-download-http "https://invisible-mirror.net/archives/lynx/tarballs/lynx&lynx-version;.tar.bz2">
-  <!ENTITY lynx-download-ftp  " ">
-  <!ENTITY lynx-md5sum        "44316f1b8a857b59099927edc26bef79">
-  <!ENTITY lynx-size          "2.5 MB">
-  <!ENTITY lynx-buildsize     "31 MB">
-  <!ENTITY lynx-time          "0.3 SBU">
-]>
-
-<sect1 id="lynx" xreflabel="Lynx-&lynx-version;">
-  <?dbhtml filename="lynx.html"?>
-
-
-  <title>Lynx-&lynx-version;</title>
-
-  <indexterm zone="lynx">
-    <primary sortas="a-Lynx">Lynx</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lynx</title>
-
-    <para>
-      <application>Lynx</application> is a text based web browser.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lynx-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lynx-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lynx-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lynx-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lynx-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lynx-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lynx-&lynx-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Lynx Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnutls"/> (experimental, to replace openssl),
-      <xref linkend="zip"/>,
-      <xref linkend="unzip"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command), and
-      <xref linkend='sharutils'/> (for the <command>uudecode</command> program)
-    </para>
-
-<!-- Attempt to utilize S-Lang (- -with-screen=slang) leads to a build failure -->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lynx</title>
-
-    <para>
-      First, apply a patch to fix a security vulnerability:
-    </para>
-
-<screen><userinput>patch -p1 -i ../lynx-&lynx-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Lynx</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc/lynx  \
-            --with-zlib             \
-            --with-bzlib            \
-            --with-ssl              \
-            --with-screen=ncursesw  \
-            --enable-locale-charset \
-            --datadir=/usr/share/doc/lynx-&lynx-version; &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-full &amp;&amp;
-chgrp -v -R root /usr/share/doc/lynx-&lynx-version;/lynx_doc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc/lynx</parameter>: This parameter is
-      used so that the configuration files are located in
-      <filename class="directory">/etc/lynx</filename> instead of
-      <filename class="directory">/usr/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--datadir=/usr/share/doc/lynx-&lynx-version;</parameter>:
-      This parameter is used so that the documentation files are installed into
-      <filename class="directory">/usr/share/doc/lynx-&lynx-version;</filename>
-      instead of
-      <filename class="directory">/usr/share/lynx_{doc,help}</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-zlib</parameter>: This enables support for
-      linking <filename class="libraryfile">libz</filename> into
-      <application>Lynx</application>.
-    </para>
-
-    <para>
-      <parameter>--with-bzlib</parameter>: This enables support for
-      linking <filename class="libraryfile">libbz2</filename> into
-      <application>Lynx</application>.
-    </para>
-
-    <para>
-      <parameter>--with-ssl</parameter>: This enables support for
-      linking SSL into <application>Lynx</application>.
-    </para>
-
-    <para>
-      <parameter>--with-screen=ncursesw</parameter>: This switch enables
-      the use of advanced wide-character support present in the system
-      <application>NCurses</application> library. This is needed for
-      proper display of characters and line wrapping in multibyte locales.
-    </para>
-
-    <para>
-      <parameter>--enable-locale-charset</parameter>: This switch allows
-      <application>Lynx</application> to deduce the proper character encoding
-      for terminal output from the current locale. A configuration step is
-      still needed (see below), but unlike the situation without this switch,
-      the configuration step becomes the same for all users (without the
-      switch one must specify the display character set explicitly). This is
-      important for environments such as a LiveCD, where the amount of
-      system-specific configuration steps has to be reduced to the minimum.
-    </para>
-
-    <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
-      questions about cookies and SSL certificates).
-    </para>
-
-    <para>
-      <option>--with-gnutls</option>: This enables experimental support
-      for linking <application>GnuTLS</application> into
-      <application>Lynx</application>. Remove the
-      <parameter>--with-ssl</parameter>  switch if you want to use gnutls.
-    </para>
-
-    <para>
-      <command>make install-full</command>: In addition to the standard
-      installation, this target installs the documentation and help files.
-    </para>
-
-    <para>
-      <command>
-        chgrp -v -R root /usr/share/doc/lynx-&lynx-version;/lynx_doc
-      </command>:
-      This command corrects the improper group ownership of installed
-      documentation files.
-    </para>
-
-    <!-- This was fixed in the 2.8.6 release, though it still could
-         be considered an issue by some
-    <note>
-      <para>
-        There has been a security vulnerability identified if you enable
-        support for CGI links by passing the <option>-enable-cgi-links</option>
-        parameter to <command>configure</command>. See <ulink
-        url="http://seclists.org/lists/vulnwatch/2005/Oct-Dec/0041.html"/> for
-        details.
-      </para>
-    </note>
-    -->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Lynx</title>
-
-    <sect3 id="lynx-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/lynx/lynx.cfg</filename>
-      </para>
-
-      <indexterm zone="lynx lynx-config">
-        <primary sortas="e-etc-lynx-lynx.cfg">/etc/lynx/lynx.cfg</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The proper way to get the display character set is to examine the
-        current locale. However, <application>Lynx</application> does not do
-        this by default. As the <systemitem class="username">root</systemitem>
-        user, change this setting:
-      </para>
-
-<screen role="root"><userinput>sed -e '/#LOCALE/     a LOCALE_CHARSET:TRUE'     \
-    -i /etc/lynx/lynx.cfg</userinput></screen>
-
-      <para>
-        The built-in editor in <application>Lynx</application> <xref
-        linkend="locale-wrong-multibyte-characters"/>. This issue manifests
-        itself in multibyte locales, e.g., as the Backspace key not erasing
-        non-ASCII characters properly, and as incorrect data being sent to the
-        network when one edits the contents of text areas. The only solution
-        to this problem is to configure <application>Lynx</application> to
-        use an external editor (bound to the <quote>Ctrl+X e</quote> key
-        combination by default). Still as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -e '/#DEFAULT_ED/ a DEFAULT_EDITOR:vi'       \
-    -i /etc/lynx/lynx.cfg</userinput></screen>
-
-      <para>
-        <application>Lynx</application> handles the following values of
-        the DEFAULT_EDITOR option specially by adding cursor-positioning
-        arguments: <quote>emacs</quote>, <quote>jed</quote>,
-        <quote>jmacs</quote>, <quote>joe</quote>, <quote>jove</quote>,
-        <quote>jpico</quote>, <quote>jstar</quote>, <quote>nano</quote>,
-        <quote>pico</quote>, <quote>rjoe</quote>, <quote>vi</quote> (but not
-        <quote>vim</quote>: in order to position the cursor in
-        <xref linkend="vim"/>, set this option to <quote>vi</quote>).
-      </para>
-
-      <para>
-        By default, <application>Lynx</application> doesn't save cookies
-        between sessions. Again as the
-        <systemitem class="username">root</systemitem> user, change this
-        setting:
-      </para>
-<screen role="root"><userinput>sed -e '/#PERSIST/    a PERSISTENT_COOKIES:TRUE' \
-    -i /etc/lynx/lynx.cfg</userinput></screen>
-
-      <para>
-        Many other system-wide settings such as proxies can also be set
-        in the <filename>/etc/lynx/lynx.cfg</filename> file.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-    <segtitle>Installed Program</segtitle>
-    <segtitle>Installed Libraries</segtitle>
-    <segtitle>Installed Directories</segtitle>
-
-    <seglistitem>
-      <seg>lynx</seg>
-      <seg>None</seg>
-      <seg>/etc/lynx and /usr/share/doc/lynx-&lynx-version;</seg>
-    </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lynx-prog">
-        <term><command>lynx</command></term>
-        <listitem>
-          <para>
-            is a general purpose, text-based, distributed information
-            browser for the World Wide Web
-          </para>
-          <indexterm zone="lynx lynx-prog">
-            <primary sortas="b-lynx">lynx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/textweb/textweb.xml
===================================================================
--- networking/textweb/textweb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="basicnet-textweb">
-  <?dbhtml filename="textweb.html"?>
-
-  <title>Text Web Browsers</title>
-
-  <para>
-    People who are new to Unix-based systems tend to ask the question "Why on
-    earth would I want a text-mode browser? I'm going to compile
-    <application>X</application> and use <application>
-    Firefox</application>/<application>Falkon</application>/Whatever!".
-    Those who have been around systems for a while know that when (not if)
-    you manage to mess up your graphical browser install and you need to
-    look up some information on the web, a console based browser will save
-    you.  Also, there are quite a few people who prefer to use one of these
-    browsers as their primary method of browsing; either to avoid the clutter
-    and bandwidth which accompanies images or because they may use a
-    text-to-speech synthesizer which can read the page to them (of use for
-    instance to partially sighted or blind users). In this chapter you will
-    find installation instructions for two console web browsers:
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="links.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lynx.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>-->
-
-</chapter>
Index: fuscate.sh
===================================================================
--- obfuscate.sh	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#!/bin/bash
-
-# obfuscate.sh
-# obfuscate email addresses in XML/HTML
-# Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
-# Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
-# to prevent hangs on very long files, like nonckunked books.
-# Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
-# Released under the GNU General Public License
-#
-# This script currently only seeks out mailto: addresses. If those same
-# addresses also appear in plaintext, we need to obfuscate those as well.
-#
-# This script was made for a very specific purpose so I was a bit lazy in
-# writing the regex's.
-#
-# Please send comments, enhancements, etc. to the above address
-
-#set -e  # Bail on all errors
-
-# First, ensure that we are given a file to process
-# if [ $# -lt 1 ]; then
-#   echo -e "\nYou must provide an input file."
-#   exit 1
-# fi
-
-# Nothing like a backup plan!
-#cp "$1" "$1".bak
-
-for i in `grep -o '"mailto:.*@.*"' ${1} |cut -d\" -f2|sed -e 's|^mailto:||' -e 's|"$||'`; do
-  link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
-  plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
-  cp ${1}{,.tmp}
-  sed -e "s|mailto:$i|mailto:$link|" \
-      -e "s|$i|$plaintext|" ${1}.tmp > ${1}
-  rm ${1}.tmp
-done
-#rm $FILE.tmp
-#exit 0
Index: ckages.ent
===================================================================
--- packages.ent	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1221 +1,0 @@
-<!-- Part II -->
-<!-- Chapter 4 -->
-
-<!ENTITY cracklib-version             "2.9.11">
-<!ENTITY cryptsetup-minor             "2.7">
-<!ENTITY cryptsetup-version           "&cryptsetup-minor;.2">
-<!ENTITY cyrus-sasl-version           "2.1.28">
-<!ENTITY gnupg2-version               "2.4.5">
-<!ENTITY gnutls-version               "3.8.5">
-<!ENTITY gpgme-version                "1.23.2">
-<!ENTITY iptables-version             "1.8.10">
-<!ENTITY libcap-version               "2.69">
-<!ENTITY liboauth-version             "1.0.3">
-<!ENTITY linux-pam-version            "1.6.1">
-<!ENTITY linux-pam-docs-version       "1.6.1">
-<!ENTITY libpwquality-version         "1.4.5">
-<!ENTITY make-ca-version              "1.13">
-<!ENTITY mitkrb-major-version         "1.21">
-<!ENTITY mitkrb-version               "&mitkrb-major-version;.2">
-<!--!ENTITY mitkrb-version               "&mitkrb-major-version;">-->
-<!ENTITY nettle-version               "3.9.1">
-
-<!ENTITY nss-dir                      "3_99">
-<!ENTITY nss-minor-version            "99">
-
-<!--<!ENTITY nss-micro-version            "1">-->
-<!--<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">-->
-
-<!ENTITY nss-version                  "3.&nss-minor-version;">
-
-<!ENTITY openssh-version              "9.7p1">
-<!ENTITY openssh-md5sum               "1100f170ca1bc669038ca3743e074094">
-<!ENTITY p11-kit-version              "0.25.3">
-<!ENTITY polkit-version               "124">
-<!ENTITY polkit-gnome-version         "0.105">
-<!ENTITY shadow-version               "4.15.1">
-<!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.72">
-<!ENTITY sudo-version                 "1.9.15p5">
-<!ENTITY tripwire-version             "2.4.3.7">
-<!--<!ENTITY volume_key-version           "0.3.12">-->
-
-<!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "6.8">
-<!ENTITY dosfstools-version           "4.2">
-<!ENTITY fuse3-version                "3.16.2">
-<!ENTITY jfsutils-version             "1.1.15">
-<!ENTITY lvm2-version                 "2.03.23">
-<!ENTITY mdadm-version                "4.3">
-<!ENTITY ntfs-3g-version              "2022.10.3">
-<!ENTITY gptfdisk-version             "1.0.10">
-<!ENTITY parted-version               "3.6">
-<!ENTITY reiser-version               "3.6.27">
-<!ENTITY smartmontools-version        "7.4">
-<!ENTITY sshfs-version                "3.7.3">
-<!ENTITY xfsprogs-version             "6.7.0">
-
-<!-- UEFI bootloaders -->
-<!ENTITY efivar-version               "39">
-<!ENTITY efibootmgr-version           "18">
-<!ENTITY grub-version                 "2.12">
-<!ENTITY unifont-version              "15.1.04">
-
-<!-- Chapter 6 -->
-<!ENTITY bluefish-version             "2.2.15">
-<!ENTITY ed-version                   "1.20.1">
-<!ENTITY emacs-version                "29.3">
-<!ENTITY gedit-version                "46.2">
-<!ENTITY joe-version                  "4.6">
-<!ENTITY mousepad-version             "0.6.2">
-<!ENTITY nano-version                 "7.2">
-<!ENTITY vim-version                  "9.1.0041">
-<!ENTITY vim-majmin                   "91">
-
-<!-- Chapter 7 -->
-<!ENTITY dash-version                 "0.5.12">
-<!ENTITY tcsh-version                 "6.24.12">
-<!ENTITY zsh-version                  "5.9">
-
-<!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version                 "8.2.2">
-
-<!-- Part III -->
-<!-- Chapter 9 -->
-<!ENTITY abseil-cpp-version           "20240116.2">
-<!ENTITY appstream-version            "1.0.2">
-<!ENTITY apr-version                  "1.7.4">
-<!ENTITY apr-util-version             "1.6.3">
-<!ENTITY aspell-version               "0.60.8.1">
-
-<!ENTITY boost-major                  "1">
-<!ENTITY boost-minor                  "85">
-<!ENTITY boost-patch                  "0">
-<!ENTITY boost-version                "&boost-major;.&boost-minor;.&boost-patch;">
-<!ENTITY boost-dl-version             "&boost-major;.&boost-minor;.&boost-patch;-b2-nodocs">
-
-<!ENTITY brotli-version               "1.1.0">
-<!ENTITY clucene-version              "2.3.3.4">
-<!ENTITY dbus-glib-version            "0.112">
-<!ENTITY double-conversion-version    "3.3.0">
-<!ENTITY duktape-version              "2.7.0">
-<!ENTITY enchant-version              "2.7.0">
-<!ENTITY exempi-version               "2.6.5">
-<!ENTITY fftw-version                 "3.3.10">
-<!ENTITY fmt-version                  "10.2.1">
-<!ENTITY glib2-minor                  "2.80">
-<!ENTITY glib2-version                "&glib2-minor;.0">
-<!ENTITY glibmm-version               "2.66.7">
-<!ENTITY glibmm2-version              "2.80.0">
-<!ENTITY gmime3-version               "3.2.7">
-<!ENTITY gobject-introspection-version "1.80.1">
-<!ENTITY gsl-version                  "2.7.1">
-<!ENTITY gspell-minor                 "1.12">
-<!ENTITY gspell-version               "&gspell-minor;.2">
-<!ENTITY highway-version              "1.1.0">
-
-<!ENTITY icu-major                    "75">
-<!ENTITY icu-minor                    "1">
-<!ENTITY icu-patch                    "0">
-<!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->
-
-<!ENTITY inih-version                 "58">
-<!ENTITY intel-gmmlib-version         "22.3.16">
-<!ENTITY jansson-version              "2.14">
-<!ENTITY json-c-version               "0.17">
-<!ENTITY json-glib-version            "1.8.0">
-<!ENTITY keyutils-version             "1.6.3">
-<!ENTITY kirigami-addons-version      "1.1.0">
-<!ENTITY libaio-version               "0.3.113">
-<!ENTITY libarchive-version           "3.7.3">
-<!ENTITY libassuan-version            "2.5.7">
-<!ENTITY libatasmart-version          "0.19">
-<!ENTITY libatomic_ops-version        "7.8.2">
-<!ENTITY libblockdev-version          "3.1.1">
-<!ENTITY libbytesize-version          "2.10">
-<!ENTITY libcloudproviders-version    "0.3.6">
-<!ENTITY libdaemon-version            "0.14">
-<!ENTITY libdisplay-info-version      "0.1.1">
-<!ENTITY libgcrypt-version            "1.10.3">
-<!ENTITY libgpg-error-version         "1.48">
-<!ENTITY libgrss-version              "0.7.0">
-<!ENTITY libgsf-version               "1.14.52">
-<!ENTITY libgudev-version             "238">
-<!ENTITY libgusb-version              "0.4.9">
-<!ENTITY libical-version              "3.0.18">
-<!ENTITY libidn-version               "1.42">
-<!ENTITY libidn2-version              "2.3.7">
-<!ENTITY libiodbc-version             "3.52.15">
-<!ENTITY libksba-version              "1.6.6">
-<!ENTITY liblinear-version            "247">
-<!ENTITY libnvme-version              "1.8">
-<!ENTITY libmbim-version              "1.26.4">
-<!ENTITY libpaper-version             "2.2.5">
-<!ENTITY libportal-version            "0.7.1">
-<!ENTITY libptytty-version            "2.0">
-<!ENTITY libqalculate-version         "5.0.0">
-<!ENTITY libqmi-version               "1.30.8">
-<!ENTITY libseccomp-version           "2.5.5">
-<!ENTITY libsigc-minor                "2.12">
-<!ENTITY libsigc-version              "&libsigc-minor;.1">
-<!ENTITY libsigc3-minor               "3.6">
-<!ENTITY libsigc3-version             "&libsigc3-minor;.0">
-<!ENTITY libsigsegv-version           "2.14">
-<!ENTITY libssh2-version              "1.11.0">
-<!ENTITY libstatgrab-version          "0.92.1">
-<!ENTITY libtasn1-version             "4.19.0">
-<!ENTITY libunique-version            "1.1.6">
-<!ENTITY libunistring-version         "1.2">
-<!ENTITY libunwind-version            "1.6.2">
-<!ENTITY liburcu-version              "0.14.0">
-<!ENTITY libusb-version               "1.0.27">
-<!ENTITY libuv-version                "1.48.0">
-<!ENTITY libxkbcommon-version         "1.7.0">
-<!ENTITY libxml2-version              "2.12.6">
-<!ENTITY libxmlb-version              "0.3.19">
-<!ENTITY libxslt-version              "1.1.39">
-<!ENTITY libwacom-version             "2.11.0">
-<!ENTITY libwpe-version               "1.14.2">
-<!ENTITY log4cplus-version            "2.1.1">
-<!ENTITY log4cplus-release            "2_1_1">
-<!ENTITY lzo-version                  "2.10">
-<!ENTITY mtdev-version                "1.1.7">
-<!ENTITY nodejs-version               "20.12.2">
-<!ENTITY npth-version                 "1.7">
-<!ENTITY nspr-version                 "4.35">
-<!ENTITY pcre2-version                "10.43">
-<!ENTITY popt-version                 "1.19">
-<!ENTITY protobuf-version             "26.1">
-<!ENTITY protobuf-c-version           "1.5.0">
-<!ENTITY pth-version                  "2.0.7">
-<!ENTITY qca-version                  "2.3.8">
-<!ENTITY qcoro-version                "0.10.0">
-<!ENTITY spidermonkey-major           "115">
-<!ENTITY spidermonkey-version         "&spidermonkey-major;.10.0">
-<!ENTITY spirv-headers-version        "1.3.280.0">
-<!ENTITY spirv-tools-version          "1.3.280.0">
-<!ENTITY talloc-version               "2.4.2">
-<!ENTITY telepathy-glib-version       "0.24.2">
-<!ENTITY uchardet-version             "0.0.8">
-<!ENTITY umockdev-version             "0.18.1">
-<!ENTITY utfcpp-version               "4.0.5">
-<!ENTITY wayland-version              "1.22.0">
-<!ENTITY wayland-protocols-version    "1.35">
-<!ENTITY wpebackend-fdo-version       "1.14.2">
-<!ENTITY wv-version                   "1.2.9">
-<!ENTITY xapian-version               "1.4.25">
-<!ENTITY yaml-version                 "0.2.5">
-
-<!-- Chapter 10 -->
-<!ENTITY aalib-version                "1.4rc5">
-<!ENTITY babl-version                 "0.1.108">
-<!ENTITY exiv2-version                "0.28.2">
-<!ENTITY freetype2-version            "2.13.2">
-<!ENTITY fontconfig-version           "2.15.0">  <!-- stable lt .90 micro version -->
-<!ENTITY fribidi-version              "1.0.13">
-<!ENTITY gegl-version                 "0.4.48">
-<!ENTITY giflib-version               "5.2.2">
-<!ENTITY glad-version                 "2.0.6">
-<!ENTITY glm-version                  "1.0.1">
-<!ENTITY graphite2-version            "1.3.14">
-<!ENTITY harfbuzz-version             "8.4.0">
-<!ENTITY jasper-version               "4.2.3">
-<!ENTITY lcms2-version                "2.14">
-<!ENTITY libavif-version              "1.0.4">
-<!ENTITY libexif-version              "0.6.24">
-<!ENTITY libgxps-version              "0.3.2">
-<!ENTITY libjpeg-turbo-version        "3.0.1">
-<!ENTITY libjxl-version               "0.10.2">
-<!ENTITY libmng-version               "2.0.3">
-<!ENTITY libmypaint-version           "1.6.1"> <!-- version 1 only -->
-<!ENTITY libpng-version               "1.6.43">
-<!ENTITY libraw-version               "0.21.2">
-<!ENTITY librsvg-minor                "2.58">
-<!ENTITY librsvg-version              "&librsvg-minor;.0">
-<!ENTITY libspiro-version             "20220722">
-<!ENTITY libtiff-version              "4.6.0">
-<!ENTITY libwebp-version              "1.4.0">
-<!ENTITY mypaint-brushes-version      "1.3.1">
-<!ENTITY newt-version                 "0.52.24">
-<!ENTITY opencv-version               "4.9.0">
-<!ENTITY opencv-contrib-version       "4.9.0">
-<!ENTITY openjpeg2-majmin-version     "2.5">
-<!ENTITY openjpeg2-version            "&openjpeg2-majmin-version;.2">
-<!ENTITY pixman-version               "0.43.4">  
-<!ENTITY poppler-version              "24.04.0">
-<!ENTITY potrace-version              "1.16">
-<!ENTITY qpdf-version                 "11.9.0">
-<!ENTITY qrencode-version             "4.1.1">
-<!ENTITY libsass-version              "3.6.6">
-<!ENTITY sassc-version                "3.6.2">
-<!ENTITY webp-pixbuf-loader-version   "0.2.7">
-<!ENTITY woff2-version                "1.0.2">
-
-<!-- Chapter 11 -->
-<!ENTITY asciidoctor-version          "2.0.22">
-<!ENTITY bogofilter-version           "1.2.5">
-<!ENTITY compface-version             "1.5.2">
-<!ENTITY desktop-file-utils-version   "0.27">
-<!ENTITY dos2unix-version             "7.5.2">
-<!ENTITY graphviz-version             "10.0.1">
-<!ENTITY gtk-doc-major                "1.34">
-<!ENTITY gtk-doc-version              "1.34.0">
-<!ENTITY highlight-version            "4.10">
-<!ENTITY ibus-version                 "1.5.29">
-<!ENTITY imagemagick-version          "7.1.1">
-<!ENTITY iso-codes-version            "4.16.0">
-<!ENTITY lsof-version                 "4.99.0">
-<!ENTITY mandoc-version               "1.14.6">
-<!ENTITY pinentry-version             "1.3.0">
-<!ENTITY rep-gtk-version              "0.90.8.3">
-<!ENTITY screen-version               "4.9.1">
-<!ENTITY shared-mime-info-version     "2.4">
-<!ENTITY sharutils-version            "4.15.2">
-<!--<!ENTITY telepathy-logger-version     "0.8.2">-->
-<!ENTITY telepathy-mission-control-version "5.16.6">
-<!ENTITY tidy-html5-version           "5.8.0">
-<!ENTITY time-version                 "1.9">
-<!ENTITY tree-version                 "2.1.1">
-<!ENTITY unixodbc-version             "2.3.12">
-<!ENTITY xdg-dbus-proxy-version       "0.1.5">
-<!ENTITY xdg-user-dirs-version        "0.18">
-
-<!-- Chapter 12 -->
-<!ENTITY accountsservice-version      "23.13.9">
-<!ENTITY acpid-version                "2.0.34">
-<!ENTITY at-version                   "3.2.5">
-<!ENTITY autofs-version               "5.1.9">
-<!ENTITY bluez-version                "5.75">
-<!ENTITY bubblewrap-version           "0.9.0">
-<!ENTITY colord-version               "1.4.7">
-<!ENTITY cpio-version                 "2.15">
-<!ENTITY cups-pk-helper-version       "0.2.7">
-<!ENTITY dbus-version                 "1.14.10">   <!-- Even minors only -->
-<!ENTITY elogind-version              "255.4-r2">
-<!ENTITY blocaled-version             "0.5">
-<!ENTITY fcron-version                "3.2.1">
-<!ENTITY gpm-version                  "1.20.7">
-<!ENTITY hdparm-version               "9.65">
-<!ENTITY hwdata-version               "0.381">
-<!ENTITY lsb-tools-version            "0.12">
-<!ENTITY lm-sensors-version           "3-6-0">
-<!ENTITY logrotate-version            "3.21.0">
-<!ENTITY mc-version                   "4.8.31">
-<!ENTITY ModemManager-version         "1.18.12">
-<!ENTITY notification-daemon-version  "3.20.0">
-<!ENTITY p7zip-version                "17.04">
-<!ENTITY pax-version                  "20201030">
-<!ENTITY pciutils-version             "3.12.0">
-<!ENTITY pm-utils-version             "1.4.1">
-<!ENTITY power-profiles-daemon-version "0.21">
-<!ENTITY raptor-version               "2.0.16">
-<!ENTITY rasqal-version               "0.9.33">
-<!ENTITY redland-version              "1.0.17">
-<!ENTITY sg3_utils-version            "1.48">
-<!ENTITY sysmon-qt-version            "2.0">
-<!ENTITY sysstat-version              "12.7.5">
-<!ENTITY systemd-version              "255">
-<!ENTITY udisks2-version              "2.10.1">   <!-- stable lt .90 micro version -->
-<!ENTITY unrar-version                "7.0.7">
-<!ENTITY unzip-version                "6.0">
-<!ENTITY upower-version               "1.90.4">
-<!ENTITY usbutils-version             "017">
-<!ENTITY which-version                "2.21">
-<!ENTITY xdotool-version              "3.20211022.1">
-<!ENTITY zip-version                  "3.0">
-
-<!-- Chapter 13 -->
-<!ENTITY autoconf213-version          "2.13">
-<!ENTITY cbindgen-version             "0.26.0">
-<!ENTITY clisp-version                "2.49">
-<!ENTITY cmake-major-version          "3.29">
-<!ENTITY cmake-minor-version          "2">
-<!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
-<!ENTITY doxygen-version              "1.10.0">
-<!ENTITY dtc-version                  "1.7.0">
-<!ENTITY gcc-version                  "13.2.0">
-<!ENTITY gc-version                   "8.2.6">
-<!ENTITY gdb-version                  "14.2">
-<!ENTITY git-version                  "2.44.0">
-<!ENTITY guile-version                "3.0.9">
-<!ENTITY librep-version               "0.92.7">
-<!ENTITY llvm-maj-version             "18">
-<!ENTITY llvm-point-version           "2">
-<!ENTITY llvm-version                 "&llvm-maj-version;.1.&llvm-point-version;">
-<!ENTITY lua-version                  "5.4.6">
-<!ENTITY lua52-version                "5.2.4">
-<!ENTITY mercurial-version            "6.7.2">
-<!ENTITY nasm-version                 "2.16.03">
-<!ENTITY patchelf-version             "0.18.0">
-<!ENTITY php-version                  "8.3.6">
-
-<!ENTITY python2-majorver             "2.7">
-<!ENTITY python2-patch                "18">
-<!ENTITY python2-version              "&python2-majorver;.&python2-patch;">
-
-<!ENTITY python3-major                "3">
-<!ENTITY python3-minor                "12">
-<!ENTITY python3-patch                "3">
-<!ENTITY python3-majorver             "&python3-major;.&python3-minor;">
-<!ENTITY python3-version              "&python3-majorver;.&python3-patch;">
-<!ENTITY python3-lib-suffix           "cpython-&python3-major;&python3-minor;-&lt;arch&gt;-linux-gnu">
-<!ENTITY python3-site                 "/usr/lib/python&python3-majorver;/site-packages">
-
-<!-- Remove once mozilla programs can use python 3.12 -->
-<!ENTITY python311-version                  "3.11.1">
-
-<!ENTITY ruby-minor-version           "3.3">
-<!ENTITY ruby-patch-version           "1">
-<!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
-<!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
-<!ENTITY rust-version                 "1.77.0">
-<!ENTITY scons-version                "4.7.0">
-<!ENTITY slang-version                "2.3.3">
-<!ENTITY subversion-version           "1.14.3">
-<!ENTITY swig-version                 "4.2.1">
-<!ENTITY sysprof-minor                "3.48">
-<!ENTITY sysprof-version              "&sysprof-minor;.0">
-<!ENTITY tk-version                   "8.6.14">
-<!ENTITY unifdef-version              "2.12">
-<!ENTITY vala-major-version           "0.56">  <!-- even minors only -->
-<!ENTITY vala-version                 "&vala-major-version;.17">
-<!ENTITY valgrind-version             "3.22.0">
-<!ENTITY yasm-version                 "1.3.0">
-
-<!ENTITY openjdk-version              "21.0.2">
-<!ENTITY openjdk-build                "13">
-<!ENTITY apache-ant-version           "1.10.14">
-
-<!-- Perl module versions used in the Perl Modules instructions
-     Please read the Changes file before updating a module.
-     These should point to www.cpan.org/authors/  -->
-<!ENTITY Archive-Zip-version          "1.68">
-<!ENTITY autovivification-version     "0.18">
-<!ENTITY Business-ISBN-version        "3.009">
-<!ENTITY Business-ISMN-version        "1.204">
-<!ENTITY Business-ISSN-version        "1.005">
-<!ENTITY Class-Accessor-version       "0.51">
-<!ENTITY Data-Compare-version         "1.29">
-<!ENTITY Data-Dump-version            "1.25">
-<!ENTITY Data-Uniqid-version          "0.12">
-<!ENTITY DateTime-Calendar-Julian-version "0.107">
-<!ENTITY DateTime-Format-Builder-version "0.83">
-<!ENTITY Encode-EUCJPASCII-version    "0.03">
-<!ENTITY Encode-HanExtra-version      "0.23">
-<!ENTITY Encode-JIS2K-version         "0.05">
-<!ENTITY File-FcntlLock-version       "0.22">
-<!ENTITY File-Slurper-version         "0.014">
-<!ENTITY File-Which-version           "1.27">
-<!ENTITY HTML-Parser-version          "3.82">
-<!ENTITY HTTP-Daemon-version          "6.16">
-<!ENTITY IO-Socket-SSL-version        "2.085">
-<!ENTITY IO-String-version            "1.08">
-<!ENTITY IPC-Run3-version             "0.049">
-<!ENTITY JSON-version                 "4.10">
-<!ENTITY libwww-perl-version          "6.77">
-<!ENTITY Lingua-Translit-version      "0.29">
-<!ENTITY List-AllUtils-version        "0.19">
-<!ENTITY List-MoreUtils-version       "0.430">
-<!ENTITY Log-Log4perl-version         "1.57">
-<!ENTITY LWP-Protocol-https-version   "6.14">
-<!ENTITY Module-Build-version         "0.4234">
-<!ENTITY Net-DNS-version              "1.44">
-<!ENTITY Parse-RecDescent-version     "1.967015">
-<!ENTITY Parse-Yapp-version           "1.21">
-<!ENTITY PerlIO-utf8_strict-version   "0.010">
-<!ENTITY Regexp-Common-version        "2017060201">
-<!ENTITY SGMLSpm-version              "1.1">
-<!ENTITY Sort-Key-version             "1.33">
-<!ENTITY Test-Command-version         "0.11">
-<!ENTITY Test-Differences-version     "0.71">
-<!ENTITY Text-BibTeX-version          "0.89">
-<!ENTITY Text-CSV-version             "2.04">
-<!ENTITY Text-Roman-version           "3.5">
-<!ENTITY Unicode-Collate-version      "1.31">
-<!ENTITY Unicode-LineBreak-version    "2019.001">
-<!ENTITY URI-version                  "5.28">
-<!ENTITY XML-LibXML-Simple-version    "1.01">
-<!ENTITY XML-LibXSLT-version          "2.002001">
-<!ENTITY XML-Simple-version           "2.25">
-<!ENTITY XML-Writer-version           "0.900">
-
-<!-- perl modules which are only in the book as deps of other modules
-    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.80">
-<!ENTITY Alien-Build-Plugin-Download-GitLab-version "0.01">
-<!ENTITY Alien-Libxml2-version        "0.19">
-<!ENTITY B-COW-version                "0.007">
-<!ENTITY B-Hooks-EndOfScope-version   "0.28">
-<!ENTITY Business-ISBN-Data-version   "20240209.001">
-<!ENTITY Capture-Tiny-version         "0.48">
-<!ENTITY Class-Data-Inheritable-version "0.09">
-<!ENTITY Class-Inspector-version      "1.36">
-<!ENTITY Class-Singleton-version      "1.6">
-<!ENTITY Class-Tiny-version           "1.008">
-<!ENTITY Clone-version                "0.46">
-<!ENTITY Config-AutoConf-version      "0.320">
-<!ENTITY CPAN-Meta-Check-version      "0.018">
-<!ENTITY DateTime-version             "1.65">
-<!ENTITY DateTime-Format-Strptime-version "1.79">
-<!ENTITY DateTime-Locale-version      "1.40">
-<!ENTITY DateTime-TimeZone-version    "2.62">
-<!ENTITY Devel-StackTrace-version     "2.05">
-<!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 Exporter-Tiny-version        "1.006002">
-<!ENTITY ExtUtils-LibBuilder-version  "0.08">
-<!ENTITY FFI-CheckLib-version         "0.31">
-<!ENTITY File-chdir-version           "0.1011">
-<!ENTITY File-Copy-Recursive-version  "0.45">
-<!ENTITY File-Find-Rule-version       "0.34">
-<!ENTITY File-Listing-version         "6.16">
-<!ENTITY File-ShareDir-version        "1.118">
-<!ENTITY File-ShareDir-Install-version "0.14">
-<!ENTITY HTML-Tagset-version          "3.24">
-<!ENTITY HTTP-CookieJar-version       "0.014">
-<!ENTITY HTTP-Cookies-version         "6.11">
-<!ENTITY HTTP-Date-version            "6.06">
-<!ENTITY HTTP-Message-version         "6.45">
-<!ENTITY HTTP-Negotiate-version       "6.01">
-<!ENTITY Importer-version             "0.026">
-<!ENTITY IO-HTML-version              "1.004">
-<!ENTITY IPC-System-Simple-version    "1.30">
-<!ENTITY List-MoreUtils-XS-version    "0.430">
-<!ENTITY List-SomeUtils-version       "0.59">
-<!ENTITY List-SomeUtils-XS-version    "0.58">
-<!ENTITY List-UtilsBy-version         "0.12">
-<!ENTITY LWP-MediaTypes-version       "6.04">
-<!ENTITY MIME-Charset-version         "1.013.1">
-<!ENTITY Module-Implementation-version "0.09">
-<!ENTITY Module-Pluggable-version      "5.2">
-<!ENTITY Module-Runtime-version       "0.016">
-<!ENTITY MRO-Compat-version           "0.15">
-<!ENTITY namespace-autoclean-version  "0.29">
-<!ENTITY namespace-clean-version      "0.27">
-<!ENTITY Net-HTTP-version             "6.23">
-<!ENTITY Net-SSLeay-version           "1.94">
-<!ENTITY Number-Compare-version       "0.03">
-<!ENTITY Package-Stash-version        "0.40">
-<!ENTITY Params-Validate-version      "1.31">
-<!ENTITY Params-ValidationCompiler-version "0.31">
-<!ENTITY Path-Tiny-version            "0.144">
-<!ENTITY Role-Tiny-version            "2.002004">
-<!ENTITY Scope-Guard-version          "0.21">
-<!ENTITY Specio-version               "0.48">
-<!ENTITY Sub-Exporter-Progressive-version "0.001013">
-<!ENTITY Sub-Identify-version         "0.14">
-<!ENTITY Sub-Info-version             "0.002">
-<!ENTITY Sub-Quote-version            "2.006008">
-<!ENTITY Sub-Uplevel-version          "0.2800">
-<!--<!ENTITY SUPER-version                "1.20190531">-->
-<!ENTITY Term-Table-version           "0.018">
-<!ENTITY Test-Deep-version            "1.204">
-<!ENTITY Test-Exception-version       "0.43">
-<!ENTITY Test-Fatal-version           "0.017">
-<!ENTITY Test-File-version            "1.993">
-<!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.002010">
-<!ENTITY Test-Requires-version        "0.11">
-<!ENTITY Test-RequiresInternet-version "0.05">
-<!ENTITY Test-utf8-version            "1.02">
-<!ENTITY Test-Warnings-version        "0.033">
-<!ENTITY Test-Without-Module-version  "0.21">
-<!ENTITY Test2-Plugin-NoWarnings-version "0.09">
-<!ENTITY Test2-Suite-version          "0.000159">
-<!ENTITY Text-CSV_XS-version          "1.53">
-<!ENTITY Text-Diff-version            "1.45">
-<!ENTITY Text-Glob-version            "0.11">
-<!ENTITY Tie-Cycle-version            "1.228">
-<!ENTITY TimeDate-version             "2.33">
-<!ENTITY Try-Tiny-version             "0.31">
-<!ENTITY Variable-Magic-version       "0.64">
-<!ENTITY WWW-RobotRules-version       "6.02">
-<!ENTITY XML-LibXML-version           "2.0210">
-<!ENTITY XML-NamespaceSupport-version "1.12">
-<!ENTITY XML-SAX-version              "1.02">
-<!ENTITY XML-SAX-Base-version         "1.09">
-
-<!-- Python module versions used in the Python Modules instructions -->
-<!ENTITY asciidoc-version             "10.2.0">
-<!ENTITY asciidoc-md5sum              "ecac3af818f7a65596efc6e243b520a0">
-<!ENTITY cachecontrol-version         "0.14.0">
-<!ENTITY cachecontrol-md5sum          "221272755063d3827de22e430ad842e6">
-<!ENTITY cssselect-version            "1.2.0">
-<!ENTITY cssselect-md5sum             "27fbafacce5447cb867acb240d35002a">
-<!ENTITY cython-version               "0.29.36">
-<!ENTITY cython-md5sum                "a4d0f9fbc9c137f1a88937cd40e8c5ee">
-<!ENTITY dbus-python-version          "1.3.2">
-<!ENTITY docutils-version             "0.21.1">
-<!ENTITY doxypypy-version             "0.8.8.7">
-<!ENTITY doxypypy-md5sum              "5773d0a7882df900cbda8ee5107e1ced">
-<!ENTITY doxyqml-version              "0.5.3">
-<!ENTITY doxyqml-md5sum               "3d394a0d896721e27beb62bf032f7f43">
-<!ENTITY gi-docgen-version            "2023.3">
-<!ENTITY gi-docgen-md5sum             "9e6c51bccb72f6d9e0ce092131f03d24">
-<!ENTITY packaging-version            "24.0">
-<!ENTITY packaging-md5sum             "8e3bc7b152efc9ffadabddc9f8465b02">
-<!ENTITY py3c-version                 "1.4">
-<!ENTITY pyatspi2-version             "2.46.1">
-<!ENTITY pycairo-version              "1.26.0">
-<!ENTITY pycairo2-version             "1.18.2">
-<!--<!ENTITY pycryptodome-version         "3.18.0">-->
-<!ENTITY dbusmock-version             "0.31.1">
-<!ENTITY pygments-version             "2.17.2">
-<!ENTITY pygments-md5sum              "7c059773b0f4808f9402eb0650de6bd4">
-<!ENTITY pygobject2-version           "2.28.7">
-<!ENTITY pygobject3-version           "3.48.2">
-<!ENTITY pygdbmi-version              "0.11.0.0">
-<!ENTITY pygdbmi-md5sum               "34b1812e77469c6206002b3929798cab">
-<!ENTITY pygtk-version                "2.24.0">
-<!ENTITY pyxdg-version                "0.28">
-<!ENTITY recommonmark-version         "0.7.1">
-<!ENTITY recommonmark-md5sum          "3c550a76eb62006bf007843a9f1805bb">
-<!ENTITY html5lib-version             "1.1">
-<!ENTITY html5lib-md5sum              "6748742e2ec4cb99287a6bc82bcfe2b0">
-<!-- libxml2 for Python2 shares the version of libxml2 -->
-<!ENTITY lxml-version                 "4.9.4">
-<!ENTITY lxml-md5sum                  "043f2ecd529d9aa8c7e4465d12d603f0">
-<!ENTITY MarkupSafe-version           "2.1.3">
-<!ENTITY MarkupSafe-md5sum            "ca33f119bd0551ce15837f58bb180214">
-<!ENTITY Jinja2-version               "3.1.2">
-<!ENTITY Jinja2-md5sum                "d31148abd89c1df1cdb077a55db27d02">
-<!ENTITY mako-version                 "1.3.3">
-<!ENTITY mako-md5sum                  "4e4e31e47be58b051886ec502b87aedf">
-<!ENTITY numpy-version                "1.26.4">
-<!ENTITY numpy-md5sum                 "19550cbe7bedd96a928da9d4ad69509d">
-<!ENTITY psutil-version               "5.9.8">
-<!ENTITY psutil-md5sum                "7bb9d4378bd451765b705946a3541393">
-<!ENTITY pyparsing-version            "3.1.2">
-<!ENTITY pyparsing-md5sum             "2bfafdb2d02d19ca4a3dfd02a9dbdfa7">
-<!ENTITY pyserial-version             "3.5">
-<!ENTITY pyserial-md5sum              "1cf25a76da59b530dbfc2cf99392dc83">
-<!ENTITY pytest-version               "8.1.1">
-<!ENTITY pytest-md5sum                "6a85eccffeb0fa15c104f408d82ce7fa">
-<!ENTITY PyYAML-version               "6.0.1">
-<!ENTITY PyYAML-md5sum                "c9246277af2d9a13b7018af267a0831a">
-<!ENTITY requests-version             "2.31.0">
-<!ENTITY requests-md5sum              "941e175c276cd7d39d098092c56679a4">
-<!ENTITY scour-version                "0.38.2">
-<!ENTITY sentry-sdk-version           "1.45.0">
-<!ENTITY sentry-sdk-md5sum            "81b7dfb592d878c09e13e1feebcda437">
-<!ENTITY six-version                  "1.16.0">
-<!ENTITY six-md5sum                   "a7c927740e4964dd29b72cebfc1429bb">
-<!ENTITY sphinx-version               "7.2.6">
-<!ENTITY sphinx_rtd_theme-version     "2.0.0">
-<!ENTITY sphinx_rtd_theme-md5sum      "8ad74a8e9ca706ed77117be0e9eed7e8">
-
-<!-- Python module versions used in the Python Dependencies instructions -->
-<!-- sc = sphinxcontrib -->
-<!ENTITY alabaster-version              "0.7.13">
-<!ENTITY alabaster-md5sum               "2e05a5f4fe5a8b95e5e576cbf4a5d503">
-<!ENTITY attrs-version                  "22.2.0">
-<!ENTITY attrs-md5sum                   "eff16b3bbd0d9b72e118cca83a19d380">
-<!ENTITY babel-version                  "2.11.0">
-<!ENTITY babel-md5sum                   "9ee7784fd452d456206ecd3a12694010">
-<!ENTITY certifi-version                "2024.2.2">
-<!ENTITY certifi-md5sum                 "13d140d3605e55270a1241a705a05ab4">
-<!ENTITY chardet-version                "5.1.0">
-<!ENTITY chardet-md5sum                 "394bd03d7a258d2771040bfbd5a7bf66">
-<!ENTITY charset-normalizer-version     "3.0.1">
-<!ENTITY charset-normalizer-md5sum      "12ee1c8bedbfba84e99db46d5d94f411">
-<!ENTITY commonmark-version             "0.9.1">
-<!ENTITY commonmark-md5sum              "cd1dc70c4714d9ed4117a40490c25e00">
-<!ENTITY editables-version              "0.3">
-<!ENTITY editables-md5sum               "e91709fbb0ef586cb7b785042068ab67">
-<!ENTITY hatchling-version              "1.12.2">
-<!ENTITY hatchling-md5sum               "5a6e2fd0c877feea7e71b9d72bbdbed9">
-<!ENTITY hatch-vcs-version              "0.3.0">
-<!ENTITY hatch-vcs-md5sum               "c2f2cbe6851b7b2969cb4aa24c4b9b2f">
-<!ENTITY idna-version                   "3.4">
-<!ENTITY idna-md5sum                    "13ea24e076212b6baae1135a116d1e0e">
-<!ENTITY imagesize-version              "1.4.1">
-<!ENTITY imagesize-md5sum               "5a40586a25c07e1a8f16f6267252c321">
-<!ENTITY iniconfig-version              "2.0.0">
-<!ENTITY iniconfig-md5sum               "3c030b3f51dcc3aca585de05635600e4">
-<!ENTITY markdown-version               "3.4.1">
-<!ENTITY markdown-md5sum                "597656cf4feadf1998b0511201620202">
-<!ENTITY meson_python-version           "0.15.0">
-<!ENTITY meson_python-md5sum            "e91eb9946d7bb8be06e434c5a2dadd05">
-<!ENTITY msgpack-version                "1.0.4">
-<!ENTITY msgpack-md5sum                 "1822cdb939e7531f7ad0f7f09b434f22">
-<!ENTITY pathspec-version               "0.10.3">
-<!ENTITY pathspec-md5sum                "d89408b52aff020ac768a14c0ef1c7de">
-<!ENTITY pluggy-version                 "1.4.0">
-<!ENTITY pluggy-md5sum                  "ffb69741271eaeefab3f2ef2435e2d5f">
-<!ENTITY py-version                     "1.11.0">
-<!ENTITY py-md5sum                      "bde7dcc1cb452a1e10206ef2f811ba88">
-<!ENTITY pyproject-metadata-version     "0.7.1">
-<!ENTITY pyproject-metadata-md5sum      "ca5e9527cff96153a976e14530b53746">
-<!ENTITY pytz-version                   "2024.1">
-<!ENTITY pytz-md5sum                    "b26bb090d1fe96064019bf7068eeb801">
-<!ENTITY setuptools_scm-version         "7.1.0">
-<!ENTITY setuptools_scm-md5sum          "158dc741637fb4fa4b955c62bd2c08be">
-<!ENTITY smartypants-version            "2.0.1">
-<!ENTITY snowballstemmer-version        "2.2.0">
-<!ENTITY snowballstemmer-md5sum         "4332ddc7bbee0f344a03915b2ad59a54">
-<!ENTITY sc-applehelp-version           "1.0.4">
-<!ENTITY sc-applehelp-md5sum            "8d52173d3d5c7bd9c0e3da26cd217916">
-<!ENTITY sc-devhelp-version             "1.0.2">
-<!ENTITY sc-devhelp-md5sum              "94069c5cdb5079c445f5477fa6107016">
-<!ENTITY sc-htmlhelp-version            "2.0.1">
-<!ENTITY sc-htmlhelp-md5sum             "e85e6970dc25fbf5fd0f4fa66b897fab">
-<!ENTITY sc-jquery-version              "4.1">
-<!ENTITY sc-jquery-md5sum               "46ea52845b17343ed6c61e6963fb265d">
-<!ENTITY sc-jsmath-version              "1.0.1">
-<!ENTITY sc-jsmath-md5sum               "e45179f0a3608b6766862e0f34c23b62">
-<!ENTITY sc-qthelp-version              "1.0.3">
-<!ENTITY sc-qthelp-md5sum               "93216721f3e154cce12d1e9c3307b415">
-<!ENTITY sc-serializinghtml-version     "1.1.9">
-<!ENTITY sc-serializinghtml-md5sum      "84957dfa6d85d2e509181281082c11ee">
-<!ENTITY typing_extensions-version      "4.4.0">
-<!ENTITY typing_extensions-md5sum       "5cfcb56ea6fc4972c3600c0030f4d136">
-<!ENTITY typogrify-version              "2.0.7">
-<!ENTITY typogrify-md5sum               "63f38f80531996f187d2894cc497ba08">
-<!ENTITY urllib3-version                "2.0.2">
-<!ENTITY urllib3-md5sum                 "92d23af401c19da3daec9934f60c8575">
-<!ENTITY webencodings-version           "0.5.1">
-<!ENTITY webencodings-md5sum            "32f6e261d52e57bf7e1c4d41546d15b8">
-
-<!-- Part IV -->
-<!-- Chapter 14 -->
-<!ENTITY dhcpcd-version               "10.0.6">
-<!--<!ENTITY dhcp-version                 "4.4.3-P1">-->
-
-<!-- Chapter 15 -->
-<!ENTITY bridgeutils-version          "1.7.1">
-<!ENTITY cifsutils-version            "7.0">
-<!ENTITY iw-version                   "6.7">
-<!ENTITY ncftp-version                "3.2.7">
-<!ENTITY net-tools-version            "2.10">
-<!ENTITY nfs-utils-version            "2.6.4">
-<!ENTITY ntp-version                  "4.2.8p17">
-<!ENTITY rpcbind-version              "1.2.6">
-<!ENTITY rsync-version                "3.3.0">
-<!ENTITY samba-version                "4.20.0">
-<!ENTITY wget-version                 "1.24.5">
-<!ENTITY wireless-tools-version       "29">
-<!ENTITY wpa_supplicant-version       "2.10">
-
-<!-- Chapter 16 -->
-<!ENTITY avahi-version                "0.8">
-<!-- for Bind Utilities -->
-<!ENTITY bind-minor-version           "9.18">
-<!ENTITY bind-version                 "&bind-minor-version;.26">
-<!ENTITY bind-md5                     "b9a6f9edd47e91e9fffe2ce8ffe576fb">
-<!ENTITY NetworkManager-minor         "1.46">
-<!ENTITY NetworkManager-version       "&NetworkManager-minor;.0">
-<!ENTITY network-manager-applet-minor "1.34">
-<!ENTITY network-manager-applet-version "&network-manager-applet-minor;.0">
-<!ENTITY nmap-version                 "7.95">
-<!ENTITY traceroute-version           "2.1.5">
-<!ENTITY whois-version                "5.4.3">
-<!ENTITY wireshark-version            "4.2.4">  <!-- even minor versions only -->
-
-<!-- Chapter 17 -->
-<!ENTITY c-ares-version               "1.28.1">
-<!ENTITY curl-version                 "8.7.1">
-<!ENTITY geoclue2-version             "2.7.1">
-<!ENTITY glib-networking-minor        "2.80">
-<!ENTITY glib-networking-version      "&glib-networking-minor;.0">
-<!ENTITY kdsoap-version               "2.2.0">
-<!ENTITY ldns-version                 "1.8.3">
-<!ENTITY libevent-version             "2.1.12">
-<!ENTITY libmnl-version               "1.0.5">
-<!ENTITY libnl-version                "3.9.0">
-<!ENTITY libnl-dl-version             "3_9_0">
-<!ENTITY libnma-version               "1.10.6">
-<!ENTITY libnsl-version               "2.0.1">
-<!ENTITY libpcap-version              "1.10.4">
-<!ENTITY libpsl-version               "0.21.5">
-<!ENTITY libndp-version               "1.8">
-<!ENTITY libslirp-version             "4.7.0">
-<!ENTITY libsoup-minor                "2.74">
-<!ENTITY libsoup-version              "&libsoup-minor;.3">
-<!ENTITY libsoup3-minor               "3.4">
-<!ENTITY libsoup3-version             "&libsoup3-minor;.4">
-<!ENTITY libtirpc-version             "1.3.4">
-<!ENTITY neon-version                 "0.33.0">
-<!ENTITY nghttp2-version              "1.61.0">
-<!ENTITY rpcsvc-proto-version         "1.4.4">
-<!ENTITY serf-version                 "1.3.10">
-<!ENTITY uhttpmock-version            "0.10.0">
-
-<!-- Chapter 18 -->
-<!ENTITY links-version                "2.29">
-<!ENTITY lynx-version                 "2.8.9rel.1">
-
-<!-- Chapter 19 -->
-<!ENTITY fetchmail-version            "6.4.38">
-<!ENTITY mailx-version                "12.5">
-<!ENTITY mutt-version                 "2.2.13">
-<!ENTITY procmail-version             "3.22">
-
-<!-- Part V -->
-<!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.59">
-<!-- Bind version is the same as for Bind Utilities -->
-<!ENTITY kea-dhcp-version             "2.4.1">
-<!ENTITY proftpd-version              "1.3.8b">
-<!ENTITY vsftpd-version               "3.0.5">
-
-<!-- Chapter 21 -->
-<!ENTITY dovecot-major                "2">
-<!ENTITY dovecot-minor                "3">
-<!ENTITY dovecot-micro                "21">
-<!ENTITY dovecot-nano                 "0">
-<!--<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;.&dovecot-nano;">-->
-<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
-
-<!ENTITY exim-version                 "4.97.1">
-<!ENTITY postfix-version              "3.9.0">
-<!ENTITY sendmail-version             "8.18.1">
-
-<!-- Chapter 22 -->
-<!ENTITY db-version                   "5.3.28">
-<!ENTITY lmdb-version                 "0.9.31">
-<!ENTITY mariadb-version              "10.11.7">
-<!ENTITY postgresql-version           "16.2">
-<!ENTITY sqlite-version               "3.45.3">
-<!ENTITY sqlite-year                  "2024">
-<!ENTITY sqlite-dl-version            "3450300">
-<!ENTITY sqlite-doc-version           "3450300">
-
-<!-- Chapter 23 -->
-<!ENTITY openldap-version             "2.6.7">
-<!ENTITY unbound-version              "1.19.3">
-
-<!-- Part VI -->
-<!-- Chapter 24 -->                               <!-- stable lt .90 micro version -->
-<!ENTITY xorg-version                 "7">      <!-- applies to all xorg packages -->
-<!ENTITY util-macros-version          "1.20.1">
-<!ENTITY xorgproto-version            "2024.1">
-<!ENTITY libXau-version               "1.0.11">
-<!ENTITY libXdmcp-version             "1.1.5">
-<!ENTITY xcb-proto-version            "1.17.0">
-<!ENTITY libxcb-version               "1.17.0">
-<!ENTITY libxcvt-version              "0.1.2">
-<!ENTITY xcb-util-version             "0.4.1">
-<!ENTITY xcb-util-image-version       "0.4.1">
-<!ENTITY xcb-util-keysyms-version     "0.4.1">
-<!ENTITY xcb-util-renderutil-version  "0.3.10">
-<!ENTITY xcb-util-wm-version          "0.4.2">
-<!ENTITY xcb-util-cursor-version      "0.1.4">
-<!ENTITY mesa-major-minor             "24.0">
-<!ENTITY mesa-version                 "&mesa-major-minor;.5">
-<!ENTITY xbitmaps-version             "1.1.3">
-<!ENTITY luit-version                 "20240102">
-<!ENTITY xcursor-themes-version       "1.0.7">
-<!ENTITY xkeyboard-config-version     "2.41">
-<!ENTITY xwayland-version             "23.2.6">
-<!ENTITY xorg-server-version          "21.1.13">
-<!ENTITY twm-version                  "1.0.12">
-<!ENTITY xterm-version                "390">
-<!ENTITY xclock-version               "1.1.1">
-<!ENTITY xinit-version                "1.4.2">
-
-<!-- Xorg Drivers, Xorg libraries, Xorg Applications, Xorg Fonts, and Xorg
-     legacy entities are defined in their respective files -->
-
-<!-- Chapter 25 -->
-<!--<!ENTITY amtk-minor                   "5.6">
-<!ENTITY amtk-version                 "&amtk-minor;.1">-->
-<!ENTITY atk-minor                    "2.38">
-<!ENTITY atk-version                  "&atk-minor;.0">
-<!ENTITY atkmm-version                "2.28.4">
-<!ENTITY atkmm2-version               "2.36.3">
-<!ENTITY at-spi2-core-version         "2.52.0">
-<!-- <!ENTITY at-spi2-atk-version          "2.38.0">-->
-<!ENTITY cairo-minor                  "1.18">
-<!ENTITY cairo-version                "&cairo-minor;.0">
-<!ENTITY cairomm-1.0-version          "1.14.5">
-<!ENTITY cairomm-1.16-version         "1.18.0">
-<!--<!ENTITY cogl-version                 "1.22.8">-->
-<!--<!ENTITY clutter-version              "1.26.4">-->
-<!--<!ENTITY clutter-gst-version          "3.0.27">-->
-<!--<!ENTITY clutter-gtk-version          "1.8.4">-->
-<!ENTITY colord-gtk-version           "0.3.1">
-<!ENTITY fltk-version                 "1.3.9">
-<!ENTITY freeglut-version             "3.4.0">
-<!ENTITY gdk-pixbuf-version           "2.42.11">
-<!ENTITY gdk-pixbuf-xlib-version      "2.40.2">
-<!ENTITY gdl-version                  "3.40.0">
-<!ENTITY glew-version                 "2.2.0">
-<!ENTITY glslang-version              "14.1.0">
-<!ENTITY glu-version                  "9.0.3">
-<!ENTITY goffice010-version           "0.10.57">
-<!ENTITY grantlee-version             "5.3.1">
-<!ENTITY graphene-version             "1.10.8">
-<!ENTITY gtk2-version                 "2.24.33">
-<!ENTITY gtk3-version                 "3.24.41">
-<!ENTITY gtk4-minor                   "4.14">
-<!ENTITY gtk4-version                 "&gtk4-minor;.3">
-<!ENTITY gtk-engines-version          "2.20.2">
-<!ENTITY gtkmm3-version               "3.24.9">
-<!ENTITY gtkmm4-version               "4.14.0">
-<!ENTITY gtk-vnc-version              "1.3.1">
-<!ENTITY gtksourceview-version        "3.24.11">
-<!ENTITY gtksourceview4-version       "4.8.4">
-<!ENTITY gtksourceview5-version       "5.12.0">
-<!ENTITY imlib2-version               "1.12.2">
-<!ENTITY kcolorpicker-version         "0.3.1">
-<!ENTITY kimageannotator-version      "0.7.1">
-<!ENTITY keybinder2-version           "0.3.1">
-<!ENTITY keybinder3-version           "0.3.2">
-<!ENTITY libadwaita-minor             "1.5">
-<!ENTITY libadwaita-version           "&libadwaita-minor;.0">
-<!--<!ENTITY libdazzle-version            "3.44.0">-->
-<!ENTITY libgedit-amtk-version        "5.8.0">
-<!ENTITY libgedit-gtksourceview-version "299.1.0">
-<!ENTITY libhandy1-version            "1.8.3">
-<!ENTITY libdrm-version               "2.4.120">
-<!ENTITY libei-version                "1.2.1">
-<!ENTITY libepoxy-minor               "1.5">
-<!ENTITY libepoxy-version             "&libepoxy-minor;.10">
-<!ENTITY libglade-version             "2.6.4">
-<!ENTITY libnotify-version            "0.8.3">
-<!ENTITY libxklavier-version          "5.4">
-<!ENTITY pango-minor                  "1.52">
-<!ENTITY pango-version                "&pango-minor;.2">
-<!ENTITY pangomm-version              "2.46.4">
-<!ENTITY pangomm2-version             "2.52.0">
-<!ENTITY qt5-version                  "5.15.12">
-<!ENTITY qtwebengine-major            "6.7">
-<!ENTITY qtwebengine-version          "6.7.0">
-<!ENTITY qt6-version                  "6.7.0">
-<!ENTITY startup-notification-version "0.12">
-<!ENTITY tepl-version                 "6.9.0">
-<!ENTITY vulkan-headers-version       "1.3.283">
-<!ENTITY vulkan-loader-version        "1.3.283">
-<!ENTITY webkitgtk-version            "2.44.1">    <!-- Even minors only -->
-<!ENTITY xdg-desktop-portal-version   "1.18.2">
-<!ENTITY xdg-desktop-portal-gtk-version "1.15.1">
-
-<!ENTITY gtk2-libdir                  "2.0/2.10.0">
-<!ENTITY qt5-dir                      "$QT5DIR">
-<!ENTITY qt6-dir                      "$QT6DIR">
-
-<!-- Chapter 26 -->
-<!ENTITY gdm-version                  "46.0">
-<!ENTITY lightdm-version              "1.32.0">
-<!ENTITY lightdm-gtk-greeter-version  "2.0.9">
-<!ENTITY sddm-version                 "0.21.0">
-
-<!-- Chapter 27 -->
-<!ENTITY fluxbox-version              "1.3.7">
-<!ENTITY icewm-version                "3.4.7">
-<!ENTITY openbox-version              "3.6.1">
-<!-- <!ENTITY sawfish-version              "1.13.0">-->
-
-<!-- Chapter 28 -->
-<!ENTITY adwaita-icon-theme-version   "46.0">
-<!-- breeze-icons version is the same as kf6-frameworks -->
-<!ENTITY gnome-icon-theme-version     "3.12.0">
-<!ENTITY gnome-icon-theme-extras-version "3.12.0">
-<!ENTITY gnome-icon-theme-symbolic-version "3.12.0">
-<!ENTITY gnome-themes-extra-version   "3.28">
-<!ENTITY hicolor-icon-theme-version   "0.17">
-<!ENTITY icon-naming-utils-version    "0.8.90">
-<!ENTITY lxde-icon-theme-version      "0.5.1">
-<!ENTITY oxygen-icons-version         "6.0.0">
-
-<!-- Part VII -->
-<!-- Chapters 29 -->
-<!ENTITY kde-download-http            "https://download.kde.org/stable/">
-<!-- extra-cmake-modules version is the same as kf6-frameworks -->
-<!ENTITY phonon-version               "4.12.0">
-<!--<!ENTITY phonon-backend-gstreamer-version "4.10.0"> deprecated -->
-<!ENTITY phonon-backend-vlc-version   "0.12.0">
-<!ENTITY polkit-qt-version            "0.200.0">
-<!ENTITY libdbusmenu-qt-version       "0.9.3+16.04.20160218">
-<!ENTITY plasma-wayland-protocols-version "1.12.0">
-<!ENTITY kuserfeedback-version        "1.3.0">
-
-<!-- Chapter 30 -->
-<!ENTITY kf5-version           "5.115.0">
-<!ENTITY kf5-short-version     "5.115">
-<!ENTITY kf5-base              "5.115">
-<!ENTITY kf5-download-http     "https://download.kde.org/stable/frameworks/&kf5-base;">
-
-<!ENTITY kf6-version           "6.1.0">
-<!ENTITY kf6-short-version     "6.1">
-<!ENTITY kf6-base              "6.1">
-<!ENTITY kf6-download-http     "https://download.kde.org/stable/frameworks/&kf6-base;">
-<!ENTITY kf6-solid-version     "6.1.1">
-
-<!-- Chapter 31 -->
-<!ENTITY kf5apps-version       "24.02.0">
-<!ENTITY kf5apps-download-http "https://download.kde.org/stable/release-service/&kf5apps-version;/src">
-<!ENTITY kf6apps-version       "24.02.2">
-<!ENTITY kf6apps-download-http "https://download.kde.org/stable/release-service/&kf6apps-version;/src">
-
-<!-- Chapter 32 -->
-<!ENTITY plasma5-version       "5.27.10">
-<!ENTITY plasma-version        "6.0.3">
-
-
-<!-- Part VIII -->
-<!ENTITY % gnome-entities SYSTEM      "gnome.ent">
-%gnome-entities;
-
-<!-- Part IX -->
-<!-- Chapter 35 -->
-<!ENTITY xfce4-version                "4.18">
-
-<!ENTITY libxfce4util-version         "4.18.2">
-<!ENTITY xfconf-version               "4.18.3">
-<!ENTITY libxfce4ui-version           "4.18.6">
-<!ENTITY exo-version                  "4.18.0">
-<!ENTITY garcon-minor                 "4.18">
-<!ENTITY garcon-version               "&garcon-minor;.2">
-<!ENTITY xfce4-panel-version          "4.18.6">
-<!ENTITY thunar-version               "4.18.10">
-<!ENTITY thunar-volman-version        "4.18.0">
-<!ENTITY tumbler-version              "4.18.2">
-<!ENTITY xfce4-appfinder-version      "4.18.1">
-<!ENTITY xfce4-power-manager-version  "4.18.3">
-<!ENTITY xfce4-settings-version       "4.18.4">
-<!ENTITY xfdesktop-version            "4.18.1">
-<!ENTITY xfwm4-version                "4.18.0">
-<!ENTITY xfce4-session-version        "4.18.3">
-
-<!-- Chapter 36 -->
-<!ENTITY parole-version               "4.18.1">
-<!ENTITY xfce4-terminal-minor         "1.1">
-<!ENTITY xfce4-terminal-version       "&xfce4-terminal-minor;.3">
-<!ENTITY xfburn-version               "0.7.0">
-<!ENTITY ristretto-version            "0.13.2">
-<!ENTITY xfce4-dev-tools-version      "&xfce4-version;.1">
-<!ENTITY xfce4-notifyd-version        "0.9.4">
-<!ENTITY xfce4-pulseaudio-plugin-version "0.4.8">
-
-<!-- Part X -->
-<!-- Chapter 37 -->
-<!--
-<!ENTITY lxmenu-data-version          "0.1.5">
-<!ENTITY libfm-version                "&libfm-extra-version;">
-<!ENTITY pcmanfm-version              "1.3.2">
-<!ENTITY libwnck2-version             "2.30.7">
-<!ENTITY lxpanel-version              "0.10.1">
-<!ENTITY lxappearance-version         "0.6.3">
-<!ENTITY lxsession-version            "0.5.5">
-<!ENTITY lxde-common-version          "0.99.2">
--->
-
-<!-- Part XI -->
-<!-- Chapter 37 -->
-<!ENTITY lxqt-version                 "2.0.0">
-<!ENTITY lxqt-archiver-version        "1.0.0">
-<!ENTITY lxqt-menu-data-version       "1.4.1"> 
-<!ENTITY libdbusmenu-lxqt-version     "0.1.0">
-<!ENTITY libqtxdg-version             "4.0.0">
-<!ENTITY qtxdg-tools-version          "4.0.0">
-<!ENTITY libfm-extra-version          "1.3.2">
-<!ENTITY menu-cache-version           "1.1.0">
-<!ENTITY libsysstat-version           "1.0.0">
-<!ENTITY muparser-version             "2.3.4">
-<!ENTITY obconf-qt-version            "0.16.4">
-<!ENTITY qps-version                  "2.9.0">
-<!ENTITY qtermwidget-version          "1.4.0">
-<!ENTITY qterminal-version            "1.4.0">
-<!ENTITY screengrab-version           "2.8.0">
-<!ENTITY xdg-desktop-portal-lxqt-version "1.0.1">
-
-<!-- Part XI -->
-<!-- Chapter 39 -->
-<!ENTITY AbiWord-version              "3.0.5">
-<!ENTITY gnumeric-version             "1.12.57">
-
-<!ENTITY libreoffice-version          "24.2.2">
-<!ENTITY libreoffice-patch            ".2">
-<!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">
-
-<!-- Chapter 40 -->
-<!ENTITY epiphany-version             "46.0">
-<!-- falkon version is the same as KDE applications -->
-<!-- FIXME: on next ESR after 115 adjust mention in
-  x/installing/tuning-fontconfig to point to wherever the
-  font settings can now be found -->
-<!ENTITY firefox-version              "115.10.0">
-<!ENTITY seamonkey-version            "2.53.18.2">
-<!ENTITY setuptools-version           "68.2.2"> <!-- for seamonkey -->
-
-<!-- Chapter 41 -->
-<!ENTITY balsa-version                "2.6.4">
-<!ENTITY feh-version                  "3.10.2">
-<!ENTITY fontforge-version            "20230101">
-<!ENTITY gimp-version                 "2.10.36">
-<!ENTITY gimp-help-version            "2.10.34">
-<!ENTITY gparted-version              "1.6.0">
-<!ENTITY hexchat-version              "2.16.2">
-<!ENTITY inkscape-minor-version       "1.3.2">
-<!-- Needed for installed dirs: may differ from inkscape version -->
-<!--<!ENTITY lib2geom-version             "1.3.0">-->
-<!ENTITY inkscape-version             "&inkscape-minor-version;_2023-11-25_091e20ef0f">
-<!ENTITY pidgin-version               "2.14.13">
-<!ENTITY rox-filer-version            "2.11">
-<!ENTITY rxvt-unicode-version         "9.31">
-<!ENTITY thunderbird-version          "115.10.1">
-<!ENTITY tigervnc-version             "1.13.1">
-<!ENTITY transmission-version         "4.0.5">
-<!ENTITY xarchiver-version            "0.5.4.23">
-<!ENTITY xdg-utils-version            "1.2.1">
-<!ENTITY xscreensaver-version         "6.08">
-
-<!-- Part XI -->
-<!-- Chapter 42 -->
-<!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.7">
-<!ENTITY alsa-lib-version             "1.2.11">
-<!ENTITY alsa-plugins-version         "1.2.7.1">
-<!ENTITY alsa-utils-version           "1.2.11">
-<!ENTITY alsa-tools-version           "1.2.11">
-<!ENTITY alsa-firmware-version        "1.2.4">
-<!ENTITY alsa-oss-version             "1.1.8">
-<!ENTITY audiofile-version            "0.3.6">
-<!ENTITY faac-version                 "1_30">
-<!ENTITY faad2-version                "2.11.1">
-<!ENTITY fdk-aac-version              "2.0.3">
-<!ENTITY flac-version                 "1.4.3">
-<!ENTITY frei0r-version               "1.8.0">
-<!ENTITY gavl-version                 "1.4.0">
-<!ENTITY gstreamer10-version          "1.24.2">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-base-version   "1.24.2">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-good-version   "1.24.2">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-bad-version    "1.24.2">  <!-- Even minors only -->
-<!ENTITY gst10-plugins-ugly-version   "1.24.2">  <!-- Even minors only -->
-<!ENTITY gst10-libav-version          "1.24.2">  <!-- Even minors only -->
-<!ENTITY gstreamer-vaapi-version      "1.24.2">  <!-- Even minors only -->
-<!ENTITY id3lib-version               "3.8.3">
-<!ENTITY intel-media-version          "23.4.3">
-<!ENTITY liba52-version               "0.8.0">
-<!ENTITY libao-version                "1.2.0">
-<!ENTITY libaom-version               "3.8.2">
-<!ENTITY libass-version               "0.17.1">
-<!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.3">
-<!ENTITY libdvdnav-version            "6.1.1">
-<!ENTITY libdv-version                "1.0.0">
-<!ENTITY libmad-version               "0.15.1b">
-<!ENTITY libmpeg2-version             "0.5.1">
-<!ENTITY libmusicbrainz-version       "2.1.5">
-<!ENTITY libmusicbrainz5-version      "5.1.0">
-<!ENTITY libogg-version               "1.3.5">
-<!ENTITY libplacebo-version           "6.338.2">
-<!ENTITY libquicktime-version         "1.2.4">
-<!ENTITY libsamplerate-version        "0.2.2">
-<!ENTITY libsndfile-version           "1.2.2">
-<!ENTITY libtheora-version            "1.1.1">
-<!ENTITY libvorbis-version            "1.3.7">
-<!ENTITY libvpx-version               "1.14.0">
-<!ENTITY mlt-version                  "7.22.0">
-<!ENTITY opus-version                 "1.5.2">
-<!ENTITY pipewire-version             "1.0.5">
-<!ENTITY pulseaudio-major-version     "17.0">
-<!ENTITY pulseaudio-version           "&pulseaudio-major-version;">
-<!ENTITY sbc-version                  "2.0">
-<!ENTITY sdl-version                  "1.2.68">
-<!ENTITY sdl2-version                 "2.30.1">
-<!ENTITY sound-theme-freedesktop-version "0.8">
-<!ENTITY soundtouch-version           "2.3.3">
-<!ENTITY speex-version                "1.2.1">
-<!ENTITY speexdsp-version             "1.2.1">
-<!ENTITY taglib-version               "2.0.1">
-<!ENTITY v4l-utils-version            "1.26.1">
-<!ENTITY wireplumber-version          "0.5.2">
-<!ENTITY x264-version                 "20240216">
-<!ENTITY x265-version                 "20240216">
-<!ENTITY xine-lib-version             "1.2.13">
-<!ENTITY xvid-version                 "1.3.7">
-
-<!-- Chapter 43 -->
-<!ENTITY audacious-version            "4.3.1">
-<!ENTITY audacious-plugins-version    "4.3.1">
-<!ENTITY CDParanoia-version           "III-10.2">
-<!-- kwave version is the same as KDE applications -->
-<!ENTITY lame-version                 "3.100">
-<!ENTITY mpg123-version               "1.32.6">
-<!ENTITY pavucontrol-version          "5.0">
-<!ENTITY pnmixer-version              "0.7.2">
-<!ENTITY vorbistools-version          "1.4.2">
-
-<!-- Chapter 44 -->
-<!ENTITY ffmpeg-version               "7.0">
-<!ENTITY mplayer-version              "1.5">
-<!ENTITY mpv-version                  "0.38.0">
-<!ENTITY transcode-version            "1.1.7">
-<!ENTITY vlc-version                  "3.0.20">
-<!ENTITY xine-ui-version              "0.99.14">
-
-<!-- Chapter 45 -->
-<!ENTITY cdrdao-version               "1.2.4">
-<!ENTITY cdrtools-version             "3.02a09">
-<!ENTITY dvd-rw-tools-version         "7.1">
-<!ENTITY libburn-version              "1.5.6">
-<!ENTITY libisoburn-version           "1.5.6">
-<!ENTITY libisofs-version             "1.5.6">
-
-<!-- Part XIII -->
-<!-- Chapter 46 -->
-<!ENTITY cups-version                 "2.4.7">
-<!ENTITY cups-browsed-version         "2.0.0">
-<!ENTITY cups-filters-version         "2.0.0">
-<!ENTITY gs-version                   "10.03.0">
-<!ENTITY gs-dl-version                "10.03.0">
-<!ENTITY gs-packver                   "10030">
-<!ENTITY gutenprint-version           "5.3.4">
-<!ENTITY libcupsfilters-version       "2.0.0">
-<!ENTITY libppd-version               "2.0.0">
-
-<!-- Chapter 47 -->
-<!ENTITY sane-version                 "1.2.1">
-<!--<!ENTITY sane-fe-version              "1.0.14">-->
-<!ENTITY simple-scan-version          "46.0">
-<!--<!ENTITY xsane-version                "0.999">-->
-
-<!-- Chapter 48 -->
-<!ENTITY sgml-common-version          "0.6.3">
-<!ENTITY docbook-3.1-dtd-version      "3.1">
-<!ENTITY docbook-4.5-dtd-version      "4.5">
-<!ENTITY opensp-version               "1.5.2">
-<!ENTITY openjade-version             "1.3.2">
-<!ENTITY docbook-dsssl-version        "1.79">
-<!ENTITY docbook-utils-version        "0.6.14">
-
-<!-- Chapter 49 -->
-<!ENTITY docBook-45-xml-version       "4.5">
-<!-- docBook-5.0 and docBook-5.1 versions are hardcoded in their files -->
-<!ENTITY docbook-xsl-version          "1.79.2">
-<!ENTITY itstool-version              "2.0.7">
-<!ENTITY xmlto-version                "0.0.28">
-
-<!-- Chapter 50 -->
-<!ENTITY enscript-version             "1.6.6">
-<!ENTITY epdfview-version             "gtk3-20200814">
-<!ENTITY fop-version                  "2.9">
-<!ENTITY mupdf-version                "1.24.1">
-<!ENTITY paps-version                 "0.8.0">
-
-<!-- Chapter 51 -->
-<!ENTITY texlive-version              "20240312">
-<!ENTITY texmf-version                "20240312">
-<!-- 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                 "2024">
-<!ENTITY asymptote-version            "2.89">
-<!ENTITY biber-version                "2.20">
-<!ENTITY biblatex-version             "3.20">
-<!ENTITY dvisvgm-version              "3.3">
-<!ENTITY xindy-version                "2.5.1">
-
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/config/bootdisk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,102 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-config-bootdisk">
+<?dbhtml filename="bootdisk.html" dir="postlfs"?>
+<title>Creating a custom bootdisk</title>
 
-<sect1 id="postlfs-config-bootdisk" xreflabel="Creating a Custom Boot Device">
-  <?dbhtml filename="bootdisk.html"?>
+<para>How to create a decent bootdisk</para>
 
+</sect1>
 
-  <title>Creating a Custom Boot Device</title>
-
-  <sect2>
-    <title>Decent Rescue Boot Device Needs</title>
-
-    <para>
-      This section is really about creating a <emphasis>rescue</emphasis>
-      device.  As the name <emphasis>rescue</emphasis> implies, the host
-      system has a problem, often lost partition information or corrupted file
-      systems, that prevents it from booting and/or operating normally.  For
-      this reason, you <emphasis>must not</emphasis> depend on resources from
-      the host being "rescued".  To presume that any given partition or hard
-      drive <emphasis>will</emphasis> be available is a risky presumption.
-    </para>
-
-    <para>
-      In a modern system, there are many devices that can be used as a
-      rescue device: floppy, cdrom, usb drive, or even a network card.
-      Which one you use depends on your hardware and your BIOS.  In the past,
-      a rescue device was thought to be a floppy disk.  Today, many
-      systems do not even have a floppy drive.
-    </para>
-
-    <para>
-      Building a complete rescue device is a challenging task.  In many
-      ways, it is equivalent to building an entire LFS system.
-      In addition, it would be a repetition of information already available.
-      For these reasons, the procedures for a rescue device image are not
-      presented here.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Creating a Rescue Floppy</title>
-
-    <para>
-      The software of today's systems has grown large.  Linux 2.6 no longer
-      supports booting directly from a floppy.  In spite of this, there are
-      solutions available using older versions of Linux.  One of the best is
-      Tom's Root/Boot Disk available at <ulink
-      url='http://www.toms.net/rb/'/>.  This will provide a minimal Linux
-      system on a single floppy disk and provides the ability to customize
-      the contents of your disk if necessary.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Creating a Bootable CD-ROM</title>
-
-    <para>
-      There are several sources that can be used for a rescue CD-ROM.
-      Just about any commercial distribution's installation CD-ROMs or
-      DVDs will work.  These include RedHat, Ubuntu, and SuSE.  One
-      very popular option is Knoppix.
-    </para>
-
-    <para>
-      Also, the LFS Community has developed its own LiveCD available at
-      <ulink url='https://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
-      ISO image, use <xref linkend="xorriso"/> to copy the image to a
-      CD-ROM.
-    </para>
-
-    <para>
-      The instructions for using GRUB2 to make a custom rescue CD-ROM are
-      also available in <ulink url='&lfs-root;/chapter10/grub.html'>LFS
-      Chapter 10</ulink>.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Creating a Bootable USB Drive</title>
-
-    <para>
-      A USB Pen drive, sometimes called a Thumb drive, is recognized by Linux
-      as a SCSI device.  Using one of these devices as a rescue device has
-      the advantage that it is usually large enough to hold more than a
-      minimal boot image.  You can save critical data to the drive as well
-      as use it to diagnose and recover a damaged system.  Booting such a
-      drive requires BIOS support, but building the system consists of
-      formatting the drive, adding <application>GRUB</application> as well
-      as the Linux kernel and supporting files.
-    </para>
-
-  </sect2>
-</sect1>
Index: stlfs/config/builtin-fw-kernel.xml
===================================================================
--- postlfs/config/builtin-fw-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>G</emphasis>eneric Driver Options ---&gt;
-    <emphasis role='blue'>F</emphasis>irmware loader ---&gt;
-      &lt;*&gt;                   <emphasis role='blue'>F</emphasis>irmware loading facility                [FW_LOADER]
-      (xx/aa.bin xx/bb.bin)   <emphasis role='blue'>B</emphasis>uild named firmware blobs into the kernel binary
-                                                           ...  [EXTRA_FIRMWARE]
-      (/lib/firmware)           <emphasis role='blue'>F</emphasis>irmware blobs root directory
-                                                       ...  [EXTRA_FIRMWARE_DIR]</screen>
Index: postlfs/config/config.xml
===================================================================
--- postlfs/config/config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/config/config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,67 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="postlfs-config">
+<?dbhtml filename="config.html" dir="postlfs"?>
+<title>After LFS Configuration Issues</title>
 
-<chapter id="postlfs-config" xreflabel="After LFS Configuration Issues">
-  <?dbhtml filename="config.html"?>
+<para>The intention of LFS is to provide a basic system which you can
+build upon.  There are several things which many people wonder about to
+do with tidying up their system once they have done the base install.
+We hope to cover these issues in this chapter.</para>
 
-  <title>After LFS Configuration Issues</title>
+<para>Most people coming from a Windows background to Linux find the
+concept of text-only configuration files slightly strange.  In Linux,
+just about all configuration is done via text files.  The majority of
+these files can be found in the <filename>/etc</filename> hierarchy.
+There are often graphical configuration programs available for different
+subsystems but these are mostly simply pretty frontends to the process
+of editing the file.  The advantage of text-only configuration is that
+you can edit parameters using your favourite text editor, whether that
+be vim, emacs or anything else.</para>
 
-  <para>
-    The intention of LFS is to provide a basic system which you can
-    build upon.  There are several things about tidying up the system which
-    many people wonder about once they have done the base install.
-    We hope to cover these issues in this chapter.
-  </para>
+&postlfs-config-logon;
+&postlfs-config-profile;
+&postlfs-config-inputrc;
+&postlfs-config-random;
+&postlfs-config-vimrc;
+&postlfs-config-bootdisk;
+&postlfs-config-manpages;
 
-  <para>
-    Most people coming from non-Unix like backgrounds to Linux find the
-    concept of text-only configuration files slightly strange.  In Linux, just
-    about all configuration is done via the manipulation of text files. The
-    majority of these files can be found in the <filename
-    class='directory'>/etc</filename> hierarchy. There are often graphical
-    configuration programs available for different subsystems but most
-    are simply pretty front ends to the process of editing a text file. The
-    advantage of text-only configuration is that you can edit parameters using
-    your favorite text editor, whether that be <command>vim</command>,
-    <command>emacs</command>, or any other editor.
-  </para>
+</chapter>
 
-  <para>
-    The first task is making a recovery boot device in <xref
-    linkend="postlfs-config-bootdisk"/> because it's the most critical need.
-    Hardware issues relevant to firmware and other devices is addressed next.
-    The system is then configured to ease addition of new users, because this
-    can affect the choices you make in the two subsequent
-    topics&mdash;<xref linkend="postlfs-config-profile"/> and
-    <xref linkend="postlfs-config-vimrc"/>.
-  </para>
-
-  <para revision="sysv">
-    The remaining topics, <xref linkend="postlfs-config-logon"/> and
-    <xref linkend="postlfs-config-random"/> are then addressed, in that order.
-    They don't have much interaction with the other topics in this chapter.
-  </para>
-
-  <para revision="systemd">
-    There is one remaining topic: <xref linkend="postlfs-config-logon"/>.
-    It doesn't have much interaction with the other topics in this chapter.
-  </para>
-<!-- autofs has been moved to sysutils -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootdisk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="console-fonts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firmware.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="skel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="users.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>
-
-  <!-- sysv only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/>
-</chapter>
Index: stlfs/config/console-fonts.xml
===================================================================
--- postlfs/config/console-fonts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-console-fonts" xreflabel="About Console Fonts">
-  <?dbhtml filename="console-fonts.html"?>
-
-
-  <title>About Console Fonts</title>
-
-  <indexterm zone="postlfs-console-fonts">
-    <primary sortas="a-console-fonts">console-fonts</primary>
-  </indexterm>
-
-  <para>
-    An LFS system can be used without a graphical desktop, and unless or until
-    you install <xref linkend="x-window-system"/> you will have to work in the
-    console. Most, if not all, PCs boot with an 8x16 font - whatever the actual
-    screen size. There are a few things you can do to alter the display on the
-    console. Most of them involve changing the font, but the first alters the
-    commandline used by grub.
-  </para>
-
-  <sect2 id="grub-video">
-    <title>Setting a smaller screen size in grub</title>
-
-    <indexterm zone="postlfs-console-fonts grub-video">
-      <primary sortas="e-boot-grub-grub-cfg">/boot/grub/grub.cfg</primary>
-    </indexterm>
-
-    <para>
-      Modern screens often have a lot more pixels then the screens used in the
-      past. If your screen is 1600 pixels wide, an 8x16 font will give you 200
-      columns of text - unless your monitor is enormous, the text will be tiny.
-      One of the ways to work around this is to tell grub to use a smaller size,
-      such as 1024x768 or 800x600 or even 640x480. Even if your screen does not
-      have a 4:3 aspect ratio, this should work.
-    </para>
-
-    <para>
-      To try this, you can reboot and edit grub's command-line to insert a
-      'video=' parameter between the 'root=/dev/sdXn' and 'ro', for example
-      <literal>root=/dev/sda2 video=1024x768 ro</literal> based on the
-      example in LFS section 10.4.4 :
-      <ulink url="&lfs-root;/chapter10/grub.html"/>.
-    </para>
-
-    <para>
-      If you decide that you wish to do this, you can then (as the
-      <systemitem class="username">root</systemitem> user) edit
-      <filename>/boot/grub/grub.cfg</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 id="psf-fonts">
-    <title>Using the standard psf fonts</title>
-
-    <indexterm zone="postlfs-console-fonts psf-fonts">
-      <primary sortas="g-usr-share-consolefonts">/usr/share/consolefonts</primary>
-    </indexterm>
-
-    <para>
-      In LFS the <application>kbd</application> package is used. The fonts it
-      provides are PC Screen Fonts, usually called PSF, and they were installed
-      into <filename class="directory">/usr/share/consolefonts</filename>. Where
-      these include a unicode mapping table, the file suffix is often changed to
-       <literal>.psfu</literal> although packages such as
-      <application>terminus-font</application> (see below) do not add the 'u'.
-      These fonts are usually compressed with gzip to save space, but that is
-      not essential.
-    </para>
-
-    <para>
-      The initial PC text screens had 8 colours, or 16 colours if the bright
-      versions of the original 8 colours were used. A PSF font can include up
-      to 256 characters (technically, glyphs) while allowing 16 colours, or up
-      to 512 characters (in which  case, the bright colours will not be
-      available). Clearly, these console fonts cannot be used to display CJK
-      text - that would need thousands of available glyphs.
-    </para>
-
-    <para>
-      Some fonts in <application>kbd</application> can cover more than 512
-      codepoints ('characters'), with varying degrees of fidelity: unicode
-      contains several whitespace codepoints which can all be mapped to a space,
-      varieties of dashes can be mapped to a minus sign, smart quotes can map to
-      the regular ASCII quotes rather than to whatever is used for "codepoint
-      not present or invalid", and those cyrillic or greek letters which look
-      like latin letters can be mapped onto them, so 'A' can also do duty for
-      cyrillic A and greek Alpha, and 'P' can also do duty for cyrillic ER and
-      greek RHO. Unfortunately, where a font has been created from a BDF file
-      (the method in terminus and Debian's <ulink
-      url="https://packages.debian.org/jessie/utils/console-setup">console-setup
-      </ulink>) such mapping of additional codepoints onto an existing glyph is
-      not always done, although the terminus ter-vXXn fonts do this well.
-    </para>
-
-    <para>
-      There are over 120 combinations of font and size in
-      <application>kbd</application>: often a font is provided at several
-      character sizes, and sometimes varieties cover different subsets of
-      unicode. Most are 8 pixels wide, in heights from 8 to 16 pixels, but there
-      are a few which are 9 pixels wide, some others which are 12x22, and even
-      one (<filename>latarcyrheb-sun32.psfu</filename>) which has been scaled up
-      to 16x32. Using a bigger font is another way of making text on a large
-      screen easier to read.
-    </para>
-
-  </sect2>
-
-  <sect2 id="testing-fonts">
-    <title>Testing different fonts</title>
-
-    <para>
-      You can test fonts as a normal user. If you have a font which has not been
-      installed, you can load it with :
-    </para>
-
-<screen><userinput>setfont /path/to/yourfont.ext</userinput></screen>
-
-    <para>
-      For the fonts already installed you only need the name, so using
-      <filename>gr737a-9x16.psfu.gz</filename> as an example:
-    </para>
-
-<screen><userinput>setfont gr737a-9x16</userinput></screen>
-
-    <para>
-      To see the glyphs in the font, use:
-    </para>
-
-<screen><userinput>showconsolefont</userinput></screen>
-
-    <para>
-      If the font looks as if it might be useful, you can then go on to test it
-      more thoroughly.
-    </para>
-
-    <para>
-      When you find a font which you wish to use, as the
-      <systemitem class="username">root</systemitem> user) edit
-      <phrase revision="sysv">
-      <filename>/etc/sysconfig/console</filename> as described in
-      LFS section 9.6.5
-      <ulink url="&lfs-root;/chapter09/usage.html"/>.</phrase>
-      <phrase revision="systemd">
-      <filename>/etc/vconsole.conf</filename> as described in
-      LFS section 9.6
-      <ulink url="&lfs-root;/chapter09/console.html"/>.</phrase>.
-    </para>
-
-    <para>
-      For fonts not supplied with the <application>kbd</application> package
-      you will need to optionally compress it / them with
-      <command>gzip</command> and then install it / them as the
-     <systemitem class="username">root</systemitem> user.
-    </para>
-
-  </sect2>
-
-<!-- after that, psf-tools -->
-
-  <sect2 id="psf-tools">
-    <title>Editing fonts using psf-tools</title>
-
-    <indexterm zone="postlfs-console-fonts psf-tools">
-      <primary sortas="a-psftools">psftools</primary>
-    </indexterm>
-
-    <para>
-      Although some console fonts are created from BDF files, which is a text
-      format with hex values for the pixels in each row of the character, there
-      are more-modern tools available for editing psf fonts. The
-      <ulink url="https://www.seasip.info/Unix/PSF/">psftools</ulink> package
-      allows you to dump a font to a text representation with a dash for a
-      pixel which is off (black) and a hash for a pixel which is on (white).
-      You can then edit the text file to add more characters, or reshape them,
-      or map extra codepoints onto them, and then create a new psf font with
-      your changes.
-    </para>
-
-  </sect2>
-
-<!-- finally, link to terminus and link to it from above -->
-  <sect2 id="terminus-font">
-    <title>Using fonts from Terminus-font</title>
-
-    <indexterm zone="postlfs-console-fonts terminus-font">
-      <primary sortas="a-terminus-font">terminus-font</primary>
-    </indexterm>
-
-    <para>
-      The <ulink
-      url="https://terminus-font.sourceforge.net/">Terminus Font</ulink> package
-      provides fixed-width bitmap fonts designed for long (8 hours and more per
-      day) work with computers. Under 'Character variants' on that page is a
-      list of patches (in the <filename class="directory">alt/</filename>
-      directory). If you are using a graphical browser to look at that page, you
-      can see what the patches do, e.g. 'll2' makes 'l' more visibly different
-      from 'i' and '1'.
-    </para>
-
-    <para>
-      By default <application>terminus-fonts</application> will try to create
-      several types of font, and it will fail if <command>bdftopcf</command>
-      from <xref linkend="xorg7-app"/> has not been installed. The configure
-      script is only really useful if you go on to install
-      <emphasis>all</emphasis> the fonts (console and X11 bitmap) to the
-      correct directories, as in a distro. To build only the PSF fonts and
-      their dependencies, run:
-    </para>
-
-<screen><userinput>make psf</userinput></screen>
-
-    <para>
-      This will create more than 240 ter-*.psf fonts.  The 'b' suffix indicates
-      bright, 'n' indicates normal. You can then test them to see if any fit
-      your requirements. Unless you are creating a distro, there seems little
-      point in installing them all.
-    </para>
-
-    <para>
-      As an example, to install the last of these fonts, you can gzip it and
-      then as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen><userinput>install -v -m644 ter-v32n.psf.gz /usr/share/consolefonts</userinput></screen>
-
-  </sect2>
-
-
-<!-- then svn up, add changelog, do the propsets, create wiki page -->
-</sect1>
Index: stlfs/config/devices.xml
===================================================================
--- postlfs/config/devices.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,204 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-devices" xreflabel="About Devices">
-  <?dbhtml filename="devices.html"?>
-
-
-  <title>About Devices</title>
-
-  <indexterm zone="postlfs-devices">
-    <primary sortas="e-etc-udev-rules">/etc/udev/rules.d</primary>
-  </indexterm>
-
-  <para>
-    Although most devices needed by packages in BLFS and beyond are set up
-    properly by <application>udev</application> using the default rules
-    installed by LFS in <filename
-    class="directory">/etc/udev/rules.d</filename>, there are cases where
-    the rules must be modified or augmented.
-  </para>
-
-  <sect2>
-    <title>Multiple Sound Cards</title>
-
-    <para>
-      If there are multiple sound cards in a system, the "default"
-      sound card becomes random.  The method to establish sound card order
-      depends on whether the drivers are modules or not.  If the sound card
-      drivers are compiled into the kernel, control is via kernel command line
-      parameters in <filename>/boot/grub/grub.cfg</filename>.  For example,
-      if a system has both an FM801 card and a SoundBlaster PCI card, the
-      following can be appended to the command line:
-    </para>
-
-<screen><literal>snd-fm801.index=0 snd-ens1371.index=1</literal></screen>
-
-    <para>
-      If the sound card drivers are built as modules, the order can be
-      established in the <filename>/etc/modprobe.conf</filename> file with:
-    </para>
-
-<screen><literal>options snd-fm801 index=0
-options snd-ens1371 index=1</literal></screen>
-
-  </sect2>
-
-  <sect2 id="usb-device-issues">
-    <title>USB Device Issues</title>
-
-    <para>
-      USB devices usually have two kinds of device nodes associated with them.
-    </para>
-
-    <para>
-      The first kind is created by device-specific drivers (e.g.,
-      usb_storage/sd_mod or usblp) in the kernel. For example, a USB mass
-      storage device would be /dev/sdb, and a USB printer would be
-      /dev/usb/lp0. These device nodes exist only when the device-specific
-      driver is loaded.
-    </para>
-
-    <para>
-      The second kind of device nodes (/dev/bus/usb/BBB/DDD, where BBB is
-      the bus number and DDD is the device number) are created even if the
-      device doesn't have a kernel driver. By using these "raw" USB device
-      nodes, an application can exchange arbitrary USB packets with the
-      device, i.e., bypass the possibly-existing kernel driver.
-    </para>
-
-    <para>
-      Access to raw USB device nodes is needed when a userspace program is
-      acting as a device driver. However, for the program to open the device
-      successfully, the permissions have to be set correctly. By default, due
-      to security concerns, all raw USB devices are owned by user root and
-      group root, and have 0664 permissions (the read access is needed, e.g.,
-      for lsusb to work and for programs to access USB hubs). Packages (such
-      as SANE and libgphoto2) containing userspace USB device drivers also
-      ship udev rules that change the permissions of the controlled raw USB
-      devices. That is, rules installed by SANE change permissions for known
-      scanners, but not printers.  If a package maintainer forgot to write
-      a rule for your device, report a bug to both BLFS (if the package is
-      there) and upstream, and you will need to write your own rule.
-    </para>
-
-    <para>
-      Before Linux-2.6.15, raw USB device access was performed not with
-      /dev/bus/usb/BBB/DDD device nodes, but with /proc/bus/usb/BBB/DDD
-      pseudofiles. Some applications still use only
-      this deprecated technique and can't use the new device nodes.  They
-      cannot work with Linux kernel version 3.5 or newer.  If you need to
-      run such an application, contact the developer of it for a fix.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Udev Device Attributes</title>
-
-    <para>
-      Fine-tuning of device attributes such as group name and permissions
-      is possible by creating extra <application>udev</application> rules,
-      matching on something like this. The vendor and product can be found by
-      searching the <filename class='directory'>/sys/devices</filename>
-      directory entries or using <command>udevadm info</command> after the
-      device has been attached. See the documentation in the current
-      <application>udev</application> directory of <filename
-      class='directory'>/usr/share/doc</filename> for details.
-    </para>
-
-<screen><literal>SUBSYSTEM=="usb_device", SYSFS{idVendor}=="05d8", SYSFS{idProduct}=="4002", \
-  GROUP:="scanner", MODE:="0660"</literal></screen>
-
-    <note>
-      <para>
-        The above line is used for descriptive purposes only. The
-        scanner <application>udev</application> rules are put into place when
-        installing <xref linkend='sane'/>.
-      </para>
-    </note>
-
-  </sect2>
-
-<!--
-  <sect2>
-    <title>Multiple Network Interfaces</title>
-
-
-  </sect2>
--->
-
-<!-- These instructions are invalid on systemd because we don't use bootscripts.
-     In addition, we should probably verify that these are valid on SysV too.-->
-
-  <sect2 revision="sysv">
-    <title>Devices for Servers</title>
-
-    <para>
-      In some cases, it makes sense to disable
-      <application>udev</application> completely and create static devices.
-      Servers are one example of this situation.  Does a server need the
-      capability of handling dynamic devices?  Only the system administrator
-      can answer that question, but in many cases the answer will be no.
-    </para>
-
-    <para>
-      If dynamic devices are not desired, then static devices must be
-      created on the system.  In the default configuration, the
-      <filename>/etc/rc.d/rcS.d/S10udev</filename> boot script mounts a
-      <systemitem class="filesystem">tmpfs</systemitem> partition over the
-      <filename class="directory">/dev</filename> directory. This problem can
-      be overcome by mounting the root partition temporarily:
-    </para>
-
-    <warning>
-      <para>
-        If the instructions below are not followed carefully, your
-        system could become unbootable.
-      </para>
-    </warning>
-
-
-<screen><userinput>mount --bind / /mnt
-cp -a /dev/* /mnt/dev
-rm /etc/rc.d/rcS.d/{S10udev,S50udev_retry}
-umount /mnt</userinput></screen>
-
-    <para>
-      At this point, the system will use static devices upon the next
-      reboot.  Create any desired additional devices using
-      <command>mknod</command>.
-    </para>
-
-    <para>
-      If you want to restore the dynamic devices, recreate the
-      <filename>/etc/rc.d/rcS.d/{S10udev,S50udev_retry}</filename> symbolic
-      links and reboot again.  Static devices do not need to be removed
-      (console and null are always needed) because they are covered by the
-      <systemitem class="filesystem">tmpfs</systemitem> partition.  Disk
-      usage for devices is negligible (about 20&ndash;30 bytes per entry.)
-    </para>
-
-  </sect2>
-
-  <sect2 id="dev-dvd">
-    <title>Devices for DVD Drives</title>
-
-    <para>
-      If the initial boot process does not set up the
-      <systemitem>/dev/dvd</systemitem> device properly, it can
-      be installed using the following modification to the default udev rules.
-      As the <systemitem class="username">root</systemitem> user, run:
-    </para>
-
-<screen><userinput>sed '1d;/SYMLINK.*cdrom/ a\
-KERNEL=="sr0", ENV{ID_CDROM_DVD}=="1", SYMLINK+="dvd", OPTIONS+="link_priority=-100"' \
-/lib/udev/rules.d/60-cdrom_id.rules > /etc/udev/rules.d/60-cdrom_id.rules</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: stlfs/config/firmware.xml
===================================================================
--- postlfs/config/firmware.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,751 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 linux-firmware-git "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git">
-]>
-
-<sect1 id="postlfs-firmware" xreflabel="About Firmware">
-  <?dbhtml filename="firmware.html"?>
-
-
-  <title>About Firmware</title>
-
-  <indexterm zone="postlfs-firmware">
-    <primary sortas="e-lib-firmware">/lib/firmware</primary>
-  </indexterm>
-
-  <para>
-    On some recent PCs it can be necessary, or desirable, to load firmware
-    to make them work at their best. There is a directory, <filename
-    class="directory">/lib/firmware</filename>, where the kernel or kernel
-    drivers look for firmware images.
-  </para>
-
-  <para>
-    Currently, most firmware can be found at a <userinput>git</userinput>
-    repository which can be viewed in the browser with the URL
-    <ulink url="&linux-firmware-git;/plain"/>.
-    For convenience, the LFS Project has created a mirror, updated daily, where
-    these firmware files can be accessed via <userinput>wget</userinput> or a
-    web browser at <ulink url="&sources-anduin-http;/linux-firmware/"/>.
-  </para>
-
-  <para>
-    To get the firmware, either point a browser to one of the above
-    repositories and then download the item(s) which you need.  If you want
-    all these firmware files (for example you are distributing the system
-    onto multiple hardware systems), install <xref linkend="git"/> and clone
-    <ulink url='&linux-firmware-git;'/>, or open this URL in a browser and
-    download the latest snapshot listed in the <literal>Tag</literal>
-    table.
-  </para>
-
-  <para>
-    For some other firmware, particularly for Intel microcode and certain
-    wifi devices, the needed firmware is not available in the above repository.
-    Some of this will be addressed below, but a search of the Internet for
-    needed firmware is sometimes necessary.
-  </para>
-
-  <para>
-    Firmware files are conventionally referred to as blobs because you cannot
-    determine what they will do. Note that firmware is distributed under
-    various different licenses which do not permit disassembly or
-    reverse-engineering.
-  </para>
-
-  <para>
-    Firmware for PCs falls into four categories:
-  </para>
-
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para>
-        Updates to the CPU to work around errata, usually referred to as
-        microcode.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Firmware for video controllers. On x86 machines this is required for
-        ATI devices (Radeon and AMDGPU chips) and may be useful for Intel (Skylake
-        and later) and Nvidia (Kepler and later) GPUs.
-      </para>
-
-      <para>
-        ATI Radeon and AMDGPU devices all require firmware to be able to use KMS
-        (kernel modesetting - the preferred option) as well as for Xorg. For
-        old radeon chips (before the R600), the firmware is still in the
-        kernel source.
-      </para>
-
-      <para>
-        Intel integrated GPUs from Skylake onwards can use firmware for GuC
-        (the Graphics microcontroller), and also for the HuC (HEVC/H265
-        microcontroller which offloads to the GPU) and the DMC (Display
-        Microcontroller) to provide additional low-power states. The GuC and
-        HuC have had a chequered history in the kernel and updated firmware
-        may be disabled by default, depending on your kernel version. Further
-        details may be found at <ulink
-        url="https://01.org/linuxgraphics/downloads/firmware/">01.org</ulink>
-        and <ulink
-        url="https://wiki.archlinux.org/index.php/intel_graphics">Arch
-        linux</ulink>.
-      </para>
-
-      <para>
-        Nvidia GPUs from Kepler onwards require signed firmware, otherwise the
-        nouveau driver is unable to provide hardware acceleration. Nvidia has
-        now released firmware up to Ampere (GeForce30 series) to linux-firmware.
-        Note that faster clocks than the default are not enabled
-        by the released firmware.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Firmware updates for wired network ports. Most of them work even
-        without the updates, but they will probably work better with
-        the updated firmware. For some modern laptops, firmware for both
-        wired ethernet (e.g. rtl_nic) and also for bluetooth devices (e.g. qca)
-        is <emphasis>required</emphasis> before the wired network can be used.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        Firmware for other devices, such as wireless NICs. These devices are not
-        required for the PC to boot, but need the firmware before these devices
-        can be used.
-      </para>
-    </listitem>
-  </itemizedlist>
-
-  <note>
-    <para>
-      Although not needed to load a firmware blob, the following
-      tools may be useful for determining, obtaining, or preparing the needed
-      firmware in order to load it into the system:
-      <xref linkend="cpio"/>,
-      <xref linkend="git"/>,
-      <xref linkend="pciutils"/>, and
-      <xref linkend="wget"/>
-    </para>
-  </note>
-
-
-  <sect2 id="cpu-microcode">
-    <title>Microcode updates for CPUs</title>
-
-    <para>
-      In general, microcode can be loaded by the BIOS or UEFI, and it might be
-      updated by upgrading to a newer version of those. On linux, you can also
-      load the microcode from the kernel if you are using an AMD family 10h or
-      later processor (first introduced late 2007), or an Intel processor from
-      1998 and later (Pentium4, Core, etc), if updated microcode has been
-      released. These updates only last until the machine is powered off, so
-      they need to be applied on every boot.
-    </para>
-
-    <para>
-      Intel provide updates of their microcode for Skylake and later
-      processors as new vulnerabilities come to light, and have in the past
-      provided updates for processors from SandyBridge onwards, although those
-      are no-longer supported for new fixes. New versions of AMD
-      firmware are rare and usually only apply to a few models, although
-      motherboard manufacturers get AGESA (AMD Generic Encapsulated Software
-      Architecture) updates to change BIOS values, e.g. to support more memory
-      variants, new vulnerability fixes or newer CPUs.
-    </para>
-
-    <para>
-      There were two ways of loading the microcode, described as 'early' and
-      'late'. Early loading happens before userspace has been started, late
-      loading happens after userspace has started. However, late loading is
-      known to be problematic and not supported anymore (see the kernel commit
-      <ulink url="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d23d33e">
-        x86/microcode: Taint and warn on late loading</ulink>.)  Indeed, early
-      loading is needed to work around one particular erratum in early Intel
-      Haswell processors which had TSX enabled.  (See <ulink url=
-      "https://www.anandtech.com/show/8376/intel-disables-tsx-instructions-erratum-found-in-haswell-haswelleep-broadwelly/">
-        Intel Disables TSX Instructions: Erratum Found in Haswell,
-        Haswell-E/EP, Broadwell-Y</ulink>.)
-      Without this update glibc can do the wrong thing in uncommon
-      situations.
-    </para>
-
-    <para>
-      In previous versions of this book, late loading of microcode to see if
-      it gets applied was recommended, followed by using an initrd to force
-      early loading. But now that the contents of the Intel microcode tarball
-      is documented, and AMD microcode can be read by a Python script to
-      determine which machines it covers, there is no real reason to use late
-      loading.
-    </para>
-
-    <para>
-      It might be still possible to manually force late loading of microcode.
-      But it may cause kernel malfunction and you should take the risk yourself.
-      You will need to reconfigure your kernel for late loading, but
-      early loading is always supported by Linux kernel version 6.6
-      or later on a x86 (no matter 32-bit or 64-bit) system.  The
-      instructions here will show you how to create an initrd for early
-      loading. It is also possible to build the same microcode bin file into
-      the kernel, which allows early loading but requires the kernel to be
-      recompiled to update the microcode.
-    </para>
-
-    <para>
-      To confirm what processor(s) you have (if more than one, they will be
-      identical) look in /proc/cpuinfo. Determine the decimal values of the cpu
-      family, model and stepping by running the following command (it will also
-      report the current microcode version):
-    </para>
-
-<screen><userinput>head -n7 /proc/cpuinfo</userinput></screen>
-
-    <para>
-      Convert the cpu family, model and stepping to pairs of hexadecimal
-      digits, and remember the value of the <quote>microcode</quote> field.
-      You can now check if there is any microcode available.
-    </para>
-
-    <para>
-      If you are creating an initrd to update firmware for different machines,
-      as a distro would do, go down to 'Early loading of microcode' and cat all
-      the Intel blobs to GenuineIntel.bin or cat all the AMD blobs to
-      AuthenticAMD.bin. This creates a larger initrd - for all Intel machines in
-      the 20200609 update the size was 3.0 MB compared to typically 24 KB for one
-      machine.
-    </para>
-
-    <sect3 id="intel-microcode">
-      <title>Intel Microcode for the CPU</title>
-
-      <para>
-        The first step is to get the most recent version of the Intel
-        microcode.  This must be done by navigating to <ulink url=
-        'https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/'/>
-        and downloading the latest file there.  As of this writing the most
-        <!-- at one time, some skylakes had problems with a certain revision
-        secure version of the microcode, for those machines which can boot it, -->
-        secure version of the microcode
-        is microcode-20240312.  Extract this
-        file in the normal way, the microcode is in the <filename>intel-ucode
-        </filename> directory, containing various blobs with names in the form
-        XX-YY-ZZ. There are also various other files, and a releasenote.
-      </para>
-
-      <para>
-        In the past, intel did not provide any details of which blobs had
-        changed versions, but now the releasenote details this.  You can
-        compare the microcode version in <filename>/proc/cpuinfo</filename>
-        with the version for your CPU model in the releasenote to know if
-        there is an update.
-      </para>
-
-      <para>
-        The recent firmware for older processors is provided to deal with
-        vulnerabilities which have now been made public, and for some of these
-        such as Microarchitectural Data Sampling (MDS) you might wish to
-        increase the protection by disabling hyperthreading, or alternatively
-        to disable the kernel's default mitigation because of its impact on
-        compile times. Please read the online documentation at <ulink url=
-        'https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/index.html'/>.
-      </para>
-
-      <para>
-        For an Tigerlake mobile (described as Intel(R) Core(TM) i5-11300H
-        CPU) the relevant values are cpu family 6, model 140, stepping 1 so
-        in this case the required identification is 06-8c-01. The
-        releasenote says the latest microcode for it is versioned 0xb6.  If
-        the value of the <quote>microcode</quote> field in
-        <filename>/proc/cpuinfo</filename> is 0xb6 or greater, it indicates
-        the microcode update is already applied by the BIOS.  Otherwise,
-        proceed to <xref linkend='early-microcode'/>.
-      </para>
-    </sect3>
-
-    <sect3 id="amd-microcode">
-      <title>AMD Microcode for the CPU</title>
-
-      <para>
-        Begin by downloading a container of firmware for your CPU family
-        from <ulink url=
-          '&sources-anduin-http;/linux-firmware/amd-ucode/'/>.
-        The family is always specified in hex. Families 10h to 14h (16 to 20)
-        are in microcode_amd.bin.  Families 15h, 16h, 17h (Zen, Zen+, Zen2) and
-        19h (Zen3) have their own containers, but  very few machines are likely to
-        get updated microcode. Instead, AMD provide an updated AGESA to the
-        motherboard makers, who may provide an updated BIOS using this.
-        There is a Python3 script at <ulink url=
-        'https://github.com/AMDESE/amd_ucode_info/blob/master/amd_ucode_info.py'/>.
-        Download that script and run it against the bin file to check which
-        processors have updates.
-      </para>
-
-      <para>
-        For the very old Athlon(tm) II X2 in these examples the values were
-        cpu family 16, model 5, stepping 3 giving an identification of
-        Family=0x10 Model=0x05 Stepping=0x03.  One line of the
-        <command>amd_ucode_info.py</command> script output describes the
-        microcode version for it:
-      </para>
-
-<screen><computeroutput>Family=0x10 Model=0x05 Stepping=0x03: Patch=0x010000c8 Length=960 bytes</computeroutput></screen>
-
-      <para>
-        If the value of the <quote>microcode</quote> field in
-        <filename>/proc/cpuinfo</filename> is 0x10000c8 or greater, it
-        indicates the BIOS has already applied the microcode update.
-        Otherwise, proceed to <xref linkend='early-microcode'/>.
-      </para>
-    </sect3>
-
-    <sect3 id="early-microcode">
-      <title>Early loading of microcode</title>
-
-      <para>
-        If you have established that updated microcode is available for
-        your system, it is time to prepare it for early loading. This requires
-        an additional package, <xref linkend='cpio'/> and the creation of an
-        initrd which will need to be added to grub.cfg.
-      </para>
-
-      <para>
-        It does not matter where you prepare the initrd, and once it is
-        working you can apply the same initrd to later LFS systems or newer
-        kernels on this same machine, at least until any newer microcode is
-        released. Use the following commands:
-      </para>
-
-<screen><userinput>mkdir -p initrd/kernel/x86/microcode
-cd initrd</userinput></screen>
-
-      <para>
-        For an AMD machine, use the following command (replace
-        &lt;MYCONTAINER&gt; with the name of the container for your CPU's
-        family):
-      </para>
-
-<screen><userinput>cp -v ../&lt;MYCONTAINER&gt; kernel/x86/microcode/AuthenticAMD.bin</userinput></screen>
-
-      <para>
-        Or for an Intel machine copy the appropriate blob using this command:
-      </para>
-
-<screen><userinput>cp -v ../intel-ucode/&lt;XX-YY-ZZ&gt; kernel/x86/microcode/GenuineIntel.bin</userinput></screen>
-
-<!-- new version from 20201110 release onwards, assumed to work on all skylakes
-   But complaints about previous version took some days to appear, so keep as a comment for now.
-      <caution>
-        <para>
-          On some Skylake machines with hex Model Number '4e' (78 decimal) the
-          upgrade to microcode version '0xdc' is reported to cause the machine to
-          hang in early boot, and the fix is to revert to version 0xd6 which was
-          first shipped in the 20191115 microcode release.
-        </para>
-
-        <para>
-          At least one model '5e' Skylake does boot successfully with version
-          0xdc, but Intel has now shipped a 20200616 release which is intended for
-          distros which need an initrd that will boot on everyone's machine: it
-          reverts both Skylake variants ('4e' and '5e') to the old 0xd6.
-        </para>
-
-        <para>
-          For a Skylake which does not boot with 0xdc, reverting to 0xd6 will make
-          the machine usable, but without the SRBDS mitigations.
-        </para>
-      </caution>-->
-
-      <para>
-        Now prepare the initrd:
-      </para>
-
-<screen><userinput>find . | cpio -o -H newc &gt; /boot/microcode.img</userinput></screen>
-
-      <para>
-        You now need to add a new entry to /boot/grub/grub.cfg and
-        here you should add a new line after the linux line within the stanza.
-        If /boot is a separate mountpoint:
-       </para>
-
-<screen><userinput>initrd /microcode.img</userinput></screen>
-
-      <para>
-        or this if it is not:
-      </para>
-
-<screen><userinput>initrd /boot/microcode.img</userinput></screen>
-
-      <para>
-        If you are already booting with an initrd (see <xref
-        linkend="initramfs"/>), you should run <command>mkinitramfs</command>
-        again after putting the appropriate blob or container into <filename
-          class="directory">/lib/firmware</filename>. More precisely, put an
-        intel blob in a <filename
-          class="directory">/lib/firmware/intel-ucode</filename> directory
-        or an AMD container in a <filename
-          class="directory">/lib/firmware/amd-ucode</filename> directory before
-        running <command>mkinitramfs</command>.
-        Alternatively, you can have both initrd on the same line, such as
-        <userinput>initrd /microcode.img /other-initrd.img</userinput> (adapt
-        that as above if /boot is not a separate mountpoint).
-      </para>
-
-      <para>
-        You can now reboot with the added initrd, and then use the following
-        command to check that the early load worked:
-      </para>
-
-<screen><userinput>dmesg | grep -e 'microcode' -e 'Linux version' -e 'Command line'</userinput></screen>
-
-      <para>
-        If you updated to address vulnerabilities, you can look at the
-        output of the <command>lscpu</command> command to see what is now
-        reported.
-      </para>
-
-      <para>
-        The places and times where early loading happens are very different
-        in AMD and Intel machines. First, an example of an Intel (Tigerlake
-        mobile) with early loading:
-      </para>
-
-<screen><literal>[    0.000000] Linux version 6.8.0 (xry111@stargazer) (gcc (GCC) 13.2.0, GNU ld (GNU Binutils) 2.42) #53 SMP PREEMPT_DYNAMIC Tue Mar 12 20:01:39 CST 2024
-[    0.000000] Command line: BOOT_IMAGE=/boot/vmlinuz-6.8.0 root=PARTUUID=<replaceable>&lt;CLASSIFIED&gt;</replaceable> ro
-[    0.571761] microcode: Current revision: 0x000000b6
-[    0.571771] microcode: Updated early from: 0x00000086</literal></screen>
-
-      <para>
-        A historic AMD example:
-      </para>
-
-<screen><literal>[    0.000000] Linux version 4.15.3 (ken@testserver) (gcc version 7.3.0 (GCC))
-               #2 SMP Sun Feb 18 02:32:03 GMT 2018
-[    0.000000] Command line: BOOT_IMAGE=/vmlinuz-4.15.3-sda5 root=/dev/sda5 ro
-[    0.307619] microcode: microcode updated early to new patch_level=0x010000c8
-[    0.307678] microcode: CPU0: patch_level=0x010000c8
-[    0.307723] microcode: CPU1: patch_level=0x010000c8
-[    0.307795] microcode: Microcode Update Driver: v2.2.</literal></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id="video-firmware">
-    <title>Firmware for Video Cards</title>
-
-    <sect3 id="ati-video-firmware">
-      <title>Firmware for ATI video chips (R600 and later)</title>
-
-      <para>
-        These instructions do NOT apply to old radeons before the R600
-        family. For those, the firmware is in the kernel's <filename
-        class='directory'>/lib/firmware/</filename> directory. Nor do they
-        apply if you intend to avoid a graphical setup such as Xorg and are
-        content to use the default 80x25 display rather than a framebuffer.
-      </para>
-
-      <para>
-        Early radeon devices only needed a single 2K blob of firmware. Recent
-        devices need several different blobs, and some of them are much bigger.
-        The total size of the radeon firmware directory is over 500K &mdash;
-        on a large modern system you can probably spare the space, but it is
-        still redundant to install all the unused files each time you build
-        a system.
-      </para>
-
-      <para>
-        A better approach is to install <xref linkend='pciutils'/> and then
-        use <userinput>lspci</userinput> to identify which VGA controller is
-        installed.
-      </para>
-
-      <para>
-        With that information, check the RadeonFeature page of the Xorg wiki
-        for <ulink url="https://wiki.x.org/wiki/RadeonFeature/#index5h2">Decoder
-        ring for engineering vs marketing names</ulink> to identify the family
-        (you may need to know this for the Xorg driver in BLFS &mdash;
-        Southern Islands and Sea Islands use the radeonsi driver) and the
-        specific model.
-      </para>
-
-      <para>
-        Now that you know which controller you are using, consult the
-        <ulink url="https://wiki.gentoo.org/wiki/Radeon#Firmware">
-           Radeon</ulink> page of the Gentoo wiki which has a table listing
-        the required firmware blobs for the various chipsets. Note that
-        Southern Islands and Sea Islands chips use different firmware for
-        kernel 3.17 and later compared to earlier kernels. Identify and
-        download the required blobs then install them:
-      </para>
-
-<screen><userinput>mkdir -pv /lib/firmware/radeon
-cp -v &lt;YOUR_BLOBS&gt; /lib/firmware/radeon</userinput></screen>
-
-    <para>
-      Building the kernel amdgpu driver as a module is recommended because
-      the firmware files need to be accessible at the time it is loaded.
-      If you are building it as a part of the kernel image for any reason,
-      you need to either include the firmware files in the initramfs (read
-      <xref linkend='initramfs'/> for details), or include them in the
-      kernel image itself (read <xref linkend='firmware-in-kernel-image'/>
-      for details).
-    </para>
-
-    </sect3>
-
-    <sect3 id="amdgpu-video-firmware">
-      <title>Firmware for AMD/ATI amdgpu video chips</title>
-
-      <para>
-        All video controllers using the amdgpu kernel driver require firmware,
-        whether you will be using the xorg amdgpu driver, the xserver's modesetting
-        driver, or just kernel modesetting to get a console framebuffer larger than
-        80x25.
-      </para>
-
-      <para>
-        Install <xref linkend="pciutils"/> and use that to check the model name
-        (look for 'VGA compatible controller:'). If you have an APU (Accelerated
-        Processing Unit, i.e. CPU and video on the same chip) that will probably
-        tell you the name. If you have a separate amdgpu video card you will need
-        to search to determine which name it uses (e.g. a card described as
-        Advanced Micro Devices, Inc. [AMD/ATI] Baffin [Radeon RX 550 640SP / RX
-        560/560X] needs Polaris11 firmware.  There is a table of "Family, Chipset
-        name, Product name and Firmware" at the end of the Kernel sections in
-        <ulink url="https://wiki.gentoo.org/wiki/AMDGPU#Known_firmware_blobs">
-        AMDGPU</ulink> page of the Gentoo wiki.
-    </para>
-
-    <para>
-      Once you have identified the firmware name, install all the relevant
-      files for it. For example, the Baffin card mentioned above has 21 different
-      polaris11* files, APUs such as renoir and picasso have at least 12 files and
-      might gain more in future updates (e.g. the raven APU now has a 13th file,
-      raven_ta.bin).
-    </para>
-
-<screen><userinput>mkdir -pv /lib/firmware/amdgpu
-cp -v &lt;YOUR_BLOBS&gt; /lib/firmware/amdgpu</userinput></screen>
-
-    <para>
-      If disk space is not a problem, you could install all the current amdgpu
-      firmware files and not worry about exactly which chipset is installed.
-    </para>
-
-    <para>
-      Building the kernel amdgpu driver as a module is recommended because
-      the firmware files need to be accessible at the time it is loaded.
-      If you are building it as a part of the kernel image for any reason,
-      you need to either include the firmware files in the initramfs (read
-      <xref linkend='initramfs'/> for details), or include them in the
-      kernel image itself (read <xref linkend='firmware-in-kernel-image'/>
-      for details).
-    </para>
-
-    </sect3>
-
-    <sect3 id="nvidia-video-firmware">
-      <title>Firmware for Nvidia video chips</title>
-
-      <para>
-        Nvidia has released basic signed firmware for recent graphics chips,
-        but significantly after the chips and its own binary drivers were first
-        available. For other chips it has been necessary to extract the firmware
-        from the binary driver.
-      </para>
-      <para>
-        For more exact information about which chips need extracted firmware, see
-        <ulink url=
-          "https://nouveau.freedesktop.org/VideoAcceleration.html"/>.
-      </para>
-
-      <para>
-        If the necessary firmware is available in the
-        <filename class="directory">nvidia/</filename> directory of
-        linux-firmware, copy it to
-        <filename class="directory">/lib/firmware/nouveau</filename>.
-      </para>
-      <para>
-        If the firmware has not been made available in linux-firmware,
-        for the old chips mentioned in the nouveau wiki link above
-        run the following commands:
-      </para>
-
-<screen><userinput>wget https://anduin.linuxfromscratch.org/BLFS/nvidia-firmware/extract_firmware.py
-wget https://us.download.nvidia.com/XFree86/Linux-x86/340.32/NVIDIA-Linux-x86-340.32.run
-sh NVIDIA-Linux-x86-340.32.run --extract-only
-python3 extract_firmware.py
-mkdir -p /lib/firmware/nouveau
-cp -d nv* vuc-* /lib/firmware/nouveau/</userinput></screen>
-
-    </sect3>
-  </sect2>
-
-  <sect2 id="nic-firmware">
-    <title>Firmware for Network Interfaces</title>
-
-    <para>
-      The kernel likes to load firmware for some network drivers, particularly
-      those from Realtek (the /lib/linux-firmware/rtl_nic/) directory, but
-      they generally appear to work without it. Therefore, you can boot the
-      kernel, check dmesg for messages about this missing firmware, and if
-      necessary download the firmware and put it in the specified directory in
-      <filename class="directory">/lib/firmware</filename> so that it will
-      be found on subsequent boots. Note that with current kernels this
-      works whether or not the driver is compiled in or built as a module,
-      there is no need to build this firmware into the kernel.
-      Here is an example where the R8169 driver has been compiled in but the
-      firmware was not made available. Once the firmware had been provided,
-      there was no mention of it on later boots.
-    </para>
-
-<screen><literal>dmesg | grep firmware | grep r8169
-[    7.018028] r8169 0000:01:00.0: Direct firmware load for rtl_nic/rtl8168g-2.fw failed with error -2
-[    7.018036] r8169 0000:01:00.0 eth0: unable to load firmware patch rtl_nic/rtl8168g-2.fw (-2)</literal></screen>
-
-  </sect2>
-
-  <sect2 id="regulatory-db">
-    <title>Firmware for Regulatory Database of Wireless Devices</title>
-
-    <para>
-      Different countries have different regulations on the radio spectrum
-      usage of wireless devices.  You can install a firmware to make the
-      wireless devices obey local spectrum regulations, so you won't be
-      inquired by local authority or find your wireless NIC jamming the
-      frequencies of other devices (for example, remote controllers).
-      The regulatory database firmware can be downloaded from
-      <ulink url = 'https://kernel.org/pub/software/network/wireless-regdb/'/>.
-      To install it, simply extract <filename>regulatory.db</filename> and
-      <filename>regulatory.db.p7s</filename> from the tarball into
-      <filename class="directory">/lib/firmware</filename>. Note that either
-      the <option>cfg80211</option> driver needs to be selected as a module
-      for the <filename>regulatory.*</filename>
-      files to be loaded, or those files need to be included as firmware into
-      the kernel, as explained above in <xref linkend="video-firmware"/>.
-    </para>
-
-    <para>
-      The access point (AP) would send a country code to your wireless NIC,
-      and <xref linkend='wpa_supplicant'/> would tell the kernel to load
-      the regulation of this country from
-      <filename>regulatory.db</filename>, and enforce it. Note that several AP
-      don't send this country code, so you may be locked to a rather
-      restricted usage (specially if you want to use your interface as an AP).
-    </para>
-  </sect2>
-
-  <sect2 id="sound-open-firmware">
-    <title>Sound Open Firmware</title>
-
-    <para>
-      Some systems (especially budget laptops) utilize a DSP shipped with
-      the CPU for connection with the audio codec.  The Sound Open Firmware
-      must be loaded onto the DSP to make it functional.  These firmware
-      files can be downloaded from
-      <ulink url='https://github.com/thesofproject/sof-bin/releases'/>.
-      Extract the tarball and changing into the extracted directory,
-      then as the &root; user install the firmware:
-    </para>
-
-    <screen role="nodump"><userinput>install -vdm755 /usr/lib/firmware/intel    &amp;&amp;
-cp -av -T --no-preserve=ownership sof      \
-   /usr/lib/firmware/intel/sof             &amp;&amp;
-cp -av -T --no-preserve=ownership sof-tplg \
-   /usr/lib/firmware/intel/sof-tplg</userinput></screen>
-
-    <para>
-      <xref linkend="alsa-lib"/> needs Use Case Manager configuration files
-      for the systems using Sound Open Firmware as well.  The ALSA UCM
-      configuration files can be downloaded from
-      <ulink url='https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-&alsa-lib-version;.tar.bz2'/>.
-      Extract the tarball and changing into the extracted directory,
-      then as the &root; user install the configuration files:
-    </para>
-
-    <screen role="nodump"><userinput>install -vdm755 /usr/share/alsa &amp;&amp;
-cp -av -T --no-preserve=ownership ucm2 /usr/share/alsa/ucm2</userinput></screen>
-
-    <para>
-      Once the firmware is loaded (you may need a reboot so the kernel will
-      load them) and the UCM configuration files are installed, following
-      <xref linkend="alsa-utils-config-sect"/> to set up your sound card for
-      ALSA properly.
-    </para>
-  </sect2>
-
-  <sect2 id="other-firmware">
-    <title>Firmware for Other Devices</title>
-
-    <para>
-      Identifying the correct firmware will typically require you to install
-      <xref linkend='pciutils'/>, and then use <userinput>lspci</userinput>
-      to identify the device. You should then search online to check which
-      module it uses, which firmware, and where to obtain the firmware &mdash;
-      not all of it is in linux-firmware.
-    </para>
-
-    <para>
-      If possible, you should begin by using a wired connection when you first
-      boot your LFS system. To use a wireless connection you will need to
-      use a network tools such as <xref linkend="iw"/>,
-      <xref linkend='wireless_tools'/>, or <xref linkend='wpa_supplicant'/>.
-    </para>
-
-    <para>
-      Firmware may also be needed for other devices such as some SCSI
-      controllers, bluetooth adaptors, or TV recorders. The same principles
-      apply.
-    </para>
-
-  </sect2>
-
-  <sect2 id='firmware-in-kernel-image'>
-    <title>Include Firmware Blobs in the Kernel Image</title>
-
-    <para>
-      Some drivers, notably the drivers for ATI or AMD GPU, requires the
-      firmware files accessible at the time it is loaded.  The easiest
-      method to handle these drivers is building them as a kernel module.
-      An alternative method is creating an initramfs (read
-      <xref linkend='initramfs'/> for details) including the firmware files.
-      If you don't want to use either methods, you may include the firmware
-      files in the kernel image itself.  Install the needed firmware files
-      into <filename class='directory'>/lib/firmware</filename> first, then
-      set the following kernel configuration and rebuild the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="builtin-fw-kernel.xml"/>
-
-    <para>
-      Replace <replaceable>xx/aa.bin xx/bb.bin</replaceable>
-      with a whitespace-separated list of paths to the needed firmware
-      files, relative to
-      <filename class='directory'>/lib/firmware</filename>.  A method
-      easier than manually typing the list (it may be long) is running the
-      following command:
-    </para>
-
-    <screen><userinput>echo CONFIG_EXTRA_FIRMWARE='"'$({ cd /lib/firmware; echo <replaceable>amdgpu/*</replaceable> })'"' &gt;&gt; .config
-make oldconfig</userinput></screen>
-
-    <para>
-      Replace <replaceable>amdgpu/*</replaceable> with a shell pattern
-      matching the needed firmware files.
-    </para>
-
-    <warning>
-      <para>
-        Do not distribute a kernel image containing the firmware to others
-        or you may violate the GPL.
-      </para>
-    </warning>
-
-  </sect2>
-
-</sect1>
Index: postlfs/config/inputrc.xml
===================================================================
--- postlfs/config/inputrc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/config/inputrc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,58 @@
+<sect1 id="postlfs-config-inputrc">
+<?dbhtml filename="inputrc.html" dir="postlfs"?>
+<title>/etc/inputrc</title>
+
+<para>There are a number of configuration files that are common to all
+linux system.  Inputrc deals with the mapping of the keybord in ceratin 
+situations.  This file is the start-up file used by readline - the input 
+related library used by bash and most other shells.  By changing this file 
+you can change how certain keys act in different situations.  The following 
+is a simple inputrc along with comments to explain what the various 
+options do.</para>
+
+<para>The following file can be used as
+<filename>/etc/inputrc</filename> or <filename>~/.inputrc</filename> as
+appropriate.  See below for more details on which to use.</para>
+
+<para><screen># Make sure we dont output everything on the 1 line
+set horizontal-scroll-mode Off
+
+set meta-flag On      # Enables 8 bit input
+set input-meta On     # Enables 8 bit input
+set convert-meta Off  # Turns off 8th bit stripping
+set output-meta On    # Keep the 8th bit for display
+set bell-style none   # none,visable or audible
+
+# All of the following map the escape sequence of the 
+# value contained inside the 1st argument to the 
+# readline specific functions
+
+"\eOd": backward-word
+"\eOc": forward-word
+
+# for linux console
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+
+# for xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line</screen></para>
+
+<para>Please see man 3 readline for more infomation.  There is a lot that 
+can be done with this single rc file.</para>
+
+<para>Note that the readline library checks ~/.inputrc, by default.  If
+you want to use <filename>/etc/inputrc</filename> as your global
+inputrc (i.e. for all users), you will need to add the line 
+<userinput>export INPUTRC=/etc/inputrc</userinput> to your
+.bash_profile, .bashrc or .profile file as appropriate.</para>
+
+<para>If you want to use per-user <userinput>.inputrc</userinput> files.
+You can create one and drop it into <filename>/etc/skel</filename> for use 
+when creating new users.</para>
+
+</sect1>
Index: postlfs/config/logon.xml
===================================================================
--- postlfs/config/logon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/config/logon.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,86 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-config-logon">
+<?dbhtml filename="logon.html" dir="postlfs"?>
+<title>Customising your logon (/etc/issue)</title>
 
-<sect1 id="postlfs-config-logon" xreflabel="Customizing your Logon with /etc/issue">
-  <?dbhtml filename="logon.html"?>
+<para>When you first boot up your new LFS system, the logon screen will
+be nice and plain (as it should be in a bare-bones system).  Many people
+however, will want their system to display some information in the logon
+message.  This can be accomplished using the 
+file <filename>/etc/issue</filename>.</para>
 
+<para>The <filename>/etc/issue</filename> file is a plain text file
+which will also accept certain Escape sequences (see below) in order to
+insert information about the system.  There is also the file
+<filename>issue.net</filename> which can be used when logging on remotely.  
+SSH however, will only use it if you set the option in the 
+configuration file and will also <emphasis>not</emphasis> interpret the 
+escape sequences as shown below.</para>
 
-  <title>Customizing your Logon with /etc/issue</title>
+<para>One of the most common things which people want to do is to clear
+the screen at each logon.  The easiest way of doing that is to put a
+"clear" escape into /etc/issue.  A simple way of doing this is to do
+<userinput>clear > /etc/issue</userinput>.  This will insert the
+relevant escape code into the start of the
+<filename>/etc/issue</filename> file.  Note that if you do this, when
+you edit the file, you should leave the ^[c character on the first line
+alone.</para>
 
-  <indexterm zone="postlfs-config-logon">
-    <primary sortas="e-etc-issue">/etc/issue</primary>
-  </indexterm>
+<para>The following escapes are recognised by agetty (the program which
+usually parses <filename>/etc/issue</filename>).  This information is from
+<userinput>man agetty</userinput> where you can find extra information
+about the logon process.</para>
 
-  <para>
-    When you first boot up your new LFS system, the logon screen will be
-    nice and plain (as it should be in a bare-bones system).  Many people
-    however, will want their system to display some information in the logon
-    message.  This can be accomplished using the
-    file <filename>/etc/issue</filename>.
-  </para>
+<para>The issue-file can contain certain escape codes to display various
+information.  All escape codes consist of a backslash (\) immediately followed 
+by one of the letters explained below (so \d in
+<filename>/etc/issue</filename> would insert the current date).</para>
 
-  <para>
-    The <filename>/etc/issue</filename> file is a plain text file
-    which will also accept certain escape sequences (see below) in order to
-    insert information about the system.  There is also the file
-    <filename>issue.net</filename> which can be used when logging on remotely.
-    <command>ssh</command> however, will only use it if you set the option in
-    the configuration file and will <emphasis>not</emphasis> interpret the
-    escape sequences shown below.
-  </para>
-
-  <para>
-    One of the most common things which people want to do is clear the
-    screen at each logon.  The easiest way of doing that is to put a "clear"
-    escape sequence into <filename>/etc/issue</filename>.  A simple way of
-    doing this is to issue the command <command>clear &gt;
-    /etc/issue</command>.  This will insert the relevant escape code into
-    the start of the <filename>/etc/issue</filename> file.  Note that if
-    you do this, when you edit the file, you should leave the characters
-    (normally '^[[H^[[2J') on the first line alone.
-  </para>
-
-  <note>
-    <para>
-      Terminal escape sequences are special codes recognized by the terminal.
-      The ^[ represents an ASCII ESC character.  The sequence ESC [ H
-      puts the cursor in the upper left hand corner of the screen and ESC 2 J
-      erases the screen.  For more information on terminal escape sequences see
-      <ulink url='https://invisible-mirror.net/xterm/ctlseqs/ctlseqs.html'/>
-    </para>
-  </note>
-
-  <para>
-    The following sequences are recognized by <command>agetty</command>
-    (the program which usually parses <filename>/etc/issue</filename>).  This
-    information is from <command>man agetty</command> where you can find
-    extra information about the logon process.
-  </para>
-
-  <para>
-    The <filename>issue</filename> file can contain certain character
-    sequences to display various information.  All <filename>issue</filename>
-    sequences consist of a backslash (\) immediately followed by one of the
-    letters explained below (so <option>\d</option> in
-    <filename>/etc/issue</filename> would insert the current date).
-  </para>
-
-<screen><literal>b   Insert the baudrate of the current line.
+<para><screen>b   Insert the baudrate of the current line.
 d   Insert the current date.
 s   Insert the system name, the name of the operating system.
 l   Insert the name of the current tty line.
-m   Insert the architecture identifier of the machine, e.g., i686.
+m   Insert the architecture identifier of the machine, eg. i486
 n   Insert the nodename of the machine, also known as the hostname.
 o   Insert the domainname of the machine.
-r   Insert the release number of the kernel, e.g., 2.6.11.12.
+r   Insert the release number of the kernel, eg. 2.4.16.
 t   Insert the current time.
 u   Insert the number of current users logged in.
 U   Insert the string "1 user" or "&lt;n&gt; users" where &lt;n&gt; is the
     number of current users logged in.
-v   Insert the version of the OS, e.g., the build-date etc.</literal></screen>
+v   Insert the version of the OS, eg. the build-date etc.</screen></para>
 
 </sect1>
+
Index: postlfs/config/manpages.xml
===================================================================
--- postlfs/config/manpages.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/config/manpages.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="postlfs-config-manpages">
+<?dbhtml filename="manpages.html" dir="postlfs"?>
+<title>Man page issues</title>
+
+<para>NEW PAGE TO BE WRITTEN</para>
+
+</sect1>
+
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/config/profile.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,737 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-config-profile">
+<?dbhtml filename="profile.html" dir="postlfs"?>
+<title>/etc/profile and ~/.bash_*</title>
 
-<sect1 id="postlfs-config-profile" xreflabel="The Bash Shell Startup Files">
-  <?dbhtml filename="profile.html"?>
-
-
-  <title>The Bash Shell Startup Files</title>
-
-  <para>
-    The shell program <filename>/bin/bash</filename> (hereafter referred to
-    as just "the shell") uses a collection of startup files to help create
-    an environment.  Each file has a specific use and may affect login and
-    interactive environments differently.  The files in the <filename
-    class="directory">/etc</filename> directory generally provide global
-    settings. If an equivalent file exists in your home directory it may
-    override the global settings.
-  </para>
-
-  <para>
-    An interactive login shell is started after a successful login, using
-    <filename>/bin/login</filename>, by reading the
-    <filename>/etc/passwd</filename> file. This shell invocation normally reads
-    <filename>/etc/profile</filename> and its private equivalent
-    <filename>~/.bash_profile</filename> (or <filename>~/.profile</filename>
-    if called as <command>/bin/sh</command>) upon startup.
-  </para>
-
-  <para>
-    An interactive non-login shell is normally started at the command-line
-    using a shell program (e.g.,
-    <prompt>[prompt]$</prompt><command>/bin/bash</command>) or by the
-    <command>/bin/su</command> command.  An interactive non-login shell is also
-    started with a terminal program such as <command>xterm</command> or
-    <command>konsole</command> from within a graphical environment. This type
-    of shell invocation normally copies the parent environment and then reads
-    the user's <filename>~/.bashrc</filename> file for additional startup
-    configuration instructions.
-  </para>
-
-  <para>
-    A non-interactive shell is usually present when a shell script is
-    running.  It is non-interactive because it is processing a script and not
-    waiting for user input between commands. For these shell invocations, only
-    the environment inherited from the parent shell is used.
-  </para>
-
-  <para>
-    The file <filename>~/.bash_logout</filename> is not used for an
-    invocation of the shell.  It is read and executed when a user exits from an
-    interactive login shell.
-  </para>
-
-  <para>
-    Many distributions use <filename>/etc/bashrc</filename> for system wide
-    initialization of non-login shells. This file is usually called from the
-    user's <filename>~/.bashrc</filename> file and is not built directly into
-    <command>bash</command> itself.  This convention is followed in this
-    section.
-  </para>
-
-  <para>
-    For more information see <command>info bash</command> --
-    <emphasis role="strong">Nodes: Bash Startup Files and Interactive
-    Shells</emphasis>.
-  </para>
-
-  <note>
-    <para>
-      Most of the instructions below are used to create files located in the
-      <filename class='directory'>/etc</filename> directory structure which
-      requires you to execute the commands as the <systemitem
-      class='username'>root</systemitem> user. If you elect to create the
-      files in user's home directories instead, you should run the commands
-      as an unprivileged user.
-    </para>
-  </note>
-
-  <para condition="html" role="usernotes">Editor Notes:
-  <ulink url="&blfs-wiki;/bash-shell-startup-files"/></para>
-
-  <sect2 id="etc-profile-profile">
-    <title>/etc/profile</title>
-
-    <indexterm zone="postlfs-config-profile etc-profile-profile">
-      <primary sortas="e-etc-profile">/etc/profile</primary>
-    </indexterm>
-
-    <para>
-      Here is a base <filename>/etc/profile</filename>. This file starts by
-      setting up some helper functions and some basic parameters. It specifies
-      some <command>bash</command> history parameters and, for security
-      purposes, disables keeping a permanent history file for the <systemitem
-      class="username">root</systemitem> user.  It also sets a default user
-      prompt.  It then calls small, single purpose scripts in the <filename
-      class='directory'>/etc/profile.d</filename> directory to provide most
-      of the initialization.
-    </para>
-
-    <para>
-      For more information on the escape sequences you can use for your prompt
-      (i.e., the <envar>PS1</envar> environment variable) see <command>info
-      bash</command> -- <emphasis role="strong">Node: Printing a
-      Prompt</emphasis>.
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# modifications by Dagmar d'Surreal &lt;rivyqntzne@pbzpnfg.arg&gt;
-
-# System wide environment variables and startup programs.
-
-# System wide aliases and functions should go in /etc/bashrc.  Personal
-# environment variables and startup programs should go into
-# ~/.bash_profile.  Personal aliases and functions should go into
-# ~/.bashrc.
-
-# Functions to help us manage paths.  Second argument is the name of the
-# path variable to be modified (default: PATH)
-pathremove () {
-        local IFS=':'
-        local NEWPATH
-        local DIR
-        local PATHVARIABLE=${2:-PATH}
-        for DIR in ${!PATHVARIABLE} ; do
-                if [ "$DIR" != "$1" ] ; then
-                  NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
-                fi
-        done
-        export $PATHVARIABLE="$NEWPATH"
-}
-
-pathprepend () {
-        pathremove $1 $2
-        local PATHVARIABLE=${2:-PATH}
-        export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}"
-}
-
-pathappend () {
-        pathremove $1 $2
-        local PATHVARIABLE=${2:-PATH}
-        export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1"
-}
-
-export -f pathremove pathprepend pathappend
-
-# 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
-
-if [ $EUID -eq 0 ] ; then
-        pathappend /usr/sbin
-        if [ ! -L /sbin ]; then
-                pathappend /sbin
-        fi
-        unset HISTFILE
-fi
-
-# Set up some environment variables.
-export HISTSIZE=1000
-export HISTIGNORE="&amp;:[bf]g:exit"
-
-# Set some defaults for graphical systems
-export XDG_DATA_DIRS=${XDG_DATA_DIRS:-/usr/share}
-export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS:-/etc/xdg}
-export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/tmp/xdg-$USER}
-
-# Set up a red prompt for root and a green one for users.
-NORMAL="\[\e[0m\]"
-RED="\[\e[1;31m\]"
-GREEN="\[\e[1;32m\]"
-if [[ $EUID == 0 ]] ; then
-  PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
-else
-  PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
-fi
-
-for script in /etc/profile.d/*.sh ; do
-        if [ -r $script ] ; then
-                . $script
-        fi
-done
-
-unset script RED GREEN NORMAL
-
-# End /etc/profile</literal>
-EOF</userinput></screen>
-
-    <sect3 id="etc-profile.d">
-      <title>The /etc/profile.d Directory</title>
-
-      <indexterm zone="postlfs-config-profile etc-profile.d">
-        <primary sortas="e-etc-profile.d">/etc/profile.d</primary>
-      </indexterm>
-
-      <para>
-        Now create the <filename class='directory'>/etc/profile.d</filename>
-        directory, where the individual initialization scripts are placed:
-      </para>
-
-<screen role="root"><userinput>install --directory --mode=0755 --owner=root --group=root /etc/profile.d</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="etc-profile.d-bash-completion.sh">
-      <title>/etc/profile.d/bash_completion.sh</title>
-
-      <indexterm zone="postlfs-config-profile etc-profile.d-bash-completion.sh">
-        <primary sortas="e-etc-profile.d-bash-completion.sh">/etc/profile.d/bash_completion.sh</primary>
-      </indexterm>
-
-      <note>
-        <para>
-          Using the bash completion script below is controversial. Not all
-          users like it.  It adds many (usually over 1000) lines to the bash
-          environment and makes it difficult to use the 'set' command to
-          examine simple environment variables.  Omitting this script does
-          not interfere with the ability of bash to use the tab key for file
-          name completion.
-        </para>
-      </note>
-
-      <para>
-        This script imports bash completion scripts, installed by many
-        other BLFS packages, to allow TAB command line completion.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/bash_completion.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/bash_completion.sh
-# Import bash completion scripts
-
-# If the bash-completion package is installed, use its configuration instead
-if [ -f /usr/share/bash-completion/bash_completion ]; then
-
-  # Check for interactive bash and that we haven't already been sourced.
-  if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
-
-    # Check for recent enough version of bash.
-    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
-       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
-       [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] &amp;&amp; \
-            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
-       if shopt -q progcomp &amp;&amp; [ -r /usr/share/bash-completion/bash_completion ]; then
-          # Source completion code.
-          . /usr/share/bash-completion/bash_completion
-       fi
-    fi
-  fi
-
-else
-
-  # bash-completions are not installed, use only bash completion directory
-  if shopt -q progcomp; then
-    for script in /etc/bash_completion.d/* ; do
-      if [ -r $script ] ; then
-        . $script
-      fi
-    done
-  fi
-fi
-
-# End /etc/profile.d/bash_completion.sh</literal>
-EOF</userinput></screen>
-      <para>
-        Make sure that the directory exists:
-      </para>
-
-<screen role="root"><userinput>install --directory --mode=0755 --owner=root --group=root /etc/bash_completion.d</userinput></screen>
-
-      <para>
-        For a more complete installation, see
-        <ulink url="&blfs-wiki;/bash-shell-startup-files#bash-completions"/>.
-      </para>
-
-    </sect3>
-
-    <sect3 id="etc-profile.d-dircolors.sh">
-      <title>/etc/profile.d/dircolors.sh</title>
-
-      <indexterm zone="postlfs-config-profile etc-profile.d-dircolors.sh">
-        <primary sortas="e-etc-profile.d-dircolors.sh">/etc/profile.d/dircolors.sh</primary>
-      </indexterm>
-
-      <para>
-        This script uses the <filename>~/.dircolors</filename> and
-        <filename>/etc/dircolors</filename> files to control the colors of
-        file names in a directory listing. They control colorized output of
-        things like <command>ls --color</command>.  The explanation of how to
-        initialize these files is at the end of this section.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/dircolors.sh &lt;&lt; "EOF"
-<literal># Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
-if [ -f "/etc/dircolors" ] ; then
-        eval $(dircolors -b /etc/dircolors)
-fi
-
-if [ -f "$HOME/.dircolors" ] ; then
-        eval $(dircolors -b $HOME/.dircolors)
-fi
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="extrapaths.sh">
-      <title>/etc/profile.d/extrapaths.sh</title>
-
-      <indexterm zone="postlfs-config-profile extrapaths.sh">
-        <primary sortas="e-etc-profile.d-extrapaths.sh">/etc/profile.d/extrapaths.sh</primary>
-      </indexterm>
-
-      <para>
-        This script adds some useful paths to the <envar>PATH</envar> and
-        can be used to customize other PATH related environment variables
-        (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
-<literal>if [ -d /usr/local/lib/pkgconfig ] ; then
-        pathappend /usr/local/lib/pkgconfig PKG_CONFIG_PATH
-fi
-if [ -d /usr/local/bin ]; then
-        pathprepend /usr/local/bin
-fi
-if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
-        pathprepend /usr/local/sbin
-fi
-
-if [ -d /usr/local/share ]; then
-        pathprepend /usr/local/share XDG_DATA_DIRS
-fi
-
-# Set some defaults before other applications add to these paths.
-pathappend /usr/share/info INFOPATH</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          The <command>man</command> program automatically deduce the search
-          path for man pages by examining the content of the
-          <envar>PATH</envar> variable, see
-          <ulink role='man' url='&man;manpath.5'>manpath(5)</ulink> for
-          details.  Setting the <envar>MANPATH</envar> variable may override
-          the automatic deduction, so the BLFS editors do not recommend to
-          set it.  If you must set it for any reason, it's better to start
-          its value with a colon (<literal>:</literal>), for example
-          <command>MANPATH=:/opt/somepkg/share/man:/opt/otherpkg/share/man</command>
-          so the paths listed in the <envar>MANPATH</envar> variable will
-          be appended to the automatically deduced value instead of
-          overriding it.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 id="readline.sh">
-      <title>/etc/profile.d/readline.sh</title>
-
-      <indexterm zone="postlfs-config-profile readline.sh">
-        <primary sortas="e-etc-profile.d-readline.sh">/etc/profile.d/readline.sh</primary>
-      </indexterm>
-
-      <para>
-        This script sets up the default <filename>inputrc</filename>
-        configuration file. If the user does not have individual settings, it
-        uses the global file.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/readline.sh &lt;&lt; "EOF"
-<literal># Set up the INPUTRC environment variable.
-if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then
-        INPUTRC=/etc/inputrc
-fi
-export INPUTRC</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="umask.sh">
-      <title>/etc/profile.d/umask.sh</title>
-
-      <indexterm zone="postlfs-config-profile umask.sh">
-        <primary sortas="e-etc-profile.d-umask.sh">/etc/profile.d/umask.sh</primary>
-      </indexterm>
-
-      <para>
-        Setting the <command>umask</command> value is important for security.
-        Here the default group write permissions are turned off for system
-        users and when the user name and group name are not the same.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/umask.sh &lt;&lt; "EOF"
-<literal># By default, the umask should be set.
-if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
-  umask 002
-else
-  umask 022
-fi</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-<!-- This is handled in the Xorg section of the book
-    <sect3 id="X.sh">
-      <title>/etc/profile.d/X.sh</title>
-
-      <indexterm zone="postlfs-config-profile X.sh">
-        <primary sortas="e-etc-profile.d-X.sh">/etc/profile.d/X.sh</primary>
-      </indexterm>
-
-      <para>
-        If <application>X</application> is installed, the <envar>PATH</envar>
-        and <envar>PKG_CONFIG_PATH</envar> variables are also updated.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/X.sh &lt;&lt; "EOF"
-<literal>if [ -x /usr/X11R6/bin/X ]; then
-        pathappend /usr/X11R6/bin
-fi
-if [ -d /usr/X11R6/lib/pkgconfig ] ; then
-        pathappend /usr/X11R6/lib/pkgconfig PKG_CONFIG_PATH
-fi</literal>
-EOF</userinput></screen>
-
-    </sect3>
--->
-    <sect3 id="i18n.sh">
-    <!-- This is handled system wide on systemd but LANG is not exported to
-         the environment, hence it's return...need to add additional text for
-         systemd only -->
-      <title>/etc/profile.d/i18n.sh</title>
-
-    <indexterm zone="postlfs-config-profile i18n.sh">
-      <primary sortas="e-etc-profile.d-i18n.sh">/etc/profile.d/i18n.sh</primary>
-    </indexterm>
-
-      <para>
-        This script sets an environment variable necessary for
-        native language support. A full discussion on determining this
-        variable can be found on the <ulink
-        url="&lfs-root;/chapter09/locale.html">Configuring the System
-        Locale</ulink> page.
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
-<literal># Set up i18n variables
-for i in $(locale); do
-  unset ${i%=*}
-done
-
-if [[ "$TERM" = linux ]]; then
-  export LANG=C.UTF-8
-else
-  export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable>
-fi</literal>
-EOF</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
-<literal># Set up i18n variables
-for i in $(locale); do
-  unset ${i%=*}
-done
-
-if [[ "$TERM" = linux ]]; then
-  export LANG=C.UTF-8
-else
-  source /etc/locale.conf
-
-  for i in $(locale); do
-    key=${i%=*}
-    if [[ -v $key ]]; then
-      export $key
-    fi
-  done
-fi</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Other Initialization Values</title>
-
-      <para>
-        Other initialization can easily be added to the
-        <filename>profile</filename> by adding additional scripts to the
-        <filename class='directory'>/etc/profile.d</filename> directory.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id="etc-bashrc-profile">
-    <title>/etc/bashrc</title>
-
-    <indexterm zone="postlfs-config-profile etc-bashrc-profile">
-      <primary sortas="e-etc-bashrc">/etc/bashrc</primary>
-    </indexterm>
-
-    <para>
-      Here is a base <filename>/etc/bashrc</filename>.  Comments in the
-      file should explain everything you need.
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/bashrc &lt;&lt; "EOF"
-<literal># Begin /etc/bashrc
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
-
-# System wide aliases and functions.
-
-# System wide environment variables and startup programs should go into
-# /etc/profile.  Personal environment variables and startup programs
-# should go into ~/.bash_profile.  Personal aliases and functions should
-# go into ~/.bashrc
-
-# Provides colored /bin/ls and /bin/grep commands.  Used in conjunction
-# with code in /etc/profile.
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-
-# Provides prompt for non-login shells, specifically shells started
-# in the X environment. [Review the LFS archive thread titled
-# PS1 Environment Variable for a great case study behind this script
-# addendum.]
-
-NORMAL="\[\e[0m\]"
-RED="\[\e[1;31m\]"
-GREEN="\[\e[1;32m\]"
-if [[ $EUID == 0 ]] ; then
-  PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
-else
-  PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
-fi
-
-unset RED GREEN NORMAL
-
-# End /etc/bashrc</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="bash_profile-profile">
-    <title>~/.bash_profile</title>
-
-    <indexterm zone="postlfs-config-profile bash_profile-profile">
-      <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
-    </indexterm>
-
-    <para>
-      Here is a base <filename>~/.bash_profile</filename>.  If you want each
-        new user to have this file automatically, just change the output of
-      the command to <filename>/etc/skel/.bash_profile</filename> and check the
-      permissions after the command is run. You can then copy <filename>
-      /etc/skel/.bash_profile</filename> to the home directories of already
-      existing users, including <systemitem class="username">root</systemitem>,
-      and set the owner and group appropriately.
-    </para>
-
-<screen><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
-<literal># Begin ~/.bash_profile
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
-
-# Personal environment variables and startup programs.
-
-# Personal aliases and functions should go in ~/.bashrc.  System wide
-# environment variables and startup programs are in /etc/profile.
-# System wide aliases and functions are in /etc/bashrc.
-
-if [ -f "$HOME/.bashrc" ] ; then
-  source $HOME/.bashrc
-fi
-
-if [ -d "$HOME/bin" ] ; then
-  pathprepend $HOME/bin
-fi
-
-# Having . in the PATH is dangerous
-#if [ $EUID -gt 99 ]; then
-#  pathappend .
-#fi
-
-# End ~/.bash_profile</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="dot_profile-profile">
-    <title>~/.profile</title>
-
-    <indexterm zone="postlfs-config-profile dot_profile-profile">
-      <primary sortas="e-AA.dot_profile">~/.profile</primary>
-    </indexterm>
-
-    <para>
-      Here is a base <filename>~/.profile</filename>. The comments and
-      instructions for using <filename class="directory">/etc/skel</filename>
-      for <filename>.bash_profile</filename> above also apply here. Only the
-      target file names are different.
-    </para>
-
-<screen><userinput>cat &gt; ~/.profile &lt;&lt; "EOF"
-<literal># Begin ~/.profile
-# Personal environment variables and startup programs.
-
-if [ -d "$HOME/bin" ] ; then
-  pathprepend $HOME/bin
-fi
-
-# Set up user specific i18n variables
-#export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable>
-
-# End ~/.profile</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="bashrc-profile">
-    <title>~/.bashrc</title>
-
-    <indexterm zone="postlfs-config-profile bashrc-profile">
-      <primary sortas="e-AA.bashrc">~/.bashrc</primary>
-    </indexterm>
-
-    <para>
-      Here is a base <filename>~/.bashrc</filename>.
-    </para>
-
-<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
-<literal># Begin ~/.bashrc
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-
-# Personal aliases and functions.
-
-# Personal environment variables and startup programs should go in
-# ~/.bash_profile.  System wide environment variables and startup
-# programs are in /etc/profile.  System wide aliases and functions are
-# in /etc/bashrc.
-
-if [ -f "/etc/bashrc" ] ; then
-  source /etc/bashrc
-fi
-
-# Set up user specific i18n variables
-#export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable>
-
-# End ~/.bashrc</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-
-  <sect2 id="bash_logout-profile">
-    <title>~/.bash_logout</title>
-
-    <indexterm zone="postlfs-config-profile bash_logout-profile">
-      <primary sortas="e-AA.bash_logout">~/.bash_logout</primary>
-    </indexterm>
-
-    <para>
-      This is an empty <filename>~/.bash_logout</filename> that can be used as
-      a template.  You will notice that the base <filename>~/.bash_logout
-      </filename> does not include a <userinput>clear</userinput> command.
-      This is because the clear is handled in the
-      <filename>/etc/issue</filename> file.
-    </para>
-
-<screen><userinput>cat &gt; ~/.bash_logout &lt;&lt; "EOF"
-<literal># Begin ~/.bash_logout
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-
-# Personal items to perform on logout.
-
-# End ~/.bash_logout</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-
-  <sect2 id="etc-dircolors-profile">
-    <title>/etc/dircolors</title>
-
-    <indexterm zone="postlfs-config-profile etc-dircolors-profile">
-      <primary sortas="e-etc-dircolors">/etc/dircolors</primary>
-    </indexterm>
-
-    <indexterm zone="postlfs-config-profile etc-dircolors-profile">
-      <primary sortas="e-AA.dircolors">~/.dircolors</primary>
-    </indexterm>
-
-    <para>
-       If you want to use the <filename>dircolors</filename> capability, then
-       run the following command. The <filename class="directory">/etc/skel
-       </filename> setup steps shown above also can be used here to provide
-       a <filename>~/.dircolors</filename> file when a new user is set up.
-       As before, just change the output file name on the following command
-       and assure the permissions, owner, and group are correct on the files
-       created and/or copied.
-    </para>
-
-<screen role="root"><userinput>dircolors -p > /etc/dircolors</userinput></screen>
-
-    <para>
-      If you wish to customize the colors used for different file types, you
-      can edit the <filename>/etc/dircolors</filename> file. The instructions
-      for setting the colors are embedded in the file.
-    </para>
-
-
-    <para>
-      Finally, Ian Macdonald has written an excellent collection of tips and
-      tricks to enhance your shell environment.  You can read it online at
-      <ulink url="https://www.caliban.org/bash/index.shtml"/>.
-    </para>
-
-  </sect2>
+<para>NEW PAGE TO BE WRITTEN</para>
 
 </sect1>
+
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/config/random.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,42 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-config-random" xreflabel="random">
+<?dbhtml filename="random.html" dir="postlfs"?>
+<title>Random number generation</title>
 
-<sect1 id="postlfs-config-random" xreflabel="Random number generation" revision="sysv">
-  <?dbhtml filename="random.html"?>
+<para>The Linux kernel supplies a random number generator which is accessed
+through <filename>/dev/random</filename> and 
+<filename>/dev/urandom</filename>.  Programs that utilize the random and
+urandom devices, such as OpenSSH, will benefit from these instructions.</para>
+
+<para>When a Linux system starts up without much operator interaction, the
+entropy pool, data used to compute a random number, may be in a fairly
+predictable state.  This creates the real possibility that the number generated
+at startup may always be the same.  In order to counteract this effect,
+you should carry the entropy pool information across your shut-downs and
+start-ups. The following init.d script and links will perform this function
+for you automatically.</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/random &lt;&lt; "EOF"
+</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/random
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+# Random script elements by Larry Lawrence
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+        start)
+                echo "Initializing kernel random number generator..."
+                if [ -f /var/tmp/random-seed ]; then
+	                cat /var/tmp/random-seed >/dev/urandom
+		fi
+		dd if=/dev/urandom of=/var/tmp/random-seed count=1 &>/dev/null
+		evaluate_retval
+		;;
+		
+	stop)
+		echo "Saving random seed..."
+		dd if=/dev/urandom of=/var/tmp/random-seed count=1 &>/dev/null
+		evaluate_retval
+		;;
+
+        *)
+                echo "Usage: $0 {start|stop}"
+                exit 1
+                ;;
+esac
+
+# End $rc_base/init.d/random
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/random</userinput></screen></para>
+
+<para>Create the symbolic links to this file in the relevant rc.d directories 
+with the following commands:
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/random ../rc0.d/K45random &amp;&amp;
+ln -sf ../init.d/random ../rc2.d/S25random &amp;&amp;
+ln -sf ../init.d/random ../rc3.d/S25random &amp;&amp;
+ln -sf ../init.d/random ../rc4.d/S25random &amp;&amp;
+ln -sf ../init.d/random ../rc5.d/S25random &amp;&amp;
+ln -sf ../init.d/random ../rc6.d/K45random</userinput></screen></para>
 
 
-  <title>Random Number Generation</title>
+</sect1>
 
-  <indexterm zone="postlfs-config-random">
-    <primary sortas="f-random">random</primary>
-  </indexterm>
-
-  <para>
-    The Linux kernel supplies a random number generator which is accessed
-    through <filename class="devicefile">/dev/random</filename> and
-    <filename class="devicefile">/dev/urandom</filename>. Programs that utilize
-    the random and urandom devices, such as <application>OpenSSH</application>,
-    will benefit from these instructions.
-  </para>
-
-  <para>
-    When a Linux system starts up without much operator interaction, the
-    entropy pool (data used to compute a random number) may be in a fairly
-    predictable state.  This creates the real possibility that the number
-    generated at startup may always be the same.  In order to counteract
-    this effect, you should carry the entropy pool information across your
-    shut-downs and start-ups.
-  </para>
-
-  <para>
-    Install the <filename>/etc/rc.d/init.d/random</filename> init script
-    included with the <xref linkend="bootscripts"/> package.
-  </para>
-
-<screen role="root"><userinput>make install-random</userinput></screen>
-
-</sect1>
Index: stlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-config-skel" xreflabel="Configuring for Adding Users">
-  <?dbhtml filename="skel.html"?>
-
-
-  <title>Configuring for Adding Users</title>
-
-  <indexterm zone="postlfs-config-skel">
-    <primary sortas="e-etc-skel">/etc/skel/*</primary>
-  </indexterm>
-
-  <indexterm zone="postlfs-config-skel">
-    <primary sortas="e-etc-default-useradd">/etc/default/useradd</primary>
-  </indexterm>
-
-  <para>
-    Together, the <command>/usr/sbin/useradd</command> command and <filename
-    class="directory">/etc/skel</filename> directory (both are easy to
-    set up and use) provide a way to assure new users are added to your LFS
-    system with the same beginning settings for things such as the
-    <envar>PATH</envar>, keyboard processing and other environmental variables.
-    Using these two facilities makes it easier to assure this initial state for
-    each new user added to the system.
-  </para>
-
-  <para>
-    The <filename class="directory">/etc/skel</filename> directory holds
-    copies of various initialization and other files that may be copied to the
-    new user's home directory when the <command>/usr/sbin/useradd</command>
-    program adds the new user.
-  </para>
-
-  <bridgehead renderas="sect5">Useradd</bridgehead>
-
-  <para>
-    The <command>useradd</command> program uses a collection of default
-    values kept in <filename>/etc/default/useradd</filename>. This file
-    is created in a base LFS installation by the
-    <application>Shadow</application> package. If it has been removed or
-    renamed, the <command>useradd</command> program uses some internal
-    defaults.  You can see the default values by running
-    <command>/usr/sbin/useradd -D</command>.
-  </para>
-
-  <para>
-    To change these values, simply modify the
-    <filename>/etc/default/useradd</filename> file as the
-    <systemitem class='username'>root</systemitem> user. An alternative to
-    directly modifying the file is to run <command>useradd</command> as the
-    <systemitem class='username'>root</systemitem> user while supplying the
-    desired modifications on the command line. Information on how to do this
-    can be found in the <command>useradd</command> man page.
-  </para>
-
-  <bridgehead renderas="sect5">/etc/skel</bridgehead>
-
-  <para>
-    To get started, create an
-    <filename class="directory">/etc/skel</filename> directory and make sure it
-    is writable only by the system administrator, usually
-    <systemitem class="username">root</systemitem>. Creating the directory as
-    <systemitem class="username">root</systemitem> is the best way to go.
-  </para>
-
-  <para>
-    The mode of any files from this part of the book that you put in <filename
-    class="directory">/etc/skel</filename> should be writable only by the
-    owner. Also, since there is no telling what kind of sensitive information
-    a user may eventually place in their copy of these files, you should
-    make them unreadable by "group" and "other".
-  </para>
-
-  <para>
-    You can also put other files in
-    <filename class="directory">/etc/skel</filename> and
-    different permissions may be needed for them.
-  </para>
-
-  <para>
-    Decide which initialization files should be provided in every (or most)
-    new user's home directory. The decisions you make will affect what you
-    do in the next two sections, <xref linkend="postlfs-config-profile"/> and
-    <xref linkend="postlfs-config-vimrc"/>. Some or all of those files will be
-    useful for <systemitem class="username">root</systemitem>, any
-    already-existing users, and new users.
-  </para>
-
-  <para>
-    The files from those sections that you might want to place in
-    <filename class="directory">/etc/skel</filename> include
-    <filename>.inputrc</filename>, <filename>.bash_profile</filename>,
-    <filename>.bashrc</filename>, <filename>.bash_logout</filename>,
-    <filename>.dircolors</filename>, and <filename>.vimrc</filename>. If
-    you are unsure which of these should be placed there, just continue to
-    the following sections, read each section and any references provided,
-    and then make your decision.
-  </para>
-
-  <para>
-    You will run a slightly modified set of commands for files which are
-    placed in <filename class="directory">/etc/skel</filename>. Each section
-    will remind you of this. In brief, the book's commands have been written
-    for files <emphasis>not</emphasis> added to <filename class="directory">
-    /etc/skel</filename> and instead just sends the results to the user's
-    home directory. If the file is going to be in <filename class="directory">
-    /etc/skel</filename>, change the book's command(s) to send output there
-    instead and then just copy the file from <filename class="directory">
-    /etc/skel</filename> to the appropriate directories, like <filename
-    class="directory">/etc</filename>, <filename class="directory">~
-    </filename> or the home directory of any other user already in the system.
-  </para>
-
-  <bridgehead renderas="sect5">When Adding a User</bridgehead>
-
-  <para>
-    When adding a new user with <command>useradd</command>, use
-    the <option>-m</option> parameter, which tells
-    <command>useradd</command> to create the user's home directory and
-    copy files from <filename class="directory">/etc/skel</filename> (can be
-    overridden) to the new user's home directory.  For example (perform as the
-    <systemitem class="username">root</systemitem> user):
-  </para>
-
-<screen role="root"><userinput>useradd -m <replaceable>&lt;newuser&gt;</replaceable></userinput></screen>
-
-  <para>
-    If you are sharing a <filename class="directory">/home</filename>
-    or <filename class="directory">/usr/src</filename> with another
-    Linux distro (for example, the host distro used for building LFS), you
-    can create a user with the same UID (and, same primary group GID) to
-    keep the file ownership consistent across the systems.  First, on
-    <emphasis>the other distro</emphasis>, get the UID of the user and the
-    GID of the user's primary group:
-  </para>
-
-<screen role="nodump"><userinput>getent passwd <replaceable>&lt;username&gt;</replaceable> | cut -d ':' -f 3,4</userinput></screen>
-
-  <para>
-    The command should output the UID and GID, separated by a colon.  Now
-    on the BLFS system, create the primary group and the user:
-  </para>
-
-<screen role="root"><userinput>groupadd -g <replaceable>&lt;GID&gt;</replaceable> <replaceable>&lt;username&gt;</replaceable> &amp;&amp;
-useradd -u <replaceable>&lt;UID&gt;</replaceable> -g <replaceable>&lt;username&gt;</replaceable> <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-</sect1>
Index: stlfs/config/users.xml
===================================================================
--- postlfs/config/users.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-users-groups" xreflabel="About System Users and Groups">
-  <?dbhtml filename="users.html"?>
-
-
-  <title>About System Users and Groups</title>
-
-  <indexterm zone="postlfs-users-groups">
-    <primary sortas="e-etc-passwd">/etc/passwd</primary>
-  </indexterm>
-
-  <indexterm zone="postlfs-users-groups">
-    <primary sortas="e-etc-group">/etc/group</primary>
-  </indexterm>
-
-  <indexterm zone="postlfs-users-groups">
-    <primary sortas="e-etc-login.defs">/etc/login.defs</primary>
-  </indexterm>
-
-  <para>
-    Throughout BLFS, many packages install programs that run as daemons or in
-    some way should have a user or group name assigned.  Generally these
-    names are used to map a user ID (uid) or group ID (gid) for system use.
-    Generally the specific uid or gid numbers used by these applications are
-    not significant.  The exception of course, is that <systemitem
-    class='username'>root</systemitem> has a uid and gid of 0 (zero) that
-    is indeed special.  The uid values are stored in
-    <filename>/etc/passwd</filename> and the gid values are found in
-    <filename>/etc/group</filename>.
-  </para>
-
-  <para>
-    Customarily, Unix systems classify users and groups into two categories:
-    system users and regular users.  The system users and groups are given
-    low numbers and regular users and groups have numeric values greater
-    than all the system values.  The cutoff for these numbers is found in
-    two parameters in the <filename>/etc/login.defs</filename> configuration
-    file.  The default UID_MIN value is 1000 and the default GID_MIN value
-    is 1000.  If a specific uid or gid value is not specified when creating
-    a user with <command>useradd</command> or a group with
-    <command>groupadd</command> the values assigned will always be above
-    these cutoff values.
-  </para>
-
-  <para>
-    Additionally, the <ulink url=
-      "https://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/usernames.html">
-    Linux Standard Base</ulink> recommends that system uid and gid values
-    should be below 100.
-  </para>
-
-  <para>
-    Below is a table of suggested uid/gid values used in BLFS beyond those
-    defined in a base LFS installation.  These can be changed as desired, but
-    provide a suggested set of consistent values.
-  </para>
-
-  <table id="uidgid" class="uidvalues">
-    <title>UID/GID Suggested Values</title>
-    <?dbfo table-width="2in" ?>
-    <tgroup cols="3">
-      <colspec colnum="1" colwidth="1.2in"/>
-      <colspec colnum="2" colwidth=".4in"/>
-      <colspec colnum="3" colwidth=".4in"/>
-      <thead>
-        <row><entry>Name</entry><entry>uid</entry><entry>gid</entry></row>
-      </thead>
-      <tbody>
-        <row><entry>bin     </entry><entry> 1</entry><entry>  </entry></row>
-        <row><entry>lp      </entry><entry> 9</entry><entry>  </entry></row>
-        <!--<row><entry>usb     </entry><entry>  </entry><entry>14</entry></row> -->
-        <row><entry>adm     </entry><entry>  </entry><entry>16</entry></row>
-        <row><entry>atd     </entry><entry>17</entry><entry>17</entry></row>
-        <row><entry>messagebus</entry><entry>18</entry><entry>18</entry></row>
-        <row><entry>lpadmin </entry><entry></entry><entry>19</entry></row>
-        <row><entry>named   </entry><entry>20</entry><entry>20</entry></row>
-        <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>apache  </entry><entry>25</entry><entry>25</entry></row>
-        <row><entry>smmsp   </entry><entry>26</entry><entry>26</entry></row>
-        <row><entry>polkitd </entry><entry>27</entry><entry>27</entry></row>
-        <row><entry>rpc     </entry><entry>28</entry><entry>28</entry></row>
-        <!-- <row><entry>courier </entry><entry>30</entry><entry>30</entry></row> -->
-        <row><entry>exim    </entry><entry>31</entry><entry>31</entry></row>
-        <row><entry>postfix </entry><entry>32</entry><entry>32</entry></row>
-        <row><entry>postdrop</entry><entry>  </entry><entry>33</entry></row>
-        <row><entry>sendmail</entry><entry>34</entry><entry>  </entry></row>
-        <row><entry>mail    </entry><entry>  </entry><entry>34</entry></row>
-        <row><entry>vmailman</entry><entry>35</entry><entry>35</entry></row>
-        <row><entry>news    </entry><entry>36</entry><entry>36</entry></row>
-        <row><entry>kdm     </entry><entry>37</entry><entry>37</entry></row>
-        <row><entry>fetchmail</entry><entry>38</entry><entry>  </entry></row>
-        <row><entry>mysql   </entry><entry>40</entry><entry>40</entry></row>
-        <row><entry>postgres</entry><entry>41</entry><entry>41</entry></row>
-        <row><entry>dovecot </entry><entry>42</entry><entry>42</entry></row>
-        <row><entry>dovenull</entry><entry>43</entry><entry>43</entry></row>
-        <row><entry>ftp     </entry><entry>45</entry><entry>45</entry></row>
-        <row><entry>proftpd </entry><entry>46</entry><entry>46</entry></row>
-        <row><entry>vsftpd  </entry><entry>47</entry><entry>47</entry></row>
-        <row><entry>rsyncd  </entry><entry>48</entry><entry>48</entry></row>
-        <row><entry>sshd    </entry><entry>50</entry><entry>50</entry></row>
-        <row><entry>stunnel </entry><entry>51</entry><entry>51</entry></row>
-        <row><entry>dhcpcd  </entry><entry>52</entry><entry>52</entry></row>
-        <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>
--->
-        <row><entry>games   </entry><entry>60</entry><entry>60</entry></row>
-        <row><entry>kvm     </entry><entry>  </entry><entry>61</entry></row>
-        <row><entry>wireshark</entry><entry> </entry><entry>62</entry></row>
-        <row><entry>sddm    </entry><entry>64</entry><entry>64</entry></row>
-        <row><entry>lightdm </entry><entry>65</entry><entry>65</entry></row>
-        <row><entry>scanner </entry><entry>  </entry><entry>70</entry></row>
-        <row><entry>colord  </entry><entry>71</entry><entry>71</entry></row>
-
-        <!-- Begin systemd specific users and groups -->
-        <!--<row><entry>systemd-bus-proxy</entry><entry>72</entry><entry>72</entry></row>-->
-        <row><entry>systemd-journal-gateway</entry><entry>73</entry><entry>73</entry></row>
-        <row><entry>systemd-journal-remote</entry><entry>74</entry><entry>74</entry></row>
-        <row><entry>systemd-journal-upload</entry><entry>75</entry><entry>75</entry></row>
-        <row><entry>systemd-network</entry><entry>76</entry><entry>76</entry></row>
-        <row><entry>systemd-resolve</entry><entry>77</entry><entry>77</entry></row>
-        <row><entry>systemd-timesync</entry><entry>78</entry><entry>78</entry></row>
-        <row><entry>systemd-coredump</entry><entry>79</entry><entry>79</entry></row>
-        <!-- 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>
-        <row><entry>avahi-autoipd</entry><entry>85</entry><entry>85</entry></row>
-        <row><entry>netdev  </entry><entry>  </entry><entry>86</entry></row>
-        <row><entry>ntp     </entry><entry>87</entry><entry>87</entry></row>
-        <row><entry>unbound </entry><entry>88</entry><entry>88</entry></row>
-        <row><entry>plugdev </entry><entry>  </entry><entry>90</entry></row>
-        <row><entry>wheel   </entry><entry>  </entry><entry>97</entry></row>
-        <row><entry>anonymous</entry><entry>98</entry><entry>  </entry></row>
-        <row><entry>nobody  </entry><entry>65534</entry><entry>  </entry></row>
-        <row><entry>nogroup </entry><entry>  </entry><entry>65534</entry></row>
-      </tbody>
-    </tgroup>
-  </table>
-<!--
-  <para>
-    One value that is missing is 65534.  This value is customarily assigned
-    to the user <systemitem class="username">nobody</systemitem> and group
-    <systemitem class="groupname">nogroup</systemitem> and is unnecessary.
-  </para>
--->
-</sect1>
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/config/vimrc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,139 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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="postlfs-config-vimrc">
+<?dbhtml filename="vimrc.html" dir="postlfs"?>
+<title>/etc/vimrc, ~/.vimrc</title>
 
-<sect1 id="postlfs-config-vimrc" xreflabel="The vimrc Files">
-  <?dbhtml filename="vimrc.html"?>
+<para>The LFS book installs vim as its editor.  At this point we should
+state that there are a <emphasis>lot</emphasis> of different editors out
+there including emacs, nano, joe and many more.  Anyone who has been
+around the Internet (especially usenet) for a short time will certainly
+have observed at least one flame war, usually involving vim and emacs
+users!</para>
 
+<para>The LFS book gives a basic <filename>vimrc</filename> file.  Here,
+we attempt to enhance this file.  At startup, vim reads
+<filename>/etc/vimrc</filename> and <filename>~/.vimrc</filename>
+(i.e., the global vimrc and the user-specific one.).  Note that this is
+only true if you compiled vim using LFS-3.1 onwards.  Prior to this,
+the global vimrc was <filename>/usr/share/vim/vimrc</filename>.</para>
 
-  <title>The /etc/vimrc and ~/.vimrc Files</title>
+<para>Here is an example of a slightly expanded vimrc:</para>
 
-  <indexterm zone="postlfs-config-vimrc">
-    <primary sortas="e-etc-vimrc">/etc/vimrc</primary>
-  </indexterm>
+<para><screen>" Begin .vimrc
 
-  <indexterm zone="postlfs-config-vimrc">
-    <primary sortas="e-AA.vimrc">~/.vimrc</primary>
-  </indexterm>
+set nocompatible
+set bs=2
+set columns=80
+set background=dark
+set tabstop=8
+set wrapmargin=8
+set nobk
+syntax on
+set ruler
+set noexpandtab
 
-  <para>
-    The LFS book installs <application>Vim</application> as its text editor.
-    At this point it should be noted that there are a <emphasis>lot</emphasis>
-    of different editing applications out there including
-    <application>Emacs</application>, <application>nano</application>,
-    <application>Joe</application> and many more.  Anyone who has been
-    around the Internet (especially usenet) for a short time will certainly
-    have observed at least one flame war, usually involving
-    <application>Vim</application> and <application>Emacs</application> users!
-  </para>
+" End .vimrc</screen></para>
 
-  <para>
-    The LFS book creates a basic <filename>vimrc</filename> file. In this
-    section you'll find an attempt to enhance this file. At startup,
-    <command>vim</command> reads the global configuration file
-    (<filename>/etc/vimrc</filename>) as well as a user-specific file
-    (<filename>~/.vimrc</filename>). Either or both can be tailored to suit
-    the needs of your particular system.
-  </para>
+<para>A FAQ on the lfs lists regards the comment tags in vimrc.  Note
+that they are " instead of the more usual # or //.  This is correct, the
+syntax for vimrc is slightly unusual.</para>
 
-  <para>
-    Here is a slightly expanded <filename>.vimrc</filename> that you can put
-    in <filename>~/.vimrc</filename> to provide user specific effects. Of
-    course, if you put it into <filename>/etc/skel/.vimrc</filename> instead,
-    it will be made available to users you add to the system later. You
-    can also copy the file from <filename>/etc/skel/.vimrc</filename> to
-    the home directory of users already on the system, such as <systemitem
-    class='username'>root</systemitem>. Be sure to set permissions, owner,
-    and group if you do copy anything directly from <filename
-    class="directory">/etc/skel</filename>.
-  </para>
+<para>We'll run through a quick explanation of what each of the
+options in this example file means here:</para>
+<itemizedlist>
+<listitem><para><userinput>set nocompatible :</userinput>
+This option stops vim from behaving in a strongly vi-compatible way.  It
+should be at the start of any vimrc file as it can affect lots of other
+options which you may want to override.</para></listitem>
 
-<screen><literal>" Begin .vimrc
+<listitem><para><userinput>set bs=2 :</userinput>
+This influences the behaviour of the backspace option.  It is fairly
+complex so see <userinput>:help 'bs'</userinput> for more 
+details.</para></listitem>
 
-set columns=80
-set wrapmargin=8
-set ruler
+<listitem><para><userinput>set columns=80 :</userinput>
+This simply sets the number of columns used on the 
+screen.</para></listitem>
 
-" End .vimrc</literal></screen>
+<listitem><para><userinput>set background=dark :</userinput>
+This tells vim to use colours which look good on a dark 
+background.</para></listitem>
 
-  <para>
-    Note that the comment tags are " instead of the more
-    usual # or //.  This is correct, the syntax for
-    <filename>vimrc</filename> is slightly unusual.
-  </para>
+<listitem><para><userinput>set tabstop=8 :</userinput>
+The number of spaces which a tabstop takes.</para></listitem>
 
-  <para>
-    Below you'll find a quick explanation of what each of the
-    options in this example file means here:
-  </para>
+<listitem><para><userinput>set wrapmargin=8 :</userinput>
+This is the number of characters from the right window 
+border where wrapping starts.</para></listitem>
 
-  <itemizedlist>
-    <!--
-    <listitem>
-      <para>
-        <option>set nocompatible</option> : This option
-        stops <command>vim</command> from behaving in a strongly <command>vi
-        </command>-compatible way. It should be at the start of any
-        <filename>vimrc </filename> file as it can affect lots of other
-        options which you may want to override.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        <option>set bs=2</option>: This influences the behavior of the
-        backspace option.  It is fairly complex so see <command>:help 'bs'
-        </command> for more details.
-      </para>
-    </listitem>
-    -->
-    <listitem>
-      <para>
-        <option>set columns=80</option>: This simply sets the
-        number of columns used on the screen.
-      </para>
-    </listitem>
-    <!--
-    <listitem>
-      <para>
-        <option>set background=dark</option>: This tells
-        <command>vim</command> to use colors which look good on a dark
-        background.
-      </para>
-    </listitem>
-    -->
-    <listitem>
-      <para>
-        <option>set wrapmargin=8</option>: This is the number of
-        characters from the right window border where wrapping starts.
-      </para>
-    </listitem>
-    <!--
-    <listitem>
-      <para>
-        <option>syntax on</option>: Enables
-        <command>vim</command>'s syntax highlighting.
-      </para>
-    </listitem>
-    -->
-    <listitem>
-      <para>
-        <option>set ruler</option>: This makes <command>vim</command>
-        show the current row and column at the bottom right of the screen.
-      </para>
-    </listitem>
-  </itemizedlist>
+<listitem><para><userinput>set nobk :</userinput>
+This stops vim from creating a backup before 
+overwriting a file.</para></listitem>
 
-  <para>
-    More information on the <emphasis>many</emphasis>
-    <command>vim</command> options can be found by reading the help
-    inside <command>vim</command> itself.  Do this by typing
-    <command>:</command><option>help</option> in
-    <command>vim</command> to get the general help, or by typing
-    <command>:</command><option>help usr_toc.txt</option> to view
-    the User Manual Table of Contents.
-  </para>
+<listitem><para><userinput>syntax on :</userinput>
+Enables vim's syntax highlighting.</para></listitem>
+
+<listitem><para><userinput>set ruler :</userinput>
+This makes vim show the current row and column at the bottom right of
+the screen.</para></listitem>
+
+<listitem><para><userinput>set noexpandtab :</userinput>
+This makes vim insert tabs as tab characters instead of as a set of
+spaces.</para></listitem>
+
+</itemizedlist>
+
+<para>More information on the <emphasis>many</emphasis> vim options 
+can be found by reading the help inside vim itself.  Do this by typing
+<userinput>:help</userinput> in vim to get the general help, or by
+typing <userinput>:help usr_toc.txt</userinput> to view the User Manual
+Table of Contents.</para>
 
 </sect1>
+
Index: stlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bluefish-download-http "https://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
-  <!ENTITY bluefish-download-ftp  " ">
-  <!ENTITY bluefish-md5sum        "48018bcfef0faeceb66b0f2d814ded03">
-  <!ENTITY bluefish-size          "4.5 MB">
-  <!ENTITY bluefish-buildsize     "52 MB">
-  <!ENTITY bluefish-time          "0.4 SBU">
-]>
-
-<sect1 id="bluefish" xreflabel="Bluefish-&bluefish-version;">
-  <?dbhtml filename="bluefish.html"?>
-
-
-  <title>Bluefish-&bluefish-version;</title>
-
-  <indexterm zone="bluefish">
-    <primary sortas="a-Bluefish">Bluefish</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Bluefish</title>
-
-    <para>
-      <application>Bluefish</application> is a
-      <application>GTK+</application> text editor targeted towards
-      programmers and web designers, with many options to write websites,
-      scripts and programming code. <application>Bluefish</application>
-      supports many programming and markup languages, and it focuses on
-      editing dynamic and interactive websites.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bluefish-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bluefish-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bluefish-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bluefish-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bluefish-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bluefish-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bluefish Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/> (for updating the desktop
-      database)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="enchant"/> (for spell checking),
-      <xref linkend="gucharmap"/>, and
-      <ulink url="https://github.com/relaxng/jing-trang">Jing</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bluefish</title>
-
-    <para>
-      Install <application>Bluefish</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/bluefish-&bluefish-version; &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>
-
-    <note>
-      <para>
-        This package installs icon files into the
-        <filename class="directory">/usr/share/icons/hicolor</filename>
-        hierarchy and desktop files into the
-        <filename class="directory">/usr/share/applications</filename>
-        hierarchy. You can improve system performance and memory usage by
-        updating <filename>/usr/share/icons/hicolor/icon-theme.cache</filename>
-        and <filename>/usr/share/applications/mimeinfo.cache</filename>. To
-        perform the update you must have <xref linkend="desktop-file-utils"/>
-        (for the desktop cache) and issue the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gtk-update-icon-cache -t -f --include-image-data /usr/share/icons/hicolor &amp;&amp;
-update-desktop-database</userinput></screen>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bluefish
-        </seg>
-        <seg>
-          several under /usr/lib/bluefish/
-        </seg>
-        <seg>
-          /usr/lib/bluefish,
-          /usr/share/bluefish,
-          /usr/share/doc/bluefish-&bluefish-version;, and
-          /usr/share/xml/bluefish
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bluefish-prog">
-        <term><command>bluefish</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> text editor for markup and
-            programming
-          </para>
-          <indexterm zone="bluefish bluefish-prog">
-            <primary sortas="b-bluefish">bluefish</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ed-download-http "&gnu-http;/ed/ed-&ed-version;.tar.lz">
-  <!ENTITY ed-download-ftp  " ">
-  <!ENTITY ed-md5sum        "f9e7c445acebf6c49ccb7f86a5b17f5d">
-  <!ENTITY ed-size          "68 KB">
-  <!ENTITY ed-buildsize     "1.0 MB">
-  <!ENTITY ed-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="ed" xreflabel="Ed-&ed-version;">
-  <?dbhtml filename="ed.html"?>
-
-
-  <title>Ed-&ed-version;</title>
-
-  <indexterm zone="ed">
-    <primary sortas="a-Ed">Ed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ed</title>
-
-    <para>
-      <application>Ed</application> is a line-oriented text editor. It
-      is used to create, display, modify and otherwise manipulate text files,
-      both interactively and via shell scripts. Ed isn't something which many
-      people use. It's described here because it can be used by the patch
-      program if you encounter an ed-based patch file. This happens rarely
-      because diff-based patches are preferred these days.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ed Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required to uncompress the tarball</bridgehead>
-    <para role="required">
-      <xref linkend="libarchive"/> (for bsdtar)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ed</title>
-
-    <para>
-      Install <application>Ed</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ed and red</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ed-prog">
-        <term><command>ed</command></term>
-        <listitem>
-          <para>
-            is a line-oriented text editor
-          </para>
-          <indexterm zone="ed ed-prog">
-            <primary sortas="b-ed">ed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="red">
-        <term><command>red</command></term>
-        <listitem>
-          <para>
-            is a restricted <command>ed</command>&mdash;it can only edit
-            files in the current directory and cannot execute shell commands
-          </para>
-          <indexterm zone="ed red">
-            <primary sortas="b-red">red</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/editors/editors.xml
===================================================================
--- postlfs/editors/editors.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/editors/editors.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,32 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="postlfs-editors">
+<?dbhtml filename="editors.html" dir="postlfs"?>
+<title>Editors</title>
 
-<chapter id="postlfs-editors">
-  <?dbhtml filename="editors.html"?>
+<para>Intro goes here</para>
 
-  <title>Text Editors</title>
-
-  <para>
-    This chapter is referenced in the LFS book for those wishing to
-    use other editors on their LFS system. You're also shown how some LFS
-    installed programs benefit from being recompiled after GUI libraries
-    have been installed.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluefish.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="emacs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="joe.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mousepad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nano.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="others.xml"/>-->
+&postlfs-editors-vim;
+&postlfs-editors-emacs;
+&postlfs-editors-nano;
+&postlfs-editors-joe;
 
 </chapter>
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/editors/emacs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,285 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-editors-emacs">
+<?dbhtml filename="emacs.html" dir="postlfs"?>
+<title>emacs</title>
 
-  <!ENTITY emacs-download-http "&gnu-http;/emacs/emacs-&emacs-version;.tar.xz">
-  <!ENTITY emacs-download-ftp  " ">
-  <!ENTITY emacs-md5sum        "1e402f3f632b68a56cb9fab4dff8e313">
-  <!ENTITY emacs-size          "50 MB">
-  <!ENTITY emacs-buildsize     "526 MB">
-  <!ENTITY emacs-time          "0.7 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="emacs" xreflabel="Emacs-&emacs-version;">
-  <?dbhtml filename="emacs.html"?>
-
-
-  <title>Emacs-&emacs-version;</title>
-
-  <indexterm zone="emacs">
-    <primary sortas="a-Emacs">Emacs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Emacs</title>
-
-    <para>
-      The <application>Emacs</application> package contains an extensible,
-      customizable, self-documenting real-time display editor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&emacs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&emacs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &emacs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &emacs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &emacs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &emacs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Emacs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="jansson"/>, and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="cairo"/>,
-      <xref linkend="dbus"/>,
-      &gobject-introspection;,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gpm"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="imagemagick"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="&gnu-http;/intlfonts/">intlfonts</ulink>,
-      <ulink url="https://directory.fsf.org/wiki/Libungif">libungif</ulink>,
-      <ulink url="https://www.nongnu.org/m17n/">libotf</ulink>, and
-      <ulink url="https://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
-      <ulink url="&xorg-download-http;/lib/">libXaw3d</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Emacs</title>
-
-    <para>
-      Install <application>Emacs</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. If make succeeds, you can
-      test the result by running <command>src/emacs -Q</command>, which is the
-      program that will be installed, with its auxiliary files. This should
-      start and display the application opening screen.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>make install &amp;&amp;
-chown -v -R root:root /usr/share/emacs/&emacs-version;</userinput></screen>
-
-<screen role="root" revision="sysv"><userinput>make install &amp;&amp;
-chown -v -R root:root /usr/share/emacs/&emacs-version; &amp;&amp;
-rm -vf /usr/lib/systemd/user/emacs.service</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-update-icon-cache.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- With 27.2, it writes scores to ~/.emacs.d/games
-    <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>
-      <option>--with-imagemagick</option>: Use this if you have installed
-      <xref linkend="imagemagick"/> and wish to link against it.
-    </para>
-
-    <para>
-      <option>--with-gif=no</option>: Use this if you have not installed
-      <xref linkend="giflib"/> or
-      <ulink url="https://directory.fsf.org/wiki/Libungif">libungif</ulink>.
-    </para>
-
-    <para>
-      <option>--with-tiff=no</option>: Use this if you have not installed
-      <xref linkend="libtiff"/>.
-    </para>
-
-    <para>
-      <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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ctags,
-             ebrowse,
-             emacs (symlink),
-             emacs-&emacs-version;,
-             emacsclient, and
-             etags</seg>
-        <seg>None</seg>
-        <seg>/usr/libexec/emacs and
-             /usr/share/emacs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ctags">
-        <term><command>ctags</command></term>
-        <listitem>
-          <para>
-            creates cross-reference tagfile database files
-            for source code
-          </para>
-          <indexterm zone="emacs ctags">
-            <primary sortas="b-ctags">ctags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ebrowse">
-        <term><command>ebrowse</command></term>
-        <listitem>
-          <para>
-            permits browsing of C++ class hierarchies from
-            within <command>emacs</command>
-          </para>
-          <indexterm zone="emacs ebrowse">
-            <primary sortas="b-ebrowse">ebrowse</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="emacs-prog">
-        <term><command>emacs</command></term>
-        <listitem>
-          <para>
-            is an editor
-          </para>
-          <indexterm zone="emacs emacs-prog">
-            <primary sortas="b-emacs">emacs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="emacsclient">
-        <term><command>emacsclient</command></term>
-        <listitem>
-          <para>
-            attaches an <command>emacs</command> session to an already
-            running <command>emacsserver</command> instance
-          </para>
-          <indexterm zone="emacs emacsclient">
-            <primary sortas="b-emacsclient">emacsclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etags">
-        <term><command>etags</command></term>
-        <listitem>
-          <para>
-            is another program to generate source code
-            cross-reference tagfiles
-          </para>
-          <indexterm zone="emacs etags">
-            <primary sortas="b-etags">etags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: stlfs/editors/gedit.xml
===================================================================
--- postlfs/editors/gedit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gedit-download-http "&gnome-download-http;/gedit/46/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  " ">
-  <!ENTITY gedit-md5sum        "01327f0d35778d8f3a914fffb69e8cd6">
-  <!ENTITY gedit-size          "2.6 MB">
-  <!ENTITY gedit-buildsize     "66 MB (with tests)">
-  <!ENTITY gedit-time          "0.2 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="gedit" xreflabel="Gedit-&gedit-version;">
-  <?dbhtml filename="gedit.html"?>
-
-
-  <title>Gedit-&gedit-version;</title>
-
-  <indexterm zone="gedit">
-    <primary sortas="a-Gedit">Gedit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gedit</title>
-
-    <para>
-      The <application>Gedit</application> package contains a lightweight
-      UTF-8 text editor for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gedit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gedit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gedit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gedit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gedit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gedit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gedit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!--<xref linkend="git"/>, unneeded -->
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libpeas"/>,
-      <xref linkend="libgedit"/>, and
-      <xref linkend="tepl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gspell"/>,
-      <xref role="runtime" linkend="gvfs"/> (runtime),
-      <xref linkend="iso-codes"/>, and
-      <xref linkend="pygobject3"/>
-      (<application>Python</application> 3 module)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="vala"/>, and
-      <ulink url="https://launchpad.net/zeitgeist">zeitgeist</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gedit</title>
-
-<!-- Not needed in 46.2
-    <para>
-      First change the <filename>meson.build</filename> script so that
-      it can accept a <option>release</option> build.
-    </para>
-
-<screen><userinput>sed -i s/plain/release/ meson.build</userinput></screen>
--->
-
-    <para>
-      Install <application>Gedit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir gedit-build &amp;&amp;
-cd    gedit-build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            .. &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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"/>
--->
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: This switch disables
-      generating the API documentation. Omit this switch if you have
-      <xref linkend="gtk-doc"/> installed and wish to generate the API
-      documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gedit
-        </seg>
-        <seg>
-          libgedit-46.so
-        </seg>
-        <seg>
-          /usr/include/gedit-46 and
-          /usr/{lib,share,share/help/*}/gedit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gedit-prog">
-        <term><command>gedit</command></term>
-        <listitem>
-          <para>
-            is a lightweight text editor integrated with the
-            <application>GNOME</application> Desktop
-          </para>
-          <indexterm zone="gedit gedit-prog">
-            <primary sortas="b-gedit">gedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/editors/joe.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,297 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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="postlfs-editors-joe">
+<?dbhtml filename="joe.html" dir="postlfs"?>
+<title>joe</title>
 
-  <!ENTITY joe-download-http "&sourceforge-dl;/joe-editor/joe-&joe-version;.tar.gz">
-  <!ENTITY joe-download-ftp  " ">
-  <!ENTITY joe-md5sum        "9017484e6116830d846678b625ea5c43">
-  <!ENTITY joe-size          "1.8 MB">
-  <!ENTITY joe-buildsize     "22 MB">
-  <!ENTITY joe-time          "0.2 SBU">
-]>
-
-<sect1 id="joe" xreflabel="JOE-&joe-version;">
-  <?dbhtml filename="joe.html"?>
-
-
-  <title>JOE-&joe-version;</title>
-
-  <indexterm zone="joe">
-    <primary sortas="a-JOE">JOE</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JOE</title>
-
-    <para>
-      <application>JOE</application> (Joe's own editor) is a small text
-      editor capable of emulating WordStar, <application>Pico</application>,
-      and <application>Emacs</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&joe-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&joe-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &joe-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &joe-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &joe-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &joe-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JOE</title>
-
-    <para>
-      Install <application>JOE</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/joe-&joe-version; &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;
-
-install -vm 755 joe/util/{stringify,termidx,uniproc} /usr/bin</userinput></screen>
-
-<!--  These do not appear to be useful.  There are txt files in
-       joe/util/unicode*/ bit I cannot we where they are used.
-install -vdm755 /usr/share/doc/joe-&joe-version;/util &amp;&amp;
-install -vm 644 joe/util/{*.txt,README} /usr/share/doc/joe-&joe-version;/util</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring JOE</title>
-
-    <sect3 id="joe-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/joe/jmacsrc</filename>,
-        <filename>/etc/joe/joerc</filename>,
-        <filename>/etc/joe/jpicorc</filename>,
-        <filename>/etc/joe/jstarrc</filename>,
-        <filename>/etc/joe/rjoerc</filename>,
-        and <filename>~/.joerc</filename>
-      </para>
-
-      <indexterm zone="joe joe-config">
-        <primary sortas="e-etc-joe-jmacsrc">/etc/joe/jmacsrc</primary>
-      </indexterm>
-
-      <indexterm zone="joe joe-config">
-        <primary sortas="e-etc-joe-joerc">/etc/joe/joerc</primary>
-      </indexterm>
-
-      <indexterm zone="joe joe-config">
-        <primary sortas="e-etc-joe-jpicorc">/etc/joe/jpicorc</primary>
-      </indexterm>
-
-      <indexterm zone="joe joe-config">
-        <primary sortas="e-etc-joe-jstarrc">/etc/joe/jstarrc</primary>
-      </indexterm>
-
-      <indexterm zone="joe joe-config">
-        <primary sortas="e-etc-joe-rjoerc">/etc/joe/rjoerc</primary>
-      </indexterm>
-
-      <indexterm zone="joe joe-config">
-        <primary sortas="e-AA.joerc">~/.joerc</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jmacs,
-          joe,
-          jpico,
-          jstar,
-          rjoe,
-          stringify,
-          termidx, and
-          uniproc
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/joe,
-          /usr/share/joe, and
-          /usr/share/doc/joe-&joe-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jmacs">
-        <term><command>jmacs</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>joe</command> used to
-            launch <application>Emacs</application> emulation mode
-          </para>
-          <indexterm zone="joe jmacs">
-            <primary sortas="b-jmacs">jmacs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="joe-prog">
-        <term><command>joe</command></term>
-        <listitem>
-          <para>
-            is a small text editor capable of emulating
-            WordStar, <application>Pico</application>, and
-            <application>Emacs</application>
-          </para>
-          <indexterm zone="joe joe-prog">
-            <primary sortas="b-joe">joe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpico">
-        <term><command>jpico</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>joe</command> used to
-            launch <application>Pico</application> emulation mode
-          </para>
-          <indexterm zone="joe jpico">
-            <primary sortas="b-jpico">jpico</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstar">
-        <term><command>jstar</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>joe</command> used to
-            launch WordStar emulation mode
-          </para>
-          <indexterm zone="joe jstar">
-            <primary sortas="b-jstar">jstar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rjoe">
-        <term><command>rjoe</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>joe</command> that restricts
-            <application>JOE</application> to editing only files which are
-            specified on the command-line
-          </para>
-          <indexterm zone="joe rjoe">
-            <primary sortas="b-rjoe">rjoe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stringify">
-        <term><command>stringify</command></term>
-        <listitem>
-          <para>
-            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)
-          </para>
-          <indexterm zone="joe stringify">
-            <primary sortas="b-stringify">stringify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="termidx">
-        <term><command>termidx</command></term>
-        <listitem>
-          <para>
-            is a program used by <command>joe</command> to generate the
-            termcap index file (see
-            /usr/share/doc/joe-&joe-version;/util/README)
-          </para>
-          <indexterm zone="joe termidx">
-            <primary sortas="b-termidx">termidx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uniproc">
-        <term><command>uniproc</command></term>
-        <listitem>
-          <para>
-            is a program used by <command>joe</command> to generate joe's
-            unicode database file unicat.c from Blocks.txt CaseFolding.txt
-            EastAsianWidth.txt and UnicodeData.txt (find them at
-            /usr/share/doc/joe-&joe-version;/util; see
-            usr/share/doc/joe-&joe-version;/util/README)
-          </para>
-          <indexterm zone="joe uniproc">
-            <primary sortas="b-uniproc">uniproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: stlfs/editors/kate.xml
===================================================================
--- postlfs/editors/kate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kate-download-http "&kf6apps-download-http;/kate-&kf6apps-version;.tar.xz">
-  <!ENTITY kate-download-ftp  " ">
-  <!ENTITY kate-md5sum        "a388e3a756b3194822273e8069101ac2">
-  <!ENTITY kate-size          "8.0 MB">
-  <!ENTITY kate-buildsize     "257 MB">
-  <!ENTITY kate-time          "1.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="kate" xreflabel="Kate-&kf6apps-version;">
-  <?dbhtml filename="kate.html"?>
-
-
-  <title>Kate-&kf6apps-version;</title>
-
-  <indexterm zone="kate">
-    <primary sortas="a-Kate">Kate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kate</title>
-
-    <para>
-      The <application>Kate</application> package contains an advanced
-      KF6 based graphical text editor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://libgit2.github.com/">libgit2</ulink>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kate</title>
-
-    <para>
-      Install <application>Kate</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$KF6_PREFIX  \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TESTING=OFF                 \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          kate and kwrite
-        </seg>
-        <seg>
-          Several plugins under $KF6_PREFIX/lib/plugins
-        </seg>
-        <seg>
-          $KF6_PREFIX/lib/plugins/ktexteditor,
-          $KF6_PREFIX/lib/plugins/plasma/dataengine,
-          $KF6_PREFIX/share/doc/HTML/*/{kate,katepart,kwrite},
-          $KF6_PREFIX/share/{kateproject,katexmltools}, and
-          $KF6_PREFIX/share/plasma/plasmoids/org.kde.plasma.katesessions
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kate-prog">
-        <term><command>kate</command></term>
-        <listitem>
-          <para>
-            is an advanced text editor for kde
-          </para>
-          <indexterm zone="kate kate-prog">
-            <primary sortas="b-kate">kate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kwrite">
-        <term><command>kwrite</command></term>
-        <listitem>
-          <para>
-            is a text editor for KDE, that is a light version of
-            <command>kate</command>
-          </para>
-          <indexterm zone="kate kwrite">
-            <primary sortas="b-kwrite">kwrite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/editors/mousepad.xml
===================================================================
--- postlfs/editors/mousepad.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mousepad-download-http
-           "https://archive.xfce.org/src/apps/mousepad/0.6/mousepad-&mousepad-version;.tar.bz2">
-  <!ENTITY mousepad-download-ftp  " ">
-  <!ENTITY mousepad-md5sum        "3ad46198202d2696cac27d5a0f08bab0">
-  <!ENTITY mousepad-size          "1.3 MB">
-  <!ENTITY mousepad-buildsize     "16 MB">
-  <!ENTITY mousepad-time          "0.1 SBU">
-]>
-
-<sect1 id="mousepad" xreflabel="Mousepad-&mousepad-version;">
-  <?dbhtml filename="mousepad.html"?>
-
-
-  <title>Mousepad-&mousepad-version;</title>
-
-  <indexterm zone="mousepad">
-    <primary sortas="a-Mousepad">Mousepad</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mousepad</title>
-
-    <para>
-      <application>Mousepad</application> is a simple
-      <application>GTK+ 3</application> text editor for the
-      <application>Xfce</application> desktop environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mousepad-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mousepad-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mousepad-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mousepad-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mousepad-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mousepad-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mousepad Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtksourceview4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend='dconf'/> (runtime) and
-      <xref linkend="dbus-glib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mousepad</title>
-
-    <para>
-      Install <application>Mousepad</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --enable-gtksourceview4 \
-            --enable-keyfile-settings &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-     <parameter>--enable-keyfile-settings</parameter>: Use the GSettings
-     keyfile backend rather than the default <xref linkend='dconf'/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mousepad
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mousepad-prog">
-        <term><command>mousepad</command></term>
-        <listitem>
-          <para>
-            is a simple <application>GTK+ 3</application> text editor
-          </para>
-          <indexterm zone="mousepad mousepad-prog">
-            <primary sortas="b-mousepad">mousepad</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/editors/nano.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,228 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-editors-nano">
+<?dbhtml filename="nano.html" dir="postlfs"?>
+<title>nano</title>
 
-  <!-- Note minor version in URL -->
-  <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v7/nano-&nano-version;.tar.xz">
-  <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "13742c686c6ddb0b7b294634f0c13cec">
-  <!ENTITY nano-size          "1.5 MB">
-  <!ENTITY nano-buildsize     "20 MB">
-  <!ENTITY nano-time          "0.2 SBU">
-]>
-
-<sect1 id="nano" xreflabel="nano-&nano-version;">
-  <?dbhtml filename="nano.html"?>
-
-
-  <title>Nano-&nano-version;</title>
-
-  <indexterm zone="nano">
-    <primary sortas="a-Nano">Nano</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nano</title>
-
-    <para>
-      The <application>Nano</application> package contains a small,
-      simple text editor which aims to replace <application>Pico</application>,
-      the default editor in the <application>Pine</application> package.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nano-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nano-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nano-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nano-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nano-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nano-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nano</title>
-
-    <para>
-      Install <application>Nano</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --enable-utf8     \
-            --docdir=/usr/share/doc/nano-&nano-version; &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;
-install -v -m644 doc/{nano.html,sample.nanorc} /usr/share/doc/nano-&nano-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-utf8</parameter>: This switch enables unicode support
-      in <application>Nano</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring nano</title>
-
-    <sect3 id="nano-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/nanorc</filename> and
-        <filename>~/.nanorc</filename>
-      </para>
-
-      <indexterm zone="nano nano-config">
-        <primary sortas="e-etc-nanorc">/etc/nanorc</primary>
-      </indexterm>
-
-      <indexterm zone="nano nano-config">
-        <primary sortas="e-AA.nanorc">~/.nanorc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Example configuration (create as a system-wide
-        <filename>/etc/nanorc</filename> or a personal
-        <filename>~/.nanorc</filename> file)
-      </para>
-
-<screen><literal>set autoindent
-set constantshow
-set fill 72
-set historylog
-set multibuffer
-set nohelp
-set positionlog
-set quickblank
-set regexp</literal></screen>
-
-      <para>
-        Check the <filename>sample.nanorc</filename> file in the installed
-        documentation directory. It includes color configurations and has
-        some documentation included in the comments.
-      </para>
-
-      <para>
-        Syntax highlighting is provided for several file types, in
-        <filename class="directory">/usr/share/nano/</filename> directory.
-        E.g., for shell scripts, you can insert
-        <option>include /usr/share/nano/sh.nanorc</option> in the personal or
-        global configuration file. If you wish highlighting for all supported
-        files, use <option>include /usr/share/nano/*.nanorc</option>. This
-        include does not descend into the <filename class="directory">extra</filename>
-        directory. Move required files one level up.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nano and rnano (symlink)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/nano and
-          /usr/share/doc/nano-&nano-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nano-prog">
-        <term><command>nano</command></term>
-        <listitem>
-          <para>
-            is a small, simple text editor which aims to replace
-            <application>Pico</application>, the default editor in the
-            <application>Pine</application> package
-          </para>
-          <indexterm zone="nano nano-prog">
-            <primary sortas="b-nano">nano</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rnano-prog">
-        <term><command>rnano</command></term>
-        <listitem>
-          <para>
-            is a restricted mode for <command>nano</command>
-          </para>
-          <indexterm zone="nano rnano-prog">
-            <primary sortas="b-rnano">rnano</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/editors/vim.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,481 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-editors-vim">
+<?dbhtml filename="vim.html" dir="postlfs"?>
+<title>Recompling vim post-X</title>
 
-  <!-- only for initial releases of a new version
-  <!ENTITY vim-download-http "http://ftp.vim.org/vim/unix/vim-&vim-version;.tar.bz2">-->
-  <!ENTITY vim-download-http "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
-  <!ENTITY vim-download-ftp  " ">
-  <!ENTITY vim-md5sum        "79dfe62be5d347b1325cbd5ce2a1f9b3">
-  <!ENTITY vim-size          "17 MB">
-  <!ENTITY vim-buildsize     "125 MB (add 67 MB for tests)">
-  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 3.0 SBU for tests)">
-]>
-
-<sect1 id="vim" xreflabel="Vim-&vim-version;">
-  <?dbhtml filename="vim.html"?>
-
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="vim">
-    <primary sortas="a-Vim">Vim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vim</title>
-
-    <para>
-      The <application>Vim</application> package, which is an
-      abbreviation for VI IMproved, contains a <command>vi</command>
-      clone with extra features as compared to the original
-      <command>vi</command>.
-    </para>
-
-    <para>
-      The default LFS instructions install <application>vim</application>
-      as a part of the base system. If you would prefer to link
-      <application>vim</application> against <application>X</application>,
-      you should recompile <application>vim</application> to enable GUI mode.
-      There is no need for special instructions since
-      <application>X</application> support is automatically detected.
-    </para>
-
-    <note>
-      <para>
-        The version of vim changes daily.  To get the latest
-        version, go to <ulink url="https://github.com/vim/vim/releases">
-        https://github.com/vim/vim/releases</ulink>.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vim-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vim-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vim-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vim-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vim-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vim-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vim Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="x-window-system"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gpm"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="ruby"/>, and
-      <xref linkend="rsync"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vim</title>
-
-    <note>
-      <para>
-        If you recompile <application>Vim</application> to link against
-        <application>X</application> and your <application>X</application>
-        libraries are not on the root partition, you will no longer have an
-        editor for use in emergencies. You may choose to install an additional
-        editor, not link <application>Vim</application> against
-        <application>X</application>, or move the current <command>vim</command>
-        executable to the <filename class="directory">/bin</filename> directory
-        under a different name such as <filename>vi</filename>.
-      </para>
-    </note>
-<!--
-    <para>
-      First, if you are building the Lua interpreter for VIM, adapt it to an
-      API change in lua-5.4.0:
-    </para>
-
-<screen><userinput remap="pre">sed -i '461 s/static int/int/' src/if_lua.c</userinput></screen>
--->
-    <para>
-      Install <application>Vim</application> by running the following
-      commands:
-    </para>
-
-    <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.
-      </para>
-    </note>
-
-<screen><userinput>echo '#define SYS_VIMRC_FILE  "/etc/vimrc"' &gt;&gt;  src/feature.h &amp;&amp;
-echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h &amp;&amp;
-
-./configure --prefix=/usr        \
-            --with-features=huge \
-            --enable-gui=gtk3    \
-            --with-tlib=ncursesw &amp;&amp;
-make</userinput></screen>
-
-    <note>
-      <para>
-        If the global configuration file <filename>/etc/vimrc</filename>
-        references the <envar>VIMRUNTIME</envar> environment variable, some
-        tests may complain about being unable to find the corresponding
-        directory and wait for user input. If this is the case, this file
-        should be saved and removed before running the tests.  Or if
-        <xref linkend='bubblewrap'/> is installed, it's also possible to
-        create a lightweight container environment where this file is hidden
-        and run the tests in the container.
-      </para>
-    </note>
-
-    <para>
-      To test the results, issue: <command>make -j1 test</command>, or
-      <command>bwrap --dev-bind / / --dev-bind /dev/null /etc/vimrc make -j1
-      test</command> if running the tests with <xref linkend='bubblewrap'/>
-      and <filename>/etc/vimrc</filename> hidden.
-      Even if one of the tests fails to produce the file
-      <filename>test.out</filename> in <filename
-      class="directory">src/testdir</filename>, the remaining tests will
-      still be executed. If all goes well, the log will report
-      <literal>ALL DONE</literal>. Some tests labelled as
-      <quote>flaky</quote> may fail occasionally and can be ignored.
-      The tests are known to fail if the output is redirected to a file,
-      and also if they are run in a 'screen' session.
-    </para>
-
-    <note>
-      <para>
-        Some color tests expect to be executed under the
-        <command>xterm</command> terminal emulator.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      By default, Vim's documentation is installed in <filename
-      class="directory">/usr/share/vim</filename>. The following symlink allows
-      the documentation to be accessed via <filename
-      class="directory">/usr/share/doc/vim-&vim-version;</filename>, making it
-      consistent with the location of documentation for other packages:
-    </para>
-
-<!-- When updating, be sure to change the vim-majmin entity for the
-     proper 'vimxx' unpacked directory -->
-
-<screen role="root"><userinput>ln -snfv ../vim/vim&vim-majmin;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
-
-    <para>
-      <emphasis role='bold'>If</emphasis> you wish to update the runtime
-      files, issue the following command (requires <xref linkend="rsync"/>)
-      to download it:
-    </para>
-
-<screen role='nodump'><userinput>rsync -avzcP --exclude="/dos/" --exclude="/spell/" \
-    ftp.nluug.nl::Vim/runtime/ ./runtime/</userinput></screen>
-
-    <para>
-      And then install the updated runtime files and regenerate the
-      <filename>tags</filename> file, as the
-      <systemitem class="username">root</systemitem> user issue:
-    </para>
-
-    <!-- already executed by "make install" if not updating the runtime
-         files -->
-<screen role="nodump"><userinput>make -C src installruntime &amp;&amp;
-vim -c ":helptags /usr/share/doc/vim-&vim-version;" -c ":q"</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-features=huge</parameter>: This switch enables all
-      the additional features available in <application>Vim</application>,
-      including support for multibyte characters.
-    </para>
-
-    <para>
-      <parameter>--with-tlib=ncursesw</parameter>: This switch forces Vim to
-      link against the <filename class="libraryfile">libncursesw</filename>
-      library.
-    </para>
-
-    <para>
-      <option>--enable-gui=no</option>: This will prevent compilation of the
-      GUI. <application>Vim</application> will still link against
-      <application>X</application>, so that some features such as the
-      client-server model or the x11-selection (clipboard) are still available.
-    </para>
-
-    <para>
-      <option>--without-x</option>: If you prefer not to link
-      <application>Vim</application> against <application>X</application>, use
-      this switch.
-    </para>
-
-    <para>
-      <option>--enable-luainterp</option>,
-      <option>--enable-perlinterp</option>,
-      <option>--enable-python3interp=dynamic</option>,
-      <option>--enable-tclinterp --with-tclsh=tclsh</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.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Vim</title>
-
-    <sect3 id='vim-config'>
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/vimrc</filename> and
-        <filename>~/.vimrc</filename>
-      </para>
-
-      <indexterm zone="vim vim-config">
-        <primary sortas="e-etc-vimrc">/etc/vimrc</primary>
-      </indexterm>
-
-      <indexterm zone="vim vim-config">
-        <primary sortas="e-AA.vimrc">~/.vimrc</primary>
-      </indexterm>
-
-    </sect3>
-<!-- there are now desktop files shipped with the package
-    <sect3 id='vim-desktop'>
-      <title>Desktop File</title>
-
-      <para>
-        If desired, create a menu entry for graphical vim,
-        <filename>gvim.desktop</filename>, as the <systemitem
-        class="username">root</systemitem> user
-      </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/applications/gvim.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Name=GVim Text Editor
-Comment=Edit text files
-Comment[pt_BR]=Edite arquivos de texto
-TryExec=gvim
-Exec=gvim -f %F
-Terminal=false
-Type=Application
-Icon=gvim.png
-Categories=Utility;TextEditor;
-StartupNotify=true
-MimeType=text/plain;</literal>
-EOF</userinput></screen>
-
-    </sect3>
--->
-    <sect3 id='vim-init'>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>Vim</application> has an integrated spell checker
-        which you can enable by issuing the following in a vim window:
-      </para>
-
-<screen><literal>:setlocal spell spelllang=ru</literal></screen>
-
-      <para>
-        This setting will enable spell checking for the Russian
-        language for the current session.
-      </para>
-
-      <para>
-        By default, <application>Vim</application> only installs spell
-        files for the English language. If a spell file is not available for
-        a language, then <application>Vim</application> will call the
-        <filename>$VIMRUNTIME/plugin/spellfile.vim</filename> plugin and will
-        try to obtain the *.spl and optionally *.sug from the vim ftp server,
-        by using the <filename>$VIMRUNTIME/plugin/netrwPlugin.vim</filename>
-        plugin.
-      </para>
-
-<!-- When updating, be sure to change the line below for the proper 'vimxx'
-     unpacked directory -->
-      <para>
-        Alternatively you can manually download the *.spl and *.sug files
-        from: <ulink url="ftp://ftp.vim.org/pub/vim/runtime/spell/"/> and save
-        them to <filename class="directory"> ~/.vim/spell </filename> or in
-        <filename
-          class="directory">/usr/share/vim/vim&vim-majmin;/spell/</filename>.
-      </para>
-
-      <para>
-        To find out what's new in <application>Vim-&vim-version;</application>
-        issue the following command:
-      </para>
-
-<screen><literal>:help version-&vim-version;</literal></screen>
-
-      <para>
-        For additional information on setting up
-        <application>Vim</application> configuration files, see <xref
-        linkend="postlfs-config-vimrc"/> and <ulink
-        url="https://vim.fandom.com/wiki/Example_vimrc"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <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>.
-    </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gview, gvim, gvimdiff, gvimtutor, rgview, and rgvim</seg>
-        <seg>None</seg>
-        <seg>/usr/share/vim</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gview">
-        <term><command>gview</command></term>
-        <listitem>
-          <para>
-            starts <command>gvim</command> in read-only mode
-          </para>
-          <indexterm zone="vim gview">
-            <primary sortas="b-gview">gview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvim">
-        <term><command>gvim</command></term>
-        <listitem>
-          <para>
-            is the editor that runs under <application>X</application>
-            and includes a GUI
-          </para>
-          <indexterm zone="vim gvim">
-            <primary sortas="b-gvim">gvim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvimdiff">
-        <term><command>gvimdiff</command></term>
-        <listitem>
-          <para>
-            edits two or three versions of a file with
-            <command>gvim</command> and shows the differences
-          </para>
-          <indexterm zone="vim gvimdiff">
-            <primary sortas="b-gvimdiff">gvimdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvimtutor">
-        <term><command>gvimtutor</command></term>
-        <listitem>
-          <para>
-            teaches the basic keys and commands of
-            <command>gvim</command>
-          </para>
-          <indexterm zone="vim gvimtutor">
-            <primary sortas="b-gvimtutor">gvimtutor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rgview">
-        <term><command>rgview</command></term>
-        <listitem>
-          <para>
-            is a restricted version of <command>gview</command>
-          </para>
-          <indexterm zone="vim rgview">
-            <primary sortas="b-rgview">rgview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rgvim">
-        <term><command>rgvim</command></term>
-        <listitem>
-          <para>
-            is a restricted version of <command>gvim</command>
-          </para>
-          <indexterm zone="vim gvim">
-            <primary sortas="b-gvim">gvim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: stlfs/filesystems/aboutlvm.xml
===================================================================
--- postlfs/filesystems/aboutlvm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="aboutlvm">
-  <?dbhtml filename="aboutlvm.html"?>
-
-
-  <title>About Logical Volume Management (LVM)</title>
-
-  <para>
-    LVM manages disk drives.  It allows multiple drives and partitions
-    to be combined into larger <emphasis>volume groups</emphasis>, assists in
-    making backups through a <emphasis>snapshot</emphasis>, and allows for
-    dynamic volume resizing. It can also provide mirroring similar to
-    a RAID 1 array.
-  </para>
-
-  <para>
-    A complete discussion of LVM is beyond the scope of this introduction,
-    but basic concepts are presented below.
-  </para>
-
-  <para>
-    To run any of the commands presented here, the <xref linkend='lvm2'/>
-    package must be installed.  All commands must be run as the <systemitem
-    class="username">root</systemitem> user.
-  </para>
-
-  <para>
-    Management of disks with lvm is accomplished using the following concepts:
-  </para>
-
-  <variablelist>
-    <varlistentry>
-      <term>physical volumes</term>
-      <listitem>
-        <para>
-          These are physical disks or partitions such as
-          /dev/sda3 or /dev/sdb.
-        </para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>volume groups</term>
-      <listitem>
-        <para>
-          These are named groups of physical volumes that
-          can be manipulated by the administrator.  The number of physical
-          volumes that make up a volume group is arbitrary.  Physical volumes
-          can be dynamically added or removed from a volume group.
-        </para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>logical volumes</term>
-      <listitem>
-        <para>
-          Volume groups may be subdivided into logical volumes. Each logical
-          volume can then be individually formatted as if it were a regular
-          Linux partition. Logical volumes may be dynamically resized by
-          the administrator according to need.
-        </para>
-      </listitem>
-
-    </varlistentry>
-  </variablelist>
-
-  <para>
-    To give a concrete example, suppose that you have two 2 TB disks. Also
-    suppose a really large amount of space is required for a very large
-    database, mounted on <filename class='directory'>/srv/mysql</filename>.
-    This is what the initial set of partitions would look like:
-  </para>
-
-  <screen><literal>Partition  Use    Size      Partition Type
-/dev/sda1  /boot  100MB     83 (Linux)
-/dev/sda2  /       10GB     83 (Linux)
-/dev/sda3  swap     2GB     82 (Swap)
-/dev/sda4  LVM    remainder 8e (LVM)
-/dev/sdb1  swap     2GB     82 (Swap)
-/dev/sdb2  LVM    remainder 8e (LVM)</literal></screen>
-
-  <para>
-    First initialize the physical volumes:
-  </para>
-
-  <screen><userinput>pvcreate /dev/sda4 /dev/sdb2</userinput></screen>
-
-  <note>
-    <para>
-      A full disk can be used as part of a physical volume, but
-      beware that the <command>pvcreate</command> command will destroy any
-      partition information on that disk.
-    </para>
-  </note>
-
-  <para>
-    Next create a volume group named lfs-lvm:
-  </para>
-
-  <screen><userinput>vgcreate lfs-lvm /dev/sda4  /dev/sdb2</userinput></screen>
-
-  <para>
-    The status of the volume group can be checked by running the command
-    <command>vgscan</command>. Now create the logical volumes.  Since there
-    is about 3900 GB available, leave about 900 GB free for expansion. Note
-    that the logical volume named <emphasis>mysql</emphasis> is larger than
-    any physical disk.
-  </para>
-
-  <screen><userinput>lvcreate --name mysql --size 2500G lfs-lvm
-lvcreate --name home  --size  500G lfs-lvm</userinput></screen>
-
-  <para>
-    Finally the logical volumes can be formatted and mounted.  In this
-    example, the jfs file system (<xref linkend='jfsutils'/>) is used for
-    demonstration purposes.
-  </para>
-
-  <screen><userinput>mkfs -t ext4 /dev/lfs-lvm/home
-mkfs -t jfs  /dev/lfs-lvm/mysql
-mount /dev/lfs-lvm/home /home
-mkdir -p /srv/mysql
-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.
-  </para>
-
-  <para>
-    A LVM logical volume can host a root filesystem, but requires the use
-    of an initramfs (initial RAM file system). The initramfs proposed in
-    <xref linkend="initramfs"/> allows to pass the lvm volume in
-    the <parameter>root=</parameter> switch of the kernel command line.
-  </para>
-
-  <para revision="systemd">
-    If not using an initramfs, there is a race condition in <application>
-    systemd</application> preventing mounting logical volumes through
-    <filename>/etc/fstab</filename>. You must create a <quote>mount</quote>
-    unit (see <ulink role='man'
-    url='&man;systemd.mount.5'>systemd.mount(5)</ulink>) as in the following
-    example, which mounts the <filename class="directory">/home</filename>
-    directory automatically at boot:
-  </para>
-
-<screen role="root" revision="systemd"><userinput>cat &gt; /etc/systemd/system/home.mount &lt;&lt; EOF
-<literal>[Unit]
-Description=Mount the lvm volume /dev/lfs-lvm/home to /home
-
-[Mount]
-What=/dev/lfs-lvm/home
-Where=/home
-Type=ext4
-Options=default
-
-[Install]
-WantedBy=multi-user.target</literal>
-EOF</userinput></screen>
-
-  <note revision="systemd">
-    <para>
-    The name of the unit must be the name of the mount point with the
-    `/' character replaced by `-', omitting the leading one.
-    </para>
-  </note>
-
-  <para revision="systemd">
-    Next the unit must be enabled with:
-  </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable home.mount</userinput></screen>
-
-  <para>
-    For more information about LVM, see the <ulink
-    url="https://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.
-  </para>
-
-</sect1>
Index: stlfs/filesystems/aboutraid.xml
===================================================================
--- postlfs/filesystems/aboutraid.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="raid">
-  <?dbhtml filename="raid.html"?>
-
-
-  <title>About RAID</title>
-
-  <para>
-    The storage technology known as RAID (Redundant Array of
-    Independent Disks) combines multiple physical disks into a logical
-    unit.  The drives can generally be combined to provide data
-    redundancy or to extend the size of logical units beyond the
-    capability of the physical disks or both.  The technology
-    also allows for providing hardware maintenance without powering
-    down the system.
-  </para>
-
-  <para>
-    The types of RAID organization are described in the <ulink
-    url="https://raid.wiki.kernel.org/index.php/Overview#The_RAID_levels">
-    RAID Wiki</ulink>.
-  </para>
-
-  <para>
-    Note that while RAID provides protection against disk
-    failures, it is not a substitute for backups.  A file deleted
-    is still deleted on all the disks of a RAID array.  Modern backups
-    are generally done via <xref linkend='rsync'/>.
-  </para>
-
-  <para>
-    There are three major types of RAID implementation:
-    Hardware RAID, BIOS-based RAID, and Software RAID.
-  </para>
-
-  <sect2 id="hwraid">
-    <title>Hardware RAID</title>
-    <para>
-      Hardware based RAID provides capability through proprietary
-      hardware and data layouts.  The control and configuration is generally
-      done via firmware in conjunction with executable programs made
-      available by the device manufacturer.  The capabilities are
-      generally supplied via a PCI card, although there are some
-      instances of RAID components integrated in to the motherboard.
-      Hardware RAID may also be available in a stand-alone enclosure.
-    </para>
-
-    <para>
-      One advantage of hardware-based RAID is that the drives
-      are offered to the operating system as a logical drive and no
-      operating system dependent configuration is needed.
-    </para>
-
-    <para>
-      Disadvantages include difficulties in transferring drives
-      from one system to another, updating firmware, or replacing
-      failed RAID hardware.
-    </para>
-
-  </sect2>
-
-  <sect2 id="biosraid">
-    <title>BIOS-based RAID</title>
-
-    <para>
-      Some computers offer a hardware-like RAID implementation in the
-      system BIOS.  Sometime this is referred to as 'fake' RAID as the
-      capabilities are generally incorporated into firmware without any hardware
-      acceleration.
-    </para>
-
-    <para>
-      The advantages and disadvantages of BIOS-based RAID are generally
-      the same as hardware RAID with the additional disadvantage that there
-      is no hardware acceleration.
-    </para>
-
-    <para>
-      In some cases, BIOS-based RAID firmware is enabled by default (e.g.
-      some DELL systems).  If software RAID is desired, this option must be
-      explicitly disabled in the BIOS.
-    </para>
-
-  </sect2>
-
-  <sect2 id="swraid">
-  <title>Software RAID</title>
-    <para>
-      Software based RAID is the most flexible form of RAID.  It is
-      easy to install and update and provides full capability on all or
-      part of any drives available to the system.  In BLFS, the RAID software
-      is found in <xref linkend='mdadm'/>.
-    </para>
-
-    <para>
-      Configuring a RAID device is straightforward using
-      <application>mdadm</application>.  Generally devices are created in the
-      <filename class='directory'>/dev</filename> directory as
-      <filename>/dev/mdx</filename> where <emphasis>x</emphasis> is an integer.
-    </para>
-
-    <para>
-      The first step in creating a RAID array is to use partitioning software
-      such as <userinput>fdisk</userinput> or <xref linkend='parted'/> to
-      define the partitions needed for the array.  Usually, there will be
-      one partition on each drive participating in the RAID array, but that
-      is not strictly necessary.  For this example, there will be four disk
-      drives:
-      <filename>/dev/sda</filename>,
-      <filename>/dev/sdb</filename>,
-      <filename>/dev/sdc</filename>, and
-      <filename>/dev/sdd</filename>.  They will be partitioned as follows:
-    </para>
-
-<screen><literal>Partition Size     Type                Use
-sda1:     100 MB   fd Linux raid auto  /boot    (RAID 1) /dev/md0
-sda2:      10 GB   fd Linux raid auto  /        (RAID 1) /dev/md1
-sda3:       2 GB   83 Linux swap       swap
-sda4      300 GB   fd Linux raid auto  /home    (RAID 5) /dev/md2
-
-sdb1:     100 MB   fd Linux raid auto  /boot    (RAID 1) /dev/md0
-sdb2:      10 GB   fd Linux raid auto  /        (RAID 1) /dev/md1
-sdb3:       2 GB   83 Linux swap       swap
-sdb4      300 GB   fd Linux raid auto  /home    (RAID 5) /dev/md2
-
-sdc1:      12 GB   fd Linux raid auto  /usr/src (RAID 0) /dev/md3
-sdc2:     300 GB   fd Linux raid auto  /home    (RAID 5) /dev/md2
-
-sdd1:      12 GB   fd Linux raid auto  /usr/src (RAID 0) /dev/md3
-sdd2:     300 GB   fd Linux raid auto  /home    (RAID 5) /dev/md2 </literal></screen>
-
-    <para>
-      In this arrangement, a separate boot partition is created as the
-      first small RAID array and a root filesystem as the secong RAID array,
-      both mirrored.  The third partition is a large (about 1TB) array for the
-      <filename class='directory'>/home</filename> directory.  This provides
-      an ability to stripe data across multiple devices, improving speed for
-      both reading and writing large files.  Finally, a fourth array is created
-      that concatenates two partitions into a larger device.
-    </para>
-
-    <note>
-      <para>
-        All <application>mdadm</application> commands must be run
-        as the <systemitem class="username">root</systemitem> user.
-      </para>
-    </note>
-
-    <para>
-      To create these RAID arrays the commands are:
-    </para>
-
-<screen><userinput>/sbin/mdadm -Cv /dev/md0 --level=1 --raid-devices=2 /dev/sda1 /dev/sdb1
-/sbin/mdadm -Cv /dev/md1 --level=1 --raid-devices=2 /dev/sda2 /dev/sdb2
-/sbin/mdadm -Cv /dev/md3 --level=0 --raid-devices=2 /dev/sdc1 /dev/sdd1
-/sbin/mdadm -Cv /dev/md2 --level=5 --raid-devices=4 \
-        /dev/sda4 /dev/sdb4 /dev/sdc2 /dev/sdd2 </userinput></screen>
-
-    <para>
-      The devices created can be examined by device.  For example,
-      to see the details of <filename>/dev/md1</filename>, use
-      <userinput>/sbin/mdadm --detail /dev/md1</userinput>:
-    </para>
-
-<screen><literal>        Version : 1.2
-  Creation Time : Tue Feb  7 17:08:45 2012
-     Raid Level : raid1
-     Array Size : 10484664 (10.00 GiB 10.74 GB)
-  Used Dev Size : 10484664 (10.00 GiB 10.74 GB)
-   Raid Devices : 2
-  Total Devices : 2
-    Persistence : Superblock is persistent
-
-    Update Time : Tue Feb  7 23:11:53 2012
-          State : clean
- Active Devices : 2
-Working Devices : 2
- Failed Devices : 0
-  Spare Devices : 0
-
-           Name : core2-blfs:0  (local to host core2-blfs)
-           UUID : fcb944a4:9054aeb2:d987d8fe:a89121f8
-         Events : 17
-
-    Number   Major   Minor   RaidDevice State
-       0       8        1        0      active sync   /dev/sda1
-       1       8       17        1      active sync   /dev/sdb1</literal></screen>
-
-    <para>
-      From this point, the partitions can be formatted with the filesystem of
-      choice (e.g. ext3, ext4, <xref linkend='xfsprogs'/>, etc).  The formatted 
-      partitions can then be
-      mounted.  The <filename>/etc/fstab</filename> file can use the devices
-      created for mounting at boot time and the linux command line in
-      <filename>/boot/grub/grub.cfg</filename> can specify
-      <option>root=/dev/md1</option>.
-    </para>
-
-    <note>
-      <para>
-        The swap devices should be specified in the
-        <filename>/etc/fstab</filename> file as normal.  The kernel normally
-        stripes swap data across multiple swap files and should not be made
-        part of a RAID array.
-      </para>
-    </note>
-
-    <para>
-      For further options and management details of RAID devices, refer to
-      <userinput>man mdadm</userinput>.
-    </para>
-
-    <para>
-      Additional details for monitoring RAID arrays and dealing with
-      problems can be found at the <ulink
-      url="https://raid.wiki.kernel.org/index.php/Linux_Raid">Linux RAID
-      Wiki</ulink>.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/btrfs-progs-kernel.xml
===================================================================
--- postlfs/filesystems/btrfs-progs-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>B</emphasis>trfs filesystem support                                      [BTRFS_FS]</screen>
Index: stlfs/filesystems/btrfs-progs-test-kernel.xml
===================================================================
--- postlfs/filesystems/btrfs-progs-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>B</emphasis>trfs filesystem support                                      [BTRFS_FS]
-  [*]     <emphasis role='blue'>B</emphasis>trfs POSIX Access Control Lists                  [BTRFS_FS_POSIX_ACL]</screen>
Index: stlfs/filesystems/btrfs-progs.xml
===================================================================
--- postlfs/filesystems/btrfs-progs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,410 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "729b0927484ebb34e375849b632e287d">
-  <!ENTITY btrfs-progs-size          "2.5 MB">
-  <!ENTITY btrfs-progs-buildsize     "62 MB (transient files created during tests need up to 10 GB)">
-  <!ENTITY btrfs-progs-time          "0.3 SBU (with parallelism=4; add 2.5 SBU for tests, up to 14 SBU on slow disks)">
-]>
-
-<sect1 id="btrfs-progs" xreflabel="btrfs-progs-&btrfs-progs-version;">
-  <?dbhtml filename="btrfs-progs.html"?>
-
-
-  <title>btrfs-progs-&btrfs-progs-version;</title>
-
-  <indexterm zone="btrfs-progs">
-    <primary sortas="a-btrfs-progs">btrfs-progs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to btrfs-progs</title>
-
-    <para>
-      The <application>btrfs-progs</application> package contains
-      administration and debugging tools for the B-tree file system (btrfs).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&btrfs-progs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&btrfs-progs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &btrfs-progs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &btrfs-progs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &btrfs-progs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &btrfs-progs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-<bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch if building with linux kernel headers version
-          before 5.12:
-          <ulink url="&patch-root;/btrfs-progs-&btrfs-progs-version;-headers_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Btrfs-progs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lzo"/>
-    </para>
-    <!-- In v6.2.1 (and maybe previous), sphinx is required for the doc
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="asciidoc"/> (or <xref role="nodep" linkend="asciidoctor"/>)
-      and <xref linkend="xmlto"/> (both required to generate man pages)
-    </para>
-    -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests),
-      <xref linkend="sphinx"/> and <xref linkend="sphinx_rtd_theme"/>
-      (required to build documentation), and
-      <ulink 
-        url='https://mirrors.edge.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/'>
-        reiserfsprogs</ulink> (for tests).
-
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id="btrfs-progs-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following option in the kernel configuration
-      and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="btrfs-progs-kernel.xml"/>
-
-    <para>
-      In addition to the above and to the options required for
-      <xref linkend="lvm2"/>, the following
-      options must be enabled for running tests:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="btrfs-progs-test-kernel.xml"/>
-
-    <indexterm zone="btrfs-progs btrfs-progs-kernel">
-      <primary sortas="d-btrfs-progs">BTRFS Programs</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of btrfs-progs</title>
-
-    <para>
-      Install <application>btrfs-progs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --disable-static        \
-            --disable-documentation &amp;&amp;
-make</userinput></screen>
-
-    <note>
-      <para>
-        Some tests require grep built with perl regular expressions. To
-        obtain this, rebuild grep with the LFS Chapter 8 instructions after
-        installing <xref linkend="pcre2"/>.
-      </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>
-      To test the results, issue (as the &root; user):
-    </para>
-
-<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
-popd</userinput></screen>
-
-<!-- Template for failed test removal:
-      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 from running because the test
-        disk image is not cleanly unmounted.
-      </para>
-    </note>
-
-    <para>
-      The convert-tests scripts are known to fail.
-      Tests 004-shrink-fs and 062-fi-show-raw-dm-all-devices in the misc-tests 
-      are known to fail.
-    </para>
-
-    <para>
-      Install the package as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have passed <parameter>--disable-documentation</parameter> to
-      <command>configure</command> and you need the manual pages, install them
-      by running, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>for i in 5 8; do
-   install Documentation/*.$i /usr/share/man/man$i
-done</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>
-      <parameter>--disable-documentation</parameter>: This switch
-      disables rebuilding the manual pages, because it requires
-      <xref linkend="sphinx"/>.
-    </para>
-<!--
-    <para>
-      <command>sed 's/,orphan_file//" ...</command>: In this version of
-      <application>btrfs-progs</application>, the
-      <command>btrfs-convert</command> program produces a btrfs filesystem
-      containing errors if converting from an ext4 filesystem created
-      with the <quote>orphan_file</quote> feature. This command creates
-      a custom configuration file that prevents creating a filesystem
-      with this feature.
-    </para>
--->
-    <!--
-    <para>
-      <command>ln -s ... /usr/lib/libbtrfs.so</command>: Creates a
-      symbolic link in the directory where it is expected.
-    </para>
-
-    <para>
-      <command>rm /lib/libbtrfs.{a,so}</command>: Removes unneeded
-      library entries.
-    </para>
--->
-  </sect2>
-<!--
-  <sect2 role="using" id="using-btrfs-convert">
-    <title>Using the btrfs-convert Program</title>
-
-    <para>
-      This version of <application>btrfs-progs</application> does not convert
-      correctly ext4 filesystems to btrfs if the ext4
-      <option>orphan_file</option> feature is turned on. If you happen to
-      convert such a filesystem, you need to first run:
-    </para>
-
-<screen role="nodump"><userinput>tune2fs -O ^orphan_file <replaceable>/dev/sdxx</replaceable></userinput></screen>
-
-    <para>
-      where <filename>/dev/sdxx</filename> is the partition of the filesystem
-      you want to convert.
-    </para>
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          btrfs,
-          btrfs-convert,
-          btrfs-find-root,
-          btrfs-image,
-          btrfs-map-logical,
-          btrfs-select-super,
-          btrfsck (link to btrfs),
-          btrfstune,
-          fsck.btrfs, and
-          mkfs.btrfs
-        </seg>
-
-        <seg>
-          libbtrfs.so and
-          libbtrfsutil.so
-        </seg>
-
-        <seg>/usr/include/btrfs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="btrfs-prog">
-        <term><command>btrfs</command></term>
-        <listitem>
-          <para>
-            is the main interface into btrfs filesystem operations
-          </para>
-          <indexterm zone="btrfs-progs btrfs-prog">
-            <primary sortas="b-btrfs">btrfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btrfs-convert">
-        <term><command>btrfs-convert</command></term>
-        <listitem>
-          <para>
-            converts from an ext2/3/4 or reiserfs filesystem to btrfs <!--(see
-            <xref linkend="using-btrfs-convert"/> above)-->
-          </para>
-          <indexterm zone="btrfs-progs btrfs-convert">
-            <primary sortas="b-btrfs-convert">btrfs-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btrfs-find-root">
-        <term><command>btrfs-find-root</command></term>
-        <listitem>
-          <para>
-            is a filter to find btrfs root
-          </para>
-          <indexterm zone="btrfs-progs btrfs-find-root">
-            <primary sortas="b-btrfs-find-root">btrfs-find-root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btrfs-map-logical">
-        <term><command>btrfs-map-logical</command></term>
-        <listitem>
-          <para>
-            maps btrfs logical extent to physical extent
-          </para>
-          <indexterm zone="btrfs-progs btrfs-map-logical">
-            <primary sortas="b-btrfs-map-logical">btrfs-map-logical</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btrfs-select-super">
-        <term><command>btrfs-select-super</command></term>
-        <listitem>
-          <para>
-            overwrites the primary superblock with a backup copy
-          </para>
-          <indexterm zone="btrfs-progs btrfs-select-super">
-            <primary sortas="b-btrfs-select-super">btrfs-select-super</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btrfstune">
-        <term><command>btrfstune</command></term>
-        <listitem>
-          <para>
-            tunes various filesystem parameters
-          </para>
-          <indexterm zone="btrfs-progs btrfstune">
-            <primary sortas="b-btrfstune">btrfstune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.btrfs">
-        <term><command>fsck.btrfs</command></term>
-        <listitem>
-          <para>
-            does nothing, but is present for consistency with fstab
-          </para>
-          <indexterm zone="btrfs-progs fsck.btrfs">
-            <primary sortas="b-fsck.btrfs">fsck.btrfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.btrfs">
-        <term><command>mkfs.btrfs</command></term>
-        <listitem>
-          <para>
-            creates a btrfs file system
-          </para>
-          <indexterm zone="btrfs-progs mkfs.btrfs">
-            <primary sortas="b-mkfs.btrfs">mkfs.btrfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/dosfstools-kernel.xml
===================================================================
--- postlfs/filesystems/dosfstools-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  <emphasis role='blue'>D</emphasis>OS/FAT/EXFAT/NT Filesystems ---&gt;
-    &lt; /*/M&gt; M<emphasis role='blue'>S</emphasis>DOS fs support                                          [MSDOS_FS]
-    &lt;*/M&gt;   <emphasis role='blue'>V</emphasis>FAT (Windows-95) fs support                               [VFAT_FS]</screen>
Index: stlfs/filesystems/dosfstools.xml
===================================================================
--- postlfs/filesystems/dosfstools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,200 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dosfstools-download-http "https://github.com/dosfstools/dosfstools/releases/download/v&dosfstools-version;/dosfstools-&dosfstools-version;.tar.gz">
-  <!ENTITY dosfstools-download-ftp  " ">
-  <!ENTITY dosfstools-md5sum        "49c8e457327dc61efab5b115a27b087a">
-  <!ENTITY dosfstools-size          "314 KB">
-  <!ENTITY dosfstools-buildsize     "4.5 MB (with tests)">
-  <!ENTITY dosfstools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="dosfstools" xreflabel="dosfstools-&dosfstools-version;">
-  <?dbhtml filename="dosfstools.html"?>
-
-
-  <title>dosfstools-&dosfstools-version;</title>
-
-  <indexterm zone="dosfstools">
-    <primary sortas="a-dosfstools">dosfstools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dosfstools</title>
-
-    <para>
-      The <application>dosfstools</application> package contains various
-      utilities for use with the FAT family of file systems.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dosfstools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dosfstools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dosfstools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dosfstools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dosfstools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dosfstools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id='dosfstools-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following option in the kernel configuration
-      and recompile the kernel if you need to mount a FAT-family filesystem:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="dosfstools-kernel.xml"/>
-
-    <para>
-      Note that <option>CONFIG_MSDOS_FS</option> deliberately unsupport
-      long file names.  <option>CONFIG_VFAT_FS</option> should be used
-      instead unless you really want to enforce the DOS-style
-      <quote>8.3</quote> file names.
-    </para>
-
-    <para>
-      You can mount a FAT-family filesystem once the kernel supports it.
-      If you don't need to create, check, or relabel a FAT-family system,
-      you may skip this package.
-    </para>
-
-    <indexterm zone="dosfstools dosfstools-kernel">
-      <primary sortas="d-fat">FAT Support in Kernel</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dosfstools</title>
-
-    <para>
-      Install <application>dosfstools</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr            \
-            --enable-compat-symlinks \
-            --mandir=/usr/share/man  \
-            --docdir=/usr/share/doc/dosfstools-&dosfstools-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-compat-symlinks</parameter>: This switch creates the
-      <application>dosfsck</application>,
-      <application>dosfslabel</application>,
-      <application>fsck.msdos</application>,
-      <application>fsck.vfat</application>,
-      <application>mkdosfs</application>,
-      <application>mkfs.msdos</application>, and
-      <application>mkfs.vfat</application> symlinks required by some programs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>fatlabel, fsck.fat, and mkfs.fat</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fatlabel">
-        <term><command>fatlabel</command></term>
-        <listitem>
-          <para>
-            sets or gets a MS-DOS filesystem label from a given device
-          </para>
-          <indexterm zone="dosfstools fatlabel">
-            <primary sortas="b-fatlabel">fatlabel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsckfat">
-        <term><command>fsck.fat</command></term>
-        <listitem>
-          <para>
-            checks and repairs MS-DOS filesystems
-          </para>
-          <indexterm zone="dosfstools fsckfat">
-            <primary sortas="b-fsckfat">fsck.fat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfsfat">
-        <term><command>mkfs.fat</command></term>
-        <listitem>
-          <para>
-            creates an MS-DOS filesystem under Linux
-          </para>
-          <indexterm zone="dosfstools mkfsfat">
-            <primary sortas="b-mkfsfat">mkfs.fat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/filesystems/ext3.xml
===================================================================
--- postlfs/filesystems/ext3.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/filesystems/ext3.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="postlfs-filesystems-ext3">
+<?dbhtml filename="ext3.html" dir="postlfs"?>
+<title>Ext3</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: postlfs/filesystems/filesystems.xml
===================================================================
--- postlfs/filesystems/filesystems.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/filesystems/filesystems.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,45 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="postlfs-filesystems">
+<?dbhtml filename="filesystems.html" dir="postlfs"?>
+<title>Filesystems</title>
 
-<chapter id="postlfs-filesystems">
-  <?dbhtml filename="filesystems.html"?>
+<para>Intro goes here.</para>
 
-  <title>File Systems and Disk Management</title>
-
-  <para>
-    Journaling file systems reduce the time needed to recover a file system
-    that was not unmounted properly.  While this can be extremely important in
-    reducing downtime for servers, it has also become popular for desktop
-    environments.  This chapter contains other journaling file systems you can
-    use instead of the default LFS extended file system (ext2/3/4). It also
-    provides introductory material on managing disk arrays.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initramfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="btrfs-progs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dosfstools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fuse3.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fuse2.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lvm2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlvm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutraid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mdadm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntfs-3g.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gptfdisk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parted.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="reiser.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="smartmontools.xml"/>
-  <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"/>
+&postlfs-filesystems-ext3;
+&postlfs-filesystems-reiser;
+&postlfs-filesystems-xfs;
 
 </chapter>
Index: stlfs/filesystems/fuse-kernel.xml
===================================================================
--- postlfs/filesystems/fuse-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>F</emphasis>USE (Filesystem in Userspace) support                         [FUSE_FS]</screen>
Index: stlfs/filesystems/fuse-test-kernel.xml
===================================================================
--- postlfs/filesystems/fuse-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>F</emphasis>USE (Filesystem in Userspace) support                         [FUSE_FS]
-  &lt;*/M&gt;   <emphasis role='blue'>C</emphasis>haracter device in Userspace support                           [CUSE]</screen>
Index: stlfs/filesystems/fuse3.xml
===================================================================
--- postlfs/filesystems/fuse3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,305 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fuse3-download-http "https://github.com/libfuse/libfuse/releases/download/fuse-&fuse3-version;/fuse-&fuse3-version;.tar.gz">
-  <!ENTITY fuse3-download-ftp  " ">
-  <!ENTITY fuse3-md5sum        "b00bf08b27ead4a9411578777e94a1cc">
-  <!ENTITY fuse3-size          "14 MB">
-  <!ENTITY fuse3-buildsize     "222 MB (with tests and documentation)">
-  <!ENTITY fuse3-time          "0.2 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="fuse3" xreflabel="Fuse-&fuse3-version;">
-  <?dbhtml filename="fuse.html"?>
-
-
-  <title>Fuse-&fuse3-version;</title>
-
-  <indexterm zone="fuse3">
-    <primary sortas="a-fuse-3">Fuse 3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fuse</title>
-
-    <para>
-      <application>FUSE</application> (Filesystem in Userspace) is a simple
-      interface for userspace programs to export a virtual filesystem to the
-      Linux kernel. <application>Fuse</application> also aims to provide a
-      secure method for non privileged users to create and mount their own
-      filesystem implementations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fuse3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fuse3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fuse3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fuse3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fuse3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fuse3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Fuse Dependencies</bridgehead>
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to rebuild the API documentation),
-      <xref linkend="pytest"/> (required for tests), and
-      <ulink url="https://pypi.org/project/looseversion/">looseversion</ulink>
-      (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="fuse-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="fuse-kernel.xml"/>
-
-    <para>
-      Character devices in userspace should be enabled too for running the
-      tests:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="fuse-test-kernel.xml"/>
-
-    <indexterm zone="fuse3 fuse-kernel">
-      <primary sortas="d-fuse3">Fuse 3</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fuse</title>
-
-    <para>
-      Install <application>Fuse</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/^udev/,$ s/^/#/' util/meson.build &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The API documentation is included in the package, but
-      if you have <xref linkend="doxygen"/> installed and wish to rebuild
-      it, issue:
-    </para>
-
-<screen remap="doc"><userinput>pushd .. &amp;&amp;
-  doxygen doc/Doxyfile &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      To test the results, issue the following commands (as the <systemitem
-      role="username">root</systemitem> user):
-    </para>
-
-    <!-- EDITORS NOTE:
-
-         Don't use 'pytest' instead of 'python3 -m pytest'.  There is no
-         testenv/bin/pytest (as at pytest-7.4.0) so 'pytest' resolves to
-         /usr/bin/pytest, and the shebang of it is /usr/bin/python3.11.
-         So it won't find the looseversion installed in testenv.
-
-         To view the results of the tests, look for
-         "short test summary info" at the end of your log. Below skipped tests,
-         you will see "X passed, X skipped, X failed (if any) in X seconds" -->
-
-<screen role="root" remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install looseversion                      &amp;&amp;
-python3 -m pytest
-deactivate</userinput></screen>
-
-    <para>
-      The <xref linkend="pytest"/> Python
-      module is required for the tests. One test named
-      <filename>test_cuse</filename> will fail if the
-      <parameter>CONFIG_CUSE</parameter> configuration item was not enabled
-      when the kernel was built. One test,
-      <filename>test/util.py</filename>, will output a warning due to the usage
-      of an unknown mark in pytest.
-      <!-- I really don't know why.  But it always happen for me, maybe
-           kernel configuration issue... -->
-      One test named
-      <filename>test_notify_inval_entry[True-expire_entries]</filename>
-      may fail under certain circumstances.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install                  &amp;&amp;
-chmod u+s /usr/bin/fusermount3 &amp;&amp;
-
-cd ..                          &amp;&amp;
-cp -Rv doc/html -T /usr/share/doc/fuse-&fuse3-version; &amp;&amp;
-install -v -m644   doc/{README.NFS,kernel.txt} \
-                   /usr/share/doc/fuse-&fuse3-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... util/meson.build</command>: This command disables the
-      installation of a boot script and udev rule that are not needed.
-    </para>
-
-<!--
-    <para>
-      <command>sed ... meson.build</command>: This command fixes a bug with the
-      test_passthrough_hp test.
-    </para>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration" id="fuse-configuration">
-    <title>Configuring fuse</title>
-
-    <sect3 id="fuse-config">
-      <title>Config Files</title>
-
-      <para>
-        Some options regarding mount policy can be set in the file
-        <filename>/etc/fuse.conf</filename>. To install the file run the
-        following command as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/fuse.conf &lt;&lt; "EOF"
-<literal># Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-#mount_max = 1000
-
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-#
-#user_allow_other</literal>
-EOF</userinput></screen>
-
-      <para>
-        Additional information about the meaning of the configuration
-        options are found in the man page.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          fusermount3 and mount.fuse3
-        </seg>
-        <seg>
-          libfuse3.so
-        </seg>
-        <seg>
-          /usr/include/fuse3 and /usr/share/doc/fuse-&fuse3-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fusermount3">
-        <term><command>fusermount3</command></term>
-        <listitem>
-          <para>
-            is a suid root program to mount and unmount Fuse filesystems
-          </para>
-          <indexterm zone="fuse3 fusermount3">
-            <primary sortas="b-fusermount3">fusermount3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.fuse3">
-        <term><command>mount.fuse3</command></term>
-        <listitem>
-          <para>
-            is the command <command>mount</command> calls to mount a Fuse
-            filesystem
-          </para>
-          <indexterm zone="fuse3 mount.fuse3">
-            <primary sortas="b-mount.fuse3">mount.fuse3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfuse3">
-        <term><filename class="libraryfile">libfuse3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>FUSE</application> API functions
-          </para>
-          <indexterm zone="fuse3 libfuse3">
-            <primary sortas="c-libfuse3">libfuse3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/gptfdisk.xml
===================================================================
--- postlfs/filesystems/gptfdisk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gptfdisk-download-http "&sourceforge-dl;/gptfdisk/gptfdisk-&gptfdisk-version;.tar.gz">
-  <!ENTITY gptfdisk-download-ftp  " ">
-  <!ENTITY gptfdisk-md5sum        "1970269eb7a97560e238611524b7797a">
-  <!ENTITY gptfdisk-size          "216 KB">
-  <!ENTITY gptfdisk-buildsize     "2.4 MB">
-  <!ENTITY gptfdisk-time          "less than 0.1 SBU (add 0.2 SBU for tests)">
-]>
-
-<sect1 id="gptfdisk" xreflabel="gptfdisk-&gptfdisk-version;">
-  <?dbhtml filename="gptfdisk.html"?>
-
-
-  <title>gptfdisk-&gptfdisk-version;</title>
-
-  <indexterm zone="gptfdisk">
-    <primary sortas="a-gptfdisk">gptfdisk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gptfdisk</title>
-
-    <para>
-      The <application>gptfdisk</application> package is a set of programs for
-      creation and maintenance of GUID Partition Table (GPT) disk drives.  A
-      GPT partitioned disk is required for drives greater than 2 TB and is a
-      modern replacement for legacy PC-BIOS partitioned disk drives that use a
-      Master Boot Record (MBR).  The main program, <command>gdisk</command>,
-      has an interface similar to the classic <command>fdisk</command> program.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gptfdisk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gptfdisk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gptfdisk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gptfdisk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gptfdisk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gptfdisk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Recommended patch: <ulink url=
-            "&patch-root;/gptfdisk-&gptfdisk-version;-convenience-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gptfdisk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gptfdisk</title>
-
-    <para>
-      The <application>gptfdisk</application> package comes with a
-      rudimentary <filename>Makefile</filename>.  First we update it
-      to provide a simple build and install interface and fix the
-      location of a header file and fix some minor location issues.
-      Install <application>gptfdisk</application> by running the following
-      commands:
-    </para>
-
-<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>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -Np1 ...</command>: This patch modifies the
-      <filename>Makefile</filename> file so that it provides an
-      <quote>install</quote> target.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          cgdisk, gdisk, fixparts, and sgdisk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cgdisk">
-        <term><command>cgdisk</command></term>
-        <listitem>
-          <para>
-            is an ncurses-based tool for manipulating GPT partitions
-          </para>
-          <indexterm zone="gptfdisk cgdisk">
-            <primary sortas="b-cgdisk">cgdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdisk">
-        <term><command>gdisk</command></term>
-        <listitem>
-          <para>
-            is an interactive text-mode tool for manipulating GPT partitions
-          </para>
-          <indexterm zone="gptfdisk gdisk">
-            <primary sortas="b-gdisk">gdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fixparts">
-        <term><command>fixparts</command></term>
-        <listitem>
-          <para>
-            repairs mis-formatted MBR based disk partitions
-          </para>
-          <indexterm zone="gptfdisk fixparts">
-            <primary sortas="b-fixparts">fixparts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgdisk">
-        <term><command>sgdisk</command></term>
-        <listitem>
-          <para>
-            is a partition manipulation program for
-            GPT partitions similar to <command>sfdisk</command>
-          </para>
-          <indexterm zone="gptfdisk sgdisk">
-            <primary sortas="b-sgdisk">sgdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/initramfs.xml
===================================================================
--- postlfs/filesystems/initramfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,512 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="initramfs">
-  <?dbhtml filename="initramfs.html"?>
-
-
-  <title>About initramfs</title>
-
-  <para>
-    The only purpose of an initramfs is to mount the root filesystem.  The
-    initramfs is a complete set of directories that you would find on a normal
-    root filesystem.  It is bundled into a single cpio archive and compressed
-    with one of several compression algorithms.
-  </para>
-
-  <para>
-    At boot time, the boot loader loads the kernel and the initramfs image
-    into memory and starts the kernel.  The kernel checks for the presence
-    of the initramfs and, if found, mounts it as / and runs /init. The init
-    program is typically a shell script.  Note that the boot process takes
-    longer, possibly significantly longer, if an initramfs is used.
-  </para>
-
-  <para>
-    For most distributions, kernel modules are the biggest reason to have
-    an initramfs.  In a general distribution, there are many unknowns such
-    as file system types and disk layouts.  In a way, this is the opposite
-    of LFS where the system capabilities and layout are known and a custom
-    kernel is normally built.  In this situation, an initramfs is rarely
-    needed.
-  </para>
-
-  <para>
-    There are only four primary reasons to have an initramfs in the LFS
-    environment: loading the rootfs from a network, loading it from an LVM
-    logical volume, having an encrypted rootfs where a password is required, or
-    for the convenience of specifying the rootfs as a LABEL or UUID.  Anything
-    else usually means that the kernel was not configured properly.
-  </para>
-
-  <sect2 id="initramfs-build">
-    <title>Building an initramfs</title>
-
-    <para>
-      If you do decide to build an initramfs, the following scripts will
-      provide a basis to do it.  The scripts will allow specifying a rootfs
-      via partition UUID or partition LABEL or a rootfs on an LVM logical
-      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
-      Hints</ulink> or <ulink
-      url="https://fedoraproject.org/wiki/Dracut">dracut</ulink>.
-    </para>
-
-    <para>
-      To install these scripts, run the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <screen role="root"><userinput>cat &gt; /usr/sbin/mkinitramfs &lt;&lt; "EOF"
-<literal>#!/bin/bash
-# This file based in part on the mkinitramfs script for the LFS LiveCD
-# written by Alexander E. Patrakov and Jeremy Huntwork.
-
-copy()
-{
-  local file
-
-  if [ "$2" = "lib" ]; then
-    file=$(PATH=/usr/lib type -p $1)
-  else
-    file=$(type -p $1)
-  fi
-
-  if [ -n "$file" ] ; then
-    cp $file $WDIR/usr/$2
-  else
-    echo "Missing required file: $1 for directory $2"
-    rm -rf $WDIR
-    exit 1
-  fi
-}
-
-if [ -z $1 ] ; then
-  INITRAMFS_FILE=initrd.img-no-kmods
-else
-  KERNEL_VERSION=$1
-  INITRAMFS_FILE=initrd.img-$KERNEL_VERSION
-fi
-
-if [ -n "$KERNEL_VERSION" ] &amp;&amp; [ ! -d "/usr/lib/modules/$1" ] ; then
-  echo "No modules directory named $1"
-  exit 1
-fi
-
-printf "Creating $INITRAMFS_FILE... "
-
-binfiles="sh cat cp dd killall ls mkdir mknod mount "
-binfiles="$binfiles umount sed sleep ln rm uname"
-binfiles="$binfiles readlink basename"
-
-# Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
-if [ -x /usr/bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
-
-sbinfiles="modprobe blkid switch_root"
-
-# Optional files and locations
-for f in mdadm mdmon udevd udevadm; do
-  if [ -x /usr/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
-
-unsorted=$(mktemp /tmp/unsorted.XXXXXXXXXX)
-
-DATADIR=/usr/share/mkinitramfs
-INITIN=init.in
-
-# Create a temporary working directory
-WDIR=$(mktemp -d /tmp/initrd-work.XXXXXXXXXX)
-
-# Create base directory structure
-mkdir -p $WDIR/{dev,run,sys,proc,usr/{bin,lib/{firmware,modules},sbin}}
-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
-
-# Create necessary device nodes
-mknod -m 640 $WDIR/dev/console c 5 1
-mknod -m 664 $WDIR/dev/null    c 1 3
-
-# Install the udev configuration files
-if [ -f /etc/udev/udev.conf ]; then
-  cp /etc/udev/udev.conf $WDIR/etc/udev/udev.conf
-fi
-
-for file in $(find /etc/udev/rules.d/ -type f) ; do
-  cp $file $WDIR/etc/udev/rules.d
-done
-
-# Install any firmware present
-cp -a /usr/lib/firmware $WDIR/usr/lib
-
-# Copy the RAID configuration file if present
-if [ -f /etc/mdadm.conf ] ; then
-  cp /etc/mdadm.conf $WDIR/etc
-fi
-
-# Install the init file
-install -m0755 $DATADIR/$INITIN $WDIR/init
-
-if [  -n "$KERNEL_VERSION" ] ; then
-  if [ -x /usr/bin/kmod ] ; then
-    binfiles="$binfiles kmod"
-  else
-    binfiles="$binfiles lsmod"
-    sbinfiles="$sbinfiles insmod"
-  fi
-fi
-
-# 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
-done
-
-for f in $sbinfiles ; do
-  ldd /usr/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
-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
-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
-  # Conf file(s)
-  cp -a /etc/lvm $WDIR/etc
-fi
-
-# Install libraries
-sort $unsorted | uniq | while read library ; do
-# linux-vdso and linux-gate are pseudo libraries and do not correspond to a file
-# libsystemd-shared is in /lib/systemd, so it is not found by copy, and
-# it is copied below anyway
-  if [[ "$library" == linux-vdso.so.1 ]] ||
-     [[ "$library" == linux-gate.so.1 ]] ||
-     [[ "$library" == libsystemd-shared* ]]; then
-    continue
-  fi
-
-  copy $library lib
-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
-fi
-
-# Install the kernel modules if requested
-if [ -n "$KERNEL_VERSION" ]; then
-  find \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib}                      \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,nvme,md,firewire} \
-     /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \
-     /usr/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
-  if [ -f /usr/lib/modules/$KERNEL_VERSION/modules.builtin.modinfo ]; then
-    cp /usr/lib/modules/$KERNEL_VERSION/modules.builtin.modinfo \
-            $WDIR/usr/lib/modules/$KERNEL_VERSION
-  fi
-
-  depmod -b $WDIR $KERNEL_VERSION
-fi
-
-( cd $WDIR ; find . | cpio -o -H newc --quiet | gzip -9 ) &gt; $INITRAMFS_FILE
-
-# 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
-
-# first empty WDIR to reuse it
-  rm -r $WDIR/*
-
-  DSTDIR=$WDIR/kernel/x86/microcode
-  mkdir -p $DSTDIR
-
-  if [ -d /usr/lib/firmware/amd-ucode ]; then
-    cat /usr/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
-  fi
-
-  ( cd $WDIR; find . | cpio -o -H newc --quiet ) &gt; microcode.img
-  cat microcode.img $INITRAMFS_FILE &gt; tmpfile
-  mv tmpfile $INITRAMFS_FILE
-  rm microcode.img
-fi
-
-# Remove the temporary directories and files
-rm -rf $WDIR $unsorted
-printf "done.\n"
-</literal>
-EOF
-
-chmod 0755 /usr/sbin/mkinitramfs</userinput></screen>
-
-    <screen role="root"><userinput>mkdir -p /usr/share/mkinitramfs &amp;&amp;
-cat &gt; /usr/share/mkinitramfs/init.in &lt;&lt; "EOF"
-<literal>#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-export PATH
-
-problem()
-{
-   printf "Encountered a problem!\n\nDropping you to a shell.\n\n"
-   sh
-}
-
-no_device()
-{
-   printf "The device %s, which is supposed to contain the\n" $1
-   printf "root file system, does not exist.\n"
-   printf "Please fix this problem and exit this shell.\n\n"
-}
-
-no_mount()
-{
-   printf "Could not mount device %s\n" $1
-   printf "Sleeping forever. Please reboot and fix the kernel command line.\n\n"
-   printf "Maybe the device is formatted with an unsupported file system?\n\n"
-   printf "Or maybe filesystem type autodetection went wrong, in which case\n"
-   printf "you should add the rootfstype=... parameter to the kernel command line.\n\n"
-   printf "Available partitions:\n"
-}
-
-do_mount_root()
-{
-   mkdir /.root
-   [ -n "$rootflags" ] &amp;&amp; rootflags="$rootflags,"
-   rootflags="$rootflags$ro"
-
-   case "$root" in
-      /dev/*    ) device=$root ;;
-      UUID=*    ) eval $root; device="/dev/disk/by-uuid/$UUID" ;;
-      PARTUUID=*) eval $root; device="/dev/disk/by-partuuid/$PARTUUID" ;;
-      LABEL=*   ) eval $root; device="/dev/disk/by-label/$LABEL" ;;
-      ""        ) echo "No root device specified." ; problem ;;
-   esac
-
-   while [ ! -b "$device" ] ; do
-       no_device $device
-       problem
-   done
-
-   if ! mount -n -t "$rootfstype" -o "$rootflags" "$device" /.root ; then
-       no_mount $device
-       cat /proc/partitions
-       while true ; do sleep 10000 ; done
-   else
-       echo "Successfully mounted device $root"
-   fi
-}
-
-do_try_resume()
-{
-   case "$resume" in
-      UUID=* ) eval $resume; resume="/dev/disk/by-uuid/$UUID"  ;;
-      LABEL=*) eval $resume; resume="/dev/disk/by-label/$LABEL" ;;
-   esac
-
-   if $noresume || ! [ -b "$resume" ]; then return; fi
-
-   ls -lH "$resume" | ( read x x x x maj min x
-       echo -n ${maj%,}:$min &gt; /sys/power/resume )
-}
-
-init=/sbin/init
-root=
-rootdelay=
-rootfstype=auto
-ro="ro"
-rootflags=
-device=
-resume=
-noresume=false
-
-mount -n -t devtmpfs devtmpfs /dev
-mount -n -t proc     proc     /proc
-mount -n -t sysfs    sysfs    /sys
-mount -n -t tmpfs    tmpfs    /run
-
-read -r cmdline &lt; /proc/cmdline
-
-for param in $cmdline ; do
-  case $param in
-    init=*      ) init=${param#init=}             ;;
-    root=*      ) root=${param#root=}             ;;
-    rootdelay=* ) rootdelay=${param#rootdelay=}   ;;
-    rootfstype=*) rootfstype=${param#rootfstype=} ;;
-    rootflags=* ) rootflags=${param#rootflags=}   ;;
-    resume=*    ) resume=${param#resume=}         ;;
-    noresume    ) noresume=true                   ;;
-    ro          ) ro="ro"                         ;;
-    rw          ) ro="rw"                         ;;
-  esac
-done
-
-# udevd location depends on version
-if [ -x /sbin/udevd ]; then
-  UDEVD=/sbin/udevd
-elif [ -x /lib/udev/udevd ]; then
-  UDEVD=/lib/udev/udevd
-elif [ -x /lib/systemd/systemd-udevd ]; then
-  UDEVD=/lib/systemd/systemd-udevd
-else
-  echo "Cannot find udevd nor systemd-udevd"
-  problem
-fi
-
-${UDEVD} --daemon --resolve-names=never
-udevadm trigger
-udevadm settle
-
-if [ -f /etc/mdadm.conf ] ; then mdadm -As                       ; fi
-if [ -x /sbin/vgchange  ] ; then /sbin/vgchange -a y &gt; /dev/null ; fi
-if [ -n "$rootdelay"    ] ; then sleep "$rootdelay"              ; fi
-
-do_try_resume # This function will not return if resuming from disk
-do_mount_root
-
-killall -w ${UDEVD##*/}
-
-exec switch_root /.root "$init" "$@"
-</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="initramfs-install">
-    <title>Using an initramfs</title>
-
-    <bridgehead renderas="sect3">Required Runtime Dependency</bridgehead>
-
-    <para role="required">
-      <xref role="runtime" linkend="cpio"/>
-    </para>
-
-    <bridgehead renderas="sect3">Other Runtime Dependencies</bridgehead>
-
-    <para role="optional">
-      <xref role="runtime" linkend="lvm2"/> and/or
-      <xref role="runtime" linkend="mdadm"/> must be installed before
-      generating the initramfs, if the system partition uses them.
-    </para>
-
-
-
-    <para>
-      To build an initramfs, run the following as the  <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-    <screen role="nodump"><userinput>mkinitramfs [KERNEL VERSION]</userinput></screen>
-
-    <para>
-      The optional argument is the directory where the appropriate kernel
-      modules are located. This must be a subdirectory of <filename
-      class='directory'> /lib/modules</filename>.  If no modules are specified,
-      then the initramfs is named <emphasis>initrd.img-no-kmods</emphasis>.
-      If a kernel version is specified, the initrd is named
-      <emphasis>initrd.img-$KERNEL_VERSION</emphasis> and is only appropriate
-      for the specific kernel specified. The output file will be placed in the
-      current directory.
-    </para>
-
-    <para>
-      If early loading of microcode is needed (see <xref
-      linkend="cpu-microcode"/>), you can install the appropriate blob or
-      container in <filename class="directory">/lib/firmware</filename>.
-      It will be automatically added to the initrd when running
-      <command>mkinitramfs</command>.
-    </para>
-
-    <para>
-      After generating the initrd, copy it to the <filename
-      class='directory'>/boot</filename> directory.
-    </para>
-
-    <para>
-      Now edit <filename>/boot/grub/grub.cfg</filename> and add a new
-      menuentry.  Below are several examples.
-    </para>
-
-     <screen role="nodump"><userinput># Generic initramfs and root fs identified by UUID
-menuentry "LFS Dev (LFS-7.0-Feb14) initrd, Linux 3.0.4"
-{
-  linux  /vmlinuz-3.0.4-lfs-20120214 root=UUID=54b934a9-302d-415e-ac11-4988408eb0a8 ro
-  initrd /initrd.img-no-kmods
-}</userinput></screen>
-
-     <screen role="nodump"><userinput># Generic initramfs and root fs on LVM partition
-menuentry "LFS Dev (LFS-7.0-Feb18) initrd lvm, Linux 3.0.4"
-{
-  linux  /vmlinuz-3.0.4-lfs-20120218 root=/dev/mapper/myroot ro
-  initrd /initrd.img-no-kmods
-}</userinput></screen>
-
-     <screen role="nodump"><userinput># Specific initramfs and root fs identified by LABEL
-menuentry "LFS Dev (LFS-7.1-Feb20) initrd label, Linux 3.2.6"
-{
-  linux  /vmlinuz-3.2.6-lfs71-120220 root=LABEL=lfs71 ro
-  initrd /initrd.img-3.2.6-lfs71-120220
-}</userinput></screen>
-
-    <para>
-      Finally, reboot the system and select the desired system.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/jfs-kernel.xml
===================================================================
--- postlfs/filesystems/jfs-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>J</emphasis>FS filesystem support                                          [JFS_FS]</screen>
Index: stlfs/filesystems/jfs.xml
===================================================================
--- postlfs/filesystems/jfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,266 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 jfsutils-download-http "https://jfs.sourceforge.net/project/pub/jfsutils-&jfsutils-version;.tar.gz">
-  <!ENTITY jfsutils-download-ftp  " ">
-  <!ENTITY jfsutils-md5sum        "8809465cd48a202895bc2a12e1923b5d">
-  <!ENTITY jfsutils-size          "532 KB">
-  <!ENTITY jfsutils-buildsize     "8.9 MB">
-  <!ENTITY jfsutils-time          "0.1 SBU">
-]>
-
-<sect1 id="jfsutils" xreflabel="jfsutils-&jfsutils-version;">
-  <?dbhtml filename="jfsutils.html"?>
-
-
-  <title>jfsutils-&jfsutils-version;</title>
-
-  <indexterm zone="jfsutils">
-    <primary sortas="a-jfsutils">jfsutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to jfsutils</title>
-
-    <para>
-      The <application>jfsutils</application> package contains administration
-      and debugging tools for the jfs file system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&jfsutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&jfsutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jfsutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &jfsutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &jfsutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &jfsutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch to fix issues exposed by GCC 10 and later:
-          <ulink url="&patch-root;/jfsutils-&jfsutils-version;-gcc10_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id='jfsutils-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following option in the kernel configuration
-      and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="jfs-kernel.xml"/>
-
-    <indexterm zone="jfsutils jfsutils-kernel">
-      <primary sortas="d-jfsutils">JFS Utilities</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of jfsutils</title>
-
-    <para>
-      First, fix some issues exposed by GCC 10 and later:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../jfsutils-&jfsutils-version;-gcc10_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>jfsutils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i "/unistd.h/a#include &lt;sys/types.h&gt;"    fscklog/extract.c &amp;&amp;
-sed -i "/ioctl.h/a#include &lt;sys/sysmacros.h&gt;" libfs/devices.c   &amp;&amp;
-
-./configure &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: Fixes building with glibc 2.28.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>fsck.jfs, jfs_debugfs, jfs_fsck, jfs_fscklog,
-        jfs_logdump, jfs_mkfs, jfs_tune, mkfs.jfs </seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fsck.jfs">
-        <term><command>fsck.jfs</command></term>
-        <listitem>
-          <para>
-            is used to replay the JFS transaction log, check a
-            JFS formatted device for errors, and fix any errors found
-          </para>
-          <indexterm zone="jfsutils fsck.jfs">
-            <primary sortas="b-fsck.jfs">fsck.jfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfs_fsck">
-        <term><command>jfs_fsck</command></term>
-        <listitem>
-          <para>
-            is a hard link to fsck.jfs
-          </para>
-          <indexterm zone="jfsutils jfs_fsck">
-            <primary sortas="b-jfs_fsck">jfs_fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.jfs">
-        <term><command>mkfs.jfs</command></term>
-        <listitem>
-          <para>
-            constructs an JFS file system
-          </para>
-          <indexterm zone="jfsutils mkfs.jfs">
-            <primary sortas="b-mkfs.jfs">mkfs.jfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfs_mkfs">
-        <term><command>jfs_mkfs</command></term>
-        <listitem>
-          <para>
-            is a hard link to mkfs.jfs
-          </para>
-          <indexterm zone="jfsutils jfs_mkfs">
-            <primary sortas="b-jfs_mkfs">jfs_mkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfs_debugfs">
-        <term><command>jfs_debugfs</command></term>
-        <listitem>
-          <para>
-            is a program which can be used to perform various low-level
-            actions on a JFS formatted device
-          </para>
-          <indexterm zone="jfsutils jfs_debugfs">
-            <primary sortas="b-jfs_debugfs">jfs_debugfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfs_fscklog">
-        <term><command>jfs_fscklog</command></term>
-        <listitem>
-          <para>
-            extracts a JFS fsck service log into a file and/or formats and
-            displays the extracted file
-          </para>
-          <indexterm zone="jfsutils jfs_fscklog">
-            <primary sortas="b-jfs_fscklog">jfs_fscklog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfs_logdump">
-        <term><command>jfs_logdump</command></term>
-        <listitem>
-          <para>
-            dumps the contents of the journal log from the specified
-            JFS formatted device into output file ./jfslog.dmp
-          </para>
-          <indexterm zone="jfsutils jfs_logdump">
-            <primary sortas="b-jfs_logdump">jfs_logdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfs_tune">
-        <term><command>jfs_tune</command></term>
-        <listitem>
-          <para>
-            adjusts tunable file system parameters on JFS file systems
-          </para>
-          <indexterm zone="jfsutils jfs_tune">
-            <primary sortas="b-jfs_tune">jfs_tune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/lvm2-kernel.xml
===================================================================
--- postlfs/filesystems/lvm2-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>B</emphasis>lock devices ---&gt;                                               [BLK_DEV]
-    &lt;*/M&gt; <emphasis role='blue'>R</emphasis>AM block device support                                 [BLK_DEV_RAM]
-  [*] M<emphasis role='blue'>u</emphasis>ltiple devices driver support (RAID and LVM) ---&gt;                   [MD]
-    &lt;*/M&gt; <emphasis role='blue'>D</emphasis>evice mapper support                                     [BLK_DEV_DM]
-    &lt;*/M&gt;   <emphasis role='blue'>C</emphasis>rypt target support                                      [DM_CRYPT]
-    &lt;*/M&gt;   <emphasis role='blue'>S</emphasis>napshot target                                        [DM_SNAPSHOT]
-    &lt;*/M&gt;   <emphasis role='blue'>T</emphasis>hin provisioning target                      [DM_THIN_PROVISIONING]
-    &lt;*/M&gt;   <emphasis role='blue'>C</emphasis>ache target (EXPERIMENTAL)                               [DM_CACHE]
-    &lt;*/M&gt;   M<emphasis role='blue'>i</emphasis>rror target                                            [DM_MIRROR]
-    &lt;*/M&gt;   <emphasis role='blue'>Z</emphasis>ero target                                                [DM_ZERO]
-    &lt;*/M&gt;   <emphasis role='blue'>I</emphasis>/O delaying target                                       [DM_DELAY]
-
-<emphasis role='blue'>K</emphasis>ernel hacking ---&gt;
-  <emphasis role='blue'>G</emphasis>eneric Kernel Debugging Instruments ---&gt;
-    [*] M<emphasis role='blue'>a</emphasis>gic SysRq key                                            [MAGIC_SYSRQ]</screen>
Index: stlfs/filesystems/lvm2.xml
===================================================================
--- postlfs/filesystems/lvm2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,487 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lvm2-download-http "https://sourceware.org/ftp/lvm2/LVM2.&lvm2-version;.tgz">
-  <!ENTITY lvm2-download-ftp  " ">
-  <!ENTITY lvm2-md5sum        "0535b5e638b6f0b48f7b259e0ec0ba65">
-  <!ENTITY lvm2-size          "2.7 MB">
-  <!ENTITY lvm2-buildsize     "39 MB (add 20 MB for tests; transient files can grow up to around 300 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
-       tests. -pierre, August 2020
-
-       Build size with tests was 58M.  The largest size of /tmp I saw was 289MB.
-       ### 412 tests: 245 passed, 155 skipped, 0 timed out, 1 warned, 11 failed
-       Aug 2023 LVM2.2.03.22 - bdubbs
-
-       ### 424 tests: 261 passed, 153 skipped, 0 timed out, 1 warned, 9 failed
-       Nov 2023 LVM2.2.03.23 - bdubbs
-       -->
-  <!ENTITY lvm2-time          "0.1 SBU (using parallelism=4; add 9 to 48 SBU for tests, depending on disk speed and whether ram block device is enabled in the kernel)">
-]>
-
-<sect1 id="lvm2" xreflabel="LVM2-&lvm2-version;">
-  <?dbhtml filename="lvm2.html"?>
-
-
-  <title>LVM2-&lvm2-version;</title>
-
-  <indexterm zone="lvm2">
-    <primary sortas="a-LVM2">LVM2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LVM2</title>
-
-    <para>
-      The <application>LVM2</application> package is a set of tools that manage
-      logical partitions. It allows spanning of file systems across multiple
-      physical disks and disk partitions and provides for dynamic growing or
-      shrinking of logical partitions, mirroring and low storage footprint
-      snapshots.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lvm2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lvm2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lvm2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lvm2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lvm2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lvm2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LVM2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend='libaio'/>
-     </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend='mdadm'/>,
-      <xref linkend='valgrind'/>,
-      <xref linkend='which'/>,
-      <xref linkend='xfsprogs'/> (all four may be used, but are not required,
-        for tests),
-      <ulink 
-        url='https://mirrors.edge.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/'>
-        reiserfsprogs</ulink>,
-      <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
-        thin-provisioning-tools</ulink>, and
-        <ulink url="https://github.com/dm-vdo/vdo">vdo</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="lvm2-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration
-      and recompile the kernel:
-    </para>
-
-    <note><para>
-      There are several other Device Mapper options in the kernel beyond those
-      listed below.  In order to get reasonable results if running the
-      regression tests, all must be enabled either internally or as a module.
-      The tests will all time out if Magic SysRq key is not enabled.
-    </para></note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="lvm2-kernel.xml"/>
-
-    <indexterm zone="lvm2 lvm2-kernel">
-      <primary sortas="d-lvm2">lvm2</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LVM2</title>
-
-    <para>
-      Install <application>LVM2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PATH+=:/usr/sbin                \
-./configure --prefix=/usr       \
-            --enable-cmdlib     \
-            --enable-pkgconfig  \
-            --enable-udev_sync  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The tests use <application>udev</application> for logical volume
-      synchronization, so the LVM udev rules and some utilities need to
-      be installed before running the tests. If you are installing
-      <application>LVM2</application> for the first time, and do not
-      want to install the full package before running the tests, the minimal
-      set of utilities can be installed by running the following instructions
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>make -C tools install_tools_dynamic &amp;&amp;
-make -C udev  install               &amp;&amp;
-make -C libdm install</userinput></screen>
-
-    <para>
-      To test the results, issue, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>LC_ALL=en_US.UTF-8 make check_local</userinput></screen>
-
-    <para>
-      Some tests may hang. In this case they can be skipped by adding
-      <command>S=&lt;testname&gt;</command> to the <command>make</command>
-      command.
-      Other targets are available and can be listed with
-      <command>make -C test help</command>. The test timings are very dependent
-      on the speed of the disk(s), and on the number of enabled kernel options.
-    </para>
-
-    <!-- Results for LVM2.2.02.176:
-    ### 292 tests: 177 passed, 46 skipped, 0 timed out, 60 warned, 9 failed
-
-    Results for LVM2.2.03.01:
-    ### 302 tests: 182 passed, 43 skipped, 0 timed out, 62 warned, 15 failed
-
-    Results for LVM2.2.03.05:
-    ### 326 tests: 255 passed, 58 skipped, 0 timed out, 2 warned, 11 failed
-
-    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
-
-    Results for LVM2.2.03.14:
-    ### 389 tests: 304 passed, 73 skipped, 0 timed out, 2 warned, 10 failed
-
-    Results for LVM2.2.03.16:
-    ### 395 tests: 241 passed, 145 skipped, 0 timed out, 1 warned, 8 failed
-
-    Results for LVM2.2.03.17:
-    ### 403 tests: 333 passed, 61 skipped, 0 timed out, 3 warned, 6 failed
-
-    Results for LVM2.2.03.20 [pierre]:
-    ### 407 tests: 324 passed, 75 skipped, 0 timed out, 3 warned, 5 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
-      <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
-      thin-provisioning-tools</ulink> are not installed. A workaround is to
-      add the following flags to <command>configure</command>:
-    </para>
-
-<screen role="nodump"><userinput>     --with-thin-check=    \
-     --with-thin-dump=     \
-     --with-thin-repair=   \
-     --with-thin-restore=  \
-     --with-cache-check=   \
-     --with-cache-dump=    \
-     --with-cache-repair=  \
-     --with-cache-restore= \</userinput></screen>
-
-    <para>
-      Some tests may hang. They can be removed if necessary, for example:
-      <command>rm test/shell/lvconvert-raid-reshape.sh</command>. The tests
-      generate a lot of kernel messages, which may clutter your terminal. You
-      can disable them by issuing <command>dmesg -D</command> before running
-      the tests (do not forget to issue <command>dmesg -E</command> when tests
-      are done).
-
-      <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>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>make install
-rm -fv /usr/lib/udev/rules.d/69-dm-lvm.rules</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>make install
-make install_systemd_units</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>PATH+=:/usr/sbin</command>: The path
-      must contain
-      <filename class='directory'>/usr/sbin</filename> for proper system tool
-      detection by the <command>configure</command> script. This instruction
-      ensures that PATH is properly set even if you build as an unprivileged user.
-    </para>
-
-    <para>
-      <parameter>--enable-cmdlib</parameter>: This switch enables
-      building of the shared command library. It is required
-      when building the event daemon.
-    </para>
-
-    <para>
-      <parameter>--enable-pkgconfig</parameter>: This switch enables
-      installation of <command>pkg-config</command> support files.
-    </para>
-
-    <para>
-     <parameter>--enable-udev_sync</parameter>: This switch enables
-      synchronisation with <application>Udev</application> processing.
-    </para>
-
-    <para>
-      <option>--enable-dmeventd</option>: This switch enables
-      building of the <application>Device Mapper</application>
-      event daemon.
-    </para>
-
-    <para revision="sysv">
-      <command>rm .../69-dm-lvm.rules</command>: Under certain circumstances,
-      this udev rule calls <command>systemd-run</command>, which is not
-      available on sysv. It performs actions that are done by another boot
-      script anyway, so it is not needed.
-    </para>
-
-    <para revision="systemd">
-      <command>make install_systemd_units</command>: This is needed to install
-      a unit that activates logical volumes at boot. It is not installed
-      by default.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" revision="systemd">
-    <title>Configuring LVM2</title>
-
-    <sect3 id="lvm2-config">
-      <title>Config File</title>
-      <para>
-        <filename>/etc/lvm/lvm.conf</filename>
-      </para>
-
-      <indexterm zone="lvm2 lvm2-config">
-        <primary
-        sortas="e-etc-lvm-lvm.conf">/etc/lvm/lvm.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-      <para>
-        The default configuration still references the obsolete <filename
-        class="directory">/var/lock</filename> directory. This creates
-        a deadlock at boot time. Change this (as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>sed -e '/locking_dir =/{s/#//;s/var/run/}' \
-    -i /etc/lvm/lvm.conf</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>
-          blkdeactivate, dmeventd (optional), dmsetup, fsadm, lvm, lvmdump,
-          and lvm_import_vdo.
-          There are also numerous symbolic links to lvm that implement specific
-          functionalities
-        </seg>
-        <seg>
-          libdevmapper.so and liblvm2cmd.so; optional:
-          libdevmapper-event.so, libdevmapper-event-lvm2.so,
-          libdevmapper-event-lvm2mirror.so, libdevmapper-event-lvm2raid.so,
-          libdevmapper-event-lvm2snapshot.so, libdevmapper-event-lvm2thin.so,
-          and libdevmapper-event-lvm2vdo.so
-        </seg>
-        <seg>
-          /etc/lvm and
-          /usr/lib/device-mapper (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-
-     <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="blkdeactivate">
-        <term><command>blkdeactivate</command></term>
-        <listitem>
-          <para>
-            is a utility to deactivate block devices
-          </para>
-          <indexterm zone="lvm2 blkdeactivate">
-            <primary sortas="b-blkdeactivate">blkdeactivate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dmeventd">
-        <term><command>dmeventd</command></term>
-        <listitem>
-          <para>
-            (optional) is the Device Mapper event daemon
-          </para>
-          <indexterm zone="lvm2 dmeventd">
-            <primary sortas="b-dmeventd">dmeventd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dmsetup">
-        <term><command>dmsetup</command></term>
-        <listitem>
-          <para>
-            is a low level logical volume management tool
-          </para>
-          <indexterm zone="lvm2 dmsetup">
-            <primary sortas="b-dmsetup">dmsetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsadm">
-        <term><command>fsadm</command></term>
-        <listitem>
-          <para>
-            is a utility used to resize or check filesystem on a device
-          </para>
-          <indexterm zone="lvm2 fsadm">
-            <primary sortas="b-fsadm">fsadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lvm">
-        <term><command>lvm</command></term>
-        <listitem>
-          <para>
-            provides the command-line tools for <application>LVM2</application>.
-            Commands are implemented via symbolic links to this program to
-            manage physical devices (pv*), volume groups (vg*) and logical
-            volumes (lv*)
-          </para>
-          <indexterm zone="lvm2 lvm">
-            <primary sortas="b-lvm">lvm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="lvmconf">
-        <term><command>lvmconf</command></term>
-        <listitem>
-          <para>
-            is a script that modifies the locking configuration in
-            the <application>LVM2</application> configuration file.
-          </para>
-          <indexterm zone="lvm2 lvmconf">
-            <primary sortas="b-lvmconf">lvmconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="lvmdump">
-        <term><command>lvmdump</command></term>
-        <listitem>
-          <para>
-            is a tool used to dump various information concerning
-            <application>LVM2</application>
-          </para>
-          <indexterm zone="lvm2 lvmdump">
-            <primary sortas="b-lvmdump">lvmdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vgimportclone">
-        <term><command>vgimportclone</command></term>
-        <listitem>
-          <para>
-            is used to import a duplicated VG (e.g. hardware snapshot)
-          </para>
-          <indexterm zone="lvm2 vgimportclone">
-            <primary sortas="b-vgimportclone">vgimportclone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdevmapper">
-        <term><filename class="libraryfile">libdevmapper.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Device Mapper</application> API
-            functions
-          </para>
-          <indexterm zone="lvm2 libdevmapper">
-            <primary sortas="c-libdevmapper">libdevmapper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/mdadm-kernel.xml
===================================================================
--- postlfs/filesystems/mdadm-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] M<emphasis role='blue'>u</emphasis>ltiple devices driver support (RAID and LVM) ---&gt;                   [MD]
-    &lt;*/M&gt;   <emphasis role='blue'>R</emphasis>AID support                                            [BLK_DEV_MD]
-    [*]       <emphasis role='blue'>A</emphasis>utodetect RAID arrays during kernel boot          [MD_AUTODETECT]
-    # Only the RAID types desired are required:
-    &lt; /*/M&gt; <emphasis role='blue'>R</emphasis>AID-0 (striping) mode                                    [MD_RAID0]
-    &lt; /*/M&gt; <emphasis role='blue'>R</emphasis>AID-1 (mirroring) mode                                   [MD_RAID1]
-    &lt; /*/M&gt; <emphasis role='blue'>R</emphasis>AID-10 (mirrored striping) mode                         [MD_RAID10]
-    &lt; /*/M&gt; <emphasis role='blue'>R</emphasis>AID-4/RAID-5/RAID-6 mode                               [MD_RAID456]</screen>
Index: stlfs/filesystems/mdadm.xml
===================================================================
--- postlfs/filesystems/mdadm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,269 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mdadm-download-http "&kernel-dl;/linux/utils/raid/mdadm/mdadm-&mdadm-version;.tar.xz">
-  <!ENTITY mdadm-download-ftp " ">
-  <!ENTITY mdadm-md5sum        "a42def84e31734a529111394f2289e0e">
-  <!ENTITY mdadm-size          "456 KB">
-  <!ENTITY mdadm-buildsize     "5.5 MB">
-  <!ENTITY mdadm-time          "0.1 SBU">
-<!--  <!ENTITY mdadm-time          "0.1 SBU (tests take about an hour, only partially processor dependent)">-->
-]>
-
-<sect1 id="mdadm" xreflabel="mdadm-&mdadm-version;">
-  <?dbhtml filename="mdadm.html"?>
-
-
-  <title>mdadm-&mdadm-version;</title>
-
-  <indexterm zone="mdadm">
-    <primary sortas="a-mdadm">mdadm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mdadm</title>
-
-    <para>
-      The <application>mdadm</application> package contains administration
-      tools for software RAID.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mdadm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mdadm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mdadm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mdadm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mdadm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mdadm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">mdadm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      A <xref linkend="server-mail"/>
-    </para>
-    <!-- Contains -DSendmail=/usr/sbin/sendmail in the build procedure -->
-
-<!-- I don't think we need this any more... We are now at kernel 6.7.8. - bdubbs
-    <caution>
-      <para>
-        Kernel versions in series 4.1 through 4.4.1 have a broken RAID
-        implementation. Use a kernel with version at or above 4.4.2.
-      </para>
-    </caution>
--->
-
-  </sect2>
-
-  <sect2 role="kernel" id='mdadm-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration
-      and recompile the kernel, if necessary.  Only the RAID types desired
-      are required.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="mdadm-kernel.xml"/>
-
-    <indexterm zone="mdadm mdadm-kernel">
-      <primary sortas="d-mdadm">mdadm</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mdadm</title>
-<!--
-    <para>
-      Fix a build error introduced by gcc-7.1:
-    </para>
-
-<screen><userinput>sed 's@-Werror@@' -i Makefile</userinput></screen>
--->
-    <para>
-      Build <application>mdadm</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-<!--
-    Still lots of errors with mdadm-4.3.  There are a lot of messages
-    like  (KNOWN BROKEN TEST: usually fails).  Finally stopped after
-    15 minutes with /build/mdadm-test/mdadm-4.3/tests/10ddf-geometry... 
-        ERROR: dmesg prints errors when testing 10ddf-geometry! 
-    kern.log shows segfaults.
-      - bdubbs 3 March 24
-
-    The test suite errors out after about half the tests are run.
-    Of those tests, about half fail.
-    There are tests that indicate failure when the test is clearly wrong
-    for the current code.
-    I asked about it at linux-raid@vger.kernel.org, but did not get
-    a responsive answer.
-      - bdubbs 6 January 22
-
-    <para>
-      If you wish to run the tests, ensure that your kernel supports RAID
-      and that a version of mdadm is not already running.  As many as 9 out
-      of 124 tests may fail.
-    </para>
-
-    <caution>
-      <para>
-        The tests edit values in /proc and run tests on software raid devices.
-        They shouldn't be run on systems with active software RAID devices.
-      </para>
-    </caution>
-
-    <para>
-      Run the tests as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>./test - -keep-going - -logdir=test-logs - -save-logs</userinput></screen>
--->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make BINDIR=/usr/sbin install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <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.
-    </para>
-<!-- Tests are not run anymore
-    <para>
-      <parameter>- -keep-going</parameter>: Run the tests to the end, even if one
-      or more tests fail.
-    </para>
-
-    <para>
-      <parameter>- -logdir=test-logs</parameter>: Defines the directory
-      where test logs are saved.
-    </para>
-
-    <para>
-      <parameter>- -save-logs</parameter>:
-      Instructs the test suite to save the logs.
-    </para>
-
-    <para>
-      <option>- -tests=<replaceable>&lt;test1,test2,...&gt;</replaceable></option>:
-      Optional comma separated list of tests to be executed
-      (all tests, if this option is not passed).
-    </para>
--->
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>mdadm and mdmon <!--and optionally mdassemble--></seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mdadm-prog">
-        <term><command>mdadm</command></term>
-        <listitem>
-          <para>
-            manages MD devices aka Linux Software RAID
-          </para>
-          <indexterm zone="mdadm mdadm-prog">
-            <primary sortas="b-mdadm-prog">mdadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdmon">
-        <term><command>mdmon</command></term>
-        <listitem>
-          <para>
-            monitors MD external metadata arrays
-          </para>
-          <indexterm zone="mdadm mdmon">
-            <primary sortas="b-mdmon">mdmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- Seems to be removed without a trace in 4.1
-      <varlistentry id="mdassemble">
-        <term><command>mdassemble</command></term>
-        <listitem>
-          <para>
-            is a tiny program that can be used to assemble MD devices
-            inside an initial ramdisk (initrd) or initramfs
-          </para>
-          <indexterm zone="mdadm mdassemble">
-            <primary sortas="b-mdassemble">mdassemble</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/ntfs-3g-kernel.xml
===================================================================
--- postlfs/filesystems/ntfs-3g-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>F</emphasis>USE (Filesystem in Userspace) support                         [FUSE_FS]</screen>
Index: stlfs/filesystems/ntfs-3g.xml
===================================================================
--- postlfs/filesystems/ntfs-3g.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,556 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ntfs-3g-download-http
-           "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-&ntfs-3g-version;.tgz">
-  <!ENTITY ntfs-3g-download-ftp  " ">
-  <!ENTITY ntfs-3g-md5sum        "a038af61be7584b79f8922ff11244090">
-  <!ENTITY ntfs-3g-size          "1.3 MB">
-  <!ENTITY ntfs-3g-buildsize     "22 MB">
-  <!ENTITY ntfs-3g-time          "0.2 SBU">
-]>
-
-<sect1 id="ntfs-3g" xreflabel="ntfs-3g-&ntfs-3g-version;">
-  <?dbhtml filename="ntfs-3g.html"?>
-
-
-  <title>ntfs-3g-&ntfs-3g-version;</title>
-
-  <indexterm zone="ntfs-3g">
-    <primary sortas="a-ntfs-3g">ntfs-3g</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ntfs-3g</title>
-
-    <note>
-      <para id='ntfs3-kernel'>
-        A new read-write driver for NTFS, called NTFS3, has been added
-        into the Linux kernel since the 5.15 release. The performance of NTFS3
-        is much better than ntfs-3g. To enable NTFS3, enable the following
-        options in the kernel configuration and recompile the kernel if
-        necessary:
-      </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="ntfs3-kernel.xml"/>
-
-    <indexterm zone="ntfs-3g ntfs3-kernel">
-      <primary sortas="d-ntfs3">NTFS read-write support in kernel</primary>
-    </indexterm>
-
-      <para>
-        To ensure the <command>mount</command> command uses NTFS3 for
-        ntfs partitions, create a wrapper script:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /usr/sbin/mount.ntfs &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/sh
-exec mount -t ntfs3 "$@"</literal>
-EOF
-chmod -v 755 /usr/sbin/mount.ntfs</userinput></screen>
-
-      <para>
-        With the kernel support available, ntfs-3g is only needed if you
-        need the utilities from it (for example, to create NTFS
-        filesystems).
-      </para>
-    </note>
-
-    <para>
-      The <application>Ntfs-3g</application> package contains a stable,
-      read-write open source driver for NTFS partitions. NTFS partitions are
-      used by most Microsoft operating systems. Ntfs-3g allows you to mount
-      NTFS partitions in read-write mode from your Linux system. It uses the
-      FUSE kernel module to be able to implement NTFS support in userspace.
-      The package also contains various utilities useful for manipulating NTFS
-      partitions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ntfs-3g-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ntfs-3g-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ntfs-3g-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ntfs-3g-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ntfs-3g-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ntfs-3g-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ntfs-3g Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/libfuse/libfuse">fuse 2.x</ulink>
-         (this disables user mounts)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="ntfs-3g-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile
-      the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="ntfs-3g-kernel.xml"/>
-
-    <para>
-      Note that it is only needed for mounting NTFS partitions with
-      ntfs-3g.  If you will use the in-kernel NTFS3 driver for mounting
-      NTFS partitions (as the BLFS editors recommend) instead, you can
-      skip this configuration item.
-    </para>
-
-    <indexterm zone="ntfs-3g ntfs-3g-kernel">
-      <primary sortas="d-ntfs-3g">ntfs-3g</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <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
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --disable-static     \
-            --with-fuse=internal \
-            --docdir=/usr/share/doc/ntfs-3g-&ntfs-3g-version; &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;</userinput></screen>
-
-    <para>
-      It's recommended to use the in-kernel NTFS3 driver for mounting
-      NTFS filesystems, instead of ntfs-3g (see the note at the start of
-      this page).  However, if you want to use ntfs-3g to mount the NTFS
-      filesystems anyway, create a symlink for the <command>mount</command>
-      command:
-    </para>
-
-<screen role="nodump"><userinput>ln -sv ../bin/ntfs-3g /usr/sbin/mount.ntfs &amp;&amp;
-ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</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>patch -Np1 -i ...</command>: This command applies a security
-      patch from upstream to fix ntfs-3g on systems that use setuid for the
-      executable.
-    </para>
--->
-
-    <para>
-      <parameter>--with-fuse=internal</parameter>: This switch dynamically
-      forces <application>ntfs-3g</application> to use an internal copy of the
-      <application>fuse-2.x</application> library. This is required if you wish
-      to allow users to mount NTFS partitions.
-    </para>
-
-    <para>
-      <option>--disable-ntfsprogs</option>: Disables installation of various
-      utilities used to manipulate NTFS partitions.
-    </para>
-
-    <para>
-      <command>chmod -v 4755 /usr/bin/ntfs-3g</command>: Making mount.ntfs setuid
-      root allows non root users to mount NTFS partitions.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Using Ntfs-3g</title>
-
-    <para>
-      To mount a Windows partition at boot time, put a line like this in
-      /etc/fstab:
-    </para>
-
-    <screen>/dev/sda1 /mnt/windows auto defaults 0 0</screen>
-
-    <para>
-      To allow users to mount a usb stick with an NTFS filesystem on it, put a
-      line similar to this (change sdc1 to whatever a usb stick would be on your
-      system) in /etc/fstab:
-    </para>
-
-    <screen>/dev/sdc1 /mnt/usb auto user,noauto,umask=0,utf8 0 0</screen>
-
-    <para>
-      In order for a user to be able to mount the usb stick, they will need
-      to be able to write to <filename class="directory">/mnt/usb</filename>,
-      so as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>chmod -v 777 /mnt/usb</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lowntfs-3g, mkfs.ntfs, mkntfs, mount.lowntfs-3g,
-          mount.ntfs, mount.ntfs-3g, ntfs-3g, ntfs-3g.probe,
-          ntfscat, ntfsclone, ntfscluster, ntfscmp, ntfscp, ntfsfix,
-          ntfsinfo, ntfslabel, ntfsls, ntfsresize and
-          ntfsundelete
-        </seg>
-        <seg>
-          libntfs-3g.so
-        </seg>
-        <seg>
-          /usr/include/ntfs-3g and
-          /usr/share/doc/ntfs-3g
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lowntfs-3g">
-        <term><command>lowntfs-3g</command></term>
-        <listitem>
-          <para>
-            is similar to ntfs-3g but uses the Fuse low-level interface
-          </para>
-          <indexterm zone="ntfs-3g lowntfs-3g">
-            <primary sortas="b-lowntfs-3g">lowntfs-3g</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ntfs">
-        <term><command>mkfs.ntfs</command></term>
-        <listitem>
-          <para>
-            is a symlink to mkntfs
-          </para>
-          <indexterm zone="ntfs-3g mkfs.ntfs">
-            <primary sortas="b-mkfs.ntfs">mkfs.ntfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkntfs">
-        <term><command>mkntfs</command></term>
-        <listitem>
-          <para>
-            creates an NTFS file system
-          </para>
-          <indexterm zone="ntfs-3g mkntfs">
-            <primary sortas="b-mkntfs">mkntfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.lowntfs-3g">
-        <term><command>mount.lowntfs-3g</command></term>
-        <listitem>
-          <para>
-            is a symlink to lowntfs-3g
-          </para>
-          <indexterm zone="ntfs-3g mount.lowntfs-3g">
-            <primary sortas="b-mount.lowntfs-3g">mount.lowntfs-3g</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.ntfs">
-        <term><command>mount.ntfs</command></term>
-        <listitem>
-          <para>
-            mounts an NTFS filesystem
-          </para>
-          <indexterm zone="ntfs-3g mount.ntfs">
-            <primary sortas="b-mount.ntfs">mount.ntfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.ntfs-3g">
-        <term><command>mount.ntfs-3g</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to ntfs-3g
-          </para>
-          <indexterm zone="ntfs-3g mount.ntfs-3g">
-            <primary sortas="b-mount.ntfs-3g">mount.ntfs-3g</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfs-3g-prog">
-        <term><command>ntfs-3g</command></term>
-        <listitem>
-          <para>
-            is an NTFS driver, which can create, remove, rename, move
-            files, directories, hard links, and streams. It can also read and write
-            files, including streams, sparse files and transparently compressed
-            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
-          </para>
-          <indexterm zone="ntfs-3g ntfs-3g-prog">
-            <primary sortas="b-ntfs-3g">ntfs-3g</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfs-3g.probe">
-        <term><command>ntfs-3g.probe</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="ntfs-3g ntfs-3g.probe">
-            <primary sortas="b-ntfs-3g.probe">ntfs-3g.probe</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="ntfs-3g ntfs-3g.secaudit">
-            <primary sortas="b-ntfs-3g.secaudit">ntfs-3g.secaudit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfs-3g.usermap">
-        <term><command>ntfs-3g.usermap</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="ntfs-3g ntfs-3g.usermap">
-            <primary sortas="b-ntfs-3g.usermap">ntfs-3g.usermap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="ntfscluster">
-        <term><command>ntfscluster</command></term>
-        <listitem>
-          <para>
-            identifies files in a specified region of an NTFS volume
-          </para>
-          <indexterm zone="ntfs-3g ntfscluster">
-            <primary sortas="b-ntfscluster">ntfscluster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfscp">
-        <term><command>ntfscp</command></term>
-        <listitem>
-          <para>
-            copies a file to an NTFS volume
-          </para>
-          <indexterm zone="ntfs-3g ntfscp">
-            <primary sortas="b-ntfscp">ntfscp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfsfix">
-        <term><command>ntfsfix</command></term>
-        <listitem>
-          <para>
-            fixes common errors and forces Windows to check an NTFS partition
-          </para>
-          <indexterm zone="ntfs-3g ntfsfix">
-            <primary sortas="b-ntfsfix">ntfsfix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfsls">
-        <term><command>ntfsls</command></term>
-        <listitem>
-          <para>
-            lists directory contents on an NTFS filesystem
-          </para>
-          <indexterm zone="ntfs-3g ntfsls">
-            <primary sortas="b-ntfsls">ntfsls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfscat">
-        <term><command>ntfscat</command></term>
-        <listitem>
-          <para>
-            prints NTFS files and streams on the standard output
-          </para>
-          <indexterm zone="ntfs-3g ntfscat">
-            <primary sortas="b-ntfscat">ntfscat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfsclone">
-        <term><command>ntfsclone</command></term>
-        <listitem>
-          <para>
-            clones an NTFS filesystem
-          </para>
-          <indexterm zone="ntfs-3g ntfsclone">
-            <primary sortas="b-ntfsclone">ntfsclone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfscmp">
-        <term><command>ntfscmp</command></term>
-        <listitem>
-          <para>
-            compares two NTFS filesystems and shows the differences
-          </para>
-          <indexterm zone="ntfs-3g ntfscmp">
-            <primary sortas="b-ntfscmp">ntfscmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfsinfo">
-        <term><command>ntfsinfo</command></term>
-        <listitem>
-          <para>
-            dumps a file's attributes
-          </para>
-          <indexterm zone="ntfs-3g ntfsinfo">
-            <primary sortas="b-ntfsinfo">ntfsinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfslabel">
-        <term><command>ntfslabel</command></term>
-        <listitem>
-          <para>
-            displays or changes the label on an ntfs file system
-          </para>
-          <indexterm zone="ntfs-3g ntfslabel">
-            <primary sortas="b-ntfslabel">ntfslabel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfsresize">
-        <term><command>ntfsresize</command></term>
-        <listitem>
-          <para>
-            resizes an NTFS filesystem without data loss
-          </para>
-          <indexterm zone="ntfs-3g ntfsresize">
-            <primary sortas="b-ntfsresize">ntfsresize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntfsundelete">
-        <term><command>ntfsundelete</command></term>
-        <listitem>
-          <para>
-            recovers a deleted file from an NTFS volume
-          </para>
-          <indexterm zone="ntfs-3g ntfsundelete">
-            <primary sortas="b-ntfsundelete">ntfsundelete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libntfs-3g">
-        <term><filename class="libraryfile">libntfs-3g.so</filename></term>
-        <listitem>
-          <para>
-            contains the Ntfs-3g API functions
-          </para>
-          <indexterm zone="ntfs-3g libntfs-3g">
-            <primary sortas="c-libntfs-3g">libntfs-3g.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/ntfs3-kernel.xml
===================================================================
--- postlfs/filesystems/ntfs3-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  <emphasis role='blue'>D</emphasis>OS/FAT/EXFAT/NT Filesystems ---&gt;
-    &lt;*/M&gt; N<emphasis role='blue'>T</emphasis>FS Read-Write file system support                         [NTFS3_FS]</screen>
Index: stlfs/filesystems/parted-test-kernel.xml
===================================================================
--- postlfs/filesystems/parted-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>S</emphasis>CSI device support ---&gt;
-    [*] <emphasis role='blue'>S</emphasis>CSI low-level drivers ---&gt;                              [SCSI_LOWLEVEL]
-      &lt;M&gt; <emphasis role='blue'>S</emphasis>CSI debugging host and device simulator                  [SCSI_DEBUG]</screen>
Index: stlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,267 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 parted-download-http "&gnu-http;/parted/parted-&parted-version;.tar.xz">
-  <!ENTITY parted-download-ftp  " ">
-  <!ENTITY parted-md5sum        "93d2d8f22baebc5eb65b85da05a79e4e">
-  <!ENTITY parted-size          "1.8 MB">
-  <!ENTITY parted-buildsize     "29 MB (additional 3 MB for the tests and additional 2 MB for optional PDF and Postscript documentation)">
-  <!ENTITY parted-time          "0.3 SBU (additional 3.6 SBU for the tests)">
-]>
-
-<sect1 id="parted" xreflabel="parted-&parted-version;">
-  <?dbhtml filename="parted.html"?>
-
-
-  <title>parted-&parted-version;</title>
-
-  <indexterm zone="parted">
-    <primary sortas="a-parted">Parted</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to parted</title>
-
-    <para>
-      The <application>Parted</application> package is a disk partitioning and
-      partition resizing tool.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&parted-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&parted-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &parted-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &parted-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &parted-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &parted-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-      <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-             Optional, to fix build without device mapper support: <ulink
-               url="&patch-root;/parted-&parted-version;-devmapper-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-    This seems to be unneeded now. The fix was merged. -->
-    <bridgehead renderas="sect3">Parted Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lvm2"/> (device-mapper, required if building
-      <application>udisks</application>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dosfstools"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
-      <ulink url="https://metacpan.org/pod/Digest::CRC">Digest::CRC</ulink> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="parted-kernel">
-    <title>Optional Kernel Configuration for Tests</title>
-
-    <para>
-      About 20 % more tests are run if the following kernel module is built:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="parted-test-kernel.xml"/>
-
-    <indexterm zone="parted parted-kernel">
-      <primary sortas="d-parted">parted (testing)</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of parted</title>
-    <!--
-    <para>
-      If you want to build without device mapper support, a fix is necessary:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../parted-&parted-version;-devmapper-1.patch</userinput></screen>
-    -->
-    <para>
-      Install <application>Parted</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make &amp;&amp;
-
-make -C doc html                                       &amp;&amp;
-makeinfo --html      -o doc/html       doc/parted.texi &amp;&amp;
-makeinfo --plaintext -o doc/parted.txt doc/parted.texi</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/> installed and wish to create
-      PDF and Postscript documentation issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>cp build-aux/texinfo.tex doc               &amp;&amp;
-texi2pdf -o doc/parted.pdf doc/parted.texi &amp;&amp;
-texi2dvi -o doc/parted.dvi doc/parted.texi &amp;&amp;
-dvips    -o doc/parted.ps  doc/parted.dvi</userinput></screen>
-
-    <para>
-      To test the results, issue, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>make check</userinput></screen>
-
-<!-- For devs: several tests are skipped with the message
-     "FS test with sector size != 512". This is expected since the same tests
-     are run with simulated sector of 1024, 2048, and 4096 bytes; only the
-     last group of tests is done with simulated sector size of 512, so that
-     less tests are skipped.
-
-     When I ran these tests over ssh, it really made my xfce environment
-     unusable.  Restarting xfce fixed things, but I don't want to retry
-     right now.  - Bruce
--->
-    <note>
-      <para>
-        Many tests are skipped if not run as the <systemitem
-        class="username">root</systemitem> user.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/parted-&parted-version;/html &amp;&amp;
-install -v -m644    doc/html/* \
-                    /usr/share/doc/parted-&parted-version;/html &amp;&amp;
-install -v -m644    doc/{FAT,API,parted.{txt,html}} \
-                    /usr/share/doc/parted-&parted-version;</userinput></screen>
-
-    <para>
-      Install the optional PDF and Postscript documentation by issuing the
-      following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/FAT doc/API doc/parted.{pdf,ps,dvi} \
-                    /usr/share/doc/parted-&parted-version;</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>
-      <option>--disable-device-mapper</option>: This option disables device
-      mapper support. Add this parameter if you have not installed
-      <application>LVM2</application>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          parted and
-          partprobe
-        </seg>
-        <seg>
-          libparted.so and
-          libparted-fs-resize.so</seg>
-        <seg>
-          /usr/include/parted and
-          /usr/share/doc/parted-&parted-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="parted-prog">
-        <term><command>parted</command></term>
-        <listitem>
-          <para>
-            is a partition manipulation program
-          </para>
-          <indexterm zone="parted parted-prog">
-            <primary sortas="b-parted">parted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="partprobe">
-        <term><command>partprobe</command></term>
-        <listitem>
-          <para>
-            informs the OS of partition table changes
-          </para>
-          <indexterm zone="parted partprobe">
-            <primary sortas="b-partprobe">partprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libparted">
-        <term><filename class="libraryfile">libparted.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Parted</application> API functions
-          </para>
-          <indexterm zone="parted libparted">
-            <primary sortas="c-libparted">libparted.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: postlfs/filesystems/reiser.xml
===================================================================
--- postlfs/filesystems/reiser.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/filesystems/reiser.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="postlfs-filesystems-reiser">
+<?dbhtml filename="reiser.html" dir="postlfs"?>
+<title>reiserfs</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: stlfs/filesystems/smartmontools.xml
===================================================================
--- postlfs/filesystems/smartmontools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 smartmontools-download-http "&sourceforge-dl;/smartmontools/smartmontools-&smartmontools-version;.tar.gz">
-  <!ENTITY smartmontools-download-ftp  " ">
-  <!ENTITY smartmontools-md5sum        "178d31a6ff5256c093227ab45a3f52aa">
-  <!ENTITY smartmontools-size          "1 MB">
-  <!ENTITY smartmontools-buildsize     "27 MB">
-  <!ENTITY smartmontools-time          "0.2 SBU">
-]>
-
-<sect1 id="smartmontools" xreflabel="smartmontools-&smartmontools-version;">
-  <?dbhtml filename="smartmontools.html"?>
-
-
-  <title>smartmontools-&smartmontools-version;</title>
-
-  <indexterm zone="smartmontools">
-    <primary sortas="a-smartmontools">smartmontools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to smartmontools</title>
-
-    <para>
-      The <application>smartmontools</application> package contains utility
-      programs (smartctl, smartd) to control/monitor storage systems using the
-      Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.)
-      built into most modern ATA and SCSI disks.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&smartmontools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&smartmontools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &smartmontools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &smartmontools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &smartmontools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &smartmontools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">smartmontools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="curl"/> or
-      <xref role="runtime" linkend="lynx"/> or
-      <xref role="runtime" linkend="wget"/> (download tools), and
-      <xref role="runtime" linkend="gnupg2"/> (encrypted hard disks)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of smartmontools</title>
-
-    <para>
-      Install <application>smartmontools</application> by running the
-      following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --with-initscriptdir=no \
-            --with-libsystemd=no    \
-            --docdir=/usr/share/doc/smartmontools-&smartmontools-version; &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --docdir=/usr/share/doc/smartmontools-&smartmontools-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands" 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>
-
-  <sect2 role="configuration">
-    <title>Configuring smartmontools</title>
-
-    <sect3 id="smartmontools-config">
-      <title>Config File</title>
-      <para>
-        <filename>/etc/smartd.conf</filename>
-      </para>
-
-      <indexterm zone="smartmontools smartmontools-config">
-        <primary sortas="e-etc-smartd.conf">/etc/smartd.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        See the embedded comments in <filename>/etc/smartd.conf</filename>
-        for detailed instructions on customizing the
-        <application>smartd</application> daemon.
-      </para>
-
-    </sect3>
-
-    <sect3  id="smartmontoools-init">
-       <title><phrase revision="sysv">Boot Script</phrase>
-              <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want the <application>smartd</application> daemon to
-        start automatically when the system is booted, install the
-        <filename>/etc/rc.d/init.d/smartd</filename> init script included
-        in the <xref linkend="bootscripts"/> package.
-      </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>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          smartctl, smartd, and update-smart-drivedb
-        </seg>
-
-        <seg>
-          None
-        </seg>
-
-        <seg>
-          /usr/share/smartmontools,
-          /usr/share/doc/smartmontools-&smartmontools-version;, and
-          /etc/smartd_warning.d
-        </seg>
-
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="smartctl">
-        <term><command>smartctl</command></term>
-        <listitem>
-          <para>
-            is the control and monitor utility for SMART Disks
-          </para>
-          <indexterm zone="smartmontools smartctl">
-            <primary sortas="b-smartctl">smartctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smartd">
-        <term><command>smartd</command></term>
-        <listitem>
-          <para>
-            is the SMART disk monitoring daemon
-          </para>
-          <indexterm zone="smartmontools smartd">
-            <primary sortas="b-smartd">smartd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="update-smart-drivedb">
-        <term><command>update-smart-drivedb</command></term>
-        <listitem>
-          <para>
-            is the update tool for the smartmontools drive database
-          </para>
-          <indexterm zone="smartmontools update-smart-drivedb">
-            <primary sortas="b-update-smart-drivedb">update-smart-drivedb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/sshfs.xml
===================================================================
--- postlfs/filesystems/sshfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sshfs-download-http
-    "https://github.com/libfuse/sshfs/releases/download/sshfs-&sshfs-version;/sshfs-&sshfs-version;.tar.xz">
-  <!ENTITY sshfs-download-ftp  " ">
-  <!ENTITY sshfs-md5sum        "f704f0d1800bdb5214030a1603e8c6d6">
-  <!ENTITY sshfs-size          "56 KB">
-  <!ENTITY sshfs-buildsize     "0.9 MB">
-  <!ENTITY sshfs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sshfs" xreflabel="sshfs-&sshfs-version;">
-  <?dbhtml filename="sshfs.html"?>
-
-
-  <title>sshfs-&sshfs-version;</title>
-
-  <indexterm zone="sshfs">
-    <primary sortas="a-sshfs">sshfs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sshfs</title>
-
-    <para>
-      The <application>Sshfs</application> package contains a filesystem
-      client based on the SSH File Transfer Protocol. This is useful for
-      mounting a remote computer that you have ssh access to as a local
-      filesystem. This allows you to drag and drop files or run shell commands
-      on the remote files as if they were on your local computer.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sshfs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sshfs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sshfs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sshfs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sshfs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sshfs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sshfs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fuse3"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="openssh"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (required to build the man page)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sshfs</title>
-
-    <para>
-      Install <application>Sshfs</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="using">
-    <title>Using Sshfs</title>
-
-    <para>
-      To mount an ssh server you need to be able to log into the server. For
-      example, to mount your remote home folder to the local ~/examplepath (the
-      directory must exist and you must have permissions to write to it):
-    </para>
-
-<screen><userinput>sshfs example.com:/home/userid ~/examplepath</userinput></screen>
-
-    <para>
-      When you've finished work and want to unmount it again:
-    </para>
-
-<screen><userinput>fusermount3 -u ~/example</userinput></screen>
-
-    <para>
-      You can also mount an <application>sshfs</application> filesystem at boot
-      by adding an entry similar to the following in the
-      <filename>/etc/fstab</filename> file:
-    </para>
-
-    <screen><literal>userid@example.com:/path /media/path fuse.sshfs _netdev,IdentityFile=/home/userid/.ssh/id_rsa 0 0</literal></screen>
-
-    <para>
-      See <command>man 1 sshfs</command> and <command>man 8 mount.fuse3</command>
-      for all available mount options.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sshfs
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sshfs-prog">
-        <term><command>sshfs</command></term>
-        <listitem>
-          <para>
-            mounts an <command>ssh</command> server as a local file system
-          </para>
-          <indexterm zone="sshfs sshfs-prog">
-            <primary sortas="b-sshfs">sshfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/uefi-bootloaders/dummy.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/dummy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>Packages for UEFI Boot</title>
-  <para/>
-</sect1>
-
Index: stlfs/filesystems/uefi-bootloaders/efibootmgr.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/efibootmgr.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,167 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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        "e170147da25e1d5f72721ffc46fe4e06">
-  <!ENTITY efibootmgr-size          "48 KB">
-  <!ENTITY efibootmgr-buildsize     "1.1 MB">
-  <!ENTITY efibootmgr-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="efibootmgr" xreflabel="efibootmgr-&efibootmgr-version;">
-  <?dbhtml filename="efibootmgr.html"?>
-
-
-  <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>
-
-    &lfs121_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>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of efibootmgr</title>
-
-    <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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/archive/&efivar-version;/efivar-&efivar-version;.tar.gz">
-  <!ENTITY efivar-download-ftp  " ">
-  <!ENTITY efivar-md5sum        "a8fc3e79336cd6e738ab44f9bc96a5aa">
-  <!ENTITY efivar-size          "456 KB">
-  <!ENTITY efivar-buildsize     "21 MB">
-  <!ENTITY efivar-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="efivar" xreflabel="efivar-&efivar-version;">
-  <?dbhtml filename="efivar.html"?>
-
-
-  <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>
-
-    &lfs121_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>
-          Optional patch (Required for 32-bit systems):
-          <ulink url="&patch-root;/efivar-&efivar-version;-i686-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">efivar Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="mandoc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of efivar</title>
-
-    <note>
-      <para>
-        This package cannot function properly on a 32-bit system with a
-        64-bit UEFI implementation.  Don't install this package (or
-        efibootmgr) on 32-bit system unless you are absolutely sure you have
-        a 32-bit UEFI implementation, which is very rare in practice.
-      </para>
-    </note>
-
-    <para>
-      Build <application>efivar</application> with the following commands:
-    </para>
-
-<screen><userinput>make</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>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>
-
-    <para>
-      <option>ENABLE_DOCS=0</option>: Disable the generation of man pages.
-      Append this option after the <command>make</command> and
-      <command>make install</command> commands if you don't need the man
-      pages to allow building this package without <xref linkend='mandoc'/>
-      installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          efisecdb and efivar
-        </seg>
-        <seg>
-          libefiboot.so, libefisec.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="efisecdb">
-        <term><command>efisecdb</command></term>
-        <listitem>
-          <para>
-            is an utility for managing UEFI signature lists
-          </para>
-          <indexterm zone="efivar efisecdb">
-            <primary sortas="b-efisecdb">efisecdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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="libefisec">
-        <term><filename class="libraryfile">libefisec.so</filename></term>
-        <listitem>
-          <para>
-            is a library for managing UEFI signature lists
-          </para>
-          <indexterm zone="efivar libefisec">
-            <primary sortas="c-libefisec">libefisec.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 libefivar">
-            <primary sortas="c-libefivar">libefivar.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/filesystems/uefi-bootloaders/grub-efi.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/grub-efi.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,257 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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        "60c564b1bdc39d8e43b3aab4bc0fb140">
-  <!ENTITY grub-efi-size          "6.4 MB">
-  <!ENTITY grub-efi-buildsize     "183 MB">
-  <!ENTITY grub-efi-time          "0.4 SBU (on 64-bit LFS, using parallelism=4)">
-
-  <!ENTITY unifont-download-http  "https://unifoundry.com/pub/unifont/unifont-&unifont-version;/font-builds/unifont-&unifont-version;.pcf.gz">
-  <!ENTITY unifont-md5sum         "72f95e7ecb47a4c7ed610babe6959ead">
-  <!ENTITY unifont-size           "1.3 MB">
-]>
-
-<sect1 id="grub-efi" xreflabel="GRUB-&grub-version; for EFI">
-  <?dbhtml filename="grub-efi.html"?>
-
-
-  <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>
-
-    &lfs121_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">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/grub-&grub-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <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>
-
-    <itemizedlist spacing="compact">
-      <title>GCC (only needed if building on 32-bit LFS)</title>
-      <listitem>
-        <para>
-          Refer to <xref linkend='gcc'/> page for download info.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GRUB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="efibootmgr"/> (runtime) and
-      <xref linkend="freetype2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lvm2"/>
-    </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>
-      Add a file missing from the release tarball:
-    </para>
-
-    <screen><userinput>echo <literal>depends bli part_gpt</literal> > grub-core/extra_deps.lst</userinput></screen>
-
-    <para>If you are running a 32-bit LFS, prepare a 64-bit compiler:</para>
-
-<!-- 'literal' is used deliberately to show this is only for 32-bit LFS -->
-<screen><userinput>case $(uname -m) in i?86 )
-    <literal>tar xf ../gcc-&gcc-version;.tar.xz
-    mkdir gcc-&gcc-version;/build
-    pushd gcc-&gcc-version;/build
-        ../configure --prefix=$PWD/../../x86_64-gcc \
-                     --target=x86_64-linux-gnu      \
-                     --with-system-zlib             \
-                     --enable-languages=c,c++       \
-                     --with-ld=/usr/bin/ld
-        make all-gcc
-        make install-gcc
-    popd
-    export TARGET_CC=$PWD/x86_64-gcc/bin/x86_64-linux-gnu-gcc</literal>
-esac</userinput></screen>
-
-    <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  \
-            --target=x86_64      \
-            --disable-werror     &amp;&amp;
-unset TARGET_CC &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 available 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 or in a smaller region on the screen.</para>
-    </warning>
-
-    <para>
-      <parameter>--with-platform=efi</parameter>: Ensures building GRUB with
-      EFI enabled.
-    </para>
-
-    <para>
-      <parameter>--target=x86_64</parameter>: Ensures building GRUB for
-      x86_64 even if building on a 32-bit LFS system.  Most EFI firmware
-      on x86_64 does not support 32-bit bootloaders.
-    </para>
-
-    <para>
-      <option>--target=i386</option>: A few 32-bit x86 platforms have EFI
-      support.  And, some x86_64 platforms have a 32-bit EFI implementation,
-      but they are very old and rare. Use this instead of
-      <parameter>--target=x86_64</parameter> if you are
-      <emphasis role='bold'>absolutely sure</emphasis> that LFS is running
-      on such a system.
-    </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-kernel.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/grub-setup-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
-  [*] <emphasis role='blue'>E</emphasis>FI runtime service support                                          [EFI]
-  [*]   <emphasis role='blue'>E</emphasis>FI stub support                                              [EFI_STUB]
-
--*- <emphasis role='blue'>E</emphasis>nable the block layer ---&gt;                                          [BLOCK]
-  <emphasis role='blue'>P</emphasis>artition Types ---&gt;
-    [ /*] <emphasis role='blue'>A</emphasis>dvanced partition selection                      [PARTITION_ADVANCED]
-    [*]     <emphasis role='blue'>E</emphasis>FI GUID Partition support                           [EFI_PARTITION]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
-    [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
-  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-                                                                      ...  [DRM]
-    [*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
-                                                      ...  [DRM_FBDEV_EMULATION]
-    &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                                [DRM_SIMPLEDRM]
-    <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
-
-<emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  <emphasis role='blue'>D</emphasis>OS/FAT/EXFAT/NT Filesystems ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>V</emphasis>FAT (Windows-95) fs support                                 [VFAT_FS]
-  <emphasis role='blue'>P</emphasis>seudo filesystems ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>E</emphasis>FI Variable filesystem                                    [EFIVAR_FS]
-  -*- N<emphasis role='blue'>a</emphasis>tive language support ---&gt;                                         [NLS]
-    &lt;*/M&gt; <emphasis role='blue'>C</emphasis>odepage 437 (United States, Canada)                [NLS_CODEPAGE_437]
-    &lt;*/M&gt; N<emphasis role='blue'>L</emphasis>S ISO 8859-1  (Latin 1; Western European Languages)  [NLS_ISO8859_1]</screen>
Index: stlfs/filesystems/uefi-bootloaders/grub-setup.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/grub-setup.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,525 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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"?>
-
-
-  <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 and UEFI 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 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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="grub-setup-kernel.xml"/>
-
-    <variablelist>
-      <title>The meaning of the configuration options:</title>
-
-      <varlistentry>
-        <term><parameter>CONFIG_PARTITION_ADVANCED</parameter></term>
-        <listitem>
-          <para>If it's not enabled,
-          <parameter>CONFIG_EFI_PARTITION</parameter> will be enabled
-          automatically.  But when it's enabled, you must set
-          <parameter>CONFIG_EFI_PARTITION</parameter> to enabled as
-          well.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <parameter>CONFIG_SYSFB_SIMPLEFB</parameter>,
-          <parameter>CONFIG_DRM</parameter>,
-          <parameter>CONFIG_DRM_FBDEV_EMULATION</parameter>,
-          <parameter>CONFIG_DRM_SIMPLEDRM</parameter>,
-          <parameter>CONFIG_FB</parameter>, and
-          <parameter>CONFIG_FRAMEBUFFER_CONSOLE</parameter></term>
-        <listitem>
-          <para>The combination of these options provides the Linux console
-          support on top of the UEFI framebuffer.  To allow the kernel to
-          print debug messages at an early boot stage, they shouldn't be
-          built as kernel modules unless an initramfs will be used.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <indexterm zone="grub-setup uefi-kernel">
-      <primary sortas="d-uefi">UEFI</primary>
-    </indexterm>
-  </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 partition
-      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.39.1).
-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>Partition number (1-9, default 9): </literal><userinput>1</userinput>
-<literal>Partition type or alias (type L to list all): </literal><userinput>uefi</userinput>
-<literal>Changed type of partition 'Linux filesystem' to 'EFI System'.
-
-Command (m for help): </literal><userinput>w</userinput>
-<literal>The partition table has been altered.
-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>mount --mkdir -v -t vfat /dev/sdx1 -o codepage=437,iocharset=iso8859-1 \
-      /mnt/rescue</userinput></screen>
-
-    <para>
-      Install GRUB for EFI on the partition:
-    </para>
-
-<screen role="nodump"><userinput>grub-install --target=x86_64-efi --removable \
-             --efi-directory=/mnt/rescue --boot-directory=/mnt/rescue</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 an emergency boot disk on any x86-64
-      UEFI platform.  It will boot the system and show the GRUB shell.  Then you
-      can type commands to boot your operating system from the hard drive.
-      To learn how to select the boot device, read the manual of your
-      motherboard or laptop.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Find or Create the EFI System Partition</title>
-
-    <para>
-      On EFI based systems, 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 some Linux
-      distribution or Windows is pre-installed, it's likely that the ESP
-      has already been 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 the first
-      installation of a UEFI-booted OS on the system, the ESP may not exist.
-      In that case, install <xref linkend='dosfstools'/> first.  Then 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 require 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>mount --mkdir -v -t vfat /dev/sda1 -o codepage=437,iocharset=iso8859-1 \
-      /boot/efi</userinput></screen>
-
-    <para>
-      If you want to mount the ESP automatically during system boot,
-      as the &root; user, add an entry for the ESP into
-      <filename>/etc/fstab</filename>:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt;&gt; /etc/fstab &lt;&lt; EOF</userinput>
-<literal>/dev/sda1 /boot/efi vfat codepage=437,iocharset=iso8859-1 0 1</literal>
-<userinput>EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-    <title>Minimal Boot Configuration with GRUB and EFI</title>
-
-    <para>
-      On UEFI based systems, GRUB works by installing an EFI application
-      (a special kind of executable) into the ESP.  The EFI firmware will
-      search boot loaders in EFI applications from boot entries recorded
-      in EFI variables, and additionally a hardcoded path
-      <filename>EFI/BOOT/BOOTX64.EFI</filename>.  Normally, a boot loader
-      should be installed into a custom path and the path should be recorded
-      in the EFI variables.  The use of the hardcoded path should be
-      avoided if possible.  However, in some cases we have to use
-      the hardcoded path:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          The system is not booted with EFI yet, making EFI variables
-          inaccessible.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The EFI firmware is 64-bit but the LFS system is 32-bit, making
-          EFI variables inaccessible because the kernel cannot invoke EFI
-          runtime services with a different virtual address length.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          LFS is built for a Live USB, so we cannot rely on EFI variables,
-          which are stored in NVRAM or EEPROM on the local machine.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          You are unable or unwilling to install the
-          <application>efibootmgr</application> for manipulating boot
-          entries in EFI variables.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      In these cases, follow these instructions to install the GRUB EFI
-      application into the hardcoded path and make a minimal boot
-      configuration. Otherwise it's better to skip ahead and set up the
-      boot configuration normally.
-    </para>
-
-    <para>
-      To install GRUB with the EFI application in the hardcoded
-      path <filename>EFI/BOOT/BOOTX64.EFI</filename>, first ensure the boot
-      partition is mounted at <filename class="directory">/boot</filename>
-      and the ESP is mounted at
-      <filename class="directory">/boot/efi</filename>.  Then, as the &root;
-      user, run the command:
-    </para>
-
-    <note>
-      <para>
-        This command will overwrite
-        <filename>/boot/efi/EFI/BOOT/BOOTX64.EFI</filename>.  It may break a
-        bootloader already installed there.  Back it up if you are not sure.
-      </para>
-    </note>
-
-    <screen role="nodump"><userinput>grub-install --target=x86_64-efi --removable</userinput></screen>
-
-    <para>
-      This command will install the GRUB EFI application into the hardcoded path
-      <filename>/boot/efi/EFI/BOOT/BOOTX64.EFI</filename>, so the EFI
-      firmware can find and load it.  The remaining GRUB files are installed
-      in the <filename class="directory">/boot/grub</filename> directory and
-      will be loaded by <filename>BOOTX64.EFI</filename> during system boot.
-    </para>
-
-    <note>
-      <para>
-        The EFI firmware usually prefers the EFI applications with a path
-        stored in EFI variables to the EFI
-        application at the hardcoded path.  So you may need to invoke the
-        boot selection menu or firmware setting interface to select the
-        newly installed GRUB manually on the next boot.  Read the manual of
-        your motherboard or laptop to learn how.
-      </para>
-    </note>
-
-    <para>
-      If you've followed the instructions in this section and set up a minimal boot
-      configuration, now skip ahead to
-      <quote>Creating the GRUB Configuration File</quote>.
-    </para>
-  </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>, is
-      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 or using a minimal boot configuration created as
-        above, then mount
-        <systemitem class="filesystem">efivarfs</systemitem> and continue.
-      </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) 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> has been loaded by the
-      firmware, it will load GRUB modules from 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 the <command>efibootmgr | cut -f 1</command> 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)
-
-insmod all_video
-if loadfont /boot/grub/fonts/unicode.pf2; then
-  terminal_output gfxterm
-fi
-
-menuentry "GNU/Linux, Linux 6.7.4-lfs-12.1"  {
-  linux   /boot/vmlinuz-6.7.4-lfs-12.1 root=/dev/sda2 ro
-}
-
-menuentry "Firmware Setup" {
-  fwsetup
-}</literal>
-<userinput>EOF</userinput></screen>
-
-    <para>
-      Refer to <ulink url='&lfs-root;/chapter10/grub.html'>the LFS
-      book</ulink> for the basic knowledge about the
-      <filename>grub.cfg</filename> file.
-      <literal>(hd0,2)</literal>, <literal>sda2</literal>, and
-      <literal>6.4.10-lfs-12.0</literal> must match your
-      configuration.
-    </para>
-
-    <para>
-      The <command>insmod all_video</command> directive loads various
-      modules for video support.  It's needed to initialize the EFI
-      framebuffer for the kernel to print messages correctly before the
-      kernel GPU driver initialization.
-    </para>
-
-    <para>
-      The <command>terminal_output gfxterm</command> directive changes
-      the display resolution of the GRUB menu to match your display device.
-      It will break the rendering if the <filename>unicode.pf2</filename>
-      font data file is not loaded, so it's guarded by a
-      <command>if</command> directive.
-    </para>
-
-    <note>
-      <para>
-        From GRUB's perspective, the files are relative to the partitions
-        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 11" {
-  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, as well.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: postlfs/filesystems/xfs.xml
===================================================================
--- postlfs/filesystems/xfs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/filesystems/xfs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="postlfs-filesystems-xfs">
+<?dbhtml filename="xfs.html" dir="postlfs"?>
+<title>XFS</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: stlfs/filesystems/xfsprogs-kernel.xml
===================================================================
--- postlfs/filesystems/xfsprogs-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>X</emphasis>FS filesystem support                                          [XFS_FS]</screen>
Index: stlfs/filesystems/xfsprogs.xml
===================================================================
--- postlfs/filesystems/xfsprogs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,494 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xfsprogs-download-http "&kernel-dl;/linux/utils/fs/xfs/xfsprogs/xfsprogs-&xfsprogs-version;.tar.xz">
-  <!ENTITY xfsprogs-download-ftp  " ">
-  <!ENTITY xfsprogs-md5sum        "0bde7bc8b3d8cbbd01064f756f67911f">
-  <!ENTITY xfsprogs-size          "1.3 MB">
-  <!ENTITY xfsprogs-buildsize     "56 MB">
-  <!ENTITY xfsprogs-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="xfsprogs" xreflabel="xfsprogs-&xfsprogs-version;">
-  <?dbhtml filename="xfsprogs.html"?>
-
-
-  <title>xfsprogs-&xfsprogs-version;</title>
-
-  <indexterm zone="xfsprogs">
-    <primary sortas="a-xfsprogs">xfsprogs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xfsprogs</title>
-
-    <para>
-      The <application>xfsprogs</application> package contains
-      administration and debugging tools for the XFS file system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfsprogs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfsprogs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfsprogs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfsprogs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfsprogs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfsprogs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xfsprogs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="inih"/> and
-      <xref linkend="liburcu"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> (for unicode name scanning in xfs_scrub)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="xfsprogs-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration
-      and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="xfsprogs-kernel.xml"/>
-
-    <indexterm zone="xfsprogs xfsprogs-kernel">
-      <primary sortas="d-xfs">XFS Programs</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xfsprogs</title>
-
-      <!-- Now appears to be fixed -->
-<!--
-    <para>
-      First, fix an incompatibility with gettext-0.22:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/0.lf/0.1f/' po/de.po</userinput></screen>
--->
-    <para>
-      Install <application>xfsprogs</application> by running the following
-      commands:
-    </para>
-
- <screen><userinput>make DEBUG=-DNDEBUG     \
-     INSTALL_USER=root  \
-     INSTALL_GROUP=root</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 PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install     &amp;&amp;
-make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install-dev &amp;&amp;
-
-rm -rfv /usr/lib/libhandle.{a,la}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>DEBUG=-DNDEBUG</parameter>: Turns off debugging
-      symbols.
-    </para>
-
-    <para>
-      <parameter>INSTALL_USER=root</parameter>
-      <parameter>INSTALL_GROUP=root</parameter>: This
-      sets the owner and group of the installed files.
-    </para>
-
-    <para>
-      <option>OPTIMIZER="..."</option>: Adding this parameter to
-      the end of the <command>make</command> command overrides the
-      default optimization settings.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>fsck.xfs, mkfs.xfs, xfs_admin, xfs_bmap, xfs_copy, xfs_db,
-        xfs_estimate, xfs_freeze, xfs_fsr, xfs_growfs, xfs_info, xfs_io,
-        xfs_logprint, xfs_mdrestore, xfs_metadump, xfs_mkfile, xfs_ncheck,
-        xfs_quota, xfs_repair, xfs_rtcp, xfs_scrub, xfs_scrub_all,
-        and xfs_spaceman</seg>
-        <seg>libhandle.so</seg>
-        <seg>/usr/include/xfs,
-        /usr/lib/xfsprogs,
-        /usr/share/xfsprogs, and
-        /usr/share/doc/xfsprogs-&xfsprogs-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fsck.xfs">
-        <term><command>fsck.xfs</command></term>
-        <listitem>
-          <para>
-            simply exits with a zero status, since XFS
-            partitions are checked at mount time
-          </para>
-          <indexterm zone="xfsprogs fsck.xfs">
-            <primary sortas="b-fsck.xfs">fsck.xfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.xfs">
-        <term><command>mkfs.xfs</command></term>
-        <listitem>
-          <para>
-            constructs an XFS file system
-          </para>
-          <indexterm zone="xfsprogs mkfs.xfs">
-            <primary sortas="b-mkfs.xfs">mkfs.xfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_admin">
-        <term><command>xfs_admin</command></term>
-        <listitem>
-          <para>
-            changes the parameters of an XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_admin">
-            <primary sortas="b-xfs_admin">xfs_admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_bmap">
-        <term><command>xfs_bmap</command></term>
-        <listitem>
-          <para>
-            prints block mapping for an XFS file
-          </para>
-          <indexterm zone="xfsprogs xfs_bmap">
-            <primary sortas="b-xfs_bmap">xfs_bmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_copy">
-        <term><command>xfs_copy</command></term>
-        <listitem>
-          <para>
-            copies the contents of an XFS file system
-            to one or more targets in parallel
-          </para>
-          <indexterm zone="xfsprogs xfs_copy">
-            <primary sortas="b-xfs_copy">xfs_copy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_estimate">
-        <term><command>xfs_estimate</command></term>
-        <listitem>
-          <para>
-            for each directory argument, estimates the space that directory
-            would take if it were copied to an XFS filesystem
-            (does not cross mount points)
-          </para>
-          <indexterm zone="xfsprogs xfs_estimate">
-            <primary sortas="b-xfs_estimate">xfs_estimate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_db">
-        <term><command>xfs_db</command></term>
-        <listitem>
-          <para>
-            is used to debug an XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_db">
-            <primary sortas="b-xfs_db">xfs_db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_freeze">
-        <term><command>xfs_freeze</command></term>
-        <listitem>
-          <para>
-            suspends access to an XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_freeze">
-            <primary sortas="b-xfs_freeze">xfs_freeze</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_fsr">
-        <term><command>xfs_fsr</command></term>
-        <listitem>
-          <para>
-            applicable only to XFS filesystems, improves the organization of
-            mounted filesystems, the reorganization algorithm operates on one
-            file at a time, compacting or otherwise  improving the layout of the
-            file extents (contiguous blocks of file data)
-          </para>
-          <indexterm zone="xfsprogs xfs_fsr">
-            <primary sortas="b-xfs_fsr">xfs_fsr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_growfs">
-        <term><command>xfs_growfs</command></term>
-        <listitem>
-          <para>
-            expands an XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_growfs">
-            <primary sortas="b-xfs_growfs">xfs_growfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_info">
-        <term><command>xfs_info</command></term>
-        <listitem>
-          <para>
-            is equivalent to invoking <command>xfs_growfs</command>, but
-            specifying that no change to the file system is to be made
-          </para>
-          <indexterm zone="xfsprogs xfs_info">
-            <primary sortas="b-xfs_info">xfs_info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_io">
-        <term><command>xfs_io</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="xfsprogs xfs_io">
-            <primary sortas="b-xfs_io">xfs_io</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_logprint">
-        <term><command>xfs_logprint</command></term>
-        <listitem>
-          <para>
-            prints the log of an XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_logprint">
-            <primary sortas="b-xfs_logprint">xfs_logprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_mdrestore">
-        <term><command>xfs_mdrestore</command></term>
-        <listitem>
-          <para>
-            restores an XFS metadump image to a filesystem image
-          </para>
-          <indexterm zone="xfsprogs xfs_mdrestore">
-            <primary sortas="b-xfs_mdrestore">xfs_mdrestore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-       <varlistentry id="xfs_metadump">
-        <term><command>xfs_metadump</command></term>
-        <listitem>
-          <para>
-            copies XFS filesystem metadata to a file
-          </para>
-          <indexterm zone="xfsprogs xfs_metadump">
-            <primary sortas="b-xfs_metadump">xfs_metadump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="xfs_mkfile">
-        <term><command>xfs_mkfile</command></term>
-        <listitem>
-          <para>
-            creates an XFS file, padded with zeroes by default
-          </para>
-          <indexterm zone="xfsprogs xfs_mkfile">
-            <primary sortas="b-xfs_mkfile">xfs_mkfile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_ncheck">
-        <term><command>xfs_ncheck</command></term>
-        <listitem>
-          <para>
-            generates pathnames from inode numbers for an
-            XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_ncheck">
-            <primary sortas="b-xfs_ncheck">xfs_ncheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_quota">
-        <term><command>xfs_quota</command></term>
-        <listitem>
-          <para>
-            is a utility for reporting and editing various
-            aspects of filesystem quotas
-          </para>
-          <indexterm zone="xfsprogs xfs_quota">
-            <primary sortas="b-xfs_quota">xfs_quota</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_repair">
-        <term><command>xfs_repair</command></term>
-        <listitem>
-          <para>
-            repairs corrupt or damaged XFS file systems
-          </para>
-          <indexterm zone="xfsprogs xfs_repair">
-            <primary sortas="b-xfs_repair">xfs_repair</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_rtcp">
-        <term><command>xfs_rtcp</command></term>
-        <listitem>
-          <para>
-            copies a file to the real-time partition on an
-            XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_rtcp">
-            <primary sortas="b-xfs_rtcp">xfs_rtcp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_scrub">
-        <term><command>xfs_scrub</command></term>
-        <listitem>
-          <para>
-            checks and repairs the contents of a mounted
-            XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_scrub">
-            <primary sortas="b-xfs_scrub">xfs_scrub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_scrub_all">
-        <term><command>xfs_scrub_all</command></term>
-        <listitem>
-          <para>
-            scrubs all mounted XFS file systems
-          </para>
-          <indexterm zone="xfsprogs xfs_scrub_all">
-            <primary sortas="b-xfs_scrub_all">xfs_scrub_all</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfs_spaceman">
-        <term><command>xfs_spaceman</command></term>
-        <listitem>
-          <para>
-            reports and controls free space usage in an
-            XFS file system
-          </para>
-          <indexterm zone="xfsprogs xfs_spaceman">
-            <primary sortas="b-xfs_spaceman">xfs_spaceman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhandle">
-        <term><filename class="libraryfile">libhandle.so</filename></term>
-        <listitem>
-          <para>
-            contains XFS-specific functions that provide a way to perform
-            certain filesystem  operations without using a file descriptor to
-            access filesystem objects
-          </para>
-          <indexterm zone="xfsprogs libhandle">
-            <primary sortas="c-libhandle">libhandle.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/postlfs.ent
===================================================================
--- postlfs/postlfs.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/postlfs.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,41 @@
+<!ENTITY postlfs SYSTEM "postlfs.xml">
+
+<!-- Post-LFS Configuration -->
+<!ENTITY postlfs-config SYSTEM "config/config.xml">
+<!ENTITY postlfs-config-logon SYSTEM "config/logon.xml">
+<!ENTITY postlfs-config-profile SYSTEM "config/profile.xml">
+<!ENTITY postlfs-config-inputrc SYSTEM "config/inputrc.xml">
+<!ENTITY postlfs-config-vimrc SYSTEM "config/vimrc.xml">
+<!ENTITY postlfs-config-bootdisk SYSTEM "config/bootdisk.xml">
+<!ENTITY postlfs-config-random SYSTEM "config/random.xml">
+<!ENTITY postlfs-config-manpages SYSTEM "config/manpages.xml">
+
+<!-- Post-LFS Security -->
+<!ENTITY postlfs-security SYSTEM "security/security.xml">
+<!ENTITY postlfs-security-shadow SYSTEM "security/shadow.xml">
+<!ENTITY % iptables SYSTEM "security/iptables/iptables.ent">
+%iptables;
+<!ENTITY % firewalling SYSTEM "security/firewalling/firewalling.ent">
+%firewalling;
+<!ENTITY postlfs-security-nessus SYSTEM "security/nessus.xml">
+<!ENTITY postlfs-security-tripwire SYSTEM "security/tripwire.xml">
+<!ENTITY postlfs-security-pam SYSTEM "security/pam.xml">
+<!ENTITY postlfs-security-syslog SYSTEM "security/syslog.xml">
+
+<!-- Filesystems -->
+<!ENTITY postlfs-filesystems SYSTEM "filesystems/filesystems.xml">
+<!ENTITY postlfs-filesystems-ext3 SYSTEM "filesystems/ext3.xml">
+<!ENTITY postlfs-filesystems-reiser SYSTEM "filesystems/reiser.xml">
+<!ENTITY postlfs-filesystems-xfs SYSTEM "filesystems/xfs.xml">
+
+<!-- Editors -->
+<!ENTITY postlfs-editors SYSTEM "editors/editors.xml">
+<!ENTITY postlfs-editors-vim SYSTEM "editors/vim.xml">
+<!ENTITY postlfs-editors-emacs SYSTEM "editors/emacs.xml">
+<!ENTITY postlfs-editors-nano SYSTEM "editors/nano.xml">
+<!ENTITY postlfs-editors-joe SYSTEM "editors/joe.xml">
+
+<!-- Shells -->
+<!ENTITY postlfs-shells SYSTEM "shells/shells.xml">
+<!ENTITY postlfs-shells-tcsh SYSTEM "shells/tcsh.xml">
+<!ENTITY postlfs-shells-zsh SYSTEM "shells/zsh.xml">
Index: postlfs/postlfs.xml
===================================================================
--- postlfs/postlfs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/postlfs.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,20 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="postlfs" xreflabel="Post LFS Configuration and Extra Software">
+<?dbhtml filename="postlfs.html" dir="postlfs"?>
+<title>Post LFS Configuration and Extra Software</title>
 
-<part id="postlfs" xreflabel="Post LFS Configuration and Extra Software">
-  <?dbhtml filename="postlfs.html" dir="postlfs"?>
-
-  <title>Post LFS Configuration and Extra Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config/config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/security.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="filesystems/filesystems.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="editors/editors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shells/shells.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtualization/virtualization.xml"/>
+&postlfs-config;
+&postlfs-security;
+&postlfs-filesystems;
+&postlfs-editors;
+&postlfs-shells;
 
 </part>
Index: stlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,355 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cracklib-url "https://github.com/cracklib/cracklib/releases/download">
-
-  <!ENTITY cracklib-download-http "&cracklib-url;/v&cracklib-version;/cracklib-&cracklib-version;.tar.xz">
-  <!ENTITY cracklib-download-ftp  " ">
-  <!ENTITY cracklib-md5sum        "a6dfb1766aab43a54e1cbd78abf0a20a">
-  <!ENTITY cracklib-size          "452 KB">
-  <!ENTITY cracklib-buildsize     "6.8 MB">
-  <!ENTITY cracklib-time          "0.1 SBU">
-
-  <!ENTITY crackdict-download     "&cracklib-url;/v&cracklib-version;/cracklib-words-&cracklib-version;.xz">
-  <!ENTITY crackdict-size         "4.0 MB">
-  <!ENTITY crackdict-md5sum       "f27804022dbf2682a7f7c353317f9a53">
-]>
-
-<sect1 id="cracklib" xreflabel="CrackLib-&cracklib-version;">
-  <?dbhtml filename="cracklib.html"?>
-
-
-  <title>CrackLib-&cracklib-version;</title>
-
-  <indexterm zone="cracklib">
-    <primary sortas="a-CrackLib">CrackLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CrackLib</title>
-
-    <para>
-      The <application>CrackLib</application> package contains a
-      library used to enforce strong passwords by comparing user selected
-      passwords to words in chosen word lists.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cracklib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cracklib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cracklib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cracklib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cracklib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cracklib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <para>Recommended word list for English-speaking countries:</para>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&crackdict-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           Download MD5 sum: &crackdict-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-            Download size:  &crackdict-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      There are additional word lists available for download, e.g., from
-      <ulink url="https://wiki.skullsecurity.org/index.php/Passwords"/>.
-      <application>CrackLib</application> can utilize as many, or as few word
-      lists you choose to install.
-    </para>
-
-    <important>
-      <para>
-        Users tend to base their passwords on regular words of the spoken
-        language, and crackers know that. <application>CrackLib</application>
-        is intended to filter out such bad passwords at the source using a
-        dictionary created from word lists. To accomplish this, the word
-        list(s) for use with <application>CrackLib</application> must be an
-        exhaustive list of words and word-based keystroke combinations likely
-        to be chosen by users of the system as (guessable) passwords.
-      </para>
-
-      <para>
-        The default word list recommended above for downloading mostly
-        satisfies this role in English-speaking countries. In other situations,
-        it may be necessary to download (or even create) additional word lists.
-      </para>
-
-      <para>
-        Note that word lists suitable for spell-checking are not usable
-        as <application>CrackLib</application> word lists in countries with
-        non-Latin based alphabets, because of <quote>word-based keystroke
-        combinations</quote> that make bad passwords.
-      </para>
-    </important>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CrackLib</title>
-
-    <para>
-      Install <application>CrackLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoreconf -fiv &amp;&amp;
-
-PYTHON=python3               \
-./configure --prefix=/usr    \
-            --disable-static \
-            --with-default-dict=/usr/lib/cracklib/pw_dict &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user to install the
-      recommended word list and create the <application>CrackLib</application>
-      dictionary. Other word lists (text based, one word per line) can also be
-      used by simply installing them into
-      <filename class="directory">/usr/share/dict</filename> and adding them
-      to the <command>create-cracklib-dict</command> command.
-    </para>
-
-<screen role="root"><userinput>install -v -m644 -D    ../cracklib-words-&cracklib-version;.xz \
-                         /usr/share/dict/cracklib-words.xz    &amp;&amp;
-
-unxz -v                  /usr/share/dict/cracklib-words.xz    &amp;&amp;
-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;
-
-create-cracklib-dict     /usr/share/dict/cracklib-words \
-                         /usr/share/dict/cracklib-extra-words</userinput></screen>
-
-    <para>
-      If desired, check the proper operation of the library as an
-      unprivileged user by issuing the following command:
-    </para>
-
-<screen remap="test"><userinput>make test</userinput></screen>
-
-    <important>
-      <para>
-        If you are installing <application>CrackLib</application> after
-        your LFS system has been completed and you have the
-        <application>Shadow</application> package installed, you must
-        reinstall <xref linkend="shadow"/> if you wish to provide strong
-        password support on your system. If you are now going to install the
-        <xref linkend="linux-pam"/> package, you may disregard this note as
-        <application>Shadow</application> will be reinstalled after the
-        <application>Linux-PAM</application> installation.
-      </para>
-    </important>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>autoreconf -fiv</command>: The configure script shipped with
-      the package is too old to get the right version string of Python
-      3.10 or later. This command regenerates it with a more recent version
-      of autotools, which fixes the issue.
-    </para>
-
-    <para>
-      <envar>PYTHON=python3</envar>: This forces the installation of
-      python bindings for Python 3, even if Python 2 is installed.
-    </para>
-
-    <para>
-      <parameter>--with-default-dict=/usr/lib/cracklib/pw_dict</parameter>:
-      This parameter forces the installation of the
-      <application>CrackLib</application> dictionary to the
-      <filename class="directory">/lib</filename> hierarchy.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <command>install -v -m644 -D ...</command>: This command creates the
-      <filename class="directory">/usr/share/dict</filename> directory (if it
-      doesn't already exist) and installs the compressed word list there.
-    </para>
-
-    <para>
-      <command>ln -v -s cracklib-words /usr/share/dict/words</command>: The
-      word list is linked to <filename>/usr/share/dict/words</filename> as
-      historically, <filename>words</filename> is the primary word list in the
-      <filename class="directory">/usr/share/dict</filename> directory. Omit
-      this command if you already have a
-      <filename>/usr/share/dict/words</filename> file installed on your system.
-    </para>
-
-    <para>
-      <command>echo $(hostname) >>...</command>: The value of
-      <command>hostname</command> is echoed to a file called
-      <filename>cracklib-extra-words</filename>. This extra file is intended
-      to be a site specific list which includes easy to guess passwords such
-      as company or department names, user names, product names, computer
-      names, domain names, etc.
-    </para>
-
-    <para>
-      <command>create-cracklib-dict ...</command>: This command creates the
-      <application>CrackLib</application> dictionary from the word lists.
-      Modify the command to add any additional word lists you have installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cracklib-check, cracklib-format, cracklib-packer,
-        cracklib-unpacker, cracklib-update, and create-cracklib-dict</seg>
-
-        <seg>libcrack.so and the _cracklib.so
-          (<application>Python</application> module)</seg>
-
-        <seg>/usr/lib/cracklib, /usr/share/dict and /usr/share/cracklib</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cracklib-check">
-        <term><command>cracklib-check</command></term>
-        <listitem>
-          <para>
-            is used to determine if a password is strong
-          </para>
-          <indexterm zone="cracklib cracklib-check">
-            <primary sortas="b-cracklib-check">cracklib-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cracklib-format">
-        <term><command>cracklib-format</command></term>
-        <listitem>
-          <para>
-            is used to format text files (lowercases all words,
-            removes control characters and sorts the lists)
-          </para>
-          <indexterm zone="cracklib cracklib-format">
-            <primary sortas="b-cracklib-format">cracklib-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="cracklib-packer">
-        <term><command>cracklib-packer</command></term>
-        <listitem>
-          <para>
-            creates a database with words read from standard input
-          </para>
-          <indexterm zone="cracklib cracklib-packer">
-            <primary sortas="b-cracklib-packer">cracklib-packer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="cracklib-unpacker">
-        <term><command>cracklib-unpacker</command></term>
-        <listitem>
-          <para>
-            displays on standard output the database specified
-          </para>
-          <indexterm zone="cracklib cracklib-packer">
-            <primary sortas="b-cracklib-packer">cracklib-packer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="create-cracklib-dict">
-        <term><command>create-cracklib-dict</command></term>
-        <listitem>
-          <para>
-            is used to create the <application>CrackLib</application>
-            dictionary from the given word list(s)
-          </para>
-          <indexterm zone="cracklib create-cracklib-dict">
-            <primary sortas="b-create-cracklib-dict">create-cracklib-dict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcrack">
-        <term><filename class="libraryfile">libcrack.so</filename></term>
-        <listitem>
-          <para>
-            provides a fast dictionary lookup method for strong
-            password enforcement
-          </para>
-          <indexterm zone="cracklib libcrack">
-            <primary sortas="c-libcrack">libcrack.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/cryptsetup-kernel.xml
===================================================================
--- postlfs/security/cryptsetup-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] M<emphasis role='blue'>u</emphasis>ltiple devices driver support (RAID and LVM) ---&gt;                   [MD]
-    &lt;*/M&gt; <emphasis role='blue'>D</emphasis>evice mapper support                                     [BLK_DEV_DM]
-    &lt;*/M&gt;   <emphasis role='blue'>C</emphasis>rypt target support                                      [DM_CRYPT]
-
--*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>B</emphasis>lock ciphers ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>A</emphasis>ES (Advanced Encryption Standard)                        [CRYPTO_AES]
-    # For tests:
-    &lt;*/M&gt; <emphasis role='blue'>T</emphasis>wofish                                               [CRYPTO_TWOFISH]
-  <emphasis role='blue'>L</emphasis>ength-preserving ciphers and modes ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>X</emphasis>TS (XOR Encrypt XOR with ciphertext stealing)            [CRYPTO_XTS]
-  H<emphasis role='blue'>a</emphasis>shes, digests, and MACs ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>HA-224 and SHA-256                                    [CRYPTO_SHA256]
-  <emphasis role='blue'>U</emphasis>serspace interface ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>ymmetric key cipher algorithms             [CRYPTO_USER_API_SKCIPHER]</screen>
Index: stlfs/security/cryptsetup.xml
===================================================================
--- postlfs/security/cryptsetup.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,295 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cryptsetup-download-http "&kernel-dl;/linux/utils/cryptsetup/v&cryptsetup-minor;/cryptsetup-&cryptsetup-version;.tar.xz">
-  <!ENTITY cryptsetup-download-ftp  " ">
-  <!ENTITY cryptsetup-md5sum        "d13fa531c37f05824d67ae92f3c6f73b">
-  <!ENTITY cryptsetup-size          "11 MB">
-  <!ENTITY cryptsetup-buildsize     "32 MB (add 5 MB for tests)">
-  <!ENTITY cryptsetup-time          "0.2 SBU (add 8.1 SBU for tests)">
-]>
-
-<sect1 id="cryptsetup" xreflabel="cryptsetup-&cryptsetup-version;">
-  <?dbhtml filename="cryptsetup.html"?>
-
-
-  <title>cryptsetup-&cryptsetup-version;</title>
-
-  <indexterm zone="cryptsetup">
-    <primary sortas="a-cryptsetup">cryptsetup</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cryptsetup</title>
-
-    <para>
-      cryptsetup is used to set up transparent encryption of block devices
-      using the kernel crypto API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cryptsetup-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cryptsetup-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cryptsetup-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cryptsetup-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cryptsetup-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cryptsetup-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- No longer needed with 2.3.2.
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cryptsetup-&cryptsetup-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">cryptsetup Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-c"/>,
-      <xref linkend="lvm2"/>, and
-      <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoctor"/>,
-      <xref linkend="libpwquality"/>,
-      <ulink url="https://github.com/P-H-C/phc-winner-argon2">argon2</ulink>,
-      <ulink url="https://www.libssh.org/">libssh</ulink>, and
-      <ulink url="https://www.openwall.com/passwdqc/">passwdqc</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="kernel" id="cryptsetup-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Encrypted block devices require kernel support.  To use it, the
-      appropriate kernel configuration parameters need to be set:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="cryptsetup-kernel.xml"/>
-
-    <indexterm zone="cryptsetup cryptsetup-kernel">
-      <primary sortas="d-cryptsetup">cryptsetup</primary>
-    </indexterm>
-
-  </sect2>
-
-    <sect2 role="installation">
-      <title>Installation of cryptsetup</title>
-
-    <para>
-      Install <application>cryptsetup</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr       \
-            --disable-ssh-token \
-            --disable-asciidoc  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the result, issue as the <systemitem
-      class="username">root</systemitem> user: <command>make check</command>.
-      Some tests will fail if appropriate kernel configuration options are not
-      set. Some additional options that may be needed for tests are:
-<screen><literal>CONFIG_SCSI_LOWLEVEL,
-CONFIG_SCSI_DEBUG,
-CONFIG_BLK_DEV_DM_BUILTIN,
-CONFIG_CRYPTO_USER,
-CONFIG_CRYPTO_CRYPTD,
-CONFIG_CRYPTO_LRW,
-CONFIG_CRYPTO_XTS,
-CONFIG_CRYPTO_ESSIV,
-CONFIG_CRYPTO_CRCT10DIF,
-CONFIG_CRYPTO_AES_TI,
-CONFIG_CRYPTO_AES_NI_INTEL,
-CONFIG_CRYPTO_BLOWFISH,
-CONFIG_CRYPTO_CAST5,
-CONFIG_CRYPTO_SERPENT,
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64,
-CONFIG_CRYPTO_SERPENT_AVX_X86_64,
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64, and
-CONFIG_CRYPTO_TWOFISH_X86_64</literal></screen>
-      <!--I had 1 of 21 tests fail with the above crypto options in the
-      kernel.  Eight tests were not run.  Version 2.4.3.
-      Failed test  was tcrypt-compat-test
-      tcrypt-images/tc_1-ripemd160-cbc-aes [FAILED]
-      bdubbs 
-
-      Version 2.6.1 12/03/2023 -bdubbs
-      2 of 26 tests failed (6 tests were not run)
-      FAIL: keyring-compat-test
-      FAIL: tcrypt-compat-test
-
-      Version 2.7.0 01/25/2024 -bdubbs
-      2 of 25 tests failed (8 tests were not run)
-      FAIL: keyring-compat-test
-      FAIL: tcrypt-compat-test
-      -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-ssh-token</parameter>:  This switch is required if
-      the optional libssh dependency is not installed.
-    </para>
-    
-    <para>
-      <parameter>--disable-asciidoc</parameter>: This switch disables
-      regeneration of the man pages. Remove this switch if you have
-      <xref linkend="asciidoctor" role="nodep"/> installed and wish to
-      regenerate the man pages.  Note that even if this switch is used,
-      the pre-generated man pages are shipped in the tarball and they'll
-      still be installed.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring cryptsetup</title>
-
-    <para>
-      Because of the number of possible configurations, setup of encrypted
-      volumes is beyond the scope of the BLFS book. Please see the
-      configuration guide in the cryptsetup <ulink
-      url="https://gitlab.com/cryptsetup/cryptsetup/wikis/FrequentlyAskedQuestions#2-setup">
-      FAQ</ulink>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cryptsetup,
-          cryptsetup-reencrypt,
-          integritysetup, and
-          veritysetup
-        </seg>
-        <seg>
-          libcryptsetup.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cryptsetup-prog">
-        <term><command>cryptsetup</command></term>
-        <listitem>
-          <para>
-            is used to setup dm-crypt managed device-mapper mappings
-          </para>
-          <indexterm zone="cryptsetup cryptsetup-prog">
-            <primary sortas="b-cryptsetup">cryptsetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cryptsetup-reencrypt">
-        <term><command>cryptsetup-reencrypt</command></term>
-        <listitem>
-          <para>
-            is a tool for offline LUKS device re-encryption
-          </para>
-          <indexterm zone="cryptsetup cryptsetup-reencrypt">
-            <primary sortas="b-cryptsetup-reencrypt">cryptsetup-reencrypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="integritysetup">
-        <term><command>integritysetup</command></term>
-        <listitem>
-          <para>
-            is a tool to manage dm-integrity (block level integrity) volumes
-          </para>
-          <indexterm zone="cryptsetup integritysetup">
-            <primary sortas="b-integritysetup">integritysetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="veritysetup">
-        <term><command>veritysetup</command></term>
-        <listitem>
-          <para>
-            is used to configure dm-verity managed device-mapper mappings.
-            The Device-mapper verity target provides read-only transparent
-            integrity checking of block devices using the kernel crypto API
-          </para>
-          <indexterm zone="cryptsetup veritysetup">
-            <primary sortas="b-veritysetup">veritysetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,441 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cyrus-sasl-download-http "https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-&cyrus-sasl-version;/cyrus-sasl-&cyrus-sasl-version;.tar.gz">
-  <!ENTITY cyrus-sasl-download-ftp  " ">
-  <!ENTITY cyrus-sasl-md5sum        "6f228a692516f5318a64505b46966cfa">
-  <!ENTITY cyrus-sasl-size          "3.9 MB">
-  <!ENTITY cyrus-sasl-buildsize     "28 MB">
-  <!ENTITY cyrus-sasl-time          "0.2 SBU">
-]>
-
-<sect1 id="cyrus-sasl" xreflabel="Cyrus SASL-&cyrus-sasl-version;">
-  <?dbhtml filename="cyrus-sasl.html"?>
-
-
-  <title>Cyrus SASL-&cyrus-sasl-version;</title>
-
-  <indexterm zone="cyrus-sasl">
-    <primary sortas="a-Cyrus-SASL">Cyrus SASL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cyrus SASL</title>
-
-    <para>
-      The <application>Cyrus SASL</application> package contains a Simple
-      Authentication and Security Layer implementation, a method for adding
-      authentication support to connection-based protocols. To use SASL, a
-      protocol includes a command for identifying and authenticating a user to
-      a server and for optionally negotiating protection of subsequent protocol
-      interactions. If its use is negotiated, a security layer is inserted
-      between the protocol and the connection.
-    </para>
-
-    &lfs121_checked;
-
-    <!-- To test this package at freeze, run the following command:
-         testsaslauthd -u <current user> -p <password>
-         after saslauthd is started. -->
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cyrus-sasl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cyrus-sasl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cyrus-sasl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cyrus-sasl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cyrus-sasl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cyrus-sasl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- Not needed anymore
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-doc_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <!- -<listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-openssl-1.1.0-1.patch"/>
-       </para>
-    </listitem>- ->
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">Cyrus SASL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lmdb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sphinx"/>,
-      <xref linkend="sqlite"/>,
-      &berkeley-db;,
-      <ulink url="https://stuff.mit.edu/afs/net.mit.edu/project/attic/krb4/">krb4</ulink>,
-      <ulink url="https://dmalloc.com/">Dmalloc</ulink>, and
-      <ulink url="https://metacpan.org/pod/Pod::POM::View::Restructured">Pod::POM::View::Restructured</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cyrus SASL</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <!-- Without this patch, having Sphinx and/or doctools (doctools not tested)
-         on the system causes an FTBFS when man pages are generated. The Sphinx
-         and Docutils API has changed significantly between Sphinx-{1,2} and
-         Sphinx-3.0.
-
-    <para>
-      First, fix a build failure if Sphinx or
-      <xref role="nodep" linkend="docutils"/> is installed on the system:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cyrus-sasl-2.1.27-doc_fixes-1.patch</userinput></screen>
-    -->
-
-    <para>
-      Install <application>Cyrus SASL</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --enable-auth-sasldb \
-            --with-dblib=lmdb    \
-            --with-dbpath=/var/lib/sasl/sasldb2 \
-            --with-sphinx-build=no              \
-            --with-saslauthd=/var/run/saslauthd &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      This package does not come with a test suite. If you are planning
-      on using the GSSAPI authentication mechanism, test
-      it after installing the package using the sample server and client
-      programs which were built in the preceding step. Instructions for
-      performing the tests can be found at
-      <ulink url="&hints-root;/downloads/files/cyrus-sasl.txt"/>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755                          /usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/html &amp;&amp;
-install -v -m644  saslauthd/LDAP_SASLAUTHD /usr/share/doc/cyrus-sasl-&cyrus-sasl-version;      &amp;&amp;
-install -v -m644  doc/legacy/*.html        /usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/html &amp;&amp;
-install -v -dm700 /var/lib/sasl</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-dbpath=/var/lib/sasl/sasldb2</parameter>: This
-      switch forces the <command>sasldb</command> database to be created
-      in <filename class="directory">/var/lib/sasl</filename> instead of
-      <filename class="directory">/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-saslauthd=/var/run/saslauthd</parameter>: This
-      switch forces <command>saslauthd</command> to use the FHS compliant
-      directory <filename class="directory">/var/run/saslauthd</filename>
-      for variable run-time data.
-    </para>
-
-    <para>
-      <parameter>--enable-auth-sasldb</parameter>: This switch enables
-      SASLDB authentication backend.
-    </para>
-
-    <para>
-      <option>--with-dblib=gdbm</option>: This switch forces
-      <application>GDBM</application> to be used instead of
-      <application>LMDB</application>.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: This switch enables the
-      <application>OpenLDAP</application> support.
-    </para>
-
-    <para>
-      <option>--enable-ldapdb</option>: This switch enables the
-      LDAPDB authentication backend.
-    </para>
-
-<!-- Removed in 2.1.28
-    <para>
-      <option>- -enable-java</option>: This switch enables compiling of the
-      <application>Java</application> support libraries.
-    </para>
--->
-
-    <para>
-      <option>--enable-login</option>: This option enables unsupported
-      LOGIN authentication.
-    </para>
-
-    <para>
-      <option>--enable-ntlm</option>: This option enables unsupported
-      NTLM authentication.
-    </para>
-
-    <para>
-      <command>install -v -m644 ...</command>: These commands
-      install documentation which is not installed by the
-      <command>make install</command> command.
-    </para>
-
-    <para>
-      <command>install -v -m700 -d /var/lib/sasl</command>: This directory
-      must exist when starting <command>saslauthd</command> or using the
-      sasldb plugin. If you're not going to be running the daemon or
-      using the plugins, you may omit the creation of this directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Cyrus SASL</title>
-
-    <sect3 id="cyrus-sasl-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/saslauthd.conf</filename>
-        (for <command>saslauthd</command> LDAP configuration) and
-        <filename>/etc/sasl2/Appname.conf</filename>
-        (where "Appname" is the application defined name of the application)
-      </para>
-
-      <indexterm zone="cyrus-sasl cyrus-sasl-config">
-        <primary sortas="e-etc-saslauthd.conf">/etc/saslauthd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        See
-        <ulink url="https://www.cyrusimap.org/sasl/sasl/sysadmin.html"/>
-        for information on what to include in the application configuration files.
-      </para>
-
-      <para>
-        See
-        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/LDAP_SASLAUTHD"/>
-        for configuring <command>saslauthd</command> with
-        <application>OpenLDAP</application>.
-      </para>
-
-      <para>
-        See
-        <ulink url="https://www.cyrusimap.org/sasl/sasl/gssapi.html#gssapi"/>
-        for configuring <command>saslauthd</command> with <application>Kerberos</application>.
-      </para>
-
-    </sect3>
-
-    <sect3 id="cyrus-sasl-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>saslauthd</command> daemon at system
-        startup, install the <filename>/etc/rc.d/init.d/saslauthd</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>saslauthd</command> daemon at system
-        startup, install the <filename>saslauthd.service</filename> unit
-        included in the <xref linkend="systemd-units"/> package using the
-        following command:
-      </para>
-
-      <indexterm zone="cyrus-sasl cyrus-sasl-init">
-        <primary sortas="f-saslauthd">saslauthd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-saslauthd</userinput></screen>
-
-      <note>
-        <para>
-          You'll need to modify
-          <filename revision="sysv">/etc/sysconfig/saslauthd</filename>
-          <filename revision="systemd">/etc/default/saslauthd</filename>
-          and modify the
-          <option revision="sysv">AUTHMECH</option>
-          <option revision="systemd">MECHANISM</option>
-          parameter with your desired authentication mechanism.
-          <phrase revision="systemd">The default authentication
-          mechanism is "shadow".</phrase>
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pluginviewer, saslauthd, sasldblistusers2, saslpasswd2 and
-          testsaslauthd
-        </seg>
-        <seg>
-          libsasl2.so
-        </seg>
-        <seg>
-          /usr/include/sasl,
-          /usr/lib/sasl2,
-          /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; and
-          /var/lib/sasl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pluginviewer">
-        <term><command>pluginviewer</command></term>
-        <listitem>
-          <para>
-            is used to list loadable SASL plugins and their properties
-          </para>
-          <indexterm zone="cyrus-sasl pluginviewer">
-            <primary sortas="b-pluginviewer">pluginviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="saslauthd">
-        <term><command>saslauthd</command></term>
-        <listitem>
-          <para>
-            is the SASL authentication server
-          </para>
-          <indexterm zone="cyrus-sasl saslauthd">
-            <primary sortas="b-saslauthd">saslauthd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sasldblistusers2">
-        <term><command>sasldblistusers2</command></term>
-        <listitem>
-          <para>
-            is used to list the users in the SASL password database
-            <filename>sasldb2</filename>
-          </para>
-          <indexterm zone="cyrus-sasl sasldblistusers2">
-            <primary sortas="b-sasldblistusers2">sasldblistusers2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="saslpasswd2">
-        <term><command>saslpasswd2</command></term>
-        <listitem>
-          <para>
-            is used to set and delete a user's SASL password and
-            mechanism specific secrets in the SASL password
-            database <filename>sasldb2</filename>
-          </para>
-          <indexterm zone="cyrus-sasl saslpasswd2">
-            <primary sortas="b-saslpasswd2">saslpasswd2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="testsaslauthd">
-        <term><command>testsaslauthd</command></term>
-        <listitem>
-          <para>
-            is a test utility for the SASL authentication server
-          </para>
-          <indexterm zone="cyrus-sasl testsaslauthd">
-            <primary sortas="b-testsaslauthd">testsaslauthd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsasl2">
-        <term><filename class="libraryfile">libsasl2.so</filename></term>
-        <listitem>
-          <para>
-            is a general purpose authentication library for server
-            and client applications
-          </para>
-          <indexterm zone="cyrus-sasl libsasl2">
-            <primary sortas="c-libsasl2">libsasl2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/firewalling.xml
===================================================================
--- postlfs/security/firewalling.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/firewalling.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,247 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-security-fw-firewall" xreflabel="Firewalling">
+<?dbhtml filename="firewall.html" dir="postlfs"?>
+<title>Setting up a network firewall</title>
 
-<sect1 id="fw-firewall" xreflabel="Firewalling">
-  <?dbhtml filename="firewall.html"?>
+<para>Before you read this part of the chapter, note that we assume that
+you have already installed iptables as described in the previous
+section.</para>
 
-
-  <title>Setting Up a Network Firewall</title>
-
-  <sect2 id="fw-intro" xreflabel="Firewalling Introduction">
-    <title>Introduction to Firewall Creation</title>
-
-    <para>
-      The purpose of a firewall is to protect a computer or a network against
-      malicious access. In a perfect world every daemon or service, on every
-      machine, is perfectly configured and immune to security flaws, and all
-      users are trusted implicitly to use the equipment as intended. However,
-      this is rarely, if ever, the case. Daemons may be misconfigured, or
-      updates may not have been applied for known exploits against essential
-      services. Additionally, you may wish to choose which services are
-      accessible by certain machines or users, or you may wish to limit which
-      machines or applications are allowed external access. Alternatively, you
-      simply may not trust some of your applications or users. For these
-      reasons, a carefully designed firewall should be an essential part of
-      system security.
-    </para>
-
-    <para>
-      While a firewall can greatly limit the scope of the above issues, do not
-      assume that having a firewall makes careful configuration redundant, or
-      that any negligent misconfiguration is harmless. A firewall does not
-      prevent the exploitation of any service you offer outside of it. Despite
-      having a firewall, you need to keep applications and daemons properly
-      configured and up to date.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Meaning of the Word "Firewall"</title>
-
-    <para>
-      The word firewall can have several different meanings.
-    </para>
-
-    <sect3>
-      <title>Personal Firewall</title>
-
-      <para>
-        This is a hardware device or software program, intended to secure a
-        home or desktop computer connected to the Internet. This type of
-        firewall is highly relevant for users who do not know how their
-        computers might be accessed via the Internet or how to disable
-        that access, especially if they are always online and connected
-        via broadband links.
-      </para>
-
-      <para>
-        An example configuration for a personal firewall is provided at
-        <xref linkend="fw-persFw-ipt"/>.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Masquerading Router</title>
-
-      <para>
-        This is a system placed between the Internet and an intranet.
-        To minimize the risk of compromising the firewall itself, it should
-        generally have only one role&mdash;that of protecting the intranet.
-        Although not completely risk-free, the tasks of doing the routing and
-        IP masquerading (rewriting IP headers of the packets it routes from
-        clients with private IP addresses onto the Internet so that they seem
-        to come from the firewall itself) are commonly considered relatively
-        secure.
-      </para>
-
-      <para>
-        An example configuration for a masquerading firewall is provided at
-        <xref linkend="fw-masqRouter-ipt"/>.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>BusyBox</title>
-
-      <para>
-        This is often an old computer you may have retired and nearly
-        forgotten, performing masquerading or routing functions, but offering
-        non-firewall services such as a web-cache or mail. This may be used
-        for home networks, but is not to be considered as secure as a firewall
-        only machine because the combination of server and router/firewall on
-        one machine raises the complexity of the setup.
-      </para>
-
-      <para>
-        An example configuration for a BusyBox is provided at
-        <xref linkend="fw-busybox-ipt"/>.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Firewall with a Demilitarized Zone</title>
-
-      <para>
-        This type of firewall performs masquerading or routing, but grants
-        public access to some branch of your network that is physically
-        separated from your regular intranet and is essentially a separate
-        network with direct Internet access. The servers on this network are
-        those which must be easily accessible from both the Internet and
-        intranet. The firewall protects both networks. This type of firewall
-        has a minimum of three network interfaces.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Packetfilter</title>
-
-      <para>
-        This type of firewall does routing or masquerading but does
-        not maintain a state table of ongoing communication streams. It is
-        fast but quite limited in its ability to block undesired packets
-        without blocking desired packets.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Conclusion</title>
-
-    <caution>
-      <para>
-        The example configurations provided for <xref linkend="iptables"/>
-<!-- and <xref linkend="nftables"/> -->
-        are not intended to be a complete guide to
-        securing systems. Firewalling is a complex issue that requires careful
-        configuration. The configurations provided by BLFS are intended only to
-        give examples of how a firewall works. They are not intended to fit any
-        particular configuration and may not provide complete protection from
-        an attack.
-      </para>
-    </caution>
-<!--
-    <para>
-      BLFS provides two utilities to manage the kernel Netfilter interface,
-      <xref linkend="iptables"/> and <xref linkend="nftables"/>.
-    </para>
--->
-    <para>
-      BLFS provides an utility to manage the kernel Netfilter interface,
-      <xref linkend="iptables"/>. It has been around since early 2.4 kernels,
-      and has been the standard since. This is likely the set of tools that
-      will be most familiar to existing admins. Other tools have been
-      developed more recently, see the list of further readings below
-      for more details. Here you will find a
-      list of URLs that contain comprehensive information about building
-      firewalls and further securing your system.
-    </para>
-<!--
-    <para>
-      <xref linkend="nftables"/> is the successor to <xref linkend="iptables"/>
-      and provies all of the same functionality with a single userspace tool,
-      <command>nft</command>, that uses similar syntax to BSD's
-      <application>pf</application> utility, and may be easier for new users or
-      admins already familiar with that platform.
-    </para>
-
-    <para>
-      While both can be used in tandem, that is an advanced configuration and
-      you should decide on one or the other. Both pages include very simple
-      example configurations, and customization of the provided configurations
-      for your specific environment will be necessary if you elect to use
-      either without a configuration tool.
-    </para>
-
-    <para>
-      Additionally, a firewall management tool, <xref linkend="firewalld"/>, is
-      provided to greatly ease firewall configuration for both simple and
-      complex environments, and can be used with either tool. You should not
-      use the example configurations if you intend to use
-      <application>firewalld</application> to manage your firewall rules.
-    </para>
-
-    <para>
-      If you elect to configure manually, have a look at the
-      list of further reading below for more details. Here you will find a
-      list of URLs that contain comprehensive information about building
-      firewalls and further securing your system.
-    </para>
--->
-  </sect2>
-
-  <sect2 id="fw-extra-info">
-    <title>Extra Information</title>
-
-    <sect3>
-      <title>Further Reading on Firewalls</title>
-
-      <blockquote>
-        <literallayout>
-<ulink url="https://www.netfilter.org/">www.netfilter.org - Homepage of the netfilter/iptables/nftables projects</ulink>
-<ulink url="https://www.netfilter.org/documentation/FAQ/netfilter-faq.html">Netfilter related FAQ</ulink>
-<ulink url="https://www.netfilter.org/documentation/index.html#HOWTO">Netfilter related HOWTO's</ulink>
-<ulink url="https://wiki.nftables.org/wiki-nftables/index.php/Main_Page">nftables HOWTO</ulink>
-<ulink url="https://tldp.org/LDP/nag2/x-087-2-firewall.html">tldp.org/LDP/nag2/x-087-2-firewall.html</ulink>
-<ulink url="https://tldp.org/HOWTO/Security-HOWTO.html">tldp.org/HOWTO/Security-HOWTO.html</ulink>
-<ulink url="https://tldp.org/HOWTO/Firewall-HOWTO.html">tldp.org/HOWTO/Firewall-HOWTO.html</ulink>
-<ulink url="https://linuxsecurity.com/howtos">linuxsecurity.com/howtos</ulink>
-<ulink url="https://www.circlemud.org/jelson/writings/security/index.htm">www.circlemud.org/jelson/writings/security/index.htm</ulink>
-<ulink url="https://insecure.org/reading.html">insecure.org/reading.html</ulink>
-        </literallayout>
-
-<!-- comment-out entries moved out of literallayout to avoid empty lines -->
-
-<!-- not accssible 2024-04-12
-<ulink url="http://www.e-infomax.com/ipmasq">www.e-infomax.com/ipmasq</ulink>-->
-<!-- not accssible 2022-09-08
-<ulink url="http://www.little-idiot.de/firewall">www.little-idiot.de/firewall (German &amp; outdated, but very comprehensive)</ulink>-->
-<!-- redirects somewhere you can buy a book, not sure if we should link to
-     a book which you'll need to pay for reading
-<ulink url="http://linux.oreillynet.com/pub/a/linux/2000/03/10/netadmin/ddos.html">linux.oreillynet.com/pub/a/linux/2000/03/10/netadmin/ddos.html</ulink>
--->
-<!-- 404 2022-09-08
-<ulink url="http://staff.washington.edu/dittrich/misc/ddos">staff.washington.edu/dittrich/misc/ddos</ulink> -->
-<!-- redirects to dead bugtraq
-<ulink url="http://www.securityfocus.com">www.securityfocus.com</ulink>-->
-<!-- redirects to CERT main page
-<ulink url="http://www.cert.org/tech_tips/">www.cert.org - tech_tips</ulink>-->
-<!-- not accessible 2022-09-08
-<ulink url="http://security.ittoolbox.com/">security.ittoolbox.com</ulink> -->
-      </blockquote>
-
-    </sect3>
-
-  </sect2>
+&postlfs-security-fw-intro;
+&postlfs-security-fw-disclaimer;
+&postlfs-security-fw-kernel;
+&postlfs-security-fw-writing;
+&postlfs-security-fw-finale;
+&postlfs-security-fw-extrainfo;
 
 </sect1>
+
Index: postlfs/security/firewalling/busybox.xml
===================================================================
--- postlfs/security/firewalling/busybox.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/busybox.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,116 @@
+<sect3 id="postlfs-security-fw-busybox" xreflabel="BusyBox">
+<title>BusyBox</title>
+
+<para>This scenario isn't too different from (<xref linkend="postlfs-security-fw-masqRouter"/>), 
+but in this case you want to offer some services to your intranet.
+Examples of this can be when you want to admin your box from another host 
+on your intranet or use it as a proxy or a nameserver. Note: Outlining a true 
+concept howto protect a server that offers services on the internet 
+goes far beyond the scope of this document, 
+see <xref linkend="postlfs-security-fw-disclaimer"/>.</para>
+
+<para>Be cautious.  Every service you offer and have enabled makes your
+setup more complex and your box less secure: You induce the risks of 
+misconfigured services or running a service with an exploitable bug, both risks 
+that a firewall principially should be immune of. See the introduction to 
+<xref linkend="postlfs-security-fw-masqRouter"/> for some more details.</para>
+
+<para>If the services you'd like to offer do not need to access the internet 
+themselves, like internal-only samba- or name-servers, it's quite
+simple and should still be acceptable from a security standpoint.
+Just add the following lines <emphasis>before</emphasis> the logging-rules 
+into the script.
+
+<screen>iptables -A INPUT	-i ! ppp+				-j ACCEPT
+iptables -A OUTPUT	-o ! ppp+				-j ACCEPT</screen></para>
+
+<para>If your daemons have to access the web themselves, like squid would need
+to, you could open OUTPUT generally and restrict INPUT.
+
+<screen>iptables -A INPUT	-m state --state ESTABLISHED,RELATED	-j ACCEPT
+iptables -A OUTPUT						-j ACCEPT</screen></para>
+
+<para>However, it is generally not advisable to leave OUTPUT unrestricted: you lose 
+any control on trojans who'd like to "call home", and a bit of redundancy in case 
+you've (mis-)configured a service so that it does broadcast its existence to the 
+world.</para>
+
+<para>If you prefer to have this protection, you may restrict INPUT and OUTPUT
+on all ports except those that it's absolutely necessary to have open.
+Which ports you have to open depends on your needs: mostly you will find them 
+by looking for failed accesses in your log-files.</para>
+
+<orderedlist numeration="arabic" spacing="compact">
+<title>Have a look at the following examples:</title>
+
+<listitem><para>Squid is caching the web:</para>
+<para><screen>iptables -A OUTPUT	-p tcp --dport 80			-j ACCEPT
+iptables -A INPUT	-p tcp --sport 80	-m state --state ESTABLISHED \
+&nbsp;&nbsp;&nbsp;-j ACCEPT</screen></para></listitem>
+
+<listitem><para>Your caching-nameserver (e.g., dnscache) does its
+lookups via udp:</para>
+<para><screen>iptables -A OUTPUT	-p udp --dport 53			-j ACCEPT
+iptables -A INPUT	-p udp --sport 53	-m state --state ESTABLISHED \
+&nbsp;&nbsp;&nbsp;-j ACCEPT</screen></para></listitem>
+
+<listitem><para>Alternatively, if you want to be able to ping your box to ensure
+it's still alive:</para>
+<para><screen>iptables -A INPUT	-p icmp	-m icmp --icmp-type echo-request	\
+&nbsp;&nbsp;&nbsp;-j ACCEPT
+iptables -A OUTPUT	-p icmp	-m icmp --icmp-type echo-reply	-j ACCEPT</screen></para></listitem>
+
+<listitem><para><anchor id='postlfs-security-fw-BB-4' xreflabel="example no. 4"/>If you are 
+frequently accessing ftp-servers or enjoy chatting you might notice certain 
+delays because some implementations of these daemons have the feature of 
+querying an identd on your box for your username for logging.
+Although there's really no harm in this, having an identd running is not 
+recommended because some implementions are known to be vulnerable.</para>
+
+<para>To avoid these delays you could reject the requests 
+with a 'tcp-reset':</para>
+
+<para><screen>iptables -A INPUT	-p tcp --dport 113			-j REJECT \
+&nbsp;&nbsp;&nbsp;--reject-with tcp-reset
+iptables -A OUTPUT	-p tcp --sport 113	-m state --state RELATED \
+&nbsp;&nbsp;&nbsp;-j ACCEPT</screen></para></listitem>
+
+<listitem><para>To log and drop invalid packets, mostly harmless packets
+that came in after netfilter's timeout, sometimes scans:</para>
+
+<para><screen>iptables -I INPUT 1	-p tcp	-m state --state INVALID	-j LOG \ 
+&nbsp;&nbsp;&nbsp;--log-prefix "FIREWALL:INVALID"
+iptables -I INPUT 2	-p tcp	-m state --state INVALID	-j DROP</screen></para></listitem>
+
+<listitem><para>Anything coming from the outside should not have a
+private address, this is a common attack called IP-spoofing:</para>
+
+<para><screen>iptables -t nat -A PREROUTING	-i ppp+	-s 10.0.0.0/8		-j DROP
+iptables -t nat -A PREROUTING	-i ppp+	-s 172.16.0.0/12	-j DROP
+iptables -t nat -A PREROUTING	-i ppp+	-s 192.168.0.0/16	-j DROP</screen></para></listitem>
+
+<listitem><para>To simplify debugging and be fair to anyone who'd like to 
+access a service you have disabled, purposely or by mistake, you should REJECT 
+those packets that are dropped.</para>
+
+<para>Obviously this must be done directly after logging as the very
+last lines before the packets are dropped by policy:</para>
+
+<para><screen>iptables -A INPUT						-j REJECT
+iptables -A OUTPUT		-p icmp --icmp-type 3		-j ACCEPT</screen></para></listitem>
+
+</orderedlist>
+
+<para>These are only examples to show you some of the capabilities of the new 
+firewalling-code in Linux-Kernel 2.4. Have a look at the man-page of
+iptables.
+There you will find more of them. The port-numbers you'll need for this
+can be found in /etc/services, in case you didn't find them via "try'n'error" 
+in your logfile.</para>
+
+<para>If you add any of your offered or accessed services such as the above,
+maybe even in FORWARD and for intranet-communication, and delete the
+general clauses, you get an old fashioned packet filter.</para>
+
+
+</sect3>
Index: postlfs/security/firewalling/credits.xml
===================================================================
--- postlfs/security/firewalling/credits.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/credits.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect3 id="postlfs-security-fw-credits" xreflabel="Credits">
+<title>Acknowledgements</title>
+
+<itemizedlist spacing="compact">
+
+<listitem><para>Jeff Bauman</para>
+<para>He calls himself to be paranoid, at least in matters of security;  ;-)
+I'd like to thank him for our discussion about security-related 
+philosophies and further, for reviewing the hint and
+for giving not only a bit of help with the fine points of 
+wording.</para></listitem>
+
+</itemizedlist>
+</sect3>
Index: postlfs/security/firewalling/disclaimer.xml
===================================================================
--- postlfs/security/firewalling/disclaimer.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/disclaimer.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2 id="postlfs-security-fw-disclaimer" xreflabel="Disclaimer">
+<title>Disclaimer</title>
+
+<para><emphasis>NEITHER THE AUTHOR NOR ANY OF THE LINUXFROMSCRATCH TEAM 
+ARE RESPONSIBLE FOR ANY DAMAGES INCURRED DUE TO ACTIONS TAKEN BASED ON THIS 
+DOCUMENT.</emphasis></para>
+
+<para>This document is meant as an introduction to how to setup a
+firewall - it is not a complete guide to securing systems.  Firewalling
+is a complex issue that requires careful configuration.
+The scripts quoted here are simply intended to give examples as to how
+firewalling works, they are not intended to fit into any imaginable 
+configuration and may not prevent any imaginable attack.</para>
+
+<para>The purpose of this text is simply to give you a hint on how to get
+started with firewalling.</para>
+
+<para>Customization of these scripts for your specific situation will
+be necessary for an optimal configuration, but you should make a serious
+study of the iptables documentation and firewalling in general before hacking
+away.  Have a look at the list of <xref linkend="postlfs-security-fw-library"/> at the end 
+of this section for more details.  Here you will find a list of URLs that 
+contain quite comprehensive information about building your own firewall.</para>
+
+</sect2>
Index: postlfs/security/firewalling/extrainfo.xml
===================================================================
--- postlfs/security/firewalling/extrainfo.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/extrainfo.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2 id="postlfs-security-fw-extra" xreflabel="Extra Information">
+<title>Extra Information</title>
+
+&postlfs-security-fw-library;
+
+&postlfs-security-fw-status;
+
+&postlfs-security-fw-stop;
+
+</sect2>
+
Index: postlfs/security/firewalling/finale.xml
===================================================================
--- postlfs/security/firewalling/finale.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/finale.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,23 @@
+<sect2 id="postlfs-security-fw-finale" xreflabel="Conclusion">
+<title>Editor's Note</title>
+
+<para>Finally, I'd like to remind you of one fact we must not forget:
+The effort spent attacking a system corresponds to the value the cracker
+expects to gain from it.
+If you are responsible for such valuable assets that you expect great
+effort to be made by potential crackers, you hopefully won't be in the 
+need of this hint!</para>
+
+<para><literallayout>Be cautious!
+
+    Henning Rohde
+<email>Henning.Rohde@uni-bayreuth.de</email></literallayout></para>
+
+<para>PS: And always do remember:
+SecureIT is not a matter of a status-quo but one of never stopping 
+to take care!</para>
+
+<para>PPS: If any of these scripts fail, please tell me. I will try to trace 
+any faults.</para>
+
+</sect2>
Index: postlfs/security/firewalling/firewalling.ent
===================================================================
--- postlfs/security/firewalling/firewalling.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/firewalling.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<!ENTITY postlfs-security-fw SYSTEM "../firewalling.xml">
+<!ENTITY postlfs-security-fw-intro SYSTEM "intro.xml">
+<!ENTITY postlfs-security-fw-disclaimer SYSTEM "disclaimer.xml">
+<!ENTITY postlfs-security-fw-kernel SYSTEM "kernel.xml">
+<!ENTITY postlfs-security-fw-writing SYSTEM "writing.xml">
+<!ENTITY postlfs-security-fw-persfw SYSTEM "persfw.xml">
+<!ENTITY postlfs-security-fw-masqrouter SYSTEM "masqrouter.xml">
+<!ENTITY postlfs-security-fw-busybox SYSTEM "busybox.xml">
+<!ENTITY postlfs-security-fw-finale SYSTEM "finale.xml">
+<!ENTITY postlfs-security-fw-extrainfo SYSTEM "extrainfo.xml">
+<!ENTITY postlfs-security-fw-library SYSTEM "library.xml">
+<!ENTITY postlfs-security-fw-status SYSTEM "status.xml">
+<!ENTITY postlfs-security-fw-stop SYSTEM "stop.xml">
Index: postlfs/security/firewalling/intro.xml
===================================================================
--- postlfs/security/firewalling/intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,84 @@
+<sect2 id="postlfs-security-fw-intro" xreflabel="Firewalling Introduction">
+<title>Introduction to Firewalling</title>
+
+<para>The general purpose of a firewall is to protect a network 
+against malicious access by using a single machine as a firewall. 
+This does imply that the firewall is to be considered a single point 
+of failure, but it can make the administrators life a lot easier.</para>
+
+<para>In a perfect world where you knew that every daemon or service 
+on every machine was perfectly configured and was immune to, e.g., 
+buffer-overflows and any other imaginable problem regarding its 
+security, and where you trusted every user accessing your services 
+to aim no harm, you wouldn't need to do firewalling!  
+In the real world however, daemons may be misconfigured, 
+exploits against essential services are freely availiable, you 
+may wish to choose which services are accessible by certain machines, 
+you may wish to limit which machines or applications are allowed 
+to have internet access, or you may simply  not trust some of your 
+apps or users.
+In these situations you might  benefit by using a firewall.</para>
+
+<para>Don't assume however, that having a firewall makes careful
+configuration redundant, nor that it makes any negligent
+misconfiguration harmless, nor that it prevents anyone from exploiting a
+service you intentionally offer but haven't recently updated or patched
+after an exploit went public.  Despite having a firewall, you need to
+keep applications and daemons on your system well-configured and
+up-to-date; a firewall is not a cure-all!</para>
+
+</sect2>
+
+<sect2>
+<title>Meaning of the word firewall.</title>
+
+<para>The word firewall can have several different meanings.</para>
+
+<sect3><title><xref linkend="postlfs-security-fw-persFw"/></title>
+
+<para>This is a setup or program, for Windows commercially sold by 
+companies such as Symantec, of which they claim or pretend that it
+secures a home or desktop-pc with internet access. This topic is 
+highly relevant for users who do not know the ways their computers 
+might be accessed via the internet and how to disable these, 
+especially if they are always online and if they are connected via 
+broadband links.</para></sect3>
+
+<sect3><title><xref linkend="postlfs-security-fw-masqRouter"/></title>
+<para>This is a box placed between the internet and an intranet. 
+To minimize the risk of compromizing the firewall itself it
+should generally have only one role, that of protecting the intranet.
+Although not completely riskless, the tasks of doing the routing 
+and eventually IP masquerading<footnote><para>rewriting IP-headers 
+of the packets it routes from clients with private IP-addresses onto 
+the internet so that they seem to come from the firewall 
+itself</para></footnote> are commonly considerd harmless.</para></sect3>
+
+<sect3><title><xref linkend="postlfs-security-fw-busybox"/></title>
+<para>This is often an old box you may have retired and nearly forgotten, 
+performing masquerading or routing functions, but offering a bunch of 
+services, e.g., web-cache, mail, etc.  This may be very commonly used 
+for home networks, but can definitely not to be considered as secure 
+anymore because the combining of server and router on one machine raises 
+the complexity of the setup.</para></sect3>
+
+<sect3><title>Firewall with a demilitarized zone [not further described
+here]</title>
+<para>This box performs masquerading or routing, but grants public access to 
+some branch of your network which, because of public IP's and a physically 
+separated structure, is neither considered to be part of the inter- nor 
+intranet.  These servers are those which must be easily accessible 
+from both the inter- and intranet. The firewall protects 
+them all.</para></sect3>
+
+<sect3><title>Packetfilter / partly accessible net [partly described
+here, see <xref linkend="postlfs-security-fw-busybox"/>]</title>
+<para>Doing routing or masquerading, but permitting only selected 
+services to be accessible, sometimes only by selected internal users or boxes; 
+mostly used in highly secure business contexts, sometimes by distrusting 
+employers.  This was the common configuration of a firewall at the time of 
+the Linux 2.2 kernel.  It's still possible to configure a firewall this way, 
+but it makes the rules quite complex and lengthy.</para></sect3>
+
+</sect2>
+
Index: postlfs/security/firewalling/kernel.xml
===================================================================
--- postlfs/security/firewalling/kernel.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/kernel.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,120 @@
+<sect2 id="postlfs-security-fw-kernel" xreflabel="getting a firewalling-enabled Kernel">
+<title>Getting a firewalling-enabled Kernel</title>
+
+<para>If you want your Linux-Box to do firewalling you must first ensure 
+that your kernel has been compiled with the relevant options turned on
+<footnote><para>If you needed assistance howto configure, compile and install 
+a new kernel, refer back to chapter VIII of the LinuxFromScratch book, 
+<ulink url="http://www.linuxfromscratch.org/view/3.1/chapter08/kernel.html">Installing a kernel</ulink>
+ and eventually 
+<ulink url="http://www.linuxfromscratch.org/view/3.1/chapter08/lilo.html">Making the LFS system bootable</ulink>
+; note, that you'll need to reboot 
+to actually run your new kernel.</para></footnote>.</para>
+
+<para>How to configure your kernel, with enabling the options to be 
+either compiled into the kernel or as modules, depends on your personal 
+preferences and experience. Note, that for the quoted scripts it is assumed 
+that the modules need to be loaded at first.</para>
+
+<table frame='none'>
+<title>Essential config-options for a firewalling-enabled Kernel</title>
+
+<tgroup cols='5'>
+<colspec colnum='1' colwidth='8*'  align='center'/>
+<colspec colnum='2' colwidth='19*' align='left'/>
+<colspec colnum='3' colwidth='11*' align='center'/>
+<colspec colnum='4' colwidth='1*'  align='center'/>
+<colspec colnum='5' colwidth='14*' align='left'/>
+
+<tbody>
+
+<row>
+<entry><emphasis><userinput>Networking options:</userinput></emphasis></entry>
+<entry><userinput>Network packet filtering</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_NETFILTER</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>Unix domain sockets</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_UNIX</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>IP: TCP/IP networking</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_INET</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>IP: advanced router</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_IP_ADVANCED_ROUTER</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>IP: verbose route monitoring</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_IP_ROUTE_VERBOSE</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>IP: TCP Explicit Congestion Notification support</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_INET_ECN</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>IP: TCP syncookie support</userinput></entry>
+<entry></entry>
+<entry>=</entry>
+<entry>CONFIG_SYN_COOKIES</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry align='center'>
+<emphasis><userinput>IP: Netfilter Configuration:</userinput></emphasis></entry>
+<entry align='left'><userinput>every option</userinput></entry>
+<entry>=</entry>
+<entry>CONFIG_IP_NF_*</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry align='right'><emphasis>WITHOUT:</emphasis></entry>
+<entry align='left'><literallayout><userinput>ipchains (2.2-style) support
+ipfw-adm (2.0-style) support</userinput></literallayout></entry>
+<entry>w\</entry>
+<entry>CONFIG_IP_NF_COMPAT_*</entry>
+</row>
+
+<row>
+<entry></entry>
+<entry><userinput>Fast switching</userinput></entry>
+<entry>Make sure to disable it because it would setup a bypass around
+your firewalling-rules.</entry>
+<entry>w\</entry>
+<entry>CONFIG_NET_FASTROUTE</entry>
+</row>
+
+</tbody>
+
+</tgroup>
+
+</table>
+
+</sect2>
Index: postlfs/security/firewalling/library.xml
===================================================================
--- postlfs/security/firewalling/library.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/library.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,37 @@
+<sect3 id="postlfs-security-fw-library" xreflabel="Links for further reading">
+<title>Where to start with further reading on firewalling.</title>
+
+<para><blockquote><literallayout>
+<ulink url="http://www.netfilter.org/">Homepage of the netfilter/iptables project</ulink>
+<ulink url="http://www.netfilter.org/documentation/FAQ/netfilter-faq.html">FAQ</ulink>
+<ulink url="http://www.netfilter.org/documentation/index.html#HOWTO">List of Netfilter-related HOWTO's</ulink>
+<ulink url="http://www.linuxdoc.org/LDP/nag2/x-087-2-firewall.html"></ulink>
+<ulink url="http://www.linuxdoc.org/HOWTO/Security-HOWTO.html"></ulink>
+<ulink url="http://www.linuxdoc.org/HOWTO/Firewall-HOWTO.html"></ulink>
+<ulink url="http://www-106.ibm.com/developerworks/security/library/s-fire.html
++s-fire2.html"></ulink>
+<ulink url="http://www.interhack.net/pubs/fw-faq/"></ulink>
+<ulink url="http://csrc.nist.gov/isptg/html/ISPTG-6.html"></ulink>
+<ulink url="http://www.linuxsecurity.com/docs/"></ulink>
+<ulink url="http://www.little-idiot.de/firewall (German & outdated, but
+very comprehensive)"></ulink>
+<ulink url="http://www.linuxgazette.com/issue65/stumpel.html"></ulink>
+<ulink url="http://linux.oreillynet.com/pub/a/linux/2000/03/10/netadmin/ddos.html"></ulink>
+<ulink url="http://staff.washington.edu/dittrich/misc/ddos"></ulink>
+<ulink url="http://ipmasq.cjb.net/"></ulink>
+<ulink url="http://www.e-infomax.com/ipmasq"></ulink>
+<ulink url="http://www.circlemud.org/~jelson/writings/security/index.htm"></ulink>
+<ulink url="http://www.securityfocus.com"></ulink>
+<ulink url="http://www.cert.org/tech_tips/"></ulink>
+<ulink url="http://www.uni-siegen.de/security/pointers.html"></ulink>
+<ulink url="http://security.ittoolbox.com/"></ulink>
+<ulink url="http://www.linux-firewall-tools.com/linux/"></ulink>
+<ulink url="http://logi.cc/linux/athome-firewall.php3"></ulink>
+<ulink url="http://www.insecure.org/reading.html"></ulink>
+<ulink url="http://www.robertgraham.com/pubs/firewall-seen.html"></ulink>
+</literallayout></blockquote></para>
+
+<para>If a link proves to be dead or if you think I missed one, 
+please mail!</para>
+
+</sect3>
Index: postlfs/security/firewalling/masqrouter.xml
===================================================================
--- postlfs/security/firewalling/masqrouter.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/masqrouter.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,100 @@
+<sect3 id="postlfs-security-fw-masqRouter" xreflabel="Masquerading Router">
+<title>Masquerading Router</title>
+
+<para>A true Firewall has two interfaces, one connected to an intranet,
+in this example, eth0, and one connected to the internet, here, ppp0. 
+To provide the maximum security against the box itself being broken into,
+make sure that there are no servers running on it, especially not X11 et
+al.  And, as a general principle, the box itself should not access any untrusted
+service<footnote><para>Thínk of a nameserver giving answers that make your
+bind crash, or, even worse, that implement a worm via a 
+buffer-overflow.</para></footnote>.</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+
+# Begin $rc_base/init.d/firewall
+
+echo
+echo "You're using the example-config for a setup of a firewall"
+echo "from the firewalling-hint written for LinuxFromScratch."
+echo "This example is far from being complete, it is only meant"
+echo "to be a reference."
+echo "Firewall security is a complex issue, that exceeds the scope"
+echo "of the quoted configuration rules."
+echo "You can find some quite comprehensive information"
+echo "about firewalling in Chapter 6 of the BLFS book."
+echo "http://beyond.linuxfromscratch.org/"
+echo
+
+# Insert iptables modules (not needed if built into the kernel).
+
+modprobe ip_tables
+modprobe iptable_filter
+modprobe ip_conntrack
+modprobe ip_conntrack_ftp
+modprobe ipt_state
+modprobe iptable_nat
+modprobe ip_nat_ftp
+modprobe ipt_MASQUERADE
+modprobe ipt_LOG
+modprobe ipt_REJECT
+
+# allow local-only connections
+iptables -A INPUT  -i lo -j ACCEPT
+iptables -A OUTPUT -o lo -j ACCEPT
+
+# allow forwarding
+iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
+iptables -A FORWARD -m state --state NEW -i ! ppp+	 -j ACCEPT
+
+# do masquerading    (not needed if intranet is not using private ip-addresses)
+iptables -t nat -A POSTROUTING -o ppp+ -j MASQUERADE
+
+# Log everything for debugging (last of all rules, but before DROP/REJECT)
+iptables -A INPUT   -j LOG --log-prefix "FIREWALL:INPUT  "
+iptables -A FORWARD -j LOG --log-prefix "FIREWALL:FORWARD"
+iptables -A OUTPUT  -j LOG --log-prefix "FIREWALL:OUTPUT "
+
+# set a sane policy
+iptables -P INPUT   DROP
+iptables -P FORWARD DROP
+iptables -P OUTPUT  DROP
+
+# be verbose on dynamic ip-addresses (not needed in case of static IP)
+echo 2 &gt; /proc/sys/net/ipv4/ip_dynaddr
+
+# disable ExplicitCongestionNotification
+echo 0 &gt; /proc/sys/net/ipv4/tcp_ecn
+
+# activate TCPsyncookies
+echo 1 &gt; /proc/sys/net/ipv4/tcp_syncookies
+
+# activate Route-Verification = IP-Spoofing_protection
+for f in /proc/sys/net/ipv4/conf/*/rp_filter; do
+	echo 1 &gt; $f
+done
+
+# activate IP-Forwarding 
+echo 1 &gt; /proc/sys/net/ipv4/ip_forward
+<userinput>EOF</userinput></screen></para>
+
+<para>With this script your intranet should be sufficiently 
+secure against external attacks: no one should be able to setup a 
+new connection to any internal service and, if it's masqueraded, 
+it s even invisible; furthermore, your firewall should be nearly immune 
+because there are no services running that a cracker could attack.</para>
+
+<para>Note: if the interface you're connecting to the Internet 
+doesn't connect via ppp, you will need to change
+<userinput>ppp+</userinput> to the name of the interface which you are
+using.  If you are using the same interface type to connect to both your
+intranet and the internet, you need to use the actual name of the
+interface such as <emphasis>eth<userinput>0</userinput></emphasis>, 
+on both interfaces.</para>
+
+<para>If you need stronger security (e.g., against DOS, connection 
+highjacking, spoofing, etc.) have a look at the list of 
+<xref linkend="postlfs-security-fw-library"/> at the end of this section.</para>
+
+</sect3>
Index: postlfs/security/firewalling/persfw.xml
===================================================================
--- postlfs/security/firewalling/persfw.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/persfw.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,64 @@
+<sect3 id="postlfs-security-fw-persFw" xreflabel="Personal Firewall">
+<title>Personal Firewall</title>
+
+<para>A Personal Firewall is supposed to let you access the all services
+offered on the internet, but keep your box secure and your data private.</para>
+
+<para>Below is a slightly modified version of Rusty Russell's
+recommendation from the <ulink
+url="http://netfilter.samba.org/unreliable-guides/packet-filtering-HOWTO/packet-filtering-HOWTO.linuxdoc-5.html">Linux
+2.4 Packet Filtering HOWTO</ulink>:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+
+# Begin $rc_base/init.d/firewall
+
+# Insert connection-tracking modules (not needed if built into the kernel).
+modprobe ip_tables
+modprobe iptable_filter
+modprobe ip_conntrack
+modprobe ip_conntrack_ftp
+modprobe ipt_state
+modprobe ipt_LOG
+
+# allow local-only connections
+iptables -A INPUT  -i lo -j ACCEPT
+# free output on any interface to any ip for any service (equal to -P ACCEPT)
+iptables -A OUTPUT -j ACCEPT
+
+# permit answers on already established connections
+# and permit new connections related to established ones (eg active-ftp)
+iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+
+# Log everything else:  What's Windows' latest exploitable vulnerability?
+iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
+
+# set a sane policy:    everything not accepted &gt; /dev/null
+iptables -P INPUT    DROP
+iptables -P FORWARD  DROP
+iptables -P OUTPUT   DROP
+
+# be verbose on dynamic ip-addresses     (not needed in case of static IP)
+echo 2 &gt; /proc/sys/net/ipv4/ip_dynaddr
+
+# disable ExplicitCongestionNotification - too many routers are still ignorant
+echo 0 &gt; /proc/sys/net/ipv4/tcp_ecn
+
+# End $rc_base/init.d/firewall
+<userinput>EOF</userinput></screen></para>
+
+<para>His script is quite simple, it drops all traffic coming in into your 
+computer that wasn't initiated from your box, but as long as you are simply 
+surfing the internet you are unlikely to exceed its limits.</para> 
+
+<para>If you frequently encounter certain delays at accessing ftp-servers,
+please have a look at <xref linkend="postlfs-security-fw-busybox"/> - 
+<xref linkend="postlfs-security-fw-BB-4"/>.</para>
+
+<para>Even if you have daemons / services running on your box, these
+should be inaccessible everywhere but from your box itself.
+If you want to allow access to services on your machine, such as ssh or pinging, 
+take a look at <xref linkend="postlfs-security-fw-busybox"/>.</para> 
+
+</sect3>
Index: postlfs/security/firewalling/status.xml
===================================================================
--- postlfs/security/firewalling/status.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/status.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,23 @@
+<sect3 id="postlfs-security-fw-status" xreflabel="/etc/rc.d/init.d/firewall.status">
+<title>firewall.status</title>
+
+<para>If you'd like to have a look at the chains your firewall consists of and 
+the order in which the rules take effect:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall.status &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+
+# Begin $rc_base/init.d/firewall.status
+
+echo "iptables.mangling:"
+iptables -t mangle  -v -L -n --line-numbers
+
+echo
+echo "iptables.nat:"
+iptables -t nat	    -v -L -n --line-numbers
+
+echo
+echo "iptables.filter:"
+iptables	    -v -L -n --line-numbers
+<userinput>EOF</userinput></screen></para>
+</sect3>
Index: postlfs/security/firewalling/stop.xml
===================================================================
--- postlfs/security/firewalling/stop.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/stop.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,27 @@
+<sect3 id="postlfs-security-fw-stop" xreflabel="/etc/rc.d/init.d/firewall.stop">
+<title>firewall.stop</title>
+
+<para>If you need to turn firewalling off, this script will do it:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/firewall.stop &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+
+# Being $rc_base/init.d/firewall.stop
+
+# deactivate IP-Forwarding 
+echo 0 > /proc/sys/net/ipv4/ip_forward
+
+iptables -Z
+iptables -F
+iptables -t nat         -F PREROUTING
+iptables -t nat         -F OUTPUT
+iptables -t nat         -F POSTROUTING
+iptables -t mangle      -F PREROUTING
+iptables -t mangle      -F OUTPUT
+iptables -X
+iptables -P INPUT       ACCEPT
+iptables -P FORWARD     ACCEPT
+iptables -P OUTPUT      ACCEPT
+<userinput>EOF</userinput></screen></para>
+
+</sect3>
Index: postlfs/security/firewalling/writing.xml
===================================================================
--- postlfs/security/firewalling/writing.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/firewalling/writing.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2 id="postlfs-security-fw-writing" xreflabel="writing the firewalling-setup-scripts">
+<title>Now you can start to build your Firewall</title>
+
+&postlfs-security-fw-persfw;
+
+&postlfs-security-fw-masqrouter;
+
+&postlfs-security-fw-busybox;
+
+</sect2>
+
Index: stlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,551 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gnupg2-download-http "&gnupg-http;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-download-ftp  " ">
-  <!ENTITY gnupg2-md5sum        "49c3534e87744e994250d37c1b43f928">
-  <!ENTITY gnupg2-size          "7.6 MB">
-  <!ENTITY gnupg2-buildsize     "164 MB (with tests)">
-  <!ENTITY gnupg2-time          "1.2 SBU (with tests; using parallelism=4)">
-]>
-
-<sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">
-  <?dbhtml filename="gnupg.html"?>
-
-
-  <title>GnuPG-&gnupg2-version;</title>
-
-  <indexterm zone="gnupg2">
-    <primary sortas="a-GnuPG">GnuPG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GnuPG</title>
-
-    <para>
-      The <application>GnuPG</application> package is GNU's tool for
-      secure communication and data storage. It can be used to encrypt data and
-      to create digital signatures. It includes an advanced key management
-      facility and is compliant with the proposed OpenPGP Internet standard as
-      described in RFC2440 and the S/MIME standard as described by several RFCs.
-      GnuPG 2 is the stable version of GnuPG integrating support for OpenPGP and
-      S/MIME.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnupg2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnupg2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnupg2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnupg2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnupg2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnupg2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gnupg-&gnupg2-version;-emacs-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GnuPG 2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libassuan"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libksba"/>,
-      <xref linkend="npth"/>, and
-      <xref linkend="openldap"/>
-    </para>
-
-    <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)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="fuse3"/>,
-      <xref linkend="imagemagick"/> (for the <command>convert</command> utility,
-      used for generating the documentation),
-      <xref linkend="libusb"/>,
-      an <xref linkend="server-mail"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <ulink url="https://mcj.sourceforge.net/">fig2dev</ulink> (for
-      generating documentation),
-      and <ulink url="https://www.chiark.greenend.org.uk/~ian/adns/">GNU
-      adns</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GnuPG</title>
-
-<!--
-    <para>
-      First, fix a compatibility issue with emacs:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gnupg-2.4.3-emacs-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GnuPG</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --prefix=/usr           \
-             --localstatedir=/var    \
-             --sysconfdir=/etc       \
-             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-make &amp;&amp;
-
-makeinfo --html --no-split -I doc -o doc/gnupg_nochunks.html ../doc/gnupg.texi &amp;&amp;
-makeinfo --plaintext       -I doc -o doc/gnupg.txt           ../doc/gnupg.texi &amp;&amp;
-make -C doc html</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/>
-      installed and you wish to create documentation in alternate formats,
-      issue the following command
-      (<ulink url="https://mcj.sourceforge.net/">fig2dev</ulink> is needed for
-      the ps format), but note that this process fails due to missing files:
-      <!-- https://wiki.linuxfromscratch.org/blfs/ticket/19188#comment:1 -->
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf ps</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      <!--
-      Note that if you have already installed
-      <application>GnuPG</application>, the instructions below will overwrite
-      <filename>/usr/share/man/man1/gpg-zip.1</filename>.
-      -->
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html            &amp;&amp;
-install -v -m644    doc/gnupg_nochunks.html \
-                    /usr/share/doc/gnupg-&gnupg2-version;/html/gnupg.html &amp;&amp;
-install -v -m644    ../doc/*.texi doc/gnupg.txt \
-                    /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-install -v -m644    doc/gnupg.html/* \
-                    /usr/share/doc/gnupg-&gnupg2-version;/html</userinput></screen>
-    <para>
-      If you created alternate formats of the documentation, install them
-      using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/gnupg.{pdf,dvi,ps} \
-                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>sed ... tools/Makefile.in</command>:
-      This command is needed to build the gpg-zip program.
-    </para>
--->
-    <para>
-      <command>mkdir build &amp;&amp; cd build</command>: the Gnupg2
-      developers recommend to build the package in a dedicated directory.
-    </para>
-
-    <para>
-      <parameter>--docdir=/usr/share/doc/gnupg-&gnupg2-version;</parameter>:
-      This switch changes the default docdir to <filename
-      class="directory">/usr/share/doc/gnupg-&gnupg2-version;</filename>.
-    </para>
-
-<!-- Unrecognized in 2.2.26, seems to get built automatically now.
-    <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>
-
-    <para>
-      <option>--enable-g13</option>: This switch enables building the
-      g13 program.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>addgnupghome, applygnupgdefaults, dirmngr, dirmngr-client, g13
-        (optional), gpg-agent, gpg-card, gpg-connect-agent, gpg, gpgconf,
-        gpgparsemail, gpgscm, gpgsm, gpgsplit, gpgtar, gpgv, gpg-wks-client,
-        gpg-wks-server, kbxutil,
-        <!--symcryptrun,--> and watchgnupg</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/gnupg-&gnupg2-version; and
-        /usr/share/gnupg</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addgnupghome">
-        <term><command>addgnupghome</command></term>
-        <listitem>
-          <para>
-            is used to create and populate a user's
-            <filename class="directory">~/.gnupg</filename> directories
-          </para>
-          <indexterm zone="gnupg2 addgnupghome">
-            <primary sortas="b-addgnupghome">addgnupghome</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="applygnupgdefaults">
-        <term><command>applygnupgdefaults</command></term>
-        <listitem>
-          <para>
-            is a wrapper script used to run <command>gpgconf</command>
-            with the <parameter>--apply-defaults</parameter> parameter on all
-            user's GnuPG home directories
-          </para>
-          <indexterm zone="gnupg2 applygnupgdefaults">
-            <primary sortas="b-applygnupgdefaults">applygnupgdefaults</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dirmngr">
-        <term><command>dirmngr</command></term>
-        <listitem>
-          <para>
-            is a tool that takes care of accessing the OpenPGP keyservers
-          </para>
-          <indexterm zone="gnupg2 dirmngr">
-            <primary sortas="b-dirmngr">dirmngr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dirmngr-client">
-        <term><command>dirmngr-client</command></term>
-        <listitem>
-          <para>
-            is a tool to contact a running dirmngr and test whether a
-            certificate has been revoked
-          </para>
-          <indexterm zone="gnupg2 dirmngr-client">
-            <primary sortas="b-dirmngr-client">dirmngr-client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g13">
-        <term><command>g13</command></term>
-        <listitem>
-          <para>
-            is a tool to create, mount or unmount an encrypted file system
-            container (optional)
-          </para>
-          <indexterm zone="gnupg2 g13">
-            <primary sortas="b-g13">g13</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-agent">
-        <term><command>gpg-agent</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="gnupg2 gpg-agent">
-            <primary sortas="b-gpg-agent">gpg-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-card">
-        <term><command>gpg-card</command></term>
-        <listitem>
-          <para>
-            is a tool to manage smart cards and tokens
-          </para>
-          <indexterm zone="gnupg2 gpg-card">
-            <primary sortas="b-gpg-card">gpg-card</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-connect-agent">
-        <term><command>gpg-connect-agent</command></term>
-        <listitem>
-          <para>
-            is a utility used to communicate with a running
-            <command>gpg-agent</command>
-          </para>
-          <indexterm zone="gnupg2 gpg-connect-agent">
-            <primary sortas="b-gpg-connect-agent">gpg-connect-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg">
-        <term><command>gpg</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="gnupg2 gpg">
-            <primary sortas="b-gpg">gpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgconf">
-        <term><command>gpgconf</command></term>
-        <listitem>
-          <para>
-            is a utility used to automatically and reasonably safely
-            query and modify configuration files in the
-            <filename class="directory">~/.gnupg</filename> home directory. It
-            is designed not to be invoked manually by the user, but
-            automatically by graphical user interfaces
-          </para>
-          <indexterm zone="gnupg2 gpgconf">
-            <primary sortas="b-gpgconf">gpgconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgparsemail">
-        <term><command>gpgparsemail</command></term>
-        <listitem>
-          <para>
-            is a utility currently only useful for debugging. Run it with
-            <parameter>--help</parameter> for usage information
-          </para>
-          <indexterm zone="gnupg2 gpgparsemail">
-            <primary sortas="b-gpgparsemail">gpgparsemail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgscm">
-        <term><command>gpgscm</command></term>
-        <listitem>
-          <para>
-            executes the given scheme program or spawns an interactive shell
-          </para>
-          <indexterm zone="gnupg2 gpgscm">
-            <primary sortas="b-gpgscm">gpgscm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgsm">
-        <term><command>gpgsm</command></term>
-        <listitem>
-          <para>
-            is a tool similar to <command>gpg</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
-          </para>
-          <indexterm zone="gnupg2 gpgsm">
-            <primary sortas="b-gpgsm">gpgsm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgsplit">
-        <term><command>gpgsplit</command></term>
-        <listitem>
-          <para>
-            splits an OpenPGP message into packets
-          </para>
-          <indexterm zone="gnupg2 gpgsplit">
-            <primary sortas="b-gpgsplit">gpgsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgtar">
-        <term><command>gpgtar</command></term>
-        <listitem>
-          <para>
-            is a tool to encrypt or sign files into an archive
-          </para>
-          <indexterm zone="gnupg2 gpgtar">
-            <primary sortas="b-gpgtar">gpgtar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgv">
-        <term><command>gpgv</command></term>
-        <listitem>
-          <para>
-            is a verify only version of <command>gpg</command>
-          </para>
-          <indexterm zone="gnupg2 gpgv">
-            <primary sortas="b-gpgv">gpgv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-wks-client">
-        <term><command>gpg-wks-client</command></term>
-        <listitem>
-          <para>
-            is a client for the
-            <application>Web Key Service</application> protocol
-          </para>
-          <indexterm zone="gnupg2 gpg-wks-client">
-            <primary sortas="b-gpg-wks-client">gpg-wks-client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-wks-server">
-        <term><command>gpg-wks-server</command></term>
-        <listitem>
-          <para>
-            provides a server for the
-            <application>Web Key Service</application> protocol
-          </para>
-          <indexterm zone="gnupg2 gpg-wks-server">
-            <primary sortas="b-gpg-wks-server">gpg-wks-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="gpg-zip">
-        <term><command>gpg-zip</command></term>
-        <listitem>
-          <para>
-            encrypts or signs files into an archive
-          </para>
-          <indexterm zone="gnupg2 gpg-zip">
-            <primary sortas="b-gpg-zip">gpg-zip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="kbxutil">
-        <term><command>kbxutil</command></term>
-        <listitem>
-          <para>
-            is used to list, export and import Keybox data
-          </para>
-          <indexterm zone="gnupg2 kbxutil">
-            <primary sortas="b-kbxutil">kbxutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!--
-      <varlistentry id="symcryptrun">
-        <term><command>symcryptrun</command></term>
-        <listitem>
-          <para>
-            is a simple symmetric encryption tool.
-          </para>
-          <indexterm zone="gnupg2 symcryptrun">
-            <primary sortas="b-symcryptrun">symcryptrun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="watchgnupg">
-        <term><command>watchgnupg</command></term>
-        <listitem>
-          <para>
-            is used to listen to a Unix Domain socket created by any of
-            the GnuPG tools
-          </para>
-          <indexterm zone="gnupg2 watchgnupg">
-            <primary sortas="b-watchgnupg">watchgnupg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,377 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gnutls-download-http "&gnupg-http;/gnutls/v3.8/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-download-ftp  " ">
-  <!ENTITY gnutls-md5sum        "74b468201ef7e9035f78d44c3f0906c4">
-  <!ENTITY gnutls-size          "6.2 MB">
-  <!ENTITY gnutls-buildsize     "147 MB (add 114 MB for tests)">
-  <!ENTITY gnutls-time          "0.6 SBU (add 1.4 SBU for tests; both using parallelism=8)">
-]>
-
-<sect1 id="gnutls" xreflabel="GnuTLS-&gnutls-version;">
-  <?dbhtml filename="gnutls.html"?>
-
-
-  <title>GnuTLS-&gnutls-version;</title>
-
-  <indexterm zone="gnutls">
-    <primary sortas="a-GnuTLS">GnuTLS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GnuTLS</title>
-
-    <para>
-      The <application>GnuTLS</application> package contains libraries and
-      userspace tools which provide a secure layer over a reliable transport
-      layer. Currently the <application>GnuTLS</application> library implements
-      the proposed standards by the IETF's TLS working group. Quoting from the
-      <ulink url="https://datatracker.ietf.org/doc/rfc8446/">
-        TLS 1.3 protocol specification
-      </ulink>:
-    </para>
-
-    <para>
-      <quote>
-        TLS allows client/server applications to communicate over the Internet
-        in a way that is designed to prevent eavesdropping, tampering, and
-        message forgery.
-      </quote>
-    </para>
-
-    <para>
-      <application>GnuTLS</application> provides support for TLS 1.3, TLS 1.2,
-      TLS 1.1, TLS 1.0, and (optionally) SSL 3.0 protocols. It also supports
-      TLS extensions, including server name and max record size. Additionally,
-      the library supports authentication using the SRP protocol, X.509
-      certificates, and OpenPGP keys, along with support for the TLS
-      Pre-Shared-Keys (PSK) extension, the Inner Application (TLS/IA)
-      extension, and X.509 and OpenPGP certificate handling.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnutls-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnutls-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnutls-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnutls-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnutls-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnutls-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GnuTLS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="nettle"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="make-ca"/>,
-      <xref linkend="libunistring"/>,
-      <xref linkend="libtasn1"/>, and
-      <xref linkend="p11-kit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="brotli"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libidn"/> or
-      <xref linkend="libidn2"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="net-tools"/> (used during the test suite),
-      <xref linkend="texlive"/> or <xref linkend="tl-installer"/>,
-      <xref linkend="unbound"/> (to build the DANE library),
-      <xref linkend="valgrind"/> (used during the test suite),
-      <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="&sourceforge-dl;/trousers/">Trousers</ulink> (Trusted Platform Module support)
-    </para>
-
-    <note><para>
- <!-- Note that if you do not install <xref linkend="libtasn1"/>, an older
-       3.8.0 includes minitasn1 4.19 which is currnet at the moment. ken -->
-      Note that if you do not install <xref linkend="libtasn1"/>, a
-      version shipped in the <application>GnuTLS</application> tarball will be
-      used instead.
-    </para></note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GnuTLS</title>
-
-    <para>
-      Install <application>GnuTLS</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/gnutls-&gnutls-version; \
-            --with-default-trust-store-pkcs11="pkcs11:" &amp;&amp;
-make</userinput></screen>
-<!-- - -disable-rpath \
-     Old gnutls versions (around 3.5) had a problem with rpath, because
-     libraries in the build tree were linked with rpath pointing to the
-     system libraries, so that tests failed. Present versions don't have
-     this problem, and do exactly what is expected without using the
-     disable-rpath option: rpath pointing to the build tree when libraries
-     are first linked, but rpath removed when libraries are relinked at
-     install time. -->
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-default-trust-store-pkcs11="pkcs11:"</parameter>: This
-      switch tells gnutls to use the PKCS #11 trust store as the default trust.
-      Omit this switch if <xref linkend="p11-kit"/> is not installed.
-    </para>
-    <!-- see above
-    <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>
-    -->
-    <para>
-      <option>--with-default-trust-store-file=/etc/pki/tls/certs/ca-bundle.crt</option>:
-      This switch tells <command>configure</command> where to find the
-      legacy CA certificate bundle and to use it instead of PKCS #11 module
-      by default. Use this if <xref linkend="p11-kit"/> is not installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--enable-openssl-compatibility</option>:
-      Use this switch if you wish to build the OpenSSL compatibility library.
-    </para>
-
-    <para>
-      <option>--without-p11-kit</option>: use this switch if you have not
-      installed <application>p11-kit</application>.
-    </para>
-
-    <para>
-      <option>--with-included-unistring</option>: uses the bundled version of
-      libunistring, instead of the system one. Use this switch if you have not
-      installed <xref linkend="libunistring"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          certtool, danetool, gnutls-cli, gnutls-cli-debug,
-          gnutls-serv, ocsptool, p11tool, psktool, and srptool
-        </seg>
-        <seg>
-          libgnutls.so, libgnutls-dane.so, libgnutlsxx.so,
-          libgnutls-openssl.so (optional), and
-          /usr/lib/guile/3.0/extensions/guile-gnutls-v-2.so
-        </seg>
-        <seg>
-          /usr/include/gnutls,
-          /usr/lib/guile/3.0/site-ccache/gnutls,
-          /usr/share/guile/site/3.0/gnutls, and
-          /usr/share/doc/gnutls-&gnutls-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="certtool">
-        <term><command>certtool</command></term>
-        <listitem>
-          <para>
-            is used to generate X.509 certificates, certificate requests,
-            and private keys
-          </para>
-          <indexterm zone="gnutls certtool">
-            <primary sortas="b-certtool">certtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="danetool">
-        <term><command>danetool</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate and check DNS resource records
-            for the DANE protocol
-          </para>
-          <indexterm zone="gnutls danetool">
-            <primary sortas="b-danetool">danetool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnutls-cli">
-        <term><command>gnutls-cli</command></term>
-        <listitem>
-          <para>
-            is a simple client program to set up a TLS connection to some
-            other computer
-          </para>
-          <indexterm zone="gnutls gnutls-cli">
-            <primary sortas="b-gnutls-cli">gnutls-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnutls-cli-debug">
-        <term><command>gnutls-cli-debug</command></term>
-        <listitem>
-          <para>
-            is a simple client program to set up a TLS connection to some
-            other computer and produces very verbose progress results
-          </para>
-          <indexterm zone="gnutls gnutls-cli-debug">
-            <primary sortas="b-gnutls-cli-debug">gnutls-cli-debug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnutls-serv">
-        <term><command>gnutls-serv</command></term>
-        <listitem>
-          <para>
-            is a simple server program that listens to incoming TLS
-            connections
-          </para>
-          <indexterm zone="gnutls gnutls-serv">
-            <primary sortas="b-gnutls-serv">gnutls-serv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ocsptool">
-        <term><command>ocsptool</command></term>
-        <listitem>
-          <para>
-            is a program that can parse and print information about OCSP
-            requests/responses, generate requests and verify responses
-          </para>
-          <indexterm zone="gnutls ocsptool">
-            <primary sortas="b-ocsptool">ocsptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="p11tool">
-        <term><command>p11tool</command></term>
-        <listitem>
-          <para>
-            is a program that allows handling data from PKCS #11 smart cards
-            and security modules
-          </para>
-          <indexterm zone="gnutls p11tool">
-            <primary sortas="b-p11tool">p11tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psktool">
-        <term><command>psktool</command></term>
-        <listitem>
-          <para>
-            is a simple program that generates random keys for use with TLS-PSK
-          </para>
-          <indexterm zone="gnutls psktool">
-            <primary sortas="b-psktool">psktool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="srptool">
-        <term><command>srptool</command></term>
-        <listitem>
-          <para>
-            is a simple program that emulates the programs in the Stanford
-            SRP (Secure Remote Password) libraries using GnuTLS
-          </para>
-          <indexterm zone="gnutls srptool">
-            <primary sortas="b-srptool">srptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnutls">
-        <term><filename class="libraryfile">libgnutls.so</filename></term>
-        <listitem>
-          <para>
-            contains the core API functions and X.509 certificate API functions
-          </para>
-          <indexterm zone="gnutls libgnutls">
-            <primary sortas="c-libgnutls">libgnutls.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,297 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gpgme-download-http "&gnupg-http;/gpgme/gpgme-&gpgme-version;.tar.bz2">
-  <!ENTITY gpgme-download-ftp  " ">
-  <!ENTITY gpgme-md5sum        "01a8c05b409847e87daf0543e91f8c37">
-  <!ENTITY gpgme-size          "1.8 MB">
-  <!ENTITY gpgme-buildsize     "260 MB (with tests)">
-  <!ENTITY gpgme-time          "1.0 SBU (with all bindings and tests; with parallelism=4)">
-]>
-
-<sect1 id="gpgme" xreflabel="GPGME-&gpgme-version;">
-  <?dbhtml filename="gpgme.html"?>
-
-
-  <title>GPGME-&gpgme-version;</title>
-
-  <indexterm zone="gpgme">
-    <primary sortas="a-GPGME">GPGME</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GPGME</title>
-
-    <para>
-      The <application>GPGME</application> package is a C library
-      that allows cryptography support to be added to a
-      program. It is designed to make access to public key crypto
-      engines like <application>GnuPG</application> or GpgSM easier
-      for applications. <application>GPGME</application> provides
-      a high-level crypto API for encryption, decryption, signing,
-      signature verification and key management.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gpgme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gpgme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gpgme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gpgme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gpgme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gpgme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch (required if SWIG is installed):
-          <ulink url="&patch-root;/gpgme-&gpgme-version;-gpg_error_1_46-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">GPGME Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libassuan"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="graphviz"/> (for API documentation),
-      <xref linkend="gnupg2"/> (required if Qt or SWIG are installed;
-        used during the test suite),
-      <xref linkend="clisp"/>,
-      &qt5-deps;, and
-      <xref linkend="swig"/> (for language bindings)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GPGME</title>
-
-    <para>
-      Install <application>GPGME</application> by running the following
-      commands:
-    </para>
-<!--gpgme 1.22 FTBFS when building in tree. Upstream thinks building
-    should be done out of tree, but this is not in the doc yet
-    https://github.com/gpg/gpgme/commit/24a8c279da98fe7e586a9fc3cd91175c9e60ffef
-    -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --prefix=/usr --disable-gpg-test &amp;&amp;
-make PYTHONS=</userinput></screen>
-
-    <para>
-      If <xref linkend='swig'/> is installed, build the Python 3 binding as
-      a wheel:
-    </para>
-
-<screen><userinput>if swig -version > /dev/null; then
-  srcdir=$PWD/../lang/python \
-  top_builddir=$PWD          \
-  &build-wheel-cmd; $PWD/lang/python
-fi</userinput></screen>
-
-    <para>
-      To test the results, you should have <xref linkend="gnupg2"/> installed
-      and remove the <option>--disable-gpg-test</option> above. If
-      <xref linkend='swig'/> is installed, it's necessary to adapt the
-      test suite to use the Python 3 binding just built as a wheel as well.
-      Issue:
-    </para>
-
-<screen remap='test'><userinput>if swig -version > /dev/null; then
-  python3 -m venv testenv                                              &amp;&amp;
-  testenv/bin/pip3 install --no-index --find-links=dist --no-cache-dir \
-                           gpg                                         &amp;&amp;
-  sed '/PYTHON/s#run-tests.py#&amp; --python-libdir=/dev/null#'            \
-      -i lang/python/tests/Makefile
-fi &amp;&amp;
-
-make -k check PYTHONS= PYTHON=$PWD/testenv/bin/python3</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install PYTHONS=</userinput></screen>
-
-    <para>
-      If <xref linkend='swig'/> is installed, still as the &root; user,
-      install the Python 3 binding:
-    </para>
-
-<screen role="root"><userinput>if swig -version > /dev/null; then
-  &install-wheel; gpg
-fi</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-gpg-test</parameter>: if this parameter is not
-      passed to configure, the test programs are built during
-      <command>make</command> stage, which requires <xref linkend="gnupg2"/>.
-      This parameter is not needed if <xref linkend="gnupg2"/> is installed.
-    </para>
-
-    <para>
-      <parameter>PYTHONS=</parameter>: Disable building Python binding
-      using the deprecated <command>python3 setup.py build</command>
-      command.  The explicit instruction to build the Python 3 binding with
-      the <command>pip3 wheel</command> command is provided.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gpgme-json, and gpgme-tool
-        </seg>
-        <seg>
-          libgpgme.so, libgpgmepp.so, and libqgpgme.so
-        </seg>
-        <seg>
-          /usr/include/{gpgme++,qgpgme,QGpgME},
-          /usr/lib/cmake/{Gpgmepp,QGpgme}.
-          /usr/lib/python&python3-majorver;/site-packages/gpg{,-&gpgme-version;.dist-info}, and
-          /usr/share/common-lisp/source/gpgme
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpgme-json">
-        <term><command>gpgme-json</command></term>
-        <listitem>
-          <para>
-            outputs <application>GPGME</application> commands in JSON format
-          </para>
-          <indexterm zone="gpgme gpgme-json">
-            <primary sortas="b-gpgme-json">gpgme-json</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgme-tool">
-        <term><command>gpgme-tool</command></term>
-        <listitem>
-          <para>
-            is an assuan server exposing <application>GPGME</application>
-            operations, such as printing fingerprints and keyids with
-            keyservers
-          </para>
-          <indexterm zone="gpgme gpgme-tool">
-            <primary sortas="b-gpgme-tool">gpgme-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- As of 1.13.1, this library isn't present anymore.
-      <varlistentry id="libgpgme-pthread">
-        <term><filename class="libraryfile">libgpgme-pthread.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GPGME</application> API functions for
-            applications using pthread.
-          </para>
-          <indexterm zone="gpgme libgpgme-pthread">
-            <primary sortas="c-libgpgme-pthread">libgpgme-pthread.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="libgpgme">
-        <term><filename class="libraryfile">libgpgme.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GPGME</application> API functions
-          </para>
-          <indexterm zone="gpgme libgpgme">
-            <primary sortas="c-libgpgme">libgpgme.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgpgmepp">
-        <term><filename class="libraryfile">libgpgmepp.so</filename></term>
-        <listitem>
-          <para>
-            contains the C++ <application>GPGME</application> API functions
-          </para>
-          <indexterm zone="gpgme libgpgmepp">
-            <primary sortas="c-libgpgmepp">libgpgmepp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqgpgme">
-        <term><filename class="libraryfile">libqgpgme.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling GPG operations in
-            <application>Qt</application> applications
-          </para>
-          <indexterm zone="gpgme libqgpgme">
-            <primary sortas="c-libqgpgme">libqgpgme.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/iptables-kernel.xml
===================================================================
--- postlfs/security/iptables-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    [*] N<emphasis role='blue'>e</emphasis>twork packet filtering framework (Netfilter) ---&gt;          [NETFILTER]
-      [*] <emphasis role='blue'>A</emphasis>dvanced netfilter configuration                  [NETFILTER_ADVANCED]
-      <emphasis role='blue'>C</emphasis>ore Netfilter Configuration ---&gt;
-        &lt;*/M&gt; N<emphasis role='blue'>e</emphasis>tfilter connection tracking support               [NF_CONNTRACK]
-        &lt;*/M&gt; N<emphasis role='blue'>e</emphasis>tfilter Xtables support (required for ip_tables)
-                                                        ...  [NETFILTER_XTABLES]
-        &lt;*/M&gt;   <emphasis role='blue'>L</emphasis>OG target support                     [NETFILTER_XT_TARGET_LOG]
-      <emphasis role='blue'>I</emphasis>P: Netfilter Configuration ---&gt;
-        &lt;*/M&gt; <emphasis role='blue'>I</emphasis>P tables support (required for filtering/masq/NAT)
-                                                           ...  [IP_NF_IPTABLES]</screen>
Index: postlfs/security/iptables.xml
===================================================================
--- postlfs/security/iptables.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/iptables.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,1029 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-security-iptables">
+<?dbhtml filename="iptables.html" dir="postlfs"?>
+<title>Installing iptables-&iptables-version;</title>
 
-  <!ENTITY iptables-download-http "https://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.xz">
-  <!ENTITY iptables-download-ftp  " ">
-  <!ENTITY iptables-md5sum        "5eaa3bb424dd3a13c98c0cb026314029">
-  <!ENTITY iptables-size          "628 KB">
-  <!ENTITY iptables-buildsize     "16 MB">
-  <!ENTITY iptables-time          "0.1 SBU">
-]>
+<para>The next part of this chapter deals with firewalling.  The
+principle firewalling tool for Linux, as of the 2.4 kernel series, is
+iptables.  It replaces ipchains from the 2.2 series and ipfwadm from the
+2.0 series. You will need to install iptables if you intend on
+using any form of firewalling.</para>
 
-<sect1 id="iptables" xreflabel="iptables-&iptables-version;">
-  <?dbhtml filename="iptables.html"?>
-
-
-  <title>iptables-&iptables-version;</title>
-
-  <indexterm zone="iptables">
-    <primary sortas="a-iptables">iptables</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to iptables</title>
-
-    <para>
-      <application>iptables</application> is a userspace command line program
-      used to configure the Linux 2.4 and later kernel packet filtering ruleset.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&iptables-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&iptables-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &iptables-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &iptables-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &iptables-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &iptables-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">iptables Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-<!--      <xref linkend="nftables"/>, -->
-      <xref linkend="libpcap"/> (required for BPF compiler or nfsynproxy support),
-      <ulink url="https://github.com/tadamdam/bpf-utils">bpf-utils</ulink>
-      (required for Berkeley 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/nftables/">nftables</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="iptables-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      A firewall in Linux is accomplished through the netfilter interface. To
-      use <application>iptables</application> to configure netfilter, the
-      following kernel configuration parameters are required:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="iptables-kernel.xml"/>
-
-    <para>
-      Include any connection tracking protocols that will be used, as well as
-      any protocols that you wish to use for match support under the
-      "Core Netfilter Configuration" section. The above options are enough
-      for running <xref linkend="fw-persFw-ipt"/> below.
-    </para>
-
-    <indexterm zone="iptables iptables-kernel">
-      <primary sortas="d-iptables">iptables</primary>
-    </indexterm>
-
-  </sect2>
-
-    <sect2 role="installation">
-      <title>Installation of iptables</title>
-
-    <note>
-      <para>
-        The installation below does not include building some specialized
-        extension libraries which require the raw headers in the
-        <application>Linux</application> source code. If you wish to build the
-        additional extensions (if you aren't sure, then you probably don't), you
-        can look at the <filename>INSTALL</filename> file to see an example of
-        how to change the <parameter>KERNEL_DIR=</parameter> parameter to point
-        at the <application>Linux</application> source code. Note that if you
-        upgrade the kernel version, you may also need to recompile
-        <application>iptables</application> and that the BLFS team has not
-        tested using the raw kernel headers.
-      </para>
-    </note>
-
-    <para>
-      Install <application>iptables</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --disable-nftables \
-            --enable-libipq    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!-- there is a iptables-test.py script which seems to run a
-      lot of tests. Unfortunately, success rate is 50% only. Needs
-      to be clarified how to use and which prerequisites are required
-      to run to 100%. Contacted Shekhar Sharma for that (Dec'19),
-      waiting for answer (thomas). -->
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-nftables</parameter>: This switch disables building
-      nftables compatibility. <!--Omit this switch if you have installed
-      <xref linkend="nftables"/>.-->
-    </para>
-
-    <para>
-      <parameter>--enable-libipq</parameter>: This switch enables building
-      of <filename class="libraryfile">libipq.so</filename> which
-      can be used by some packages outside of BLFS.
-    </para>
-
-    <para>
-      <option>--enable-nfsynproxy</option>: This switch enables installation
-      of <application>nfsynproxy</application> SYNPROXY configuration tool.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring iptables</title>
-<!--
-    <note>
-      <para>
-        If you intend to use <xref linkend="firewalld"/> to configure your
-        firewall rules, you should not use the example configurations provided
-        here, nor should you enable the
-        <phrase revision="sysv">bootscript.</phrase>
-        <phrase revision="systemd">systemd unit.</phrase>
-      </para>
-    </note>
--->
-    <note>
-      <para>
-        In the following example configurations, <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>
-
-    <sect3 id="fw-persFw-ipt"
-    xreflabel="Creating a Personal Firewall With iptables">
-      <title>Personal Firewall</title>
-
-      <para>
-        A Personal Firewall is designed to let you access all the
-        services offered on the Internet while keeping your computer secure and
-        your data private.
-      </para>
-
-      <para>
-        Below is a slightly modified version of Rusty Russell's
-        recommendation from the <ulink
-        url="https://www.netfilter.org/documentation/HOWTO/packet-filtering-HOWTO.html">
-        Linux 2.4 Packet Filtering HOWTO</ulink>. It is still applicable
-        to the Linux 6.x kernels.
-      </para>
-
-<screen role="root" revision="sysv"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/rc.d/rc.iptables &lt;&lt; "EOF"
-<literal>#!/bin/sh
-
-# Begin rc.iptables
-
-# Insert connection-tracking modules
-# (not needed if built into the kernel)
-modprobe nf_conntrack
-modprobe xt_LOG
-
-# Enable broadcast echo Protection
-echo 1 &gt; /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts
-
-# Disable Source Routed Packets
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/accept_source_route
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/accept_source_route
-
-# Enable TCP SYN Cookie Protection
-echo 1 &gt; /proc/sys/net/ipv4/tcp_syncookies
-
-# Disable ICMP Redirect Acceptance
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/accept_redirects
-
-# Do not send Redirect Messages
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/send_redirects
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/send_redirects
-
-# Drop Spoofed Packets coming in on an interface, where responses
-# would result in the reply going out a different interface.
-echo 1 &gt; /proc/sys/net/ipv4/conf/all/rp_filter
-echo 1 &gt; /proc/sys/net/ipv4/conf/default/rp_filter
-
-# Log packets with impossible addresses.
-echo 1 &gt; /proc/sys/net/ipv4/conf/all/log_martians
-echo 1 &gt; /proc/sys/net/ipv4/conf/default/log_martians
-
-# be verbose on dynamic ip-addresses  (not needed in case of static IP)
-echo 2 &gt; /proc/sys/net/ipv4/ip_dynaddr
-
-# disable Explicit Congestion Notification
-# too many routers are still ignorant
-echo 0 &gt; /proc/sys/net/ipv4/tcp_ecn
-
-# Set a known state
-iptables -P INPUT   DROP
-iptables -P FORWARD DROP
-iptables -P OUTPUT  DROP
-
-# These lines are here in case rules are already in place and the
-# script is ever rerun on the fly. We want to remove all rules and
-# pre-existing user defined chains before we implement new rules.
-iptables -F
-iptables -X
-iptables -Z
-
-iptables -t nat -F
-
-# Allow local-only connections
-iptables -A INPUT  -i lo -j ACCEPT
-
-# Free output on any interface to any ip for any service
-# (equal to -P ACCEPT)
-iptables -A OUTPUT -j ACCEPT
-
-# Permit answers on already established connections
-# and permit new connections related to established ones
-# (e.g. port mode ftp)
-iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
-
-# Drop any incoming MULTICAST or BROADCAST packet before logging:
-# The box outputs several of them when using netbios or mDNS, and those
-# appear immediately as incoming, which clutters the log.
-iptables -A INPUT -m addrtype --dst-type BROADCAST,MULTICAST -j DROP
-
-# Log everything else.
-iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
-
-# End $rc_base/rc.iptables</literal>
-EOF
-chmod 700 /etc/rc.d/rc.iptables</userinput></screen>
-
-<screen role="root" revision="systemd"><?dbfo keep-together="auto"?><userinput>install -v -dm755 /etc/systemd/scripts
-
-cat &gt; /etc/systemd/scripts/iptables &lt;&lt; "EOF"
-<literal>#!/bin/sh
-
-# Begin /etc/systemd/scripts/iptables
-
-# Insert connection-tracking modules
-# (not needed if built into the kernel)
-modprobe nf_conntrack
-modprobe xt_LOG
-
-# Enable broadcast echo Protection
-echo 1 &gt; /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts
-
-# Disable Source Routed Packets
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/accept_source_route
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/accept_source_route
-
-# Enable TCP SYN Cookie Protection
-echo 1 &gt; /proc/sys/net/ipv4/tcp_syncookies
-
-# Disable ICMP Redirect Acceptance
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/accept_redirects
-
-# Do not send Redirect Messages
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/send_redirects
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/send_redirects
-
-# Drop Spoofed Packets coming in on an interface, where responses
-# would result in the reply going out a different interface.
-echo 1 &gt; /proc/sys/net/ipv4/conf/all/rp_filter
-echo 1 &gt; /proc/sys/net/ipv4/conf/default/rp_filter
-
-# Log packets with impossible addresses.
-echo 1 &gt; /proc/sys/net/ipv4/conf/all/log_martians
-echo 1 &gt; /proc/sys/net/ipv4/conf/default/log_martians
-
-# be verbose on dynamic ip-addresses  (not needed in case of static IP)
-echo 2 &gt; /proc/sys/net/ipv4/ip_dynaddr
-
-# disable Explicit Congestion Notification
-# too many routers are still ignorant
-echo 0 &gt; /proc/sys/net/ipv4/tcp_ecn
-
-# Set a known state
-iptables -P INPUT   DROP
-iptables -P FORWARD DROP
-iptables -P OUTPUT  DROP
-
-# These lines are here in case rules are already in place and the
-# script is ever rerun on the fly. We want to remove all rules and
-# pre-existing user defined chains before we implement new rules.
-iptables -F
-iptables -X
-iptables -Z
-
-iptables -t nat -F
-
-# Allow local-only connections
-iptables -A INPUT  -i lo -j ACCEPT
-
-# Free output on any interface to any ip for any service
-# (equal to -P ACCEPT)
-iptables -A OUTPUT -j ACCEPT
-
-# Permit answers on already established connections
-# and permit new connections related to established ones
-# (e.g. port mode ftp)
-iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
-
-# Log everything else.
-iptables -A INPUT -j LOG --log-prefix "FIREWALL:INPUT "
-
-# End /etc/systemd/scripts/iptables</literal>
-EOF
-chmod 700 /etc/systemd/scripts/iptables</userinput></screen>
-
-      <para>
-        This script is quite simple, it drops all traffic coming
-        into your computer that wasn't initiated from your computer, but
-        as long as you are simply surfing the Internet you are unlikely
-        to exceed its limits.
-      </para>
-
-      <para>
-        If you frequently encounter certain delays at accessing
-        FTP servers, take a look at <xref linkend="fw-BB-4-ipt"/>.
-      </para>
-
-      <para>
-        Even if you have daemons or services running on your system,
-        these will be inaccessible everywhere but from your computer itself.
-        If you want to allow access to services on your machine, such as
-        <command>ssh</command> or <command>ping</command>, take a look at
-        <xref linkend="fw-busybox-ipt"/>.
-      </para>
-
-    </sect3>
-
-    <sect3 id="fw-masqRouter-ipt"
-     xreflabel="Creating a Masquerading Router With iptables">
-      <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>. 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>.
-        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>
-
-<screen role="root" revision="sysv"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/rc.d/rc.iptables &lt;&lt; "EOF"
-<literal>#!/bin/sh
-
-# Begin rc.iptables
-
-echo
-echo "You're using the example configuration for a setup of a firewall"
-echo "from Beyond Linux From Scratch."
-echo "This example is far from being complete, it is only meant"
-echo "to be a reference."
-echo "Firewall security is a complex issue, that exceeds the scope"
-echo "of the configuration rules below."
-echo "You can find additional information"
-echo "about firewalls in Chapter 4 of the BLFS book."
-echo "https://www.&lfs-domainname;/blfs"
-echo
-
-# Insert iptables modules (not needed if built into the kernel).
-
-modprobe nf_conntrack
-modprobe nf_conntrack_ftp
-modprobe xt_conntrack
-modprobe xt_LOG
-modprobe xt_state
-
-# Enable broadcast echo Protection
-echo 1 &gt; /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts
-
-# Disable Source Routed Packets
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/accept_source_route
-
-# Enable TCP SYN Cookie Protection
-echo 1 &gt; /proc/sys/net/ipv4/tcp_syncookies
-
-# Disable ICMP Redirect Acceptance
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/accept_redirects
-
-# Don't send Redirect Messages
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/send_redirects
-
-# Drop Spoofed Packets coming in on an interface where responses
-# would result in the reply going out a different interface.
-echo 1 &gt; /proc/sys/net/ipv4/conf/default/rp_filter
-
-# Log packets with impossible addresses.
-echo 1 &gt; /proc/sys/net/ipv4/conf/all/log_martians
-
-# Be verbose on dynamic ip-addresses  (not needed in case of static IP)
-echo 2 &gt; /proc/sys/net/ipv4/ip_dynaddr
-
-# Disable Explicit Congestion Notification
-# Too many routers are still ignorant
-echo 0 &gt; /proc/sys/net/ipv4/tcp_ecn
-
-# Set a known state
-iptables -P INPUT   DROP
-iptables -P FORWARD DROP
-iptables -P OUTPUT  DROP
-
-# These lines are here in case rules are already in place and the
-# script is ever rerun on the fly. We want to remove all rules and
-# pre-existing user defined chains before we implement new rules.
-iptables -F
-iptables -X
-iptables -Z
-
-iptables -t nat -F
-
-# Allow local connections
-iptables -A INPUT  -i lo -j ACCEPT
-iptables -A OUTPUT -o lo -j ACCEPT
-
-# Allow forwarding if the initiated on the intranet
-iptables -A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
-iptables -A FORWARD ! -i WAN1 -m conntrack --ctstate NEW       -j ACCEPT
-
-# Do masquerading
-# (not needed if intranet is not using private ip-addresses)
-iptables -t nat -A POSTROUTING -o WAN1 -j MASQUERADE
-
-# Log everything for debugging
-# (last of all rules, but before policy rules)
-iptables -A INPUT   -j LOG --log-prefix "FIREWALL:INPUT "
-iptables -A FORWARD -j LOG --log-prefix "FIREWALL:FORWARD "
-iptables -A OUTPUT  -j LOG --log-prefix "FIREWALL:OUTPUT "
-
-# Enable IP Forwarding
-echo 1 &gt; /proc/sys/net/ipv4/ip_forward</literal>
-EOF
-chmod 700 /etc/rc.d/rc.iptables</userinput></screen>
-
-<screen role="root" revision="systemd"><?dbfo keep-together="auto"?><userinput>install -v -dm755 /etc/systemd/scripts
-
-cat &gt; /etc/systemd/scripts/iptables &lt;&lt; "EOF"
-<literal>#!/bin/sh
-
-# Begin /etc/systemd/scripts/iptables
-
-echo
-echo "You're using the example configuration for a setup of a firewall"
-echo "from Beyond Linux From Scratch."
-echo "This example is far from being complete, it is only meant"
-echo "to be a reference."
-echo "Firewall security is a complex issue, that exceeds the scope"
-echo "of the configuration rules below."
-
-echo "You can find additional information"
-echo "about firewalls in Chapter 4 of the BLFS book."
-echo "https://www.&lfs-domainname;/blfs"
-echo
-
-# Insert iptables modules (not needed if built into the kernel).
-
-modprobe nf_conntrack
-modprobe nf_conntrack_ftp
-modprobe xt_conntrack
-modprobe xt_LOG
-modprobe xt_state
-
-# Enable broadcast echo Protection
-echo 1 &gt; /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts
-
-# Disable Source Routed Packets
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/accept_source_route
-
-# Enable TCP SYN Cookie Protection
-echo 1 &gt; /proc/sys/net/ipv4/tcp_syncookies
-
-# Disable ICMP Redirect Acceptance
-echo 0 &gt; /proc/sys/net/ipv4/conf/all/accept_redirects
-
-# Don't send Redirect Messages
-echo 0 &gt; /proc/sys/net/ipv4/conf/default/send_redirects
-
-# Drop Spoofed Packets coming in on an interface where responses
-# would result in the reply going out a different interface.
-echo 1 &gt; /proc/sys/net/ipv4/conf/default/rp_filter
-
-# Log packets with impossible addresses.
-echo 1 &gt; /proc/sys/net/ipv4/conf/all/log_martians
-
-# Be verbose on dynamic ip-addresses  (not needed in case of static IP)
-echo 2 &gt; /proc/sys/net/ipv4/ip_dynaddr
-
-# Disable Explicit Congestion Notification
-# Too many routers are still ignorant
-echo 0 &gt; /proc/sys/net/ipv4/tcp_ecn
-
-# Set a known state
-iptables -P INPUT   DROP
-iptables -P FORWARD DROP
-iptables -P OUTPUT  DROP
-
-# These lines are here in case rules are already in place and the
-# script is ever rerun on the fly. We want to remove all rules and
-# pre-existing user defined chains before we implement new rules.
-iptables -F
-iptables -X
-iptables -Z
-
-iptables -t nat -F
-
-# Allow local connections
-iptables -A INPUT  -i lo -j ACCEPT
-iptables -A OUTPUT -o lo -j ACCEPT
-
-# Allow forwarding if the initiated on the intranet
-iptables -A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
-iptables -A FORWARD ! -i WAN1 -m conntrack --ctstate NEW       -j ACCEPT
-
-# Do masquerading
-# (not needed if intranet is not using private ip-addresses)
-iptables -t nat -A POSTROUTING -o WAN1 -j MASQUERADE
-
-# Log everything for debugging
-# (last of all rules, but before policy rules)
-iptables -A INPUT   -j LOG --log-prefix "FIREWALL:INPUT "
-iptables -A FORWARD -j LOG --log-prefix "FIREWALL:FORWARD "
-iptables -A OUTPUT  -j LOG --log-prefix "FIREWALL:OUTPUT "
-
-# Enable IP Forwarding
-echo 1 &gt; /proc/sys/net/ipv4/ip_forward
-
-# The following sections allow inbound packets for specific examples
-# Uncomment the example lines and adjust as necessary
-
-# Allow ping on the external interface
-#iptables -A INPUT  -p icmp -m icmp --icmp-type echo-request -j ACCEPT
-#iptables -A OUTPUT -p icmp -m icmp --icmp-type echo-reply   -j ACCEPT
-
-# Reject ident packets with TCP reset to avoid delays with FTP or IRC
-#iptables -A INPUT  -p tcp --dport 113 -j REJECT --reject-with tcp-reset
-
-# Allow HTTP and HTTPS to 192.168.0.2
-#iptables -A PREROUTING -t nat -i WAN1 -p tcp --dport 80 -j DNAT --to 192.168.0.2
-#iptables -A PREROUTING -t nat -i WAN1 -p tcp --dport 443 -j DNAT --to 192.168.0.2
-#iptables -A FORWARD -p tcp -d 192.168.0.2 --dport 80 -j ACCEPT
-#iptables -A FORWARD -p tcp -d 192.168.0.2 --dport 443 -j ACCEPT
-
-# End /etc/systemd/scripts/iptables</literal>
-EOF
-chmod 700 /etc/systemd/scripts/iptables</userinput></screen>
-
-      <para>
-        With this script your intranet should be reasonably secure
-        against external attacks. No one should be able to setup a new
-        connection to any internal service and, if it's masqueraded,
-        makes your intranet invisible to the Internet. Furthermore, your
-        firewall should be relatively safe because there are no services
-        running that a cracker could attack.
-      </para>
-
-    </sect3>
-
-    <sect3 id="fw-busybox-ipt" xreflabel="Creating a BusyBox With iptables">
-      <title>BusyBox</title>
-
-      <para>
-        This scenario isn't too different from the <xref
-        linkend="fw-masqRouter-ipt"/>, but additionally offers some
-        services to your intranet. Examples of this can be when
-        you want to administer your firewall from another host on
-        your intranet or use it as a proxy or a name server.
-      </para>
-
-      <note>
-        <para>
-          Outlining specifically how to protect a server that
-          offers services on the Internet goes far beyond the scope of
-          this document. See the references in <xref linkend="fw-extra-info"/>
-          for more information.
-        </para>
-      </note>
-
-      <para>
-        Be cautious. Every service you have enabled makes your
-        setup more complex and your firewall less secure. You are
-        exposed to the risks of misconfigured services or running
-        a service with an exploitable bug. A firewall should generally
-        not run any extra services.  See the introduction to the
-        <xref linkend="fw-masqRouter-ipt"/> for some more details.
-      </para>
-
-      <para>
-        If you want to add services such as internal Samba or
-        name servers that do not need to access the Internet themselves,
-        the additional statements are quite simple and should still be
-        acceptable from a security standpoint. Just add the following lines
-        into the script <emphasis>before</emphasis> the logging rules.
-      </para>
-
-<screen><literal>iptables -A INPUT  -i ! WAN1  -j ACCEPT
-iptables -A OUTPUT -o ! WAN1  -j ACCEPT</literal></screen>
-
-      <para>
-        If daemons, such as squid, have to access the Internet
-        themselves, you could open OUTPUT generally and restrict
-        INPUT.
-      </para>
-
-<screen><literal>iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
-iptables -A OUTPUT -j ACCEPT</literal></screen>
-
-      <para>
-        However, it is generally not advisable to leave OUTPUT
-        unrestricted. You lose any control over trojans who would like
-        to "call home", and a bit of redundancy in case you've
-        (mis-)configured a service so that it broadcasts its existence
-        to the world.
-      </para>
-
-      <para>
-        To accomplish this, you should restrict INPUT and OUTPUT
-        on all ports except those that it's absolutely necessary to have
-        open. Which ports you have to open depends on your needs: mostly
-        you will find them by looking for failed accesses in your log
-        files.
-      </para>
-
-      <itemizedlist spacing="compact" role='iptables'>
-        <title>Have a Look at the Following Examples:</title>
-        <listitem>
-          <para>
-            Squid is caching the web:
-          </para>
-
-<screen><literal>iptables -A OUTPUT -p tcp --dport 80 -j ACCEPT
-iptables -A INPUT  -p tcp --sport 80 -m conntrack --ctstate ESTABLISHED \
-  -j ACCEPT</literal></screen>
-
-        </listitem>
-        <listitem>
-          <para>
-            Your caching name server (e.g., named) does its lookups via UDP:
-          </para>
-
-<screen><literal>iptables -A OUTPUT -p udp --dport 53 -j ACCEPT</literal></screen>
-
-        </listitem>
-        <listitem>
-          <para>
-            You want to be able to ping your computer to ensure it's still
-            alive:
-          </para>
-
-<screen><literal>iptables -A INPUT  -p icmp -m icmp --icmp-type echo-request -j ACCEPT
-iptables -A OUTPUT -p icmp -m icmp --icmp-type echo-reply   -j ACCEPT</literal></screen>
-
-        </listitem>
-        <listitem>
-          <para id='fw-BB-4-ipt' xreflabel="BusyBox with iptables example number 4">
-            If you are frequently accessing FTP servers or enjoy chatting, you
-            might notice delays because some implementations of these daemons
-            query an identd daemon on your system to obtain usernames. Although
-            there's really little harm in this, having an identd running is not
-            recommended because many security experts feel the service gives
-            out too much additional information.
-          </para>
-
-          <para>
-            To avoid these delays you could reject the requests with a
-            'tcp-reset' response:
-          </para>
-
-<screen><literal>iptables -A INPUT  -p tcp --dport 113 -j REJECT --reject-with tcp-reset</literal></screen>
-
-        </listitem>
-        <listitem>
-          <para>
-            To log and drop invalid packets (packets
-            that came in after netfilter's timeout or some types of
-            network scans) insert these rules at the top of the chain:
-          </para>
-
-<screen><literal>iptables -I INPUT 0 -p tcp -m conntrack --ctstate INVALID \
-  -j LOG --log-prefix "FIREWALL:INVALID "
-iptables -I INPUT 1 -p tcp -m conntrack --ctstate INVALID -j DROP</literal></screen>
-
-        </listitem>
-        <listitem>
-          <para>
-            Anything coming from the outside should not have a
-            private address, this is a common attack called IP-spoofing:
-          </para>
-
-<screen><literal>iptables -A INPUT -i WAN1 -s 10.0.0.0/8     -j DROP
-iptables -A INPUT -i WAN1 -s 172.16.0.0/12  -j DROP
-iptables -A INPUT -i WAN1 -s 192.168.0.0/16 -j DROP</literal></screen>
-
-          <para>
-            There are other addresses that you may also want to drop:
-            0.0.0.0/8, 127.0.0.0/8, 224.0.0.0/3 (multicast and
-            experimental), 169.254.0.0/16 (Link Local Networks), and
-            192.0.2.0/24 (IANA defined test network).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            If your firewall is a DHCP client, you need to allow those packets:
-          </para>
-
-<screen><literal>iptables -A INPUT  -i WAN1 -p udp -s 0.0.0.0 --sport 67 \
-   -d 255.255.255.255 --dport 68 -j ACCEPT</literal></screen>
-
-        </listitem>
-        <listitem>
-          <para>
-            To simplify debugging and be fair to anyone who'd like
-            to access a service you have disabled, purposely or by mistake,
-            you could REJECT those packets that are dropped.
-          </para>
-
-          <para>
-            Obviously this must be done directly after logging as the very
-            last lines before the packets are dropped by policy:
-          </para>
-
-<screen><literal>iptables -A INPUT -j REJECT</literal></screen>
-
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        These are only examples to show you some of the capabilities
-        of the firewall code in Linux. Have a look at the man page of iptables.
-        There you will find much more information. The port numbers needed for
-        this can be found in <filename>/etc/services</filename>, in case you
-        didn't find them by trial and error in your log file.
-      </para>
-
-    </sect3>
-
-    <sect3  id="iptables-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To set up the iptables firewall at boot, install the
-        <filename>/etc/rc.d/init.d/iptables</filename> init script included
-        in the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To set up the iptables firewall at boot, install the
-        <filename>iptables.service</filename> unit included in the
-        <xref linkend="systemd-units"/> package.
-      </para>
-
-      <indexterm zone="iptables iptables-init">
-        <primary sortas="f-iptables">iptables</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-iptables</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>
-          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
-        </seg>
-        <seg>
-          libip4tc.so,
-          libip6tc.so,
-          libipq.so,
-          libiptc.so,
-          and libxtables.so
-        </seg>
-        <seg>
-          /lib/xtables and
-          /usr/include/libiptc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="iptables-prog">
-        <term><command>iptables</command></term>
-        <listitem>
-          <para>
-            is used to set up, maintain, and inspect the tables of
-            IP packet filter rules in the Linux kernel
-          </para>
-          <indexterm zone="iptables iptables-prog">
-            <primary sortas="b-iptables">iptables</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            is used to restore IP Tables from data specified on
-            STDIN. Use I/O redirection provided by your
-            shell to read from a file
-          </para>
-          <indexterm zone="iptables iptables-restore">
-            <primary sortas="b-iptables-restore">iptables-restore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iptables-save">
-        <term><command>iptables-save</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="iptables iptables-save">
-            <primary sortas="b-iptables-save">iptables-save</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iptables-xml">
-        <term><command>iptables-xml</command></term>
-        <listitem>
-          <para>
-            is used to convert the output of
-            <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>
-          </para>
-          <indexterm zone="iptables iptables-xml">
-            <primary sortas="b-iptables-xml">iptables-xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ip6tables">
-        <term><command>ip6tables*</command></term>
-        <listitem>
-          <para>
-            are a set of commands for IPV6 that parallel the iptables
-            commands above
-          </para>
-          <indexterm zone="iptables ip6tables">
-            <primary sortas="b-ip6tables">ip6tables</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsynproxy">
-        <term><command>nfsynproxy</command></term>
-        <listitem>
-          <para>
-            (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
-          </para>
-          <indexterm zone="iptables nfsynproxy">
-            <primary sortas="b-nfsynproxy">nfsynproxy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xtables-multi">
-        <term><command>xtables-multi</command></term>
-        <listitem>
-          <para>
-            is a binary that behaves according to the name it is called by
-          </para>
-          <indexterm zone="iptables xtables-multi">
-            <primary sortas="b-xtables-multi">xtables-multi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&iptables-intro;
+&iptables-inst;
+&iptables-exp;
+&iptables-desc;
 
 </sect1>
Index: postlfs/security/iptables/iptables-desc.xml
===================================================================
--- postlfs/security/iptables/iptables-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/iptables/iptables-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Contents</title>
+
+<para>The iptables-package contains <userinput>iptables,
+ip6tables,</userinput> and some libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>iptables</title>
+<para>is used to set up, maintain, and inspect the tables of IP packet
+filter rules in the Linux kernel.</para>
+</sect3>
+
+<sect3><title>iptables-save, ~-restore</title>
+<para>to save and to restore your elabourated set of chains and rules.
+Until iptables-1.2.5 they were declared experimental.</para>
+</sect3>
+
+<sect3 id="ip6tables" xreflabel="ip6tables"><title>ip6tables</title>
+<para>This is the same as iptables but for use with IPv6.  As of v1.2.5,
+it is not as complete as the standard IPv4 version, especially with
+regard to some of the modules.</para>
+</sect3>
+
+<sect3><title>libip*.so</title>
+<para>These are various modules (implemented as dynamic libraries) which
+extend the the core functionality of iptables.</para>
+</sect3>
+
+</sect2>
Index: postlfs/security/iptables/iptables-exp.xml
===================================================================
--- postlfs/security/iptables/iptables-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/iptables/iptables-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><userinput>make BINDIR=/usr/sbin LIBDIR=/usr/lib MANDIR=/usr/share/man &amp;&amp;
+make BINDIR=/usr/sbin LIBDIR=/usr/lib MANDIR=/usr/share/man install:</userinput></screen></para>
+
+<para>Compiles and installs iptables into the <filename>/usr</filename>
+hierarchy instead of <filename>/usr/local</filename>.</para>
+
+</sect2>
+
Index: postlfs/security/iptables/iptables-inst.xml
===================================================================
--- postlfs/security/iptables/iptables-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/iptables/iptables-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of iptables</title>
+
+<para>Install iptables by running the following commands:</para>
+
+<para><screen><userinput>make BINDIR=/usr/sbin LIBDIR=/usr/lib MANDIR=/usr/share/man &amp;&amp;
+make BINDIR=/usr/sbin LIBDIR=/usr/lib MANDIR=/usr/share/man install</userinput></screen></para>
+
+</sect2>
+
Index: postlfs/security/iptables/iptables-intro.xml
===================================================================
--- postlfs/security/iptables/iptables-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/iptables/iptables-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,36 @@
+<sect2>
+<title>Introduction to iptables</title>
+
+<screen>Download location:		&iptables-download;
+Version used:			&iptables-version;
+Package size:			&iptables-size;
+Estimated Disk space required:	&iptables-buildsize;</screen>
+
+<para>To use firewalling, as well as installing iptables, you will need
+to configure the relevant options into your kernel.  This is discussed
+in the next part of this chapter - <xref linkend="postlfs-security-fw-kernel"/>.</para>
+
+<para>If you intend to use IPv6 you might consider extending the kernel
+by running <userinput>make patch-o-matic</userinput> in the top-level
+directory of the sources of iptables.  If you are going to do this, on a
+freshly untarred kernel, you need to run <userinput>yes "" | make config
+&amp;&amp; make dep</userinput> first because otherwise the
+patch-o-matic command is likely to fail while setting up
+some dependencies.</para>
+
+<para>If you are going to patch the kernel, you need to do it before you
+compile iptables, because during the compilation, the kernel source tree
+is checked (if it is available at <filename>/usr/src/linux</filename> to
+see which features are available.  Support will only be compiled into
+iptables for the features recognised at compile-time.  Applying a kernel
+patch may result in errors, often because the hooks for the patches
+have changed or because the runme script doesn't recognize that a patch
+has already been incorporated.</para>
+
+<para>Note that for most people, patching the kernel is unnecessary.
+With the later 2.4.x kernels, most functionality is already available
+and those who need to patch it are generally those who need a specific
+feature; if you don't know why you need to patch the kernel, you're 
+unlikely to need to!</para>
+
+</sect2>
Index: postlfs/security/iptables/iptables.ent
===================================================================
--- postlfs/security/iptables/iptables.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/iptables/iptables.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY iptables SYSTEM "../iptables.xml">
+<!ENTITY iptables-intro SYSTEM "iptables-intro.xml">
+<!ENTITY iptables-inst SYSTEM "iptables-inst.xml">
+<!ENTITY iptables-exp SYSTEM "iptables-exp.xml">
+<!ENTITY iptables-desc SYSTEM "iptables-desc.xml">
+<!ENTITY iptables-buildsize "approximately 3.0 MB">
+<!ENTITY iptables-version "1.2.5">
+<!ENTITY iptables-download "http://www.iptables.org/files/iptables-1.2.5.tar.bz2">
+<!ENTITY iptables-size "236 KB">
Index: stlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcap-download-http "&kernel-dl;/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-  <!ENTITY libcap-download-ftp  " ">
-  <!ENTITY libcap-md5sum        "4667bacb837f9ac4adb4a1a0266f4b65">
-  <!ENTITY libcap-size          "188 KB">
-  <!ENTITY libcap-buildsize     "2.2 MB">
-  <!ENTITY libcap-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libcap-pam" xreflabel="libcap-&libcap-version; with PAM">
-  <?dbhtml filename="libcap.html"?>
-
-
-  <title>libcap-&libcap-version; with PAM</title>
-
-  <indexterm zone="libcap-pam">
-    <primary sortas="a-libcap-pam">libcap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcap with PAM</title>
-
-    <para>
-      The <application>libcap</application> package was installed in
-      LFS, but if <application>Linux-PAM</application> support is desired,
-      the PAM module must be built (after installation of
-      <application>Linux-PAM</application>).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="linux-pam"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcap</title>
-
-    <note>
-      <para>
-        If you are upgrading libcap from a previous version, use the
-        instructions in
-        <ulink url="&lfs-root;/chapter08/libcap.html">
-          LFS libcap page
-        </ulink> to upgrade libcap. If <xref linkend="linux-pam"/> has been
-        built, the PAM module will automatically be built too.
-      </para>
-    </note>
-
-    <para>
-      Install <application>libcap</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make -C pam_cap</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>install -v -m755 pam_cap/pam_cap.so /usr/lib/security &amp;&amp;
-install -v -m644 pam_cap/capability.conf /etc/security</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Libcap</title>
-
-    <para>
-      In order to allow <application>Linux-PAM</application> to grant
-      privileges based on POSIX capabilities, you need to add the libcap module
-      to the beginning of the <filename>/etc/pam.d/system-auth</filename> file.
-      Make the required edits with the following commands:
-    </para>
-
-<screen role="root"><userinput>mv -v /etc/pam.d/system-auth{,.bak} &amp;&amp;
-cat &gt; /etc/pam.d/system-auth &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/system-auth
-
-auth      optional    pam_cap.so</literal>
-EOF
-tail -n +3 /etc/pam.d/system-auth.bak &gt;&gt; /etc/pam.d/system-auth</userinput></screen>
-
-    <para>
-      Additionally, you'll need to modify the
-      <filename>/etc/security/capability.conf</filename> file to grant
-      necessary privileges to users, and utilize the <command>setcap</command>
-      utility to set capabilities on specific utilities as needed. See
-      <command>man 8 setcap</command> and
-      <command>man 3 cap_from_text</command> for additional information.
-    </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>pam_cap.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liboauth-download-http "&sourceforge-dl;/liboauth/liboauth-&liboauth-version;.tar.gz">
-  <!ENTITY liboauth-download-ftp  " ">
-  <!ENTITY liboauth-md5sum        "689b46c2b3ab1a39735ac33f714c4f7f">
-  <!ENTITY liboauth-size          "496 KB">
-  <!ENTITY liboauth-buildsize     "3.5 MB">
-  <!ENTITY liboauth-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liboauth" xreflabel="liboauth-&liboauth-version;">
-  <?dbhtml filename="liboauth.html"?>
-
-
-  <title>liboauth-&liboauth-version;</title>
-
-  <indexterm zone="liboauth">
-    <primary sortas="a-liboauth">liboauth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liboauth</title>
-
-    <para>
-      <application>liboauth</application> is a collection of POSIX-C functions
-      implementing the OAuth Core RFC 5849 standard. Liboauth provides functions
-      to escape and encode parameters according to OAuth specification and
-      offers high-level functionality to sign requests or verify OAuth signatures
-      as well as perform HTTP requests.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liboauth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liboauth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liboauth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liboauth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liboauth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liboauth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch for use with openssl: <ulink url=
-            "&patch-root;/liboauth-&liboauth-version;-openssl-1.1.0-3.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liboauth Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nss"/> and
-      <xref linkend="doxygen"/> (to build documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liboauth</title>
-
-    <para>
-      Apply a patch for the current version of openssl:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../liboauth-&liboauth-version;-openssl-1.1.0-3.patch</userinput></screen>
-
-    <para>
-      Install <application>liboauth</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to build the documentation (needs <xref linkend="doxygen"/>),
-      issue:
-    </para>
-
-<screen remap="doc"><userinput>make dox</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have previously built the 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/liboauth-&liboauth-version; &amp;&amp;
-cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</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>
-      <option>--enable-nss</option>: Use this switch if you want to
-      use Mozilla NSS instead of <application>OpenSSL</application>.
-    </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>
-          liboauth.so
-        </seg>
-        <seg>
-          /usr/share/doc/liboauth-&liboauth-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liboauth-lib">
-        <term><filename class="libraryfile">liboauth.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to escape and encode strings according to
-            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
-          </para>
-          <indexterm zone="liboauth liboauth-lib">
-            <primary sortas="c-liboauth">liboauth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/libpwquality.xml
===================================================================
--- postlfs/security/libpwquality.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,243 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpwquality-download-http "https://github.com/libpwquality/libpwquality/releases/download/libpwquality-&libpwquality-version;/libpwquality-&libpwquality-version;.tar.bz2">
-  <!ENTITY libpwquality-download-ftp  " ">
-  <!ENTITY libpwquality-md5sum        "6b70e355269aef0b9ddb2b9d17936f21">
-  <!ENTITY libpwquality-size          "424 KB">
-  <!ENTITY libpwquality-buildsize     "5.4 MB">
-  <!ENTITY libpwquality-time          "0.1 SBU">
-]>
-
-<sect1 id="libpwquality" xreflabel="libpwquality-&libpwquality-version;">
-  <?dbhtml filename="libpwquality.html"?>
-
-
-  <title>libpwquality-&libpwquality-version;</title>
-
-  <indexterm zone="libpwquality">
-    <primary sortas="a-libpwquality">libpwquality</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpwquality</title>
-
-    <para>
-      The <application>libpwquality</application> package provides common
-      functions for password quality checking and also scoring them based on
-      their apparent randomness. The library also provides a function for
-      generating random passwords with good pronounceability.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpwquality-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpwquality-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpwquality-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpwquality-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpwquality-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpwquality-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libpwquality Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cracklib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="linux-pam"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpwquality</title>
-
-    <para>
-      Install <application>libpwquality</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                      \
-            --disable-static                   \
-            --with-securedir=/usr/lib/security \
-            --disable-python-bindings          &amp;&amp;
-make &amp;&amp;
-&build-wheel-cmd; $PWD/python</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;
-&install-wheel; pwquality</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-python-bindings</parameter>: This parameter
-      disables building Python bindings with the deprecated
-      <command>python3 setup.py build</command> command.  The explicit
-      instruction to build the Python 3 binding with the
-      <command>pip3 wheel</command> command is provided.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring libpwquality</title>
-
-    <para>
-      <application>libpwquality</application> is intended to be a
-      functional replacement for the now-obsolete
-      <filename>pam_cracklib.so</filename> PAM module. To configure the system
-      to use the <filename>pam_pwquality</filename> module, execute the
-      following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mv /etc/pam.d/system-password{,.orig} &amp;&amp;
-cat &gt; /etc/pam.d/system-password &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/system-password
-
-# check new passwords for strength (man pam_pwquality)
-password  required    pam_pwquality.so   authtok_type=UNIX retry=1 difok=1 \
-                                         minlen=8 dcredit=0 ucredit=0 \
-                                         lcredit=0 ocredit=0 minclass=1 \
-                                         maxrepeat=0 maxsequence=0 \
-                                         maxclassrepeat=0 gecoscheck=0 \
-                                         dictcheck=1 usercheck=1 \
-                                         enforcing=1 badwords="" \
-                                         dictpath=/usr/lib/cracklib/pw_dict
-
-# use yescrypt hash for encryption, use shadow, and try to use any
-# previously defined authentication token (chosen password) set by any
-# prior module.
-password  required    pam_unix.so        yescrypt shadow try_first_pass
-
-# End /etc/pam.d/system-password</literal>
-EOF
-</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pwscore and pwmake
-        </seg>
-        <seg>
-          pam_pwquality.so and libpwquality.so
-        </seg>
-        <seg>
-          /usr/lib/python3.11/site-packages/pwquality-&libpwquality-version;.dist-info
-          <!-- /etc/security was installed by Linux-PAM -->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pwmake">
-        <term><command>pwmake</command></term>
-        <listitem>
-          <para>
-            is a simple configurable tool for generating random
-            and relatively easily pronounceable passwords
-          </para>
-          <indexterm zone="libpwquality pwmake">
-            <primary sortas="b-pwmake">pwmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwscore">
-        <term><command>pwscore</command></term>
-        <listitem>
-          <para>
-            is a simple tool for checking quality of a password
-          </para>
-          <indexterm zone="libpwquality pwscore">
-            <primary sortas="b-pwscore">pwscore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpwquality-lib">
-        <term><filename class="libraryfile">libpwquality.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for checking the password quality
-          </para>
-          <indexterm zone="libpwquality libpwquality-lib">
-            <primary sortas="c-libpwquality">libpwquality.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pam_pwquality">
-        <term><filename class="libraryfile">pam_pwquality.so</filename></term>
-        <listitem>
-          <para>
-            is a <application>Linux PAM</application> module used to perform
-            password quality checking
-          </para>
-          <indexterm zone="libpwquality pam_pwquality">
-            <primary sortas="c-pam_pwquality">pam_pwquality.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/linux-pam-kernel.xml
===================================================================
--- postlfs/security/linux-pam-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  [*] <emphasis role='blue'>A</emphasis>uditing support                                                   [AUDIT]</screen>
Index: stlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,594 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "8ad1e72d1ff6480d8e0af658e2d7b768">
-  <!ENTITY linux-pam-size          "1.0 MB">
-  <!ENTITY linux-pam-buildsize     "39 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   "46dc9f9a27ef73a2fbe3b667877e88da">
-  <!ENTITY linux-pam-docs-size     "455 KB">
-  <!--
-  <!ENTITY debian-pam-docs         "http://debian.securedservers.com/kernel/pub/linux/libs/pam">
-  -->
-]>
-
-<sect1 id="linux-pam" xreflabel="Linux-PAM-&linux-pam-version;">
-  <?dbhtml filename="linux-pam.html"?>
-
-
-  <title>Linux-PAM-&linux-pam-version;</title>
-
-  <indexterm zone="linux-pam">
-    <primary sortas="a-Linux-PAM">Linux-PAM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Linux PAM</title>
-
-    <para>
-      The <application>Linux PAM</application> package contains
-      Pluggable Authentication Modules used by the local
-      system administrator to control how application programs authenticate
-      users.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&linux-pam-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&linux-pam-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &linux-pam-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &linux-pam-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &linux-pam-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &linux-pam-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-    <title>Optional Documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&linux-pam-docs-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &linux-pam-docs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &linux-pam-docs-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Linux PAM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="rpcsvc-proto"/>,
-      &berkeley-db;,
-      <ulink url="https://github.com/linux-audit/audit-userspace">libaudit</ulink>,
-      <ulink url="https://github.com/openSUSE/libeconf">libeconf</ulink>, and
-      <ulink url="https://www.prelude-siem.org">Prelude</ulink>
-    </para>
-<!-- With 1.5.3, building the doc requires the namespaced version of
-     docbook-xsl, which is beyond BLFS.
-
-    <bridgehead renderas="sect4">Optional (To Rebuild the Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="fop"/>,
-      <xref linkend="libxslt"/> and either
-      <xref linkend="lynx"/> or
-      <ulink url="&w3m-url;">W3m</ulink>
-    </para>
--->
-    <note>
-      <para role="required">
-        <xref role="runtime" linkend="shadow"/>
-        <phrase revision="systemd"> and <xref role="runtime" linkend="systemd"/>
-        must</phrase><phrase revision="sysv">must</phrase> be reinstalled
-        and reconfigured
-        after installing and configuring <application>Linux PAM</application>.
-      </para>
-
-      <para role="recommended">
-         With Linux-PAM-1.4.0 and higher, the pam_cracklib module is not
-         installed by default. Use <xref role="runtime" linkend="libpwquality"/>
-         to enforce strong passwords.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="kernel" id="linux-pam-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      For the PAM module <filename
-      class='libraryfile'>pam_loginuid.so</filename> (referred by
-      the PAM configuration file <filename>system-session</filename> if
-      <phrase revision='sysv'><xref linkend='elogind'/> is
-      built</phrase><phrase revision='systemd'><xref linkend='systemd'/> is
-      rebuilt with PAM support</phrase> later) to work,
-      a kernel configuration parameter need to be set or the module will
-      just do nothing:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="linux-pam-kernel.xml"/>
-
-    <indexterm zone="linux-pam linux-pam-kernel">
-      <primary sortas="d-linux-pam">Linux-PAM</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Linux PAM</title>
-
-    <para revision="sysv">
-      First, prevent the installation of an unneeded systemd file:
-    </para>
-
-<screen revision="sysv"><userinput>sed -e /service_DATA/d \
-    -i modules/pam_namespace/Makefile.am &amp;&amp;
-autoreconf</userinput></screen>
-
-    <para>
-      If you downloaded the documentation, unpack the tarball by issuing
-      the following command.
-    </para>
-
-<screen><userinput>tar -xf ../Linux-PAM-&linux-pam-docs-version;-docs.tar.xz --strip-components=1</userinput></screen>
-<!--
-    <para>
-      If you want to regenerate the documentation yourself, fix the
-      <command>configure</command> script so it will detect lynx:
-    </para>
-
-<screen><userinput>sed -e 's/dummy elinks/dummy lynx/'                                    \
-    -e 's/-no-numbering -no-references/-force-html -nonumbers -stdin/' \
-    -i configure</userinput></screen>
--->
-    <para>
-      Compile and link <application>Linux PAM</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                        \
-            --sbindir=/usr/sbin                  \
-            --sysconfdir=/etc                    \
-            --libdir=/usr/lib                    \
-            --enable-securedir=/usr/lib/security \
-            --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, a suitable <filename>/etc/pam.d/other</filename>
-      configuration file must exist.
-    </para>
-
-    <caution>
-      <title>Reinstallation or Upgrade of Linux PAM</title>
-      <para>
-        If you have a system with Linux PAM installed and working, be careful
-        when modifying the files in
-        <filename class="directory">/etc/pam.d</filename>, since your system
-        may become totally unusable. If you want to run the tests, you do not
-        need to create another <filename>/etc/pam.d/other</filename> file. The
-        existing file can be used for the tests.
-      </para>
-
-      <para>
-         You should also be aware that <command>make install</command>
-         overwrites the configuration files in
-         <filename class="directory">/etc/security</filename> as well as
-         <filename>/etc/environment</filename>. If you
-         have modified those files, be sure to back them up.
-      </para>
-    </caution>
-
-    <para>
-      For a first-time installation, create a configuration file by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /etc/pam.d &amp;&amp;
-
-cat &gt; /etc/pam.d/other &lt;&lt; "EOF"
-<literal>auth     required       pam_deny.so
-account  required       pam_deny.so
-password required       pam_deny.so
-session  required       pam_deny.so</literal>
-EOF</userinput></screen>
-
-    <para>
-      Now run the tests by issuing <command>make check</command>.
-      Be sure the tests produced no errors before continuing the
-      installation. Note that the tests are very long.
-      Redirect the output to a log file, so you can inspect it thoroughly.
-    </para>
-
-    <para>
-      For a first-time installation, remove the configuration file
-      created earlier by issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -fv /etc/pam.d/other</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chmod -v 4755 /usr/sbin/unix_chkpwd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-securedir=/usr/lib/security</parameter>:
-      This switch sets the installation location for the
-      <application>PAM</application> modules.
-    </para>
-<!--
-    <para>
-      <option>- -disable-regenerate-docu</option> : If the needed dependencies
-      (<xref linkend="DocBook"/>, <xref linkend="docbook-xsl"/>, <xref
-      linkend="libxslt"/>, and <xref linkend="lynx"/> or <ulink
-      url="&w3m-url;">W3m</ulink>) are installed, the manual pages, and the
-      html and text documentation files, are generated and installed.
-      Furthermore, if <xref linkend="fop"/> is installed, the PDF
-      documentation is generated and installed. Use this switch if you do not
-      want to rebuild the documentation.
-    </para>
--->
-    <para>
-      <command>chmod -v 4755 /usr/sbin/unix_chkpwd</command>:
-      The setuid bit for the <command>unix_chkpwd</command> helper program must be
-      turned on, so that non-<systemitem class="username">root</systemitem>
-      processes can access the shadow file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Linux-PAM</title>
-
-    <sect3 id="pam-config">
-      <title>Configuration Files</title>
-
-      <para>
-        <filename>/etc/security/*</filename> and
-        <filename>/etc/pam.d/*</filename>
-      </para>
-
-      <indexterm zone="linux-pam pam-config">
-        <primary sortas="e-etc-security">/etc/security/*</primary>
-      </indexterm>
-
-      <indexterm zone="linux-pam pam-config">
-        <primary sortas="e-etc-pam.d">/etc/pam.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Configuration information is placed in
-        <filename class="directory">/etc/pam.d/</filename>.
-        Here is a sample file:
-      </para>
-
-<screen><literal># Begin /etc/pam.d/other
-
-auth            required        pam_unix.so     nullok
-account         required        pam_unix.so
-session         required        pam_unix.so
-password        required        pam_unix.so     nullok
-
-# End /etc/pam.d/other</literal></screen>
-
-      <para>
-        Now create some generic configuration files.  As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -vdm755 /etc/pam.d &amp;&amp;
-cat &gt; /etc/pam.d/system-account &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/system-account
-
-account   required    pam_unix.so
-
-# End /etc/pam.d/system-account</literal>
-EOF
-
-cat &gt; /etc/pam.d/system-auth &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/system-auth
-
-auth      required    pam_unix.so
-
-# End /etc/pam.d/system-auth</literal>
-EOF
-
-cat &gt; /etc/pam.d/system-session &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/system-session
-
-session   required    pam_unix.so
-
-# End /etc/pam.d/system-session</literal>
-EOF
-
-cat &gt; /etc/pam.d/system-password &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/system-password
-
-# use yescrypt hash for encryption, use shadow, and try to use any
-# previously defined authentication token (chosen password) set by any
-# prior module.
-password  required    pam_unix.so       yescrypt shadow try_first_pass
-
-# End /etc/pam.d/system-password</literal>
-EOF
-</userinput></screen>
-
-     <para>
-       If you wish to enable strong password support, install
-       <xref linkend="libpwquality"/>, and follow the
-       instructions on that page to configure the pam_pwquality
-       PAM module with strong password support.
-     </para>
-
-      <para>
-        Next, add a restrictive <filename>/etc/pam.d/other</filename>
-        configuration file.  With this file, programs that are PAM aware will
-        not run unless a configuration file specifically for that application
-        exists.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/other &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/other
-
-auth        required        pam_warn.so
-auth        required        pam_deny.so
-account     required        pam_warn.so
-account     required        pam_deny.so
-password    required        pam_warn.so
-password    required        pam_deny.so
-session     required        pam_warn.so
-session     required        pam_deny.so
-
-# End /etc/pam.d/other</literal>
-EOF</userinput></screen>
-
-      <para>
-        The <application>PAM</application> man page (<command>man
-        pam</command>) provides a good starting point to learn
-        about the several fields, and allowable entries.
-        <!-- not accessible 2022-09-08 -->
-        <!-- it's available at a different address 2022-10-23-->
-        The
-        <ulink url="https://www.docs4dev.com/docs/en/linux-pam/1.1.2/reference/Linux-PAM_SAG.html">
-          Linux-PAM System Administrators' Guide
-        </ulink> is recommended for additional information.
-      </para>
-
-      <important>
-        <para>
-          You should now reinstall the <xref linkend="shadow"/>
-          <phrase revision="sysv">package</phrase>
-          <phrase revision="systemd"> and <xref linkend="systemd"/>
-          packages</phrase>.
-        </para>
-      </important>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          faillock, mkhomedir_helper, pam_namespace_helper,
-          pam_timestamp_check, pwhistory_helper, unix_chkpwd and
-          unix_update
-        </seg>
-        <seg>
-          libpam.so, libpamc.so and libpam_misc.so
-        </seg>
-        <seg>
-          /etc/security,
-          /usr/lib/security,
-          /usr/include/security and
-          /usr/share/doc/Linux-PAM-&linux-pam-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="faillock">
-        <term><command>faillock</command></term>
-        <listitem>
-          <para>
-            displays and modifies the authentication failure record files
-          </para>
-          <indexterm zone="linux-pam faillock">
-            <primary sortas="b-faillock">faillock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkhomedir_helper">
-        <term><command>mkhomedir_helper</command></term>
-        <listitem>
-          <para>
-            is a helper binary that creates home directories
-          </para>
-          <indexterm zone="linux-pam mkhomedir_helper">
-            <primary sortas="b-mkhomedir_helper">mkhomedir_helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pam_namespace_helper">
-        <term><command>pam_namespace_helper</command></term>
-        <listitem>
-          <para>
-            is a helper program used to configure a private namespace for a
-            user session
-          </para>
-          <indexterm zone="linux-pam pam_namespace_helper">
-            <primary sortas="b-pam_namespace_helper">pam_namespace_helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwhistory_helper">
-        <term><command>pwhistory_helper</command></term>
-        <listitem>
-          <para>
-            is a helper program that transfers password hashes from passwd or
-            shadow to opasswd
-          </para>
-          <indexterm zone="linux-pam pwhistory_helper">
-            <primary sortas="b-pwhistory_helper">pwhistory_helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- Removed with the removal of the pam_tally{,2} module
-      <varlistentry id="pam_tally">
-        <term><command>pam_tally</command></term>
-        <listitem>
-          <para>
-            is used to interrogate and manipulate the login counter file.
-          </para>
-          <indexterm zone="linux-pam pam_tally">
-            <primary sortas="b-pam_tally">pam_tally</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pam_tally2">
-        <term><command>pam_tally2</command></term>
-        <listitem>
-          <para>
-            is used to interrogate and manipulate the login counter file, but
-            does not have some limitations that <command>pam_tally</command>
-            does.
-          </para>
-          <indexterm zone="linux-pam pam_tally2">
-            <primary sortas="b-pam_tally2">pam_tally2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="pam_timestamp_check">
-        <term><command>pam_timestamp_check</command></term>
-        <listitem>
-          <para>
-            is used to check if the default timestamp is valid
-          </para>
-          <indexterm zone="linux-pam pam_timestamp_check">
-            <primary sortas="b-pam_timestamp_check">pam_timestamp_check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unix_chkpwd">
-        <term><command>unix_chkpwd</command></term>
-        <listitem>
-          <para>
-            is a helper binary that verifies the password of the current user
-          </para>
-          <indexterm zone="linux-pam unix_chkpwd">
-            <primary sortas="b-unix_chkpwd">unix_chkpwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unix_update">
-        <term><command>unix_update</command></term>
-        <listitem>
-          <para>
-            is a helper binary that updates the password of a given user
-          </para>
-          <indexterm zone="linux-pam unix_update">
-            <primary sortas="b-unix_update">unix_update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpam">
-        <term><filename class="libraryfile">libpam.so</filename></term>
-        <listitem>
-          <para>
-            provides the interfaces between applications and the
-            PAM modules
-          </para>
-          <indexterm zone="linux-pam libpam">
-            <primary sortas="c-libpam">libpam.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/make-ca.xml
===================================================================
--- postlfs/security/make-ca.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,405 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 certhost              "https://hg.mozilla.org/">
-  <!ENTITY certpath              "/lib/ckfw/builtins/certdata.txt">
-  <!ENTITY make-ca-buildsize     "6.9 MB (with all runtime deps)">
-  <!ENTITY make-ca-time          "0.1 SBU (with all runtime deps)">
-
-  <!ENTITY make-ca-download      "https://github.com/lfs-book/make-ca/releases/download/v&make-ca-version;/make-ca-&make-ca-version;.tar.xz">
-  <!ENTITY make-ca-size          "32 KB">
-  <!ENTITY make-ca-md5sum        "04bd86fe2eb299788439c3466782ce45">
-]>
-
-<sect1 id="make-ca" xreflabel="make-ca-&make-ca-version;">
-  <?dbhtml filename="make-ca.html"?>
-
-
-  <title>make-ca-&make-ca-version;</title>
-  <indexterm zone="make-ca">
-    <primary sortas="a-make-ca">make-ca</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to make-ca</title>
-
-    <para>
-      Public Key Infrastructure (PKI) is a method to validate the authenticity
-      of an otherwise unknown entity across untrusted networks. PKI works by
-      establishing a chain of trust, rather than trusting each individual host
-      or entity explicitly. In order for a certificate presented by a remote
-      entity to be trusted, that certificate must present a complete chain of
-      certificates that can be validated using the root certificate of a
-      Certificate Authority (CA) that is trusted by the local machine.
-    </para>
-
-    <para>
-      Establishing trust with a CA involves validating things like company
-      address, ownership, contact information, etc., and ensuring that the CA
-      has followed best practices, such as undergoing periodic security audits
-      by independent investigators and maintaining an always available
-      certificate revocation list. This is well outside the scope of BLFS (as
-      it is for most Linux distributions). The certificate store provided here
-      is taken from the Mozilla Foundation, who have established very strict
-      inclusion policies described <ulink
-        url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/policy/">here</ulink>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&make-ca-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &make-ca-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 Sum: &make-ca-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &make-ca-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &make-ca-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        This package ships a CA certificate for validating the identity of
-        <ulink url='&certhost;'/>.  If the trust chain of this website
-        has been changed after the release of make-ca-&make-ca-version;,
-        it may fail to get the revision of <filename>certdata.txt</filename>
-        from server.  Use an updated make-ca release at
-        <ulink url='https://github.com/lfs-book/make-ca/releases'>the
-        release page</ulink> if this issue happens.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">make-ca Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- Attention: no role="runtime" here because jhalfs don't assume
-           runtime dependencies are needed to run commands.  -->
-      <xref linkend="p11-kit"/> (runtime, built after
-      <xref role="nodep" linkend="libtasn1"/>, required in the following
-      instructions to generate certificate stores from trust anchors, and
-      each time <command>make-ca</command> is run)
-    </para>
-    <!-- /usr/bin/trust is needed to extract the certs to /etc/ssl/certs -->
-
-   <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="nss"/> (to generate a shared NSSDB)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of make-ca and Generation of the CA-certificates stores</title>
-
-    <para>
-      The <application>make-ca</application> script will download and process
-      the certificates included in the <filename>certdata.txt</filename> file
-      for use as trust anchors for the <xref linkend="p11-kit"/> trust module.
-      Additionally, it will generate system certificate stores used by BLFS
-      applications (if the recommended and optional applications are present
-      on the system). Any local certificates stored in
-      <filename>/etc/ssl/local</filename> will be imported to both the trust
-      anchors and the generated certificate stores (overriding Mozilla's
-      trust). Additionally, any modified trust values will be copied from the
-      trust anchors to <filename>/etc/ssl/local</filename> prior to any
-      updates, preserving custom trust values that differ from Mozilla when
-      using the <command>trust</command> utility from
-      <application>p11-kit</application> to operate on the trust store.
-    </para>
-
-    <para>
-      To install the various certificate stores, first install the
-      <application>make-ca</application> script into the correct location.
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -vdm755 /etc/ssl/local</userinput></screen>
-
-   <note>
-     <para>
-       Technically, this package is already installed at this point.
-       But most packages listing <application>make-ca</application> as
-       a dependency actually require the system certificate store set up
-       by this package, rather than the <command>make-ca</command>
-       program itself.  So the instructions for using
-       <command>make-ca</command> for setting up the system certificate
-       store are included in this section.  You should make sure the required
-       runtime dependency for <application>make-ca</application> is
-       satisfied now, and continue to follow the instructions.
-     </para>
-   </note>
-
-   <para>
-     As the <systemitem class="username">root</systemitem> user,
-     download the certificate source and
-     prepare for system use with the following command:
-   </para>
-
-    <note>
-      <para>
-        If running the script a second time with the same version of
-        <filename>certdata.txt</filename>, for instance, to update the
-        stores when <application>make-ca</application> is upgraded, or to
-        add additional stores as the requisite software is installed,
-        replace the <parameter>-g</parameter> switch with the
-        <parameter>-r</parameter> switch in the command line. If packaging,
-        run <command>make-ca --help</command> to see all available command
-        line options.
-      </para>
-    </note>
-
-<screen role="root"><userinput>/usr/sbin/make-ca -g</userinput></screen>
-
-    <para>
-      You should periodically update the store with the above command,
-      either manually, or via a <phrase revision="sysv">cron job.</phrase>
-      <phrase revision="systemd">systemd timer. A timer is installed at
-      <filename>/usr/lib/systemd/system/update-pki.timer</filename> that, if
-      enabled, will check for updates weekly.</phrase><phrase
-      revision="sysv">If you've installed <xref linkend="fcron"/> and
-      completed the section on periodic jobs, execute</phrase> <phrase
-      revision="systemd">Execute</phrase> the following commands, as the
-      <systemitem class="username">root</systemitem> user, to <phrase
-      revision="sysv">create a weekly cron job:</phrase><phrase
-      revision="systemd">enable the systemd timer:</phrase>
-    </para>
-
-<screen role="nodump" revision="sysv"><userinput>cat &gt; /etc/cron.weekly/update-pki.sh &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/bash
-/usr/sbin/make-ca -g</literal>
-EOF
-chmod 754 /etc/cron.weekly/update-pki.sh</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable update-pki.timer</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration" id="make-ca-config">
-    <title>Configuring make-ca</title>
-
-    <para>
-      For most users, no additional configuration is necessary, however,
-      the default <filename>certdata.txt</filename> file provided by make-ca
-      is obtained from the mozilla-release branch, and is modified to provide a
-      Mercurial revision. This will be the correct version for most systems.
-      There are several other variants of the file available for use that might
-      be preferred for one reason or another, including the files shipped with
-      Mozilla products in this book. RedHat and OpenSUSE, for instance, use the
-      version included in <xref linkend="nss"/>. Additional upstream downloads
-      are available at the links included in
-      <filename>/etc/make-ca/make-ca.conf.dist</filename>. Simply copy the
-      file to
-      <filename>/etc/make-ca.conf</filename> and edit as appropriate.
-    </para>
-
-    <indexterm zone="make-ca make-ca-config">
-      <primary sortas="e-etc-make-ca-conf">/etc/make-ca.conf</primary>
-    </indexterm>
-
-    <bridgehead renderas="sect3">About Trust Arguments</bridgehead>
-
-    <para>
-      There are three trust types that are recognized by the
-      <application>make-ca</application> script, SSL/TLS, S/Mime, and code
-      signing. For <application>OpenSSL</application>, these are
-      <parameter>serverAuth</parameter>,
-      <parameter>emailProtection</parameter>, and
-      <parameter>codeSigning</parameter> respectively. If one of the three
-      trust arguments is omitted, the certificate is neither trusted, nor
-      rejected for that role. Clients that use
-      <application>OpenSSL</application> or <application>NSS</application>
-      encountering this certificate will present a warning to the user.
-      Clients using
-      <application>GnuTLS</application> without
-      <application>p11-kit</application> support are not aware of trusted
-      certificates. To include this CA into the
-      <filename>ca-bundle.crt</filename>,
-      <filename>email-ca-bundle.crt</filename>, or
-      <filename>objsign-ca-bundle.crt</filename> files
-      (the <application>GnuTLS</application> legacy bundles), it must have the
-      appropriate trust arguments.
-    </para>
-
-    <bridgehead renderas="sect3">Adding Additional CA Certificates</bridgehead>
-
-    <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
-      <command>openssl</command> command, and create a new certificate. For
-      example, using the <ulink url="http://www.cacert.org/">CAcert</ulink>
-      roots, if you want to trust both for all three roles, the following
-      commands will create appropriate OpenSSL trusted certificates (run as
-      the <systemitem class="username">root</systemitem> user after <xref
-      linkend="wget"/> is installed):
-    </para>
-
-<screen role="nodump"><userinput>wget http://www.cacert.org/certs/root.crt &amp;&amp;
-wget http://www.cacert.org/certs/class3.crt &amp;&amp;
-openssl x509 -in root.crt -text -fingerprint -setalias "CAcert Class 1 root" \
-        -addtrust serverAuth -addtrust emailProtection -addtrust codeSigning \
-        > /etc/ssl/local/CAcert_Class_1_root.pem &amp;&amp;
-openssl x509 -in class3.crt -text -fingerprint -setalias "CAcert Class 3 root" \
-        -addtrust serverAuth -addtrust emailProtection -addtrust codeSigning \
-        > /etc/ssl/local/CAcert_Class_3_root.pem &amp;&amp;
-/usr/sbin/make-ca -r</userinput></screen>
-
-    <bridgehead renderas="sect3">Overriding Mozilla Trust</bridgehead>
-
-    <para>
-      Occasionally, there may be instances where you don't agree with
-      Mozilla's inclusion of a particular certificate authority. If you'd like
-      to override the default trust of a particular CA, simply create a copy of
-      the existing certificate in <filename
-      class="directory">/etc/ssl/local</filename> with different trust
-      arguments. For example, if you'd like to distrust the
-      "Makebelieve_CA_Root" file, run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>openssl x509 -in /etc/ssl/certs/Makebelieve_CA_Root.pem \
-             -text \
-             -fingerprint \
-             -setalias "Disabled Makebelieve CA Root" \
-             -addreject serverAuth \
-             -addreject emailProtection \
-             -addreject codeSigning \
-       > /etc/ssl/local/Disabled_Makebelieve_CA_Root.pem &amp;&amp;
-/usr/sbin/make-ca -r</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration" id="make-ca-python">
-    <title>Using make-ca with Python3</title>
-
-    <para>
-      When <application>Python3</application> was installed in LFS it included
-      the <application>pip3</application> module with vendored certificates
-      from the <application>Certifi</application> module. That was necessary,
-      but it means that whenever <command>pip3</command> is used it can reference
-      those certificates, primarily when creating a virtual environment or when
-      installing a module with all its wheel dependencies in one go.
-    </para>
-
-    <para>
-      It is generally considered that the System Administrator should be in
-      charge of which certificates are available. Now that <xref
-      linkend="make-ca"/> and <xref linkend="p11-kit"/> have been installed and
-      <application>make-ca</application> has been configured, it is possible to
-      make <command>pip3</command> use the system certificates.
-    </para>
-
-    <para>
-      The vendored certificates installed in LFS are a snapshot from when the
-      pulled-in version of <application>Certifi</application> was created. If
-      you regularly update the system certificates, the vendored version will
-      become out of date.
-    </para>
-
-    <para>
-      To use the system certificates in <application>Python3</application> you
-      should set <envar>_PIP_STANDALONE_CERT</envar> to point to them, e.g for
-      the <application>bash</application> shell:
-    </para>
-
-<screen><userinput>export _PIP_STANDALONE_CERT=/etc/pki/tls/certs/ca-bundle.crt</userinput></screen>
-
-    <warning>
-      <para>
-        If you have created virtual environments, for example when testing modules,
-        and those include the <application>Requests</application> and
-        <application>Certifi</application> modules in <filename
-        class="directory">~/.local/lib/python3.11/</filename> then those local
-        modules will be used instead of the system certificates unless you
-        remove the local modules.
-      </para>
-    </warning>
-
-    <para>
-      To use the system certificates in <application>Python3</application> with
-      the BLFS profiles add the following variable to your system or personal
-      profiles:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /etc/profile.d &amp;&amp;
-cat &gt; /etc/profile.d/pythoncerts.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/pythoncerts.sh
-
-export _PIP_STANDALONE_CERT=/etc/pki/tls/certs/ca-bundle.crt
-
-# End /etc/profile.d/pythoncerts.sh</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>make-ca</seg>
-        <seg>/etc/ssl/{certs,local} and
-        /etc/pki/{nssdb,anchors,tls/{certs,java}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-   <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="make-ca-bin">
-        <term><command>make-ca</command></term>
-        <listitem>
-          <para>
-            is a shell script that adapts a current version of
-            <filename>certdata.txt</filename>, and prepares it for use
-            as the system trust store
-          </para>
-          <indexterm zone="make-ca make-ca">
-            <primary sortas="b-make-ca">make-ca</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-   </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,959 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mitkrb-download-http "https://kerberos.org/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;.tar.gz">
-  <!ENTITY mitkrb-download-ftp  " ">
-  <!ENTITY mitkrb-md5sum        "97d5f3a48235c53f6d537c877290d2af">
-  <!ENTITY mitkrb-size          "8.2 MB">
-  <!ENTITY mitkrb-buildsize     "130 MB (add 10 MB for tests)">
-  <!ENTITY mitkrb-time          "0.3 SBU (Using parallelism=4; add 1.0 SBU for tests)">
-]>
-
-<sect1 id="mitkrb" xreflabel="MIT Kerberos V5-&mitkrb-version;">
-  <?dbhtml filename="mitkrb.html"?>
-
-
-  <title>MIT Kerberos V5-&mitkrb-version;</title>
-
-  <indexterm zone="mitkrb">
-    <primary sortas="a-MIT-Kerberos">MIT Kerberos V5</primary>
-  </indexterm>
-
-    <sect2 role="package">
-      <title>Introduction to MIT Kerberos V5</title>
-
-    <para>
-      <application>MIT Kerberos V5</application> is a free implementation
-      of Kerberos 5. Kerberos is a network authentication protocol. It
-      centralizes the authentication database and uses kerberized
-      applications to work with servers or services that support Kerberos
-      allowing single logins and encrypted communication over internal
-      networks or the Internet.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mitkrb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mitkrb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mitkrb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mitkrb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mitkrb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mitkrb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-           <ulink url="&patch-root;/mitkrb-&mitkrb-version;-openssl3_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
- -->
-    <bridgehead renderas="sect3">MIT Kerberos V5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bind-utils"/>,
-      <xref linkend="gnupg2"/> (to authenticate the package),
-      <xref linkend="keyutils"/>,
-      <xref linkend="openldap"/>,<!-- Seems so that mit has its own
-      implementation of rpc now.
-      <xref linkend="rpcbind"/> (used during the test suite),-->
-      <xref linkend="valgrind"/> (used during the test suite),
-      <xref linkend="yasm"/>,
-      <ulink url="https://thrysoee.dk/editline/">libedit</ulink>,
-      <ulink url="https://cmocka.org/">cmocka</ulink>,
-      <ulink url="https://pypi.org/project/kdcproxy/">kdcproxy</ulink>,
-      <ulink url="https://pypi.org/project/pyrad/">pyrad</ulink>, and
-      <ulink url="https://cwrap.org/resolv_wrapper.html">resolv_wrapper</ulink>
-    </para>
-
-    <note>
-      <para>
-        Some sort of time synchronization facility on your system (like
-        <xref linkend="ntp"/>) is required since Kerberos won't authenticate
-        if there is a time difference between a kerberized client and the
-        KDC server.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MIT Kerberos V5</title>
-<!--
-    <para>
-      Next, fix several issues identified by OpenSSL-3:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../mitkrb-&mitkrb-version;-openssl3_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Build <application>MIT Kerberos V5</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>cd src &amp;&amp;
-<!-- dejagnu is not used anymore for tests
-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_kadm5.py/d'           lib/kadm5/Makefile.in                &amp;&amp;-->
-
-./configure --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --localstatedir=/var/lib \
-            --runstatedir=/run       \
-            --with-system-et         \
-            --with-system-ss         \
-            --with-system-verto=no   \
-            --enable-dns-for-realm &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the build, issue: <command>make -j1 -k check</command>.
-      <!-- You need at least <xref link end="tcl"/>, which is used to drive the
-      test suite.  Furthermore, <xref link end="dejagnu"/> must be available for
-      some of the tests to run. If you have a former version of MIT Kerberos V5
-      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.  Some tests may hang for a
-      long time and fail if the system is not connected to a network.
-      One test, <filename>t_kadm5srv</filename>, is known to fail.
-      If <xref linkend='keyutils'/> is installed but
-      <xref linkend='keyutils-test-kernel'/> is not
-      satisfied, some tests will fail complaining
-      <computeroutput>keyctl failed with code 1</computeroutput>.
-      <!-- Note: on my laptop -j8 fails but -j1 passes
-      For version 1.21, -j1 no longer needs to be specified and the
-      time for the tests was reduced considerably.  -bdubbs
-      But on one of my machines (4 cores) -j4 fails and -j1 passes...
-      I guess the test suite is just too fragile. -xry111
-      -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-cp -vfr ../doc -T /usr/share/doc/krb5-&mitkrb-version;</userinput></screen>
-
-    <!-- libsoup3 FTBFS with these flags if -Dgssapi=enabled (not used by
-         the book) -->
-    <para>
-      Still as the &root; user, remove linker flags setting RPATH from the
-      <command>krb5-config</command> script.  These flags are unneeded for
-      an installation in the standard prefix
-      (<filename class='directory'>/usr</filename>) and they may cause some
-      packages fail to build:
-    </para>
-
-    <screen role='root'><userinput>sed '/PROG_RPATH_FLAGS/d' -i /usr/bin/krb5-config</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      The <command>sed</command> 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
-      <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>
-
-    <para>
-      <parameter>--with-system-et</parameter>: This switch causes the build
-      to use the system-installed versions of the error-table support
-      software.
-    </para>
-
-    <para>
-      <parameter>--with-system-ss</parameter>: This switch causes the build
-      to use the system-installed versions of the subsystem command-line
-      interface software.
-    </para>
-
-    <para>
-      <parameter>--with-system-verto=no</parameter>: This switch fixes a bug in
-      the package: it does not recognize its own verto library installed
-      previously. This is not a problem, if reinstalling the same version,
-      but if you are updating, the old library is used as system's one,
-      instead of installing the new version.
-    </para>
-
-    <para>
-      <parameter>--enable-dns-for-realm</parameter>: This switch allows
-      realms to be resolved using the DNS server.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: Use this switch if you want to compile the
-      <application>OpenLDAP</application> database backend module.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MIT Kerberos V5</title>
-
-    <sect3 id="krb5-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/krb5.conf</filename> and
-        <filename>/var/lib/krb5kdc/kdc.conf</filename>
-      </para>
-
-      <indexterm zone="mitkrb krb5-config">
-        <primary sortas="e-etc-krb5.conf">/etc/krb5.conf</primary>
-      </indexterm>
-
-      <indexterm zone="mitkrb krb5-config">
-        <primary sortas="e-var-lib-krb5kdc-kdc.conf">/var/lib/krb5kdc/kdc.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <sect4>
-        <title>Kerberos Configuration</title>
-
-        <tip>
-          <para>
-            You should consider installing some sort of password checking
-            dictionary so that you can configure the installation to only
-            accept strong passwords. A suitable dictionary to use is shown in
-            the <xref linkend="cracklib"/> instructions. Note that only one
-            file can be used, but you can concatenate many files into one. The
-            configuration file shown below assumes you have installed a
-            dictionary to <filename>/usr/share/dict/words</filename>.
-          </para>
-        </tip>
-
-        <para>
-          Create the Kerberos configuration file with the following
-          commands issued by the <systemitem class="username">root</systemitem>
-          user:
-        </para>
-
-<screen role="root"><userinput>cat &gt; /etc/krb5.conf &lt;&lt; "EOF"
-<literal># Begin /etc/krb5.conf
-
-[libdefaults]
-    default_realm = <replaceable>&lt;EXAMPLE.ORG&gt;</replaceable>
-    encrypt = true
-
-[realms]
-    <replaceable>&lt;EXAMPLE.ORG&gt;</replaceable> = {
-        kdc = <replaceable>&lt;belgarath.example.org&gt;</replaceable>
-        admin_server = <replaceable>&lt;belgarath.example.org&gt;</replaceable>
-        dict_file = /usr/share/dict/words
-    }
-
-[domain_realm]
-    .<replaceable>&lt;example.org&gt;</replaceable> = <replaceable>&lt;EXAMPLE.ORG&gt;</replaceable>
-
-[logging]
-    kdc = SYSLOG:INFO:AUTH
-    admin_server = SYSLOG:INFO:AUTH
-    default = SYSLOG:DEBUG:DAEMON
-
-# End /etc/krb5.conf</literal>
-EOF</userinput></screen>
-
-        <para>
-          You will need to substitute your domain and proper hostname for the
-          occurrences of the <replaceable>&lt;belgarath&gt;</replaceable> and
-          <replaceable>&lt;example.org&gt;</replaceable> names.
-        </para>
-
-        <para>
-          <option>default_realm</option> should be the name of your
-          domain changed to ALL CAPS. This isn't required, but both
-          <application>Heimdal</application> and MIT recommend it.
-        </para>
-
-        <para>
-          <option>encrypt = true</option> provides encryption of all traffic
-          between kerberized clients and servers. It's not necessary and can
-          be left off. If you leave it off, you can encrypt all traffic from
-          the client to the server using a switch on the client program
-          instead.
-        </para>
-
-        <para>
-          The <option>[realms]</option> parameters tell the client programs
-          where to look for the KDC authentication services.
-        </para>
-
-        <para>
-          The <option>[domain_realm]</option> section maps a domain to a realm.
-        </para>
-
-        <para>
-          Create the KDC database:
-       </para>
-
-<screen role="root"><userinput>kdb5_util create -r <replaceable>&lt;EXAMPLE.ORG&gt;</replaceable> -s</userinput></screen>
-
-        <para>
-          Now you should populate the database with principals
-          (users). For now, just use your regular login name or
-          <systemitem class="username">root</systemitem>.
-        </para>
-
-<screen role="root"><userinput>kadmin.local
-<prompt>kadmin.local:</prompt> add_policy dict-only
-<prompt>kadmin.local:</prompt> addprinc -policy dict-only <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
-
-        <para>
-          The KDC server and any machine running kerberized
-          server daemons must have a host key installed:
-        </para>
-
-<screen role="root"><userinput><prompt>kadmin.local:</prompt> addprinc -randkey host/<replaceable>&lt;belgarath.example.org&gt;</replaceable></userinput></screen>
-
-        <para>
-          After choosing the defaults when prompted, you will have to
-          export the data to a keytab file:
-        </para>
-
-<screen role="root"><userinput><prompt>kadmin.local:</prompt> ktadd host/<replaceable>&lt;belgarath.example.org&gt;</replaceable></userinput></screen>
-
-        <para>
-          This should have created a file in
-          <filename class="directory">/etc</filename> named
-          <filename>krb5.keytab</filename> (Kerberos 5). This file should
-          have 600 (<systemitem class="username">root</systemitem> rw only)
-          permissions. Keeping the keytab files from public access is crucial
-          to the overall security of the Kerberos installation.
-        </para>
-
-        <para>
-          Exit the <command>kadmin</command> program (use
-          <command>quit</command> or <command>exit</command>) and return
-          back to the shell prompt. Start the KDC daemon manually, just to
-          test out the installation:
-        </para>
-
-<screen role="root"><userinput>/usr/sbin/krb5kdc</userinput></screen>
-
-        <para>
-          Attempt to get a ticket with the following command:
-        </para>
-
-<screen><userinput>kinit <replaceable>&lt;loginname&gt;</replaceable></userinput></screen>
-
-        <para>
-          You will be prompted for the password you created. After you
-          get your ticket, you can list it with the following command:
-        </para>
-
-<screen><userinput>klist</userinput></screen>
-
-        <para>
-          Information about the ticket should be displayed on the
-          screen.
-        </para>
-
-        <para>
-          To test the functionality of the keytab file, issue the
-          following command as the
-          <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="root"><userinput>ktutil
-<prompt>ktutil:</prompt> rkt /etc/krb5.keytab
-<prompt>ktutil:</prompt> l</userinput></screen>
-
-        <para>
-          This should dump a list of the host principal, along with
-          the encryption methods used to access the principal.
-        </para>
-
-        <para>
-          Create an empty ACL file that can be modified later:
-        </para>
-
-<screen role="root"><userinput>touch /var/lib/krb5kdc/kadm5.acl</userinput></screen>
-
-        <para>
-          At this point, if everything has been successful so far, you
-          can feel fairly confident in the installation and configuration of
-          the package.
-        </para>
-
-      </sect4>
-
-      <sect4>
-        <title>Additional Information</title>
-
-        <para>
-          For additional information consult the <ulink
-          url="https://web.mit.edu/kerberos/www/krb5-&mitkrb-major-version;/#documentation">
-          documentation for krb5-&mitkrb-version;</ulink> on which the above
-          instructions are based.
-        </para>
-
-      </sect4>
-
-    </sect3>
-
-    <sect3 id="mitkrb-init">
-      <title><phrase revision="sysv">Init Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want to start <application>Kerberos</application> services
-        at boot, install the <filename>/etc/rc.d/init.d/krb5</filename> init
-        script included in the <xref linkend="bootscripts"/> package using
-        the following command:
-      </para>
-
-      <para revision="systemd">
-        If you want to start <application>Kerberos</application> services
-        at boot, install the <filename>krb5.service</filename> unit included in
-        the <xref linkend="systemd-units"/> package using the following command:
-      </para>
-
-      <indexterm zone="mitkrb mitkrb-init">
-        <primary sortas="f-krb5">krb5</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-krb5</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>
-          gss-client, gss-server, k5srvutil, kadmin, kadmin.local,
-          kadmind, kdb5_ldap_util (optional), kdb5_util, kdestroy, kinit, klist,
-          kpasswd, kprop, kpropd, kproplog, krb5-config, krb5-send-pr, krb5kdc,
-          ksu, kswitch, ktutil, kvno, sclient, sim_client, sim_server,
-          sserver, uuclient, and uuserver
-        </seg>
-        <seg>
-          libgssapi_krb5.so, libgssrpc.so, libk5crypto.so, libkadm5clnt_mit.so,
-          libkadm5clnt.so, libkadm5srv_mit.so, libkadm5srv.so, libkdb_ldap.so
-          (optional), libkdb5.so, libkrad.so, libkrb5.so, libkrb5support.so,
-          libverto.so, and some plugins under the /usr/lib/krb5 tree
-        </seg>
-        <seg>
-          /usr/include/{gssapi,gssrpc,kadm5,krb5},
-          /usr/lib/krb5,
-          /usr/share/{doc/krb5-&mitkrb-version;,examples/krb5},
-          /var/lib/krb5kdc, and
-          /run/krb5kdc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gss-client">
-        <term><command>gss-client</command></term>
-        <listitem>
-          <para>
-            is a GSSAPI test client
-          </para>
-          <indexterm zone="mitkrb gss-client">
-            <primary sortas="b-gss-client">gss-client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gss-server">
-        <term><command>gss-server</command></term>
-        <listitem>
-          <para>
-            is a GSSAPI test server
-          </para>
-          <indexterm zone="mitkrb gss-server">
-            <primary sortas="b-gss-server">gss-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="k5srvutil">
-        <term><command>k5srvutil</command></term>
-        <listitem>
-          <para>
-            is a host keytable manipulation utility
-          </para>
-          <indexterm zone="mitkrb k5srvutil">
-            <primary sortas="b-k5srvutil">k5srvutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kadmin">
-        <term><command>kadmin</command></term>
-        <listitem>
-          <para>
-            is an utility used to make modifications
-            to the Kerberos database
-          </para>
-          <indexterm zone="mitkrb kadmin">
-            <primary sortas="b-kadmin">kadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kadmin.local">
-        <term><command>kadmin.local</command></term>
-        <listitem>
-          <para>
-            is an utility similar to <command>kadmin</command>, but if the
-            database is db2, the local client <command>kadmin.local</command>,
-            is intended to run directly on the master KDC without Kerberos
-            authentication
-          </para>
-          <indexterm zone="mitkrb kadmin.local">
-            <primary sortas="b-kadmin.local">kadmin.local</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kadmind">
-        <term><command>kadmind</command></term>
-        <listitem>
-          <para>
-            is a server for administrative access
-            to a Kerberos database
-          </para>
-          <indexterm zone="mitkrb kadmind">
-            <primary sortas="b-kadmind">kadmind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdb5_ldap_util">
-        <term><command>kdb5_ldap_util (optional)</command></term>
-        <listitem>
-          <para>
-            allows an administrator to manage realms, Kerberos services
-            and ticket policies
-          </para>
-          <indexterm zone="mitkrb kdb5_ldap_util">
-            <primary sortas="b-kdb5_ldap_util">kdb5_ldap_util</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdb5_util">
-        <term><command>kdb5_util</command></term>
-        <listitem>
-          <para>
-            is the KDC database utility
-          </para>
-          <indexterm zone="mitkrb kdb5_util">
-            <primary sortas="b-kdb5_util">kdb5_util</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kdestroy">
-        <term><command>kdestroy</command></term>
-        <listitem>
-          <para>
-            removes the current set of tickets
-          </para>
-          <indexterm zone="mitkrb kdestroy">
-            <primary sortas="b-kdestroy">kdestroy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kinit">
-        <term><command>kinit</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="mitkrb kinit">
-            <primary sortas="b-kinit">kinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="klist">
-        <term><command>klist</command></term>
-        <listitem>
-          <para>
-            reads and displays the current tickets in
-            the credential cache
-          </para>
-          <indexterm zone="mitkrb klist">
-            <primary sortas="b-klist">klist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpasswd">
-        <term><command>kpasswd</command></term>
-        <listitem>
-          <para>
-            is a program for changing Kerberos 5 passwords
-          </para>
-          <indexterm zone="mitkrb kpasswd">
-            <primary sortas="b-kpasswd">kpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kprop">
-        <term><command>kprop</command></term>
-        <listitem>
-          <para>
-            takes a principal database in a specified format and
-            converts it into a stream of database records
-          </para>
-          <indexterm zone="mitkrb kprop">
-            <primary sortas="b-kprop">kprop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kpropd">
-        <term><command>kpropd</command></term>
-        <listitem>
-          <para>
-            receives a database sent by <command>kprop</command>
-            and writes it as a local database
-          </para>
-          <indexterm zone="mitkrb kpropd">
-            <primary sortas="b-kpropd">kpropd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kproplog">
-        <term><command>kproplog</command></term>
-        <listitem>
-          <para>
-            displays the contents of the KDC database update log to standard
-            output
-          </para>
-          <indexterm zone="mitkrb kproplog">
-            <primary sortas="b-kproplog">kproplog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krb5-config-prog2">
-        <term><command>krb5-config</command></term>
-        <listitem>
-          <para>
-            gives information on how to link programs against
-            libraries
-          </para>
-          <indexterm zone="mitkrb krb5-config-prog2">
-            <primary sortas="b-krb5-config">krb5-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krb5kdc">
-        <term><command>krb5kdc</command></term>
-        <listitem>
-          <para>
-            is the <application>Kerberos 5</application> server
-          </para>
-          <indexterm zone="mitkrb krb5kdc">
-            <primary sortas="b-krb5kdc">krb5kdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="krb5-send-pr">
-        <term><command>krb5-send-pr</command></term>
-        <listitem>
-          <para>
-            sends a problem report (PR) to a central support site
-          </para>
-          <indexterm zone="mitkrb krb5-send-pr">
-            <primary sortas="b-krb-send-pr">krb5-send-pr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ksu">
-        <term><command>ksu</command></term>
-        <listitem>
-          <para>
-            is the super user program using Kerberos protocol.
-            Requires a properly configured
-            <filename>/etc/shells</filename> and
-            <filename>~/.k5login</filename> containing principals
-            authorized to become super users
-          </para>
-          <indexterm zone="mitkrb ksu">
-            <primary sortas="b-ksu">ksu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kswitch">
-        <term><command>kswitch</command></term>
-        <listitem>
-          <para>
-            makes the specified credential cache the
-            primary cache for the collection, if a cache
-            collection is available
-          </para>
-          <indexterm zone="mitkrb kswitch">
-            <primary sortas="b-kswitch">kswitch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ktutil">
-        <term><command>ktutil</command></term>
-        <listitem>
-          <para>
-            is a program for managing Kerberos keytabs
-          </para>
-          <indexterm zone="mitkrb ktutil">
-            <primary sortas="b-ktutil">ktutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kvno">
-        <term><command>kvno</command></term>
-        <listitem>
-          <para>
-            prints keyversion numbers of Kerberos principals
-          </para>
-          <indexterm zone="mitkrb kvno">
-            <primary sortas="b-kvno">kvno</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sclient">
-        <term><command>sclient</command></term>
-        <listitem>
-          <para>
-            is used to contact a sample server and authenticate to it
-            using Kerberos 5 tickets, then display the server's
-            response
-          </para>
-          <indexterm zone="mitkrb sclient">
-            <primary sortas="b-sclient">sclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sim_client">
-        <term><command>sim_client</command></term>
-        <listitem>
-          <para>
-            is a simple UDP-based sample client program, for
-            demonstration
-          </para>
-          <indexterm zone="mitkrb sim_client">
-            <primary sortas="b-sim_client">sim_client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sim_server">
-        <term><command>sim_server</command></term>
-        <listitem>
-          <para>
-            is a simple UDP-based server application, for
-            demonstration
-          </para>
-          <indexterm zone="mitkrb sim_server">
-            <primary sortas="b-sim_server">sim_server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sserver">
-        <term><command>sserver</command></term>
-        <listitem>
-          <para>
-            is the sample Kerberos 5 server
-          </para>
-          <indexterm zone="mitkrb sserver">
-            <primary sortas="b-sserver">sserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuclient">
-        <term><command>uuclient</command></term>
-        <listitem>
-          <para>
-            is another sample client
-          </para>
-          <indexterm zone="mitkrb uuclient">
-            <primary sortas="b-uuclient">uuclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuserver">
-        <term><command>uuserver</command></term>
-        <listitem>
-          <para>
-            is another sample server
-          </para>
-          <indexterm zone="mitkrb uuserver">
-            <primary sortas="b-uuserver">uuserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="libgssapi_krb5">
-        <term><filename class="libraryfile">libgssapi_krb5.so</filename></term>
-        <listitem>
-          <para>
-            contains the Generic Security Service Application Programming
-            Interface (GSSAPI) functions which provides security services
-            to callers in a generic fashion, supportable with a range of
-            underlying mechanisms and technologies and hence allowing
-            source-level portability of applications to different
-            environments
-          </para>
-          <indexterm zone="mitkrb libgssapi_krb5">
-            <primary sortas="c-libgssapi_krb5">libgssapi_krb5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkadm5clnt">
-        <term><filename class="libraryfile">libkadm5clnt.so</filename></term>
-        <listitem>
-          <para>
-            contains the administrative authentication and password checking
-            functions required by Kerberos 5 client-side programs
-          </para>
-          <indexterm zone="mitkrb libkadm5clnt">
-            <primary sortas="c-libkadm5clnt">libkadm5clnt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkadm5srv">
-        <term><filename class="libraryfile">libkadm5srv.so</filename></term>
-        <listitem>
-          <para>
-            contains the administrative authentication and password
-            checking functions required by Kerberos 5 servers
-          </para>
-          <indexterm zone="mitkrb libkadm5srv">
-            <primary sortas="c-libkadm5srv">libkadm5srv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkdb5">
-        <term><filename class="libraryfile">libkdb5.so</filename></term>
-        <listitem>
-          <para>
-            is a Kerberos 5 authentication/authorization database
-            access library
-          </para>
-          <indexterm zone="mitkrb libkdb5">
-            <primary sortas="c-libkdb5">libkdb5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkrad">
-        <term><filename class="libraryfile">libkrad.so</filename></term>
-        <listitem>
-          <para>
-            contains the internal support library for RADIUS functionality
-          </para>
-          <indexterm zone="mitkrb libkrad">
-            <primary sortas="c-libkrad">libkrad.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkrb5">
-        <term><filename class="libraryfile">libkrb5.so</filename></term>
-        <listitem>
-          <para>
-            is an all-purpose <application>Kerberos 5</application> library
-          </para>
-          <indexterm zone="mitkrb libkrb5">
-            <primary sortas="c-libkrb5">libkrb5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/nessus.xml
===================================================================
--- postlfs/security/nessus.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/nessus.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,11 +1,7 @@
 <sect1 id="postlfs-security-nessus">
-  <?dbhtml filename="nessus.html"?>
+<?dbhtml filename="nessus.html" dir="postlfs"?>
+<title>nessus</title>
 
-
-  <title>nessus</title>
-
-  <para>
-    TO BE WRITTEN - NEW
-  </para>
+<para>TO BE WRITTEN - NEW</para>
 
 </sect1>
Index: stlfs/security/nettle.xml
===================================================================
--- postlfs/security/nettle.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nettle-download-http "&gnu-http;/nettle/nettle-&nettle-version;.tar.gz">
-  <!ENTITY nettle-download-ftp  " ">
-  <!ENTITY nettle-md5sum        "29fcd2dec6bf5b48e5e3ffb3cbc4779e">
-  <!ENTITY nettle-size          "2.3 MB">
-  <!ENTITY nettle-buildsize     "95 MB (with tests)">
-  <!ENTITY nettle-time          "0.2 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="nettle" xreflabel="Nettle-&nettle-version;">
-  <?dbhtml filename="nettle.html"?>
-
-
-  <title>Nettle-&nettle-version;</title>
-
-  <indexterm zone="nettle">
-    <primary sortas="a-Nettle">Nettle</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nettle</title>
-
-    <para>
-      The <application>Nettle</application> package contains a low-level
-      cryptographic library that is designed to fit easily in many contexts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nettle-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nettle-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nettle-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nettle-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nettle-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nettle-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nettle Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (optional for the tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nettle</title>
-
-    <para>
-      Install <application>Nettle</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chmod   -v   755 /usr/lib/lib{hogweed,nettle}.so &amp;&amp;
-install -v -m755 -d /usr/share/doc/nettle-&nettle-version; &amp;&amp;
-install -v -m644 nettle.{html,pdf} /usr/share/doc/nettle-&nettle-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          nettle-hash, nettle-lfib-stream, nettle-pbkdf2,
-          pkcs1-conv and sexp-conv
-        </seg>
-        <seg>
-          libhogweed.so and libnettle.so
-        </seg>
-        <seg>
-          /usr/include/nettle and /usr/share/doc/nettle-&nettle-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nettle-hash">
-        <term><command>nettle-hash</command></term>
-        <listitem>
-          <para>
-            calculates a hash value using a specified algorithm
-          </para>
-          <indexterm zone="nettle nettle-hash">
-            <primary sortas="b-nettle-hash">nettle-hash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nettle-lfib-stream">
-        <term><command>nettle-lfib-stream</command></term>
-        <listitem>
-          <para>
-            outputs a sequence of pseudorandom (non-cryptographic)  bytes,
-            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
-          </para>
-          <indexterm zone="nettle nettle-lfib-stream">
-            <primary sortas="b-nettle-lfib-stream">nettle-lfib-stream</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nettle-pbkdf2">
-        <term><command>nettle-pbkdf2</command></term>
-        <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.
-          </para>
-          <indexterm zone="nettle nettle-pbkdf2">
-            <primary sortas="b-nettle-pbkdf2">nettle-pbkdf2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkcs1-conv">
-        <term><command>pkcs1-conv</command></term>
-        <listitem>
-          <para>
-            converts private and public RSA keys from PKCS #1 format to
-            sexp format
-          </para>
-          <indexterm zone="nettle pkcs1-conv">
-            <primary sortas="b-pkcs1-conv">pkcs1-conv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sexp-conv">
-        <term><command>sexp-conv</command></term>
-        <listitem>
-          <para>
-            converts an s-expression to a different encoding
-          </para>
-          <indexterm zone="nettle sexp-conv">
-            <primary sortas="b-sexp-conv">sexp-conv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,454 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- for when .0 is not part of the new tarball name, but always referenced -->
-<!ENTITY nss-url "archive.mozilla.org/pub/security/nss/releases">
-
-<!-- micro versions-->
-<!--<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">-->
-
-<!-- no micro versions -->
-  <!ENTITY nss-download-http "https://&nss-url;/NSS_&nss-dir;_RTM/src/nss-&nss-version;.tar.gz">
-  <!ENTITY nss-download-ftp  " ">
-  <!ENTITY nss-md5sum        "a9e62202ca3d6b542b9318bb05bb7027">
-  <!ENTITY nss-size          "73 MB">
-  <!ENTITY nss-buildsize     "304 MB (add 268 MB for tests)">
-  <!ENTITY nss-time          "1.1 SBU (with parallelism=4, add 16 SBU for tests on AMD Ryzens or at least 30 SBU on Intel machines)">
-  <!-- On my system, I got 64.2 SBU, but Bruce gets 18 SBU. -renodr -->
-  <!-- On my system, I got 63 SBU, but Xi gets ~18 SBU. -pierre (for 3.78) -->
-  <!-- On my 3400G for 3.79 I got 16 SBU -ken -->
-  <!-- Still 17 SBU for 3.81 - bdubbs -->
-  <!-- 73 SBU but I'm on Intel. -renodr -->
-  <!-- 3.86 amended the figures -ken
-   3400G 14 SBU with 6.0.12, but the remeasured SBU has become very slow
-   and maybe other people would see a ster SBU on a fresh build;
-   i7-4790 35 SBU with 6.0.12, no failures
-   Bruce's 3900X 19.3 SBU, his i7-12700K about 30 SBU, 12 failures
-
-   3.93:
-     Passed:             69982
-     Failed:             0
-     Failed with core:   0
-     ASan failures:      0
-     Unknown status:     2
-     TinderboxPrint:Unknown: 2
-   
-   Test Results 3.95: (Intel i9-10900k) I got close to 70 SBU [rahul] 
-
-     Passed:             69982
-     Failed:             0
-     Failed with core:   0
-     ASan failures:      0
-     Unknown status:     2
-     TinderboxPrint:Unknown: 2
-
-   Test Results 3.96: (AMD Ryzen 9 3900X) about 14 SBU [bdubbs]
-     Passed:             70289
-     Failed:             0
-     Failed with core:   0
-     ASan failures:      0
-     Unknown status:     2
-     TinderboxPrint:Unknown: 2
-
-   Test Results 3.97: (AMD Ryzen 7 1700) about 16 SBU [rahul]
-     Passed:             69809
-     Failed:             0
-     Failed with core:   0
-     ASan failures:      0
-     Unknown status:     2
-     TinderboxPrint:Unknown: 2
-
-   Test results 3.98: (Intel Xeon E5-1650v3) 25 SBU [renodr]
-     Tests summary:
-     Passed:             69919
-     Failed:             0
-     Failed with core:   0
-     ASan failures:      0
-     Unknown status:     2
-     TinderboxPrint:Unknown: 2
-
-   Test results 3.99: (AMD Ryzen 9 3900X) 14 SBU [bdubbs]
-     Tests summary:
-     Passed:             69953
-     Failed:             0
-     Failed with core:   0
-     ASan failures:      0
-     Unknown status:     2
-     TinderboxPrint:Unknown: 2
-   -->
-]>
-
-<sect1 id="nss" xreflabel="nss-&nss-version;">
-  <?dbhtml filename="nss.html"?>
-
-  <title>NSS-&nss-version;</title>
-
-  <indexterm zone="nss">
-    <primary sortas="a-NSS">NSS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NSS</title>
-
-    <para>
-      The Network Security Services (<application>NSS</application>) package is
-      a set of libraries designed to support cross-platform development of
-      security-enabled client and server applications. Applications built with
-      NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12,
-      S/MIME, X.509 v3 certificates, and other security standards. This is
-      useful for implementing SSL and S/MIME or other Internet security
-      standards into an application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nss-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nss-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nss-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nss-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nss-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nss-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/nss-&nss-version;-standalone-1.patch"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          Required patch for processors lacking the <quote>adx</quote>
-          instruction set:
-          <ulink url="&patch-root;/nss-&nss-version;-illegal_instruction-1.patch"/>
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NSS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="nspr"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> and
-      <xref role="runtime" linkend="p11-kit"/> (runtime)
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/nss"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NSS</title>
-
-<!--
-    <note>
-      <para>
-        Some old generations processors lack an assembler instruction that
-        is generated unconditionally by NSS-3.90. It leads to an
-        "illegal instruction" fault when running firefox. The availability
-        of this instruction is asserted by the <quote>adx</quote> flag
-        in <filename>/proc/cpuinfo</filename>. If this flag is not set,
-        apply the following patch:
-      </para>
-    </note>
-
-<screen><userinput>grep -q adx /proc/cpuinfo || \
-patch -Np1 -i ../nss-&nss-version;-illegal_instruction-1.patch</userinput></screen>
-
--->
-    <para>
-      Install <application>NSS</application> by running the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch &amp;&amp;
-
-cd nss &amp;&amp;
-
-make BUILD_OPT=1                      \
-  NSPR_INCLUDE_DIR=/usr/include/nspr  \
-  USE_SYSTEM_ZLIB=1                   \
-  ZLIB_LIBS=-lz                       \
-  NSS_ENABLE_WERROR=0                 \
-  $([ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1) \
-  $([ -f /usr/include/sqlite3.h ] &amp;&amp; echo NSS_USE_SYSTEM_SQLITE=1)</userinput></screen>
-
-    <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)-->:
-    </para>
-
-<screen remap="test"><userinput>cd tests &amp;&amp;
-HOST=localhost DOMSUF=localdomain ./all.sh
-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 be specified and this generic way should work for
-           everyone, provided <systemitem>localhost.localdomain</systemitem>
-           is defined
-           <phrase revision='sysv'>
-             in <filename>/etc/hosts</filename>, as done in
-             <ulink url="&lfs-root;/chapter09/network.html#ch-config-hosts">
-               the LFS book</ulink>.
-           </phrase>
-           <phrase revision='systemd'>
-             by the <systemitem class='library'>myhostname</systemitem>
-             Name Service Switch module, as specified in
-             <ulink url="&lfs-root;/chapter08/glibc.html#conf-glibc">
-               the LFS book</ulink>.
-           </phrase>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-           The tests take a 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
-           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>
-      <listitem>
-        <para>
-           A few tests might fail on some Intel machines for unknown reasons.
-        </para>
-      </listitem>
-      </itemizedlist>
-     </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cd ../dist                                                          &amp;&amp;
-
-install -v -m755 Linux*/lib/*.so              /usr/lib              &amp;&amp;
-install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib              &amp;&amp;
-
-install -v -m755 -d                           /usr/include/nss      &amp;&amp;
-cp -v -RL {public,private}/nss/*              /usr/include/nss      &amp;&amp;
-
-install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} /usr/bin &amp;&amp;
-
-install -v -m644 Linux*/lib/pkgconfig/nss.pc  /usr/lib/pkgconfig</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>BUILD_OPT=1</parameter>: This option is passed to
-      <command>make</command> so that the build is performed with no debugging
-      symbols built into the binaries and the default compiler optimizations are
-      used.
-    </para>
-
-    <para>
-      <parameter>NSPR_INCLUDE_DIR=/usr/include/nspr</parameter>: This option
-      sets the location of the nspr headers.
-    </para>
-
-    <para>
-      <parameter>USE_SYSTEM_ZLIB=1</parameter>: This option is passed to
-      <command>make</command> to ensure that the
-      <filename class="libraryfile">libssl3.so</filename> library is linked to
-      the system installed <application>zlib</application> instead of the
-      in-tree version.
-    </para>
-
-    <para>
-      <parameter>ZLIB_LIBS=-lz</parameter>: This option provides the
-      linker flags needed to link to the system <application>zlib</application>.
-    </para>
-
-    <para>
-      <command>$([ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1)</command>:
-      The <parameter>USE_64=1</parameter> option is <emphasis>required on
-      x86_64</emphasis>, otherwise <command>make</command> will try (and fail)
-      to create 32-bit objects. The [ $(uname -m) = x86_64 ] test ensures it
-      has no effect on a 32 bit system.
-    </para>
-
-    <para>
-      <command>([ -f /usr/include/sqlite3.h ] &amp;&amp; echo
-      NSS_USE_SYSTEM_SQLITE=1)</command>: This tests if
-      <application>sqlite</application> is installed and if so it
-      <command>echo</command>s the option NSS_USE_SYSTEM_SQLITE=1 to
-      <command>make</command> so that
-      <filename class="libraryfile">libsoftokn3.so</filename> will link against
-      the system version of sqlite.
-    </para>
-
-    <para>
-      <option>NSS_DISABLE_GTESTS=1</option>: If you don't need to run
-      NSS test suite, append this option to <command>make</command> command,
-      to prevent the compilation of tests and save some build time.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NSS</title>
-
-    <para>
-      If <xref linkend="p11-kit"/> is installed, the
-      <application>p11-kit</application> trust module
-      (<filename>/usr/lib/pkcs11/p11-kit-trust.so</filename>) can be used as a
-      drop-in replacement for <filename>/usr/lib/libnssckbi.so</filename> to
-      transparently make the system CAs available to
-      <application>NSS</application> aware applications, rather than the static
-      library provided by <filename>/usr/lib/libnssckbi.so</filename>. As the
-      <systemitem class="username">root</systemitem> user, execute the following
-      command:
-    </para>
-
-<screen role="root"><userinput>ln -sfv ./pkcs11/p11-kit-trust.so /usr/lib/libnssckbi.so</userinput></screen>
-
-    <para>
-      Additionally, for dependent applications that do not use the internal
-      database (<filename>/usr/lib/libnssckbi.so</filename>), the
-      <filename>/usr/sbin/make-ca</filename> script included on the
-      <xref linkend="make-ca"/> page can generate a system wide NSS DB with the
-      <parameter>-n</parameter> switch, or by modifying the
-      <filename>/etc/make-ca/make-ca.conf</filename> file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          certutil, nss-config, and pk12util
-        </seg>
-        <seg>
-          libcrmf.a, libfreebl3.so, libfreeblpriv3.so,
-          libnss3.so, libnssckbi.so, libnssckbi-testlib.so,
-          libnssdbm3.so, libnsssysinit.so, libnssutil3.so,
-          libpkcs11testmodule.so, libsmime3.so, libsoftokn3.so,
-          and libssl3.so
-        </seg>
-        <seg>
-          /usr/include/nss
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="certutil">
-        <term><command>certutil</command></term>
-        <listitem>
-          <para>
-            is the Mozilla Certificate Database Tool. It is a command-line
-            utility that can create and modify the Netscape Communicator
-            cert8.db and key3.db database files. It can also list, generate,
-            modify, or delete certificates within the cert8.db file and create
-            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
-          </para>
-          <indexterm zone="nss certutil">
-            <primary sortas="b-certutil">certutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nss-config">
-        <term><command>nss-config</command></term>
-        <listitem>
-          <para>
-            is used to determine the NSS library settings of the installed NSS
-            libraries
-          </para>
-          <indexterm zone="nss nss-config">
-            <primary sortas="b-nss-config">nss-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pk12util">
-        <term><command>pk12util</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="nss pk12util">
-            <primary sortas="b-pk12util">pk12util</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,550 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 openssh-download-http
-           "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
-  <!ENTITY openssh-download-ftp  " ">
-  <!ENTITY openssh-md5sum        "&openssh-md5sum;">
-  <!ENTITY openssh-size          "1.7 MB">
-  <!ENTITY openssh-buildsize     "45 MB (add 22 MB for tests)">
-  <!ENTITY openssh-time          "0.2 SBU (Using parallelism=4;
-                                  running the tests takes about 20 minutes,
-                                  irrespective of processor speed)">
-]>
-
-  <!-- make check: real 18m13.005s;  9.2p1  3 Feb 2023 -->
-  <!-- make check: real 18m08.654s;  9.3p1 17 Mar 2023 -->
-
-<sect1 id="openssh" xreflabel="OpenSSH-&openssh-version;">
-  <?dbhtml filename="openssh.html"?>
-
-  <title>OpenSSH-&openssh-version;</title>
-
-  <indexterm zone="openssh">
-    <primary sortas="a-OpenSSH">OpenSSH</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenSSH</title>
-
-    <para>
-      The <application>OpenSSH</application> package contains
-      <command>ssh</command> clients and the <command>sshd</command> daemon.
-      This is useful for encrypting authentication and subsequent traffic over
-      a network. The <command>ssh</command> and <command>scp</command> commands
-      are secure implementations of <command>telnet</command> and
-      <command>rcp</command> respectively.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openssh-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openssh-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openssh-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openssh-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openssh-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openssh-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/openssh-&openssh-version;-glibc_2.31_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">OpenSSH Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/> (for tests),
-      <xref linkend="linux-pam"/> (PAM configuration files from
-      <xref linkend="shadow"/> are used to create openssh ones),
-      <xref linkend="xorg7-app"/> (or
-      <xref linkend='xorg-env' role='nodep'/>, see Command Explanations),
-      <xref linkend="mitkrb"/>,
-      <xref linkend="which"/> (for tests),
-      <ulink url="https://www.thrysoee.dk/editline/">libedit</ulink>,
-      <ulink url="https://www.libressl.org/">LibreSSL Portable</ulink>,
-      <ulink url="https://github.com/OpenSC/OpenSC/wiki">OpenSC</ulink>, and
-      <ulink url="http://www.citi.umich.edu/projects/smartcard/sectok.html">libsectok</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime (Used only to gather entropy)</bridgehead>
-    <para role="optional">
-      <!--<xref role="runtime" linkend="openjdk"/>, Not seen in 8.8p1 -->
-      <xref role="runtime" linkend="net-tools"/>, and
-      <xref role="runtime" linkend="sysstat"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenSSH</title>
-
-    <para>
-      <application>OpenSSH</application> runs as two processes when connecting
-      to other computers. The first process is a privileged process and controls
-      the issuance of privileges as necessary. The second process communicates
-      with the network. Additional installation steps are necessary to set up
-      the proper environment, which are performed by issuing the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -g sys -m700 -d /var/lib/sshd &amp;&amp;
-
-groupadd -g 50 sshd        &amp;&amp;
-useradd  -c 'sshd PrivSep' \
-         -d /var/lib/sshd  \
-         -g sshd           \
-         -s /bin/false     \
-         -u 50 sshd</userinput></screen>
-<!--
-    <para>
-      Apply a patch to allow OpenSSH to build and function with
-      <application>Glibc-2.31</application> and later:
-    </para>
-
-<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
-      commands:
-    </para>
-
-<!-- -\-with-md5-passwords used to be here, but a comment inside of a <screen>
-     block leaves an eyesore. -->
-<screen><userinput>./configure --prefix=/usr                            \
-            --sysconfdir=/etc/ssh                    \
-            --with-privsep-path=/var/lib/sshd        \
-            --with-default-path=/usr/bin             \
-            --with-superuser-path=/usr/sbin:/usr/bin \
-            --with-pid-dir=/run                      &amp;&amp;
-make</userinput></screen>
-
-<!--  I got all tests passed without this with 9.3p1, June 12, 2023.
-    <para>
-      The test suite requires an installed copy of <command>scp</command> to
-      complete the multiplexing tests. To run the test suite, first copy the
-      <command>scp</command> program to
-      <filename class="directory">/usr/bin</filename>, making sure that you
-      backup any existing copy first.
-    </para>
--->
-<!--  I got all tests passed without this with 9.0p1.  Apr 13, 2022.
-    <para>
-      If you wish to run the tests, remove a test suite that is not valid on
-      Linux-based platforms:
-    </para>
-
-<screen><userinput>sed -i 's/conch-ciphers//' regress/Makefile</userinput></screen>
--->
-    <para>
-      To test the results, issue: <command>make -j1 tests</command>.
-      <!--One test, <filename>key options</filename>, fails when run in chroot.-->
-    </para>
-
-<!-- commenting this, I get "all tests passed" [ ken ]
- NB tests should be run as _user_ but the role in the comment is root
-
- commenting [ bruce ]:  There are a couple of tests that want root.
- The log mentions that SUDO is not set.  These skipped tests are
- ignored and the end says 'all tests passed' even when not root
-
-    <para>
-      To run the test suite, issue the following commands:
-    </para>
-
-<screen role="root"><userinput>make tests 2&gt;&amp;1 | tee check.log
-grep FATAL check.log</userinput></screen>
-
-    <para>
-      If the above command produces no 'FATAL' errors, then proceed with the
-      installation, 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 &amp;&amp;
-install -v -m755    contrib/ssh-copy-id /usr/bin     &amp;&amp;
-
-install -v -m644    contrib/ssh-copy-id.1 \
-                    /usr/share/man/man1              &amp;&amp;
-install -v -m755 -d /usr/share/doc/openssh-&openssh-version;     &amp;&amp;
-install -v -m644    INSTALL LICENCE OVERVIEW README* \
-                    /usr/share/doc/openssh-&openssh-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc/ssh</parameter>: This prevents the
-      configuration files from being installed in
-      <filename class="directory">/usr/etc</filename>.
-    </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 referring to deprecated
-      <filename class="directory">/var/run</filename>.
-    </para>
-<!--
-    <para>
-      <parameter>- -without-zlib-version-check</parameter>: This prevents
-      <application>OpenSSH</application> from checking the version of
-      the system <application>Zlib</application>.  We need to use this
-      switch or the version check would mistakenly report the latest
-      <application>Zlib</application> 1.13 <quote>too old</quote> and
-      reject it.
-    </para>
--->
-    <para>
-      <option>--with-pam</option>: This parameter enables
-      <application>Linux-PAM</application> support in the build.
-    </para>
-
-    <para>
-      <option>--with-xauth=$XORG_PREFIX/bin/xauth</option>: Set the default
-      location for the <command>xauth</command> binary for X authentication.
-      The environment variable <envar>XORG_PREFIX</envar> should be set
-      following <xref linkend='xorg-env'/>. This can also be controlled from
-      <filename>sshd_config</filename> with the XAuthLocation keyword. You can
-      omit this switch if <application>Xorg</application> is already installed.
-    </para>
-
-    <para>
-      <option>--with-kerberos5=/usr</option>: This option is used to
-      include Kerberos 5 support in the build.
-    </para>
-
-    <para>
-      <option>--with-libedit</option>: This option enables line editing
-      and history features for <command>sftp</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenSSH</title>
-
-    <sect3 id="openssh-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.ssh/*</filename>,
-      <filename>/etc/ssh/ssh_config</filename>, and
-      <filename>/etc/ssh/sshd_config</filename>
-        </para>
-
-      <indexterm zone="openssh openssh-config">
-        <primary sortas="e-AA.ssh">~/.ssh/*</primary>
-      </indexterm>
-
-      <indexterm zone="openssh openssh-config">
-        <primary sortas="e-etc-ssh-ssh_config">/etc/ssh/ssh_config</primary>
-      </indexterm>
-
-      <indexterm zone="openssh openssh-config">
-        <primary sortas="e-etc-ssh-sshd_config">/etc/ssh/sshd_config</primary>
-      </indexterm>
-
-      <para>
-        There are no required changes to any of these files. However,
-        you may wish to view the
-        <filename class='directory'>/etc/ssh/</filename> files and make any
-        changes appropriate for the security of your system. One recommended
-        change is that you disable
-        <systemitem class='username'>root</systemitem> login via
-        <command>ssh</command>. Execute the following command as the
-        <systemitem class='username'>root</systemitem> user to disable
-        <systemitem class='username'>root</systemitem> login via
-        <command>ssh</command>:
-      </para>
-
-<screen role="root"><userinput>echo "PermitRootLogin no" &gt;&gt; /etc/ssh/sshd_config</userinput></screen>
-
-      <para>
-        If you want to be able to log in without typing in your password, first
-        create ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub with
-        <command>ssh-keygen</command> and then copy ~/.ssh/id_rsa.pub to
-        ~/.ssh/authorized_keys on the remote computer that you want to log into.
-        You'll need to change REMOTE_USERNAME and REMOTE_HOSTNAME for the username and hostname of the remote
-        computer and you'll also need to enter your password for the ssh-copy-id command
-        to succeed:
-      </para>
-
-<screen role='nodump'><userinput>ssh-keygen &amp;&amp;
-ssh-copy-id -i ~/.ssh/id_ed25519.pub <replaceable>REMOTE_USERNAME</replaceable>@<replaceable>REMOTE_HOSTNAME</replaceable></userinput></screen>
-
-      <para>
-        Once you've got passwordless logins working it's actually more secure
-        than logging in with a password (as the private key is much longer than
-        most people's passwords). If you would like to now disable password
-        logins, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-
-<screen role="root"><userinput>echo "PasswordAuthentication no" >> /etc/ssh/sshd_config &amp;&amp;
-echo "KbdInteractiveAuthentication no" >> /etc/ssh/sshd_config</userinput></screen>
-
-      <para>
-        If you added <application>Linux-PAM</application> support and you want
-        ssh to use it then you will need to add a configuration file for
-        <application>sshd</application> and enable use of
-        <application>LinuxPAM</application>. Note, ssh only uses PAM to check
-        passwords, if you've disabled password logins these commands are not
-        needed. If you want to use PAM, issue the following commands as the
-        <systemitem class='username'>root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed 's@d/login@d/sshd@g' /etc/pam.d/login &gt; /etc/pam.d/sshd &amp;&amp;
-chmod 644 /etc/pam.d/sshd &amp;&amp;
-echo "UsePAM yes" &gt;&gt; /etc/ssh/sshd_config</userinput></screen>
-
-      <para>
-        Additional configuration information can be found in the man
-        pages for <command>sshd</command>, <command>ssh</command> and
-        <command>ssh-agent</command>.
-      </para>
-    </sect3>
-
-    <sect3  id="openssh-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To start the SSH server at system boot, install the
-        <filename>/etc/rc.d/init.d/sshd</filename> init script included
-        in the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the SSH server at system boot, install the
-        <filename>sshd.service</filename> unit included in the
-        <xref linkend="systemd-units"/> package.
-      </para>
-
-      <indexterm zone="openssh openssh-init">
-        <primary sortas="f-sshd">sshd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-sshd</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>
-          scp, sftp, <!--slogin (symlink to ssh),--> ssh, ssh-add, ssh-agent,
-          ssh-copy-id, ssh-keygen, ssh-keyscan, and sshd
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/ssh,
-          /usr/share/doc/openssh-&openssh-version;, and
-          /var/lib/sshd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scp">
-        <term><command>scp</command></term>
-        <listitem>
-          <para>
-            is a file copy program that acts like <command>rcp</command> except
-            it uses an encrypted protocol
-          </para>
-          <indexterm zone="openssh scp">
-            <primary sortas="b-scp">scp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sftp">
-        <term><command>sftp</command></term>
-        <listitem>
-          <para>
-            is an FTP-like program that works over the SSH1 and SSH2 protocols
-          </para>
-          <indexterm zone="openssh sftp">
-            <primary sortas="b-sftp">sftp</primary>
-          </indexterm>
-        </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>
-          </para>
-          <indexterm zone="openssh slogin">
-            <primary sortas="b-slogin">slogin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="ssh">
-        <term><command>ssh</command></term>
-        <listitem>
-          <para>
-            is an <command>rlogin</command>/<command>rsh</command>-like client
-            program except it uses an encrypted protocol
-          </para>
-          <indexterm zone="openssh ssh">
-            <primary sortas="b-ssh">ssh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sshd">
-        <term><command>sshd</command></term>
-        <listitem>
-          <para>
-            is a daemon that listens for <command>ssh</command> login requests
-          </para>
-          <indexterm zone="openssh sshd">
-            <primary sortas="b-sshd">sshd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssh-add">
-        <term><command>ssh-add</command></term>
-        <listitem>
-          <para>
-            is a tool which adds keys to the <command>ssh-agent</command>
-          </para>
-          <indexterm zone="openssh ssh-add">
-            <primary sortas="b-ssh-add">ssh-add</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssh-agent">
-        <term><command>ssh-agent</command></term>
-        <listitem>
-          <para>
-            is an authentication agent that can store private keys
-          </para>
-          <indexterm zone="openssh ssh-agent">
-            <primary sortas="b-ssh-agent">ssh-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssh-copy-id">
-        <term><command>ssh-copy-id</command></term>
-        <listitem>
-          <para>
-            is a script that enables logins on remote machines using local keys
-          </para>
-          <indexterm zone="openssh ssh-copy-id">
-            <primary sortas="b-ssh-copy-id">ssh-copy-id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssh-keygen">
-        <term><command>ssh-keygen</command></term>
-        <listitem>
-          <para>
-            is a key generation tool
-          </para>
-          <indexterm zone="openssh ssh-keygen">
-            <primary sortas="b-ssh-keygen">ssh-keygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssh-keyscan">
-        <term><command>ssh-keyscan</command></term>
-        <listitem>
-          <para>
-            is a utility for gathering public host keys from a number of hosts
-          </para>
-          <indexterm zone="openssh ssh-keyscan">
-            <primary sortas="b-ssh-keyscan">ssh-keyscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: stlfs/security/p11-kit.xml
===================================================================
--- postlfs/security/p11-kit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,294 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "2610cef2951d83d7037577eaae1acb54">
-  <!ENTITY p11-kit-size          "972 KB">
-  <!ENTITY p11-kit-buildsize     "95 MB (with tests)">
-  <!ENTITY p11-kit-time          "0.8 SBU (with tests)">
-]>
-
-<sect1 id="p11-kit" xreflabel="p11-kit-&p11-kit-version;">
-  <?dbhtml filename="p11-kit.html"?>
-
-
-  <title>p11-kit-&p11-kit-version;</title>
-
-  <indexterm zone="p11-kit">
-    <primary sortas="a-p11-kit">p11-kit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to p11-kit</title>
-
-    <para>
-      The <application>p11-kit</application> package provides a way to load and
-      enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&p11-kit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&p11-kit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &p11-kit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &p11-kit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &p11-kit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &p11-kit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">p11-kit Dependencies</bridgehead>
-
-    <!-- There is a check for libsystemd. It seems to install a systemd service
-    in /usr/lib/systemd/user.-->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libtasn1"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="make-ca"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>, and
-      <xref role="runtime" linkend="nss"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of p11-kit</title>
-
-    <!-- https://github.com/p11-glue/p11-kit/pull/535
-         The issue causes test failures in glib-networking and libsoup 
-         Fixed in version 0.25.1
-
-    <para>
-      Fix an issue causing some PKCS 11 modules fail to load:
-    </para>
-
-<screen><userinput>sed 's/if (gi/&amp; \&amp;\&amp; gi != C_GetInterface/' \
-    -i p11-kit/modules.c</userinput></screen>-->
-
-    <para>
-      Prepare the distribution specific anchor hook:
-    </para>
-
-<screen><userinput>sed '20,$ d' -i trust/trust-extract-compat &amp;&amp;
-
-cat &gt;&gt; trust/trust-extract-compat &lt;&lt; "EOF"
-<literal># Copy existing anchor modifications to /etc/ssl/local
-/usr/libexec/make-ca/copy-trust-modifications
-
-# Update trust stores
-/usr/sbin/make-ca -r</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>p11-kit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir p11-build &amp;&amp;
-cd    p11-build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dtrust_paths=/etc/pki/anchors &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-ln -sfv /usr/libexec/p11-kit/trust-extract-compat \
-        /usr/bin/update-ca-certificates</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>-Dtrust_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
-      use the Freebl library from <application>NSS</application> for SHA1 and
-      MD5 hashing.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</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.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring p11-kit</title>
-
-    <para>
-      The <application>p11-kit</application> trust module
-      (<filename>/usr/lib/pkcs11/p11-kit-trust.so</filename>) can be used as a
-      drop-in replacement for <filename>/usr/lib/libnssckbi.so</filename> to
-      transparently make the system CAs available to
-      <application>NSS</application> aware applications, rather than the static
-      list provided by <filename>/usr/lib/libnssckbi.so</filename>. As the
-      <systemitem class="username">root</systemitem> user, execute the
-      following commands:
-    </para>
-
-<screen role="root"><userinput>ln -sfv ./pkcs11/p11-kit-trust.so /usr/lib/libnssckbi.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          p11-kit, trust, and update-ca-certificates
-        </seg>
-        <seg>
-          libp11-kit.so and p11-kit-proxy.so
-        </seg>
-        <seg>
-          /etc/pkcs11,
-          /usr/include/p11-kit-1,
-          /usr/lib/pkcs11,
-          /usr/libexec/p11-kit,
-          /usr/share/gtk-doc/html/p11-kit, and
-          /usr/share/p11-kit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="p11-kit-prog">
-        <term><command>p11-kit</command></term>
-        <listitem>
-          <para>
-            is a command line tool that can be used to perform operations
-            on PKCS#11 modules configured on the system
-          </para>
-          <indexterm zone="p11-kit p11-kit-prog">
-            <primary sortas="b-p11-kit">p11-kit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="trust">
-        <term><command>trust</command></term>
-        <listitem>
-          <para>
-            is a command line tool to examine and modify the shared trust
-            policy store
-          </para>
-          <indexterm zone="p11-kit trust">
-            <primary sortas="b-trust">trust</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="update-ca-certificates">
-        <term><command>update-ca-certificates</command></term>
-        <listitem>
-          <para>
-            is a command line tool to both extract local certificates from an
-            updated anchor store, and regenerate all anchors and certificate
-            stores on the system. This is done unconditionally on BLFS using
-            the <parameter>--force</parameter> and <parameter>--get</parameter>
-            flags to <command>make-ca</command> and should likely not be used
-            for automated updates
-          </para>
-          <indexterm zone="p11-kit update-ca-certificates">
-            <primary sortas="b-update-ca-certificates">update-ca-certificates</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libp11-kit">
-        <term><filename class="libraryfile">libp11-kit.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to coordinate initialization and
-            finalization of any PKCS#11 module
-          </para>
-          <indexterm zone="p11-kit libp11-kit">
-            <primary sortas="c-libp11-kit">libp11-kit.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="p11-kit-proxy">
-        <term><filename class="libraryfile">p11-kit-proxy.so</filename></term>
-        <listitem>
-          <para>
-            is the PKCS#11 proxy module
-          </para>
-          <indexterm zone="p11-kit p11-kit-proxy">
-            <primary sortas="c-p11-kit-proxy">p11-kit-proxy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/pam.xml
===================================================================
--- postlfs/security/pam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ postlfs/security/pam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="postlfs-security-pam">
+<?dbhtml filename="pam.html" dir="postlfs"?>
+<title>pam</title>
+
+<para>TO BE WRITTEN - NEW</para>
+
+</sect1>
Index: stlfs/security/polkit-gnome.xml
===================================================================
--- postlfs/security/polkit-gnome.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,204 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 polkit-gnome-download-http
-           "&gnome-download-http;/polkit-gnome/&polkit-gnome-version;/polkit-gnome-&polkit-gnome-version;.tar.xz">
-  <!ENTITY polkit-gnome-download-ftp  " ">
-  <!ENTITY polkit-gnome-md5sum        "50ecad37c8342fb4a52f590db7530621">
-  <!ENTITY polkit-gnome-size          "305 KB">
-  <!ENTITY polkit-gnome-buildsize     "5.0 MB">
-  <!ENTITY polkit-gnome-time          "0.1 SBU">
-]>
-
-<sect1 id="polkit-gnome" xreflabel="polkit-gnome-&polkit-gnome-version;">
-  <?dbhtml filename="polkit-gnome.html"?>
-
-
-  <title>polkit-gnome-&polkit-gnome-version;</title>
-
-  <indexterm zone="polkit-gnome">
-    <primary sortas="a-polkit-gnome">polkit-gnome</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Polkit GNOME</title>
-
-    <para>
-      The <application>Polkit GNOME</application> package provides an
-      Authentication Agent for <application>Polkit</application> that integrates
-      well with the <application>GNOME</application> Desktop environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&polkit-gnome-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&polkit-gnome-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &polkit-gnome-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &polkit-gnome-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &polkit-gnome-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &polkit-gnome-time;
-        </para>
-      </listitem>
-    </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="polkit"/>
-    </para>
-
-  </sect2>
-
-  <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>
-      Install <application>Polkit GNOME</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="configuration">
-    <title>Configuring Polkit GNOME</title>
-
-    <sect3>
-
-      <title>Automatic Startup</title>
-
-      <para>
-        For the authentication framework to work,
-        <command>polkit-gnome-authentication-agent-1</command> needs to be
-        started. However, <command>make install</command> did not
-        install a startup file for the <application>Polkit GNOME</application>
-        so you have to create it by yourself.
-      </para>
-
-      <para>
-        Issue the following commands as the
-        <systemitem class="username">root</systemitem> user to create
-        a startup file for <application>Polkit GNOME</application>:
-     </para>
-
-<screen role="root"><userinput>mkdir -p /etc/xdg/autostart &amp;&amp;
-cat &gt; /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Comment=PolicyKit Authentication Agent
-Exec=/usr/libexec/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=GNOME;XFCE;Unity;
-AutostartCondition=GNOME3 unless-session gnome</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          polkit-gnome-authentication-agent-1
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="polkit-gnome-authentication-agent-1">
-        <term><command>polkit-gnome-authentication-agent-1</command></term>
-        <listitem>
-          <para>
-            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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,429 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 polkit-download-http "https://gitlab.freedesktop.org/polkit/polkit/-/archive/&polkit-version;/polkit-&polkit-version;.tar.gz">
-  <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "97db655618e1483706fbc764787c7d6e">
-  <!ENTITY polkit-size          "744 KB">
-  <!ENTITY polkit-buildsize     "7.2 MB (with tests)">
-  <!ENTITY polkit-time          "0.3 SBU (with tests; using parallelism=4)">
-]>
-
-<sect1 id="polkit" xreflabel="Polkit-&polkit-version;">
-  <?dbhtml filename="polkit.html"?>
-
-
-  <title>Polkit-&polkit-version;</title>
-
-  <indexterm zone="polkit">
-    <primary sortas="a-Polkit">Polkit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Polkit</title>
-
-    <para>
-      <application>Polkit</application> is a toolkit for defining and handling
-      authorizations. It is used for allowing unprivileged processes to
-      communicate with privileged processes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&polkit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&polkit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &polkit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &polkit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &polkit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &polkit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/polkit-&polkit-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/polkit-&polkit-version;-js91-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- For jhalfs just make it required to avoid over-complexity. -->
-      <xref role="required" linkend="duktape"/>,
-      <xref linkend="libxslt"/>,<phrase revision="systemd"> and</phrase>
-      <xref linkend="linux-pam"/><phrase revision="sysv">, and
-        <xref linkend="elogind"/>
-      </phrase>
-    </para>
-
-    <note>
-      <para>
-        Since <phrase revision="sysv"><command>elogind</command></phrase>
-        <phrase revision="systemd"><command>systemd-logind</command></phrase>
-        uses PAM to register user sessions, it is a good idea to build
-        <application>Polkit</application> with PAM support so
-        <phrase revision="sysv"><command>elogind</command></phrase>
-        <phrase revision="systemd"><command>systemd-logind</command></phrase>
-        can track <application>Polkit</application> sessions.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="python-dbusmock"/>, and
-      <xref linkend="spidermonkey"/> (can be used in place of duktape)
-    </para>
-
-    <bridgehead renderas="sect4" revision="systemd">Required Runtime Dependencies</bridgehead>
-    <para role="required" revision="systemd">
-      <xref role="runtime" linkend="systemd"/>
-    </para>
-
-    <bridgehead renderas="sect4" id="polkit-agent" xreflabel="Polkit Authentication Agent">
-      Optional Runtime Dependencies
-    </bridgehead>
-    <para role="optional">
-      One polkit authentication agent for using polkit in the graphical
-      environment:
-      <application>polkit-kde-agent</application> in
-      <xref role="runtime" linkend="plasma-build"/> for KDE,
-      the agent built in
-      <xref role="runtime" linkend="gnome-shell"/> for GNOME3,
-      <xref role="runtime" linkend="polkit-gnome"/> for XFCE, and
-      <xref role="runtime" linkend="lxqt-policykit"/> for LXQt
-    </para>
-
-    <note>
-      <para>
-        If <xref linkend="libxslt"/> is installed,
-        then <xref linkend="DocBook"/> and <xref linkend="docbook-xsl"/> are
-        required. If you have installed <xref linkend="libxslt"/>, but you do
-        not want to install any of the DocBook packages mentioned, you will
-        need to use <option>-Dman=false</option> in the instructions
-        below.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Polkit</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>polkitd</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -fg 27 polkitd &amp;&amp;
-useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
-        -g polkitd -s /bin/false polkitd</userinput></screen>
-
-    <para revision='sysv'>
-      First fix a build problem for sysV based systems:
-    </para>
-
-<screen revision="sysv"><userinput>sed -i '/systemd_sysusers_dir/s/^/#/' meson.build</userinput></screen>
-
-    <para>
-      Install <application>Polkit</application> by running the following
-      commands:
-    </para>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                            \
-      --prefix=/usr                       \
-      --buildtype=release                 \
-      -Dman=true                          \
-      -Dsession_tracking=libsystemd-login \
-      -Dtests=true                        &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                      \
-      --prefix=/usr                 \
-      --buildtype=release           \
-      -Dman=true                    \
-      -Dsession_tracking=libelogind \
-      -Dtests=true                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, first ensure that the system
-      <application>D-Bus</application> daemon is running,
-      and both <xref linkend='dbus-python'/> and
-      <xref linkend='python-dbusmock'/> are installed.
-      Then 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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dtests=true</parameter>: This switch allows to run the
-      test suite of this package.  As <application>Polkit</application> is
-      used for authorizations, its integrity can affect system security.
-      So it's recommended to run the test suite building this package.
-    </para>
-
-    <para>
-      <option>-Djs_engine=mozjs</option>: This switch allows using the
-      <xref linkend="spidermonkey"/> JavaScript engine instead of the
-      <xref linkend='duktape'/> JavaScript engine.
-    </para>
-
-    <!--
-    <para revision="sysv">
-      <parameter>- -disable-libsystemd-login</parameter>: This switch forces
-      polkit to build with elogind support (if available) rather than
-      systemd-logind.
-    </para>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-    -->
-
-    <para>
-      <option>-Dos_type=lfs</option>: Use this switch if you did not create
-      the <filename>/etc/lfs-release</filename> file or distribution auto
-      detection will fail and you will be unable to use
-      <application>Polkit</application>.
-    </para>
-
-    <para>
-      <option>-Dauthfw=shadow</option>: This switch enables the
-      package to use the <application>Shadow</application> rather than the
-      <application>Linux PAM</application> Authentication framework. Use it
-      if you have not installed <application>Linux PAM</application>.
-    </para>
-
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-    -->
-
-    <para>
-      <option>-Dintrospection=false</option>: Use this option if you are certain
-      that you do not need gobject-introspection files for polkit, or do not have
-      installed <xref linkend='glib2'/> with GObject Introspection.
-    </para>
-
-    <para>
-      <option>-Dman=false</option>: Use this option to disable generating and
-      installing manual pages. This is useful if libxslt is not installed.
-    </para>
-
-    <para>
-      <option>-Dexamples=true</option>: Use this option to build the example
-      programs.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this option to enable building and
-      installing the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pkaction, pkcheck, <!--pk-example-frobnicate,--> pkexec,
-          pkttyagent, and polkitd
-        </seg>
-        <seg>
-          libpolkit-agent-1.so and
-          libpolkit-gobject-1.so
-        </seg>
-        <seg>
-          /etc/polkit-1,
-          /usr/include/polkit-1,
-          /usr/lib/polkit-1,
-          /usr/share/gtk-doc/html/polkit-1, and
-          /usr/share/polkit-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkaction">
-        <term><command>pkaction</command></term>
-        <listitem>
-          <para>
-            is used to obtain information about registered PolicyKit actions
-          </para>
-          <indexterm zone="polkit pkaction">
-            <primary sortas="b-pkaction">pkaction</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkcheck">
-        <term><command>pkcheck</command></term>
-        <listitem>
-          <para>
-            is used to check whether a process is authorized for action
-          </para>
-          <indexterm zone="polkit pkcheck">
-            <primary sortas="b-pkcheck">pkcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="pk-example-frobnicate">
-        <term><command>pk-example-frobnicate</command></term>
-        <listitem>
-          <para>
-            is an example program to test the <command>pkexec</command>
-            command
-          </para>
-          <indexterm zone="polkit pk-example-frobnicate">
-            <primary sortas="b-pk-example-frobnicate">pk-example-frobnicate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="pkexec">
-        <term><command>pkexec</command></term>
-        <listitem>
-          <para>
-            allows an authorized user to execute a command as another user
-          </para>
-          <indexterm zone="polkit pkexec">
-            <primary sortas="b-pkexec">pkexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkttyagent">
-        <term><command>pkttyagent</command></term>
-        <listitem>
-          <para>
-            is used to start a textual authentication agent for the subject
-          </para>
-          <indexterm zone="polkit pkttyagent">
-            <primary sortas="b-pkttyagent">pkttyagent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="polkitd">
-        <term><command>polkitd</command></term>
-        <listitem>
-          <para>
-            provides the org.freedesktop.PolicyKit1 <application>D-Bus</application>
-            service on the system message bus
-          </para>
-          <indexterm zone="polkit polkitd">
-            <primary sortas="b-polkitd">polkitd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpolkit-agent-1">
-        <term><filename class="libraryfile">libpolkit-agent-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Polkit</application> authentication
-            agent API functions
-          </para>
-          <indexterm zone="polkit libpolkit-agent-1">
-            <primary sortas="c-libpolkit-agent-1">libpolkit-agent-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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
-          </para>
-          <indexterm zone="polkit libpolkit-gobject-1">
-            <primary sortas="c-libpolkit-gobject-1">libpolkit-gobject-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/security.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,95 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="postlfs-security">
+<?dbhtml filename="security.html" dir="postlfs"?>
+<title>Security</title>
 
-<chapter id="postlfs-security">
-  <?dbhtml filename="security.html"?>
-
-  <title>Security</title>
-
-  <para>
-    Security takes many forms in a computing environment. After some
-    initial discussion, this chapter
-    gives examples of three different types of security: access, prevention
-    and detection.
-  </para>
-
-  <para>
-    Access for users is usually handled by <command>login</command> or an
-    application designed to handle the login function. In this chapter, we show
-    how to enhance <command>login</command> by setting policies with
-    <application>PAM</application> modules.  Access via networks can also be
-    secured by policies set by <application>iptables</application>, commonly
-    referred to as a firewall. The Network Security Services (NSS) and
-    Netscape Portable Runtime (NSPR) libraries can be installed and shared
-    among the many applications requiring them. For applications that don't
-    offer the best security, you can use the
-    <application>Stunnel</application> package to wrap an application daemon
-    inside an SSL tunnel.
-  </para>
-
-  <para>
-    Prevention of breaches, like a trojan, are assisted by applications like
-    <application>GnuPG</application>, specifically the ability to confirm
-    signed packages, which recognizes modifications of the tarball
-    after the packager creates it.
-  </para>
-
-  <para>
-    Finally, we touch on detection with a package that stores "signatures"
-    of critical files (defined by the administrator) and then regenerates those
-    "signatures" and compares for files that have been changed.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make-ca.xml"/>
-
-  <!-- sysv only -->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cryptsetup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnutls.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpgme.xml"/>
-<!-- archive
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="haveged.xml"/>
--->
-<!-- Leave in alphabetical order of now -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboauth.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpwquality.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nettle.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/> -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl10.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p11-kit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ssh-askpass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stunnel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sudo.xml"/>
-  <!-- comment out until shadow really abandon su -->
-  <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tripwire.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="volume_key.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nftables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalld.xml"/>-->
+&postlfs-security-shadow;
+&iptables;
+&postlfs-security-fw;
+&postlfs-security-nessus;
+&postlfs-security-tripwire;
+&postlfs-security-pam;
+&postlfs-security-syslog;
 
 </chapter>
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/shadow.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,632 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-security-shadow">
+<?dbhtml filename="shadow.html" dir="postlfs"?>
+<title>Configuring shadow</title>
 
-  <!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        "006b0856abd49b5e7b45b7cb78ca272a">
-  <!ENTITY shadow-size          "1.7 MB">
-  <!ENTITY shadow-buildsize     "39 MB">
-  <!ENTITY shadow-time          "0.2 SBU">
-]>
-
-<sect1 id="shadow" xreflabel="Shadow-&shadow-version;">
-  <?dbhtml filename="shadow.html"?>
-
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Shadow</title>
-
-    <para>
-      <application>Shadow</application> was indeed installed in LFS and there is
-      no reason to reinstall it unless you installed
-      <application>CrackLib</application> or
-      <application>Linux-PAM</application> after your LFS system was completed.
-      If you have installed <application>CrackLib</application> after LFS, then
-      reinstalling <application>Shadow</application> will enable strong password
-      support. If you have installed <application>Linux-PAM</application>,
-      reinstalling <application>Shadow</application> will allow programs such as
-      <command>login</command> and <command>su</command> to utilize PAM.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&shadow-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&shadow-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &shadow-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &shadow-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &shadow-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &shadow-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/shadow-&shadow-version;-useradd_segfault-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Shadow Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="linux-pam"/> or
-      <xref role="nodep" linkend="cracklib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://libbsd.freedesktop.org/wiki/">libbsd</ulink> and
-      <ulink url="https://www.openwall.com/tcb/">tcb</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <important>
-      <para>
-        The installation commands shown below are for installations where
-        <application>Linux-PAM</application> has been installed and
-        <application>Shadow</application> is being reinstalled to support the
-        <application>Linux-PAM</application> installation.
-      </para>
-
-      <para>
-        If you are reinstalling <application>Shadow</application> to provide
-        strong password support using the <application>CrackLib</application>
-        library without using <application>Linux-PAM</application>, ensure you
-        add the <parameter>--with-libcrack</parameter> parameter to the
-        <command>configure</command> script below and also issue the following
-        command:
-      </para>
-
-<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
-    </important>
-
-    <warning>
-      <para>
-        If reinstalling shadow for a version update, be sure to 
-        reaccomplish the Linux-PAM configuration below.  The installation
-        of shadow overwrites many of the files in 
-        <filename class="directory">/etc/pam.d/</filename>.
-      </para>
-    </warning>
-
-    <para>
-      Reinstall <application>Shadow</application> by running the following
-      commands:
-    </para>
-<!--
-<screen><userinput>patch -Np1 -i ../shadow-4.10-useradd_segfault-1.patch &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;
-find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \; &amp;&amp;
-find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \; &amp;&amp;
-
-sed -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD YESCRYPT@' \
-    -e 's@/var/spool/mail@/var/mail@'                   \
-    -e '/PATH=/{s@/sbin:@@;s@/bin:@@}'                  \
-    -i etc/login.defs                                   &amp;&amp;
-
-./configure --sysconfdir=/etc   \
-            --disable-static    \
-            --without-libbsd    \
-            --with-{b,yes}crypt &amp;&amp;<!--
-This is the default:            - -with-group-name-max-length=32 &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 exec_prefix=/usr pamddir= install</userinput></screen>
-
-    <para>
-      The man pages were installed in LFS, but if reinstallation is
-      desired, run (as the <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>make -C man install-man</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/groups$(EXEEXT) //' src/Makefile.in</command>: This sed
-      is used to suppress the installation of the <command>groups</command>
-      program as the version from the <application>Coreutils</application>
-      package installed during LFS is preferred.
-    </para>
-
-    <para>
-      <command>find man -name Makefile.in -exec ... {} \;</command>: The
-      first command is used to suppress the installation of the
-      <command>groups</command> man pages so the existing ones installed from
-      the <application>Coreutils</application> package are not replaced.
-      The two other commands prevent installation of manual pages that
-      are already installed by <application>Man-pages</application> in LFS.
-    </para>
-
-    <para>
-      <command>sed -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD YESCRYPT@' -e
-        's@/var/spool/mail@/var/mail@' -e '/PATH=/{s@/sbin:@@;s@/bin:@@}'
-        -i etc/login.defs</command>: Instead of using the default 'DES'
-      method, this command modifies the installation to use the much more
-      secure 'YESCRYPT' method of hashing passwords, which also allows
-      passwords longer than eight characters.  The command also changes the
-      obsolete <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>
-      <parameter>--without-libbsd</parameter>: Prevents looking for the
-      <command>readpassphrase</command> function, which can be found only in
-      <filename class="libraryfile">libbsd</filename>, which we do not
-      have in BLFS. An internal implementation of
-      <command>readpassphrase</command> is used instead.
-    </para>
-
-    <para>
-      <parameter>pamddir=</parameter>: Prevents installation of the shipped
-      PAM configuration files into
-      <filename class='directory'>/etc/pam.d</filename>. The shipped
-      configuration does not work with the BLFS PAM configuration and we
-      will create these configuration files explicitly.
-    </para>
-
-<!-- This is the default
-    <para>
-      <parameter>-\-with-group-name-max-length=32</parameter>: The maximum
-      user name is 32 characters. Make the maximum group name the same.
-    </para>
-    -->
-<!--
-    <para>
-      <parameter>-\-without-su</parameter>: Don't reinstall
-      <command>su</command> because upstream recommends using the
-      <command>su</command> command from <xref linkend='util-linux'/>
-      when <application>Linux-PAM</application> is available.
-    </para>
--->
-  </sect2>
-
-<!-- Now, /etc/default/useradd is not reinstalled anymore, and this
-     configuration has been done in lfs
-  <sect2 role="configuration">
-    <title>Configuring Shadow</title>
-
-    <para>
-      <application>Shadow</application>'s stock configuration for the
-      <command>useradd</command> utility may not be desirable for your
-      installation. One default parameter causes <command>useradd</command> to
-      create a mailbox file for any newly created user.
-      <command>useradd</command> will make the group ownership of this file to
-      the <systemitem class="groupname">mail</systemitem> group with 0660
-      permissions. If you would prefer that these mailbox files are not created
-      by <command>useradd</command>, issue the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>sed -i 's/yes/no/' /etc/default/useradd</userinput></screen>
-  </sect2>
--->
-  <sect2 role="configuration">
-    <title>Configuring Linux-PAM to Work with Shadow</title>
-
-    <note>
-      <para>
-        The rest of this page is devoted to configuring
-        <application>Shadow</application> to work properly with
-        <application>Linux-PAM</application>. If you do not have
-        <application>Linux-PAM</application> installed, and you reinstalled
-        <application>Shadow</application> to support strong passwords via the
-        <application>CrackLib</application> library, no further configuration is
-        required.
-      </para>
-    </note>
-
-    <sect3 id="pam.d">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/pam.d/*</filename> or alternatively
-        <filename>/etc/pam.conf</filename>,
-        <filename>/etc/login.defs</filename> and
-        <filename>/etc/security/*</filename>
-      </para>
-
-      <indexterm zone="shadow pam.d">
-        <primary sortas="e-etc-pam.d">/etc/pam.d/*</primary>
-      </indexterm>
-
-      <indexterm zone="shadow pam.d">
-        <primary sortas="e-etc-pam.conf">/etc/pam.conf</primary>
-      </indexterm>
-
-      <indexterm zone="shadow pam.d">
-        <primary sortas="e-etc-login.defs">/etc/login.defs</primary>
-      </indexterm>
-
-      <indexterm zone="shadow pam.d">
-        <primary sortas="e-etc-security">/etc/security/*</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Configuring your system to use <application>Linux-PAM</application> can
-        be a complex task. The information below will provide a basic setup so
-        that <application>Shadow</application>'s login and password
-        functionality will work effectively with
-        <application>Linux-PAM</application>. Review the information and links
-        on the <xref linkend="linux-pam"/> page for further configuration
-        information. For information specific to integrating
-        <application>Shadow</application>, <application>Linux-PAM</application>
-        and <application>libpwquality</application>, you can visit the
-        following link:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <!-- Old URL redirects to here. -->
-          <para>
-            <ulink url="https://deer-run.com/users/hal/linux_passwords_pam.html"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <sect4 id="pam-login-defs">
-        <title>Configuring /etc/login.defs</title>
-
-        <para>
-          The <command>login</command> program currently performs many functions
-          which <application>Linux-PAM</application> modules should now handle.
-          The following <command>sed</command> command will comment out the
-          appropriate lines in <filename>/etc/login.defs</filename>, and stop
-          <command>login</command> from performing these functions (a backup
-          file named <filename>/etc/login.defs.orig</filename> is also created
-          to preserve the original file's contents). Issue the following
-          commands as the <systemitem class="username">root</systemitem> user:
-        </para>
-
-        <indexterm zone="shadow pam-login-defs">
-          <primary sortas="e-etc-login.defs">/etc/login.defs</primary>
-        </indexterm>
-
-<screen role="root"><userinput>install -v -m644 /etc/login.defs /etc/login.defs.orig &amp;&amp;
-for FUNCTION in FAIL_DELAY               \
-                FAILLOG_ENAB             \
-                LASTLOG_ENAB             \
-                MAIL_CHECK_ENAB          \
-                OBSCURE_CHECKS_ENAB      \
-                PORTTIME_CHECKS_ENAB     \
-                QUOTAS_ENAB              \
-                CONSOLE MOTD_FILE        \
-                FTMP_FILE NOLOGINS_FILE  \
-                ENV_HZ PASS_MIN_LEN      \
-                SU_WHEEL_ONLY            \
-                CRACKLIB_DICTPATH        \
-                PASS_CHANGE_TRIES        \
-                PASS_ALWAYS_WARN         \
-                CHFN_AUTH ENCRYPT_METHOD \
-                ENVIRON_FILE
-do
-    sed -i "s/^${FUNCTION}/# &amp;/" /etc/login.defs
-done</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>Configuring the /etc/pam.d/ Files</title>
-
-        <para>
-          As mentioned previously in the <application>Linux-PAM</application>
-          instructions, <application>Linux-PAM</application> has two supported
-          methods for configuration. The commands below assume that you've
-          chosen to use a directory based configuration, where each program has
-          its own configuration file.  You can optionally use a single
-          <filename>/etc/pam.conf</filename> configuration file by using the
-          text from the files below, and supplying the program name as an
-          additional first field for each line.
-        </para>
-
-        <para>
-          As the <systemitem class="username">root</systemitem> user, create
-          the following <application>Linux-PAM</application> configuration files
-          in the <filename class="directory">/etc/pam.d/</filename> directory
-          (or add the contents to the <filename>/etc/pam.conf</filename> file)
-          using the following commands:
-        </para>
-      </sect4>
-
-      <sect4>
-        <title>'login'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/login &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/login
-
-# Set failure delay before next prompt to 3 seconds
-auth      optional    pam_faildelay.so  delay=3000000
-
-# Check to make sure that the user is allowed to login
-auth      requisite   pam_nologin.so
-
-# Check to make sure that root is allowed to login
-# Disabled by default. You will need to create /etc/securetty
-# file for this module to function. See man 5 securetty.
-#auth      required    pam_securetty.so
-
-# Additional group memberships - disabled by default
-#auth      optional    pam_group.so
-
-# include system auth settings
-auth      include     system-auth
-
-# check access for the user
-account   required    pam_access.so
-
-# include system account settings
-account   include     system-account
-
-# Set default environment variables for the user
-session   required    pam_env.so
-
-# Set resource limits for the user
-session   required    pam_limits.so
-
-# Display the message of the day - Disabled by default
-#session   optional    pam_motd.so
-
-# Check user's mail - Disabled by default
-#session   optional    pam_mail.so      standard quiet
-
-# include system session and password settings
-session   include     system-session
-password  include     system-password
-
-# End /etc/pam.d/login</literal>
-EOF</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>'passwd'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/passwd &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/passwd
-
-password  include     system-password
-
-# End /etc/pam.d/passwd</literal>
-EOF</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>'su'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/su &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/su
-
-# always allow root
-auth      sufficient  pam_rootok.so
-
-# Allow users in the wheel group to execute su without a password
-# disabled by default
-#auth      sufficient  pam_wheel.so trust use_uid
-
-# include system auth settings
-auth      include     system-auth
-
-# limit su to users in the wheel group
-# disabled by default
-#auth      required    pam_wheel.so use_uid
-
-# include system account settings
-account   include     system-account
-
-# Set default environment variables for the service user
-session   required    pam_env.so
-
-# include system session settings
-session   include     system-session
-
-# End /etc/pam.d/su</literal>
-EOF</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>'chpasswd' and 'newusers'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/chpasswd &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/chpasswd
-
-# always allow root
-auth      sufficient  pam_rootok.so
-
-# include system auth and account settings
-auth      include     system-auth
-account   include     system-account
-password  include     system-password
-
-# End /etc/pam.d/chpasswd</literal>
-EOF
-
-sed -e s/chpasswd/newusers/ /etc/pam.d/chpasswd >/etc/pam.d/newusers</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>'chage'</title>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/chage &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/chage
-
-# always allow root
-auth      sufficient  pam_rootok.so
-
-# include system auth and account settings
-auth      include     system-auth
-account   include     system-account
-
-# End /etc/pam.d/chage</literal>
-EOF</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>Other shadow utilities</title>
-
-<screen role="root"><userinput>for PROGRAM in chfn chgpasswd chsh groupadd groupdel \
-               groupmems groupmod useradd userdel usermod
-do
-    install -v -m644 /etc/pam.d/chage /etc/pam.d/${PROGRAM}
-    sed -i "s/chage/$PROGRAM/" /etc/pam.d/${PROGRAM}
-done</userinput></screen>
-
-        <warning>
-          <para>
-            At this point, you should do a simple test to see if
-            <application>Shadow</application> is working as expected. Open
-            another terminal and log in as
-            <systemitem class="username">root</systemitem>, and then run
-            <command>login</command> and login as another user.  If you do
-            not see any errors, then all is well and you should proceed with
-            the rest of the configuration. If you did receive errors, stop
-            now and double check the above configuration files manually.
-            Any error is the sign of an error in the above procedure.
-            You can also run the
-            test suite from the <application>Linux-PAM</application> package
-            to assist you in determining the problem. If you cannot find and
-            fix the error, you should recompile
-            <application>Shadow</application> adding the
-            <option>--without-libpam</option> switch to the
-            <command>configure</command> command in the above instructions
-            (also move the <filename>/etc/login.defs.orig</filename> backup
-            file to <filename>/etc/login.defs</filename>). If you fail to do
-            this and the errors remain, you will be unable to log into your
-            system.
-          </para>
-        </warning>
-      </sect4>
-
-      <sect4 id="pam-access">
-        <title>Configuring Login Access</title>
-
-        <para>
-          Instead of using the <filename>/etc/login.access</filename> file for
-          controlling access to the system, <application>Linux-PAM</application>
-          uses the <filename class='libraryfile'>pam_access.so</filename> module
-          along with the <filename>/etc/security/access.conf</filename> file.
-          Rename the <filename>/etc/login.access</filename> file using the
-          following command:
-        </para>
-
-        <indexterm zone="shadow pam-access">
-          <primary sortas="e-etc-security-access.conf">/etc/security/access.conf</primary>
-        </indexterm>
-<!-- to editors: it is a common belief that:
-        if <condition>; then <command>; fi
-     is equivalent to:
-        <condition> && <command>
-     This is not true in bash; try:
-        ([ 0 = 1 ] && echo not reachable); echo $? # echoes 1
-     vs
-        (if [ 0 = 1 ]; then echo not reachable; fi); echo $? # echoes 0
-     So in scripts that may call subshells (for example through sudo) and
-     that need error reporting, the outcome _is_ different. In all
-     cases, for bash, the "if" form should be preferred.-->
-<screen role="root"><userinput>if [ -f /etc/login.access ]; then mv -v /etc/login.access{,.NOUSE}; fi</userinput></screen>
-      </sect4>
-
-      <sect4 id="pam-limits">
-        <title>Configuring Resource Limits</title>
-
-        <para>
-          Instead of using the <filename>/etc/limits</filename> file for
-          limiting usage of system resources,
-          <application>Linux-PAM</application> uses the
-          <filename class='libraryfile'>pam_limits.so</filename> module along
-          with the <filename>/etc/security/limits.conf</filename> file. Rename
-          the <filename>/etc/limits</filename> file using the following command:
-        </para>
-
-        <indexterm zone="shadow pam-limits">
-          <primary sortas="e-etc-security-limits.conf">/etc/security/limits.conf</primary>
-        </indexterm>
-
-<screen role="root"><userinput>if [ -f /etc/limits ]; then mv -v /etc/limits{,.NOUSE}; fi</userinput></screen>
-
-        <caution>
-          <para>
-          Be sure to test the login capabilities of the system before logging
-          out.  Errors in the configuration can cause a permanent
-          lockout requiring a boot from an external source to correct the
-          problem.
-          </para>
-        </caution>
-
-      </sect4>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>
-      A list of the installed files, along with their short descriptions can be
-      found at
-      <ulink url="&lfs-root;/chapter08/shadow.html#contents-shadow"/>.
-    </para>
-
-  </sect2>
+<para>TO BE WRITTEN - NEW</para>
 
 </sect1>
Index: stlfs/security/ssh-askpass.xml
===================================================================
--- postlfs/security/ssh-askpass.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ssh-askpass-download-http
-    "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
-  <!ENTITY ssh-askpass-download-ftp  " ">
-  <!ENTITY ssh-askpass-md5sum        "&openssh-md5sum;">
-  <!ENTITY ssh-askpass-size          "1.8 MB">
-  <!ENTITY ssh-askpass-buildsize     "10 MB">
-  <!ENTITY ssh-askpass-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="ssh-askpass" xreflabel="ssh-askpass-&ssh-askpass-version;">
-  <?dbhtml filename="ssh-askpass.html"?>
-
-
-  <title>ssh-askpass-&ssh-askpass-version;</title>
-
-  <indexterm zone="ssh-askpass">
-    <primary sortas="a-ssh-askpass">ssh-askpass</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ssh-askpass</title>
-
-  <para>
-    The <application>ssh-askpass</application> is a generic executable name for
-    many packages, with similar names, that provide a interactive X service to
-    grab password for packages requiring administrative privileges to be run.
-    It prompts the user with a window box where the necessary password can be
-    inserted. Here, we choose Damien Miller's package distributed in the
-    <application>OpenSSH</application> tarball.</para>
-
-  &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ssh-askpass-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ssh-askpass-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ssh-askpass-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ssh-askpass-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ssh-askpass-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ssh-askpass-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ssh-askpass Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref role="runtime" linkend="sudo"/> (runtime),
-      <xref linkend="xorg7-lib"/>, and
-      <xref role="runtime" linkend="x-window-system"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ssh-askpass</title>
-
-    <para>
-      Install <application>ssh-askpass</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd contrib &amp;&amp;
-make gnome-ssh-askpass3</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755                    /usr/libexec/openssh/contrib  &amp;&amp;
-install -v -m755    gnome-ssh-askpass3 /usr/libexec/openssh/contrib  &amp;&amp;
-ln -sv -f contrib/gnome-ssh-askpass3   /usr/libexec/openssh/ssh-askpass</userinput></screen>
-
-    <para>
-     The use of /usr/libexec/openssh/contrib and a symlink is justified by the
-     eventual necessity of a different program for that service.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ssh-askpass</title>
-
-    <sect3 id="ssh-askpass-config">
-      <title>Configuration Information</title>
-
-        <para>
-          As the <systemitem class="username">root</systemitem> user, configure
-          <xref linkend="sudo"/> to use <application>ssh-askpass</application>:
-        </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sudo.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Path to askpass helper program
-Path askpass /usr/libexec/openssh/ssh-askpass</literal>
-EOF
-chmod -v 0644 /etc/sudo.conf</userinput></screen>
-
-        <para>
-          If a given graphical &lt;application&gt; requires administrative
-          privileges, use <command>sudo -A &lt;application&gt;</command> from an
-          x-terminal, from a Window Manager menu and/or replace
-          "Exec=&lt;application&gt; ..." by
-          "Exec=sudo -A &lt;application&gt; ..." in the
-          &lt;application&gt;.desktop file.
-        </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-ssh-askpass3, ssh-askpass (symlink to
-          <filename>gnome-ssh-askpass3</filename>)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/libexec/openssh/contrib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,391 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 stunnel-download-http "https://www.stunnel.org/downloads/archive/5.x/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-download-ftp  " ">
-  <!ENTITY stunnel-md5sum        "61d35d2df1b96b23ed6fb20cf5ddb613">
-  <!ENTITY stunnel-size          "880 KB">
-  <!ENTITY stunnel-buildsize     "7.5 MB">
-  <!ENTITY stunnel-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="stunnel" xreflabel="stunnel-&stunnel-version;">
-  <?dbhtml filename="stunnel.html"?>
-
-
-  <title>stunnel-&stunnel-version;</title>
-
-  <indexterm zone="stunnel">
-    <primary sortas="a-stunnel">stunnel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to stunnel</title>
-
-    <para>
-      The <application>stunnel</application> package contains a program
-      that allows you to encrypt arbitrary TCP connections inside SSL (Secure
-      Sockets Layer) so you can easily communicate with clients over secure
-      channels. <!--<application>stunnel</application> can be used to add SSL
-      functionality to commonly used <application>Inetd</application> daemons
-      such as POP-2, POP-3, and IMAP servers, along with standalone daemons
-      such as NNTP, SMTP, and HTTP.--> <application>stunnel</application> can
-      also be used to tunnel PPP over network sockets without changes to the
-      server package source code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&stunnel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&stunnel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &stunnel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &stunnel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &stunnel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &stunnel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">stunnel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>,
-      <ulink url="https://netcat.sourceforge.net/">netcat</ulink>
-      (required for tests),
-      <ulink url="http://ftp.porcupine.org/pub/security/index.html">tcpwrappers</ulink>,
-      and
-      <ulink url="https://dist.torproject.org/">TOR</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of stunnel</title>
-
-    <para>
-      The <command>stunnel</command> daemon will be run in a
-      <command>chroot</command> jail by an unprivileged user. Create the
-      new user and group using the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 51 stunnel &amp;&amp;
-useradd -c "stunnel Daemon" -d /var/lib/stunnel \
-        -g stunnel -s /bin/false -u 51 stunnel</userinput></screen>
-
-    <note>
-      <para>
-        A signed SSL Certificate and a Private Key is necessary to run the
-        <command>stunnel</command> daemon. After the package is installed,
-        there are instructions to generate them. However, if you own or have
-        already created a signed SSL Certificate you wish to use, copy it to
-        <filename>/etc/stunnel/stunnel.pem</filename> before starting the
-        build (ensure only <systemitem class="username">root</systemitem> has
-        read and write access). The <filename class="extension">.pem</filename>
-        file must be formatted as shown below:
-      </para>
-
-<screen><literal>-----BEGIN PRIVATE KEY-----
-<replaceable>&lt;many encrypted lines of private key&gt;</replaceable>
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-<replaceable>&lt;many encrypted lines of certificate&gt;</replaceable>
------END CERTIFICATE-----
------BEGIN DH PARAMETERS-----
-<replaceable>&lt;encrypted lines of dh parms&gt;</replaceable>
------END DH PARAMETERS-----</literal></screen>
-
-    </note>
-
-    <para>
-      Install <application>stunnel</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-systemd    &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed the optional netcat application, the
-      regression tests can be run with <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/stunnel-&stunnel-version; install</userinput></screen>
-
-    <para revision="systemd">
-      Install the included systemd unit by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -v -m644 tools/stunnel.service /usr/lib/systemd/system</userinput></screen>
-
-    <para>
-      If you do not already have a signed SSL Certificate and Private Key,
-      create the <filename>stunnel.pem</filename> file in the
-      <filename class="directory">/etc/stunnel</filename> directory using the
-      command below. You will be prompted to enter the necessary
-      information. Ensure you reply to the
-    </para>
-
-<screen><prompt>Common Name (FQDN of your server) [localhost]:</prompt></screen>
-
-    <para>
-      prompt with the name or IP address you will be using
-      to access the service(s).
-    </para>
-
-    <para>
-      To generate a certificate, as the
-      <systemitem class="username">root</systemitem> user, issue:
-    </para>
-
-<screen role="root"><userinput>make cert</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: This switch disables systemd
-      socket activation support which is not available in BLFS.
-    </para>
-
-    <para>
-      <command>make docdir=... install</command>: This command installs the
-      package and changes the documentation installation directory to standard
-      naming conventions.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring stunnel</title>
-
-    <sect3 id="stunnel-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/stunnel/stunnel.conf</filename>
-      </para>
-
-      <indexterm zone="stunnel stunnel-config">
-        <primary sortas="e-etc-stunnel-stunnel.conf">/etc/stunnel/stunnel.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user,
-        create the directory used for the
-        <filename class="extension">.pid</filename> file created
-        when the <application>stunnel</application> daemon starts:
-      </para>
-
-<screen role="root"><userinput>install -v -m750 -o stunnel -g stunnel -d /var/lib/stunnel/run &amp;&amp;
-chown stunnel:stunnel /var/lib/stunnel</userinput></screen>
-
-      <para>
-        Next, create a basic <filename>/etc/stunnel/stunnel.conf</filename>
-        configuration file using the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/stunnel/stunnel.conf &lt;&lt; "EOF"
-<literal>; File: /etc/stunnel/stunnel.conf
-
-; Note: The pid and output locations are relative to the chroot location.
-
-pid    = /run/stunnel.pid
-chroot = /var/lib/stunnel
-client = no
-setuid = stunnel
-setgid = stunnel
-cert   = /etc/stunnel/stunnel.pem
-
-;debug = 7
-;output = stunnel.log
-
-;[https]
-;accept  = 443
-;connect = 80
-;; "TIMEOUTclose = 0" is a workaround for a design flaw in Microsoft SSL
-;; Microsoft implementations do not use SSL close-notify alert and thus
-;; they are vulnerable to truncation attacks
-;TIMEOUTclose = 0</literal>
-
-EOF</userinput></screen>
-
-      <para>
-        Finally, add the service(s) you wish to encrypt to the
-        configuration file. The format is as follows:
-      </para>
-
-<screen><literal>[<replaceable>&lt;service&gt;</replaceable>]
-accept  = <replaceable>&lt;hostname:portnumber&gt;</replaceable>
-connect = <replaceable>&lt;hostname:portnumber&gt;</replaceable></literal></screen>
-
-<!--
-      <para>
-        If you use <application>stunnel</application> to encrypt a daemon
-        started from <command>[x]inetd</command>, you may need to disable that
-        daemon in the <filename>/etc/[x]inetd.conf</filename> file and enable a
-        corresponding <replaceable>&lt;service&gt;</replaceable>_stunnel
-        service. You may have to add an appropriate entry in
-        <filename>/etc/services</filename> as well.
-      </para>
--->
-
-      <para>
-        For a full explanation of the commands and syntax used in the
-        configuration file, issue <command>man stunnel</command>.
-      </para>
-
-    </sect3>
-
-    <sect3  id="stunnel-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To automatically start the <command>stunnel</command> daemon when the
-        system is booted, install the
-        <filename>/etc/rc.d/init.d/stunnel</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>stunnel</command>
-        daemon at boot, enable the previously installed
-        <application>systemd</application> unit by running the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="stunnel stunnel-init">
-        <primary sortas="f-stunnel">stunnel</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-stunnel</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable stunnel</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          stunnel and stunnel3
-        </seg>
-        <seg>
-          libstunnel.so
-        </seg>
-        <seg>
-          /{etc,lib,var/lib}/stunnel and
-          /usr/share/doc/stunnel-&stunnel-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="stunnel-prog">
-        <term><command>stunnel</command></term>
-        <listitem>
-          <para>
-            is a program designed to work as an SSL
-            encryption wrapper between remote clients and local
-            or remote servers
-          </para>
-          <indexterm zone="stunnel stunnel-prog">
-            <primary sortas="b-stunnel">stunnel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stunnel3">
-        <term><command>stunnel3</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> wrapper script to use
-            <command>stunnel</command> 3.x syntax with
-            <command>stunnel</command> 4.05 or later
-          </para>
-          <indexterm zone="stunnel stunnel3">
-            <primary sortas="b-stunnel3">stunnel3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstunnel">
-        <term><filename class="libraryfile">libstunnel.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by
-            <application>stunnel</application>
-          </para>
-          <indexterm zone="stunnel libstunnel">
-            <primary sortas="c-libstunnel">libstunnel.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,411 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sudo-download-http "https://www.sudo.ws/dist/sudo-&sudo-version;.tar.gz">
-  <!ENTITY sudo-download-ftp  " ">
-  <!ENTITY sudo-md5sum        "4166279cb188ecb6641c7a2ba5f68270">
-  <!ENTITY sudo-size          "5.1 MB">
-  <!ENTITY sudo-buildsize     "53 MB (add 18 MB for tests)">
-  <!ENTITY sudo-time          "0.2 SBU (with parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="sudo" xreflabel="Sudo-&sudo-version;">
-  <?dbhtml filename="sudo.html"?>
-
-
-  <title>Sudo-&sudo-version;</title>
-
-  <indexterm zone="sudo">
-    <primary sortas="a-Sudo">Sudo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sudo</title>
-
-    <para>
-      The <application>Sudo</application> package allows a system administrator
-      to give certain users (or groups of users) the ability to run
-      some (or all) commands as
-      <systemitem class="username">root</systemitem> or another user while
-      logging the commands and arguments.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sudo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sudo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sudo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sudo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sudo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sudo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sudo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command),
-      <ulink url="https://www.openafs.org/">AFS</ulink>,
-<!--  It seems dead for decades, nowhere to download source code
-      <ulink url="https://www.fwtk.org/">FWTK</ulink>, and
--->
-      <ulink url="https://github.com/linux-audit/audit-userspace">libaudit</ulink>,
-      <ulink url="&sourceforge-dl;/opie/">Opie</ulink>, and
-      <ulink url="https://sssd.io/">Sssd</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sudo</title>
-
-    <para>
-      Install <application>Sudo</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr              \
-            --libexecdir=/usr/lib      \
-            --with-secure-path         \
-            --with-env-editor          \
-            --docdir=/usr/share/doc/sudo-&sudo-version; \
-            --with-passprompt="[sudo] password for %p: " &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <!-- line breaks in command tags confuse jhalfs -->
-      <command>env LC_ALL=C make check |&amp; tee make-check.log</command>.
-      Check the results with <command>grep failed make-check.log</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- for a DESTDIR install as normal user, use
-    "make install INSTALL_OWNER= DESTDIR=<destdir>"-->
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-     <parameter>--libexecdir=/usr/lib</parameter>: This switch controls where
-     private programs are installed.  Everything in that directory is a library, so
-     they belong under <filename class="directory">/usr/lib</filename> instead of
-     <filename class="directory">/usr/libexec</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-secure-path</parameter>: This switch transparently adds
-      <filename class="directory">/sbin</filename> and <filename
-      class="directory">/usr/sbin</filename> directories to the
-      <envar>PATH</envar> environment variable.
-    </para>
-
-    <para>
-      <parameter>--with-env-editor</parameter>: This switch enables use of the
-      environment variable EDITOR for <command>visudo</command>.
-    </para>
-
-    <para>
-      <parameter>--with-passprompt</parameter>: This switch sets the password prompt.
-      The <parameter>%p</parameter> will be expanded to the name of the user whose password is being requested.
-    </para>
-
-    <para>
-      <option>--without-pam</option>: This switch avoids building
-      <application>Linux-PAM</application> support when
-      <application>Linux-PAM</application> is installed on the system.
-    </para>
-
-    <para>
-      <option>--with-all-insults</option>: This switch includes all the
-      sudo insult sets. Insults are printed if the user types a bad
-      password, and if enabled in <filename>/etc/sudoers</filename>. Use
-      <option>--with-insults</option> to have them enabled by default.
-      Various sets of insults can be selected with some other switches.
-    </para>
-
-    <note>
-      <para>
-        There are many options to <application>sudo</application>'s
-        <command>configure</command> command. Check the
-        <command>configure --help</command> output for a complete list.
-      </para>
-    </note>
-    <!-- Seems to be fixed
-    <para>
-      <command>ln -sfv libsudo_util...</command>: Works around a bug in the
-      installation process, which links to the previously installed
-      version (if there is one) instead of the new one.
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Sudo</title>
-
-    <sect3 id="sudo-config">
-      <title>Config File</title>
-
-      <para>
-        <filename>/etc/sudoers</filename>
-      </para>
-
-      <indexterm zone="sudo sudo-config">
-        <primary sortas="e-etc-sudoers">/etc/sudoers</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <filename>sudoers</filename> file can be quite complicated.  It
-        is composed of two types of entries: aliases (basically variables) and
-        user specifications (which specify who may run what).  The installation
-        installs a default configuration that has no privileges installed for
-        any user.
-      </para>
-
-      <para>
-        A couple of common configuration changes 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 credentials. Use the following
-        commands to create the <filename>/etc/sudoers.d/00-sudo</filename>
-        configuration file as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/00-sudo &lt;&lt; "EOF"
-<literal>Defaults secure_path="/usr/sbin:/usr/bin"
-%wheel ALL=(ALL) ALL</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          In very simple installations where there is only one user, it
-          may be easier to just edit the <filename>/etc/sudoers</filename>
-          file directly.  In that case, the <varname>secure_path</varname>
-          entry may not be needed and using <command>sudo -E ...</command> can
-          import the non-privileged user's full environment into the
-          privileged session.
-        </para>
-
-        <para>
-          The files in the <filename class="directory">/etc/sudoers.d</filename>
-          directory are parsed in sorted lexical order. Be careful that entries
-          in an added file do not overwrite previous entries.
-        </para>
-      </note>
-
-      <para>
-        For details, see <command>man sudoers</command>.
-      </para>
-
-      <note>
-        <para>
-          The <application>Sudo</application> developers highly recommend
-          using the <command>visudo</command> program to edit the
-          <filename>sudoers</filename> file. This will provide basic sanity
-          checking like syntax parsing and file permission to avoid some
-          possible mistakes that could lead to a vulnerable configuration.
-        </para>
-      </note>
-
-      <para>
-        If <application>PAM</application> is installed on the system,
-        <application>Sudo</application> is built with
-        <application>PAM</application> support. In that case, issue the
-        following command as the <systemitem class="username">root</systemitem>
-        user to create the <application>PAM</application> configuration file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/sudo &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sudo
-
-# include the default auth settings
-auth      include     system-auth
-
-# include the default account settings
-account   include     system-account
-
-# Set default environment variables for the service user
-session   required    pam_env.so
-
-# include system session defaults
-session   include     system-session
-
-# End /etc/pam.d/sudo</literal>
-EOF
-chmod 644 /etc/pam.d/sudo</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>
-          cvtsudoers, sudo, sudo_logsrvd, sudo_sendlog,
-          sudoedit (symlink), sudoreplay, and visudo
-        </seg>
-        <seg>
-          <!-- [pierre, September 25, 2020] except libsudo_util, the other
-          shared objects in /usr/lib/sudo look more like modules than
-          libraries. Leaving them now, and updating the list, but I think
-          they should not be listed. -->
-          audit_json.so, group_file.so, libsudo_util.so,
-          sudoers.so, sudo_intercept.so, sudo_noexec.so, and system_group.so
-        </seg>
-        <seg>
-          /etc/sudoers.d,
-          /usr/lib/sudo,
-          /usr/share/doc/sudo-&sudo-version;, and
-          /var/lib/sudo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvtsudoers">
-        <term><command>cvtsudoers</command></term>
-        <listitem>
-          <para>
-            converts between sudoers file formats
-          </para>
-          <indexterm zone="sudo cvtsudoers">
-            <primary sortas="b-cvtsudoers">cvtsudoers</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sudo_prog">
-        <term><command>sudo</command></term>
-        <listitem>
-          <para>
-            executes a command as another user as permitted by
-            the <filename>/etc/sudoers</filename> configuration file
-          </para>
-          <indexterm zone="sudo sudo">
-            <primary sortas="b-sudo">sudo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sudo_logsrvd">
-        <term><command>sudo_logsrvd</command></term>
-        <listitem>
-          <para>
-            is a sudo event and I/O log server
-          </para>
-          <indexterm zone="sudo sudo_logsrvd">
-            <primary sortas="b-sudo_logsrvd">sudo_logsrvd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sudo_sendlog">
-        <term><command>sudo_sendlog</command></term>
-        <listitem>
-          <para>
-            sends sudo I/O logs to the log server
-          </para>
-          <indexterm zone="sudo sudo_sendlog">
-            <primary sortas="b-sudo_sendlog">sudo_sendlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sudoedit">
-        <term><command>sudoedit</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>sudo</command> that implies the
-            <option>-e</option> option to invoke an editor as another user
-          </para>
-          <indexterm zone="sudo sudoedit">
-            <primary sortas="b-sudoedit">sudoedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sudoreplay">
-        <term><command>sudoreplay</command></term>
-        <listitem>
-          <para>
-            is used to play back or list the output
-            logs created by <command>sudo</command>
-          </para>
-          <indexterm zone="sudo sudoreplay">
-            <primary sortas="b-sudoreplay">sudoreplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="visudo">
-        <term><command>visudo</command></term>
-        <listitem>
-          <para>
-            allows for safer editing of the <filename>sudoers</filename>
-            file
-          </para>
-          <indexterm zone="sudo visudo">
-            <primary sortas="b-visudo">visudo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/syslog.xml
===================================================================
--- postlfs/security/syslog.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/syslog.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,10 +1,7 @@
 <sect1 id="postlfs-security-syslog">
-  <?dbhtml filename="syslog.html"?>
+<?dbhtml filename="syslog.html" dir="postlfs"?>
+<title>Configuring syslog</title>
 
-  <title>Configuring syslog</title>
-
-  <para>
-    TO BE WRITTEN - NEW
-  </para>
+<para>TO BE WRITTEN - NEW</para>
 
 </sect1>
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/security/tripwire.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,411 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-security-tripwire">
+<?dbhtml filename="tripwire.html" dir="postlfs"?>
+<title>tripwire</title>
 
-  <!ENTITY tripwire-download-http "https://github.com/Tripwire/tripwire-open-source/releases/download/&tripwire-version;/tripwire-open-source-&tripwire-version;.tar.gz">
-  <!ENTITY tripwire-download-ftp  " ">
-  <!ENTITY tripwire-md5sum        "a5cf1bc2f235f5d8ca458f00548db6ee">
-  <!ENTITY tripwire-size          "980 KB">
-  <!ENTITY tripwire-buildsize     "29 MB">
-  <!ENTITY tripwire-time          "1.6 SBU (scripting install)">
-]>
-
-<sect1 id="tripwire" xreflabel="Tripwire-&tripwire-version;">
-  <?dbhtml filename="tripwire.html"?>
-
-
-  <title>Tripwire-&tripwire-version;</title>
-
-  <indexterm zone="tripwire">
-    <primary sortas="a-Tripwire">Tripwire</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tripwire</title>
-
-    <para>
-      The <application>Tripwire</application> package contains programs
-      used to verify the integrity of the files on a given system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tripwire-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tripwire-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tripwire-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tripwire-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tripwire-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tripwire-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tripwire Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      An <xref linkend="server-mail"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tripwire</title>
-
-    <para>
-      Compile <application>Tripwire</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e '/^CLOBBER/s/false/true/'         \
-    -e 's|TWDB="${prefix}|TWDB="/var|'   \
-    -e '/TWMAN/ s|${prefix}|/usr/share|' \
-    -e '/TWDOCS/s|${prefix}/doc/tripwire|/usr/share/doc/tripwire-&tripwire-version;|' \
-    -i installer/install.cfg                               &amp;&amp;
-
-find . -name Makefile.am | xargs                           \
-    sed -i 's/^[[:alpha:]_]*_HEADERS.*=/noinst_HEADERS =/' &amp;&amp;
-
-sed '/dist/d' -i man/man?/Makefile.am                      &amp;&amp;
-autoreconf -fi                                             &amp;&amp;
-
-./configure --prefix=/usr --sysconfdir=/etc/tripwire       &amp;&amp;
-make CPPFLAGS=-std=c++11</userinput></screen>
-
-    <note>
-      <para>
-        The default configuration is to use a local MTA. If
-        you don't have an MTA installed and have no wish to install
-        one, modify <filename>install/install.cfg</filename> to use an SMTP
-        server instead.  Otherwise the install will fail.
-      </para>
-    </note>
-
-    <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;
-cp -v policy/*.txt /usr/share/doc/tripwire-&tripwire-version;</userinput></screen>
-
-    <note>
-      <para>
-        During <command>make install</command>, several questions
-        are asked, including passwords. If you want to make a script, you have
-        to apply a <application>sed</application> before running
-        <command>make install</command>:
-      </para>
-
-<screen><userinput>sed -i -e 's@installer/install.sh@&amp; -n -s <replaceable>&lt;site-password&gt;</replaceable> -l <replaceable>&lt;local-password&gt;</replaceable>@' Makefile</userinput></screen>
-
-      <para>
-        Of course, you should do this with dummy passwords and change them
-        later.
-      </para>
-
-      <para>
-        Another issue when scripting is that the installer exits when the
-        standard input is not a terminal. You may disable this behavior
-        with the following sed:
-      </para>
-
-<screen><userinput>sed '/-t 0/,+3d' -i installer/install.sh</userinput></screen>
-
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... installer/install.cfg</command>: This command tells
-      the package to install the program database and reports in
-      <filename class="directory">/var/lib/tripwire</filename> and sets the
-      proper location for man pages and documentation.
-    </para>
-
-    <para>
-      <command>find ...</command>, <command>sed ...</command>, and
-      <command>autoreconf -fi</command>: The build system is unusable as is, and
-      has to be modified for the build to succeed.
-    </para>
-
-    <para>
-      <parameter>CPPFLAGS=-std=c++11</parameter>: Setting the C++ preprocessor
-      flags to version 11 is necessary to prevent a conflict with the
-      default version which is c++17 in recent version of gcc.
-    </para>
-
-    <para>
-      <command>make install</command>: This command creates the
-      <application>Tripwire</application> security keys as well as installing
-      the binaries. There are two keys: a site key and a local key which are
-      stored in <filename class="directory">/etc/tripwire/</filename>.
-    </para>
-
-    <para>
-      <command>cp -v policy/*.txt /usr/doc/tripwire-&tripwire-version;</command>:
-      This command installs the <application>tripwire</application> sample
-      policy files with the other <application>tripwire</application>
-      documentation.i
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tripwire</title>
-
-    <sect3 id="tripwire-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/tripwire/*</filename>
-      </para>
-
-      <indexterm zone="tripwire tripwire-config">
-        <primary sortas="e-etc-tripwire">/etc/tripwire/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>Tripwire</application> uses a policy file to
-        determine which files are integrity checked. The default policy
-        file (<filename>/etc/tripwire/twpol.txt</filename>) is for a
-        default installation and will need to be updated for your
-        system.
-      </para>
-
-      <para>
-        Policy files should be tailored to each individual distribution and/or
-        installation. Some example policy files can be found in <filename
-        class="directory">/usr/share/doc/tripwire/</filename>.
-      </para>
-
-      <para>
-        If desired, copy the policy file you'd like to try into <filename
-        class="directory">/etc/tripwire/</filename> instead of using the
-        default policy file, <filename>twpol.txt</filename>.  It is, however,
-        recommended that you edit your policy file. Get ideas from the
-        examples above and read
-        <filename>/usr/share/doc/tripwire/policyguide.txt</filename> for
-        additional information. <filename>twpol.txt</filename> is a good
-        policy file for learning about <application>Tripwire</application>
-        as it will note any changes to the file system and can even be used
-        as an annoying way of keeping track of changes for uninstallation of
-        software.
-      </para>
-
-      <para>
-        After your policy file has been edited to your satisfaction you may
-        begin the configuration steps (perform as the <systemitem
-        class='username'>root</systemitem>) user:
-      </para>
-
-<screen role="root"><userinput>twadmin --create-polfile --site-keyfile /etc/tripwire/site.key \
-    /etc/tripwire/twpol.txt &amp;&amp;
-tripwire --init</userinput></screen>
-
-      <para>
-        Depending on your system and the contents of the policy file, the
-        initialization phase above can take a relatively long time.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Usage Information</title>
-
-      <para>
-        <application>Tripwire</application> will identify file changes in
-        the critical system files specified in the policy file.  Using
-        <application>Tripwire</application> while making frequent changes to
-        these directories will flag all these changes.  It is most useful
-        after a system has reached a configuration that the user considers
-        stable.
-      </para>
-
-      <para>
-        To use <application>Tripwire</application> after creating a policy
-        file to run a report, use the following command:
-      </para>
-
-<screen role="root"><userinput>tripwire --check &gt; /etc/tripwire/report.txt</userinput></screen>
-
-      <para>
-        View the output to check the integrity of your files. An automatic
-        integrity report can be produced by using a cron facility to schedule
-        the runs.
-      </para>
-
-      <para>
-        Reports are stored in binary and, if desired, encrypted.  View reports,
-        as the <systemitem class="username">root</systemitem> user, with:
-      </para>
-
-<screen role="nodump"><userinput>twprint --print-report -r /var/lib/tripwire/report/<replaceable>&lt;report-name.twr&gt;</replaceable></userinput></screen>
-
-      <para>
-        After you run an integrity check, you should examine the report (or
-        email) and then modify the <application>Tripwire</application> database
-        to reflect the changed files on your system. This is so that
-        <application>Tripwire</application> will not continually notify you
-        hat files you intentionally changed are a security violation. To do
-        this you must first <command>ls -l /var/lib/tripwire/report/</command>
-        and note the name of the newest file which starts with your system
-        name as presented by the command <userinput>uname -n</userinput> and
-        ends in <filename>.twr</filename>. These files were created during
-        report creation and the most current one is needed to update the
-        <application>Tripwire</application> database of your system. As the
-        <systemitem class='username'>root</systemitem> user, type in the
-        following command making the appropriate report name:
-      </para>
-
-<screen role="nodump"><userinput>tripwire --update --twrfile /var/lib/tripwire/report/<replaceable>&lt;report-name.twr&gt;</replaceable></userinput></screen>
-
-      <para>
-        You will be placed into <application>Vim</application> with a copy
-        of the report in front of you. If all the changes were good, then just
-        type <command>:wq</command> and after entering your local key, the
-        database will be updated. If there are files which you still want to
-        be warned about, remove the 'x' before the filename in the report and
-        type <command>:wq</command>.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Changing the Policy File</title>
-
-      <para>
-        If you are unhappy with your policy file and would like to modify it
-        or use a new one, modify the policy file and then execute the following
-        commands as the <systemitem class='username'>root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>twadmin --create-polfile /etc/tripwire/twpol.txt &amp;&amp;
-tripwire --init</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>siggen, tripwire, twadmin, and twprint</seg>
-        <seg>None</seg>
-        <seg>/etc/tripwire, /var/lib/tripwire,
-        and /usr/share/doc/tripwire-&tripwire-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="siggen">
-        <term><command>siggen</command></term>
-        <listitem>
-          <para>
-            is a signature gathering utility that displays
-            the hash function values for the specified files
-          </para>
-          <indexterm zone="tripwire siggen">
-            <primary sortas="b-siggen">siggen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tripwire-program">
-        <term><command>tripwire</command></term>
-        <listitem>
-          <para>
-            is the main file integrity checking program
-          </para>
-          <indexterm zone="tripwire tripwire">
-            <primary sortas="b-tripwire">tripwire</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="twadmin">
-        <term><command>twadmin</command></term>
-        <listitem>
-          <para>
-            administrative and utility tool used to perform
-            certain administrative functions related to
-            <application>Tripwire</application> files and configuration
-            options
-          </para>
-          <indexterm zone="tripwire twadmin">
-            <primary sortas="b-twadmin">twadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="twprint">
-        <term><command>twprint</command></term>
-        <listitem>
-          <para>
-            prints <application>Tripwire</application>
-            database and report files in clear text format
-          </para>
-          <indexterm zone="tripwire twprint">
-            <primary sortas="b-twprint">twprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE WRITTEN - NEW</para>
 
 </sect1>
Index: stlfs/security/vulnerabilities.xml
===================================================================
--- postlfs/security/vulnerabilities.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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="vulnerabilities" xreflabel="vulnerabilities">
-  <?dbhtml filename="vulnerabilities.html"?>
-
-
-  <title>Vulnerabilities</title>
-
-  <!-- section g : 'Others' in longindex.html -->
-  <indexterm zone="vulnerabilities">
-    <primary sortas="g-vulnerabilities">vulnerability links</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>About vulnerabilities</title>
-
-    <para>
-      All software has bugs. Sometimes, a bug can be exploited, for example to
-      allow users to gain enhanced privileges (perhaps gaining a root shell,
-      or simply accessing or deleting other user&apos;s files), or to allow a
-      remote site to crash an application (denial of service), or for theft of
-      data. These bugs are labelled as vulnerabilities.
-    </para>
-
-    <para>
-      The main place where vulnerabilities get logged is
-      <ulink url="https://cve.mitre.org">cve.mitre.org</ulink>. Unfortunately,
-      many vulnerability numbers (CVE-yyyy-nnnn) are initially only labelled
-      as "reserved" when distributions start issuing fixes.  Also, some
-      vulnerabilities apply to particular combinations of
-      <command>configure</command> options, or only apply to old versions of
-      packages which have long since been updated in BLFS.
-    </para>
-
-    <para>
-      BLFS differs from distributions&mdash;there is no BLFS security team, and
-      the editors only become aware of vulnerabilities after they are public
-      knowledge. Sometimes, a package with a vulnerability will not be updated
-      in the book for a long time.  Issues can be logged in the Trac system,
-      which might speed up resolution.
-    </para>
-
-    <para>
-      The normal way for BLFS to fix a vulnerability is, ideally, to update
-      the book to a new fixed release of the package.  Sometimes that happens
-      even before the vulnerability is public knowledge, so there is no
-      guarantee that it will be shown as a vulnerability fix in the Changelog.
-      Alternatively, a <command>sed</command> command, or a patch taken from
-      a distribution, may be appropriate.
-    </para>
-
-    <para>
-      The bottom line is that you are responsible for your own security, and
-      for assessing the potential impact of any problems.
-    </para>
-
-    <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
-      has <ulink url="https://www.debian.org/security">Debian security</ulink>.
-      Fedora's links on security are at <ulink
-        url="https://fedoraproject.org/wiki/category:Security">the Fedora wiki</ulink>.
-      Details of Gentoo linux security announcements are discussed at
-      <ulink url="https://security.gentoo.org">Gentoo security</ulink>.
-      Finally, the Slackware archives of security announcements are at
-      <!-- To editors: the https version redirects back to the non-https
-           version.  Not sure why they must do this, but please check
-           before turning this to https.  -->
-      <ulink url="http://slackware.com/security/">Slackware security</ulink>.
-    </para>
-
-    <para>
-      The most general English source is perhaps
-      <ulink url="https://seclists.org/fulldisclosure">the Full Disclosure
-      Mailing List</ulink>, but please read the comment on that page. If you
-      use other languages you may prefer other sites such as <ulink
-        url="https://www.heise.de/security">heise.de</ulink> (German) or <ulink
-        url="https://www.cert.hr">cert.hr</ulink> (Croatian). These are not
-      linux-specific. There is also a daily update at lwn.net for subscribers
-      (free access to the data after 2 weeks, but their vulnerabilities
-      database at <ulink
-        url="https://lwn.net/Alerts/">lwn.net/Alerts</ulink>
-      is unrestricted).
-    </para>
-
-    <para>
-      For some packages, subscribing to their &apos;announce&apos; lists
-      will provide prompt news of newer versions.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: stlfs/shells/dash.xml
===================================================================
--- postlfs/shells/dash.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dash-download-http "http://gondor.apana.org.au/~herbert/dash/files/dash-&dash-version;.tar.gz">
-  <!ENTITY dash-download-ftp  " ">
-  <!ENTITY dash-md5sum        "57222b768b84003ea4b801e5d5e0e52b">
-  <!ENTITY dash-size          "244 KB">
-  <!ENTITY dash-buildsize     "2.9 MB">
-  <!ENTITY dash-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="dash" xreflabel="Dash-&dash-version;">
-  <?dbhtml filename="dash.html"?>
-
-
-  <title>Dash-&dash-version;</title>
-
-  <indexterm zone="dash">
-    <primary sortas="a-Dash">Dash</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Dash</title>
-
-    <para>
-      <application>Dash</application> is a POSIX compliant shell. It can be
-      installed as /bin/sh or as the default shell for either <systemitem
-      class="username">root</systemitem> or a second user with a userid of 0.
-      It depends on fewer libraries than the <application>Bash</application>
-      shell and is therefore less likely to be affected by an upgrade problem
-      or disk failure. <application>Dash</application> is also useful for
-      checking that a script is completely compatible with POSIX syntax.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dash-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dash-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dash-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dash-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dash-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dash-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Dash Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.thrysoee.dk/editline/">libedit</ulink>
-      (command line editor library)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dash</title>
-
-    <para>
-      Install <application>Dash</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --bindir=/bin --mandir=/usr/share/man &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>
-
-    <para>
-      If you would like to make <command>dash</command> the default
-      <command>sh</command>, recreate the <filename>/bin/sh</filename>
-      symlink as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <note>
-      <para>
-        If you create the symbolic link from <command>dash</command>
-        to  <command>sh</command>, you will need to reset the link to
-        <command>bash</command> to build LFS.
-      </para>
-    </note>
-
-<screen role="nodump"><userinput>ln -svf dash /bin/sh</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--bindir=/bin</parameter>: This parameter places the
-      <command>dash</command> binary into the root filesystem.
-    </para>
-
-    <para>
-      <option>--with-libedit</option>: To compile
-      <application>Dash</application> with libedit support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Dash</title>
-
-    <sect3 id="dash-config">
-      <title>Config Files</title>
-
-      <para>
-        <application>Dash</application> sources
-        <filename>/etc/profile</filename> and
-        <filename>~/.profile</filename>
-      </para>
-
-      <indexterm zone="dash dash-config">
-        <primary sortas="e-etc-profile">/etc/profile</primary>
-      </indexterm>
-
-      <indexterm zone="dash dash-config">
-        <primary sortas="e-AA.profile">~/.profile</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Update <filename>/etc/shells</filename> to include the
-        <application>Dash</application> shell by issuing the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
-<literal>/bin/dash</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dash</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dash-prog">
-        <term><command>dash</command></term>
-        <listitem>
-          <para>
-            is a POSIX compliant shell
-          </para>
-          <indexterm zone="dash dash-prog">
-            <primary sortas="b-dash">dash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/shells/shells.xml
===================================================================
--- postlfs/shells/shells.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/shells/shells.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="postlfs-shells">
+<?dbhtml filename="shells.html" dir="postlfs"?>
+<title>Shells</title>
 
-<chapter id="postlfs-shells">
-  <?dbhtml filename="shells.html"?>
+<para>Intro goes here</para>
 
-  <title>Shells</title>
-
-  <para>
-    We are all familiar with the Bourne Again SHell, but there are two
-    other user interfaces that are considered useful modern shells &ndash; the
-    Berkeley Unix C shell and the Korn shell.  This chapter installs
-    packages compatible with these additional shell types.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcsh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zsh.xml"/>
+&postlfs-shells-tcsh;
+&postlfs-shells-zsh;
 
 </chapter>
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/shells/tcsh.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,274 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/do/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="postlfs-shells-tcsh">
+<?dbhtml filename="tcsh.html" dir="postlfs"?>
+<title>tcsh</title>
 
-  <!-- Following URL does has old versions: https://astron.com/pub/tcsh/old/ -->
-  <!ENTITY tcsh-download-http "https://astron.com/pub/tcsh/tcsh-&tcsh-version;.tar.gz">
-  <!ENTITY tcsh-download-ftp  " ">
-  <!ENTITY tcsh-md5sum        "ad1f1d18638ac1d0ff736a96d0b5dbd3">
-  <!ENTITY tcsh-size          "936 KB">
-  <!ENTITY tcsh-buildsize     "11 MB (with tests)">
-  <!ENTITY tcsh-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="tcsh" xreflabel="Tcsh-&tcsh-version;">
-  <?dbhtml filename="tcsh.html"?>
-
-  <title>Tcsh-&tcsh-version;</title>
-
-  <indexterm zone="tcsh">
-    <primary sortas="a-Tcsh">Tcsh</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tcsh</title>
-
-    <para>
-      The <application>Tcsh</application> package contains <quote>an
-      enhanced but completely compatible version of the Berkeley Unix C shell
-      (<command>csh</command>)</quote>. This is useful as an alternative shell
-      for those who prefer C syntax to that of the <command>bash</command>
-      shell, and also because some programs require the C shell in order to
-      perform installation tasks.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tcsh-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tcsh-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tcsh-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tcsh-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tcsh-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tcsh-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tcsh</title>
-
-    <para>
-      Install <application>Tcsh</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install install.man &amp;&amp;
-
-ln -v -sf tcsh   /bin/csh &amp;&amp;
-ln -v -sf tcsh.1 /usr/share/man/man1/csh.1</userinput></screen>
-<!--
-install -v -m755 -d          /usr/share/doc/tcsh-&tcsh-version;/html &amp;&amp;
-install -v -m644 tcsh.html/* /usr/share/doc/tcsh-&tcsh-version;/html &amp;&amp;
-install -v -m644 FAQ         /usr/share/doc/tcsh-&tcsh-version;</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!-- No longer there
-    <para>
-      <command>sh ./tcsh.man2html</command>: This creates HTML documentation
-      from the formatted man page.
-    </para>
--->
-    <para>
-      <command>ln -v -sf tcsh /bin/csh</command>: The FHS states that if
-      there is a <application>C</application> shell installed, there should
-      be a symlink from <filename>/bin/csh</filename> to it. This creates
-      that symlink.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tcsh</title>
-
-    <sect3 id="tcsh-config">
-      <title>Config Files</title>
-
-      <para>
-        There are numerous configuration files for the C shell. Examples
-        of these are <filename>/etc/csh.cshrc</filename>,
-        <filename>/etc/csh.login</filename>,
-        <filename>/etc/csh.logout</filename>,
-        <filename>~/.tcshrc</filename>, <filename>~/.cshrc</filename>,
-        <filename>~/.history</filename>, <filename>~/.cshdirs</filename>,
-        <filename>~/.login</filename>, and <filename>~/.logout</filename>. More
-        information on these files can be found in the
-        <ulink role='man' url='&man;tcsh.1'>tcsh(1)</ulink> man page.
-      </para>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-etc-csh.cshrc">/etc/csh.cshrc</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-etc-csh.login">/etc/csh.login</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-etc-csh.logout">/etc/csh.logout</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-AA.tcshrc">~/.tcshrc</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-AA.cshrc">~/.cshrc</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-AA.history">~/.history</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-AA.cshdirs">~/.cshdirs</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-AA.login">~/.login</primary>
-      </indexterm>
-
-      <indexterm zone="tcsh tcsh-config">
-        <primary sortas="e-AA.logout">~/.logout</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Update <filename>/etc/shells</filename> to include the C shell
-        program names (as the &root; user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
-<literal>/bin/tcsh
-/bin/csh</literal>
-EOF</userinput></screen>
-
-      <para>
-        The following <filename>~/.cshrc</filename> provides two alternative
-        colour prompts and coloured <command>ls</command> output. If you prefer
-        a global modification, issue the command as the &root; user, replacing
-        <filename>~/.cshrc</filename> by <filename>/etc/csh.cshrc</filename>.
-      </para>
-
-<screen><userinput>cat &gt; ~/.cshrc &lt;&lt; "EOF"
-<literal># Original at:
-# https://www.cs.umd.edu/~srhuang/teaching/code_snippets/prompt_color.tcsh.html
-
-# Modified by the BLFS Development Team.
-
-# Add these lines to your ~/.cshrc (or to /etc/csh.cshrc).
-
-# Colors!
-set     red="%{\033[1;31m%}"
-set   green="%{\033[0;32m%}"
-set  yellow="%{\033[1;33m%}"
-set    blue="%{\033[1;34m%}"
-set magenta="%{\033[1;35m%}"
-set    cyan="%{\033[1;36m%}"
-set   white="%{\033[0;37m%}"
-set     end="%{\033[0m%}" # This is needed at the end...
-
-# Setting the actual prompt.  Two separate versions for you to try, pick
-# whichever one you like better, and change the colors as you want.
-# Just don't mess with the ${end} guy in either line...  Comment out or
-# delete the prompt you don't use.
-
-set prompt="${green}%n${blue}@%m ${white}%~ ${green}%%${end} "
-set prompt="[${green}%n${blue}@%m ${white}%~ ]${end} "
-
-# This was not in the original URL above
-# Provides coloured ls
-alias ls ls --color=always
-
-# Clean up after ourselves...
-unset red green yellow blue magenta cyan yellow white end</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>tcsh</seg>
-        <seg>None</seg>
-        <seg>None <!--/usr/share/doc/tcsh-&tcsh-version;--></seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tcsh-prog">
-        <term><command>tcsh</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="tcsh tcsh-prog">
-            <primary sortas="b-tcsh">tcsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ postlfs/shells/zsh.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,319 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postlfs-shells-zsh">
+<?dbhtml filename="zsh.html" dir="postlfs"?>
+<title>zsh</title>
 
-  <!ENTITY zsh-download-http "https://www.zsh.org/pub/zsh-&zsh-version;.tar.xz">
-  <!ENTITY zsh-download-ftp  " ">
-  <!ENTITY zsh-md5sum        "182e37ca3fe3fa6a44f69ad462c5c30e">
-  <!ENTITY zsh-size          "3.2 MB">
-  <!ENTITY zsh-buildsize     "48 MB (includes documentation and tests)">
-  <!ENTITY zsh-time          "1.6 SBU (Using parallelism=4; includes documentation and tests)">
-]>
-
-<sect1 id="zsh" xreflabel="zsh-&zsh-version;">
-  <?dbhtml filename="zsh.html"?>
-
-
-  <title>zsh-&zsh-version;</title>
-
-  <indexterm zone="zsh">
-    <primary sortas="a-zsh">zsh</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to zsh</title>
-
-    <para>
-      The <application>zsh</application> package contains a command
-      interpreter (shell) usable as an interactive login shell and as
-      a shell script command processor. Of the standard shells,
-      <application>zsh</application> most closely resembles
-      <application>ksh</application> but includes many enhancements.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&zsh-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&zsh-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &zsh-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &zsh-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &zsh-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &zsh-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        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/"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">zsh Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="pcre2"/>, The next zsh release will support it -->
-      <xref linkend="valgrind"/> and
-      <ulink url='https://fbb-git.gitlab.io/yodl/'>yodl</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of zsh</title>
-
-    <para>
-      Adapt the documentation build system for texinfo-7.0 or later:
-    </para>
-
-<screen><userinput>sed -e 's/set_from_init_file/texinfo_&amp;/' \
-    -i Doc/Makefile.in</userinput></screen>
-
-    <para>
-      The documentation files contain references to zsh configuration
-      files in <filename class='directory'>/etc</filename>, but we'll
-      use <filename class='directory'>/etc/zsh</filename> to hold these
-      configuration files instead.  The building system will fix up those
-      references if the <application>yodl</application> package is
-      available, but it's out of the scope of BLFS.  So we need to fix up
-      the references manually:
-    </para>
-
-<screen><userinput>sed 's|/etc/z|/etc/zsh/z|g' -i Doc/*.*</userinput></screen>
-
-<!--    <note>
-      <para>
-        Using a script to build with "su -c script" may produce a funny
-        configure error message: "no controlling tty". If this happens, add
-        the switch -\-with-tcsetpgrp to configure.
-      </para>
-    </note>
--->
-    <para>
-      Install <application>zsh</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr            \
-            --sysconfdir=/etc/zsh    \
-            --enable-etcdir=/etc/zsh \
-            --enable-cap             \
-            --enable-gdbm                      &amp;&amp;
-make                                           &amp;&amp;
-
-makeinfo  Doc/zsh.texi --html      -o Doc/html &amp;&amp;
-makeinfo  Doc/zsh.texi --plaintext -o zsh.txt  &amp;&amp;
-makeinfo  Doc/zsh.texi --html --no-split --no-headers -o zsh.html</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/>
-      installed, you can build PDF format of the documentation by issuing
-      the following command:
-    </para>
-
-<screen remap="doc"><userinput>texi2pdf  Doc/zsh.texi -o Doc/zsh.pdf</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                                    &amp;&amp;
-make infodir=/usr/share/info install.info                       &amp;&amp;
-make htmldir=/usr/share/doc/zsh-&zsh-version;/html install.html           &amp;&amp;
-install -v -m644 zsh.{html,txt} Etc/FAQ /usr/share/doc/zsh-&zsh-version;</userinput></screen>
-
-    <para>
-      If you built the PDF format of the documentation, install
-      it by issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 Doc/zsh.pdf /usr/share/doc/zsh-&zsh-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc/zsh</parameter> and
-      <parameter>--enable-etcdir=/etc/zsh</parameter>: These parameters are
-      used so that all the <application>zsh</application> configuration files
-      are consolidated into the <filename class='directory'>/etc/zsh</filename>
-      directory. Omit these parameters if you wish to retain historical
-      compatibility by having all the files located in the
-      <filename class='directory'>/etc</filename> directory.
-    </para>
-
-    <para>
-      <parameter>--enable-cap</parameter>: This option enables
-      POSIX capabilities.
-    </para>
-
-    <para>
-      <parameter>--enable-gdbm</parameter>: This option enables the
-      use of the <application>GDBM</application> library.
-    </para>
-<!-- the next zsh release will support it
-    <para>
-      <option>- -enable-pcre</option>: This option allows zsh to use
-      the <application>PCRE2</application> regular expression library in shell
-      builtins.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring zsh</title>
-
-    <sect3 id="zsh-config">
-      <title>Config Files</title>
-
-      <para>
-        There are a whole host of configuration files for
-        <application>zsh</application> including
-        <filename>/etc/zsh/zshenv</filename>,
-        <filename>/etc/zsh/zprofile</filename>,
-        <filename>/etc/zsh/zshrc</filename>,
-        <filename>/etc/zsh/zlogin</filename> and
-        <filename>/etc/zsh/zlogout</filename>.
-        You can find more information on these in the
-        <ulink role='man' url='&man;zsh.1'>zsh(1)</ulink> and related
-        manual pages.
-      </para>
-
-      <para>
-        The first time zsh is executed, you will be prompted by messages asking
-        several questions. The answers will be used to create a
-        <filename>~/.zshrc</filename> file. If you wish to run these questions
-        again, run <command>zsh
-        /usr/share/zsh/&zsh-version;/functions/zsh-newuser-install -f</command>.
-      </para>
-
-      <para>
-        There are several built-in advanced prompts. In the
-        <command>zsh</command> shell, start advanced prompt support with
-        <command>autoload -U promptinit</command>, then
-        <command>promptinit</command>. Available prompt names are listed with
-        <command>prompt -l</command>. Select a particular one with
-        <command>prompt <literal>&lt;prompt-name&gt;</literal></command>.
-        Display all available
-        prompts with <command>prompt -p</command>. Except for the list and
-        display commands above, you can insert the other ones in
-        <filename>~/.zshrc</filename> to be automatically executed at
-        shell start, with the prompt you chose.
-      </para>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zsh-zshenv">/etc/zsh/zshenv</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zsh-zprofile">/etc/zsh/zprofile</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zsh-zshrc">/etc/zsh/zshrc</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zsh-zlogin">/etc/zsh/zlogin</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zsh-zlogout">/etc/zsh/zlogout</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Update <filename>/etc/shells</filename> to include the
-        <application>zsh</application> shell program names (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
-<literal>/bin/zsh</literal>
-EOF</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>zsh and zsh-&zsh-version; (hardlinked to each other)</seg>
-        <seg>Numerous plugin helper modules under
-        /usr/lib/zsh/&zsh-version;/</seg>
-        <seg>/usr/{lib,share}/zsh and /usr/share/doc/zsh-&zsh-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="zsh-prog">
-        <term><command>zsh</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="zsh zsh-prog">
-            <primary sortas="b-zsh">zsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: stlfs/virtualization/qemu-bridge-kernel.xml
===================================================================
--- postlfs/virtualization/qemu-bridge-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    &lt;*/M&gt; 802.1<emphasis role='blue'>d</emphasis> Ethernet Bridging                                      [BRIDGE]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork device support ---&gt;                                   [NETDEVICES]
-    [*]   N<emphasis role='blue'>e</emphasis>twork core driver support                                 [NET_CORE]
-    &lt;*/M&gt;   <emphasis role='blue'>U</emphasis>niversal TUN/TAP device driver support                        [TUN]</screen>
Index: stlfs/virtualization/qemu-kvm-kernel.xml
===================================================================
--- postlfs/virtualization/qemu-kvm-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] <emphasis role='blue'>V</emphasis>irtualization ---&gt;                                         [VIRTUALIZATION]
-  &lt;*/M&gt;   <emphasis role='blue'>K</emphasis>ernel-based Virtual Machine (KVM) support                       [KVM]
-  # Enable the option for your CPU:
-  &lt; /*/M&gt;   <emphasis role='blue'>K</emphasis>VM for Intel (and compatible) processors support        [KVM_INTEL]
-  &lt; /*/M&gt;   <emphasis role='blue'>K</emphasis>VM for AMD processors support                             [KVM_AMD]</screen>
Index: stlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,783 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qemu-download-http "https://download.qemu.org/qemu-&qemu-version;.tar.xz">
-  <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "e43091262671c1728b09522932b75b1d">
-  <!ENTITY qemu-size          "124 MB">
-  <!ENTITY qemu-buildsize     "2.4 GB (373 MB installed)">
-  <!ENTITY qemu-time          "1.3 SBU (add 0.8 SBU for tests, both using parallelism=4)">
-]>
-
-<sect1 id="qemu" xreflabel="qemu-&qemu-version;">
-  <?dbhtml filename="qemu.html"?>
-
-
-  <title>qemu-&qemu-version;</title>
-
-  <indexterm zone="qemu">
-    <primary sortas="a-qemu">qemu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qemu</title>
-
-    <para>
-      <application>qemu</application> is a full virtualization solution for
-      Linux on x86 hardware containing virtualization extensions (Intel VT or
-      AMD-V).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qemu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qemu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qemu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qemu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qemu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qemu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qemu Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="pixman"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="dtc"/>,
-      <xref linkend="libslirp"/>, and
-      <xref linkend="sdl2"/>
-    </para>
-
-    <note>
-      <para>
-        If <xref linkend="dtc"/> is not installed, the building system
-        will attempt to download a copy of dtc source code from the
-        Internet.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="pipewire"/> or
-      <xref linkend="pulseaudio"/> (can be used instead of alsa-lib),
-      <xref linkend="bluez"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="fuse3"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="keyutils"/>,
-      <xref linkend="libaio"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtasn1"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="nettle"/>,
-      <xref linkend="mesa"/>,
-      <xref role="nodep" linkend="vte"/>,
-<!-- libcacard has been a standalone project since qemu-2.5.-->
-      <ulink url="https://www.capstone-engine.org/">capstone</ulink>,
-      <ulink url="https://github.com/ceph/ceph/">ceph</ulink>,
-      <ulink url="https://pmem.io/daxctl/">daxctl</ulink>,
-      <ulink url="https://jackaudio.org/">JACK</ulink>,
-      <ulink url="https://github.com/gluster/glusterfs">glusterfs</ulink>,
-      <ulink url="https://github.com/libbpf/libbpf">libbpf</ulink>,
-      <ulink url="https://gitlab.freedesktop.org/spice/libcacard">libcacard</ulink>,
-      <ulink url="https://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink>,
-      <ulink url="https://sourceware.org/elfutils/">libdw</ulink>,
-      <ulink url="https://github.com/sahlberg/libiscsi">libiscsi</ulink>,
-      <ulink url="https://github.com/sahlberg/libnfs">libnfs</ulink>,
-      <ulink url="https://pmem.io/pmdk/libpmem/">libpmem</ulink>,
-      <ulink url="https://www.libssh.org/">libssh</ulink>,
-      <ulink url="https://github.com/Agnoctopus/libu2f-emu">libu2f-emu</ulink>,
-      <ulink url="https://github.com/lzfse/lzfse">lzfse</ulink>,
-      <ulink url="https://github.com/luigirizzo/netmap">netmap</ulink>,
-      <ulink url="https://github.com/numactl/numactl">numactl</ulink>,
-      <ulink url="https://github.com/linux-rdma/rdma-core">rdma-core</ulink>,
-      <ulink url="https://selinuxproject.org/">SELinux</ulink>,
-      <ulink url="https://google.github.io/snappy/">snappy</ulink>,
-      <ulink url="https://gitlab.freedesktop.org/spice/spice">spice</ulink>,
-      <ulink url="https://gitlab.freedesktop.org/spice/usbredir">usbredir</ulink>,
-      and <ulink url="https://github.com/virtualsquare/vde-2">VDE</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="runtime">
-      &logind;
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for building the documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx_rtd_theme"/>
-    </para>
-
-    <note>
-      <para>
-        This optional dependencies list is not comprehensive. See the output of
-        <command>./configure --help</command> for a more complete list.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/qemu"/></para>
-
-  </sect2>
-
-  <sect2 id='qemu-prereq'>
-    <title>KVM Prerequisites</title>
-
-    <para>
-      Before building <application>qemu</application>, check to see if
-      your processor supports Virtualization Technology (VT):
-    </para>
-
-    <screen><userinput>grep -E '^flags.*(vmx|svm)' /proc/cpuinfo</userinput></screen>
-
-    <para>
-      If you get any output, you have VT technology (vmx for Intel
-      processors and svm for AMD processors).  You then need to go into your
-      system BIOS and ensure it is enabled.  After enabling, reboot back to your
-      LFS instance.
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='qemu-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and
-      recompile the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="qemu-kvm-kernel.xml"/>
-
-    <indexterm zone="qemu qemu-kernel">
-      <primary sortas="d-qemu">qemu</primary>
-    </indexterm>
-
-    <para>
-      The Intel or AMD settings are not both required, but the one matching
-      your system processor is required.
-    </para>
-
-    <para>
-      To use the <quote>bridge</quote> network device, as explained below,
-      check that <xref linkend='bridgeutils'/> is installed
-      and the following options in the kernel configuration are enabled:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="qemu-bridge-kernel.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qemu</title>
-<!-- group kvm is created in lfs chapter 7 even for sysv
-    <para revision="sysv">
-      You will need a dedicated group that will contain users (other than root)
-      allowed to access the KVM device.  Create this group by running the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>groupadd -g 61 kvm</userinput></screen>
--->
-    <para>
-      The udev rule of LFS only allows the &root; user, the users owning
-      a local login session supported by the optional runtime dependency
-      &logind;, or the users in the
-      <systemitem class="groupname">kvm</systemitem> group to use the KVM
-      device.  As the &root; user, add any non-&root; users that might use
-      the KVM device either without &logind; installed or remotely (via a
-      SSH connection) to the
-      <systemitem class="groupname">kvm</systemitem> group:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G kvm <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <para>
-      Install <application>qemu</application> by running the following
-      commands:
-    </para>
-
-    <note>
-      <para>
-        Qemu is capable of running many targets.  The build process
-        is also capable of building multiple targets at one time in a
-        comma delimited list assigned to <option>--target-list</option>. Run
-        <command>./configure --help</command> to get a complete list of
-        available targets.
-      </para>
-    </note>
-
-
-<screen><userinput>if [ $(uname -m) = i686 ]; then
-   QEMU_ARCH=i386-softmmu
-else
-   QEMU_ARCH=x86_64-softmmu
-fi
-
-
-mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-../configure --prefix=/usr               \
-             --sysconfdir=/etc           \
-             --localstatedir=/var        \
-             --target-list=$QEMU_ARCH    \
-             --audio-drv-list=alsa       \
-             --disable-pa                \
-             --enable-slirp              \
-             --docdir=/usr/share/doc/qemu-&qemu-version; &amp;&amp;
-
-unset QEMU_ARCH &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      <application>qemu</application> uses <command>ninja</command> as
-      a subprocess when building.  To run the tests, issue:
-      <command>ninja test</command>. Two tests, bios-tables-test and migration-test, 
-      are known to fail.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Change the permissions and ownership of a helper script, which is needed
-      when using the <quote>bridge</quote> network device (see below). Again
-      as the &root; user, issue:
-    </para>
-
-    <note>
-      <para>
-        You need to add any users who might use the <quote>bridge</quote>
-        network device into the
-        <systemitem class="groupname">kvm</systemitem> group even if
-        &logind; is installed.
-      </para>
-    </note>
-
-<screen role="root"><userinput>chgrp kvm  /usr/libexec/qemu-bridge-helper &amp;&amp;
-chmod 4750 /usr/libexec/qemu-bridge-helper</userinput></screen>
-
-    <note>
-      <para>
-        For convenience you may want to create a symbolic link to run
-        the installed program. For instance (as the &root; user):
-      </para>
-
-<screen role="root"><userinput>ln -sv qemu-system-`uname -m` /usr/bin/qemu</userinput></screen>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--audio-drv-list=alsa</parameter>: This switch
-      sets the audio driver to ALSA. See below for enabling other audio drivers.
-    </para>
-
-    <para>
-      <parameter>--disable-pa</parameter>: even if <emphasis>pa</emphasis> is
-      not in <parameter>--audio-drv-list</parameter> list, the pulseaudio
-      driver is built, unless disabled by this parameter.
-    </para>
-
-    <para>
-      <parameter>--enable-slirp</parameter>: This switch forces the building
-      system to check for <xref linkend='libslirp'/>.  Remove it if you
-      don't need the <option>-netdev user</option> support.
-    </para>
-
-    <para>
-      <option>--audio-drv-list=pa --disable-alsa</option>: This switch sets
-      the audio driver to pulseaudio. For other drivers see the
-      --audio-drv-list choices in the output of
-      <command>./configure --help</command>. The default audio driver is OSS.
-      To enable support for both alsa and pulseaudio, use
-      <option>--audio-drv-list=alsa,pa</option>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using Qemu</title>
-
-    <para>
-      Since using qemu means using a virtual computer, the steps to set up
-      the virtual machine are in close analogy with those to set up a real
-      computer. You'll need to decide about CPU, memory, disk, USB devices,
-      network card(s), screen size, etc. Once the <quote>hardware</quote> is
-      decided, you'll have for example to choose how to connect the machine
-      to internet, and/or to install an OS. In the following, we show basic
-      ways of performing those steps. But qemu is much more than this, and it
-      is strongly advised to read the qemu documentation in
-      <filename>/usr/share/doc/qemu-&qemu-version;/qemu-doc.html</filename>.
-    </para>
-
-    <note>
-      <para>
-        It is standard practice to name the computer running qemu
-        <quote>host</quote> and the emulated machine running under qemu the
-        <quote>guest</quote>. We'll use those notations in the following.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The following instructions assume the optional symbolic link,
-        <filename>qemu</filename>, has been created. Additionally,
-        <command>qemu</command> should be run in a graphical environment.
-        But it is possible to use qemu <quote>headless</quote> or through
-        SSH. See the documentation for the various possibilities.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Disk</bridgehead>
-    <para>
-      A virtual disk may be set up in the following way:
-    </para>
-
-<screen><userinput>VDISK_SIZE=<replaceable>50G</replaceable>
-VDISK_FILENAME=<replaceable>vdisk.img</replaceable>
-qemu-img create -f qcow2 $VDISK_FILENAME $VDISK_SIZE</userinput></screen>
-
-    <para>
-      The virtual disk size and filename should be adjusted 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.
-    </para>
-
-    <bridgehead renderas="sect3">Operating System</bridgehead>
-    <para>
-      To install an operating system, download an iso image from your preferred
-      Linux distribution. For the purposes of this example, we'll use
-      <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> in the current
-      directory. Run the following:
-    </para>
-
-<screen><userinput>qemu -enable-kvm                           \
-     -drive file=$VDISK_FILENAME           \
-     -cdrom Fedora-16-x86_64-Live-LXDE.iso \
-     -boot d                               \
-     -m <replaceable>1G</replaceable></userinput></screen>
-
-    <para>
-      Follow the normal installation procedures for the chosen distribution.
-      The <parameter>-boot</parameter> option specifies the boot order of
-      drives as a string of drive letters. Valid drive letters are: a, b
-      (floppy 1 and 2), c (first hard disk), d (first CD-ROM). The
-      <parameter>-m</parameter> option is the amount of memory to use for the
-      virtual machine. The choice depends on the load of the host. Modern
-      distributions should be comfortable with 1GB.
-      The <parameter>-enable-kvm</parameter> option allows hardware
-      acceleration. Without this switch, the emulation is much slower.
-    </para>
-
-    <bridgehead renderas="sect3">Defining the virtual hardware</bridgehead>
-    <para>
-      The virtual machine hardware is defined by the qemu command line.
-      An example command is given below:
-    </para>
-
-<screen><userinput>qemu -enable-kvm                     \
-     -smp 4                          \
-     -cpu host                       \
-     -m 1G                           \
-     -drive file=$VDISK_FILENAME     \
-     -cdrom grub-img.iso             \
-     -boot order=c,once=d,menu=on    \
-     -net nic,netdev=net0            \
-     -netdev user,id=net0            \
-     -device ac97                    \
-     -vga std                        \
-     -serial mon:stdio               \
-     -name "fedora-16"</userinput></screen>
-
-    <bridgehead renderas="sect3">Meaning of the command line options</bridgehead>
-    <para>
-      <parameter>-enable-kvm</parameter>: enable full KVM virtualization
-      support. On some hardware, it may be necessary to add the undocumented
-      <option>-machine smm=off</option> option in order to enable KVM.
-    </para>
-
-    <para>
-      <parameter>-smp &lt;N&gt;</parameter>: enable symmetric multiprocessing
-      with &lt;N&gt; CPUs.
-    </para>
-
-    <para>
-      <parameter>-cpu &lt;model&gt;</parameter>: simulate CPU &lt;model&gt;.
-      the list of supported models can be obtained with <option>-cpu
-      help</option>.
-    </para>
-
-    <para>
-      <parameter>-drive file=&lt;filename&gt;</parameter>: defines a virtual
-      disk whose image is stored in <filename>&lt;filename&gt;</filename>.
-    </para>
-
-    <para>
-      <parameter>-cdrom grub-img.iso</parameter>: defines an iso formatted file
-      to use as a cdrom. Here we use a grub rescue disk, which may turn handy
-      when something goes wrong at boot time.
-    </para>
-
-    <para>
-      <parameter>-boot order=c,once=d,menu=on</parameter>: defines the boot
-      order for the virtual BIOS.
-    </para>
-
-    <para>
-      <parameter>-net nic,netdev=&lt;netid&gt;</parameter>: defines a network
-      card connected to the network device with id &lt;netid&gt;.
-    </para>
-
-    <para>
-      <parameter>-netdev user,id=&lt;netid&gt;</parameter>: defines the
-      network <quote>user</quote> device. This is a virtual local network
-      with addresses 10.0.2.0/24, where the host has address 10.0.2.2 and
-      acts as a gateway to internet, and with a name server at address
-      10.0.2.3, and an smb server at address 10.0.2.4. A builtin DHCP server
-      can allocate addresses between 10.0.2.15 and 10.0.2.31.
-    </para>
-
-    <para>
-      <parameter>-soundhw &lt;model&gt;</parameter>: defines the soundcard
-      model. The list may be obtained with <option>-soundhw help</option>.
-    </para>
-
-    <para>
-      <parameter>-vga &lt;type&gt;</parameter>: defines the type of VGA card
-      to emulate.  For <parameter>-vga std</parameter>, if you are building
-      a Linux kernel for the guest, it's recommended to enable
-      <option>CONFIG_DRM_BOCHS</option> (as a part of the kernel or a kernel
-      module) to drive all the features of the emulated VGA card, and
-      <option>CONFIG_FB</option> to display the Linux console on it.  The
-      other <option>&lt;type&gt;</option> values are not tested by the
-      editors and may require additional dependencies.
-    </para>
-
-    <para>
-      <parameter>-serial mon:stdio</parameter>: sends the serial port of the
-      guest (<filename>/dev/ttyS0</filename> on linux guests), multiplexed with
-      the qemu monitor, to the standard input and output of the qemu
-      process.
-    </para>
-
-    <para>
-      <parameter>-name &lt;name&gt;</parameter>: sets the name of the guest.
-      This name is displayed in the guest window caption. It may be useful
-      if you run several guests at the same time.
-    </para>
-
-    <para>
-      <option>-drive if=pflash,format=raw,readonly=on,file=/usr/share/qemu/edk2-x86_64-code.fd</option>: Load a
-      pre-built EDK2 UEFI firmware, instead of the default PC BIOS.  Use
-      this option if you want to boot the guest OS with UEFI.
-    </para>
-
-    <para>
-      <option>-drive file=&lt;filename&gt;,if=virtio</option>: Provide
-      Virtio interface to the guest kernel for accessing the disk image,
-      instead of simulating a real disk hardware.  This can improve disk I/O
-      performance, but it requires a Virtio driver in guest kernel.  Use
-      it instead of a plain <option>-drive</option> if the guest kernel
-      supports Virtio.  To build a Linux kernel with Virtio support for the
-      guest, use
-      <command>make defconfig &amp;&amp; make kvm_guest.config</command> to
-      create an initial kernel configuration with the Virtio drives enabled,
-      then make your customization.  And, if the guest kernel is Linux, the
-      virtual disks using Virtio interface will be named
-      <filename>vdx</filename> in the devtmpfs, instead of
-      <filename>sdx</filename>.
-    </para>
-
-    <para>
-      <option>-net nic,netdev=net0,model=virtio-net-pci</option>: Provide
-      Virtio interface to the guest kernel for accessing the network
-      interface, instead of simulating a real network interface card.  This
-      can improve network I/O performance, but it requires a Virtio driver
-      in guest kernel.  Use it instead of a plain <option>-net</option> if
-      the guest kernel supports Virtio.
-    </para>
-
-    <bridgehead renderas="sect3">Controlling the Emulated Display</bridgehead>
-    <para>
-      To set the resolution of the emulated display for a Xorg server
-      running in the guest Linux system, read <xref linkend='xdisplay'/>.
-    </para>
-
-    <bridgehead renderas="sect3">Networking</bridgehead>
-    <para>
-      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
-      access the guest, unless port forwarding is enabled. And in the case
-      several guests are running, they cannot communicate with each other.
-      Other network devices can be used for this purpose. For example, there
-      is the <quote>socket</quote> device, which allows several guests to
-      share a common virtual network. In the following, we describe in more
-      details how to set up the <quote>bridge</quote> device, which allows
-      the guests to appear as if connected to the local network. All the
-      commands below should be run as the <systemitem
-      class="username">root</systemitem> user.
-    </para>
-
-    <para revision="sysv">
-      Set up bridging with <xref linkend="bridgeutils"/>. Only the physical
-      interface(s) should be set up at boot. The virtual interface(s) will be
-      added as needed when qemu is started.
-    </para>
-
-    <para revision="systemd">
-      <!-- On SYS-V, IP_FORWARD is enabled by the bridge script. -->
-      Allow the host to forward IP packets:
-    </para>
-
-<screen role="root"
-        revision="systemd"><userinput>sysctl -w net.ipv4.ip_forward=1</userinput></screen>
-
-    <para revision="systemd">
-      To make this permanent, add the command to
-      <filename>/etc/sysctl.d/60-net-forward.conf:</filename>
-    </para>
-
-<screen role="root"
-        revision="systemd"><userinput>cat &gt;&gt; /etc/sysctl.d/60-net-forward.conf &lt;&lt; EOF
-<literal>net.ipv4.ip_forward=1</literal>
-EOF</userinput></screen>
-
-    <para>
-      Set up a required configuration file:
-    </para>
-
-<!-- /etc/qemu has not been installed by "make install" since version 2.4 -->
-<screen role="root"><userinput>install -vdm 755 /etc/qemu &amp;&amp;
-echo allow br0 &gt; /etc/qemu/bridge.conf</userinput></screen>
-
-    <para>
-      In the qemu command line above, replace the switch
-      <parameter>-netdev user,...</parameter> with
-      <parameter>-netdev bridge,...</parameter>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          elf2dmp,
-          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;
-        </seg>
-        <seg>None</seg>
-        <seg>
-          /usr/share/qemu and
-          /usr/share/doc/qemu-&qemu-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?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="qemu-edid">
-        <term><command>qemu-edid</command></term>
-        <listitem>
-          <para>
-            is a test tool for the qemu EDID generator
-          </para>
-          <indexterm zone="qemu qemu-edid">
-            <primary sortas="b-qemu-edid">qemu-edid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-ga">
-        <term><command>qemu-ga</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="qemu qemu-ga">
-            <primary sortas="b-qemu-ga">qemu-ga</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-img">
-        <term><command>qemu-img</command></term>
-        <listitem>
-          <para>
-            provides commands to manage QEMU disk images
-          </para>
-          <indexterm zone="qemu qemu-img">
-            <primary sortas="b-qemu-img">qemu-img</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-io">
-        <term><command>qemu-io</command></term>
-        <listitem>
-          <para>
-            is a diagnostic and manipulation program for (virtual) memory
-            media. It is still at an early stage of development
-          </para>
-          <indexterm zone="qemu qemu-io">
-            <primary sortas="b-qemu-io">qemu-io</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            exports Qemu disk images using the QEMU Disk Network Block
-            Device (NBD) protocol
-          </para>
-          <indexterm zone="qemu qemu-nbd">
-            <primary sortas="b-qemu-nbd">qemu-nbd</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="qemu qemu-system">
-            <primary sortas="b-qemu-system">qemu-system-x86_64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/virtualization/virtualization.xml
===================================================================
--- postlfs/virtualization/virtualization.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="postlfs-virtualization">
-  <?dbhtml filename="virtualization.html"?>
-
-  <title>Virtualization</title>
-
-  <para>
-    Virtualization allows running a complete operating system, or virtual
-    machine (VM), within another operating environment as a task.  There are
-    several commercial and open source environments that either emulate another
-    processor or utilize the hardware virtualization features of the host
-    processor.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu.xml"/>
-
-</chapter>
Index: preface/foreword.xml
===================================================================
--- preface/foreword.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ preface/foreword.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,36 @@
+<sect1 id="preface-foreword">
+<?dbhtml filename="foreword.html" dir="preface"?>
+<title>Foreword</title>
+
+<para>Having helped out with LinuxFromScratch for a short time, I
+noticed that we were getting many queries as to how to do things beyond
+the base LFS system.  At the time, the only assistance specifically
+offered relating to LFS were the LFS hints (<ulink
+url="&hints-root;">&hints-root;</ulink>).  Most of the LFS hints are
+extremely good and well written but I (and others) could still see a
+need for more comprehensive help to go Beyond LFS - hence BLFS.</para>
+
+<para>BLFS aims to be more than the LFS-hints converted to XML although
+much of our work is based around the hints and indeed some authors write
+both hints and the relevant BLFS sections.  We hope that we can provide
+you with enough information to not only manage to build your system up
+to what you want, whether it be a web server or a multimedia desktop
+system, but also that you will learn a lot about system configuration as
+you go.</para>
+
+<para>Thanks as ever go to everyone in the LFS/BLFS community especially
+those who have contributed instructions, written text, answered
+questions and generally shouted when things were wrong!</para>
+
+<para>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 at irc.linuxfromscratch.org.
+You can find more details about all of these in the <xref linkend="introduction"/> section of the book.</para>
+
+<para>Enjoy using BLFS.</para>
+
+<para>Mark Hymers &lt;markh@linuxfromscratch.org&gt;
+BLFS Editor</para>
+
+</sect1>
+
Index: preface/organization.xml
===================================================================
--- preface/organization.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ preface/organization.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect1 id="preface-organization">
+<?dbhtml filename="organization.html" dir="preface"?>
+<title>Organization</title>
+
+<para>This book is divided into the following parts.</para>
+
+&preface-organization-temp;
+
+</sect1>
Index: preface/organtemp.xml
===================================================================
--- preface/organtemp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ preface/organtemp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,6 @@
+<sect2 id="preface-organization-temp">
+<title>Description of the new parts goes here.</title>
+
+<para>TO BE WRITTEN</para>
+
+</sect2>
Index: preface/preface.ent
===================================================================
--- preface/preface.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ preface/preface.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,6 @@
+<!ENTITY preface SYSTEM "preface.xml">
+<!ENTITY preface-foreword SYSTEM "foreword.xml">
+<!ENTITY preface-whoread SYSTEM "whoread.xml">
+
+<!ENTITY preface-organization SYSTEM "organization.xml">
+<!ENTITY preface-organization-temp SYSTEM "organtemp.xml">
Index: preface/preface.xml
===================================================================
--- preface/preface.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ preface/preface.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<preface id="preface">
+<?dbhtml filename="preface.html" dir="preface"?>
+<title>Preface</title>
+
+&preface-foreword;
+&preface-whoread;
+&preface-organization;
+
+</preface>
Index: preface/whoread.xml
===================================================================
--- preface/whoread.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ preface/whoread.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect1 id="preface-whoread">
+<?dbhtml filename="whoread.html" dir="preface"?>
+<title>Who would want to read this book</title>
+
+<para>This book is mainly aimed at those who have built a system based
+on the LFS book.  It will also be useful for those who are using other
+distributions, but for one reason or another want to manually build
+software and are in need of some assistance.  BLFS can be used to create
+a range of diverse systems and so the target audience is probably nearly
+as wide as that of the LFS book.  If you found LFS useful, you should
+also like this!</para>
+
+</sect1>
+
Index: t/printing/cups-browsed.xml
===================================================================
--- pst/printing/cups-browsed.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cups-browsed-download-http
-  "https://github.com/OpenPrinting/cups-browsed/releases/download/&cups-browsed-version;/cups-browsed-&cups-browsed-version;.tar.xz">
-  <!ENTITY cups-browsed-download-ftp  " ">
-  <!ENTITY cups-browsed-md5sum        "1f8dc0c5a08d8a410df0713c5adbaee9">
-  <!ENTITY cups-browsed-size          "416 KB">
-  <!ENTITY cups-browsed-buildsize     "6.3 MB">
-  <!ENTITY cups-browsed-time          "less than 0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="cups-browsed" xreflabel="cups-browsed-&cups-browsed-version;">
-  <?dbhtml filename="cups-browsed.html"?>
-
-
-  <title>cups-browsed-&cups-browsed-version;</title>
-
-  <indexterm zone="cups-browsed">
-    <primary sortas="a-cups-browsed">cups-browsed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cups-browsed</title>
-
-    <para>
-      The <application>cups-browsed</application> daemon is used to
-      browse the network for remote CUPS queues and IPP network printers
-      and automatically create local queues pointing to them.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-browsed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-browsed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-browsed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-browsed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-browsed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-browsed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">cups-browsed Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="avahi"/>,
-      <xref linkend="libcupsfilters"/> and
-      <xref linkend="libppd"/>
-    </para>
-
-<!-- as of 2.0.0 \-\-disable-avahi is still accepted by configure,
-  but make fails.https://github.com/OpenPrinting/cups-browsed/issues/21
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="avahi"/>
-    </para>-->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openldap"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cups-browsed</title>
-
-    <para>
-      Install <application>cups-browsed</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --with-cups-rundir=/run/cups    \
-            --without-rcdir                 \
-            --disable-static                \
-            --docdir=/usr/share/doc/cups-browsed-&cups-browsed-version; &amp;&amp;
-make</userinput></screen>
-<!-- Tests seem to hang, not sure why
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-    -->
-    <para>
-      This package does not come with a functional test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para revision="systemd">
-      Install the systemd unit by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -v -m644 daemon/cups-browsed.service /lib/systemd/system/cups-browsed.service</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>
-      <parameter>--with-cups-rundir=/run/cups</parameter>: Defines the
-      directory containing transient printing data. The default
-      <filename class="directory">/var/run/cups</filename> is obsolete.
-    </para>
-
-    <para>
-      <parameter>--without-rcdir</parameter>: This switch disables
-      installation of the bundled bootscript which is not compatible with BLFS.
-    </para>
-
-  </sect2>
-
-<!-- TODO: Write a bootscript for cups-browsed -->
-
-  <sect2 role="configuration" revision="systemd">
-    <title>Configuring cups-browsed</title>
-
-    <sect3 id="cups-browsed-init">
-      <title>Systemd Unit</title>
-
-      <para>
-        To start the <command>cups-browsed</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="cups-browsed cups-browsed-init">
-        <primary sortas="f-cups-browsed">cups-browsed</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable cups-browsed</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>
-          cups-browsed
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cups-browsed-prog">
-        <term><command>cups-browsed</command></term>
-        <listitem>
-          <para>
-            is a daemon for browsing the Bonjour and CUPS broadcasts of
-            shared, remote CUPS printers
-          </para>
-          <indexterm zone="cups-browsed cups-browsed-prog">
-            <primary sortas="b-cups-browsed">cups-browsed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cups-filters-download-http
-  "https://github.com/OpenPrinting/cups-filters/releases/download/&cups-filters-version;/cups-filters-&cups-filters-version;.tar.xz">
-  <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "1d9ac8b601ea5e25a42767856a48c4d7">
-  <!ENTITY cups-filters-size          "437 KB">
-  <!ENTITY cups-filters-buildsize     "9.1 MB">
-  <!ENTITY cups-filters-time          "less than 0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="cups-filters" xreflabel="cups-filters-&cups-filters-version;">
-  <?dbhtml filename="cups-filters.html"?>
-
-
-  <title>cups-filters-&cups-filters-version;</title>
-
-  <indexterm zone="cups-filters">
-    <primary sortas="a-cups-filters">cups-filters</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CUPS Filters</title>
-
-    <para>
-      The <application>CUPS Filters</application> package is only needed
-      to adapt <xref linkend="libcupsfilters"/> and <xref linkend="libppd"/>
-      filter functions for cups-2.x. It should not be needed for cups-3.x.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-filters-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-filters-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-filters-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-filters-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-filters-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-filters-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcupsfilters"/> and
-      <xref linkend="libppd"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="avahi"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CUPS Filters</title>
-
-    <para>
-      Install <application>CUPS Filters</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --disable-static                \
-            --disable-avahi                 \
-            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a functional test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-avahi</parameter>: This switch should be
-      given even <application>Avahi</application> is installed. This is needed
-      due to a flaw in the configure script of
-      <application>CUPS Filters</application>, where it will bail out if
-      <application>Avahi</application> is not installed. Note though that Avahi
-      is not used by this package.
-    </para>
-
-    <!--
-    <para>
-      <option>- -enable-ijs</option>: This switch will allow the pdftoijs
-      filter, for sending PDFs to an HP InkJet Server, to be built.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          driverless, driverless-fax, and foomatic-rip
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/cups/{backend,driver,filter},
-          /usr/share/doc/cups-filters-&cups-filters-version;, and
-          /usr/share/ppd/cupsfilters
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="driverless">
-        <term><command>driverless</command></term>
-        <listitem>
-          <para>
-            is a PPD generator utility for driverless printing
-          </para>
-          <indexterm zone="cups-filters driverless">
-            <primary sortas="b-driverless">driverless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="driverless-fax">
-        <term><command>driverless-fax</command></term>
-        <listitem>
-          <para>
-            is a wrapper to <command>driverless</command> for FAX type devices
-          </para>
-          <indexterm zone="cups-filters driverless-fax">
-            <primary sortas="b-driverless-fax">driverless-fax</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="foomatic-rip">
-        <term><command>foomatic-rip</command></term>
-        <listitem>
-          <para>
-            is a universal print filter/RIP wrapper which can be used as CUPS
-            filter or stand-alone for spooler-less, direct printing
-          </para>
-          <indexterm zone="cups-filters foomatic-rip">
-            <primary sortas="b-foomatic-rip">foomatic-rip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="libcupsfilters">
-        <term><filename class="libraryfile">libcupsfilters.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>CUPS Filters</application> API functions
-          </para>
-          <indexterm zone="cups-filters libcupsfilters">
-            <primary sortas="c-libcupsfilters">libcupsfilters.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,792 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cups-download-http "https://github.com/OpenPrinting/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
-  <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "e0a5ddbf53dfad41da26fc1ef60b2256">
-  <!ENTITY cups-size          "7.8 MB">
-  <!ENTITY cups-buildsize     "77 MB (Add 49 MB for tests)">
-  <!ENTITY cups-time          "0.4 SBU (Add 1.0 SBU for tests)">
-]>
-
-<sect1 id="cups" xreflabel="Cups-&cups-version;">
-  <?dbhtml filename="cups.html"?>
-
-
-  <title>Cups-&cups-version;</title>
-
-  <indexterm zone="cups">
-    <primary sortas="a-Cups">Cups</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cups</title>
-
-    <para>
-      The Common Unix Printing System (CUPS) is a print spooler and
-      associated utilities. It is based on the "Internet Printing
-      Protocol" and provides printing services to most PostScript
-      and raster printers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cups Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="colord"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="linux-pam"/>, and
-      <xref linkend="xdg-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="mitkrb"/>,
-      <!--<xref linkend="openjdk"/>, Not found in 2.4.0 -->
-      <xref linkend="php"/>, and
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Postinstall)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="cups-filters"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Postinstall)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="gutenprint"/> and
-      <ulink role="runtime" url="https://developers.hp.com/hp-linux-imaging-and-printing">hplip</ulink> (HP printers)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="cups-kernel">
-    <title>Kernel Configuration</title>
-
-    <note>
-      <para>
-        There used to be a conflict between the <application>Cups</application>
-        <application>libusb</application> backend and the usblp kernel driver.
-        This is no longer the case and cups will work with both of these
-        enabled.
-      </para>
-    </note>
-
-    <para>
-      If you want to use the kernel usblp driver (for example, if you wish to
-      use <application>escputil</application> from <xref
-      linkend="gutenprint"/>) enable the following options in your kernel
-      configuration and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="usb-printer-kernel.xml"/>
-
-    <para>
-      If you have a parallel printer, enable the following options in your
-      kernel configuration and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="parallel-printer-kernel.xml"/>
-
-    <indexterm zone="cups cups-kernel">
-      <primary sortas="d-cups">cups</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cups</title>
-
-    <para>
-      You will need to add an <systemitem class="username">lp</systemitem>
-      user, as <application>Cups</application> will create some files owned
-      by this user. (The <systemitem class="username">lp</systemitem> user
-      is the default used by <application>Cups</application>, but may be
-      changed to a different user by passing a parameter to the
-      <command>configure</command> script.) Use the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp</userinput></screen>
-
-    <para>
-      You will also need a dedicated group that will contain users allowed to
-      do <application>Cups</application> administrative tasks. Add the group
-      by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 19 lpadmin</userinput></screen>
-
-    <para>
-      If you want to add a user to the <application>Cups</application>
-      administrative group, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G lpadmin <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <para>
-      If you didn't install <xref linkend="xdg-utils"/>, use the following
-      <command>sed</command> to change the default browser that will be used
-      to access the <application>Cups</application> web interface:
-    </para>
-
-<screen><userinput>sed -i 's#@CUPS_HTMLVIEW@#firefox#' desktop/cups.desktop.in</userinput></screen>
-
-    <para>
-      Replace <command>firefox</command> with the web browser of your
-      choice.
-    </para>
-
-    <para>
-      Build <application>Cups</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --libdir=/usr/lib            \
-            --disable-systemd            \
-            --with-rcdir=/tmp/cupsinit   \
-            --with-rundir=/run/cups      \
-            --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --libdir=/usr/lib            \
-            --with-rundir=/run/cups      \
-            --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      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".
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make BUILDROOT=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install &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</userinput></screen>
-
-    <para>
-      Create a basic <application>Cups</application> client configuration file
-      by running the following command as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>echo "ServerName /run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-update-icon-cache.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: Systemd is not supported by
-      this version of BLFS.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
-      build process to install the shipped bootscript into <filename
-      class="directory">/tmp</filename> instead of <filename
-      class="directory">/etc/rc.d</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-rundir=/run/cups</parameter>: This switch prevents
-      the package from referring to the deprecated
-      <filename class='directory'>/var/run</filename> directory.
-    </para>
-
-    <para>
-      <parameter>--with-system-groups=lpadmin</parameter>: This switch ensures
-      that only <systemitem class="groupname">lpadmin</systemitem> will be used
-      as the <application>Cups</application> administrative group.
-    </para>
-
-    <para>
-      <option>--disable-libusb</option>: Use this switch if you have installed
-      <xref linkend="libusb"/>, but wish to use the kernel usblp driver.
-    </para>
-
-    <para>
-      <option>--enable-libpaper</option>: Use this switch if you have installed
-      <application>libpaper</application> and wish to use it with
-      <application>Cups</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Cups</title>
-
-    <sect3 id="cups-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/cups/*</filename>
-      </para>
-
-      <indexterm zone="cups cups-config">
-        <primary sortas="e-etc-cups">/etc/cups/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Normally, printers are set up via a web browser.  The
-        <application>Cups</application> server will normally connect via
-        the url http://localhost:631.  From there printers, print
-        jobs, and the server configuration can be set up and managed.
-        Remote system administration can also be set up.  Configuration
-        can also be done from the command line via the
-        <command>lpadmin</command>, <command>lpoptions</command>,
-        and <command>lpstat</command> commands.
-      </para>
-
-      <para>
-        Configuration of <application>Cups</application> is dependent on
-        the type of printer and can be complex. Generally, PostScript printers
-        are easier. For detailed instructions on configuration and use of
-        <application>Cups</application>, see <ulink
-        url="https://www.cups.org/documentation.html"/>.
-      </para>
-
-      <para>
-        For non-PostScript printers to print with
-        <application>Cups</application>, you need to install <xref
-        linkend="gs"/> to convert PostScript to raster images and a driver
-        (e.g. from <xref linkend="gutenprint"/>) to convert the resulting
-        raster images to a form that the printer understands.  <ulink
-        url="https://wiki.linuxfoundation.org/openprinting/database/foomatic">Foomatic</ulink>
-        drivers use <xref linkend="gs"/> to convert PostScript to a printable
-        form directly, but this is considered suboptimal by
-        <application>Cups</application> developers.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>CUPS</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following command as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/cups &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/cups
-
-auth    include system-auth
-account include system-account
-session include system-session
-
-# End /etc/pam.d/cups</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="cups-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want the <application>Cups</application> print service to start
-        automatically when the system is booted, install the init script
-        included in the <xref linkend="bootscripts"/> package:
-      </para>
-
-      <para revision="systemd">
-        To start the <command>cupsd</command> daemon when something tries to
-        access it, enable the previously installed systemd units by running
-        the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="cups cups-init">
-        <primary sortas="f-cups">cups</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-cups</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable cups</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>
-          cancel, cupsaccept, cups-config, cupsctl, cupsd, cupsdisable,
-          cupsenable, cupsfilter, cupsreject, cupstestppd, ippeveprinter,
-          ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lpq,
-          lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge, and ppdpo
-        </seg>
-        <seg>
-          libcupsimage.so
-          and libcups.so
-        </seg>
-        <seg>
-          /etc/cups,
-          /usr/{include,lib,share}/cups,
-          /usr/share/doc/cups-&cups-version;,
-          /run/cups, and
-          /var/{cache,log,spool}/cups
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="cancel-cups">
-        <term><command>cancel</command></term>
-        <listitem>
-          <para>
-            cancels existing print jobs from the print queues
-          </para>
-          <indexterm zone="cups cancel-cups">
-            <primary sortas="b-cancel">cancel</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="cupsaccept">
-        <term><command>cupsaccept</command></term>
-        <listitem>
-          <para>
-            accept jobs sent to a destination
-          </para>
-          <indexterm zone="cups cupsaccept">
-            <primary sortas="b-cupsaccept">cupsaccept</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-config-prog">
-        <term><command>cups-config</command></term>
-        <listitem>
-          <para>
-            is a <application>Cups</application>
-            program configuration utility
-          </para>
-          <indexterm zone="cups cups-config-prog">
-            <primary sortas="b-cups-config">cups-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsctl">
-        <term><command>cupsctl</command></term>
-        <listitem>
-          <para>
-            updates or queries the cupsd.conf file for a server
-          </para>
-          <indexterm zone="cups cupsctl">
-            <primary sortas="b-cupsctl">cupsctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsd">
-        <term><command>cupsd</command></term>
-        <listitem>
-          <para>
-            is the scheduler for the Common Unix Printing System
-          </para>
-          <indexterm zone="cups cupsd">
-            <primary sortas="b-cupsd">cupsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsdisable">
-        <term><command>cupsdisable</command></term>
-        <listitem>
-          <para>
-            stop printers and classes
-          </para>
-          <indexterm zone="cups cupsdisable">
-            <primary sortas="b-cupsdisable">cupsdisable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsenable">
-        <term><command>cupsenable</command></term>
-        <listitem>
-          <para>
-            start printers and classes
-          </para>
-          <indexterm zone="cups cupsenable">
-            <primary sortas="b-cupsenable">cupsenable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsfilter">
-        <term><command>cupsfilter</command></term>
-        <listitem>
-          <para>
-            is a front-end to the <application>Cups</application>
-            filter subsystem which allows you to convert a file
-            to a specific format
-          </para>
-          <indexterm zone="cups cupsfilter">
-            <primary sortas="b-cupsfilter">cupsfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsreject">
-        <term><command>cupsreject</command></term>
-        <listitem>
-          <para>
-            reject jobs sent to a destination
-          </para>
-          <indexterm zone="cups cupsreject">
-            <primary sortas="b-cupsreject">cupsreject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupstestppd">
-        <term><command>cupstestppd</command></term>
-        <listitem>
-          <para>
-            tests the conformance of PPD files
-          </para>
-          <indexterm zone="cups cupstestppd">
-            <primary sortas="b-cupstestppd">cupstestppd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ippeveprinter">
-        <term><command>ippeveprinter</command></term>
-        <listitem>
-          <para>
-            is an IPP Everywhere printer for CUPS
-          </para>
-          <indexterm zone="cups ippeveprinter">
-            <primary sortas="b-ippeveprinter">ippeveprinter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ippfind">
-        <term><command>ippfind</command></term>
-        <listitem>
-          <para>
-            finds Internet Printing Protocol printers
-          </para>
-          <indexterm zone="cups ippfind">
-            <primary sortas="b-ippfind">ippfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipptool">
-        <term><command>ipptool</command></term>
-        <listitem>
-          <para>
-            sends IPP requests to the specified URI and tests
-            and/or displays the results
-          </para>
-          <indexterm zone="cups ipptool">
-            <primary sortas="b-ipptool">ipptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lp-cups">
-        <term><command>lp</command></term>
-        <listitem>
-          <para>
-            submits files for printing or alters a pending job
-          </para>
-          <indexterm zone="cups lp-cups">
-            <primary sortas="b-lp">lp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpadmin">
-        <term><command>lpadmin</command></term>
-        <listitem>
-          <para>
-            configures printer and class queues provided by
-            <application>Cups</application>
-          </para>
-          <indexterm zone="cups lpadmin">
-            <primary sortas="b-lpadmin">lpadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpc-cups">
-        <term><command>lpc</command></term>
-        <listitem>
-          <para>
-            provides limited control over printer and class queues
-            provided by <application>Cups</application>
-          </para>
-          <indexterm zone="cups lpc-cups">
-            <primary sortas="b-lpc">lpc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpinfo">
-        <term><command>lpinfo</command></term>
-        <listitem>
-          <para>
-            lists the available devices or drivers known to the
-            <application>Cups</application> server
-          </para>
-          <indexterm zone="cups lpinfo">
-            <primary sortas="b-lpinfo">lpinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpmove">
-        <term><command>lpmove</command></term>
-        <listitem>
-          <para>
-            moves the specified job to a new destination
-          </para>
-          <indexterm zone="cups lpmove">
-            <primary sortas="b-lpmove">lpmove</primary>
-          </indexterm>
-      </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpoptions">
-        <term><command>lpoptions</command></term>
-        <listitem>
-          <para>
-            displays or sets printer options and defaults
-          </para>
-          <indexterm zone="cups lpoptions">
-            <primary sortas="b-lpoptions">lpoptions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpq-cups">
-        <term><command>lpq</command></term>
-        <listitem>
-          <para>
-            shows the current print queue status on the named printer
-          </para>
-          <indexterm zone="cups lpq-cups">
-            <primary sortas="b-lpq">lpq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpr-cups">
-        <term><command>lpr</command></term>
-        <listitem>
-          <para>
-            submits files for printing
-          </para>
-          <indexterm zone="cups lpr-cups">
-            <primary sortas="b-lpr">lpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lprm-cups">
-        <term><command>lprm</command></term>
-        <listitem>
-          <para>
-            cancels print jobs that have been queued for printing
-          </para>
-          <indexterm zone="cups lprm-cups">
-            <primary sortas="b-lprm">lprm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpstat-cups">
-        <term><command>lpstat</command></term>
-        <listitem>
-          <para>
-            displays status information about the current classes, jobs,
-            and printers
-          </para>
-          <indexterm zone="cups lpstat-cups">
-            <primary sortas="b-lpstat">lpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdc">
-        <term><command>ppdc</command></term>
-        <listitem>
-          <para>
-            compiles PPDC source files into one or more PPD files
-          </para>
-          <indexterm zone="cups ppdc">
-            <primary sortas="b-ppdc">ppdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdhtml">
-        <term><command>ppdhtml</command></term>
-        <listitem>
-          <para>
-            reads a driver information file and produces a HTML summary
-            page that lists all of the drivers in a file and the
-            supported options
-          </para>
-          <indexterm zone="cups ppdhtml">
-            <primary sortas="b-ppdhtml">ppdhtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdi">
-        <term><command>ppdi</command></term>
-        <listitem>
-          <para>
-            imports one or more PPD files into a PPD compiler source file
-          </para>
-          <indexterm zone="cups ppdi">
-            <primary sortas="b-ppdi">ppdi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdmerge">
-        <term><command>ppdmerge</command></term>
-        <listitem>
-          <para>
-            merges two or more PPD files into a single, multi-language
-            PPD file
-          </para>
-          <indexterm zone="cups ppdmerge">
-            <primary sortas="b-ppdmerge">ppdmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdpo">
-        <term><command>ppdpo</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="cups ppdpo">
-            <primary sortas="b-ppdpo">ppdpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcups">
-        <term><filename class="libraryfile">libcups.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cups</application> API functions
-          </para>
-          <indexterm zone="cups libcups">
-            <primary sortas="c-libcups">libcups.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,396 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!--  When updating, ensure gs-packver is updated in packages.ent -->
-
-  <!ENTITY gs-download-http
-  "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs&gs-packver;/ghostscript-&gs-dl-version;.tar.xz">
-  <!ENTITY gs-download-ftp  " ">
-  <!ENTITY gs-md5sum        "44e8ae7e2ce5bb0e5e2ba1134b51d043">
-  <!ENTITY gs-size          "65 MB">
-  <!ENTITY gs-buildsize     "383 MB (with fonts and libgs.so)">
-  <!ENTITY gs-time          "1.4 SBU (Using parallelism=4; with libgs.so)">
-
-  <!ENTITY gs-standard-fonts-download
-  "&sourceforge-dl;/gs-fonts/ghostscript-fonts-std-8.11.tar.gz">
-  <!ENTITY gs-standard-fonts-md5sum   "6865682b095f8c4500c54b285ff05ef6">
-  <!ENTITY gs-standard-fonts-size     "3.7 MB">
-
-  <!ENTITY gs-other-fonts-download
-  "&sourceforge-dl;/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz">
-  <!ENTITY gs-other-fonts-md5sum      "33457d3f37de7ef03d2eea05a9e6aa4f">
-  <!ENTITY gs-other-fonts-size        "796 KB">
-]>
-
-<sect1 id="gs" xreflabel="ghostscript-&gs-version;">
-  <?dbhtml filename="gs.html"?>
-
-
-  <title>ghostscript-&gs-version;</title>
-
-  <indexterm zone="gs">
-    <primary sortas="a-Ghostscript">Ghostscript</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ghostscript</title>
-
-    <para>
-      <application>Ghostscript</application> is a versatile processor
-      for PostScript data with the ability to render PostScript to different
-      targets. It is a mandatory part of the cups printing stack.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <!-- devs: do not comment out the bridgehead, unless you comment
-         out all the additional downloads (including font files)
-         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"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <para>
-      If you wish, you can download additional fonts.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <title>Standard Fonts</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gs-standard-fonts-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gs-standard-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gs-standard-fonts-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing="compact">
-      <title>Other Fonts</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gs-other-fonts-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gs-other-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gs-other-fonts-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ghostscript Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/> (required for building the <quote>cups</quote>
-      device backend, which is needed by
-      <application>cups-filters</application>),
-      <xref linkend="fontconfig"/> (required, if you are installing any
-      suggested font),
-      <xref linkend="freetype2"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="openjpeg2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libidn"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="libwebp"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ghostscript</title>
-
-    <note>
-      <para>
-        The <application>Ghostscript</application> build system is not
-        user-friendly. In order to use system copies of various graphics
-        libraries, you must do it using unconventional methods.
-      </para>
-    </note>
-
-    <para>
-      <application>Ghostscript</application> includes (old) copies of
-      several libraries. Some of these seem to have been patched to fix known
-      vulnerabilities, but others of these copies are less-well maintained.
-      To ensure that any future fixes are applied throughout the whole system,
-      it is recommended that you first install the released versions of these
-      libraries and then configure <application>Ghostscript</application>
-      to link to them.
-    </para>
-
-    <para>
-      If you have installed the recommended dependencies on your system,
-      remove the copies of
-      <application>freetype</application>, <application>lcms2</application>,
-      <application>libjpeg</application>, <application>libpng</application>,
-      and <application>openjpeg</application>:
-    </para>
-
-<screen><userinput>rm -rf freetype lcms2mt jpeg libpng openjpeg</userinput></screen>
-
-<!--
-    <para>
-      Apply an upstream fix to prevent a build problem.
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../ghostscript-&gs-version;-upstream_fix-1.patch</userinput></screen>
--->
-    <para>
-      Compile <application>Ghostscript</application>:
-    </para>
-
-<screen><userinput>rm -rf zlib &amp;&amp;
-
-./configure --prefix=/usr           \
-            --disable-compile-inits \
-            --with-system-libtiff   &amp;&amp;
-make</userinput></screen>
-
-    <note>
-      <para>
-        The shared library depends on <xref linkend="gtk3"/>. It is only used by
-        external programs like <xref linkend="asymptote"/>, <xref
-        linkend="dvisvgm"/>, and <xref linkend="imagemagick"/>.
-      </para>
-    </note>
-
-    <para>
-      To compile the shared library
-      <filename class="libraryfile">libgs.so</filename>, run the following
-      additional command as an unprivileged user:
-    </para>
-
-<screen><userinput>make so</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.  A set of example files
-      may be used for testing, but it is only possible after installation
-      of the package.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you want the shared library too:
-    </para>
-
-<screen role="root"><userinput>make soinstall &amp;&amp;
-install -v -m644 base/*.h /usr/include/ghostscript &amp;&amp;
-ln -sfvn ghostscript /usr/include/ps</userinput></screen>
-
-    <para>
-      Now make the documentation accessible from a standard place:
-    </para>
-<!-- Starting with 9.23, the install does not seem to copy the examples any more -->
-
-<screen role="root"><userinput>mv -v /usr/share/doc/ghostscript/&gs-version; /usr/share/doc/ghostscript-&gs-version;  &amp;&amp;
-cp -r examples/ -T /usr/share/ghostscript/&gs-version;/</userinput></screen>
-
-    <para>
-      If you have downloaded the fonts, unpack them to
-      <filename class="directory">/usr/share/ghostscript</filename> and ensure
-      the ownership of the files are
-      <systemitem class="username">root</systemitem>:
-      <systemitem class="groupname">root</systemitem>.
-    </para>
-
-<screen role="root"><userinput>tar -xvf ../ghostscript-fonts-std-8.11.tar.gz -C /usr/share/ghostscript --no-same-owner &amp;&amp;
-tar -xvf ../gnu-gs-fonts-other-6.0.tar.gz     -C /usr/share/ghostscript --no-same-owner &amp;&amp;
-fc-cache -v /usr/share/ghostscript/fonts/</userinput></screen>
-
-    <para>
-      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):
-    </para>
-
-<screen remap="test"><userinput>gs -q -dBATCH /usr/share/ghostscript/&gs-version;/examples/tiger.eps</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>rm -rf zlib </command>: <application>zlib</application>
-      was installed as part of LFS.
-    </para>
-
-    <para>
-      <parameter>--disable-compile-inits</parameter>: This option makes
-      <command>gs</command> and <filename>libgs.so</filename> slightly smaller.
-    </para>
-
-    <para>
-      <parameter>--with-system-libtiff</parameter>: Remove this option if
-      you've not installed <xref linkend="libtiff"/>.
-    </para>
-
-    <para>
-      <command>install -v -m644 base/*.h... </command>: Some packages
-      (<application>ImageMagick</application> is one) need the
-      <application>Ghostscript</application> interface headers in place to link
-      to the shared library. These commands install the headers.
-    </para>
-
-    <para>
-      <command>ln -sfvn ghostscript /usr/include/ps</command>: Some packages
-      expect to find the interface headers in an alternate location.
-    </para>
-
-    <para>
-        <command>mv -v /usr/share/doc/ghostscript/&gs-version;
-        /usr/share/doc/ghostscript-&gs-version;</command>: This moves the
-        documentation where it is expected to be found.
-    </para>
-
-    <para>
-      <option>--disable-cups</option>: this option will save a tiny amount of
-      space by not linking <command>gs</command> and <filename>libgs.so</filename>
-      to the <xref linkend="cups"/> libraries if you have installed those.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dvipdf, eps2eps, gs, gsbj, gsc (from soinstall), gsdj,
-          gsdj500, gslj, gslp, gsnd, gsx (from soinstall), lprsetup.sh,
-          pdf2dsc, pdf2ps, pf2afm, pfbtopfa, pphs, printafm, ps2ascii,
-          ps2epsi, ps2pdf, ps2pdf12, ps2pdf13, ps2pdf14, ps2pdfwr,
-          ps2ps, ps2ps2, and unix-lpr.sh
-          <!-- I don't see bdftops,fixmswrd.pl or pv.sh on my builds [ I don't
-          have any bdf tools from xorg ] but they are still referenced in
-          base/unixinst.mak -->
-        </seg>
-        <seg>libgs.so</seg>
-        <seg>
-          /usr/include/ghostscript,
-          /usr/share/ghostscript, and
-          /usr/share/doc/ghostscript-&gs-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gplgs-prog">
-        <term><command>gs</command></term>
-        <listitem>
-          <para>
-            is an interpreter for Adobe Systems' PostScript(tm) and Portable
-            Document Format (PDF)
-          </para>
-          <indexterm zone="gs gplgs-prog">
-            <primary sortas="b-gs">gs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgs.so">
-        <term><filename class="libraryfile">libgs.so</filename></term>
-        <listitem>
-          <para>
-            provides <application>Ghostscript</application> functionality to
-            other programs, such as <application>GSView</application>,
-            <application>ImageMagick</application>, and
-            <application>libspectre</application>
-          </para>
-          <indexterm zone="gs libgs.so">
-            <primary sortas="c-libgs.so">libgs.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-   </variablelist>
-
-   <para>
-     <application>Ghostscript</application> provides many different
-     scripts used to convert PostScript, PDF, and other formats. Please refer to
-     the HTML documentation or the man pages for information about the
-     capabilities provided.
-    </para>
-  </sect2>
-
-</sect1>
Index: t/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gutenprint-download-http "&sourceforge-dl;/gimp-print/gutenprint-&gutenprint-version;.tar.xz">
-  <!ENTITY gutenprint-download-ftp  " ">
-  <!ENTITY gutenprint-md5sum        "dc208cfb873f13a93439185c15aa6f81">
-  <!ENTITY gutenprint-size          "5.1 MB">
-  <!ENTITY gutenprint-buildsize     "59 MB (without tests)">
-  <!ENTITY gutenprint-time          "0.4 SBU (without tests)">
-  <!-- Tests add 75 SBU and 13GB to the equation - updated info in the tests below -->
-]>
-
-<sect1 id="gutenprint" xreflabel="Gutenprint-&gutenprint-version;">
-  <?dbhtml filename="gutenprint.html"?>
-
-
-  <title>Gutenprint-&gutenprint-version;</title>
-
-  <indexterm zone="gutenprint">
-    <primary sortas="a-Gutenprint">Gutenprint</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gutenprint</title>
-
-    <para>
-      The <application>Gutenprint</application> (formerly
-      <application>Gimp-Print</application>) package contains high
-      quality drivers for many brands and models of printers for use with
-      <xref linkend="cups"/>
-      and the
-      <application>GIMP-2.0</application>. See a list of supported printers at
-      <ulink url="https://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gutenprint-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gutenprint-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gutenprint-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gutenprint-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gutenprint-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gutenprint-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gutenprint Dependencies</bridgehead>
-
-    <!-- recommend cups since we describe how to use it, and the gimp
-    so that we can use gutenprint's driver to print photos there -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/> and
-      <xref linkend="gimp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      Two families of DyeSub photo printers each require another library at
-      runtime. Unless you have one of these devices you will not want these
-      libraries.
-    </para>
-
-    <para role="recommended">
-      For the Sinfonia S6145 and the Ciaat Brava 21, <ulink
-      url="https://git.shaftnet.org/gitea/slp/selphy_print/src/branch/master/lib6145">libS6145ImageReProcess</ulink>,
-      see <ulink role="nodep"
-      url="https://www.peachyphotos.com/blog/posts/201601301524-sinfonia-chc-s6145-cs2-and-ciaat-brava-21-revited/">Peachy
-      Photos (Sinfonia)</ulink> for instructions on how to build and test this.
-    </para>
-
-    <para role="recommended">
-      For the Mitsubishi D70 family and the similar Kodak 305, <ulink
-	  url="https://git.shaftnet.org/gitea/slp/selphy_print/src/branch/master/lib70x">libMitsuD70ImageReProcess</ulink>,
-      see <ulink role="nodep"
-      url="https://www.peachyphotos.com/blog/posts/201610061508-mitsubishi-cp-d70-family-working/">Peachy
-      Photos (Mitsubishi CP-D70)</ulink> for instructions on how to build and
-      test this.
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="imagemagick"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="doxygen"/>, and
-      <xref linkend="docbook-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="gutenprint-escputil">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If you intend to use <application>escputil</application> with a USB-connected
-      Epson Stylus printer for commands such as <command>--ink-level</command>
-      which need to access the raw device, you must enable the kernel's usblp
-      driver. Enable the following options in your kernel configuration and
-      recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="usb-printer-kernel.xml"/>
-
-    <indexterm zone="gutenprint escputil">
-      <primary sortas="d-escputil">escputil for usb printers</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gutenprint</title>
-
-    <para>
-      Install <application>Gutenprint</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's|$(PACKAGE)/doc|doc/$(PACKAGE)-$(VERSION)|' \
-       {,doc/,doc/developer/}Makefile.in &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- this is supposed to discourage you from running the tests if you upgrade
-    the package - but the tests in 5.2.12 have changed and I thought I read they
-    were more parallel -->
-    <para>
-      To test the results, issue: <command>make check</command>.  The tests
-      take a very long time and use a lot of disk space.  When last tested
-      (version 5.2.15 in June 2019) this needed 75 SBU and 13.5 GB
-      to complete the tests (one test, rastertogutenprint failed because the
-      CUPS ppds are for a previous version. Maybe genppds should be run before
-      the tests). Note that the tests used only one CPU.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint{,ui2} &amp;&amp;
-install -v -m644    doc/gutenprint/html/* \
-                    /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint &amp;&amp;
-install -v -m644    doc/gutenprintui2/html/* \
-                    /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprintui2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '...' ...Makefile.in</command>: This
-      command is used so that the package documentation is installed in the
-      conventional <filename class='directory'>/usr/share/doc</filename>
-      directory structure instead of
-      <filename class='directory'>/usr/share/gutenprint/doc</filename>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gutenprint</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        For <application>CUPS</application> to see newly installed print
-        drivers, it has to be restarted (as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<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>
-
-      <!-- <para>
-        This command may take a long time (up to 10 minutes)
-        to complete. Don't panic while <application>CUPS</application>
-        is rescanning the list of PPD files. The long delay will happen
-        only once.
-      </para> -->
-
-      <para>
-        Then point your web browser to <ulink url="http://localhost:631/"/>
-        to add a new printer to <application>CUPS</application>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cups-calibrate, cups-genppd.5.2, cups-genppdupdate, escputil,
-          and testpattern
-        </seg>
-        <seg>
-          libgutenprint.so, libgutenprintui2.so and optionally, various
-          <application>CUPS</application> filters and backend drivers under
-          /usr/lib/gutenprint/5.2/modules/
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/gutenprint,
-          /usr/include/gutenprintui2 and
-          /usr/share/doc/gutenprint-&gutenprint-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cups-calibrate">
-        <term><command>cups-calibrate</command></term>
-        <listitem>
-          <para>
-            calibrates the color output of printers using the
-            <application>Gutenprint</application>,
-            <application>CUPS</application> or
-            <application>ESP Print Pro</application> drivers
-          </para>
-          <indexterm zone="gutenprint cups-calibrate">
-            <primary sortas="b-cups-calibrate">cups-calibrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-genppd.5.2">
-        <term><command>cups-genppd.5.2</command></term>
-        <listitem>
-          <para>
-            generates Gutenprint PPD files for use with CUPS
-          </para>
-          <indexterm zone="gutenprint cups-genppd.5.2">
-            <primary sortas="b-cups-genppd.5.2">cups-genppd.5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-genppdupdate">
-        <term><command>cups-genppdupdate</command></term>
-        <listitem>
-          <para>
-            regenerates the Gutenprint PPD files in use by CUPS
-          </para>
-          <indexterm zone="gutenprint cups-genppdupdate">
-            <primary sortas="b-cups-genppdupdate">cups-genppdupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escputil">
-        <term><command>escputil</command></term>
-        <listitem>
-          <para>
-            is a command line utility to perform various maintenance
-            tasks on Epson Stylus inkjet printers
-          </para>
-          <indexterm zone="gutenprint escputil">
-            <primary sortas="b-escputil">escputil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!-- With 5.2.15, even with IJS installed, this program no longer exists.
-      cups-filters-1.25.0 dropped support for IJS filters entirely. -->
-      <!--
-      <varlistentry id="ijsgutenprint.5.2">
-        <term><command>ijsgutenprint.5.2</command></term>
-        <listitem>
-          <para>
-            is a Ghostscript driver for HP InkJet and LaserJet printers.
-          </para>
-          <indexterm zone="gutenprint ijsgutenprint.5.2">
-            <primary sortas="b-ijsgutenprint.5.2">ijsgutenprint.5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-     <varlistentry id="testpattern">
-        <term><command>testpattern</command></term>
-        <listitem>
-          <para>
-            is a test program to learn how to use libgutenprint
-          </para>
-          <indexterm zone="gutenprint testpattern">
-            <primary sortas="b-testpattern">testpattern</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-   </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/printing/libcupsfilters.xml
===================================================================
--- pst/printing/libcupsfilters.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,220 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcupsfilters-download-http
-  "https://github.com/OpenPrinting/libcupsfilters/releases/download/&libcupsfilters-version;/libcupsfilters-&libcupsfilters-version;.tar.xz">
-  <!ENTITY libcupsfilters-download-ftp  " ">
-  <!ENTITY libcupsfilters-md5sum        "267e569145bd20615fa18ae65ea6f870">
-  <!ENTITY libcupsfilters-size          "1.2 MB">
-  <!ENTITY libcupsfilters-buildsize     "38 MB (with tests)">
-  <!ENTITY libcupsfilters-time          "0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libcupsfilters" xreflabel="libcupsfilters-&libcupsfilters-version;">
-  <?dbhtml filename="libcupsfilters.html"?>
-
-
-  <title>libcupsfilters-&libcupsfilters-version;</title>
-
-  <indexterm zone="libcupsfilters">
-    <primary sortas="a-libcupsfilters">libcupsfilters</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcupsfilters</title>
-
-    <para>
-      The <application>libcupsfilters</application> library contains
-      filter functions for the data format conversion tasks needed in
-      Printer Applications. It also contains several API functions for
-      developing printer drivers/Printer Applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcupsfilters-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcupsfilters-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcupsfilters-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcupsfilters-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcupsfilters-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcupsfilters-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libcupsfilters-&libcupsfilters-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">libcupsfilters Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cups"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gs"/> or <xref linkend="mupdf"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="poppler"/>, and
-      <xref linkend="qpdf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dejavu-fonts"/> (the build fails if they are not
-      installed, although they are only required for the tests),
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="libtiff"/>
-    </para>
-    <!--
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (required to build the DNSSD backend of the
-      <command>cups-browsed</command> daemon, which is needed for operating
-      some network printers),
-      <xref linkend="openldap"/>,
-      <xref linkend="php"/> (use of this might be broken),
-      <ulink url="https://liblouis.github.io/downloads/">Liblouis (Braille)</ulink>, and
-      <ulink url="https://liblouis.github.io/downloads/">Liblouisutdml (Braille)</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional printer drivers (runtime)</bridgehead>
-    <para role="optional">
-      <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>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcupsfilters</title>
-
-    <!--
-    <para>
-      First, fix a security vulnerability that can allow for remote code
-      execution with the 'beh' printer backend:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libcupsfilters-&libcupsfilters-version;-security_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>libcupsfilters</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --disable-static                \
-            --docdir=/usr/share/doc/libcupsfilters-&libcupsfilters-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>. DejaVu fonts
-      are needed for the tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-test-font-path=<replaceable>VALUE</replaceable></option>:
-      If you wish to run the tests, but
-      you do not have the default
-      <filename>/usr/share/fonts/dejavu/DejaVuSans.ttf</filename> use this
-      switch to specify where <filename>DejaVuSans.ttf</filename> (or perhaps
-      some other text TTF font - untested) is located.
-    </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>
-          libcupsfilters.so
-        </seg>
-        <seg>
-          /usr/include/cupsfilters,
-          /usr/share/cups/{banners,charsets,data}, and
-          /usr/share/doc/libcupsfilters-&libcupsfilters-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcupsfilters-lib">
-        <term><filename class="libraryfile">libcupsfilters.so</filename></term>
-        <listitem>
-          <para>
-            contains CUPS filters API functions
-          </para>
-          <indexterm zone="libcupsfilters libcupsfilters-lib">
-            <primary sortas="c-libcupsfilters">libcupsfilters.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/printing/libppd.xml
===================================================================
--- pst/printing/libppd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libppd-download-http
-  "https://github.com/OpenPrinting/libppd/releases/download/&libppd-version;/libppd-&libppd-version;.tar.xz">
-  <!ENTITY libppd-download-ftp  " ">
-  <!ENTITY libppd-md5sum        "ab889cbcdaa23689d9a425769f208da9">
-  <!ENTITY libppd-size          "567 KB">
-  <!ENTITY libppd-buildsize     "13 MB (with tests)">
-  <!ENTITY libppd-time          "less than 0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libppd" xreflabel="libppd-&libppd-version;">
-  <?dbhtml filename="libppd.html"?>
-
-
-  <title>libppd-&libppd-version;</title>
-
-  <indexterm zone="libppd">
-    <primary sortas="a-libppd">libppd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libppd</title>
-
-    <para>
-      The <application>libppd</application> library contains
-      functions for handling legacy printers using PPD description files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libppd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libppd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libppd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libppd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libppd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libppd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libppd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcupsfilters"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libppd</title>
-
-    <para>
-      Install <application>libppd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --disable-static                \
-            --with-cups-rundir=/run/cups    \
-            --enable-ppdc-utils             \
-            --docdir=/usr/share/doc/libppd-&libppd-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-cups-rundir=/run/cups</parameter>:
-      Defines the directory containing transient printing data. The default
-      <filename class="directory">/var/run/cups</filename> is obsolete.
-    </para>
-
-    <para>
-      <parameter>--enable-ppdc-utils</parameter>:
-      Allows building utilities to manipulate <emphasis>.ppd</emphasis> files.
-      <!-- This is not required until cups v3 is out, since those utilities
-      are also installed by cups v2. But since cups v3 should be out before
-      our next release, I put it here. Pierre -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ppdc,
-          ppdhtml,
-          ppdi,
-          ppdmerge, and
-          ppdo
-        </seg>
-        <seg>
-          libppd.so
-        </seg>
-        <seg>
-          /usr/include/ppd,
-          /usr/share/ppdc, and
-          /usr/share/doc/libppd-&libppd-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libppd-ppdc">
-        <term><command>ppdc</command></term>
-        <listitem>
-          <para>
-            compiles PPDC source files into one or more PPD files
-          </para>
-          <indexterm zone="libppd libppd-ppdc">
-            <primary sortas="b-ppdc">ppdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdhtml">
-        <term><command>ppdhtml</command></term>
-        <listitem>
-          <para>
-            reads a driver information file and produces a HTML summary
-            page that lists all of the drivers in a file and the
-            supported options
-          </para>
-          <indexterm zone="libppd libppd-ppdhtml">
-            <primary sortas="b-ppdhtml">ppdhtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdi">
-        <term><command>ppdi</command></term>
-        <listitem>
-          <para>
-            imports one or more PPD files into a PPD compiler source file
-          </para>
-          <indexterm zone="libppd libppd-ppdi">
-            <primary sortas="b-ppdi">ppdi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdmerge">
-        <term><command>ppdmerge</command></term>
-        <listitem>
-          <para>
-            merges two or more PPD files into a single, multi-language
-            PPD file
-          </para>
-          <indexterm zone="libppd libppd-ppdmerge">
-            <primary sortas="b-ppdmerge">ppdmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdpo">
-        <term><command>ppdpo</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="libppd libppd-ppdpo">
-            <primary sortas="b-ppdpo">ppdpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-lib">
-        <term><filename class="libraryfile">libppd.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for manipulating <emphasis>.ppd</emphasis>
-            files
-          </para>
-          <indexterm zone="libppd libppd-lib">
-            <primary sortas="c-libppd">libppd.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/printing/parallel-printer-kernel.xml
===================================================================
--- pst/printing/parallel-printer-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>P</emphasis>arallel port support ---&gt;                                     [PARPORT]
-    &lt;*/M&gt; <emphasis role='blue'>P</emphasis>C-style hardware                                         [PARPORT_PC]
-  <emphasis role='blue'>C</emphasis>haracter devices ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>P</emphasis>arallel printer support                                     [PRINTER]</screen>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ pst/printing/printing.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,27 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="pst-printing">
+<?dbhtml filename="printing.html" dir="pst"?>
+<title>Printing</title>
 
-<chapter id="pst-printing">
-  <?dbhtml filename="printing.html"?>
-
-  <title>Printing</title>
-
-  <para>
-    This chapter contains spooling printer management systems and
-    ghostscript applications to render PostScript for display on terminals
-    or paper.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-browsed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-filters.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gutenprint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcupsfilters.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libppd.xml"/>
+<para>Placeholder for ghostscript, lprng and cups</para>
 
 </chapter>
Index: t/printing/usb-printer-kernel.xml
===================================================================
--- pst/printing/usb-printer-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>U</emphasis>SB support ---&gt;                                             [USB_SUPPORT]
-    &lt;*/M&gt; <emphasis role='blue'>U</emphasis>SB Printer support                                      [USB_PRINTER]</screen>
Index: t/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,281 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Keeping this URL as this is the actual maintainer's site
-  <!ENTITY enscript-download-http "http://www.iki.fi/mtr/genscript/enscript-&enscript-version;.tar.gz">
-  -->
-
-  <!ENTITY enscript-download-http "&gnu-http;/enscript/enscript-&enscript-version;.tar.gz">
-  <!ENTITY enscript-download-ftp  " ">
-  <!ENTITY enscript-md5sum        "3acc242b829adacabcaf28533f049afd">
-  <!ENTITY enscript-size          "1.3 MB">
-  <!ENTITY enscript-buildsize     "14 MB">
-  <!ENTITY enscript-time          "0.1 SBU">
-]>
-
-<sect1 id="enscript" xreflabel="Enscript-&enscript-version;">
-  <?dbhtml filename="enscript.html"?>
-
-
-  <title>Enscript-&enscript-version;</title>
-
-  <indexterm zone="enscript">
-    <primary sortas="a-Enscript">Enscript</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Enscript</title>
-
-    <para>
-      <application>Enscript</application> converts ASCII text files
-      to PostScript, HTML, RTF, ANSI and overstrikes.
-    </para>
-
-    &lfs121_checked;
-
-    <caution>
-      <para>
-        <application>Enscript</application> cannot convert UTF-8 encoded
-        text to PostScript. The issue is discussed in detail in the
-        <xref linkend="locale-not-valid-option"/> section of the
-        <xref linkend="locale-issues"/> page.
-        The solution is to use <xref linkend="paps"/>, instead of
-        <application>Enscript</application>, for converting
-        UTF-8 encoded text to PostScript.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&enscript-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&enscript-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &enscript-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &enscript-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &enscript-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &enscript-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-            "&patch-root;/enscript-&enscript-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist> -->
-
-    <bridgehead renderas="sect3">Enscript Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Enscript</title>
-
-    <para>
-      Install <application>Enscript</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr              \
-            --sysconfdir=/etc/enscript \
-            --localstatedir=/var       \
-            --with-media=Letter &amp;&amp;
-make &amp;&amp;
-
-pushd docs &amp;&amp;
-  makeinfo --plaintext -o enscript.txt enscript.texi &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/> installed, you can create
-      Postscript and PDF documentation by issuing (does not support parallel
-      make):
-    </para>
-
-<screen remap="doc"><userinput>make -j1 -C docs ps pdf</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/enscript-&enscript-version; &amp;&amp;
-install -v -m644    README* *.txt docs/*.txt \
-                    /usr/share/doc/enscript-&enscript-version;</userinput></screen>
-
-    <para>
-      If you built Postscript and PDF documentation, install it
-      using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 docs/*.{dvi,pdf,ps} \
-                 /usr/share/doc/enscript-&enscript-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc/enscript</parameter>: This switch puts
-      configuration data in <filename class="directory">/etc/enscript</filename>
-      instead of <filename class="directory">/usr/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--localstatedir=/var</parameter>: This switch sets the
-      directory for runtime data to <filename class="directory">/var</filename>
-      instead of <filename class="directory">/usr/var</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-media=Letter</parameter>: This switch sets the
-      medium format to letter size instead of the A4 default.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>diffpp, enscript, mkafmmap, over, sliceprint,
-        and states</seg>
-        <seg>None</seg>
-        <seg>/etc/enscript, /usr/share/doc/enscript-&enscript-version;, and
-        /usr/share/enscript</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="diffpp">
-        <term><command>diffpp</command></term>
-        <listitem>
-          <para>
-            converts <command>diff</command> output files to a format
-            suitable to be printed with <command>enscript</command>
-          </para>
-          <indexterm zone="enscript diffpp">
-            <primary sortas="b-diffpp">diffpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enscript-prog">
-        <term><command>enscript</command></term>
-        <listitem>
-          <para>
-            is a filter, used primarily by printing scripts, that
-            converts ASCII text files to PostScript, HTML, RTF, ANSI and
-            overstrikes
-          </para>
-          <indexterm zone="enscript enscript-prog">
-            <primary sortas="b-enscript">enscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkafmmap">
-        <term><command>mkafmmap</command></term>
-        <listitem>
-          <para>
-            creates a font map from a given file
-          </para>
-          <indexterm zone="enscript mkafmmap">
-            <primary sortas="b-mkafmmap">mkafmmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="over">
-        <term><command>over</command></term>
-        <listitem>
-          <para>
-            is a script which calls <command>enscript</command> and
-            passes the correct parameters to create overstriked fonts
-          </para>
-          <indexterm zone="enscript over">
-            <primary sortas="b-over">over</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sliceprint">
-        <term><command>sliceprint</command></term>
-        <listitem>
-          <para>
-            slices documents with long lines
-          </para>
-          <indexterm zone="enscript sliceprint">
-            <primary sortas="b-sliceprint">sliceprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="states">
-        <term><command>states</command></term>
-        <listitem>
-          <para>
-            is an <command>awk</command>-like text processing tool
-            with some state machine extensions. It is designed for program
-            source code highlighting and for similar tasks where state
-            information helps input processing
-          </para>
-          <indexterm zone="enscript states">
-            <primary sortas="b-states">states</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 epdfview-download-http "&sources-anduin-http;/epdfview-gtk3/epdfview-&epdfview-version;.tar.xz">
-  <!ENTITY epdfview-download-ftp  " ">
-  <!ENTITY epdfview-md5sum        "d222a3dc26c2faf6f862018bb478fb36">
-  <!ENTITY epdfview-size          "184 KB">
-  <!ENTITY epdfview-buildsize     "3.5 MB">
-  <!ENTITY epdfview-time          "less than 0.1 SBU (using parallelism=4)">
-]>
-
-<sect1 id="epdfview" xreflabel="epdfview-&epdfview-version;">
-  <?dbhtml filename="epdfview.html"?>
-
-
-  <title>ePDFView-&epdfview-version;</title>
-
-  <indexterm zone="epdfview">
-    <primary sortas="a-epdfview">epdfview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ePDFView-gtk3</title>
-
-    <para>
-      <application>ePDFView-gtk3</application> is a fork of the old
-      <application>ePDFView</application> program. Although the github repository
-      <ulink url="https://github.com/Flow-It/epdfview_old.git"/>  names it as
-      'old', it is the gtk3 fork. It is a lightweight replacement for
-      <application>Evince</application> as it does not rely upon
-      <application>GNOME</application> libraries and is more capable than
-      <application>MuPDF</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&epdfview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&epdfview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &epdfview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &epdfview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &epdfview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &epdfview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ePDFView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="poppler"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="Recommended">
-      <xref linkend="cups"/> (to access print queues),
-      <xref linkend="desktop-file-utils"/>, and
-      <xref linkend="hicolor-icon-theme"/> (both for the icons this installs)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      The home page of the project's repository mentions that there are optional
-      dependencies, which are enabled by switches. These are for building the
-      documentation and running the test suite,
-      <xref linkend="doxygen"/> and
-      <ulink url='https://freedesktop.org/wiki/Software/cppunit/'>Cppunit</ulink>.
-      Note that <application>doxygen</application> only installs a skeletal
-      page about itself, which contains no package documentation, and the test
-      code does not compile with recent versions of C++.
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ePDFView-gtk3</title>
-
-    <para>
-      Install <application>ePDFView-gtk3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            -Denable-printing=true \
-            ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a buildable test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <para>
-      <command>-Denable-printing=true</command>: builds the code to link to the
-      <application>cups</application> print queue(s). Omit this if you have not
-      installed <application>cups</application>.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ePDFView-gtk3</title>
-
-      <para>
-        ePDFView-gtk3 has several keyboard hotkeys for optional features. Most
-        of them are 'off' by default, including the toolbar, and if it has been
-        closed with the menu disabled, the program can start with all options
-        not being visible until the relevant function keys are pressed.
-        <itemizedlist>
-          <listitem>
-            <para>[F6] - toggle toolbar</para>
-          </listitem>
-          <listitem>
-            <para>[F7] - toggle menu</para>
-          </listitem>
-          <listitem>
-            <para>[F8] - toggle invert-colors</para>
-          </listitem>
-          <listitem>
-            <para>[F9] - toggle show-index</para>
-          </listitem>
-          <listitem>
-            <para>[F11] - toggle fullscreen</para>
-          </listitem>
-        </itemizedlist>
-      </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>epdfview</seg>
-        <seg>None</seg>
-        <seg>/usr/share/epdfview</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="epdfview-prog">
-        <term><command>epdfview</command></term>
-        <listitem>
-          <para>
-            is a <application>Gtk+-3</application> program for viewing PDF
-            documents
-          </para>
-          <indexterm zone="epdfview epdfview-prog">
-            <primary sortas="b-epdfview">epdfview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: t/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,454 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fop-download-http "https://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz">
-  <!ENTITY fop-download-ftp  " ">
-  <!ENTITY fop-md5sum        "f7537ca7f2e16971fa99c8bb0dad62c7">
-  <!ENTITY fop-size          "20 MB">
-  <!ENTITY fop-buildsize     "333 MB (including files downloaded to the user directory)">
-  <!ENTITY fop-time          "0.9 SBU">
-<!--
-  <!ENTITY pdfbox-version    "2.0.27">
-  <!ENTITY pdfbox-download   "https://archive.apache.org/dist/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
-  <!ENTITY pdfbox-md5sum     "ddd46402b1692eed9e5c73b4a94c45d8">
-  <!ENTITY pdfbox-size       "2.7 MB">
-
-  <!ENTITY fontbox-download  "https://archive.apache.org/dist/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
-  <!ENTITY fontbox-md5sum    "587744efe2a82d3584c2f3969fa4dca0">
-  <!ENTITY fontbox-size      "1.5 MB">
--->
-  <!ENTITY maven-major        "3">
-  <!ENTITY maven-version      "3.9.4">
-  <!ENTITY maven-download     "https://archive.apache.org/dist/maven/maven-&maven-major;/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
-  <!ENTITY maven-md5sum       "0698a533397eda60cbebcc0fb68ae842">
-  <!ENTITY maven-size         "9.0 MB (additionally, about 90 MB are downloaded to the building user's directory)">
-
-  <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
-  <!ENTITY offo-md5sum       "bf9c09bf05108ef9661b8f08d91c2336">
-  <!ENTITY offo-size         "862 KB">
-]>
-
-<sect1 id="fop" xreflabel="fop-&fop-version;">
-  <?dbhtml filename="fop.html"?>
-
-
-  <title>fop-&fop-version;</title>
-
-  <indexterm zone="fop">
-    <primary sortas="a-fop">fop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fop</title>
-
-    <para>
-      The <application>FOP</application> (Formatting Objects Processor)
-      package contains a print formatter driven by XSL formatting objects
-      (XSL-FO). It is a <application>Java</application> application that reads
-      a formatting object tree and renders the resulting pages to a specified
-      output. Output formats currently supported include PDF, PCL, PostScript,
-      SVG, XML (area tree representation), print, AWT, MIF and ASCII text. The
-      primary output target is PDF.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Required Additional Downloads:</title>
-<!--
-      <listitem>
-        <para>
-          PDFBox:
-          <simplelist>
-            <member><ulink url="&pdfbox-download;"/></member>
-            <member>&pdfbox-md5sum;</member>
-            <member>&pdfbox-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          PDFBox Fonts:
-          <simplelist>
-            <member><ulink url="&fontbox-download;"/></member>
-            <member>&fontbox-md5sum;</member>
-            <member>&fontbox-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          Maven build system:
-          <simplelist>
-            <member><ulink url="&maven-download;"/></member>
-            <member>&maven-md5sum;</member>
-            <member>&maven-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing="compact">
-      <title>Recommended packages</title>
-      <listitem>
-        <para>
-          Objects for Formatting Objects (OFFO) hyphenation patterns:
-          <simplelist>
-            <member><ulink url="&offo-download;"/></member>
-            <member>&offo-md5sum;</member>
-            <member>&offo-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">fop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apache-ant"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/> (to run tests),
-      <ulink url="https://jai-tools.blogspot.com/">JAI Image I/O Tools</ulink>, and
-      <ulink url="https://jeuclid.sourceforge.net/">JEuclid</ulink>
-<!-- [pierre 2017-04-29] Note to devs: there are a lot of bundled dependencies.
-     Some were listed here, but not all. I am not sure it is possible to
-     use system ones. So, I have removed them, and kept only those which
-     are not bundled. -->
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fop</title>
-
-    <para>
-      Ensure <envar>$JAVA_HOME</envar> is set correctly before beginning
-      the build. To build the <application>JIMI SDK</application> and/or
-      <application>XMLUnit</application> extension classes, ensure the
-      corresponding <filename class='extension'>.jar</filename> files can be
-      found via the <envar>CLASSPATH</envar> environment variable.
-    </para>
-
-    <sect3>
-      <title>Installing OFFO Hyphenation Patterns</title>
-
-      <para>
-        Copy the XML hyphenation patterns into the fop source tree by running
-        the following commands:
-      </para>
-
-<screen><userinput>unzip ../offo-hyphenation.zip &amp;&amp;
-cp offo-hyphenation/hyph/* fop/hyph &amp;&amp;
-rm -rf offo-hyphenation</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing a temporary Maven binary</title>
-
-      <para>
-        Starting with fop-2.5, the Maven build system is required. We use
-        the binary provided by apache, that we install in a temporary location:
-      </para>
-
-<screen><userinput>tar -xf ../apache-maven-&maven-version;-bin.tar.gz -C /tmp</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing fop Components</title>
-
-      <para>
-        The <command>javadoc</command> command that ships with OpenJDK 10 and
-        later has
-        become much stricter than previous versions regarding conformance of
-        the Javadoc comments in source code to HTML. The FOP documentation does
-        not meet those standards, so the conformance checks have to be
-        disabled. This can be done with the following command:
-      </para>
-
-<screen><userinput>sed -i '\@&lt;/javad@i\
-&lt;arg value="-Xdoclint:none"/&gt;\
-&lt;arg value="--allow-script-in-comments"/&gt;\
-&lt;arg value="--ignore-source-errors"/&gt;' \
-    fop/build.xml</userinput></screen>
-
-<!--
-      <para>
-        The <filename>build.xml</filename> file calls for an old version of
-        <application>PDFBox</application> components that are no longer
-        available. Copy the updated PDFBox components into the source tree:
-      </para>
-
-<screen><userinput>cp ../{pdf,font}box-&pdfbox-version;.jar fop/lib</userinput></screen>
--->
-      <para>
-        Compile <application>fop</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>cd fop &amp;&amp;
-
-LC_ALL=en_US.UTF-8                     \
-PATH=$PATH:/tmp/apache-maven-&maven-version;/bin \
-ant all javadocs &amp;&amp;
-
-mv build/javadocs .</userinput></screen>
-
-      <para>
-        This package comes with a test suite, but the java infrastructure
-        installed in this book does not allow running it.
-      </para>
-
-      <para>
-        Now, install <application>Fop</application> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -d -m755 -o root -g root          /opt/fop-&fop-version; &amp;&amp;
-cp -vR build conf examples fop* javadocs lib /opt/fop-&fop-version; &amp;&amp;
-chmod a+x /opt/fop-&fop-version;/fop                                &amp;&amp;
-ln -v -sfn fop-&fop-version; /opt/fop</userinput></screen>
-
-      <para>
-        The last thing to do is to clean what we have done:
-      </para>
-
-<screen><userinput>rm -rf /tmp/apache-maven-&maven-version;</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... build.xml</command>: This adds three switches to the
-      <command>javadoc</command> command, preventing some errors from occurring
-      when building the documentation.
-    </para>
-
-    <para>
-      <command>export LC_ALL=en_US.UTF-8</command>: the compiler fails if using
-      an ASCII locale.
-    </para>
-
-    <para>
-      <command>ant <option>target</option></command>: This reads the file
-      <filename>build.xml</filename> and builds the target: <option>compile
-      </option> compiles the java sources, <option>jar-main</option> generates
-      jar archives, <option>jar-hyphenation</option> generates the hyphenation
-      patterns for FOP, <option>junit</option> runs the
-      <application>junit</application> tests, and <option>javadocs</option>
-      builds the documentation. The <option>all</option> target runs all of the
-      above.
-    </para>
-
-    <para>
-      <command>ln -v -sf fop-&fop-version; /opt/fop</command>: This is
-      optional and creates a convenience symlink so that
-      <envar>$FOP_HOME</envar> doesn't have to be changed each time there's a
-      package version change.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring fop</title>
-
-    <sect3 id="fop-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.foprc</filename>
-      </para>
-
-      <indexterm zone="fop fop-config">
-        <primary sortas="e-AA.foprc">~/.foprc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Using <application>fop</application> to process some large FO's
-        (including the FO derived from the BLFS XML sources), can lead to
-        memory errors. Unless you add a parameter to the
-        <command>java</command> command used in the <command>fop</command>
-        script you may receive messages similar to the one shown below:
-      </para>
-
-      <para>
-        <computeroutput>
-          Exception in thread "main" java.lang.OutOfMemoryError: Java heap
-          space
-        </computeroutput>
-      </para>
-
-      <para>
-        To avoid errors like this, you need to pass an extra parameter to
-        the <command>java</command> command used in the <command>fop</command>
-        script. This can be accomplished by creating a
-        <filename>~/.foprc</filename> (which is sourced by the
-        <command>fop</command> script) and adding the parameter to the
-        <envar>FOP_OPTS</envar> environment variable.
-      </para>
-
-      <para>
-        The <command>fop</command> script looks for a
-        <envar>FOP_HOME</envar> environment variable to locate the
-        <application>fop</application> class libraries. You can create this
-        variable using the <filename>~/.foprc</filename> file as well. Create
-        a <filename>~/.foprc</filename> file using the following commands:
-      </para>
-
-<screen><userinput>cat &gt; ~/.foprc &lt;&lt; "EOF"
-<literal>FOP_OPTS="-Xmx<replaceable>&lt;RAM_Installed&gt;</replaceable>m"
-FOP_HOME="/opt/fop"</literal>
-EOF</userinput></screen>
-
-      <para>
-        Replace <replaceable>&lt;RAM_Installed&gt;</replaceable> with a
-        number representing the amount of RAM installed in your computer (in
-        megabytes). An example would be
-        <userinput>FOP_OPTS="-Xmx768m"</userinput>.
-        <!--  the URL is broken
-        For more information about
-        memory issues running <application>fop</application>, see
-        <ulink url="http://xml.apache.org/fop/running.html#memory"/>.
-        -->
-      </para>
-
-      <para>
-        To include the <command>fop</command> script in your path,
-        update the system-wide profile with the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/fop.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/fop.sh
-
-pathappend /opt/fop
-
-# End /etc/profile.d/fop.sh</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          Running <command>fop</command> can be somewhat verbose.
-          The default logging level can be changed from INFO to any of
-          FINEST, FINER, FINE, CONFIG, INFO, WARNING, SEVERE, ALL, or OFF.
-          To do this, edit
-          <filename>$JAVA_HOME/jre/lib/logging.properties</filename> and change
-          the entries for <option>.level</option> and
-          <option>java.util.logging.ConsoleHandler.level</option> to
-          the desired value.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>fop</seg>
-        <seg>fop.jar and numerous support library classes located in
-        <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>
-        <seg>/opt/fop-&fop-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fop-prog">
-        <term><command>fop</command></term>
-        <listitem>
-          <para>
-            is a wrapper script to the <command>java</command> command
-            which sets up the <application>fop</application>
-            environment and passes the required parameters
-          </para>
-          <indexterm zone="fop fop-prog">
-            <primary sortas="b-fop">fop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fop.jar">
-        <term><filename class="libraryfile">fop.jar</filename></term>
-        <listitem>
-          <para>
-            contains all the <application>fop</application>
-            <application>Java</application> classes
-          </para>
-          <indexterm zone="fop fop.jar">
-            <primary sortas="c-fop.jar">fop.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/ps/mupdf.xml
===================================================================
--- pst/ps/mupdf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,293 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!--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-ftp  " ">
-  <!ENTITY mupdf-md5sum        "ff320ad9eb4296f0ec48ce6c90307a52">
-  <!ENTITY mupdf-size          "52.7 MB">
-  <!ENTITY mupdf-buildsize     "252 MB">
-  <!ENTITY mupdf-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="mupdf" xreflabel="mupdf-&mupdf-version;">
-  <?dbhtml filename="mupdf.html"?>
-
-
-  <title>MuPDF-&mupdf-version;</title>
-
-  <indexterm zone="mupdf">
-    <primary sortas="a-mupdf">mupdf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MuPDF</title>
-
-    <para>
-      <application>MuPDF</application> is a lightweight PDF and XPS viewer.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mupdf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mupdf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mupdf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mupdf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mupdf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mupdf-time;
-        </para>
-      </listitem>
-    </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="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!--<xref linkend="freeglut"/>, use of the bundled glut is preferred -->
-      <xref linkend="harfbuzz"/>,
-      <!-- This no-longer gets linked in with our system libs patch
-      <xref linkend="lcms2"/>, -->
-      <xref linkend="libjpeg"/>,
-      <xref linkend="openjpeg2"/>, and
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="xdg-utils"/> (runtime),
-      <ulink url="https://jbig2dec.com">jbig2dec</ulink>, and
-      <ulink url="https://mujs.com/">MuJS</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="x-window-system"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MuPDF</title>
-<!--
-    <para>First, fix the Makefile to link properly with the shared library:</para>
-
-<screen><userinput>sed -i '/MU.*_EXE. :/{
-        s/\(.(MUPDF_LIB)\)\(.*\)$/\2 | \1/
-        N
-        s/$/ -lmupdf -L$(OUT)/
-        }' Makefile</userinput></screen>
--->
-    <para>
-      Install <application>MuPDF</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cat &gt; user.make &lt;&lt; EOF &amp;&amp;
-USE_SYSTEM_FREETYPE := yes
-USE_SYSTEM_HARFBUZZ := yes
-USE_SYSTEM_JBIG2DEC := no
-USE_SYSTEM_JPEGXR := no # not used without HAVE_JPEGXR
-USE_SYSTEM_LCMS2 := no # need lcms2-art fork
-USE_SYSTEM_LIBJPEG := yes
-USE_SYSTEM_MUJS := no # build needs source anyway
-USE_SYSTEM_OPENJPEG := yes
-USE_SYSTEM_ZLIB := yes
-USE_SYSTEM_GLUT := no # need freeglut2-art fork
-USE_SYSTEM_CURL := yes
-USE_SYSTEM_GUMBO := no
-EOF
-
-export XCFLAGS=-fPIC                      &amp;&amp;
-make build=release shared=yes verbose=yes &amp;&amp;
-unset XCFLAGS</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr                        \
-     shared=yes                         \
-     docdir=/usr/share/doc/mupdf-&mupdf-version; \
-     install                            &amp;&amp;
-
-ln -sfv libmupdf.so.24.1 /usr/lib/libmupdf.so   &amp;&amp;
-ln -sfv libmupdf.so.24.1 /usr/lib/libmupdf.so.1 &amp;&amp;
-chmod 755 /usr/lib/libmupdf.so.24.1             &amp;&amp;
-
-ln -sfv mupdf-x11 /usr/bin/mupdf</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -sfv mupdf-x11 /usr/bin/mupdf </command>:
-      This symbolic link chooses between <command>mupdf-gl</command>
-      and <command>mupdf-x11</command> when running <command>mupdf</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mupdf (symlink),
-          mupdf-gl,
-          mupdf-x11,
-          mupdf-x11-curl,
-          muraster, and
-          mutool
-        </seg>
-        <seg>
-          libmupdf.so
-        </seg>
-        <seg>
-          /usr/include/mupdf,
-          /usr/share/doc/mupdf-&mupdf-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mupdf-prog">
-        <term><command>mupdf</command></term>
-        <listitem>
-          <para>
-            is a program for viewing PDF, XPS, EPUB, and CBZ documents,
-            and various image formats such as PNG, JPEG, GIFF, and TIFF
-          </para>
-          <indexterm zone="mupdf mupdf-prog">
-            <primary sortas="b-mupdf">mupdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mupdf-gl">
-        <term><command>mupdf-gl</command></term>
-        <listitem>
-          <para>
-            same as <command>mupdf</command>, using an opengl renderer
-          </para>
-          <indexterm zone="mupdf mupdf-gl">
-            <primary sortas="b-mupdf-gl">mupdf-gl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mupdf-x11">
-        <term><command>mupdf-x11</command></term>
-        <listitem>
-          <para>
-            same as <command>mupdf</command>, using an X Window renderer
-          </para>
-          <indexterm zone="mupdf mupdf-x11">
-            <primary sortas="b-mupdf-x11">mupdf-x11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="muraster">
-        <term><command>muraster</command></term>
-        <listitem>
-          <para>
-            is a program used to perform rasterization tasks with PDF
-            documents
-          </para>
-          <indexterm zone="mupdf muraster">
-            <primary sortas="b-muraster">muraster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutool">
-        <term><command>mutool</command></term>
-        <listitem>
-          <para>
-            is a program to perform various operations on PDF files, such
-            as merging and cleaning PDF documents
-          </para>
-          <indexterm zone="mupdf mutool">
-            <primary sortas="b-mutool">mutool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmupdf">
-        <term><filename class="libraryfile">libmupdf.so</filename></term>
-        <listitem>
-          <para>
-            contains the mupdf API functions
-          </para>
-          <indexterm zone="mupdf libmupdf">
-            <primary sortas="c-libmupdf">libmupdf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/ps/paps.xml
===================================================================
--- pst/ps/paps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 paps-download-http "https://github.com/dov/paps/releases/download/v&paps-version;/paps-&paps-version;.tar.gz">
-  <!ENTITY paps-download-ftp  " ">
-  <!ENTITY paps-md5sum        "6bd661b8fd224adc3343a91e6521a4f2">
-  <!ENTITY paps-size          "220 KB">
-  <!ENTITY paps-buildsize     "4.0 MB">
-  <!ENTITY paps-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="paps" xreflabel="paps-&paps-version;">
-  <?dbhtml filename="paps.html"?>
-
-
-  <title>paps-&paps-version;</title>
-
-  <indexterm zone="paps">
-    <primary sortas="a-paps">paps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to paps</title>
-
-    <para>
-      <application>paps</application> is a text to PostScript converter that
-      works through <application>Pango</application>. Its input is a UTF-8
-      encoded text file and it outputs vectorized PostScript. It may be used
-      for printing any complex script supported by
-      <application>Pango</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&paps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&paps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &paps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &paps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &paps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &paps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">paps Dependencies</bridgehead>
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fmt"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of paps</title>
-
-    <para>
-      Install <application>paps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-Werror \
-            --mandir=/usr/share/man &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 Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>paps</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="paps-prog">
-        <term><command>paps</command></term>
-        <listitem>
-          <para>
-            is a text to PostScript converter that supports UTF-8
-            character encoding
-          </para>
-          <indexterm zone="paps paps-prog">
-            <primary sortas="b-paps">paps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="pst-ps">
-  <?dbhtml filename="ps.html"?>
-
-  <title>PostScript</title>
-
-  <para>
-    This chapter includes applications that create, manipulate or view
-    PostScript files and create or view Portable Document Format
-    PDF files.
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="a2ps.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enscript.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psutils.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epdfview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mupdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="paps.xml"/>
-
-</chapter>
Index: pst/pst.ent
===================================================================
--- pst/pst.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ pst/pst.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY pst SYSTEM "pst.xml">
+
+<!-- Printing -->
+<!ENTITY pst-printing SYSTEM "printing/printing.xml">
+
+<!-- Scanning -->
+<!ENTITY pst-scanning SYSTEM "scanning/scanning.xml">
+
+<!-- Typesetting -->
+<!ENTITY pst-typesetting SYSTEM "typesetting/typesetting.xml">
Index: pst/pst.xml
===================================================================
--- pst/pst.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ pst/pst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,20 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="pst" xreflabel="pst">
+<?dbhtml filename="pst.html" dir="pst"?>
+<title>Printing, Scanning and Typesetting</title>
 
-<part id="pst" xreflabel="Printing, Scanning and Typesetting">
-  <?dbhtml filename="pst.html" dir="pst"?>
-
-  <title>Printing, Scanning and Typesetting</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="printing/printing.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scanning/scanning.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml/sgml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml/xml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ps/ps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="typesetting/typesetting.xml"/>
+&pst-printing;
+&pst-scanning;
+&pst-typesetting;
 
 </part>
Index: t/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,671 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sane-be-download-http "&sources-anduin-http;/sane/sane-backends-&sane-version;.tar.gz">
-  <!ENTITY sane-be-download-ftp  " ">
-  <!ENTITY sane-be-md5sum        "302159419ed1ee216c6e1edbe97c2a8c">
-  <!ENTITY sane-be-size          "6.9 MB">
-  <!ENTITY sane-be-buildsize     "311 MB (with tests)">
-  <!ENTITY sane-be-time          "0.7 SBU (Using parallelism=4; with tests)">
-
-<!--
-  <!ENTITY sane-fe-download-http "&sources-anduin-http;/sane/sane-frontends-&sane-fe-version;.tar.gz">
-  <!ENTITY sane-fe-download-ftp  " ">
-  <!ENTITY sane-fe-md5sum        "c63bf7b0bb5f530cf3c08715db721cd3">
-  <!ENTITY sane-fe-size          "231 KB">
-  <!ENTITY sane-fe-buildsize     "3.0 MB">
-  <!ENTITY sane-fe-time          "less than 0.1 SBU">
--->
-]>
-
-<sect1 id="sane" xreflabel="SANE-&sane-version;">
-  <?dbhtml filename="sane.html"?>
-
-
-  <title>SANE-&sane-version;</title>
-
-  <indexterm zone="sane">
-    <primary sortas="a-SANE">SANE</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SANE</title>
-
-    <para>
-      <application>SANE</application> is short for Scanner Access Now Easy.
-      Scanner access, however, is far from easy, since every vendor has their
-      own protocols. The only known protocol that should bring some unity into
-      this chaos is the TWAIN interface, but this is too imprecise to allow a
-      stable scanning framework. Therefore, <application>SANE</application>
-      comes with its own protocol, and the vendor drivers can't be used.
-    </para>
-
-    <para>
-      <application>SANE</application> is split into back ends and front ends.
-      The back ends are drivers for the supported scanners and cameras. The
-      front ends are user interfaces to access the backends.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Back Ends Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sane-be-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sane-be-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sane-be-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sane-be-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sane-be-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sane-be-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads (Front Ends)</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sane-fe-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sane-fe-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sane-fe-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sane-fe-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sane-fe-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sane-fe-time;
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <note>
-      <para>
-        The upstream location for this file is at
-        <ulink url="https://gitlab.com/sane-project"/> but
-        the file URL uses an embedded md5sum.  For convenience,
-        the package has been copied to the location above.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">SANE Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (Back Ends)</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="v4l-utils"/>,
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-      <ulink url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-<!--
-    <bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="gimp"/>
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="kernel" id='sane-kernel'>
-    <title>Kernel Configuration, Drivers and Additional Packages</title>
-
-    <indexterm zone="sane sane-kernel">
-      <primary sortas="d-Scanning-devices">Scanning devices</primary>
-    </indexterm>
-
-    <para>
-      To access your scanner, you will probably need the related kernel
-      drivers and/or additional support packages. A SCSI scanner will need SCSI
-      drivers, a parallel port scanner needs parallel port support (you should
-      use enhanced EPP modes) and perhaps <ulink
-      url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>, and a USB
-      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>.
-      Ensure you have the necessary drivers properly configured to access
-      the devices.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SANE</title>
-
-    <sect3>
-      <title>Installation of SANE Back Ends</title>
-
-      <para>
-        The <application>SANE</application> daemon should run with its own
-        group.  Create this group by issuing the following command as the
-        &root; user:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 70 scanner</userinput></screen>
-
-      <note>
-        <para>
-          <command>configure</command> assumes that the user building
-          <application>SANE</application>-backends is a member of the
-          <systemitem class="groupname">scanner</systemitem> group for testing
-          the existence of this group. As a result, the user building the
-          package needs to be added to the
-          <systemitem class="groupname">scanner</systemitem> group. Add the
-          user to the <systemitem class="groupname">scanner</systemitem> group
-          by issuing the following command as the &root; user:
-        </para>
-
-<screen role="root"><userinput>usermod -G scanner -a <replaceable>username</replaceable></userinput></screen>
-
-        <para>
-          After adding the <systemitem class="groupname">scanner</systemitem>
-          group as above, you will need to log out and back in to activate it.
-        </para>
-
-      </note>
-
-      <para>
-        For a USB scanner, if you are linking to <xref linkend="libusb"/>,
-        include the configure switch --enable-libusb_1_0. Install
-        <application>SANE</application>-backends by running the following
-        commands:
-      </para>
-
-<screen><userinput>sg scanner -c "                                 \
-PYTHON=python3 ./configure --prefix=/usr        \
-                           --sysconfdir=/etc    \
-                           --localstatedir=/var \
-                           --with-lockdir=/run/lock \
-                           --docdir=/usr/share/doc/sane-backends-&sane-version;" &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>make check</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install                                         &amp;&amp;
-install -m 644 -v tools/udev/libsane.rules           \
-                  /etc/udev/rules.d/65-scanner.rules &amp;&amp;
-mkdir -p          /run/lock/sane &amp;&amp;
-chgrp -v scanner  /run/lock/sane</userinput></screen>
-
-      <para>
-        With the scanner on, run <command>scanimage -L</command> and the
-        name and location of the device should appear. Of course, you need the
-        device drivers configured, in order to run this test.
-      </para>
-
-    </sect3>
-
-<!--
-    <sect3>
-      <title>Installation of SANE Front Ends</title>
-
-      <para>
-        The <application>SANE</application>-frontends package
-        includes the graphical frontends <command>xscanimage</command> and
-        <command>xcam</command>, and a command-line frontend
-        <command>scanadf</command>. You don't need this package if you intend
-        to use one of the more advanced graphical frontends like
-        <xref linkend="xsane"/>. For a list of frontend packages, see
-        <ulink url="http://www.sane-project.org/sane-frontends.html"/>.
-      </para>
-
-      <para>
-        To install <application>SANE</application>-frontends,
-        use the following commands:
-      </para>
-
-<screen><userinput>tar -xf ../sane-frontends-&sane-fe-version;.tar.gz &amp;&amp;
-cd sane-frontends-&sane-fe-version;                &amp;&amp;
-
-sed -i -e "/SANE_CAP_ALWAYS_SETTABLE/d" src/gtkglue.c &amp;&amp;
-./configure - -prefix=/usr - -mandir=/usr/share/man &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;
-install -v -m644 doc/sane.png xscanimage-icon-48x48-2.png \
-    /usr/share/sane</userinput></screen>
-
-      <para>
-        If <application>GIMP</application> was linked into the build and
-        you wish <application>GIMP</application> to use
-        <command>xscanimage</command> as a scanning plugin, issue the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -v -s ../../../../bin/xscanimage /usr/lib/gimp/2.0/plug-ins</userinput></screen>
-
-      <note>
-        <para>
-          If the plugin <command>xscanimage</command> is disabled in
-          <application>GIMP</application>'s menu, in order to enable it,
-          "create" a blank image using the menu or Ctrl-N. After that, it is
-          enabled.
-        </para>
-      </note>
-
-    </sect3>
--->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sg scanner -c "..."</command>: runs the command between double
-      quotes with principal group <systemitem
-      class="groupname">scanner</systemitem>. This may be needed if the user
-      has been newly added to group scanner, and has not logged out and in.
-    </para>
-
-    <para>
-      <parameter>PYTHON=python3</parameter>: This switch forces the build
-      system to use Python 3 instead of Python 2.
-    </para>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This switch installs the
-      configuration files in <filename class="directory">/etc/sane.d</filename>
-      instead of <filename class="directory">/usr/etc/sane.d</filename>.
-    </para>
-
-<!-- This option doesn't exist anymore as of 1.2.1, and the udev rule
-     references the usage of 'scanner' everywhere.
-    <para>
-      <parameter>- -with-group=scanner</parameter>: This parameter causes
-      the directory created for the locking files to be group owned by the
-      <systemitem class="groupname">scanner</systemitem> group instead of the
-      default <systemitem class="groupname">uucp</systemitem> group.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SANE</title>
-
-    <sect3 id="sane-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sane.d/*.conf</filename>
-      </para>
-
-      <indexterm zone="sane sane-config">
-        <primary sortas="e-etc-sane.d-conf">/etc/sane.d/*.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <sect4>
-        <title>Backend Configuration</title>
-
-        <para>
-          The backend configuration files are located in
-          <filename class='directory'>/etc/sane.d</filename>. Information
-          for configuring the various backends can be found by using the man(5)
-          page for the desired backend. Run
-          <command>
-            man sane-<replaceable>&lt;backend&gt;</replaceable></command>,
-          substituting the desired backend.
-        </para>
-
-        <para>
-          Add any users that will use a scanner to the <systemitem
-          class="groupname">scanner</systemitem> group.
-        </para>
-
-        <para>
-          If you want to access a network scanner, include two lines in
-          <filename>net.conf</filename>, as the &root; user (make sure to
-          replace &lt;server_ip&gt; by the actual value):
-        </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sane.d/net.conf &lt;&lt; "EOF"
-<literal>connect_timeout = 60
-&lt;server_ip&gt;</literal>
-EOF</userinput></screen>
-
-        <para>
-          On the server side, include the client ip in the access list of
-          <filename>/etc/sane.d/saned.conf</filename>, restart the
-          <command>saned</command> daemon, and make sure the firewall, if any,
-          is open to the client.
-        </para>
-
-      </sect4>
-
-<!--
-      <sect4>
-        <title>Frontend Configuration</title>
-        <para>
-          If you use a desktop environment like <application>GNOME</application>
-          or <application>KDE</application> you may wish to create a
-          <filename>xscanimage.desktop</filename> file so that
-          <application>xscanimage</application> appears in the panel's menus.
-          Create the desktop file using the following commands as the &root; user:
-        </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps}               &amp;&amp;
-
-cat &gt; /usr/share/applications/xscanimage.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=XScanImage - Scanning
-Comment=Acquire images from a scanner
-Exec=xscanimage
-Icon=xscanimage
-Terminal=false
-Type=Application
-Categories=Application;Graphics</literal>
-EOF
-
-ln -svf ../sane/xscanimage-icon-48x48-2.png /usr/share/pixmaps/xscanimage.png</userinput></screen>
-
-      </sect4>
--->
-      <sect4>
-        <title>General Information</title>
-
-        <para>
-          For general information about configuring and using
-          <application>SANE</application>, see <command>man sane</command>.
-          For information about USB scanning devices,
-          run <command>man sane-usb</command>. For information about SCSI
-          devices, run <command>man sane-scsi</command>.
-        </para>
-
-      </sect4>
-
-      <sect4>
-        <title>Configuration and setup of the 'saned' daemon</title>
-
-        <para>
-          The <command>saned</command> daemon is not meant to be used for
-          untrusted clients. You should provide <xref linkend="fw-firewall"/>
-          protection to ensure only trusted clients access the daemon. Due to
-          the complex security requirements to ensure only trusted clients
-          access the daemon, BLFS does not provide
-          instructions to configure the <command>saned</command> daemon.
-          Some good (but outdated)
-          information for setting up and securing the <command>saned</command>
-          daemon can be found at
-          <ulink url="https://penguin-breeder.org/sane/saned/"/>.
-        </para>
-
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gamma4scanimage,
-        sane-config,
-        saned,
-        sane-find-scanner,
-        scanimage, and
-        umax_pp</seg>
-        <seg>libsane.so and numerous scanner backend modules</seg>
-        <seg>/etc/sane.d,
-        /usr/{include,lib,share}/sane,
-        and /usr/share/doc/sane-&sane-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-<!--
-    <bridgehead renderas="sect4">Front Ends:</bridgehead>
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>scanadf,
-        xcam, and
-        xscanimage</seg>
-        <seg><application>GIMP</application> plugin embedded in
-        <command>xscanimage</command></seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
--->
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gamma4scanimage">
-        <term><command>gamma4scanimage</command></term>
-        <listitem>
-          <para>
-            creates a gamma table in the format expected by
-            <command>scanimage</command>
-          </para>
-          <indexterm zone="sane gamma4scanimage">
-            <primary sortas="b-gamma4scanimage">gamma4scanimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sane-config-prog">
-        <term><command>sane-config</command></term>
-        <listitem>
-          <para>
-            is a tool used to determine the compiler and linker
-            flags that should be used to compile and link
-            <application>SANE</application>
-          </para>
-          <indexterm zone="sane sane-config-prog">
-            <primary sortas="b-sane-config">sane-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="saned">
-        <term><command>saned</command></term>
-        <listitem>
-          <para>
-            is the <application>SANE</application> daemon that
-            allows remote clients to access image acquisition devices
-            available on the local host
-          </para>
-          <indexterm zone="sane saned">
-            <primary sortas="b-saned">saned</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sane-find-scanner">
-        <term><command>sane-find-scanner</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to find SCSI and
-            USB scanners and determine their device files. Its primary
-            purpose is to make sure that scanners can be detected by
-            <application>SANE</application> backends
-          </para>
-          <indexterm zone="sane sane-find-scanner">
-            <primary sortas="b-sane-find-scanner">sane-find-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="scanadf">
-        <term><command>scanadf</command></term>
-        <listitem>
-          <para>
-            is a command-line interface to control image acquisition
-            devices which are equipped with an automatic document feeder (ADF)
-          </para>
-          <indexterm zone="sane scanadf">
-            <primary sortas="b-scanadf">scanadf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="scanimage">
-        <term><command>scanimage</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="sane scanimage">
-            <primary sortas="b-scanimage">scanimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umax_pp">
-        <term><command>umax_pp</command></term>
-        <listitem>
-          <para>
-            is a tool used to read information from UMAX parallel port
-            scanners. It can also be used for performing diagnostics on these
-            scanners
-          </para>
-          <indexterm zone="sane umax_pp">
-            <primary sortas="b-umax_pp">umax_pp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="xcam">
-        <term><command>xcam</command></term>
-        <listitem>
-          <para>
-            is a graphical camera front end for
-            <application>SANE</application>
-          </para>
-          <indexterm zone="sane xcam">
-            <primary sortas="b-xcam">xcam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscanimage">
-        <term><command>xscanimage</command></term>
-        <listitem>
-          <para>
-            is a graphical user interface for scanning
-          </para>
-          <indexterm zone="sane xscanimage">
-            <primary sortas="b-xscanimage">xscanimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="libsane">
-        <term><filename class="libraryfile">libsane.so</filename></term>
-        <listitem>
-          <para>
-            is the application programming interface that is used to
-            communicate between frontends and backends
-          </para>
-          <indexterm zone="sane libsane">
-            <primary sortas="c-libsane">libsane.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsane-module">
-        <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
-          </para>
-          <indexterm zone="sane libsane-module">
-            <primary sortas="c-libsane-module">libsane-*.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/scanning/scanning.xml
===================================================================
--- pst/scanning/scanning.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ pst/scanning/scanning.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,23 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="pst-scanning">
+<?dbhtml filename="scanning.html" dir="pst"?>
+<title>Scanning</title>
 
-<chapter id="pst-scanning">
-  <?dbhtml filename="scanning.html"?>
-
-  <title>Scanning</title>
-
-  <para>
-    This chapter contains scanning applications which allow you to
-    convert printed documents into formatted documents readable by other
-    applications.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sane.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="simple-scan.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xsane.xml"/>-->
+<para>Placeholder for sane and xsane.</para>
 
 </chapter>
Index: t/scanning/simple-scan.xml
===================================================================
--- pst/scanning/simple-scan.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 simple-scan-download-http "&gnome-download-http;/simple-scan/&gnome-46;/simple-scan-&simple-scan-version;.tar.xz">
-  <!ENTITY simple-scan-download-ftp  " ">
-  <!ENTITY simple-scan-md5sum        "5ae9ca4d4c59520736c11a2eb427502d">
-  <!ENTITY simple-scan-size          "1.1 MB">
-  <!ENTITY simple-scan-buildsize     "27 MB">
-  <!ENTITY simple-scan-time          "0.1 SBU">
-]>
-
-<sect1 id="simple-scan" xreflabel="Simple-scan-&simple-scan-version;">
-  <?dbhtml filename="simple-scan.html"?>
-
-  <title>Simple-scan-&simple-scan-version;</title>
-
-  <indexterm zone="simple-scan">
-    <primary sortas="a-simple-scan">Simple-scan</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Simple-scan</title>
-
-    <para>
-      The <application>Simple-scan</application> package contains a modern
-      document scanning application. It captures images using SANE, and
-      supports the latest color management and graphics standards.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&simple-scan-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&simple-scan-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &simple-scan-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &simple-scan-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &simple-scan-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &simple-scan-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Simple-scan Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libgusb"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libwebp"/>, and
-      <xref linkend="sane"/> (backends)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Simple-scan</title>
-
-    <para>
-      Install <application>Simple-scan</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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 &amp;&amp;
-gtk-update-icon-cache -qtf /usr/share/icons/hicolor</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>
-      <command>gtk-update-icon-cache [...]</command>: This command updates the
-      system-wide GTK+ icon cache since Simple-scan's build system does not
-      update it to account for the icons that it installs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          simple-scan
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/simple-scan
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="simple-scan-prog">
-        <term><command>simple-scan</command></term>
-        <listitem>
-          <para>
-            is a modern document scanning application
-          </para>
-          <indexterm zone="simple-scan simple-scan-prog">
-            <primary sortas="b-simple-scan">simple-scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: t/sgml/docbook-3.1-dtd.xml
===================================================================
--- pst/sgml/docbook-3.1-dtd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sgml-dtd-3-download-http "https://www.docbook.org/sgml/&docbook-3.1-dtd-version;/docbk31.zip">
-  <!ENTITY sgml-dtd-3-download-ftp  " ">
-  <!ENTITY sgml-dtd-3-md5sum        "432749c0c806dbae81c8bcb70da3b5d3">
-  <!ENTITY sgml-dtd-3-size          "55 KB">
-  <!ENTITY sgml-dtd-3-buildsize     "676 KB">
-  <!ENTITY sgml-dtd-3-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sgml-dtd-3" xreflabel="docbook-&docbook-3.1-dtd-version;-dtd">
-  <?dbhtml filename="docbook-3.1-dtd.html"?>
-
-
-  <title>docbook-&docbook-3.1-dtd-version;-dtd</title>
-
-  <indexterm zone="sgml-dtd-3">
-    <primary sortas="a-DocBook-SGML-DTD-&docbook-3.1-dtd-version;">DocBook SGML
-    DTD-&docbook-3.1-dtd-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-3.1 SGML DTD</title>
-
-    <para>
-      The <application>DocBook SGML DTD</application> package contains
-      document type definitions for verification of SGML data files against
-      the DocBook rule set. These are useful for structuring books and software
-      documentation to a standard allowing you to utilize transformations
-      already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sgml-dtd-3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sgml-dtd-3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sgml-dtd-3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sgml-dtd-3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sgml-dtd-3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sgml-dtd-3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-3.1 SGML DTD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/> and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-3.1 SGML DTD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook-3.1 SGML DTD</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i -e '/ISO 8879/d' \
-       -e 's|DTDDECL "-//OASIS//DTD DocBook V&docbook-3.1-dtd-version;//EN"|SGMLDECL|g' \
-       docbook.cat</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>install -v -d -m755 /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version; &amp;&amp;
-chown -R root:root . &amp;&amp;
-install -v docbook.cat /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &amp;&amp;
-cp -v -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version; &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-3.1-dtd-version;.cat \
-    /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-3.1-dtd-version;.cat \
-    /etc/sgml/sgml-docbook.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i -e '/ISO 8879/d' docbook.cat</command>: This command
-      removes the ENT definitions from the catalog file.
-    </para>
-
-    <para>
-      <command>sed -i -e 's|DTDDECL
-      "-//OASIS//DTD Docbook V&docbook-3.1-dtd-version;//EN"|SGMLDECL|g'
-      docbook.cat</command>: This command replaces the DTDDECL catalog entry,
-      which is not supported by Linux SGML tools, with the SGMLDECL catalog
-      entry.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook-3.1 SGML DTD</title>
-
-    <sect3 id="sgml-dtd-3-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sgml/catalog</filename>
-      </para>
-
-      <indexterm zone="sgml-dtd-3 sgml-dtd-3-config">
-        <primary sortas="e-etc-sgml-catalog">/etc/sgml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The above installation script updates the catalog.
-      </para>
-
-      <para>
-        Using only the most current 3.x version of <application>DocBook
-        SGML DTD</application> requires the following (perform as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &lt;&lt; "EOF"
-<literal>  -- Begin Single Major Version catalog changes --
-
-PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
-
-  -- End Single Major Version catalog changes --</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>SGML DTD and MOD files</seg>
-        <seg>/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="SGML-DTD-files">
-        <term><filename>SGML DTD files</filename></term>
-        <listitem>
-          <para>
-            contains a document type definition which defines the element
-            types and the attribute lists that can be used in the corresponding
-            SGML files
-          </para>
-          <indexterm zone="sgml-dtd-3 SGML-DTD-files">
-            <primary sortas="g-SGML-DTD-files">SGML DTD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="SGML-MOD-files">
-        <term><filename>SGML MOD files</filename></term>
-        <listitem>
-          <para>
-            contains components of the document type definition that are
-            sourced into the <filename>DTD</filename> files
-          </para>
-          <indexterm zone="sgml-dtd-3 SGML-MOD-files">
-            <primary sortas="g-SGML-MOD-files">SGML MOD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/docbook-4.5-dtd.xml
===================================================================
--- pst/sgml/docbook-4.5-dtd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-ftp  " ">
-  <!ENTITY sgml-dtd-md5sum        "07c581f4bbcba6d3aac85360a19f95f7">
-  <!ENTITY sgml-dtd-size          "70 KB">
-  <!ENTITY sgml-dtd-buildsize     "784 KB">
-  <!ENTITY sgml-dtd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sgml-dtd" xreflabel="docbook-&docbook-4.5-dtd-version;-dtd">
-  <?dbhtml filename="docbook-4.5-dtd.html"?>
-
-
-  <title>docbook-&docbook-4.5-dtd-version;-dtd</title>
-
-  <indexterm zone="sgml-dtd">
-    <primary sortas="a-DocBook-SGML-DTD-&docbook-4.5-dtd-version;">DocBook SGML
-    DTD-&docbook-4.5-dtd-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-4.5 SGML DTD</title>
-
-    <para>
-      The <application>DocBook-4.5 SGML DTD</application> package contains
-      document type definitions for verification of SGML data files against the
-      DocBook rule set. These are useful for structuring books and software
-      documentation to a standard allowing you to utilize transformations
-      already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sgml-dtd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sgml-dtd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sgml-dtd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sgml-dtd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sgml-dtd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sgml-dtd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-4.5 SGML DTD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/> and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-4.5 SGML DTD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook-4.5 SGML DTD</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i -e '/ISO 8879/d' \
-       -e '/gml/d' docbook.cat</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>install -v -d /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version; &amp;&amp;
-chown -R root:root . &amp;&amp;
-
-install -v docbook.cat /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &amp;&amp;
-cp -v -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version; &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-4.5-dtd-version;.cat \
-    /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-4.5-dtd-version;.cat \
-    /etc/sgml/sgml-docbook.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat</command>:
-      This command removes the ENT definitions from the catalog file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook-4.5 SGML DTD</title>
-
-    <sect3 id="sgml-dtd-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sgml/catalog</filename>
-      </para>
-
-      <indexterm zone="sgml-dtd sgml-dtd-config">
-        <primary sortas="e-etc-sgml-catalog">/etc/sgml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The above installation script updates the catalog.
-      </para>
-
-      <para>
-        Using only the most current 4.x version of <application>DocBook
-        SGML DTD</application> requires the following (perform as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &lt;&lt; "EOF"
-<literal>  -- Begin Single Major Version catalog changes --
-
-PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.3//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
-
-  -- End Single Major Version catalog changes --</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>SGML DTD and MOD files</seg>
-        <seg>/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="SGML-DTD-files-4">
-        <term><filename>SGML DTD files</filename></term>
-        <listitem>
-          <para>
-            contains a document type definition which defines the element
-            types and the attribute lists that can be used in the corresponding
-            SGML files
-          </para>
-          <indexterm zone="sgml-dtd SGML-DTD-files-4">
-            <primary sortas="g-SGML-DTD-files">SGML DTD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="SGML-MOD-files-4">
-        <term><filename>SGML MOD files</filename></term>
-        <listitem>
-          <para>
-            contains components of the document type definition that are
-            sourced into the <filename>DTD</filename> files
-          </para>
-          <indexterm zone="sgml-dtd SGML-MOD-files-4">
-            <primary sortas="g-SGML-MOD-files">SGML MOD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/docbook-dsssl.xml
===================================================================
--- pst/sgml/docbook-dsssl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,261 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 docbook-dsssl-download-http "&sourceforge-dl;/docbook/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
-  <!ENTITY docbook-dsssl-download-ftp  "">
-  <!ENTITY docbook-dsssl-md5sum        "bc192d23266b9a664ca0aba4a7794c7c">
-  <!ENTITY docbook-dsssl-size          "277 KB">
-  <!ENTITY docbook-dsssl-buildsize     "14 MB">
-  <!ENTITY docbook-dsssl-time          "less than 0.1 SBU">
-
-  <!ENTITY docbook-dsssl-doc-download-http "&sourceforge-dl;/docbook/docbook-dsssl-doc-&docbook-dsssl-version;.tar.bz2">
-  <!ENTITY docbook-dsssl-doc-md5sum        "9a7b809a21ab7d2749bb328334c380f2">
-  <!ENTITY docbook-dsssl-doc-size          "142 KB">
-]>
-
-<sect1 id="docbook-dsssl"
-xreflabel="docbook-dsssl-&docbook-dsssl-version;">
-  <?dbhtml filename="docbook-dsssl.html"?>
-
-
-  <title>docbook-dsssl-&docbook-dsssl-version;</title>
-
-  <indexterm zone="docbook-dsssl">
-    <primary sortas="a-DocBook-DSSSL-Stylesheets">DocBook DSSSL
-    Stylesheets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook DSSSL Stylesheets</title>
-
-    <para>
-      The <application>DocBook DSSSL Stylesheets</application> package
-      contains DSSSL stylesheets. These are used by
-      <application>OpenJade</application> or other tools to transform SGML
-      and XML DocBook files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-dsssl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook-dsssl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-dsssl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-dsssl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook-dsssl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook-dsssl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <title>Documentation and test data</title>
-
-      <listitem>
-        <para>
-          Download (HTTP):
-          <ulink url="&docbook-dsssl-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-dsssl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-dsssl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook DSSSL Stylesheets
-    Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (to Test the DocBook SGML
-      Toolchain)</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-dtd-3"/>,
-      <xref linkend="sgml-dtd"/>,
-      <xref linkend="opensp"/>, and
-      <xref linkend="openjade"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook DSSSL Stylesheets</title>
-
-    <para>
-      If you downloaded the documentation, run:
-    </para>
-
-<screen><userinput>tar -xf ../docbook-dsssl-doc-1.79.tar.bz2 --strip-components=1</userinput></screen>
-
-    <para>
-      Install <application>DocBook DSSSL Stylesheets</application> by running
-      the following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 bin/collateindex.pl /usr/bin                      &amp;&amp;
-install -v -m644 bin/collateindex.pl.1 /usr/share/man/man1         &amp;&amp;
-install -v -d -m755 /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version; &amp;&amp;
-cp -v -R * /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;          &amp;&amp;
-
-install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/catalog         &amp;&amp;
-
-install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/common/catalog  &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook.cat              \
-    /etc/sgml/dsssl-docbook-stylesheets.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      The above commands create an installation script for this package.
-    </para>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing the DocBook SGML Toolchain (Optional)</title>
-
-    <para>
-      The following commands will perform the necessary tests to confirm
-      that your installed DocBook SGML toolchain will produce desired results.
-      You must have the <xref linkend="sgml-dtd-3"/>,
-      <xref linkend="sgml-dtd"/>, <xref linkend="opensp"/>,
-      and <xref linkend="openjade"/> packages installed,
-      and perform the tests as the
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      All tests will be performed from the <filename class='directory'>
-      /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/doc/testdata
-      </filename>
-      directory as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cd /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/doc/testdata</userinput></screen>
-
-    <para>
-      The first test should produce no output to stdout (your screen) and
-      create a file named <filename>jtest.rtf</filename> in the current
-      directory:
-    </para>
-
-<screen role="root"><userinput>openjade -t rtf -d jtest.dsl jtest.sgm</userinput></screen>
-
-    <para>
-      The next test should return only the following line to stdout:
-      <computeroutput>onsgmls:I: "OpenSP" version "&opensp-version;"</computeroutput>
-    </para>
-
-<screen role="root"><userinput>onsgmls -sv test.sgm</userinput></screen>
-
-    <para>
-      The next test should produce no output to stdout and create a file
-      named <filename>test.rtf</filename> in the current directory:
-    </para>
-
-<screen role="root"><userinput>openjade -t rtf \
-    -d /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/print/docbook.dsl \
-    test.sgm</userinput></screen>
-
-    <para>
-      The last test should produce no output to stdout and create a file
-      named <filename>c1.htm</filename> in the current directory:
-    </para>
-
-<screen role="root"><userinput>openjade -t sgml \
-    -d /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/html/docbook.dsl \
-    test.sgm</userinput></screen>
-
-    <para>
-      Finally, clean up:
-    </para>
-
-<screen role="root"><userinput>rm jtest.rtf test.rtf c1.htm</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>collateindex.pl</seg>
-        <seg>None</seg>
-        <seg>DSSSL stylesheets</seg>
-        <seg>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="collateindex.pl">
-        <term><command>collateindex.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that creates a
-            DocBook index from raw index data
-          </para>
-          <indexterm zone="docbook-dsssl collateindex.pl">
-            <primary sortas="b-collateindex.pl">collateindex.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 docbook-utils-download-http "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/docbook-utils-&docbook-utils-version;.tar.gz">
-  <!ENTITY docbook-utils-download-ftp  " ">
-  <!ENTITY docbook-utils-md5sum        "6b41b18c365c01f225bc417cf632d81c">
-  <!ENTITY docbook-utils-size          "124 KB">
-  <!ENTITY docbook-utils-buildsize     "1.44 MB">
-  <!ENTITY docbook-utils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="docbook-utils" xreflabel="DocBook-utils-&docbook-utils-version;">
-  <?dbhtml filename="docbook-utils.html"?>
-
-
-  <title>DocBook-utils-&docbook-utils-version;</title>
-
-  <indexterm zone="docbook-utils">
-    <primary sortas="a-DocBook-utils">DocBook-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-utils</title>
-
-    <para>
-      The <application>DocBook-utils</application> package is a collection
-      of utility scripts used to convert and analyze SGML documents in general,
-      and DocBook files in particular. The scripts are used to convert from
-      DocBook or other SGML formats into <quote>classical</quote> file formats
-      like HTML, man, info, RTF and many more. There's also a utility to compare
-      two SGML files and only display the differences in markup. This is useful
-      for comparing documents prepared for different languages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-           "&patch-root;/docbook-utils-&docbook-utils-version;-grep_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openjade"/>,
-      <xref linkend="docbook-dsssl"/>, and
-      <xref linkend="sgml-dtd-3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime Dependencies Only)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="perl-sgmlspm"/> (for conversion to man and
-      texinfo), and
-      <xref role="runtime" linkend="lynx"/> or
-      <xref role="nodep" linkend="Links"/> or
-      <ulink role="runtime" url="&w3m-url;">W3m</ulink>
-      (for conversion to ASCII text)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-utils</title>
-
-    <para>
-      Install <application>DocBook-utils</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch &amp;&amp;
-sed -i 's:/html::' doc/HTML/Makefile.in                &amp;&amp;
-
-./configure --prefix=/usr --mandir=/usr/share/man      &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 docdir=/usr/share/doc install</userinput></screen>
-
-    <para>
-      Many packages use an alternate name for the
-      <application>DocBook-utils</application> scripts. If you wish to create
-      these alternate names, use the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for doctype in html ps dvi man pdf rtf tex texi txt
-do
-    ln -svf docbook2$doctype /usr/bin/db2$doctype
-done</userinput></screen>
-
-    <note>
-      <para>
-        The <command>jw</command> script uses the <command>which</command>
-        command to locate required utilities. You must install
-        <xref linkend="which"/> before attempting to use any of the
-        <application>DocBook-utils</application> programs.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch</command>:
-      This patch corrects the syntax in the jw (Jade Wrapper) script which is
-      at the heart of much db2* processing, so that the current version of
-      <application>grep</application> will not reject it.
-    </para>
-
-    <para>
-      <command>sed -i 's:/html::' doc/HTML/Makefile.in</command>:
-      This command changes the installation directory of the HTML documents.
-    </para>
-
-    <para>
-      <parameter>docdir=/usr/share/doc</parameter>: This option is placed on the
-      <command>make install</command> line because it is not
-      recognized by <command>configure</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <segtitle>Installed Symlinks</segtitle>
-
-      <seglistitem>
-        <seg>docbook2dvi, docbook2html, docbook2man, docbook2pdf, docbook2ps,
-        docbook2rtf, docbook2tex, docbook2texi, docbook2txt, jw, and
-        sgmldiff</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/docbook-utils-&docbook-utils-version; and
-        /usr/share/sgml/docbook/utils-&docbook-utils-version;</seg>
-        <seg>db2dvi, db2html, db2man, db2pdf, db2ps, db2rtf, db2tex, db2texi,
-        and db2txt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="docbook2">
-        <term><command>docbook2*</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="docbook-utils docbook2">
-            <primary sortas="b-docbook2-star">docbook2*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db2">
-        <term><command>db2*</command></term>
-        <listitem>
-          <para>
-            are symlinks pointing at the respectively named
-            <command>docbook2*</command> commands, created to satisfy some
-            program's use of these names
-          </para>
-          <indexterm zone="docbook-utils db2">
-            <primary sortas="b-db2-star">db2*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jw">
-        <term><command>jw</command></term>
-        <listitem>
-          <para>
-            is a script used to convert DocBook or other SGML files to various
-            output formats. It hides most of
-            <application>OpenJade</application>'s complexity and adds
-            comfortable features
-          </para>
-          <indexterm zone="docbook-utils jw">
-            <primary sortas="b-jw">jw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgmldiff">
-        <term><command>sgmldiff</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="docbook-utils sgmldiff">
-            <primary sortas="b-sgmldiff">sgmldiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/openjade.xml
===================================================================
--- pst/sgml/openjade.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,274 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 openjade-download-http "&sourceforge-dl;/openjade/openjade-&openjade-version;.tar.gz">
-  <!ENTITY openjade-download-ftp  " ">
-  <!ENTITY openjade-md5sum        "7df692e3186109cc00db6825b777201e">
-  <!ENTITY openjade-size          "880 KB">
-  <!ENTITY openjade-buildsize     "19.2 MB">
-  <!ENTITY openjade-time          "0.7 SBU">
-]>
-
-<sect1 id="openjade" xreflabel="OpenJade-&openjade-version;">
-  <?dbhtml filename="openjade.html"?>
-
-
-  <title>OpenJade-&openjade-version;</title>
-
-  <indexterm zone="openjade">
-    <primary sortas="a-OpenJade">OpenJade</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJade</title>
-
-    <para>
-      The <application>OpenJade</application> package contains a
-      DSSSL engine. This is useful for SGML and XML transformations into
-      RTF, TeX, SGML and XML.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openjade-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openjade-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjade-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openjade-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjade-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openjade-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-            url="&patch-root;/openjade-&openjade-version;-upstream-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenJade Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="opensp"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJade</title>
-
-    <para>
-      First fix problems when building with newer compilers:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../openjade-&openjade-version;-upstream-1.patch</userinput></screen>
-
-    <para>
-      Now fix a compilation problem with perl-5.16 and later:
-    </para>
-
-<screen><userinput>sed -i -e '/getopts/{N;s#&amp;G#g#;s#do .getopts.pl.;##;}' \
-       -e '/use POSIX/ause Getopt::Std;' msggen.pl</userinput></screen>
-
-    <para>
-      Install <application>OpenJade</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export CXXFLAGS="${CXXFLAGS:--O2 -g} -fno-lifetime-dse"            &amp;&amp;
-./configure --prefix=/usr                                \
-            --mandir=/usr/share/man                      \
-            --enable-http                                \
-            --disable-static                             \
-            --enable-default-catalog=/etc/sgml/catalog   \
-            --enable-default-search-path=/usr/share/sgml \
-            --datadir=/usr/share/sgml/openjade-&openjade-version;   &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>
-
-<!-- Be careful of spacing here -->
-<screen role="root"><userinput>make install                                                   &amp;&amp;
-make install-man                                               &amp;&amp;
-ln -v -sf openjade /usr/bin/jade                               &amp;&amp;
-ln -v -sf libogrove.so /usr/lib/libgrove.so                    &amp;&amp;
-ln -v -sf libospgrove.so /usr/lib/libspgrove.so                &amp;&amp;
-ln -v -sf libostyle.so /usr/lib/libstyle.so                    &amp;&amp;
-
-install -v -m644 dsssl/catalog /usr/share/sgml/openjade-&openjade-version;/ &amp;&amp;
-
-install -v -m644 dsssl/*.{dtd,dsl,sgm}              \
-    /usr/share/sgml/openjade-&openjade-version;                             &amp;&amp;
-
-install-catalog --add /etc/sgml/openjade-&openjade-version;.cat  \
-    /usr/share/sgml/openjade-&openjade-version;/catalog                     &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook.cat    \
-    /etc/sgml/openjade-&openjade-version;.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>export CXXFLAGS=...</command>: This command prevents
-      segmentation faults when the package is compiled with
-      <application>gcc-6.1</application>.
-    </para>
-
-    <para>
-      <command>make install-man</command>: This command installs the
-      <command>openjade</command> man page.
-    </para>
-
-    <para>
-      <parameter>--disable-static</parameter>: This switch prevents
-      the building of the static library.
-    </para>
-
-    <para>
-      <parameter>--enable-http</parameter>: This switch adds support
-      for HTTP.
-    </para>
-
-    <para>
-      <parameter>--enable-default-catalog=/etc/sgml/catalog</parameter>: This
-      switch sets the path to the centralized catalog.
-    </para>
-
-    <para>
-      <parameter>--enable-default-search-path</parameter>: This switch
-      sets the default value of <envar>SGML_SEARCH_PATH</envar>.
-    </para>
-
-    <para>
-      <parameter>
-        --datadir=/usr/share/sgml/openjade-&openjade-version;</parameter>:
-      This switch puts data files in
-      <filename>/usr/share/sgml/openjade-&openjade-version;</filename> instead
-      of <filename class="directory">/usr/share</filename>.
-    </para>
-
-    <para>
-      <command>ln -v -sf ...</command>: These commands create the
-      <application>Jade</application> equivalents of
-      <application>OpenJade</application> executables and libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenJade</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo "SYSTEM \"http://www.oasis-open.org/docbook/xml/&docbook-4.5-dtd-version;/docbookx.dtd\" \
-    \"/usr/share/xml/docbook/xml-dtd-&docbook-4.5-dtd-version;/docbookx.dtd\"" &gt;&gt; \
-    /usr/share/sgml/openjade-&openjade-version;/catalog</userinput></screen>
-
-      <para>
-        This configuration is only necessary if you intend to use
-        <application>OpenJade</application> to process the BLFS XML files
-        through DSSSL Stylesheets.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>openjade and the <application>Jade</application> equivalent symlink,
-        jade</seg>
-        <seg>libogrove.so, libospgrove.so, libostyle.so, and the
-        <application>Jade</application> equivalent symlinks: libgrove.so,
-        libspgrove.so, and libstyle.so</seg>
-        <seg>/usr/share/sgml/openjade-&openjade-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="openjade-prog">
-        <term><command>openjade</command></term>
-        <listitem>
-          <para>
-            is a DSSSL engine used for transformations
-          </para>
-          <indexterm zone="openjade openjade-prog">
-            <primary sortas="b-openjade">openjade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jade">
-        <term><command>jade</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>openjade</command>
-          </para>
-          <indexterm zone="openjade jade">
-            <primary sortas="b-jade">jade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,402 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 opensp-download-http "&sourceforge-dl;/openjade/OpenSP-&opensp-version;.tar.gz">
-  <!ENTITY opensp-download-ftp  " ">
-  <!ENTITY opensp-md5sum        "670b223c5d12cee40c9137be86b6c39b">
-  <!ENTITY opensp-size          "1.5 MB">
-  <!ENTITY opensp-buildsize     "32 MB">
-  <!ENTITY opensp-time          "1.0 SBU">
-]>
-
-<sect1 id="opensp" xreflabel="OpenSP-&opensp-version;">
-  <?dbhtml filename="opensp.html"?>
-
-
-  <title>OpenSP-&opensp-version;</title>
-
-  <indexterm zone="opensp">
-    <primary sortas="a-OpenSP">OpenSP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenSP</title>
-
-    <para>
-      The <application>OpenSP</application> package contains a
-      <application>C++</application> library for using SGML/XML files.
-      This is useful for validating, parsing and manipulating SGML and XML
-      documents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opensp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opensp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opensp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opensp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opensp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opensp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenSP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenSP</title>
-
-    <para>
-      Install <application>OpenSP</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/32,/253,/' lib/Syntax.cxx &amp;&amp;
-sed -i 's/LITLEN          240 /LITLEN          8092/' \
-    unicode/{gensyntax.pl,unicode.syn} &amp;&amp;
-
-./configure --prefix=/usr                              \
-            --disable-static                           \
-            --disable-doc-build                        \
-            --enable-default-catalog=/etc/sgml/catalog \
-            --enable-http                              \
-            --enable-default-search-path=/usr/share/sgml &amp;&amp;
-
-make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. As many as
-      nine of the 23 tests may fail. Do not be alarmed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version; \
-     docdir=/usr/share/doc/OpenSP-&opensp-version;      \
-     install &amp;&amp;
-
-ln -v -sf onsgmls   /usr/bin/nsgmls   &amp;&amp;
-ln -v -sf osgmlnorm /usr/bin/sgmlnorm &amp;&amp;
-ln -v -sf ospam     /usr/bin/spam     &amp;&amp;
-ln -v -sf ospcat    /usr/bin/spcat    &amp;&amp;
-ln -v -sf ospent    /usr/bin/spent    &amp;&amp;
-ln -v -sf osx       /usr/bin/sx       &amp;&amp;
-ln -v -sf osx       /usr/bin/sgml2xml &amp;&amp;
-ln -v -sf libosp.so /usr/lib/libsp.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/32,/253,/...unicode.syn}</command>:
-      These seds prevent some annoying messages that may otherwise appear
-      while running <command>openjade</command>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-http</parameter>: This switch adds support
-      for HTTP.
-    </para>
-
-    <para>
-      <parameter>--disable-doc-build</parameter>: This switch prevents the
-      <command>configure</command> script checking if you have
-      <application>xmlto</application> installed. If you have
-      <application>xmlto</application>, you can remove this option.
-    </para>
-
-    <para>
-      <parameter>--enable-default-catalog=/etc/sgml/catalog</parameter>:
-      This switch sets the path to the centralized catalog.
-    </para>
-
-    <para>
-      <parameter>--enable-default-search-path</parameter>: This switch
-      sets the default value of <envar>SGML_SEARCH_PATH</envar>.
-    </para>
-
-    <para>
-      <option>--enable-xml-messages</option>: This switch adds
-      support for XML Formatted Messages.
-    </para>
-
-    <para>
-      <command>
-        make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;
-      </command>: This sets the
-      pkgdatadir variable in the <filename>Makefile</filename> from
-      <filename class="directory">/usr/share/OpenSP</filename> to <filename
-      class="directory">/usr/share/sgml/OpenSP-&opensp-version;</filename>.
-    </para>
-
-    <para>
-      <command>ln -v -sf ...</command>: These commands create the
-      <application>SP</application> equivalents of
-      <application>OpenSP</application> executables and libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>onsgmls, osgmlnorm, ospam, ospcat, ospent, osx, and the
-        <application>SP</application> equivalent symlinks: nsgmls, sgml2xml,
-        sgmlnorm, spam, spcat, spent, and sx</seg>
-        <seg>libosp.so and the <application>SP</application> equivalent symlink:
-        libsp.so</seg>
-        <seg>/usr/include/OpenSP, /usr/share/doc/OpenSP, and
-        /usr/share/sgml/OpenSP-&opensp-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="onsgmls">
-        <term><command>onsgmls</command></term>
-        <listitem>
-          <para>
-            is used to process SGML files
-          </para>
-          <indexterm zone="opensp onsgmls">
-            <primary sortas="b-onsgmls">onsgmls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osgmlnorm">
-        <term><command>osgmlnorm</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="opensp osgmlnorm">
-            <primary sortas="b-osgmlnorm">osgmlnorm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ospam">
-        <term><command>ospam</command></term>
-        <listitem>
-          <para>
-            is a markup stream editor
-          </para>
-          <indexterm zone="opensp ospam">
-            <primary sortas="b-ospam">ospam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ospcat">
-        <term><command>ospcat</command></term>
-        <listitem>
-          <para>
-            prints effective system identifiers found in the catalogs
-          </para>
-          <indexterm zone="opensp ospcat">
-            <primary sortas="b-ospcat">ospcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ospent">
-        <term><command>ospent</command></term>
-        <listitem>
-          <para>
-            provides access to <application>OpenSP</application>'s
-            entity manager
-          </para>
-          <indexterm zone="opensp ospent">
-            <primary sortas="b-ospent">ospent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osx">
-        <term><command>osx</command></term>
-        <listitem>
-          <para>
-            is an SGML normalizer or used to convert
-            SGML files to XML files
-          </para>
-          <indexterm zone="opensp osx">
-            <primary sortas="b-osx">osx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsgmls">
-        <term><command>nsgmls</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>onsgmls</command>
-          </para>
-          <indexterm zone="opensp nsgmls">
-            <primary sortas="b-nsgmls">nsgmls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgml2xml">
-        <term><command>sgml2xml</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>osx</command>
-          </para>
-          <indexterm zone="opensp sgml2xml">
-            <primary sortas="b-sgml2xml">sgml2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgmlnorm">
-        <term><command>sgmlnorm</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>osgmlnorm</command>
-          </para>
-          <indexterm zone="opensp sgmlnorm">
-            <primary sortas="b-sgmlnorm">sgmlnorm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spam">
-        <term><command>spam</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ospam</command>
-          </para>
-          <indexterm zone="opensp spam">
-            <primary sortas="b-spam">spam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spcat">
-        <term><command>spcat</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ospcat</command>
-          </para>
-          <indexterm zone="opensp spcat">
-            <primary sortas="b-spcat">spcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spent">
-        <term><command>spent</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ospent</command>
-          </para>
-          <indexterm zone="opensp spent">
-            <primary sortas="b-spent">spent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sx">
-        <term><command>sx</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>osx</command>
-          </para>
-          <indexterm zone="opensp sx">
-            <primary sortas="b-sx">sx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libosp">
-        <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
-          </para>
-          <indexterm zone="opensp libosp">
-            <primary sortas="c-libosp">libosp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsp">
-        <term><filename class="libraryfile">libsp.so</filename></term>
-        <listitem>
-          <para>
-            is a symlink to
-            <filename class="libraryfile">libosp.so</filename>
-          </para>
-          <indexterm zone="opensp libsp">
-            <primary sortas="c-libsp">libsp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/sgml-common.xml
===================================================================
--- pst/sgml/sgml-common.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,251 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sgml-common-download-http "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-&sgml-common-version;.tgz">
-  <!ENTITY sgml-common-download-ftp  " ">
-  <!ENTITY sgml-common-md5sum        "103c9828f24820df86e55e7862e28974">
-  <!ENTITY sgml-common-size          "75 KB">
-  <!ENTITY sgml-common-buildsize     "1.5 MB">
-  <!ENTITY sgml-common-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sgml-common" xreflabel="sgml-common-&sgml-common-version;">
-  <?dbhtml filename="sgml-common.html"?>
-
-
-  <title>sgml-common-&sgml-common-version;</title>
-
-  <indexterm zone="sgml-common">
-    <primary sortas="a-SGML-Common">SGML Common</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SGML Common</title>
-
-    <para>
-      The <application>SGML Common</application> package contains
-      <command>install-catalog</command>. This is useful for creating and
-      maintaining centralized SGML catalogs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sgml-common-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sgml-common-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sgml-common-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sgml-common-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sgml-common-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sgml-common-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-            "&patch-root;/sgml-common-&sgml-common-version;-manpage-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SGML Common</title>
-
-    <para>
-      Instead of the normal convention of including the autotools files
-      in the package, the maintainers included symlinks to the files in
-      <filename class="directory">/usr/share/automake</filename>. For previous
-      versions of <application>Automake</application> this convention is
-      correct, but recent versions of <application>Automake</application>
-      install the internal files in version specific directories. This causes
-      the <command>configure</command> script to abort. To fix this error, the
-      autotools are regenerated. Since the included
-      <filename>Makefile.am</filename> file uses a syntax not supported by
-      current versions of <application>Automake</application>, a patch is
-      required to fix the syntax.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../sgml-common-0.6.3-manpage-1.patch &amp;&amp;
-autoreconf -f -i</userinput></screen>
-
-    <para>
-      Install <application>SGML Common</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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 docdir=/usr/share/doc install &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-ent.cat \
-    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook.cat \
-    /etc/sgml/sgml-ent.cat</userinput></screen>
-
-    <tip>
-      <title>Update Hint</title>
-
-      <para>
-        Remove the above catalog items prior to upgrading (as the
-        <systemitem class='username'>root</systemitem> user) with:
-      </para>
-
-<screen role="nodump"><userinput>install-catalog --remove /etc/sgml/sgml-ent.cat \
-    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &amp;&amp;
-
-install-catalog --remove /etc/sgml/sgml-docbook.cat \
-    /etc/sgml/sgml-ent.cat</userinput></screen>
-
-    </tip>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SGML Common</title>
-
-    <sect3 id="sgml-common-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sgml/sgml.conf</filename>
-      </para>
-
-      <indexterm zone="sgml-common sgml-common-config">
-        <primary sortas="e-etc-sgml-sgml.conf">/etc/sgml/sgml.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        No change in this file is necessary.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>install-catalog and sgmlwhich</seg>
-        <seg>None</seg>
-        <seg>SGML and XML DocBook entity files</seg>
-        <seg>/etc/sgml, /usr/share/doc/sgml-common-&sgml-common-version;, and
-        /usr/share/sgml</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="install-catalog">
-        <term><command>install-catalog</command></term>
-        <listitem>
-          <para>
-            creates a centralized catalog that maintains references to
-            catalogs scattered throughout the
-            <filename class="directory">/usr/share/sgml</filename> directory
-          tree
-          </para>
-          <indexterm zone="sgml-common install-catalog">
-            <primary sortas="b-install-catalog">install-catalog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgmlwhich">
-        <term><command>sgmlwhich</command></term>
-        <listitem>
-          <para>
-            prints to standard output the name of the main configuration file
-          </para>
-          <indexterm zone="sgml-common sgmlwhich">
-            <primary sortas="b-sgmlwhich">sgmlwhich</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="SGML-entities">
-        <term><filename>SGML entities files</filename></term>
-        <listitem>
-          <para>
-            contains the basic character entities defined with SDATA entries
-          </para>
-          <indexterm zone="sgml-common SGML-entities">
-            <primary sortas="g-SGML-ENT-files">SGML entity files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="XML-entities">
-        <term><filename>XML entities files</filename></term>
-        <listitem>
-          <para>
-            contains the basic character entities defined by a hexadecimal
-            representation of the Unicode character number
-          </para>
-          <indexterm zone="sgml-common XML-entities">
-            <primary sortas="g-XML-ENT-files">XML entity files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/sgml/sgml.xml
===================================================================
--- pst/sgml/sgml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="pst-sgml">
-  <?dbhtml filename="sgml.html"?>
-
-  <title>Standard Generalized Markup Language (SGML)</title>
-
-  <para>
-    This chapter contains DocBook SGML document type definitions (DTDs),
-    DocBook DSSSL Stylesheets and DocBook tools to validate, transform, format
-    and publish DocBook documents.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml-common.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-3.1-dtd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-4.5-dtd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opensp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjade.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-dsssl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-utils.xml"/>
-
-</chapter>
Index: t/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,301 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 asymptote-download-http "&sourceforge-dl;/asymptote/asymptote-&asymptote-version;.src.tgz">
-  <!ENTITY asymptote-download-ftp  " ">
-  <!ENTITY asymptote-md5sum        "905c100fc40b4af24ebf7398b8cce2b7">
-  <!ENTITY asymptote-size          "14 MB">
-  <!-- for asymptote-2.88 on top of TL2024, 75 MB for programis
-       the docs overwrite texmf-dist (5.2 MB) -->
-  <!ENTITY asymptote-buildsize     "202 MB (50 MB installed after overwriting files in $TEXLIVE_PREFIX/texmf-dist/, with all the dependencies which are in BLFS)">
-  <!ENTITY asymptote-time          "0.9 SBU (using parallelism=4)">
-]>
-
-<sect1 id="asymptote" xreflabel="asymptote-&asymptote-version;">
-  <?dbhtml filename="asymptote.html"?>
-
-
-  <title>asymptote-&asymptote-version;</title>
-
-  <indexterm zone="asymptote">
-    <primary sortas="a-asymptote">asymptote</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to asymptote</title>
-
-    <para>
-      <application>Asymptote</application> is a powerful descriptive vector
-      graphics language that provides a natural coordinate-based framework for
-      technical drawing. Labels and equations can be typeset with LaTeX.  As
-      well as EPS, PDF and PNG output it can produce WebGL 3D HTML rendering
-      and (using <application>dvisvgm</application>) SVG output.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&asymptote-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&asymptote-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &asymptote-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &asymptote-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &asymptote-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &asymptote-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/asymptote-&asymptote-version;-build_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">asymptote Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gs"/> and
-      <xref linkend="texlive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>,
-      <xref linkend="freeglut"/>,
-      <xref linkend="gc"/>,
-      <xref linkend="glew"/>,
-      <xref linkend="glm"/> and
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended at runtime</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="dvisvgm"/> to allow svg output
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="fftw"/>,
-      <xref linkend="gsl"/>,
-      <xref linkend="libsigsegv"/>,
-      both <xref linkend="boost"/> and
-      <ulink url="https://github.com/Tencent/rapidjson/releases/">rapidjson</ulink>
-      to use
-      <ulink url="https://microsoft.github.io/language-server-protocol/implementors/tools/">LSP</ulink>
-      which can be used with
-      <ulink url="https://asymptote.sourceforge.io/doc/Language-server-protocol.html#index-LSP/">emacs</ulink>,
-      and <ulink url="https://eigen.tuxfamily.org/">eigen</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (at runtime)</bridgehead>
-    <para role="optional">
-      <xref linkend="imagemagick"/> to convert output to other formats such as
-      JPEG or to create animated GIFs,
-      <!-- dependency is in GUI/xasy.py -->
-      <ulink url="https://pypi.org/project/PyQt5/">PyQt5</ulink> (not tested,
-      has a build dependency of &qt5-deps;) to use xasy.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/asymptote"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of asymptote</title>
-
-    <note>
-      <!-- This is specifically about my cylinder test - it has been
-       broken twice, one time the fix involved changing the script,
-       the second was blamed on the low-end hardware (radeon 3400G).
-       I don't understand the commands of asy so I will not
-       spend time bisecting it.  Ken -->
-      <para>
-        Certain 3D PDF scripts may not work when invoked from pdflatex
-        on some zen+ amdgpu APU machines.
-      </para>
-    </note>
-
-<!-- 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-20240320.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-20200809.tar.xz
--->
-<!--<para>
-      First apply a patch to fix building without the Language Server Protocol :
-    </para>
-
-<screen><userinput>patch -Np1 -i ../asymptote-&asymptote-version;-build_fix-1.patch</userinput></screen>-->
-
-    <para>
-      Install <application>asymptote</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-./configure --prefix=$TEXLIVE_PREFIX                          \
-            --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH             \
-            --datarootdir=$TEXLIVE_PREFIX/texmf-dist          \
-            --infodir=$TEXLIVE_PREFIX/texmf-dist/doc/info     \
-            --libdir=$TEXLIVE_PREFIX/texmf-dist               \
-            --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man       \
-            --disable-lsp                                     \
-            --enable-gc=system                                \
-            --with-latex=$TEXLIVE_PREFIX/texmf-dist/tex/latex \
-            --with-context=$TEXLIVE_PREFIX/texmf-dist/tex/context/third &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <para>
-      <parameter>--libdir=$TEXLIVE_PREFIX/texmf-dist</parameter>:
-      This parameter ensures that the <filename
-      class="directory">asymptote</filename> directory will similarly
-      overwrite any files installed by install-tl-unx.
-    </para>
-
-     <para>
-       <parameter>--disable-lsp</parameter>: The Language Server Protocol is
-       enabled by default, with several third-party sources included, but it
-       does not build unless boost and repidjson have been installed.
-     </para>
-
-    <para>
-      <parameter>--enable-gc=system</parameter>: this ensures that the system
-      version of <filename class="libraryfile">libgc.so</filename> will be used
-      instead of the version shipped with this package.
-    </para>
-
-    <para>
-      <parameter>--with-latex=</parameter>
-      <parameter>--with-context=</parameter>: These switches
-      ensure that style files and a tex file will be installed into the
-      <application>texlive</application> directories instead of creating a
-      <filename class="directory">texmf-local</filename> directory for them.
-    </para>
-
-    <!-- commenting for now: 2.44 installs asymptote.info in both places
-     so the old version no longer remains
-
-    <para>
-      <command>rm -fv /opt/texlive/.../asymptote.info</command>:
-      This deletes the file installed by <application>texlive</application>.
-      Exceptionally, asymptote will create an <filename
-      class="directory">asymptote/</filename> subdirectory for its own
-      <filename>asymptote.info</filename> even though a possibly older
-      version from <xref linkend="texlive"/> is in the main
-      <application>texlive</application>
-      <filename class="directory">info/</filename> directory. Both the
-      new version and the existing <filename>asy-faq.info</filename>
-      <emphasis>will</emphasis> be found by <command>info</command>.
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          asy, xasy
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $TEXLIVE_PREFIX/texmf-dist/asymptote,
-          $TEXLIVE_PREFIX/doc/asymptote,
-          $TEXLIVE_PREFIX/info/asymptote
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asy">
-        <term><command>asy</command></term>
-        <listitem>
-          <para>
-            is a vector graphics program
-          </para>
-          <indexterm zone="asymptote asy">
-            <primary sortas="b-asy">asy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xasy">
-        <term><command>xasy</command></term>
-        <listitem>
-          <para>
-            is a Python3 script providing a Qt5 GUI for asy
-          </para>
-          <indexterm zone="asymptote xasy">
-            <primary sortas="b-xasy">xasy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/typesetting/biber.xml
===================================================================
--- pst/typesetting/biber.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,358 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!--
-  When a proper url is not evident, github will download with
-  https://github.com/ <path> /archive/<version>/<name>-<version>.tar.<compression>
-
-  <!ENTITY biber-download-http "https://github.com/plk/biber/archive/v&biber-version;.tar.gz">
--->
-  <!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        "a7f400cdac3a3d9d9ab13ca053eb6791">
-  <!ENTITY biber-size          "1.6 MB">
-  <!-- Buildsize includes the installed biblatex, except that what matters is
-    the difference from the files shipped by texlive, so usually the addition is
-    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 grew by 3MB -->
-  <!ENTITY biber-buildsize     "15 MB (installs 1.6MB of perl modules)"> <!-- only include biblatex size if texmf grows -->
-  <!ENTITY biber-time          "0.4 SBU including tests">
-
-  <!-- FIXME - ok to comment biblatex when version for a new year matches
-   what is in texmf-dist. For new version, reinstate to avoid runtime error.
-   The texmf version is at 'revision=' in texmf/doc/latex/biblatex/biblatex.tex -->
-  <!-- Check path.  Directory might not be &biblatex-version; if a suffixed update -->
- 
-  <!ENTITY biblatex-download-http   "https://sourceforge.net/projects/biblatex/files/biblatex-&biblatex-version;/biblatex-&biblatex-version;.tds.tgz">
-  <!ENTITY biblatex-download-ftp    "">
-  <!ENTITY biblatex-md5sum          "6c4117fd06e12854495a3777523d5372">
-  <!ENTITY biblatex-size            "19 MB">
-  <!-- this usually overwrites files in texmf-dist¸use du -sm to measure
-      before and after - 'buildsize' might easily be unchanged, or add to biber above -->
-  <!-- Unchanged for 3.20, it overwrote everything from 3.19 and rounded to same size -->
-]>
-
-<sect1 id="biber" xreflabel="biber-&biber-version;">
-  <?dbhtml filename="biber.html"?>
-
-
-  <title>biber-&biber-version;</title>
-
-  <indexterm zone="biber">
-    <primary sortas="a-biber">Biber</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to biber</title>
-
-    <para>
-      Biber is a BibTeX replacement for users of biblatex, written in
-      <application>Perl</application>, with full Unicode support.
-    </para>
-
-    &lfs121_checked;
-
-    <!-- note for editors: FIXME please test this by using the latest
-         version of the latex-test tarball from
-         https://www.linuxfromscratch.org/~ken/tex-testfiles/
-         using ./configure (to create the Makefile) and then making the
-         following targets:
-         biblatex-unibiber and biblatex-biber (these just use pdflatex
-         and biber, biblatex-unibiber is more important, it uses UTF-8)
-         bibxelatex (uses xelatex and biber, needs TTF or OTF fonts and
-         in particular coverage of simplified Chinese and Japanese, and
-         optionally Korean - installed fonts for CJK can be specified to
-         configure if they are not found)
-         remote1 and remote2 (pdflatex and biber, for use with manually
-         installed perl modules, i.e. without Mozilla::CA, to prove that
-         remote references work).
-         In all cases the output PDF should include references at the
-         end, the Makefile does not check that for the remote tests.
-         The biblatex-biber test only uses latex, trad markup, and
-         biber, biblatex.
- -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&biber-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&biber-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &biber-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &biber-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &biber-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &biber-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-
-      <para>
-        The <application>biber</application> source tarball shown above
-        downloads with the correct name, biber-&biber-version;.tar.gz,
-        if using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain
-        v&biber-version;.tar.gz. To obtain this package with the proper
-        filename, run:
-
-<screen><userinput>wget -c &biber-download-http; \
-     -O biber-&biber-version;.tar.gz</userinput></screen>.
-      </para>
-
-      <para>
-        If you have updated to a new release of texlive-source, biber and its
-        perl dependencies are still present in <filename
-        class="directory">/usr</filename> and do not need to be rebuilt.
-        However, biblatex installs in <filename
-        class="directory">/opt/texlive/&texlive-year;</filename> and does
-        need to be reinstalled.
-      </para>
-
-      <para>
-        If you installed the above dependencies using the BLFS instructions
-        for each of them, <command>perl ./Build.PL</command> will complain
-        that Mozilla::CA is not installed, but that is not needed unless
-        CPAN was used to install the modules. BLFS patches LWP::Protocol::https
-        to use the system certificates, Mozilla::CA uses old certificates.
-      </para>
-
-<!--  <para> ##commented as a reminder that sooner or later it will need a
-        newer version than our current or last but one release ##
-        This version of biber requires <application>perl-5.30</application>
-        or later.  If you are still using the 8.4 version of BLFS you may
-        wish to build the 2.13 version: see the 8.4 book noting that
-        biblatex-3.13 has been replaced by biblatex-3.13a upstream.
-      </para>-->
-    </note>
-
-    <!-- TexLive 2024 shipped biblatex-3.19.  Uncomment if a newer
-         biber requires a newer biblatex.  -->
-
-  <!-- FIXME - ok to comment biblatex when version for a new year matches
-   what is in texmf-dist. For new version, reinstate to avoid runtime error.-->
-    <bridgehead renderas="sect3">Required Additional Download</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&biblatex-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &biblatex-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &biblatex-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Biber Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- KFM: the order listed in Build.PL is not alphabetical -->
-      <xref linkend="perl-autovivification"/>
-      <xref linkend="perl-business-isbn"/>
-      <xref linkend="perl-business-ismn"/>
-      <xref linkend="perl-business-issn"/>
-      <xref linkend="perl-class-accessor"/>
-      <xref linkend="perl-data-compare"/>
-      <xref linkend="perl-data-dump"/>
-      <xref linkend="perl-data-uniqid"/>
-      <xref linkend="perl-datetime-calendar-julian"/>
-      <xref linkend="perl-datetime-format-builder"/>
-      <xref linkend="perl-encode-eucjpascii"/>
-      <xref linkend="perl-encode-hanextra"/>
-      <xref linkend="perl-encode-jis2k"/>
-      <xref linkend="perl-file-slurper"/>
-      <xref linkend="perl-io-string"/>
-      <!-- IPC::Cmd is a part of core perl -->
-      <xref linkend="perl-ipc-run3"/>
-      <xref linkend="perl-lingua-translit"/>
-      <xref linkend="perl-list-allutils"/>
-      <xref linkend="perl-list-moreutils"/>
-      <!-- perl-list-moreutils-xs is a dep of perl-list-moreutils -->
-      <xref linkend="perl-log-log4perl"/>
-      <xref linkend="perl-lwp-protocol-https"/>
-      <!-- LWP::Simple dep for this protocol is part of perl-libwww-perl,
-      that is pulled in by perl-lwp-protocol-https and that pulls in
-      perl-uri. Biber lists LWP::UserAgent as a dep, again it is part
-      of perl-libwww-perl. -->
-      <xref linkend="perl-module-build"/>
-      <xref linkend="perl-parse-recdescent"/>
-      <xref linkend="perl-perlio-utf8_strict"/>
-      <!-- Mozilla::CA should not be needed when using system certificates -->
-      <xref linkend="perl-regexp-common"/>
-      <xref linkend="perl-sort-key"/>
-      <xref linkend="perl-text-bibtex"/>
-      <xref linkend="perl-text-csv"/>
-      <!-- perl-text-csv_xs is a recommended dependency for perl-text-csv -->
-      <xref linkend="perl-text-roman"/>
-      <!-- Unicode-Collate usually needs to be latest when biber is released,
-        core perl is usually older. To read the core version, look at
-        /usr/lib/perl5/5.xx.y/x86_64-linux-thread-multi/Unicode/Collate.pm -->
-      <xref linkend="perl-unicode-collate"/>
-      <!-- Unicode::GCstring is part of Unicode::LineBreak -->
-      <xref linkend="perl-unicode-linebreak"/>
-      <!-- Unicode::Normalize is part of core perl, found in
-        /usr/lib/perl5/5.xx.y/x86_64-linux-thread-multi/Unicode/Normalize.pm -->
-      <!-- perl-xml-libxml is a dependency of perl-xml-libxml-simple -->
-      <xref linkend="perl-xml-libxml-simple"/>
-      <xref linkend="perl-xml-libxslt"/>
-      <xref linkend="perl-xml-writer"/>
-      <!-- untarring biblatex requires that the texmf directories already exist -->
-      <!--
-      <xref linkend="texlive"/>
-      (or <xref linkend="tl-installer"/>, but for that you can use
-       <command>tlmgr update</command>)
-      -->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (required for the test suite)</bridgehead>
-    <para role="recommended">
-      <xref linkend="perl-file-which"/> and
-      <xref linkend="perl-test-differences"/>
-    </para>
-
-    <note>
-      <para>
-        It is possible to install all missing dependencies automatically. You
-        must first install <xref linkend="perl-module-build"/> using <xref
-        linkend="perl-auto-install"/>. Then run <command>perl
-        ./Build.PL</command> and when it prompts you, become the &root; user
-        and run <command>./Build installdeps</command> - this will use CPAN
-        and as noted above it will use Mozilla::CA instead of using system
-        certificates.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Biber</title>
-
-    <!-- https://github.com/plk/biber/commit/d9e9617 -->
-    <!--
-    <para>
-      Fix an issue building this package with Perl 5.36 or later:
-    </para>
-
-<screen><userinput remap="pre">sed 's/undef$/&amp;;/' -i lib/Biber/Section.pm</userinput></screen>
--->
-    <para>
-      Install <application>Biber</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>perl ./Build.PL &amp;&amp;
-./Build</userinput></screen>
-
-    <para>
-      To test the results, enter: <command>./Build test</command>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-<!--
-<screen role="root"><userinput>tar -xf ../biblatex-&biblatex-version;.tds.tgz -C /opt/texlive/&texlive-year;/texmf-dist &amp;&amp;
-texhash &amp;&amp;
--->
-<screen role="root"><userinput>./Build install</userinput></screen>
-<!-- Editor note: As for any ./Build type perl module, use destdir=
-     after the command for DESTDIR. -->
-
-<!--<para>
-      The corresponding version of <application>biblatex</application> is
-      a separate project.  The tarball is pre-packaged for untarring
-      into the <filename class="directory">texmf-dist</filename>
-      directory. Install it as the &root; user:
-    </para>
-
-<screen role="root"><userinput>tar -C $TEXLIVE_PREFIX/texmf-dist -xf ../biblatex-&biblatex-version;.tds.tgz</userinput></screen>-->
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>tar -xf biblatex-&biblatex-version;.tds.tar.gz -C
-      /opt/texlive/&texlive-year;/texmf-dist</command>:
-      this installs the new <application>biblatex</application> files over those
-      installed by <application>texlive</application>.
-    </para>
-
-    <para>
-      <command>texhash</command> : this updates the file hash tables (otherwise
-      known as the file name database).
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>biber</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/perl5/site_perl/5.*{,/&lt;arch&gt;-linux/auto}/Biber</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="biber-prog">
-        <term><command>biber</command></term>
-        <listitem>
-          <para>
-            is used for producing bibliographies in LaTeX documents
-          </para>
-          <indexterm zone="biber biber-prog">
-            <primary sortas="b-biber">biber</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/typesetting/dvisvgm.xml
===================================================================
--- pst/typesetting/dvisvgm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- This can be accessed via https://dvisvgm.de/Downloads/
-       NOT via the tags at github - those use autogen.sh -->
-  <!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        "bd2f4e747f1d090ae623e6ebd7c6a5e8">
-  <!ENTITY dvisvgm-size          "2.8 MB">
-  <!-- for dvisvgm-3.22 on top of TL2023, 7 MB for program,
-       a few KB for bigger dvisvgm.1 and the PDF man page was not updated.
-       For a DESTDIR this would be 313 MB and 45 MB. -->
-  <!ENTITY dvisvgm-buildsize     "268 MB (net 7 MB installed after overwriting files in $TEXLIVE_PREFIX/texmf-dist/, add 948 MB for the tests)">
-  <!ENTITY dvisvgm-time          "0.8 SBU (add 0.5 SBU for the tests, both using parallelism=4)">
-]>
-
-<sect1 id="dvisvgm" xreflabel="dvisvgm-&dvisvgm-version;">
-  <?dbhtml filename="dvisvgm.html"?>
-
-
-  <title>dvisvgm-&dvisvgm-version;</title>
-
-  <indexterm zone="dvisvgm">
-    <primary sortas="a-dvisvgm">dvisvgm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dvisvgm</title>
-
-    <para>
-      The <application>dvisvgm</application> package converts DVI, EPS and
-      PDF files to SVG format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dvisvgm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dvisvgm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dvisvgm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dvisvgm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dvisvgm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dvisvgm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">dvisvgm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- EDITORS: the docs say it needs clipper, but it uses an internal
-       modified version and cannot be built with system clipper -->
-      <xref linkend="brotli"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="potrace"/>, and
-      <xref linkend="texlive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="woff2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/> with
-      <xref linkend="xmlto"/> and
-      <xref linkend="libxslt"/> (see command explanations),
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink> (with the above) and
-      <!-- version checked for dvisvgm-2.9, 0.7.3 is mentioned in the
-           news and is the latest version at 2020-03-21
-           maybe change to 'a recent version' if that releases faster -->
-      <ulink url="https://github.com/Cyan4973/xxHash/releases/latest">xxHash</ulink>
-      (the current version is included in the tarball)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dvisvgm</title>
-
-<!-- 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
- Can also be tested with texlive including tikz
- https://www.linuxfromscratch.org/~ken/tex-testfiles/ https://www.linuxfromscratch.org/~ken/
- Or, use use it to convert first or specified page(s) of a PDF to SVG - see the man page
--->
-
-   <!-- symlink for kpathsea moved to texlive so that if it already exists for
-   evince from a previous year it will be recreated -->
-
-    <para>
-      The test suite 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 <filename>Makefile.in</filename>
-      file.
-    </para>
-
-    <para>
-      Install <application>dvisvgm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.in         &amp;&amp;
-./configure                                     \
-    --bindir=$TEXLIVE_PREFIX/bin/${TEXARCH}     \
-    --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man \
-    --with-kpathsea=$TEXLIVE_PREFIX             &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!-- This is now done in Texlive
-    <para>
-      <command>ln -svf $TEXLIVE_PREFIX/lib/libkpathsea.so /usr/lib</command>:
-      Without this, the program will not link correctly,
-    </para>
--->
-<!-- The autoreconf command is not used above anymore.
-    <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>
--->
-
-    <!-- EDITORS: the doc target to rebuild the manpage (make man) is not
-      recognised unless invoked from the doc directory (unlike make pdf which
-      can be invoked from top-level but needs dblatex), and I see no utility
-      in explaining how to regenerate it. ken -->
-    <para>
-      <parameter>--with-kpathsea=$TEXLIVE_PREFIX</parameter>: This allows
-      the build system to find the headers for <filename
-      class="libraryfile">kpathsea</filename>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dvisvgm
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dvisvgm-prog">
-        <term><command>dvisvgm</command></term>
-        <listitem>
-          <para>
-            converts DVI, EPS and PDF files to the SVG format
-          </para>
-          <indexterm zone="dvisvgm dvisvgm-prog">
-            <primary sortas="b-dvisvgm">dvisvgm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: t/typesetting/tex-path.xml
===================================================================
--- pst/typesetting/tex-path.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="tex-path" xreflabel="Setting the PATH for TeX Live">
-  <?dbhtml filename="tex-path.html"?>
-
-
-  <title>Setting the PATH for TeX Live</title>
-
-  <para>
-    Upstream prefers to install in <filename
-    class="directory">/usr/local</filename> but the BLFS editors regard that as
-    inconvenient, and think using <filename
-    class="directory">/opt/texlive</filename> is more appropriate. Originally
-    BLFS used a full binary install to bootstrap the source install, so the
-    same prefix is used for both.
-  </para>
-
-  <para>
-    Before starting to build TeX Live, set up your PATH so
-    that the system can properly find the files.  If you set up your login
-    scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
-    the needed paths by creating the
-    <filename>texlive.sh</filename> script. The programs are always
-    installed in an &lt;ARCH&gt;-linux subdirectory and on 32-bit x86 this is
-    always i386-linux. For x86_64 and i?86 we can generate this as $TEXARCH:
-  </para>
-
-  <note>
-    <para>
-      If upgrading from a previous year's version, you should manually
-      edit <filename>texlive.sh</filename> to ensure that the version for
-      the year you wish to use is the only TeX present (some people need to
-      keep multiple years available to ensure there are no regressions in
-      their documents).
-    </para>
-  </note>
-
-<!-- EOF should NOT be in double quotes, we want it to evaluate $TEXARCH -->
-<!-- this is also in texlive.xml -->
-   <para>Now, create the texlive.sh script as the &root; user:</para>
-
-<screen role="root"><userinput>TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/')
-
-cat &gt; /etc/profile.d/texlive.sh &lt;&lt; EOF
-<literal># Begin texlive setup
-TEXLIVE_PREFIX=/opt/texlive/&texlive-year;
-export TEXLIVE_PREFIX
-
-pathappend \$TEXLIVE_PREFIX/texmf-dist/doc/info INFOPATH
-pathappend \$TEXLIVE_PREFIX/bin/$TEXARCH
-
-TEXMFCNF=\$TEXLIVE_PREFIX/texmf-dist/web2c
-export TEXMFCNF
-
-# End texlive setup</literal>
-EOF
-
-unset TEXARCH</userinput></screen>
-
-  <note>
-    <para>
-      The standard INFOPATH path are specified above to
-      ensure they are included.  If they are already set in the boot script
-      procedure, the pathappend function will ensure duplicates are
-      removed, so including them here will do no harm.
-    </para>
-  </note>
-
-  <note>
-    <para>
-      The backslashes before the dollar signs in the script above are to
-      facilitate a copy/paste operation. The backslashes should not
-      appear in the actual script.
-    </para>
-  </note>
-
-  <para>
-    The new paths can be immediately activated by running:
-  </para>
-
-<screen><userinput>source /etc/profile</userinput></screen>
-
-  <para>
-    You should now proceed either to <xref linkend="tl-installer"/> for
-    a binary installation of texlive, or to <xref linkend="texlive"/> to begin
-    installing from source.
-  </para>
-
-</sect1>
Index: t/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,591 +1,0 @@
-<!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;
-
-  <!-- utah -->
-  <!ENTITY texlive-download-http "https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-download-ftp  " ">
-  <!ENTITY texlive-md5sum        "1da2f08e3ba4a3708870dd088c1d6823">
-  <!ENTITY texlive-size          "67 MB">
-
-  <!ENTITY texlive-buildsize      "9.1 GB including the additional download and the tests, 8.3 GB installed">
-  <!ENTITY texlive-time           "4.6 SBU including the additional download and the tests, building with parallelism=4">
-
-  <!-- utah -->
-  <!ENTITY texlive-texmf-download-http "https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-texmf.tar.xz">
-  <!ENTITY texlive-texmf-download-ftp  " ">
-  <!ENTITY texlive-texmf-md5sum        "e67ce334dd0fddda5f4a87b4fcaaf48f">
-  <!ENTITY texlive-texmf-size          "4.0 GB">
-
-  <!ENTITY texlive-extra-download-http "https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-extra.tar.xz">
-  <!ENTITY texlive-extra-download-ftp  " ">
-  <!ENTITY texlive-extra-md5sum        "1bd045bd1673ce61bde590c10b86c6cc">
-  <!ENTITY texlive-extra-size          "1.9 MB">
-
-<!-- The following commit will change future installs so that the scripts in
-texmf-dist linked from bin/ are copied instead of symlinks.
-
-commit 0c9707142465610f0e22745a22bf8c71850cef49
-Author: Karl Berry <karl@freefriends.org>
-Date:   Tue Mar 19 22:03:22 2024 +0000
-
-    (%opts): create the generically-named output files as copies by default.
-    (@cmdline_options): allow -no-copy.
-    (help): document.
-    
-    
-    git-svn-id: svn://tug.org/texlive/trunk@70707 c570f23f-e606-0410-a88d-b1316a301751
-
-That was done to simplify the process (windows has always used copy) and will likely
-make the installed sizes somewhat bigger.
-
-There is an option \-\-no-copy for updmap.pl, unclear if that can be used here,
-and it might have been removed by next year. -->
-]>
-
-
-<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
-  <?dbhtml filename="texlive.html"?>
-
-
-  <title>texlive-&texlive-version;-source</title>
-
-  <indexterm zone="texlive">
-    <primary sortas="a-texlive">texlive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live from source</title>
-
-    <note>
-      <para>
-        According to <ulink url="https://www.tug.org/historic/"/> the master
-        site in France only supports ftp and rsync. Now that ftp is generally
-        deprecated, that page has links to mirrors, some of which support https,
-        e.g. in Utah and Chemnitz as well as in China. If you prefer to use a
-        different mirror from the example links here, you will need to navigate
-        to systems/historic/texlive/&texlive-year; or systems/texlive/&texlive-year;
-        as the case may be.
-        <!-- the chinese mirros do not use a 'historic' subdirectory. -->
-      </para>
-    </note>
-
-    <para>
-      Most of TeX Live can be built from source without a pre-existing
-      installation, but <application>xindy</application> (for indexing) needs
-      working versions of <command>latex</command> and
-      <command>pdflatex</command> when configure is run, and the test suite
-      and install for <command>asy</command> (for vector graphics) will fail
-      if TeX has not already been installed. Additionally,
-      <application>biber</application> is not provided within the
-      <application>texlive</application> source and the version of
-      <application>dvisvgm</application> in the
-      <application>texlive</application> tree cannot be built
-      if shared system libraries are used.
-    </para>
-
-      <para>
-      </para>
-    <para>
-      All of those packages are dealt with on their own pages and can be
-      built after installing this package. If you have not already done so, you
-      should start at <xref linkend="tex-path"/> so that the final commands to
-      initialize the new installation will be found.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&texlive-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &texlive-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &texlive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
-
-      <para>
-        Much of the texlive environment (including scripts, documentation,
-        fonts, and various other files) is not part of the source tarball.
-        You must download it separately. This will give you all of the
-        additional files which are provided by a full install of the binary
-        version, there is no realistic way to restrict which parts get
-        installed.
-      </para>
-
-      <para>
-        Because of the size of this package, it is unlikely to be mirrored by
-        BLFS mirrors.  In case of difficulty, go to http://www.ctan.org/mirrors/
-        to find a more-accessible mirror.
-      </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&texlive-texmf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-texmf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-texmf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-texmf-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-      <para>
-        The tlpdb database is shipped as a separate tarball. The
-        <command>texdoc</command> program needs a cache file derived
-        from this (and will create the cache on its first run).
-      </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&texlive-extra-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-extra-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-extra-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-extra-size;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-          "&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TeX Live from source Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <!-- text for recommended libraries -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texrecommendlibs.xml"/>
-
-<!-- the following ensures jhalfs will set paths before running texlive -->
-
-    <para role="recommended">
-      Furthermore, the instructions below assume you are using the layout
-      described in <xref linkend="tex-path"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- text for optional deps -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texoptional.xml"/>
-
-    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
-    <!-- text for runtime deps, shared with tl-installer -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TeX Live</title>
-
-    <para>
-      Install TeX Live by running the following commands:
-    </para>
-
-    <caution>
-      <para>
-        If you wish to upgrade to current <application>texlive</application>
-        on an older system where extra packages (<application>asymptote</application>,
-        <!-- Ken: comment biber - usually a new texyear has brought a new version
-        but not so far for 2024. Looking at what it installs it is only perl
-        modules and their man pages so those ought to still exist after the
-        previous year's texlive has been removed.
-        <application>biber</application>, -->
-                                          <application>dvisvgm</application>, or
-        <application>xindy</application>) have been installed, you will need to
-        reinstall those as well as fixing up your <literal>PATH</literal> for
-        <literal>$TEXLIVE_PREFIX</literal>.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        A successful install requires some texlive
-        commands to be run as the root user, so we will export the TEXARCH
-        variable to let <systemitem class="username">root</systemitem> use it.
-      </para>
-    </note>
-
-    <para>
-      Now, as a normal user:
-    </para>
-
-<!-- if a patch for the source is needed, this should go between the export
-	ande configure. But keeping it there as a commented line adds too much vertical space.
-    patch -Np1 -i ../texlive-&texlive-version;-source-security_fix-1.patch &amp;&amp;-->
-<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;
-
-mkdir texlive-build &amp;&amp;
-cd    texlive-build &amp;&amp;
-
-../configure -C                                   \
-    --prefix=$TEXLIVE_PREFIX                      \
-    --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH         \
-    --datarootdir=$TEXLIVE_PREFIX                 \
-    --includedir=$TEXLIVE_PREFIX/include          \
-    --infodir=$TEXLIVE_PREFIX/texmf-dist/doc/info \
-    --libdir=$TEXLIVE_PREFIX/lib                  \
-    --mandir=$TEXLIVE_PREFIX/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                            \
-    --with-banner-add=" - BLFS" &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
-      <!-- https://github.com/rrthomas/libpaper/issues/43 -->
-      One test <filename>psutils.test</filename> is known to fail if
-      using system libpaper because TeX Live includes old versions of both
-      <application>psutils</application> and <application>libpaper</application>
-      which result in a difference in the final decimal places of the psresize
-      test. The <application>libpaper</application> developer does not think
-      this is significant.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- Editors, you can run 'make texlinks' in a DESTDIR by passing
-DESTDIR=some/where -->
-<screen role="root"><userinput>make install-strip &amp;&amp;
-make texlinks      &amp;&amp;
-mkdir -pv                                $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
-install -v -m644 ../texk/tests/TeXLive/* $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
-tar -xf ../../texlive-&texlive-version;-extra.tar.xz -C $TEXLIVE_PREFIX/tlpkg --strip-components=2</userinput></screen>
-
-    <note>
-      <para>
-        Only run <command>make texlinks</command> once. If it is rerun,
-        it can change all the program symlinks so that they point to
-        themselves and are useless.
-      </para>
-    </note>
-
-    <para>
-      Now install the additional files as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- if texmf does not need to be patched, remove &amp;&amp; from first line,
- close userinput, screen, comment pushd, patch, popd -->
-<screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C $TEXLIVE_PREFIX --strip-components=1</userinput></screen>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user,
-      initialize the new system (the command <command>fmtutil-sys
-      --all</command> will produce
-      a <emphasis>lot</emphasis> of output):
-    </para>
-
-<!-- Editors, fmtutil-sys can apparently only be run on
-a real install, as root.  But mktexlsr can be run in a DESTDIR with
-cd /YOUR/TEXMF/ROOT ; ls -LAR ./ >ls-R -->
-
-<screen role="root"><userinput>mktexlsr &amp;&amp;
-fmtutil-sys --all</userinput></screen>
-
-    <para>
-      To allow <xref linkend="evince"/> or <xref linkend="dvisvgm"/> to
-      link to <filename class="libraryfile">libkpathsea.so</filename>,
-      as the &root; user (re)create a symlink from
-      <filename class="directory">/usr/lib</filename>:
-    </para>
-
-<screen role="root"><userinput>ln -svf $TEXLIVE_PREFIX/lib/libkpathsea.so{,.6} /usr/lib</userinput></screen>
-
-    <note>
-      <para>
-        TeX Live does not include the source for ConTeXt, only the items that
-        are at CTAN. Trying to build ConTeXt purely from source on a  BLFS
-        TeX Live system is a niche usage and looks as if it will be more trouble
-        than it is worth.
-      </para>
-
-      <para>
-        If you wish to use ConTeXt with <command>luametatex</command> (most of
-        the old MKII and MKIV code was removed from TeX Live 2023 by the ConTeXt
-        developer), starting with the binary (only installing ConTeXt, 753 MB in
-        March 2024) would probably be the easiest way to bootstrap it. The source
-        for <command>luametatex</command> can be pulled with git from <ulink
-        url="https://github.com/contextgarden/luametatex/tags">github
-        luametatex</ulink>, compiled with meson and ninja, and installed by
-        copying to the correct program directory. This should avoid having to
-        fix all the symlinks etc and also avoid including the many unrelated
-        <!-- trying to use a filename tag here is rejected within para ?? -->
-        parts of texmf-dist.
-        See comments 1 to 5 of
-        <ulink url="&blfs-ticket-root;17823">#17823</ulink>.
-      </para>
-    </note>
-
-    <para>
-      You can now proceed to <xref linkend="asymptote"/>,
-      <xref linkend="biber"/>, <xref linkend="dvisvgm"/> and / or <xref
-      linkend="xindy"/> if you wish to install them.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>-C</command>: create config.cache, this saves significant
-      time in a parallel build.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-lib.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-shared.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-system.xml"/>
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-xpdf.xml"/>-->
-
-    <para>
-      <parameter>--disable-dvisvgm</parameter>: As noted above, the shipped version
-      of dvisvgm, which has modified configuration files, cannot be built with
-      shared system libraries.
-    </para>
-
-    <para>
-      <command>make texlinks</command> : this runs the texlinks.sh script
-      to create symbolic links from formats to engines.  In
-      practice, several of the targets such as <command>xetex</command> are now
-      separate binaries and for these it will report "file already exists".
-    </para>
-
-    <para>
-      <command>tar -xf texlive-&texmf-version;-texmf.tar.xz -C $TEXLIVE_PREFIX --strip-components=1</command>:
-      the tarball contains the files for the texmf-dist directory, and because
-      of its size we do not want to waste time and space untarring it and then
-      copying the files.
-    </para>
-
-    <para>
-      <command>install -v -m644 ../texk/tests/TeXLive/*
-      $TEXLIVE_PREFIX/tlpkg/TeXLive/</command>: This puts the perl
-      modules <filename>TLConfig.pm</filename> and <filename>TLUtils.pm</filename>
-      into the directory where the binary installer puts them - it is at the
-      start of the perl @INC@ PATH within texlive when installed using the above
-      configure switches. Without these modules, texlive is unusable.
-    </para>
-
-    <para>
-      <command>mktexlsr</command>: Create an <filename>ls-R</filename> file
-      which lists what was installed - this is used by kpathsea to find files.
-    </para>
-
-    <para>
-      <command>fmtutil-sys --all</command>: This initializes the TeX formats,
-      Metafont bases and Metapost mems.
-    </para>
-
-    <para>
-      <option>--without-x</option>: use this if you do not have Xorg installed.
-    </para>
-
-    <para>
-      There are many other '--disable' or '--without' options. Some of them such
-      as <option>--without-texinfo</option> are accepted but no longer do anything,
-      others will prevent a program being built - but the far greater amount of
-      space used for the related items in texmf means there is no obvious benefit
-      from disabling a few of the programs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>libkpathsea.so,
-             libptexenc.so,
-             libsynctex.so,
-             libtexlua52.so,
-             libtexluajit.so
-        </seg>
-        <seg>$TEXLIVE_PREFIX/bin,
-             $TEXLIVE_PREFIX/include,
-             $TEXLIVE_PREFIX/lib,
-             $TEXLIVE_PREFIX/texmf-dist
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="texlive-programs">
-        <term><command>TeX&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="texlive texlive-programs">
-            <primary sortas="b-texlive-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class="libraryfile">libkpathsea.so</filename></term>
-        <listitem>
-          <para>
-            (kpathsearch) exists to look up a file in a list of directories
-            and is used by <command>kpsewhich</command>
-          </para>
-          <indexterm zone="texlive libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libptexenc">
-        <term><filename class="libraryfile">libptexenc.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Japanese pTeX (publishing TeX)
-          </para>
-          <indexterm zone="texlive libptexenc">
-            <primary sortas="c-libptexenc">libptexenc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsynctex">
-        <term><filename class="libraryfile">libsynctex.so</filename></term>
-        <listitem>
-          <para>
-            is the SyncTeX (Synchronize TeXnology) parser library
-          </para>
-          <indexterm zone="texlive libsynctex">
-            <primary sortas="c-libsynctex">libsynctex.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtexlua52">
-        <term><filename class="libraryfile">libtexlua52.so</filename></term>
-        <listitem>
-          <para>
-            provides Lua 5.2, modified for use with LuaTeX
-          </para>
-          <indexterm zone="texlive libtexlua52">
-            <primary sortas="c-libtexlua52">libtexlua52.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtexluajit">
-        <term><filename class="libraryfile">libtexluajit.so</filename></term>
-        <listitem>
-          <para>
-            provides LuaJIT, modified for use with LuaJITTeX
-          </para>
-          <indexterm zone="texlive libtexluajit">
-            <primary sortas="c-libtexluajit">libtexluajit.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tl-installer-download-http   "https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
-
-  <!ENTITY tl-installer-download-ftp    " ">
-  <!ENTITY tl-installer-md5sum          "cec36f23d7d4e1a4a2a90f77bad8e667">
-  <!ENTITY tl-installer-date             "20230313"> <!-- in the directory name -->
-  <!ENTITY tl-installer-size            "5.5 MB">
-  <!ENTITY tl-installer-buildsize        "85 MB for plain TeX, typically 2 to 4 MB for latex and later engines, 8.6 GB if everything is included">
-  <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
-<!-- The following commit will change future installs so that the scripts in
-texmf-dist linked from bin/ are copied instead of symlinks.
-
-commit 0c9707142465610f0e22745a22bf8c71850cef49
-Author: Karl Berry <karl@freefriends.org>
-Date:   Tue Mar 19 22:03:22 2024 +0000
-
-    (%opts): create the generically-named output files as copies by default.
-    (@cmdline_options): allow -no-copy.
-    (help): document.
-    
-    
-    git-svn-id: svn://tug.org/texlive/trunk@70707 c570f23f-e606-0410-a88d-b1316a301751
-
-That was done to simplify the process (windows has always used copy) and will likely
-make the installed sizes somewhat bigger.
-
-There is an option \-\-no-copy for updmap.pl, unclear if that can be used here,
-and it might have been removed by next year. -->
-]>
-
-<sect1 id="tl-installer" xreflabel="install-tl-unx">
-  <?dbhtml filename="tl-installer.html"?>
-
-
-  <title>install-tl-unx</title>
-
-  <indexterm zone="tl-installer">
-    <primary sortas="a-install-tl-unx">install-tl-unx</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live and its installer</title>
-
-    <para>
-      The <application>TeX Live</application> package is a comprehensive
-      TeX document production system.  It includes TeX, LaTeX2e, LuaLaTeX,
-      Metafont, MetaPost, BibTeX and many other programs; an extensive
-      collection of macros, fonts and documentation; and support for
-      typesetting in many different scripts from around the world.
-    </para>
-
-    <para>
-      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
-      installer are expected to work with these instructions, for so long as
-      they install to a
-      <filename class="directory">&texlive-year;/</filename> directory.
-    </para>
-
-    <para>
-      There are two reasons why you may wish to install the binaries in BLFS:
-      either you need a smaller install (e.g. at a minimum plain TeX without
-      LaTeX, ConTeXt, etc), or you wish to use <command>tlmgr</command> to
-      get updates whilst this version is supported (typically, until March of
-      the year after it was released). For the latter, you might prefer to
-      install in your <filename class="directory">/home</filename> directory
-      as an unprivileged user, and to then make corresponding changes to the
-      PATH in your <filename>~/.bashrc</filename> or equivalent.
-    </para>
-
-    <note>
-      <para>
-        If you wish to use ConTeXt with <command>luametatex</command> (most of
-        the old MKII and MKIV code was removed from TeX Live 2023 by the ConTeXt
-        developer), using the binary is probably the easiest option. The source
-        no-longer ships with TeX Live and is poorly adapted to building with
-        systems except those running Mac and Windows. See comments 1 to 5 of
-        <ulink url="&blfs-ticket-root;17823">#17823</ulink>.
-      </para>
-    </note>
-
-    <!-- editors: latex-test-20240320.tar.xz at ~/ken/tex-testfiles and the
-    ABOUT.pdf now deal with specifying which collections are needed when using
-    binary texlive. Please do not sign off this package without at least
-    testing asy to ensure that the symlinks are as needed. Please also be aware
-    that removing a collection might leave huge backups in tlpkg/backups -->
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tl-installer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tl-installer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <!--Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)-->
-          Download MD5 sum: Varies frequently
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tl-installer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tl-installer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tl-installer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnupg2"/> (to validate both the initial downloads, and also
-      any updates you might later make using <command>tlmgr</command>.)
-      <xref linkend="perl-libwww-perl"/> (to use a single connection to the server,
-      which will reduce its load and speed things up.)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      The binaries are mostly linked to included static libraries or
-      general (LFS) system libraries, but a few of the programs
-      and several scripts will fail if the following packages are not present:
-    </para>
-    <para role="recommended">
-      <xref role="runtime" linkend="gs"/> is dynamically loaded by
-      the external application <ulink url="https://dvisvgm.de/">dvisvgm</ulink>,
-      which is used by <application>asy</application> when that creates SVG
-      files.
-    </para>
-    <para role="recommended">
-      <xref role="runtime" linkend="xorg7-lib"/> and
-      <xref role="runtime" linkend="libxcb"/> are needed for inimf, mf,
-      pdfclose, pdfopen and xdvi-xaw. But if you are using asy, or using a
-      <application>TeX</application> engine to create a PDF file, you will
-      need <xref role="runtime" linkend="x-window-system"/> (for PDF files,
-      this is to support a PDF viewer of your choice, for example
-       <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
-      application") from the bottom of the <application>Ncurses</application>
-      page in LFS is needed
-      for xindy.run which is used by <application>xindy</application>
-    </para> -->
-    <para role="recommended">
-      The binary version of <application>asy</application> needs
-      <xref linkend="freeglut"/>.
-    </para>
-    <para> <!-- needed, but cannot recommend :-) -->
-      The binary version of asy is linked to libGLX.so.0 from
-      <ulink url="https://gitlab.freedesktop.org/glvnd/libglvnd/">libglvnd</ulink>,
-      but installing that will break future updates of BLFS packages such as
-      <xref linkend="mesa"/>. Work around that by creating a symlink as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-    <screen role="nodump"><userinput>ln -sv libGL.so.1 /usr/lib/libGLX.so.0</userinput></screen>
-    <para role="recommended">
-    The binary versions of <application>biber</application> and
-    <application>xindy</application> are linked to <filename
-    class='libraryfile'>libcrypt.so.1</filename> from old versions
-    of <application>glibc</application>. To use these two applications, follow the
-    Note about binary-only applications in <application>libxcrypt</application> in
-    LFS to install the ABI version 1 crypt library.
-    </para>
-    <note>
-      <para>
-        As always with contributed binary software, it is possible that the
-        required dependencies may change when the installer is updated. In
-        particular, these dependencies have only been checked on x86_64.
-      </para>
-    </note>
-    <!-- text for runtime deps, shared with texlive -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Binary Installation of TeX Live</title>
-
-    <para>
-      The <application>TeX Live</application> set of programs with its
-      supporting documents, fonts, and utilities is very large.  The upstream
-      maintainers recommend placing all files in a single directory structure.
-      BLFS recommends <filename class='directory'>/opt/texlive</filename>.
-    </para>
-
-    <note>
-     <para>
-       If you have chosen to install the binary as a normal user, the directory
-       for the prefix needs to be writable by that user.  The
-       <systemitem class="username">root</systemitem> user can chown
-       <filename class="directory">/opt/texlive/2024</filename> to that
-       user before the user starts the install.<!-- Problem was reported on
-       texlive list, at least ls-R was involved and maybe other files,
-       suggestion was to remove, chown prefix, reinstall. --> If any later
-       change in that directory is made by the <systemitem
-       class="username">root</systemitem> user <emphasis>that will change the
-       ownership</emphasis> which breaks usage by normal users.
-     </para>
-    </note>
-
-    <para>
-      As with any other package, unpack the installer and change into its
-      directory, <filename class='directory'>
-        install-tl-&lt;CCYYMMDD&gt;</filename>.
-      This directory name changes when the installer is updated, so replace
-      &lt;CCYYMMDD&gt; by the correct directory name.
-    </para>
-
-    <note>
-      <para>
-        The distribution binaries installed below may use static linking
-        for general linux system libraries.  Additional libraries or
-        interpreters as specified in the dependencies section do not need to
-        be present during the install, but the programs that need them will
-        not run until their specific dependencies have been installed.
-      </para>
-
-    <!-- please keep something like this in the future -->
-      <para>
-        With all contributed binary software, there may be a mismatch between
-        the builder's toolchain and your hardware.  In most of TeX this will
-        probably not matter, but in uncommon corner cases you might hit
-        problems. For example, if your x86_64 processor does not support 3dnowext or
-        3dnow, the 2014-06-28 binary failed in conTeXt when running LuaTeX,
-        although lualatex worked, as did the i686 binaries on the same
-        machine. In such cases, the easiest solution is to install texlive
-        from source. Similarly, the x86_64 binary version of
-        <command>asy</command> runs very slowly when creating 3-D diagrams.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>TEXLIVE_INSTALL_PREFIX=/opt/texlive ./install-tl</userinput></screen>
-
-    <para>
-      This command is interactive and allows selection or modification of
-      platform, packages, directories, and other options. The full installation
-      scheme will require about 4.9 gigabytes of disk space. The time to
-      complete the download will depend on your internet connection speed
-      and the number of packages selected.
-    </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>
-      <option>./install-tl --location
-      http://mirror.aut.ac.nz/CTAN/systems/texlive/tlnet/</option>: use a
-      variation of this if you wish to use a different mirror, for example, because
-      you are in New Zealand but the installer chooses to use an Australian
-      mirror. The list of mirrors is at
-      <ulink url='https://ctan.org/mirrors/'/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>None</seg>
-        <seg>/opt/texlive</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tl-installer-programs">
-        <term><command>TeX&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="tl-installer tl-installer-programs">
-            <primary sortas="b-tl-installer-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ pst/typesetting/typesetting.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,82 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="pst-typesetting">
+<?dbhtml filename="typesetting.html" dir="pst"?>
+<title>Typesetting</title>
 
-<chapter id="pst-typesetting">
-  <?dbhtml filename="typesetting.html"?>
-
-  <title>Typesetting</title>
-
-  <para>
-    This chapter includes <application>texlive</application> applications that
-    create output equivalent to typesetting.
-  </para>
-
-  <para>
-    There are two alternative routes through this chapter:
-  </para>
-
-  <para>
-    Some people may wish to use the binary installer, either because of the
-    complexity of installing all of <application>texlive</application> from
-    source, or because they only want a part of the package, or perhaps because
-    they wish to get updates as soon as those are available (the source is only
-    updated annually, but the binaries and associated tex and sty files are
-    updated for approximately 10 months). These people should begin at <xref
-    linkend="tex-path"/> and then follow the <xref linkend="tl-installer"/>
-    instructions. After installing, they can run <command>tlmgr</command> to
-    update their system.
-  </para>
-
-  <para>
-    Most people reading BLFS will wish to build from source. BLFS used to
-    start by installing <application>install-tl-unx</application> and then
-    use that to bootstrap the build.  Nowadays, we build almost the whole
-    of <application>texlive</application> <emphasis>without</emphasis> a
-    binary install, by adding the separately-packaged texmf files into this
-    build.  For this, begin at <xref linkend="tex-path"/> then go to <xref
-    linkend="texlive"/> which will install most of
-    <application>texlive</application>, together with <emphasis>all</emphasis>
-    of the supporting files. This almost-complete install can then be used
-    to build the remaining parts of <application>texlive</application>:
-    <xref linkend="asymptote"/>, <xref linkend="biber"/> and <xref
-    linkend="xindy"/>.
-  </para>
-
-  <para>
-    Because the texmf files (including documentation, fonts, scripts and
-    supporting files) are all in one tarball, it is not practical to limit what
-    gets extracted in a sensible way  (you could exclude one or other of the
-    typesetting engines, not its many supporting files) when building from
-    source in this manner.
-  </para>
-
-  <para>
-    In either case, BLFS installs into
-    <filename class="directory">/opt/texlive/&texlive-year;</filename>.
-  </para>
-
-  <para>
-    Also, please note that texlive is released annually, and updating from the
-    previous year to the current year is no longer supported. If for some
-    reason you wish to keep versions for multiple years, for most things
-    you can mount the old or new system at /opt/texlive and fix up your
-    PATH as necessary. However doing that will not preserve any changes in
-    <filename class="directory">texmf-local</filename> and if you build
-    from source and try to run a newer version of
-    <application>biber</application> with an older version of
-    <application>biblatex</application> it is unlikely to work.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tex-path.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tl-installer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texlive.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asymptote.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="biber.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dvisvgm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xindy.xml"/>
+<para>Placeholder for a2ps, openjade, tex and latex.</para>
 
 </chapter>
Index: t/typesetting/xindy.xml
===================================================================
--- pst/typesetting/xindy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xindy-download-http "https://tug.ctan.org/support/xindy/base/xindy-&xindy-version;.tar.gz">
-  <!ENTITY xindy-download-ftp  " ">
-  <!ENTITY xindy-md5sum        "221acfeeb0f6f8388f89a59c56491041">
-  <!ENTITY xindy-size          "506 KB">
-  <!ENTITY xindy-buildsize     "15 MB">
-  <!ENTITY xindy-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xindy" xreflabel="xindy-&xindy-version;">
-  <?dbhtml filename="xindy.html"?>
-
-
-  <title>xindy-&xindy-version;</title>
-
-  <indexterm zone="xindy">
-    <primary sortas="a-xindy">xindy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xindy</title>
-
-    <para>
-      <!-- LaTeX for the system, but just latex for the command -->
-      <application>Xindy</application> is an index processor that can be used
-      to generate book-like indexes for arbitrary document-preparation systems.
-      This includes systems such as TeX and LaTeX, the roff-family, and
-      SGML/XML-based systems (e.g., HTML) that process some kind of text and
-      generate indexing information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xindy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xindy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xindy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xindy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xindy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xindy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/xindy-&xindy-version;-upstream_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xindy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clisp"/> and
-      <xref linkend="texlive"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xindy</title>
-
-    <para>
-      Install <application>xindy</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-sed -i "s/ grep -v '^;'/ awk NF/" make-rules/inputenc/Makefile.in &amp;&amp;
-
-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;
-
-./configure --prefix=$TEXLIVE_PREFIX              \
-            --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH \
-            --datarootdir=$TEXLIVE_PREFIX         \
-            --includedir=/usr/include             \
-            --libdir=$TEXLIVE_PREFIX/texmf-dist   \
-            --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man &amp;&amp;
-
-make LC_ALL=POSIX</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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "s/ grep -v '^;'/ awk NF/" ...</command>: The build
-      sorts files in latin{1..3} encodings to create latin.xdy, and unicode
-      versions of these to create utf8.xdy after using
-      <command>grep -v '^;'</command> to remove blank lines. With
-      <application>grep-2.23</application> any data not in the expected
-      encoding is treated as binary, resulting in a useless file. This
-      command uses an alternative way of removing blank lines.
-    </para>
-
-    <para>
-      <command>sed -i 's%\(indexentry\)%\1\\%' ...</command>: A regexp
-      contains <literal>indexentry{</literal> - perl has warned about the
-      unescaped left brace for some time and now treats it as illegal.
-      Change it to <literal>indexentry\{</literal>, doubling the backslash
-      for <command>sed</command>.
-    </para>
-
-    <para>
-      <command>patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch</command>:
-      <application>Xindy</application> is now maintained at CTAN. This patch
-      updates the source with some of the changes made there (but ignoring
-      changes which were only made to allow for spaces in pathnames and some trivial
-      recent changes).
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <para>
-      <parameter>--includedir=/usr/include</parameter>:
-      This parameter ensures that the <filename>kpathsea</filename>
-      headers from <xref linkend="texlive"/> will be found.
-    </para>
-
-    <para>
-      <command>make LC_ALL=POSIX</command>: with the current version of
-      <application>coreutils</application> it is essential to build
-      <application>xindy</application> in the POSIX (or C) locale because in a
-      UTF-8 locale the file <filename>latin.xdy</filename> will contain only a
-      heading and then a line '<literal>Binary file (standard input)
-      matches</literal>' instead of the many lines of
-      <application>lisp</application> merge-rule commands it ought to contain.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          tex2xindy, texindy, xindy
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $TEXLIVE_PREFIX/texmf-dist/xindy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tex2xindy">
-        <term><command>tex2xindy</command></term>
-        <listitem>
-          <para>
-            transforms a LaTeX index file into a xindy raw index file
-          </para>
-          <indexterm zone="xindy tex2xindy">
-            <primary sortas="b-tex2xindy">tex2xindy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texindy">
-        <term><command>texindy</command></term>
-        <listitem>
-          <para>
-            is a wrapper for xindy that turns on many LaTeX conventions by default
-          </para>
-          <indexterm zone="xindy texindy">
-            <primary sortas="b-texindy">texindy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xindy-prog">
-        <term><command>xindy</command></term>
-        <listitem>
-          <para>
-            creates a sorted and tagged index from a raw LaTeX index
-          </para>
-          <indexterm zone="xindy xindy">
-            <primary sortas="b-xindy">xindy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/xml/docbook-45-xml.xml
===================================================================
--- pst/xml/docbook-45-xml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,322 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 DocBook-download-http "https://www.docbook.org/xml/&docBook-45-xml-version;/docbook-xml-&docBook-45-xml-version;.zip">
-  <!ENTITY DocBook-download-ftp  " ">
-  <!ENTITY DocBook-md5sum        "03083e288e87a7e829e437358da7ef9e">
-  <!ENTITY DocBook-size          "96 KB">
-  <!ENTITY DocBook-buildsize     "1.2 MB">
-  <!ENTITY DocBook-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="DocBook" xreflabel="docbook-xml-&docBook-45-xml-version;">
-  <?dbhtml filename="docbook.html"?>
-
-
-  <title>docbook-xml-&docBook-45-xml-version;</title>
-
-  <indexterm zone="DocBook">
-    <primary sortas="a-DocBook-XML-DTD">DocBook XML DTD</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-4.5 XML DTD</title>
-
-    <para>
-      The <application>DocBook-4.5 XML DTD</application>-&docBook-45-xml-version;
-      package contains document type definitions for verification of XML data
-      files against the DocBook rule set. These are useful for structuring
-      books and software documentation to a standard allowing you to utilize
-      transformations already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&DocBook-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&DocBook-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &DocBook-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &DocBook-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &DocBook-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &DocBook-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-4.5 XML DTD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="sgml-common"/>, and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-4.5 XML DTD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook XML DTD</application> by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version; &amp;&amp;
-install -v -d -m755 /etc/xml &amp;&amp;
-cp -v -af --no-preserve=ownership docbook.cat *.dtd ent/ *.mod \
-    /usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;</userinput></screen>
-
-    <para>
-      Create (or update) and populate the <filename>/etc/xml/docbook</filename>
-      catalog file by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook ]; then
-    xmlcatalog --noout --create /etc/xml/docbook
-fi &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V&docBook-45-xml-version;//EN" \
-    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;/docbookx.dtd" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/calstblx.dtd" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/soextblx.dtd" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbpoolx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbhierx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/htmltblx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbnotnx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbcentx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbgenent.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook</userinput></screen>
-
-    <para>
-      Create (or update) and populate the
-      <filename>/etc/xml/catalog</filename> catalog file by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//ENTITIES DocBook XML" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//DTD DocBook XML" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook-4.5 XML DTD</title>
-
-    <sect3 id="docbook-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename> and
-        <filename>/etc/xml/docbook</filename>
-      </para>
-
-      <indexterm zone="DocBook docbook-config">
-        <primary sortas="e-etc-xml-docbook">/etc/xml/docbook</primary>
-      </indexterm>
-
-      <indexterm zone="DocBook docbook-config">
-        <primary sortas="e-etc-xml-catalog">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <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>
-        The above installation creates the files and updates the catalogs.
-        In order to utilize <application>DocBook XML DTD</application>
-        V&docBook-45-xml-version; when any version 4.x is requested in the System
-        Identifier, you need to add additional statements to the catalog
-        files. If you have any of the <application>DocBook XML
-        DTD</application>'s referenced below already installed on your
-        system, remove those entries from the <command>for</command> command
-        below (issue the commands as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>for DTDVERSION in 4.1.2 4.2 4.3 4.4
-do
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
-    /etc/xml/docbook
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook
-  xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog
-  xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog
-done</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>DTD, MOD and ENT files</seg>
-        <seg>/etc/xml and /usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="DTD-files">
-        <term><filename>DTD files</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="DocBook DTD-files">
-            <primary sortas="g-XML-DTD-files">XML DTD Files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="MOD-files">
-        <term><filename>MOD files</filename></term>
-        <listitem>
-          <para>
-            contain components of the document type definition that
-            are sourced into the <filename>DTD</filename> files
-          </para>
-          <indexterm zone="DocBook MOD-files">
-            <primary sortas="g-XML-MOD-files">XML MOD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ENT-files">
-        <term><filename>ENT files</filename></term>
-        <listitem>
-          <para>
-            contain lists of named character entities allowed in HTML
-          </para>
-          <indexterm zone="DocBook ENT-files">
-            <primary sortas="g-XML-ENT-files">XML entity files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 path "https://github.com/docbook/xslt10-stylesheets/releases/download/release">
-
-  <!ENTITY docbook-xsl-download-http "&path;/&docbook-xsl-version;/docbook-xsl-nons-&docbook-xsl-version;.tar.bz2">
-  <!ENTITY docbook-xsl-download-ftp  " ">
-  <!ENTITY docbook-xsl-md5sum        "2666d1488d6ced1551d15f31d7ed8c38">
-  <!ENTITY docbook-xsl-size          "22 MB">
-  <!ENTITY docbook-xsl-buildsize     "58 MB (includes installing optional documentation)">
-  <!ENTITY docbook-xsl-time          "less than 0.1 SBU">
-
-  <!ENTITY docbook-xsl-doc-download  "&path;/&docbook-xsl-version;/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
-  <!ENTITY docbook-xsl-doc-md5sum    "62375ca864fc198cb2b17d98209d0b8c">
-  <!ENTITY docbook-xsl-doc-size      "522 KB">
-]>
-
-<sect1 id="docbook-xsl"
-xreflabel="docbook-xsl-nons-&docbook-xsl-version;">
-  <?dbhtml filename="docbook-xsl.html"?>
-
-
-  <title>docbook-xsl-nons-&docbook-xsl-version;</title>
-
-  <indexterm zone="docbook-xsl">
-    <primary sortas="a-DocBook-XSL-Stylesheets">DocBook XSL
-    Stylesheets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook XSL Stylesheets</title>
-
-    <para>
-      The <application>DocBook XSL Stylesheets</application>
-      package contains XSL stylesheets. These are useful for
-      performing transformations on XML DocBook files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-xsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook-xsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-xsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-xsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook-xsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook-xsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-            "&patch-root;/docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing="compact">
-      <title>Optional documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-xsl-doc-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-xsl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-xsl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook XSL Stylesheets Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (all used at runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="apache-ant"/>
-         (to produce <quote>webhelp</quote> documents),
-      <xref role="runtime"  linkend="libxslt"/>
-         (or any other XSLT processor), to process
-          Docbook documents,
-      <xref role="runtime" linkend="ruby"/>
-         (to utilize the <quote>epub</quote> stylesheets),
-      <xref role="runtime" linkend="zip"/>
-         (to produce <quote>epub3</quote> documents), and
-      <ulink url="https://sourceforge.net/projects/saxon/files/saxon6/">
-        Saxon6
-      </ulink> and
-      <ulink url="http://xerces.apache.org/xerces2-j/">Xerces2 Java</ulink>
-         (used with <xref role="runtime" linkend="apache-ant"/>
-          to produce <quote>webhelp</quote> documents)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook XSL Stylesheets</title>
-
-    <para>
-      First, fix a problem that causes stack overflows when doing recursion:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation tarball, unpack it
-      with the following command:
-    </para>
-
-<screen><userinput>tar -xf ../docbook-xsl-doc-&docbook-xsl-version;.tar.bz2 --strip-components=1</userinput></screen>
-
-    <para>
-      BLFS does not install the required packages to run the test suite
-      and provide meaningful results.
-    </para>
-
-    <para>
-      Install <application>DocBook XSL Stylesheets</application>
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &amp;&amp;
-
-cp -v -R VERSION assembly common eclipse epub epub3 extensions fo        \
-         highlighting html htmlhelp images javahelp lib manpages params  \
-         profiling roundtrip slides template tests tools webhelp website \
-         xhtml xhtml-1_1 xhtml5                                          \
-    /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &amp;&amp;
-
-ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/VERSION.xsl &amp;&amp;
-
-install -v -m644 -D README \
-                    /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;/README.txt &amp;&amp;
-install -v -m644    RELEASE-NOTES* NEWS* \
-                    /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation tarball, install the
-      documentation by issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -v -R doc/* /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XSL Stylesheets</title>
-
-    <sect3 id="docbook-xsl-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename>
-      </para>
-
-      <indexterm zone="docbook-xsl docbook-xsl-config">
-        <primary sortas="e-etc-xml-catalog">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <note>
-        <para>
-          If you are installing the current version of docbook-xsl-nons
-          over a previous version of docbook-xsl, then remove the old
-          rewrite entries in the catalog as the <systemitem
-          class="username">root</systemitem> user:
-        </para>
-
-<screen role="nodump"><userinput>sed -i '/rewrite/d' /etc/xml/catalog</userinput></screen>
-      </note>
-
-      <para>
-        Create (or append) and populate the XML catalog file using the
-        following commands as the <systemitem
-        class="username">root</systemitem> user (both <emphasis>http</emphasis>
-        and <emphasis>https</emphasis> forms are used because upstream
-        have had both in their documentation):
-      </para>
-
-<screen role="root"><userinput>if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &amp;&amp;
-if [ ! -f /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "https://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "https://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "https://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "https://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog</userinput></screen>
-
-      <para>
-        Occasionally, you may find the need to install other versions of the
-        XSL stylesheets as some projects reference a specific version. One
-        example is BLFS-6.0, which required the 1.67.2 version. In these
-        instances you should install any other required version in its own
-        versioned directory and create catalog entries as follows (substitute
-        the desired version number for
-        <replaceable>&lt;version&gt;</replaceable>):
-      </para>
-
-<screen role="nodump"><userinput>xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/<replaceable>&lt;version&gt;</replaceable>" \
-           "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>&lt;version&gt;</replaceable>" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/<replaceable>&lt;version&gt;</replaceable>" \
-           "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>&lt;version&gt;</replaceable>" \
-    /etc/xml/catalog</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/*/*.xsl</seg>
-        <seg>/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; and
-        /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xsl-stylesheets">
-        <term><filename>XSL Stylesheets</filename></term>
-        <listitem>
-          <para>
-            are used for performing transformations on XML files
-          </para>
-          <indexterm zone="docbook-xsl xsl-stylesheets">
-            <primary sortas="g-XSL-Stylesheets">XSL Stylesheets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/xml/docbook5.xml
===================================================================
--- pst/xml/docbook5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,404 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 docbook5-download-http "https://docbook.org/xml/5.0/docbook-5.0.zip">
-  <!ENTITY docbook5-download-ftp  " ">
-  <!ENTITY docbook5-md5sum        "2411c19ed4fb141f3fa3d389fae40736">
-  <!ENTITY docbook5-size          "820 KB">
-  <!ENTITY docbook5-buildsize     "6.2 MB">
-  <!ENTITY docbook5-time          "0.1 SBU">
-]>
-
-<sect1 id="docbook5" xreflabel="docbook-xml-5.0">
-  <?dbhtml filename="docbook5.html"?>
-
-
-  <title>docbook-xml-5.0</title>
-
-  <indexterm zone="docbook5">
-    <primary sortas="a-DocBook5-XML-DTD">DocBook XML DTD and Schemas 5.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook XML DTD and Schemas 5.0</title>
-
-    <para>
-      The <application>DocBook XML DTD and Schemas</application>-5.0 package
-      contains document type definitions and schemas for verification of XML
-      data files against the DocBook rule set. These are useful for structuring
-      books and software documentation to a standard allowing you to utilize
-      transformations already written for that standard. In addition to
-      providing a DTD, version 5 introduced the RelaxNG schema and Schematron
-      rules, and is incompatible with previous versions of DocBook XML.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook XML DTD and Schemas 5.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="sgml-common"/>, and
-      <xref linkend="unzip"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook XML DTD and Schemas 5.0</title>
-
-    <para>
-      Install <application>DocBook XML DTD and Schemas</application>
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /usr/share/xml/docbook/schema/{dtd,rng,sch,xsd}/5.0 &amp;&amp;
-install -vm644  dtd/* /usr/share/xml/docbook/schema/dtd/5.0         &amp;&amp;
-install -vm644  rng/* /usr/share/xml/docbook/schema/rng/5.0         &amp;&amp;
-install -vm644  sch/* /usr/share/xml/docbook/schema/sch/5.0         &amp;&amp;
-install -vm644  xsd/* /usr/share/xml/docbook/schema/xsd/5.0</userinput></screen>
-
-    <para>
-      Create (or update) and populate the
-      <filename>/etc/xml/docbook-5.0</filename> catalog file by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook-5.0 ]; then
-    xmlcatalog --noout --create /etc/xml/docbook-5.0
-fi &amp;&amp;
-
-xmlcatalog --noout --add "public" \
-  "-//OASIS//DTD DocBook XML 5.0//EN" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "system" \
-  "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "system" \
-  "http://docbook.org/xml/5.0/dtd/docbook.dtd" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rnc/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rnc/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbook.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbook.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbook.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbook.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbookxi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbookxi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbookxi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/xi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xlink.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xlink.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xlink.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/xml.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xml.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xml.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xml.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.0/docbook.sch" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.0/docbook.sch" \
-  /etc/xml/docbook-5.0</userinput></screen>
-
-
-    <para>
-      While again as the <systemitem class="username">root</systemitem> user,
-      create the individual catalogs:
-    </para>
-
-<screen role="root"><userinput>xmlcatalog --noout --create /usr/share/xml/docbook/schema/dtd/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --add "public" \
-  "-//OASIS//DTD DocBook XML 5.0//EN" \
-  "docbook.dtd" /usr/share/xml/docbook/schema/dtd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "system" \
-  "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" \
-  "docbook.dtd" /usr/share/xml/docbook/schema/dtd/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rng" \
-  "docbook.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng" \
-  "docbook.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rng" \
-  "docbookxi.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" \
-  "docbookxi.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/sch/docbook.sch" \
-  "docbook.sch" /usr/share/xml/docbook/schema/sch/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" \
-  "docbook.sch" /usr/share/xml/docbook/schema/sch/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbook.xsd" \
-  "docbook.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbook.xsd" \
-  "docbook.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbookxi.xsd" \
-  "docbookxi.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd" \
-  "docbookxi.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xlink.xsd" \
-  "xlink.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-   "http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd" \
-   "xlink.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-   "http://docbook.org/xml/5.0/xsd/xml.xsd" \
-   "xml.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-   "http://www.oasis-open.org/docbook/xml/5.0/xsd/xml.xsd" \
-   "xml.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml</userinput></screen>
-
-    <para>
-      Create (or update) and populate the system XML catalog
-      (<filename>/etc/xml/catalog</filename>) by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-  "-//OASIS//DTD DocBook XML 5.0//EN" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateSystem" \
-  "http://docbook.org/xml/5.0/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/rng/"  \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/sch/"  \
-  "file:///usr/share/xml/docbook/schema/sch/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/xsd/"  \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/catalog.xml" \
-  /etc/xml/catalog</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XML DTD and Schemas 5.0</title>
-
-    <sect3 id="docbook5-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename> and
-        <filename>/etc/xml/docbook-5.0</filename>
-      </para>
-
-      <indexterm zone="docbook5 docbook-config">
-        <primary sortas="e-etc-xml-docbook5">/etc/xml/docbook-5.0</primary>
-      </indexterm>
-
-      <indexterm zone="docbook5 docbook-config">
-        <primary sortas="e-etc-xml-catalog5">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>DTD, RNC, RNG, SCH and XSD files</seg>
-        <seg>/etc/xml and /usr/share/xml/docbook/schema/{dtd,rng,sch,xsd}/5.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="DTD5-files">
-        <term><filename>DTD files</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="docbook5 DTD5-files">
-            <primary sortas="g-XML-DTD-files">XML DTD Files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Schema5-files">
-        <term><filename>RNC, RNG, and SCH files</filename></term>
-        <listitem>
-          <para>
-            contain the Docbook 5.0 RelaxNG, RelaxNG Compact, and Schematron
-            schema definitions
-          </para>
-          <indexterm zone="docbook5 Schema5-files">
-            <primary sortas="g-XML-Schema-files">XML Schema files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="XSD5-files">
-        <term><filename>XSD files</filename></term>
-        <listitem>
-          <para>
-            files contain DocBook-5.0 Schematron rules
-          </para>
-          <indexterm zone="docbook5 XSD5-files">
-            <primary sortas="g-XML-XSD5-files">XML Schematron rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/xml/docbook51.xml
===================================================================
--- pst/xml/docbook51.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 docbook51-download-http "https://docbook.org/xml/5.1/docbook-v5.1-os.zip">
-  <!ENTITY docbook51-download-ftp  " ">
-  <!ENTITY docbook51-md5sum        "d8bea8ddfc5743578a31cb18f9ae1f5a">
-  <!ENTITY docbook51-size          "752 KB">
-  <!ENTITY docbook51-buildsize     "8.5 MB">
-  <!ENTITY docbook51-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="docbook51" xreflabel="docbook-xml-5.1">
-  <?dbhtml filename="docbook51.html"?>
-
-
-  <title>docbook-xml-5.1</title>
-
-  <indexterm zone="docbook51">
-    <primary sortas="a-DocBook51-XML-DTD">DocBook XML Schemas 5.1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook XML Schemas 5.1</title>
-
-    <para>
-      The <application>DocBook XML Schemas</application>-5.1 package
-      contains schema files and Schematron rules for verification of XML data
-      files against the DocBook rule set. These are useful for structuring books
-      and software documentation to a standard allowing you to utilize
-      transformations already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook51-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook51-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook51-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook51-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook51-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook51-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook XML Schemas 5.1 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="sgml-common"/>, and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook XML Schemas 5.1</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook XML Schemas</application>
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /usr/share/xml/docbook/schema/{rng,sch}/5.1         &amp;&amp;
-install -m644   schemas/rng/* /usr/share/xml/docbook/schema/rng/5.1 &amp;&amp;
-install -m644   schemas/sch/* /usr/share/xml/docbook/schema/sch/5.1 &amp;&amp;
-install -m755   tools/db4-entities.pl /usr/bin                      &amp;&amp;
-install -vdm755 /usr/share/xml/docbook/stylesheet/docbook5          &amp;&amp;
-install -m644   tools/db4-upgrade.xsl \
-                /usr/share/xml/docbook/stylesheet/docbook5</userinput></screen>
-
-    <para>
-      Create (or update) and populate the
-      <filename>/etc/xml/docbook-5.1</filename> catalog file by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook-5.1 ]; then
-  xmlcatalog --noout --create /etc/xml/docbook-5.1
-fi &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rnc/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rnc/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch" \
-  /etc/xml/docbook-5.1</userinput></screen>
-
-
-    <para>
-      While again as the <systemitem class="username">root</systemitem> user,
-      create the individual catalogs:
-    </para>
-
-<screen role="root"><userinput>xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbook.schemas/rng" \
-  "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbook.schemas/rng" \
-  "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbookxi.schemas/rng" \
-  "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbookxi.schemas/rng" \
-  "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/5.1/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/sch/docbook.schemas/sch" \
-  "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/sch/docbook.schemas/sch" \
-  "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/5.1/catalog.xml</userinput></screen>
-
-    <para>
-      Create (or update) and populate the system XML catalog
-      (<filename>/etc/xml/catalog</filename>) by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
-  xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-  "-//OASIS//DTD DocBook XML 5.1//EN" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateSystem" \
-  "http://docbook.org/xml/5.1/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/rng/"  \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/sch/"  \
-  "file:///usr/share/xml/docbook/schema/sch/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/xsd/"  \
-  "file:///usr/share/xml/docbook/schema/xsd/5.1/catalog.xml" \
-  /etc/xml/catalog</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XML Schemas 5.1</title>
-
-    <sect3 id="docbook51-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename> and
-        <filename>/etc/xml/docbook-5.1</filename>
-      </para>
-
-      <indexterm zone="docbook51 docbook-config">
-        <primary sortas="e-etc-xml-docbook51">/etc/xml/docbook-5.1</primary>
-      </indexterm>
-
-      <indexterm zone="docbook51 docbook-config">
-        <primary sortas="e-etc-xml-catalog51">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>db4-entities.pl</seg>
-        <seg>RNC, RNG, SCH, and XSL files</seg>
-        <seg>/etc/xml, /usr/share/xml/docbook/stylesheets, and
-        /usr/share/xml/docbook/schema/{rng,sch}/5.1</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="db4-entries-pl">
-        <term><filename>db4-entities.pl</filename></term>
-        <listitem>
-          <para>
-            is a script to convert DocBook 4.x files to DocBook 5.1
-          </para>
-          <indexterm zone="docbook51 db4-entries-pl">
-            <primary sortas="b-db4-entries-pl">db4-entities.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Schema51-files">
-        <term><filename>RNC, RNG, and SCH files</filename></term>
-        <listitem>
-          <para>
-            contain the Docbook 5.1 RelaxNG, RelaxNG Compact, and Schematron
-            schema definitions
-          </para>
-          <indexterm zone="docbook51 Schema51-files">
-            <primary sortas="g-XML-Schema-files">XML Schema files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db4-upgrade-xsl">
-        <term><filename>db4-upgrade.xsl</filename></term>
-        <listitem>
-          <para>
-            is an XSL stylesheet to assist in conversion from DocBook 4.x files
-            to DocBook 5.1
-          </para>
-          <indexterm zone="docbook51 db4-upgrade-xsl">
-            <primary sortas="g-XSL-Stylesheets">XSL Stylesheets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/xml/itstool.xml
===================================================================
--- pst/xml/itstool.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 itstool-download-http "https://files.itstool.org/itstool/itstool-&itstool-version;.tar.bz2">
-  <!ENTITY itstool-download-ftp  " ">
-  <!ENTITY itstool-md5sum        "267a3bdc72a2d8abb1b824f2ea32ee9b">
-  <!ENTITY itstool-size          "104 KB">
-  <!ENTITY itstool-buildsize     "688 KB">
-  <!ENTITY itstool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="itstool" xreflabel="itstool-&itstool-version;">
-  <?dbhtml filename="itstool.html"?>
-
-
-  <title>itstool-&itstool-version;</title>
-
-  <indexterm zone="itstool">
-    <primary sortas="a-itstool">itstool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to itstool</title>
-
-    <para>
-      <application>Itstool</application> extracts messages from XML files
-      and outputs PO template files, then merges translations from MO files
-      to create translated XML files. It determines what to translate and how to
-       chunk it into messages using the W3C Internationalization Tag Set (ITS).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&itstool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&itstool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &itstool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &itstool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &itstool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &itstool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Itstool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="DocBook"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of itstool</title>
-
-    <para>
-      First, fix some compatibility problems with Python-3.12:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/re.sub(/re.sub(r/'         itstool.in &amp;&amp;
-sed -i 's/re.compile(/re.compile(r/' itstool.in</userinput></screen>
-
-    <para>
-      Install <application>itstool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=/usr/bin/python3 ./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-<!--
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          itstool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/itstool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="itstool-prog">
-        <term><command>itstool</command></term>
-        <listitem>
-          <para>
-            is used to create translated XML files
-          </para>
-          <indexterm zone="itstool itstool-prog">
-            <primary sortas="b-itstool">itstool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: t/xml/xml.xml
===================================================================
--- pst/xml/xml.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="pst-xml">
-  <?dbhtml filename="xml.html"?>
-
-  <title>Extensible Markup Language (XML)</title>
-
-  <para>
-    This chapter contains the DocBook XML document type definition
-    (DTD) and DocBook Stylesheets which are used to validate, transform,
-    format and publish DocBook documents.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-45-xml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook51.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-xsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="itstool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xmlto.xml"/>
-
-</chapter>
Index: t/xml/xmlto.xml
===================================================================
--- pst/xml/xmlto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xmlto-download-http "https://releases.pagure.org/xmlto/xmlto-&xmlto-version;.tar.bz2">
-  <!ENTITY xmlto-download-ftp  " ">
-  <!ENTITY xmlto-md5sum        "93bab48d446c826399d130d959fe676f">
-  <!ENTITY xmlto-size          "128 KB">
-  <!ENTITY xmlto-buildsize     "1.5 MB (with tests)">
-  <!ENTITY xmlto-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="xmlto" xreflabel="xmlto-&xmlto-version;">
-  <?dbhtml filename="xmlto.html"?>
-
-
-  <title>xmlto-&xmlto-version;</title>
-
-  <indexterm zone="xmlto">
-    <primary sortas="a-xmlto">xmlto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xmlto</title>
-
-    <para>
-      The <application>xmlto</application> package is a front-end to a XSL
-      toolchain. It chooses an appropriate stylesheet for the conversion you
-      want and applies it using an external XSLT processor. It also performs
-      any necessary post-processing.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xmlto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xmlto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xmlto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xmlto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xmlto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xmlto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xmlto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for DVI, PDF, and postscript
-    backend post-processing)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="fop"/>,
-<!--    <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink>, and -->
-      <ulink url="https://sourceforge.net/projects/dblatex/files/dblatex/">dblatex</ulink>, and
-      <ulink url="https://www.garshol.priv.no/download/xmltools/prod/PassiveTeX.html">
-      PassiveTeX</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for text backend
-    post-processing)</bridgehead>
-    <para role="optional">
-      One of
-      <xref role="runtime" linkend="Links"/>,
-      <xref role="runtime" linkend="lynx"/>,
-      <ulink url="&w3m-url;">W3m</ulink>, or
-      <ulink url="&elinks-url;">ELinks</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/xmlto"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xmlto</title>
-
-    <para>
-      Install <application>xmlto</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>LINKS="/usr/bin/links" \
-./configure --prefix=/usr &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>LINKS="/usr/bin/links"</envar>: This environment variable fixes a
-      bug causing <command>xmlto</command> to think that
-      <command>links</command> command is the same as
-      <command>elinks</command>. Setting this variable does not cause problems
-      if <xref linkend="links"/> is not installed, unless
-      you have <ulink url="http://elinks.or.cz/">ELinks</ulink> installed, and
-      wish to use it for text backend post-processing, in which case,
-      remove it.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>xmlif and xmlto</seg>
-        <seg>None</seg>
-        <seg>/usr/share/xmlto</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xmlif">
-        <term><command>xmlif</command></term>
-        <listitem>
-          <para>
-            is a conditional processing instructions for XML
-          </para>
-          <indexterm zone="xmlto xmlif">
-            <primary sortas="b-xmlif">xmlif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlto-prog">
-        <term><command>xmlto</command></term>
-        <listitem>
-          <para>
-            applies an XSL stylesheet to an XML document
-          </para>
-          <indexterm zone="xmlto xmlto-prog">
-            <primary sortas="b-xmlto">xmlto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="server-databases">
-  <?dbhtml filename="databases.html"?>
-
-  <title>Databases</title>
-
-  <para>
-    This chapter includes databases that range from single-user
-    read/write to industrial database servers with transaction support.
-    Generally, you will be sent here to satisfy dependencies to other
-    applications although building a SQL server on a base LFS system is
-    entirely possible.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upgradedb.xml"/>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="db.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lmdb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mariadb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postgresql.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sqlite.xml"/>
-
-</chapter>
Index: rver/databases/lmdb.xml
===================================================================
--- server/databases/lmdb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lmdb-download-http "https://github.com/LMDB/lmdb/archive/LMDB_&lmdb-version;.tar.gz">
-  <!ENTITY lmdb-download-ftp  " ">
-  <!ENTITY lmdb-md5sum        "9d7f059b1624d0a4d4b2f1781d08d600">
-  <!ENTITY lmdb-size          "144 KB">
-  <!ENTITY lmdb-buildsize     "4.7 MB">
-  <!ENTITY lmdb-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lmdb" xreflabel="lmdb-&lmdb-version;">
-  <?dbhtml filename="lmdb.html"?>
-
-
-  <title>lmdb-&lmdb-version;</title>
-
-  <indexterm zone="lmdb">
-    <primary sortas="a-lmdb">lmdb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lmdb</title>
-
-    <para>
-      The <application>lmdb</application> package is a fast, compact, key-value
-      embedded data store.  It uses memory-mapped files, so it has the read
-      performance of a pure in-memory database while still offering the
-      persistence of standard disk-based databases, and is only limited to the
-      size of the virtual address space
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lmdb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lmdb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lmdb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lmdb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lmdb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lmdb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lmdb</title>
-
-    <note>
-      <para>
-        This package extracts to lmdb-LMDB_&lmdb-version;.
-      </para>
-    </note>
-
-    <para>
-      Install <application>lmdb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd libraries/liblmdb &amp;&amp;
-make                 &amp;&amp;
-sed -i 's| liblmdb.a||' Makefile</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 prefix=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!--para>
-      <command>sed ... prefix ... Makefile</command>: The Makefile creates the
-      man pages directory during install if it is not present.
-      This fixes the directory location.
-    </para-->
-
-    <para>
-      <command>sed ... liblmdb.a ... Makefile</command>: The package executables
-      use a static library so it must be created.  This command suppresses installation
-      of the static library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mdb_copy, mdb_dump, mdb_load, and mdb_stat
-        </seg>
-        <seg>
-          liblmdb.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-<!--  TODO
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lmdb_copy">
-        <term><command>lmdb_copy</command></term>
-        <listitem>
-          <para>
-            A tool to copy an LMDB environment.
-          </para>
-          <indexterm zone="lmdb lmdb_copy">
-            <primary sortas="b-lmdb_copy">lmdb_copy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: rver/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-download-ftp  " ">
-  <!ENTITY mariadb-md5sum        "904693e6fb92aa8804a6cb161441b474">
-  <!ENTITY mariadb-size          "96 MB">
-  <!ENTITY mariadb-buildsize     "1.9 GB (415 MB installed)">
-  <!ENTITY mariadb-time          "8.7 SBU (with parallelism=4, add 0.3 SBU for tests)">
-]>
-
-<sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
-  <?dbhtml filename="mariadb.html"?>
-
-
-  <title>MariaDB-&mariadb-version;</title>
-
-  <indexterm zone="mariadb">
-    <primary sortas="a-MariaDB">MariaDB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MariaDB</title>
-
-    <para>
-      <application>MariaDB</application> is a community-developed fork and a
-      drop-in replacement for the <application>MySQL</application> relational
-      database management system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mariadb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mariadb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mariadb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mariadb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mariadb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mariadb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The installed size of MariaDB is 723 MB, but this can be
-        reduced by about 262 MB, if desired, by removing the <filename
-        class="directory">/usr/share/mysql/test</filename>
-        directory after installation.
-      </para>
-    </note>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch to prevent a stack smashing error when using openssl-3:
-          <ulink url="&patch-root;/mariadb-&mariadb-version;-openssl3_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libevent"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="boost"/>,
-      <xref linkend="libaio"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sphinx"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://groonga.org/">Groonga</ulink>,
-      <ulink url="https://www.phontron.com/kytea/">KyTea</ulink>,
-      <ulink url="https://sourceforge.net/projects/judy/">Judy</ulink>,
-      <ulink url="https://taku910.github.io/mecab">MeCab</ulink>,
-      <ulink url="https://msgpack.org/">MessagePack</ulink>,
-      <ulink url="https://www.mruby.org/">mruby</ulink>,
-      <ulink url="https://mariadb.com/kb/en/myrocks/">MyRocks</ulink>,
-      <ulink url="https://github.com/google/snappy">Snappy</ulink>, and
-      <!--<ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and-->
-      <ulink url="https://zeromq.org/">ZeroMQ</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MariaDB</title>
-
-    <warning>
-      <para>
-        MariaDB and MySQL cannot be installed on the same system without
-        extensive changes to the build configuration of one of the two applications.
-      </para>
-    </warning>
-
-    <para>
-      For security reasons, running the server as an unprivileged user
-      and group is strongly encouraged. Issue the following (as
-      <systemitem class="username">root</systemitem>) to create the
-      user and group:
-    </para>
-
-<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 stack smashing error introduced by openssl-3:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../mariadb-&mariadb-version;-openssl3_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>MariaDB</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release                       \
-      -DCMAKE_INSTALL_PREFIX=/usr                      \
-      -DGRN_LOG_PATH=/var/log/groonga.log              \
-      -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
-      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
-      -DINSTALL_MANDIR=share/man                       \
-      -DINSTALL_MYSQLSHAREDIR=share/mysql              \
-      -DINSTALL_MYSQLTESTDIR=share/mysql/test          \
-      -DINSTALL_PAMDIR=lib/security                    \
-      -DINSTALL_PAMDATADIR=/etc/security               \
-      -DINSTALL_PLUGINDIR=lib/mysql/plugin             \
-      -DINSTALL_SBINDIR=sbin                           \
-      -DINSTALL_SCRIPTDIR=bin                          \
-      -DINSTALL_SQLBENCHDIR=share/mysql/bench          \
-      -DINSTALL_SUPPORTFILESDIR=share/mysql            \
-      -DMYSQL_DATADIR=/srv/mysql                       \
-      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock        \
-      -DWITH_EXTRA_CHARSETS=complex                    \
-      -DWITH_EMBEDDED_SERVER=ON                        \
-      -DSKIP_TESTS=ON                                  \
-      -DTOKUDB_OK=0                                    \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      One test, test-connect, is known to fail.
-    </para>
-
-    <note><para>
-      A more extensive set of tests can be run with the following:</para>
-
-<screen remap="test"><userinput>pushd mysql-test
-./mtr --parallel <replaceable>&lt;N&gt;</replaceable> --mem --force
-popd</userinput></screen>
-
-    <para>
-      Where N is the number of tests to run in parallel.
-      Over 5400 tests are run in about 24 SBU with N=4.  A few tests
-      may fail, mainly due to character set issues.
-    </para></note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have <xref linkend="linux-pam" role="nodep"/> installed, move the
-      PAM module and configuration file installed by this package as the
-      &root; user:
-    </para>
-
-<screen role="nodump"><userinput>mv -v /usr/share/pam_use_map.so /lib/security &amp;&amp;
-mv -v /usr/share/user_map.conf /etc/security</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
-      compiling the embedded server library needed by certain applications,
-      such as <application>Amarok</application>.
-    </para>
-
-    <para>
-      <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
-      support for the complex character sets.
-    </para>
-
-    <para>
-      <parameter>-DSKIP_TESTS=ON</parameter>: This switch disables
-      tests for MariaDB Connector/C which are not supported without
-      additional setup.
-    </para>
-
-    <para>
-      <option>-DWITHOUT_SERVER=ON</option>: Use this
-      switch if you don't want the server and would like to build the client
-      only.
-    </para>
-
-    <note><para>
-      There are numerous options available to <command>cmake</command>. Check
-      the output of the <command>cmake . -LH</command> for additional
-      customization options.
-    </para></note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MySQL</title>
-
-    <sect3 id="mariadb-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mysql/my.cnf</filename> and
-        <filename>~/.my.cnf</filename>
-      </para>
-
-      <indexterm zone="mariadb mariadb-config">
-        <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
-      </indexterm>
-
-      <indexterm zone="mariadb mariadb-config">
-        <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Create basic <filename>/etc/mysql/my.cnf</filename>
-        using the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -dm 755 /etc/mysql &amp;&amp;
-cat &gt; /etc/mysql/my.cnf &lt;&lt; "EOF"
-<literal># Begin /etc/mysql/my.cnf
-
-# The following options will be passed to all MySQL clients
-[client]
-#password       = your_password
-port            = 3306
-socket          = /run/mysqld/mysqld.sock
-
-# The MySQL server
-[mysqld]
-port            = 3306
-socket          = /run/mysqld/mysqld.sock
-datadir         = /srv/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-sort_buffer_size = 512K
-net_buffer_length = 16K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all.
-skip-networking
-
-# required unique id between 1 and 2^32 - 1
-server-id       = 1
-
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 4M
-#bdb_max_lock = 10000
-
-# InnoDB tables are now used by default
-innodb_data_home_dir = /srv/mysql
-innodb_log_group_home_dir = /srv/mysql
-# All the innodb_xxx values below are the default ones:
-innodb_data_file_path = ibdata1:12M:autoextend
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-innodb_buffer_pool_size = 128M<!--
-This variable has been removed in version 10.2.2:
-innodb_additional_mem_pool_size = 2M-->
-innodb_log_file_size = 48M
-innodb_log_buffer_size = 16M
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-# End /etc/mysql/my.cnf</literal>
-EOF</userinput></screen>
-
-      <para>
-        You can now install a database and change the ownership to the
-        unprivileged user and group (perform as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &amp;&amp;
-chown -R mysql:mysql /srv/mysql</userinput></screen>
-
-      <para>
-        Further configuration requires that the
-        <application>MariaDB</application> server is running. Start
-        the server using the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /run/mysqld &amp;&amp;
-mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</userinput></screen>
-
-      <para>
-        A default installation does not set up a password for the
-        administrator, so use the following command as the <systemitem
-        class="username">root</systemitem> user to set one.
-      </para>
-
-<screen role="root"><userinput>mysqladmin -u root password</userinput></screen>
-
-      <para>
-        Configuration of the server is now finished. Shut the server
-        down using the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="mariadb-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        Install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/mysql</filename> init
-        script</phrase>
-        <phrase revision="systemd"><filename>mysqld.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package as
-        the <systemitem class="username">root</systemitem> user to start the
-        <application>MariaDB</application> server during system boot-up.
-      </para>
-
-      <indexterm zone="mariadb mariadb-init">
-        <primary sortas="f-mysql">mysql</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-mysql</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>make install-mysqld</userinput></screen>
-
-      <note>
-        <para>
-          If you have an existing database already and this
-          installation of binaries was just an upgrade to a newer
-          version, check the upstream documentation for upgrading. It
-          is recommended to run:
-          <screen role="nodump"><userinput>mariadb-upgrade</userinput></screen>
-        </para>
-      </note>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
-          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-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-slap, mariadb-test, mariadb-test-embedded,
-          mariadb-tzinfo-to-sql, mariadb-upgrade, mariadb-waitpid,
-          mariadb_config,
-          mbstream, msql2mysql, my_print_defaults, myisamchk,
-          myisam_ftdump, myisamlog, myisampack, mysql_config, mytop, perror,
-          replace, resolve_stack_dump, resolveip, sst_dump, wsrep_sst_common,
-          wsrep_sst_mariabackup, wsrep_sst_mysqldump, and wsrep_sst_rsync
-        </seg>
-        <seg>
-          libmariadbclient.a, libmariadb.so, libmariadbd.so, libmysqlclient.a,
-          libmysqlclient_r.a (symbolic links to libmariadbclient.a),
-          libmysqld.{so,a}, libmysqlservices.a,
-          and several under /usr/lib/mysql/plugin/
-        </seg>
-        <seg>
-          /etc/mysql,
-          /usr/{include,lib,share}/mysql,
-          /usr/share/groonga{-normalizer-mysql}, and
-          /usr/share/doc/mariadb-&mariadb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-
-    <para>
-      There are several symlinks from mysql* to their mariadb
-      counterparts. These are maintained for compatibility.
-    </para>
-
-<!--
-    <para>
-      Descriptions of all the programs and libraries would be several
-      pages long. Instead, consult the man pages
-      or the online documentation at <ulink
-      url="https://mariadb.com/kb/en/mariadb-documentation/"/>.
-    </para>
--->
-    <para>
-      The <application>Perl</application> DBI modules must be installed
-      for some of the <application>MariaDB</application> support programs to
-      function properly.
-    </para>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aria_chk-mariadb">
-        <term><command>aria_chk</command></term>
-        <listitem>
-          <para>
-            is used to check, repair, optimize, sort and get information
-            about Aria tables
-          </para>
-          <indexterm zone="mariadb aria_chk-mariadb">
-            <primary sortas="b-aria_chk-mariadb">aria_chk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aria_dump_log-mariadb">
-        <term><command>aria_dump_log</command></term>
-        <listitem>
-          <para>
-            is a tool to dump the contents of Aria log pages
-          </para>
-          <indexterm zone="mariadb aria_dump_log-mariadb">
-            <primary sortas="b-aria_dump_log-mariadb">aria_dump_log</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aria_ftdump-mariadb">
-        <term><command>aria_ftdump</command></term>
-        <listitem>
-          <para>
-            displays full-text index information
-          </para>
-          <indexterm zone="mariadb aria_ftdump-mariadb">
-            <primary sortas="b-aria_ftdump-mariadb">aria_ftdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aria_pack-mariadb">
-        <term><command>aria_pack</command></term>
-        <listitem>
-          <para>
-            is a tool to generate compressed, read-only Aria tables
-          </para>
-          <indexterm zone="mariadb aria_pack-mariadb">
-            <primary sortas="b-aria_pack-mariadb">aria_pack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aria_read_log-mariadb">
-        <term><command>aria_read_log</command></term>
-        <listitem>
-          <para>
-            displays Aria log file contents
-          </para>
-          <indexterm zone="mariadb aria_read_log-mariadb">
-            <primary sortas="b-aria_read_log-mariadb">aria_read_log</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aria_s3_copy-mariadb">
-        <term><command>aria_s3_copy</command></term>
-        <listitem>
-          <para>
-            copies an aria table to and from AWS S3
-          </para>
-          <indexterm zone="mariadb aria_s3_copy-mariadb">
-            <primary sortas="b-aria_s3_copy-mariadb">aria_s3_copy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="galera_new_cluster-mariadb">
-         <term><command>galera_new_cluster</command></term>
-         <listitem>
-           <para>
-             bootstraps a new Galera cluster
-           </para>
-           <indexterm zone="mariadb galera_new_cluster-mariadb">
-             <primary sortas="b-galera_new_cluster-mariadb">galera_new_cluster</primary>
-           </indexterm>
-         </listitem>
-      </varlistentry>
-
-      <varlistentry id="galera_recovery-mariadb">
-        <term><command>galera_recovery</command></term>
-        <listitem>
-          <para>
-            recovers data from a Galera cluster
-          </para>
-          <indexterm zone="mariadb galera_recovery-mariadb">
-             <primary sortas="b-galera_recovery-mariadb">galera_recovery</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="innochecksum-mariadb">
-        <term><command>innochecksum</command></term>
-        <listitem>
-          <para>
-            prints checksums for InnoDB files
-          </para>
-          <indexterm zone="mariadb innochecksum-mariadb">
-            <primary sortas="b-innochecksum-mariadb">innochecksum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariabackup-mariadb">
-        <term><command>mariabackup</command></term>
-        <listitem>
-          <para>
-            is an open source backup tool for InnoDB and XtraDB
-          </para>
-          <indexterm zone="mariadb mariabackup-mariadb">
-            <primary sortas="b-mariabackup-mariadb">mariabackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-mariadb">
-        <term><command>mariadb</command></term>
-        <listitem>
-          <para>
-             is a simple SQL shell with input line editing capabilities
-          </para>
-          <indexterm zone="mariadb mariadb-mariadb">
-            <primary sortas="b-mariadb-mariadb">mariadb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadbd-mariadb">
-        <term><command>mariadbd</command></term>
-        <listitem>
-          <para>
-            is the MySQL server daemon
-          </para>
-          <indexterm zone="mariadb mariadbd-mariadb">
-            <primary sortas="b-mariadbd-mariadb">mariadbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-access-mariadb">
-        <term><command>mariadb-access</command></term>
-        <listitem>
-          <para>
-            checks the access privileges for a host name, user name, and
-            database combination
-          </para>
-          <indexterm zone="mariadb mariadb-access-mariadb">
-            <primary sortas="b-mariadb-access-mariadb">mariadb-access</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-admin-mariadb">
-        <term><command>mariadb-admin</command></term>
-        <listitem>
-          <para>
-            is a client for performing administrative operations
-          </para>
-          <indexterm zone="mariadb mariadb-admin-mariadb">
-            <primary sortas="b-mariadb-admin-mariadb">mariadb-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-binlog-mariadb">
-        <term><command>mariadb-binlog</command></term>
-        <listitem>
-          <para>
-            reads binary log files
-          </para>
-          <indexterm zone="mariadb mariadb-binlog-mariadb">
-            <primary sortas="b-mariadb-binlog-mariadb">mariadb-binlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-check-mariadb">
-        <term><command>mariadb-check</command></term>
-        <listitem>
-          <para>
-            performs table maintenance: It checks, repairs, optimizes,
-            or analyzes tables
-          </para>
-          <indexterm zone="mariadb mariadb-check-mariadb">
-            <primary sortas="b-mariadb-check-mariadb">mariadb-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-client-test-mariadb">
-        <term><command>mariadb-client-test</command></term>
-        <listitem>
-          <para>
-            is used for testing aspects of the MySQL client API that cannot be
-            tested using mysqltest and its test language
-          </para>
-          <indexterm zone="mariadb mariadb-client-test-mariadb">
-            <primary sortas="b-mariadb-client-test-mariadb">mariadb-client-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-client-test-embedded-mariadb">
-        <term><command>mariadb-client-test-embedded</command></term>
-        <listitem>
-          <para>
-            is a tool to test the client API for the embedded server
-          </para>
-          <indexterm zone="mariadb mariadb-client-test-embedded-mariadb">
-            <primary sortas="b-mariadb-client-test-embedded-mariadb">mariadb-client-test-embedded</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-conv-mariadb">
-        <term><command>mariadb-conv</command></term>
-        <listitem>
-          <para>
-            converts character sets for use with MariaDB
-          </para>
-          <indexterm zone="mariadb mariadb-conv-mariadb">
-            <primary sortas="b-mariadb-conv-mariadb">mariadb-conv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-convert-table-format-mariadb">
-        <term><command>mariadb-convert-table-format</command></term>
-        <listitem>
-          <para>
-            converts the tables in a database to use a particular storage
-            engine
-          </para>
-          <indexterm zone="mariadb mariadb-convert-table-format-mariadb">
-            <primary sortas="b-mariadb-convert-table-format-mariadb">mariadb-convert-table-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadbd-multi-mariadb">
-        <term><command>mariadbd-multi</command></term>
-        <listitem>
-          <para>
-            is designed to manage several mysqld processes that listen for
-            connections on different Unix socket files and TCP/IP ports
-          </para>
-          <indexterm zone="mariadb mariadbd-multi-mariadb">
-            <primary sortas="b-mariadbd-multi-mariadb">mariadbd-multi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadbd-safe-mariadb">
-        <term><command>mariadbd-safe</command></term>
-        <listitem>
-          <para>
-             is the recommended way to start a mysqld server on Unix
-             and NetWare
-          </para>
-          <indexterm zone="mariadb mariadbd-safe-mariadb">
-            <primary sortas="b-mariadbd-safe-mariadb">mariadbd-safe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-dump-mariadb">
-        <term><command>mariadb-dump</command></term>
-        <listitem>
-          <para>
-            is a backup program
-          </para>
-          <indexterm zone="mariadb mariadb-dump-mariadb">
-            <primary sortas="b-mariadb-dump-mariadb">mariadb-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-dumpslow-mariadb">
-        <term><command>mariadb-dumpslow</command></term>
-        <listitem>
-          <para>
-            parses MySQL slow query log files and prints a summary of their
-            contents
-          </para>
-          <indexterm zone="mariadb mariadb-dumpslow-mariadb">
-            <primary sortas="b-mariadb-dumpslow-mariadb">mariadb-dumpslow</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="mariadb-embedded-mariadb">
-        <term><command>mariadb-embedded</command></term>
-        <listitem>
-          <para>
-            is a MySQL client statically linked to
-            libmariadbd
-          </para>
-          <indexterm zone="mariadb mariadb-embedded-mariadb">
-            <primary sortas="b-mariadbd-embedded-mariadb">mariadbd-embedded</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-find-rows-mariadb">
-        <term><command>mariadb-find-rows</command></term>
-        <listitem>
-          <para>
-            reads files containing SQL statements and extracts statements that
-            match a given regular expression or that contain USE db_name or
-            SET statements
-          </para>
-          <indexterm zone="mariadb mariadb-find-rows-mariadb">
-            <primary sortas="b-mariadb-find-rows-mariadb">mariadb-find-rows</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-fix-extensions-mariadb">
-        <term><command>mariadb-fix-extensions</command></term>
-        <listitem>
-          <para>
-            converts the extensions for MyISAM (or ISAM) table files to
-            their canonical forms
-          </para>
-          <indexterm zone="mariadb mariadb-fix-extensions-mariadb">
-            <primary sortas="b-mariadb-fix-extensions-mariadb">mariadb-fix-extensions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-hotcopy-mariadb">
-        <term><command>mariadb-hotcopy</command></term>
-        <listitem>
-          <para>
-            locks the table, flushes the table and then performs a copy of
-            the database
-          </para>
-          <indexterm zone="mariadb mariadb-hotcopy-mariadb">
-            <primary sortas="b-mariadb-hotcopy-mariadb">mariadb-hotcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-import-mariadb">
-        <term><command>mariadb-import</command></term>
-        <listitem>
-          <para>
-            reads a range of data formats, and inserts the data into a
-            database
-          </para>
-          <indexterm zone="mariadb mariadb-import-mariadb">
-            <primary sortas="b-mariadb-import-mariadb">mariadb-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-install-db-mariadb">
-        <term><command>mariadb-install-db</command></term>
-        <listitem>
-          <para>
-            initializes the MySQL data directory and creates the system
-            tables that it contains, if they do not exist
-          </para>
-          <indexterm zone="mariadb mariadb-install-db-mariadb">
-            <primary sortas="b-mariadb-install-db-mariadb">mariadb-install-db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-ldb-mariadb">
-        <term><command>mariadb-ldb</command></term>
-        <listitem>
-          <para>
-            is the RocksDB tool
-          </para>
-          <indexterm zone="mariadb mariadb-ldb-mariadb">
-            <primary sortas="b-mariadb-ldb-mariadb">mariadb-ldb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-plugin-mariadb">
-        <term><command>mariadb-plugin</command></term>
-        <listitem>
-          <para>
-            is a utility that enables MySQL administrators to manage which
-            plugins a MySQL server loads
-          </para>
-          <indexterm zone="mariadb mariadb-plugin-mariadb">
-            <primary sortas="b-mariadb-plugin-mariadb">mariadb-plugin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-secure-installation-mariadb">
-        <term><command>mariadb-secure-installation</command></term>
-        <listitem>
-          <para>
-            is a tool to improve MySQL installation security
-          </para>
-          <indexterm zone="mariadb mariadb-secure-installation-mariadb">
-            <primary sortas="b-mariadb-secure-installation-mariadb">mariadb-secure-installation</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="mariadb mariadb-setpermission-mariadb">
-            <primary sortas="b-mariadb-setpermission-mariadb">mariadb-setpermission</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-show-mariadb">
-        <term><command>mariadb-show</command></term>
-        <listitem>
-          <para>
-            shows the structure of a MariaDB database
-          </para>
-          <indexterm zone="mariadb mariadb-show-mariadb">
-            <primary sortas="b-mariadb-show-mariadb">mariadb-show</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-slap-mariadb">
-        <term><command>mariadb-slap</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program designed to emulate client load for a
-            MySQL server and to report the timing of each stage
-          </para>
-          <indexterm zone="mariadb mariadb-slap-mariadb">
-            <primary sortas="b-mariadb-slap-mariadb">mariadb-slap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-test-mariadb">
-        <term><command>mariadb-test</command></term>
-        <listitem>
-          <para>
-            runs a test case against a MySQL server and optionally compares
-            the output with a result file
-          </para>
-          <indexterm zone="mariadb mariadb-test-mariadb">
-            <primary sortas="b-mariadb-test-mariadb">mariadb-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-test-embedded-mariadb">
-        <term><command>mariadb-test-embedded</command></term>
-        <listitem>
-          <para>
-            is similar to the <command>mysqltest</command> command but is built
-            with support for the libmysqld embedded server
-          </para>
-          <indexterm zone="mariadb mariadb-test-embedded-mariadb">
-            <primary sortas="b-mariadb-test-embedded-mariadb">mariadb-test-embedded</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-tzinfo-to-sql-mariadb">
-        <term><command>mariadb-tzinfo-to-sql</command></term>
-        <listitem>
-          <para>
-            loads the time zone tables in the mysql database
-          </para>
-          <indexterm zone="mariadb mariadb-tzinfo-to-sql-mariadb">
-            <primary sortas="b-mariadb-tzinfo-to-sql-mariadb">mariadb-tzinfo-to-sql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-upgrade-mariadb">
-        <term><command>mariadb-upgrade</command></term>
-        <listitem>
-          <para>
-            examines all tables in all databases for incompatibilities with
-            the current version of MySQL Server
-          </para>
-          <indexterm zone="mariadb mariadb-upgrade-mariadb">
-            <primary sortas="b-mariadb-upgrade-mariadb">mariadb-upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb-waitpid-mariadb">
-        <term><command>mariadb-waitpid</command></term>
-        <listitem>
-          <para>
-            signals a process to terminate and waits for the process to exit
-          </para>
-          <indexterm zone="mariadb mariadb-waitpid-mariadb">
-            <primary sortas="b-mariadb-waitpid-mariadb">mariadb-waitpid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mariadb_config-mariadb">
-        <term><command>mariadb_config</command></term>
-        <listitem>
-          <para>
-            gets compiler flags for using the MariaDB Connector/C
-          </para>
-          <indexterm zone="mariadb mariadb_config-mariadb">
-            <primary sortas="b-mariadb_config-mariadb">mariadb_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbstream-mariadb">
-        <term><command>mbstream</command></term>
-        <listitem>
-          <para>
-            is an utility for sending InnoDB and XTraDB backups over a stream
-          </para>
-          <indexterm zone="mariadb mbstream-mariadb">
-            <primary sortas="b-mbstream-mariadb">mbstream</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msql2mysql-mariadb">
-        <term><command>msql2mysql</command></term>
-        <listitem>
-          <para>
-            is a tool to convert mSQL programs for use with MySQL
-          </para>
-          <indexterm zone="mariadb msql2mysql-mariadb">
-            <primary sortas="b-msql2mysql-mariadb">msql2mysql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="my_print_defaults-mariadb">
-        <term><command>my_print_defaults</command></term>
-        <listitem>
-          <para>
-            displays the options from option groups of option files
-          </para>
-          <indexterm zone="mariadb my_print_defaults-mariadb">
-            <primary sortas="b-my_print_defaults-mariadb">my_print_defaults</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisam_ftdump-mariadb">
-        <term><command>myisam_ftdump</command></term>
-        <listitem>
-          <para>
-            displays information about FULLTEXT indexes in MyISAM tables
-          </para>
-          <indexterm zone="mariadb myisam_ftdump-mariadb">
-            <primary sortas="b-myisam_ftdump-mariadb">myisam_ftdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisamchk-mariadb">
-        <term><command>myisamchk</command></term>
-        <listitem>
-          <para>
-            gets information about your database tables or checks, repairs,
-            or optimizes them
-          </para>
-          <indexterm zone="mariadb myisamchk-mariadb">
-            <primary sortas="b-myisamchk-mariadb">myisamchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisamlog-mariadb">
-        <term><command>myisamlog</command></term>
-        <listitem>
-          <para>
-            displays MyISAM log file contents
-          </para>
-          <indexterm zone="mariadb myisamlog-mariadb">
-            <primary sortas="b-myisamlog-mariadb">myisamlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="myisampack-mariadb">
-        <term><command>myisampack</command></term>
-        <listitem>
-          <para>
-            is a tool for compressing MyISAM tables
-          </para>
-          <indexterm zone="mariadb myisampack-mariadb">
-            <primary sortas="b-myisampack-mariadb">myisampack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mysql_config-mariadb">
-        <term><command>mysql_config</command></term>
-        <listitem>
-          <para>
-            provides you with useful information for compiling your MySQL
-            client and connecting it to MySQL
-          </para>
-          <indexterm zone="mariadb mysql_config-mariadb">
-            <primary sortas="b-mysql_config-mariadb">mysql_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mytop-mariadb">
-        <term><command>mytop</command></term>
-        <listitem>
-          <para>
-            is a console-based tool for monitoring the threads and overall
-            performance of a MySQL server
-          </para>
-          <indexterm zone="mariadb mytop-mariadb">
-            <primary sortas="b-mytop-mariadb">mytop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perror-mariadb">
-        <term><command>perror</command></term>
-        <listitem>
-          <para>
-            is a utility that displays descriptions for system or storage
-            engine error codes
-          </para>
-          <indexterm zone="mariadb perror-mariadb">
-            <primary sortas="b-perror-mariadb">perror</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="replace-mariadb">
-        <term><command>replace</command></term>
-        <listitem>
-          <para>
-            is a MariaDB/MySQL extension to the SQL standard
-          </para>
-          <indexterm zone="mariadb replace-mariadb">
-            <primary sortas="b-replace-mariadb">replace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resolve_stack_dump-mariadb">
-        <term><command>resolve_stack_dump</command></term>
-        <listitem>
-          <para>
-            resolves a numeric stack dump to symbols
-          </para>
-          <indexterm zone="mariadb resolve_stack_dump-mariadb">
-            <primary sortas="b-resolve_stack_dump-mariadb">resolve_stack_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resolveip-mariadb">
-        <term><command>resolveip</command></term>
-        <listitem>
-          <para>
-            is a utility for resolving IP addresses to host names and
-            vice versa
-          </para>
-          <indexterm zone="mariadb resolveip-mariadb">
-            <primary sortas="b-resolveip-mariadb">resolveip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sst_sump-mariadb">
-        <term><command>sst_sump</command></term>
-        <listitem>
-          <para>
-            dumps the content of sst files (the format used by RocksDB)
-          </para>
-          <indexterm zone="mariadb sst_sump-mariadb">
-            <primary sortas="b-sst_sump-mariadb">sst_sump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1025 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 postgresql-download-http "https://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-download-ftp  " ">
-  <!ENTITY postgresql-md5sum        "3d19d93434666db5d33e692472915ae5">
-  <!ENTITY postgresql-size          "24 MB">
-  <!ENTITY postgresql-buildsize     "227 MB (add 43 MB for tests)">
-  <!ENTITY postgresql-time          "0.8 SBU (with parallelism=4, add 0.2 SBU for tests)">
-]>
-
-<sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
-  <?dbhtml filename="postgresql.html"?>
-
-
-  <title>PostgreSQL-&postgresql-version;</title>
-
-  <indexterm zone="postgresql">
-    <primary sortas="a-PostgreSQL">PostgreSQL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PostgreSQL</title>
-
-    <para>
-      <application>PostgreSQL</application> is an advanced
-      object-relational database management system (ORDBMS), derived
-      from the Berkeley Postgres database management system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&postgresql-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&postgresql-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &postgresql-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &postgresql-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &postgresql-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &postgresql-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PostgreSQL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/> and
-      <ulink url="https://developer.apple.com/bonjour/">Bonjour</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (To Regenerate Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="fop"/>,
-      <xref linkend="sgml-dtd"/>,
-      <xref linkend="docbook-dsssl"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="openjade"/>, and
-      <xref linkend="perl-sgmlspm"/>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/postgresql"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PostgreSQL</title>
-
-    <para>
-      For enhanced security, it is better to have a dedicated group and user
-      for running the PostgreSQL server. First, issue as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 41 postgres &amp;&amp;
-useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
-        -u 41 postgres</userinput></screen>
-
-    <note>
-      <para>
-        There are several configuration items that add additional
-        functionality with optional packages to
-        <application>PostgreSQL</application>.  Use <command>./configure
-        --help</command> to see a list.
-      </para>
-    </note>
-
-    <para>
-      Install <application>PostgreSQL</application> with the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
-
-./configure --prefix=/usr          \
-            --enable-thread-safety \
-            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      There are a number of programs in the
-      <filename class="directory">contrib/</filename> directory. If you are
-      going to run this installation as a server and wish to build some of
-      them, enter <command>make -C contrib</command> or <command>make -C
-      contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable></command> for
-      each subdirectory.
-    </para>
-
-    <para>
-      Tests must be run as an unprivileged user because they need to start a
-      temporary server and this is prevented as the root user. For the same
-      reason, you need to stop all PostgreSQL servers if any are running. If a
-      previous version of PostgreSQL is installed, it may be necessary to use
-      <command>--disable-rpath</command> with <command>configure</command> to
-      avoid failures, but <emphasis>installing the binaries created using this
-      switch is not recommended</emphasis>. To test the results, issue:
-      <command>make check</command>.
-    </para>
-
-    <note>
-      <para>If you are installing <application>PostgreSQL</application> to
-      upgrade an existing installation, there are important steps that you need
-      to follow. If the major version of the new build is greater than the
-      previous version, there is a chance that the data file format has changed.
-      new software cannot act on the existing data files. In this case, the
-      server will not start because the old programs have been overwritten, so
-      the data is unavailable until it's file format has been converted.</para>
-
-      <para>
-        Before upgrading an existing installation of PostgreSQL, check
-        the documentation for any considerations that you must keep in mind
-        during the upgrade. Note that new major versions might use a different
-        binary format in the data objects, causing potential incompatibilities.
-        For more information, check out upstream's documentation about
-        upgrading PostgreSQL here.
-        <ulink url="https://www.postgresql.org/docs/current/upgrading.html"/>.
-      </para>
-
-      <para>At this point, you may have both the old and the new binaries
-      installed on your filesystem. These binaries can be used to perform an
-      upgrade of your existing database files. For the following instructions
-      it is assumed that
-      <itemizedlist>
-        <listitem><para>The actual data files are stored in
-          <filename class="directory">/srv/pgsql/data</filename></para>
-        </listitem>
-        <listitem><para>The upgraded data files will be stored in
-          <filename class="directory">/srv/pgsql/newdata</filename></para>
-        </listitem>
-        <listitem><para>There is enough disk space to hold the actual
-          data files twice. The upgrade is not an inline upgrade but
-          it will copy the data to new database files.</para>
-        </listitem>
-      </itemizedlist>
-      </para>
-
-      <para>First, do a temporary install which makes access to the new
-      binaries much easier:</para>
-<screen role="nodump"><userinput>make DESTDIR=$(pwd)/DESTDIR install</userinput></screen>
-
-      <para>Next, create a directory which is writable by the
-      <systemitem class="username">postgres</systemitem> user, as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="nodump"><userinput>install -d -o postgres $(pwd)/DESTDIR/tmp</userinput></screen>
-
-      <para>Now, stop the existing instance of <application>PostgreSQL</application>
-      and start the upgrade process as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen revision="sysv" role="nodump"><userinput>pushd $(pwd)/DESTDIR/tmp
-/etc/rc.d/init.d/postgresql stop
-su postgres -c "../usr/bin/initdb -D /srv/pgsql/newdata"
-su postgres -c "../usr/bin/pg_upgrade \
-                    -d /srv/pgsql/data    -b /usr/bin \
-                    -D /srv/pgsql/newdata -B ../usr/bin"
-popd</userinput></screen>
-
-<screen revision="systemd" role="nodump"><userinput>pushd $(pwd)/DESTDIR/tmp
-systemctl stop postgresql
-su postgres -c "../usr/bin/initdb -D /srv/pgsql/newdata"
-su postgres -c "../usr/bin/pg_upgrade \
-                    -d /srv/pgsql/data    -b /usr/bin \
-                    -D /srv/pgsql/newdata -B ../usr/bin"
-popd</userinput></screen>
-
-      <para>At this point, your database files are available in two locations on
-      disk. The old data is located in
-      <filename class="directory">/srv/pgsql/data</filename>, and the new data
-      is in <filename class="directory">/srv/pgsql/newdata</filename>.
-      Backing up the old database files is suggested before continuing.</para>
-
-      <para>Next, remove the old database files, and rename the new data
-      directory as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="nodump"><userinput>rm -rf /srv/pgsql/data
-mv /srv/pgsql/newdata /srv/pgsql/data</userinput></screen>
-
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install      &amp;&amp;
-make install-docs</userinput></screen>
-
-    <para>
-      If you made any of the <filename class="directory">contrib/</filename>
-      programs, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>make -C contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable> install</userinput></screen>
-
-    <tip>
-      <para>
-        If you only intend to use <application>PostgreSQL</application> as a
-        client to connect to a server on another machine, your installation is
-        complete and you should not run the remaining commands.
-      </para>
-    </tip>
-
-    <para>
-      If you have upgraded an existing database, skip the rest of the
-      commands because your database is ready to use. If this is the
-      first time you install <application>PostgreSQL</application>,
-      continue with the initialization.
-    </para>
-
-    <para>
-      Initialize a database cluster with the following commands issued by the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm700 /srv/pgsql/data &amp;&amp;
-install -v -dm755 /run/postgresql &amp;&amp;
-chown -Rv postgres:postgres /srv/pgsql /run/postgresql</userinput></screen>
-
-    <para>
-      Now, initialize the database as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: This sed changes the server socket location
-      from <filename class="directory">/tmp</filename> to
-      <filename class="directory">/run/postgresql</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-thread-safety</parameter>: This switch makes the
-      client libraries thread-safe by allowing concurrent threads in
-      <filename class="libraryfile">libpq</filename> and ECPG programs to
-      safely control their private connection handles.
-    </para>
-
-    <para>
-      <option>--with-openssl</option>: builds the package  with support for
-      <application>OpenSSL</application> encrypted connections.
-    </para>
-
-    <para>
-      <option>--with-perl</option>: builds the PL/Perl server-side language.
-    </para>
-
-    <para>
-      <option>--with-python</option>: builds the PL/Python server-side
-      language. Python3 is used by default, Python2 is no longer supported.
-    </para>
-
-    <para>
-      <option>--with-tcl</option>: builds the PL/Tcl server-side language.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PostgreSQL</title>
-
-    <sect3 id="postgresql-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>$PGDATA/pg_ident.con</filename>,
-        <filename>$PGDATA/pg_hba.conf</filename>, and
-        <filename>$PGDATA/postgresql.conf</filename>
-      </para>
-
-      <indexterm zone="postgresql postgresql-config">
-        <primary sortas="e-A.PGDATA-pg_ident.con">$PGDATA/pg_indent.con</primary>
-      </indexterm>
-
-      <indexterm zone="postgresql postgresql-config">
-        <primary sortas="e-A.PGDATA-pg_hba.conf">$PGDATA/pg_hba_conf</primary>
-      </indexterm>
-
-      <indexterm zone="postgresql postgresql-config">
-        <primary sortas="e-A.PGDATA-postgresql.conf">$PGDATA/postgresql.conf</primary>
-      </indexterm>
-
-      <para>
-        The <envar>PGDATA</envar> environment variable is used to
-        distinguish database clusters from one another by setting it to
-        the value of the directory which contains the cluster desired.
-        The three configuration files exist in every <filename
-        class="directory">PGDATA/</filename> directory. Details on the
-        format of the files and the options that can be set in each can
-        be found in <filename>
-        /usr/share/doc/postgresql-&postgresql-version;/html/index.html</filename>.
-      </para>
-
-    </sect3>
-
-    <sect3  id="postgresql-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        Install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/postgresql</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>postgresql.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="postgresql postgresql-init">
-        <primary sortas="f-postgresql">postgresql</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-postgresql</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Starting the PostgreSQL Server and Creating a Sample Database</title>
-
-      <para>
-        The database server can be manually started with the following command
-        (as the <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>su - postgres -c '/usr/bin/postgres -D /srv/pgsql/data > \
-                  /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</userinput></screen>
-      <note>
-        <para>
-          If you are scripting this part, you should wait for the server to
-          start before going on, by adding for example
-          <command>sleep 2</command> after the above command.
-        </para>
-      </note>
-
-      <para>
-        The instructions below show how to create a database, add a table to
-        it, insert some rows into the table and select them, to verify that the
-        installation is working properly. Still as user <systemitem
-        class="username">root</systemitem>, issue:
-      </para>
-
-<screen role="root"><userinput>su - postgres -c '/usr/bin/createdb test' &amp;&amp;
-echo "create table t1 ( name varchar(20), state_province varchar(20) );" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Billy', 'NewYork');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Evanidus', 'Quebec');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Jesse', 'Ontario');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput></screen>
-
-      <para>
-        When you are done with testing, you can shut down the server, by
-        issuing as <systemitem class="username">root</systemitem>:
-      </para>
-
-<screen role="root"><userinput>su - postgres -c "/usr/bin/pg_ctl stop -D /srv/pgsql/data"</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>
-          clusterdb, createdb, createuser, dropdb, dropuser,
-          ecpg, initdb, pg_amcheck, pg_archivecleanup, pg_basebackup,
-          pg_checksums,
-          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_waldump, pgbench, postgres, psql, reindexdb, vacuumdb,
-          optionally, if Tcl support has been built, pltcl_delmod,
-          pltcl_listmod, pltcl_loadmod, and optionally (in contrib/) oid2name,
-          pg_standby, vacuumlo, and many others
-
-        </seg>
-        <seg>
-          libecpg.{so,a}, libecpg_compat.{so,a}, libpgcommon.a,
-          libpgcommon_shlib.a, libpgfeutils.a, libpgport.a, libpgport_shlib.a,
-          libpgtypes.{so,a}, libpq.{so,a}, various charset modules and
-          optionally programming language modules under /usr/lib/postgresql
-        </seg>
-        <seg>
-          /usr/include/{libpq,postgresql},
-          /usr/lib/postgresql,
-          /usr/share/{doc/postgresql-&postgresql-version;,postgresql}, and
-          /srv/pgsql
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="clusterdb">
-        <term><command>clusterdb</command></term>
-        <listitem>
-          <para>
-            is a utility for reclustering tables in a
-            <application>PostgreSQL</application> database
-          </para>
-          <indexterm zone="postgresql clusterdb">
-            <primary sortas="b-clusterdb">clusterdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="createdb">
-        <term><command>createdb</command></term>
-        <listitem>
-          <para>
-            creates a new <application>PostgreSQL</application>
-            database
-          </para>
-          <indexterm zone="postgresql createdb">
-            <primary sortas="b-createdb">createdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="createuser">
-        <term><command>createuser</command></term>
-        <listitem>
-          <para>
-            defines a new <application>PostgreSQL</application>
-            user account
-          </para>
-          <indexterm zone="postgresql createuser">
-            <primary sortas="b-createuser">createuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dropdb">
-        <term><command>dropdb</command></term>
-        <listitem>
-          <para>
-            removes a <application>PostgreSQL</application> database
-          </para>
-          <indexterm zone="postgresql dropdb">
-            <primary sortas="b-dropdb">dropdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dropuser">
-        <term><command>dropuser</command></term>
-        <listitem>
-          <para>
-            removes a <application>PostgreSQL</application> user account
-          </para>
-          <indexterm zone="postgresql dropuser">
-            <primary sortas="b-dropuser">dropuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ecpg">
-        <term><command>ecpg</command></term>
-        <listitem>
-          <para>
-            is the embedded SQL preprocessor
-          </para>
-          <indexterm zone="postgresql ecpg">
-            <primary sortas="b-ecpg">ecpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="initdb">
-        <term><command>initdb</command></term>
-        <listitem>
-          <para>
-            creates a new database cluster
-          </para>
-          <indexterm zone="postgresql initdb">
-            <primary sortas="b-initdb">initdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oid2name">
-        <term><command>oid2name</command></term>
-        <listitem>
-          <para>
-            resolves OIDs (Object IDs) and file nodes in a PostgreSQL data
-            directory
-          </para>
-          <indexterm zone="postgresql oid2name">
-            <primary sortas="b-oid2name">oid2name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_amcheck">
-        <term><command>pg_amcheck</command></term>
-        <listitem>
-          <para>
-            checks for corruption in one or more PostgreSQL databases
-          </para>
-          <indexterm zone="postgresql pg_amcheck">
-            <primary sortas="b-pg_amcheck">pg_amcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_archivecleanup">
-        <term><command>pg_archivecleanup</command></term>
-        <listitem>
-          <para>
-            cleans up PostgreSQL WAL (write-ahead log) archive files
-          </para>
-          <indexterm zone="postgresql pg_archivecleanup">
-            <primary sortas="b-pg_archivecleanup">pg_archivecleanup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_basebackup">
-        <term><command>pg_basebackup</command></term>
-        <listitem>
-          <para>
-            takes base backups of a running
-            <application>PostgreSQL</application> cluster
-          </para>
-          <indexterm zone="postgresql pg_basebackup">
-            <primary sortas="b-pg_basebackup">pg_basebackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_checksums">
-        <term><command>pg_checksums</command></term>
-        <listitem>
-          <para>
-            enables, disables, or checks data checksums in a
-            <application>PostgreSQL</application> database cluster
-          </para>
-          <indexterm zone="postgresql pg_checksums">
-            <primary sortas="b-pg_checksums">pg_checksums</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_config">
-        <term><command>pg_config</command></term>
-        <listitem>
-          <para>
-            retrieves <application>PostgreSQL</application> version
-            information
-          </para>
-          <indexterm zone="postgresql pg_config">
-            <primary sortas="b-pg_config">pg_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_controldata">
-        <term><command>pg_controldata</command></term>
-        <listitem>
-          <para>
-            returns information initialized during <command>initdb</command>,
-            such as the catalog version and server locale
-          </para>
-          <indexterm zone="postgresql pg_controldata">
-            <primary sortas="b-pg_controldata">pg_controldata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_ctl">
-        <term><command>pg_ctl</command></term>
-        <listitem>
-          <para>
-            controls stopping and starting the database server
-          </para>
-          <indexterm zone="postgresql pg_ctl">
-            <primary sortas="b-pg_ctl">pg_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_dump">
-        <term><command>pg_dump</command></term>
-        <listitem>
-          <para>
-            dumps database data and metadata into scripts which are used
-            to recreate the database
-          </para>
-          <indexterm zone="postgresql pg_dump">
-            <primary sortas="b-pg_dump">pg_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_dumpall">
-        <term><command>pg_dumpall</command></term>
-        <listitem>
-          <para>
-            recursively calls <command>pg_dump</command> for each
-            database in a cluster
-          </para>
-          <indexterm zone="postgresql pg_dumpall">
-            <primary sortas="b-pg_dumpall">pg_dumpall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_isready">
-        <term><command>pg_isready</command></term>
-        <listitem>
-          <para>
-            checks the connection status of a PostgreSQL server
-          </para>
-          <indexterm zone="postgresql pg_isready">
-            <primary sortas="b-pg_isready">pg_isready</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_receivewal">
-        <term><command>pg_receivewal</command></term>
-        <listitem>
-          <para>
-            is used to stream write-ahead logs from a PostgreSQL server
-          </para>
-          <indexterm zone="postgresql pg_receivewal">
-            <primary sortas="b-pg_receivewal">pg_receivewal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_recvlogical">
-        <term><command>pg_recvlogical</command></term>
-        <listitem>
-          <para>
-            controls PostgreSQL logical decoding streams
-          </para>
-          <indexterm zone="postgresql pg_recvlogical">
-            <primary sortas="b-pg_recvlogical">pg_recvlogical</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_resetwal">
-        <term><command>pg_resetwal</command></term>
-        <listitem>
-          <para>
-            resets the write-ahead log and other control information
-            of a PostgreSQL database cluster
-          </para>
-          <indexterm zone="postgresql pg_resetwal">
-            <primary sortas="b-pg_resetwal">pg_resetwal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_restore">
-        <term><command>pg_restore</command></term>
-        <listitem>
-          <para>
-            creates databases from dump files created by
-            <command>pg_dump</command>
-          </para>
-          <indexterm zone="postgresql pg_restore">
-            <primary sortas="b-pg_restore">pg_restore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_rewind">
-        <term><command>pg_rewind</command></term>
-        <listitem>
-          <para>
-            synchronizes a PostgreSQL data directory with another data
-            directory that was forked from the first one
-          </para>
-          <indexterm zone="postgresql pg_rewind">
-            <primary sortas="b-pg_rewind">pg_rewind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_standby">
-        <term><command>pg_standby</command></term>
-        <listitem>
-          <para>
-            supports the creation of a PostgreSQL warm standby server
-          </para>
-          <indexterm zone="postgresql pg_standby">
-            <primary sortas="b-pg_standby">pg_standby</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_test_fsync">
-        <term><command>pg_test_fsync</command></term>
-        <listitem>
-          <para>
-            determines the fastest wal_sync method for PostgreSQL
-          </para>
-          <indexterm zone="postgresql pg_test_fsync">
-            <primary sortas="b-pg_test_fsync">pg_test_fsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_test_timing">
-        <term><command>pg_test_timing</command></term>
-        <listitem>
-          <para>
-            measures timing overhead
-          </para>
-          <indexterm zone="postgresql pg_test_timing">
-            <primary sortas="b-pg_test_timing">pg_test_timing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_upgrade">
-        <term><command>pg_upgrade</command></term>
-        <listitem>
-          <para>
-            upgrades a PostgreSQL server instance
-          </para>
-          <indexterm zone="postgresql pg_upgrade">
-            <primary sortas="b-pg_upgrade">pg_upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_verifybackup">
-        <term><command>pg_verifybackup</command></term>
-        <listitem>
-          <para>
-            verifies the integrity of a base backup of a PostgreSQL cluster
-          </para>
-          <indexterm zone="postgresql pg_verifybackup">
-            <primary sortas="b-pg_upgrade">pg_verifybackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_waldump">
-        <term><command>pg_waldump</command></term>
-        <listitem>
-          <para>
-            displays a human-readable rendering of the write-ahead log of a
-            PostgreSQL database cluster
-          </para>
-          <indexterm zone="postgresql pg_waldump">
-            <primary sortas="b-pg_waldump">pg_waldump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgbench">
-        <term><command>pgbench</command></term>
-        <listitem>
-          <para>
-            runs a benchmark test on PostgreSQL
-          </para>
-          <indexterm zone="postgresql pgbench">
-            <primary sortas="b-pgbench">pgbench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltcl_delmod">
-        <term><command>pltcl_delmod</command></term>
-        <listitem>
-          <para>
-            is a support script used to delete a module from a
-            PL/<application>Tcl</application> table. The command
-            requires the
-            <ulink url="https://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
-            package to be installed
-          </para>
-          <indexterm zone="postgresql pltcl_delmod">
-            <primary sortas="b-pltcl_delmod">pltcl_delmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltcl_listmod">
-        <term><command>pltcl_listmod</command></term>
-        <listitem>
-          <para>
-            is a support script used to list the modules in a
-            PL/<application>Tcl</application> table. The command
-            requires the
-            <ulink url="https://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
-            package to be installed
-          </para>
-          <indexterm zone="postgresql pltcl_listmod">
-            <primary sortas="b-pltcl_listmod">pltcl_listmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltcl_loadmod">
-        <term><command>pltcl_loadmod</command></term>
-        <listitem>
-          <para>
-            is a support script used to load a module into a
-            PL/<application>Tcl</application> table. The command
-            requires the
-            <ulink url="https://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
-            package to be installed too
-          </para>
-          <indexterm zone="postgresql pltcl_loadmod">
-            <primary sortas="b-pltcl_loadmod">pltcl_loadmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postgres">
-        <term><command>postgres</command></term>
-        <listitem>
-          <para>
-            is the PostgreSQL database server
-          </para>
-          <indexterm zone="postgresql postgres">
-            <primary sortas="b-postgres">postgres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Removed in 16.0
-      <varlistentry id="postmaster">
-        <term><command>postmaster</command></term>
-        <listitem>
-          <para>
-            (deprecated, a symlink to <command>postgres</command>) is a
-            multi-user database daemon
-          </para>
-          <indexterm zone="postgresql postmaster">
-            <primary sortas="b-postmaster">postmaster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="psql">
-        <term><command>psql</command></term>
-        <listitem>
-          <para>
-            is a console based database shell
-          </para>
-          <indexterm zone="postgresql psql">
-            <primary sortas="b-psql">psql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-       <varlistentry id="reindexdb">
-        <term><command>reindexdb</command></term>
-        <listitem>
-          <para>
-            is a utility for rebuilding indexes in a database
-          </para>
-          <indexterm zone="postgresql reindexdb">
-            <primary sortas="b-reindexdb">reindexdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacuumdb">
-        <term><command>vacuumdb</command></term>
-        <listitem>
-          <para>
-            compacts databases and generates statistics for the query analyzer
-          </para>
-          <indexterm zone="postgresql vacuumdb">
-            <primary sortas="b-vacuumdb">vacuumdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacuumlo">
-        <term><command>vacuumlo</command></term>
-        <listitem>
-          <para>
-            removes orphaned large objects from a PostgreSQL database
-          </para>
-          <indexterm zone="postgresql vacuumlo">
-            <primary sortas="b-vacuumlo">vacuumlo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libecpg">
-        <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">
-            <primary sortas="c-libecpg">libecpg.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libecpg_compat">
-        <term><filename class="libraryfile">libecpg_compat.{so,a}</filename></term>
-        <listitem>
-          <para>
-            is the ecpg compatibility library
-          </para>
-          <indexterm zone="postgresql libecpg_compat">
-            <primary sortas="c-libecpg_compat">libecpg_compat.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgport">
-        <term><filename class="libraryfile">libgport.a</filename></term>
-        <listitem>
-          <para>
-            is the port-specific subsystem of the Postgres backend
-          </para>
-          <indexterm zone="postgresql libgport">
-            <primary sortas="c-libgport">libgport.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpgtypes">
-        <term><filename class="libraryfile">libpgtypes.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains functions for dealing with Postgres data types
-          </para>
-          <indexterm zone="postgresql libpgtypes">
-            <primary sortas="c-libpgtypes">libpgtypes.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpq">
-        <term><filename class="libraryfile">libpq.{so,a}</filename></term>
-        <listitem>
-          <para>
-            is the C programmer's API to Postgres
-          </para>
-          <indexterm zone="postgresql libpq">
-            <primary sortas="c-libpq">libpq.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/databases/sqlite.xml
===================================================================
--- server/databases/sqlite.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- moved to packages.ent because they are often forgotten...
-  <!ENTITY sqlite-dl-version    "3360000">
-  <!ENTITY sqlite-doc-version   "3360000">
-
-When updating, do not forget the above entities... They are anyway -->
-
-  <!ENTITY sqlite-download-http "https://sqlite.org/&sqlite-year;/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
-  <!ENTITY sqlite-download-ftp  " ">
-  <!ENTITY sqlite-md5sum        "f418272ba1d588747dcd4201018ed912">
-  <!ENTITY sqlite-size          "3.1 MB">
-  <!ENTITY sqlite-buildsize     "79 MB">
-  <!ENTITY sqlite-time          "0.4 SBU (Using parallelism=4)">
-
-  <!ENTITY sqlite-docs-download "https://sqlite.org/&sqlite-year;/sqlite-doc-&sqlite-doc-version;.zip">
-  <!ENTITY sqlite-docs-md5sum   "de799a90c24450196036ad1f497976ad">
-  <!ENTITY sqlite-docs-size     "11 MB">
-]>
-
-<sect1 id="sqlite" xreflabel="SQLite-&sqlite-version;">
-  <?dbhtml filename="sqlite.html"?>
-
-
-  <title>SQLite-&sqlite-version;</title>
-
-  <indexterm zone="sqlite">
-    <primary sortas="a-SQLite">SQLite</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SQLite</title>
-
-    <para>
-      The <application>SQLite</application> package is a software library that
-      implements a self-contained, serverless, zero-configuration, transactional
-      SQL database engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sqlite-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sqlite-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sqlite-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sqlite-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sqlite-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sqlite-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Optional Documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sqlite-docs-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sqlite-docs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sqlite-docs-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SQLite Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.thrysoee.dk/editline/">libedit</ulink> and
-      <xref linkend="unzip"/> (required to unzip the documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SQLite</title>
-
-    <para>
-      If you downloaded the optional documentation, issue the following command
-      to install the documentation into the source tree:
-    </para>
-
-<screen><userinput>unzip -q ../sqlite-doc-&sqlite-doc-version;.zip</userinput></screen>
-
-    <para>
-      Install <application>SQLite</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --disable-static  \
-            --enable-fts{4,5} \
-            CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1 \
-                      -DSQLITE_ENABLE_UNLOCK_NOTIFY=1   \
-                      -DSQLITE_ENABLE_DBSTAT_VTAB=1     \
-                      -DSQLITE_SECURE_DELETE=1"         &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>
-
-    <para>
-      If you downloaded the optional documentation, issue the following commands
-      as the <systemitem class="username">root</systemitem> user to install it:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/sqlite-&sqlite-version; &amp;&amp;
-cp -v -R sqlite-doc-&sqlite-doc-version;/* /usr/share/doc/sqlite-&sqlite-version;</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>
-      <parameter>--enable-fts{4,5}</parameter>: These switches enable
-      support for version 3, 4 and 5 of the full text search (FTS)
-      extension.  Note that the <option>--enable-fts4</option> switch
-      enables support for both FTS version 4 and FTS version 3.
-    </para>
-
-    <para>
-      <parameter>CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1 ... </parameter>:
-      Some applications require these options 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
-      url="https://www.sqlite.org/compile.html"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          sqlite3
-        </seg>
-        <seg>
-          libsqlite3.so
-        </seg>
-        <seg>
-          /usr/share/doc/sqlite-&sqlite-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sqlite3">
-        <term><command>sqlite3</command></term>
-        <listitem>
-          <para>
-            is a terminal-based front-end to the <application>SQLite</application>
-            library that can evaluate queries interactively and display the
-            results
-          </para>
-          <indexterm zone="sqlite sqlite3">
-            <primary sortas="b-sqlite3">sqlite3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsqlite3">
-        <term><filename class="libraryfile">libsqlite3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>SQLite</application> API functions
-          </para>
-          <indexterm zone="sqlite libsqlite3">
-            <primary sortas="c-libsqlite3">libsqlite3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/databases/upgradedb.xml
===================================================================
--- server/databases/upgradedb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,283 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="upgradedb" xreflabel="Upgrade Database">
-  <?dbhtml filename="upgradedb.html"?>
-
-
-  <title>Important Notes About Upgrading Database Server Software</title>
-
-    <note><para>This section is about reinstalling database software
-    when an existing database is in use.  It is not applicable for
-    initial installations or if there is no existing database for
-    the package being updated, but users should read through it
-    to become aware of issues that can arise in the future.</para></note>
-
-    <para>Let's start this chapter with a dramatic screenshot of an error that
-    really happened.  This error will not occur if you are installing database
-    software for the first time:</para>
-
-<screen>$ sudo systemctl status postgresql
--- postgresql.service - PostgreSQL database server
-     Loaded: loaded (/usr/lib/systemd/system/postgresql.service; enabled; vendor preset: enabled)
-     Active: failed (Result: exit-code) since Tue 2021-10-26 17:11:53 CDT; 2min 49s ago
-    Process: 17336 ExecStart=/usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 (code=exited, status=1/FAILURE)
-        CPU: 7ms
-
-Oct 26 17:11:53 SVRNAME systemd[1]: Starting PostgreSQL database server...
-Oct 26 17:11:53 SRVNAME postgres[17338]: 2021-10-26 17:11:53.420 CDT [17338] FATAL:
-                database files are incompatible with server
-Oct 26 17:11:53 SRVNAME postgres[17338]: 2021-10-26 17:11:53.420 CDT [17338] DETAIL:
-                The data directory was initialized by PostgreSQL version 13,
-                which is not compatible with this version 14.0.
-Oct 26 17:11:53 SRVNAME postgres[17336]: pg_ctl: could not start server
-Oct 26 17:11:53 SRVNAME postgres[17336]: Examine the log output.
-Oct 26 17:11:53 SRVNAME systemd[1]: postgresql.service: Control process exited, code=exited, status=1/FAILURE
-Oct 26 17:11:53 SRVNAME systemd[1]: postgresql.service: Failed with result 'exit-code'.
-Oct 26 17:11:53 SRVNAME systemd[1]: Failed to start PostgreSQL database server.</screen>
-
-  <para>
-    To avoid situations like this (i.e., your database server
-    software refuses to start), read the following discussion of the best way to
-    upgrade a DBMS (Database Management System).
-  </para>
-
-  <para>
-    The root cause of the error shown above was an upgrade
-    of the server software to a newer major version which left the
-    data files untouched. In this case, the administrator was able to recover
-    the DBMS without any loss of data.
-  </para>
-
-  <para>
-    Even if you are doing an initial DBMS install, read through this
-    section. It provides information about implementing backup
-    and restore procedures (or at least a strategy for creating
-    them) which will satisfy your needs and guarantee the safety
-    of your data.
-  </para>
-
-  <sect2>
-    <title>Upgrade Database Server Packages</title>
-
-    <para>
-      Database systems work on files which hold the database metadata and the
-      data itself. The internal structure of these files is optimized for use
-      by the server software. When such server software is upgraded,
-      the new software may utilize a different file format than
-      had previously been used. Sometimes the new software can
-      work with the old format as well as the new one&mdash;but without the
-      performance improvements the new format provides.
-      Other times, the new server software will
-      reformat the data files automatically after the upgrade.
-    </para>
-
-    <para>
-      Unfortunately, the most likely case is that the new server software
-      complains about out of date file formats and exits.  When this happens,
-      and you have overwritten the old server software, you may end up
-      with a broken system and lost data.
-    </para>
-
-    <para>
-       Changes in data file formats usually happen at major version changes, but
-       they can also occur at other times.  Before upgrading any DBMS
-       software, check the documentation to see if this upgrade makes changes which
-       require reformatting the database.
-    </para>
-
-    <para>
-      Of course, if you have databases with content that is not easily
-      rebuilt, it is always a good idea to create backups of the database from
-      time to time. Before upgrading the server software, you should run
-      another backup.
-    </para>
-
-    <sect3>
-      <title>Upgrade by Backup and Restore</title>
-
-      <note>
-        <para>
-          A backup is useless if there is no verified process
-          to restore the data from this backup. When running a
-          database server, you should not only create backups; you
-          should also verify that the restore process
-          really works. The time to test the restore procedure
-          is <emphasis>before</emphasis> you urgently need
-          to recover lost data.
-        </para>
-      </note>
-
-      <para>
-        Most database server software provides some basic
-        tools to create backups of your data. Usually the backups created with
-        those tools can be read by newer versions of the software (via a
-        restore tool). Using older restore tools with newer backup data is
-        a bad idea; you should <emphasis>never</emphasis> blindly assume that
-        it will work. It might, but usually it doesn't.
-      </para>
-
-      <para>
-        The easiest way to upgrade your database files is to
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Create a full database backup using the old tools.</para>
-
-          <para>This step creates an offline copy of the database files&mdash;for
-          long term archiving, for disaster recovery, or as
-          preparation for an upgrade. This offline backup consists of either (1) a full
-          one-to-one copy of the current database files, or (2) a full backup of the
-          database files from a certain point in time, plus all the journal data (that is
-          Oracle&reg; terminology, it is called "Continuous Archiving" or
-          "write ahead log (WAL)" in Postgresql) describing the
-          changes made after that point in time. This second form takes less time to create
-          (if the DB software provides this type of journaling) because you only have
-          to save the data that have changed since the last full backup was created.</para>
-
-          <para>When upgrading database server software, a full backup
-          (which can be used for subsequent incremental backups) should be
-          created; but if there is a lot of data, an incremental backup will
-          suffice. The best strategy for you depends on
-          the amount of data stored in your database (is it a few hundred table
-          rows, or is it hundreds of terabytes?). A full backup in the latter case
-          can't be done quickly.  To
-          fully protect your data, create a backup of the old
-          programs (and/or their sources) and save it, along with the data
-          files, to be certain there is a fallback solution if
-          the new software cannot read the old data.</para>
-          </listitem>
-
-          <listitem>
-            <para>Upgrade the server software</para>
-
-            <para>In this step, instructions to build the database server
-            software are executed just as they are shown in subsequent sections
-            talking about the DBMs like MariaDB or Postgresql. That is, build
-            the software as usual using BLFS instructions.</para>
-          </listitem>
-
-          <listitem>
-            <para>Restore the database by using the new tools.</para>
-
-            <para>To restore the data, the tools of the newly installed server
-            software should be used. During the restoration process, the new
-            tools will create and/or upgrade the data files in the format the
-            new software requires. It is assumed that newer software is capable of
-            reading old data.</para>
-          </listitem>
-          </itemizedlist>
-
-      <para>
-        Since you already have a backup procedure in place (and you
-        have tested your restore procedure, right?), this might
-        be the easiest way to upgrade as you can use your well known
-        processes to upgrade just as you always do&mdash;at least in terms
-        of the backup and restore.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Upgrade the Database Files by Using System Tools</title>
-
-      <para>
-        Some database systems (for instance Postgresql) provide
-        a tool which can reformat (upgrade) the existing database
-        files to the new format.
-        If you need to restore from a backup (for example, running
-        the upgrade tool failed) you will have to reinstall the old software
-        to recover your data.
-      </para>
-
-      <para>
-        Even though the reformatting tools might work as advertised,
-        you should create a full backup before running them. A failure
-        could cause serious damage to the database.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Notes for Specific DBMS</title>
-
-    <sect3>
-      <title>PostgreSQL</title>
-
-      <!-- might add some advanced notes for the DBMS here -->
-
-      <para>Upstream documentation for Backup/Restore:
-        <ulink url="https://www.postgresql.org/docs/current/backup.html"/>
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>MariaDB</title>
-
-      <!-- might add some advanced notes for the DBMS here -->
-
-      <para>Upstream documentation for Backup/Restore:
-        <ulink url="https://mariadb.com/kb/en/backup-and-restore-overview/"/>
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Sqlite</title>
-
-      <!-- might add some advanced notes for the DBMS here -->
-
-      <para>Do not underestimate <application>Sqlite</application>. It is a
-      feature-rich DBMS. The main difference from the two big players above is
-      that Sqlite does not provide access via a network API. Sqlite databases
-      are always stored on the machine running the program which
-      uses the database. The manipulation of data content is done via API calls
-      to library functions directly within the program.</para>
-
-      <para>In the upstream documentation you may find the following
-      useful:</para>
-
-      <para>Documentation of the sqlite3 command line tool:
-        <ulink url="https://www.sqlite.org/cli.html"/>
-      </para>
-
-      <para>Documentation of backup API calls:
-        <ulink url="https://www.sqlite.org/backup.html"/>
-      </para>
-
-      <para>Unfortunately, there is no dedicated chapter in the
-      upstream documentation talking about backup/restore, but
-      there are several articles about it on the
-      Internet. Here is an example.</para>
-
-      <para>Documentation for Backup/Restore:
-        <ulink url="https://database.guide/backup-sqlite-database/"/>
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>LMDB</title>
-
-      <!-- might add some advanced notes for the DBMS here -->
-
-      <para>Like <application>Sqlite</application>, this
-      software acts on local database files; there is no
-      network interface.</para>
-
-      <para>The relevant resources to back up/restore a LMDB database
-      are the man pages for <filename>mdb_dump</filename> and its
-      counterpart <filename>mdb_load</filename>.</para>
-
-    </sect3>
-  </sect2>
-
-</sect1>
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/courier.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="courier" xreflabel="courier">
+<?dbhtml filename="courier.html" dir="server"?>
+<title>courier</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/mail/courier/courier.ent
===================================================================
--- server/mail/courier/courier.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/courier/courier.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY courier SYSTEM "../courier.xml">
Index: rver/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,433 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dovecot-download-http
-  "https://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
-  <!ENTITY dovecot-download-ftp  " ">
-  <!ENTITY dovecot-md5sum        "8961c3dafd845a25fd55e7903ffc3755">
-  <!ENTITY dovecot-size          "7.5 MB">
-  <!ENTITY dovecot-buildsize     "237 MB">
-  <!ENTITY dovecot-time          "4.8 SBU">
-]>
-
-<sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">
-  <?dbhtml filename="dovecot.html"?>
-
-
-  <title>Dovecot-&dovecot-version;</title>
-
-  <indexterm zone="dovecot">
-    <primary sortas="a-Dovecot">Dovecot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Dovecot</title>
-
-    <para>
-      <application>Dovecot</application> is an Internet Message Access Protocol
-      (IMAP) and Post Office Protocol (POP) server, written primarily with
-      security in mind. <application>Dovecot</application> aims to be
-      lightweight, fast and easy to set up as well as highly configurable and
-      easily extensible with plugins.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dovecot-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dovecot-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dovecot-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dovecot-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dovecot-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dovecot-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dovecot-&dovecot-version;-openssl3_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dovecot-&dovecot-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Dovecot Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="clucene"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libunwind"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="xfsprogs"/>,
-      <ulink url="https://cassandra.apache.org/">Cassandra</ulink>,
-      <ulink url="https://github.com/shibukawa/snowball_py">stemmer</ulink> and
-      <ulink url="https://libsodium.gitbook.io/doc/">libsodium</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dovecot</title>
-
-    <para>
-      There should be dedicated users and groups for unprivileged Dovecot
-      processes and for processing users' logins. Issue the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 42 dovecot &amp;&amp;
-useradd -c "Dovecot unprivileged user" -d /dev/null -u 42 \
-        -g dovecot -s /bin/false dovecot &amp;&amp;
-groupadd -g 43 dovenull &amp;&amp;
-useradd -c "Dovecot login user" -d /dev/null -u 43 \
-        -g dovenull -s /bin/false dovenull</userinput></screen>
-
-    <para>
-      First, apply a patch to fix problems with OpenSSL-3:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../dovecot-&dovecot-version;-openssl3_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, apply a patch to fix a security vulnerability:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../dovecot-&dovecot-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Dovecot</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>CPPFLAGS="-I/usr/include/tirpc" \
-LDFLAGS+=" -ltirpc" \
-./configure --prefix=/usr                          \
-            --sysconfdir=/etc                      \
-            --localstatedir=/var                   \
-            --with-systemd=no                      \
-            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>CPPFLAGS="-I/usr/include/tirpc" \
-LDFLAGS+=" -ltirpc" \
-./configure --prefix=/usr                          \
-            --sysconfdir=/etc                      \
-            --localstatedir=/var                   \
-            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
-            --disable-static                       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make -k check</command>. <!-- An error
-      may be reported if <xref linkend="valgrind"/> is present when running
-      the test.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>CPPFLAGS=... LDFLAGS+=...</command>: build with libtirpc
-      instead of the recently removed RPC code provided by GlibC.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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>:
-      This switch is used to set the correct installation directory for
-      systemd units.
-    </para>
-    -->
-
-    <para>
-      <option>--with-ldap</option>: This switch enables
-      <application>OpenLDAP</application> authentication support.
-    </para>
-
-    <para>
-      <option>--with-pgsql</option>: This switch enables
-      <application>PostgreSQL</application> database support.
-    </para>
-
-    <para>
-      <option>--with-mysql</option>: This switch enables
-      <application>MySQL</application> database support.
-    </para>
-
-    <para>
-      <option>--with-sqlite</option>: This switch enables
-      <application>SQLite</application> database support.
-    </para>
-
-    <para>
-      <option>--with-lucene</option>: This switch enables
-      <application>CLucene</application> full text search support.
-    </para>
-
-    <para>
-      <option>--with-lua</option>: This switch enables
-      <application>Lua</application> plugin support. This includes
-      a mail and push notification plugin.
-    </para>
-
-<!--
-    <para>
-      <option>- -with-krb5</option>: This switch enables
-      GSSAPI authentication support.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Dovecot</title>
-
-    <sect3 id="dovecot-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/dovecot/dovecot.conf</filename>,
-        <filename>/etc/dovecot/conf.d/*</filename>, and
-        <filename>/etc/dovecot/local.conf</filename>
-      </para>
-
-      <indexterm zone="dovecot dovecot-config">
-        <primary sortas="e-etc-dovecot-dovecot.conf">/etc/dovecot/dovecot.conf</primary>
-      </indexterm>
-      <indexterm zone="dovecot dovecot-config">
-        <primary sortas="e-etc-dovecot-conf.d">/etc/dovecot/conf.d/*</primary>
-      </indexterm>
-      <indexterm zone="dovecot dovecot-config">
-        <primary sortas="e-etc-dovecot-local.conf">/etc/dovecot/local.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Copy an example configuration, which you can use as a starting point:
-      </para>
-
-<screen role="root"><userinput>cp -rv /usr/share/doc/dovecot-&dovecot-version;/example-config/* /etc/dovecot</userinput></screen>
-
-      <para>
-        The following configuration is a simple proof of concept with IMAP
-        service using local users for authentication and mailbox location.
-        Reading files from the <filename class="directory">conf.d</filename>
-        directory is commented out since the included example configuration
-        requires <application>OpenSSL</application> and
-        <application>Linux PAM</application>.
-      </para>
-
-<screen role="root"><userinput>sed -i '/^\!include / s/^/#/' /etc/dovecot/dovecot.conf &amp;&amp;
-chmod -v 1777 /var/mail &amp;&amp;
-cat &gt; /etc/dovecot/local.conf &lt;&lt; "EOF"
-<literal>protocols = imap
-ssl = no
-# The next line is only needed if you have no IPv6 network interfaces
-listen = *
-mail_location = mbox:~/Mail:INBOX=/var/mail/%u
-userdb {
-  driver = passwd
-}
-passdb {
-  driver = shadow
-}</literal>
-EOF</userinput></screen>
-
-      <para>
-        You will definitely want to read the official documentation at <ulink
-        url="https://wiki2.dovecot.org/"/> if you plan to use
-        <application>Dovecot</application> in a production environment.
-      </para>
-
-    </sect3>
-
-    <sect3 id="dovecot-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want the <application>Dovecot</application>
-        server to start automatically when the system is booted, install the
-        <filename>/etc/rc.d/init.d/dovecot</filename> init script included in
-        the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>dovecot</command>
-        daemon at boot, enable the previously installed systemd unit with the
-        following command:
-      </para>
-
-      <indexterm zone="dovecot dovecot-init">
-        <primary sortas="f-dovecot">dovecot</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-dovecot</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable dovecot</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>
-          doveadm, doveconf, dovecot, dovecot-sysreport, and dsync (symbolic link)
-        </seg>
-        <seg>
-          various internal plugins in
-          <filename class="directory">/usr/lib/dovecot</filename>
-        </seg>
-        <seg>
-          /etc/dovecot,
-          /usr/{include,lib,libexec,share}/dovecot and
-          /usr/share/doc/dovecot-&dovecot-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="doveadm">
-        <term><command>doveadm</command></term>
-        <listitem>
-          <para>
-            is the <application>Dovecot</application> administration tool
-          </para>
-          <indexterm zone="dovecot doveadm">
-            <primary sortas="b-doveadm">doveadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doveconf">
-        <term><command>doveconf</command></term>
-        <listitem>
-          <para>
-            is <application>Dovecot</application>'s configuration dumping
-            utility
-          </para>
-          <indexterm zone="dovecot doveconf">
-            <primary sortas="b-doveconf">doveconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dovecot-prog">
-        <term><command>dovecot</command></term>
-        <listitem>
-          <para>
-            is the IMAP and POP server
-          </para>
-          <indexterm zone="dovecot dovecot-prog">
-            <primary sortas="b-dovecot">dovecot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dovecot-sysreport">
-        <term><command>dovecot-sysreport</command></term>
-        <listitem>
-          <para>
-            prints system information that is useful to the Dovecot developers
-            when submitting bug reports upstream
-          </para>
-          <indexterm zone="dovecot dovecot-sysreport">
-            <primary sortas="b-dovecot-sysreport">dovecot-sysreport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dsync">
-        <term><command>dsync</command></term>
-        <listitem>
-          <para>
-            is <application>Dovecot</application>'s mailbox synchronization
-            utility
-          </para>
-          <indexterm zone="dovecot dsync">
-            <primary sortas="b-dsync">dsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ server/mail/exim.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,736 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="exim" xreflabel="exim">
+<?dbhtml filename="exim.html" dir="server"?>
+<title>exim</title>
 
-  <!ENTITY exim-download-http   "https://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.xz">
-
-  <!ENTITY exim-download-ftp    " ">
-  <!-- if above don't work, please use one of the official mirrors at
-       http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "3fd68ae37720767619dd305b047fe8f9">
-  <!ENTITY exim-size            "1.9 MB">
-  <!ENTITY exim-buildsize       "18 MB">
-  <!ENTITY exim-time            "0.1 SBU">
-
-  <!ENTITY exim-daemon-version  "&exim-version;-2">
-]>
-
-<sect1 id="exim" xreflabel="Exim-&exim-version;">
-  <?dbhtml filename="exim.html"?>
-
-
-  <title>Exim-&exim-version;</title>
-
-  <indexterm zone="exim">
-    <primary sortas="a-Exim">Exim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exim</title>
-
-    <para>
-      The <application>Exim</application> package contains a Mail
-      Transport Agent written by the University of Cambridge, released
-      under the GNU Public License.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exim-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exim-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exim-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exim-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exim-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exim-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Additional formats of the documentation (text-based docs are
-          shipped with the sources) can be downloaded by following the links
-          shown at <ulink url="https://exim.org/docs.html"/>.
-        </para>
-      </listitem>
-<!-- Applied in 4.96
-      <listitem>
-        <para>
-          Required patch when building with <application>PAM</application> support:
-          <ulink url="&patch-root;/exim-&exim-version;-call_pam-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch to build with openssl-3:
-          <ulink url="&patch-root;/exim-&exim-version;-openssl3_fix-1.patch"/>
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exim Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnsl"/>,
-      <xref linkend="perl-file-fcntllock"/> and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://sourceforge.net/projects/tdb">TDB</ulink>
-      (alternative to GDBM, built in LFS),
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="libidn"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/> or
-      <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="x-window-system"/>,
-      <ulink url="https://github.com/heimdal/heimdal">Heimdal GSSAPI</ulink>,
-      <ulink url="https://github.com/shevek/libspf2/">libspf2</ulink>, and
-      <ulink url="http://www.trusteddomain.org/opendmarc/">OpenDMARC</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exim</title>
-
-    <para>
-      Before building <application>Exim</application>, as the
-      <systemitem class="username">root</systemitem> user you should create
-      the group and user <systemitem class="username">exim</systemitem> which
-      will run the <command>exim</command> daemon:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 31 exim &amp;&amp;
-useradd -d /dev/null -c "Exim Daemon" -g exim -s /bin/false -u 31 exim</userinput></screen>
-
-    <para>
-      Configure <application>Exim</application> with the following commands:
-    </para>
-
-<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'    \
-    -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
-    -e 's,^EXIM_USER.*$,EXIM_USER=exim,'           \
-    -e '/# USE_OPENSSL/s,^#,,' src/EDITME > Local/Makefile &amp;&amp;
-
-printf "USE_GDBM = yes\nDBMLIB = -lgdbm\n" >> Local/Makefile
-</userinput></screen>
-
-    <para>
-      If you want to add <application>Linux PAM</application> support, also run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>sed -i '/# SUPPORT_PAM=yes/s,^#,,' Local/Makefile
-echo "EXTRALIBS=-lpam" >> Local/Makefile
-</userinput></screen>
-
-    <para>
-      Build <application>Exim</application> with the following command:
-    </para>
-
-<screen><userinput>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>
-
-<!-- dev note: make INSTALL_ARG=-no_chown DESTDIR=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install                                    &amp;&amp;
-install -v -m644 doc/exim.8 /usr/share/man/man8 &amp;&amp;
-
-install -vdm 755    /usr/share/doc/exim-&exim-version; &amp;&amp;
-cp      -Rv doc/*   /usr/share/doc/exim-&exim-version; &amp;&amp;
-
-ln -sfv exim /usr/sbin/sendmail                 &amp;&amp;
-install -v -d -m750 -o exim -g exim /var/spool/exim</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ... > Local/Makefile</command>: Most of
-      <application>Exim</application>'s configuration options are defined
-      in <filename>Local/Makefile</filename>, which is created from
-      the <filename>src/EDITME</filename> file. This command specifies the
-      minimum set of options. Descriptions for the options are listed below.
-    </para>
-
-    <para>
-      <command>printf ... > Local/Makefile</command>: Setting those
-      variables allows to use GDBM instead of the default Berkeley DB. Remove
-      this command if you have installed &berkeley-db;.
-    </para>
-
-    <para>
-      <parameter>BIN_DIRECTORY=/usr/sbin</parameter>: This installs all of
-      <application>Exim</application>'s binaries and scripts in
-      <filename class='directory'>/usr/sbin</filename>.
-    </para>
-
-    <para>
-      <parameter>CONFIGURE_FILE=/etc/exim.conf</parameter>: This installs
-      <application>Exim</application>'s main configuration file in
-      <filename class='directory'>/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>EXIM_USER=exim</parameter>: This tells
-      <application>Exim</application> that after the daemon no longer needs
-      <systemitem class="username">root</systemitem> privileges, the process
-      needs to hand off the daemon to the <systemitem
-      class="username">exim</systemitem> user.
-    </para>
-    <!-- obsolete: now default 
-    <para>
-      <option>SUPPORT_TLS=yes</option>: This allows to support
-      STARTTLS connections. If you use this option, you need to select
-      whether <application>OpenSSL</application> or
-      <application>GnuTLS</application> is used (see
-      <filename>src/EDITME</filename>).
-    </para>
-    -->
-    <para>
-      <parameter>USE_OPENSSL</parameter>: uncommenting
-      <option>USE_OPENSSL=yes</option> and <option>USE_OPNSSL_PC=yes</option>
-      tells the
-      build system to use <application>OpenSSL</application>, and to
-      find the needed libraries with <application>pkg-config</application>.
-    </para>
-
-    <para>
-      Uncomment <option>EXIM_MONITOR</option>: This allows building the
-      <application>Exim</application> monitor program, which requires
-      <application>X Window System</application> support, and is commented out
-      by default.
-    </para>
-
-    <para>
-      <command>ln -sfv exim /usr/sbin/sendmail</command>: Creates a link to
-      <command>sendmail</command> for applications which need it.
-      <application>Exim</application> will accept most
-      <application>Sendmail</application> command-line options.
-    </para>
-
-    <para>
-      <command>install -v -m750 -o exim -g exim /var/spool/exim</command>:
-      Since /var/spool is owned by root and this version of
-      <command>exim</command> drops
-      <systemitem class="username">root</systemitem> privileges early, to run
-      as user <systemitem class="username">exim</systemitem>, it cannot create
-      the <filename class="directory">/var/spool/exim</filename> directory. As
-      a work around, it is created manually.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Adding Additional Functionality</title>
-
-    <para>
-      To utilize some or all of the dependency packages, you'll need to
-      modify <filename>Local/Makefile</filename> to include the appropriate
-      directives and parameters to link additional libraries before you build
-      <application>Exim</application>. <filename>Local/Makefile</filename> is
-      heavily commented with instructions on how to do this. Listed below is
-      additional information to help you link these dependency packages or
-      add additional functionality.
-    </para>
-
-    <para>
-      If you wish to build and install the
-      <filename class='extension'>.info</filename> documentation, refer to
-      <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinsinfdoc"/>.
-    </para>
-
-    <para>
-      If you wish to build in Exim's interfaces for calling virus and spam
-      scanning software directly from access control lists, uncomment the
-      <option>WITH_CONTENT_SCAN=yes</option> parameter and review the
-      information found at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch45.html"/>.
-    </para>
-
-    <para>
-      To use a backend database other than <application>GDBM
-      </application>, see the instructions at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.
-    </para>
-
-    <para>
-      For SSL functionality, see the instructions at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
-      and <ulink url="
-      https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch42.html"/>.
-    </para>
-
-    <para>
-      For <application>tcpwrappers</application> functionality, see the
-      instructions at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECID27"/>.
-    </para>
-
-    <para>
-      For information about adding authentication mechanisms to the
-      build, see chapters 33&mdash;41 of <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/index.html"/>.
-    </para>
-
-    <para>
-      For information about linking <application>Linux-PAM</application>,
-      refer to the instructions <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch11.html#SECTexpcond"/>.
-    </para>
-
-    <para>
-      For information about linking database engine libraries used for
-      <application>Exim</application> name lookups, see the instructions at
-      <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch09.html"/>.
-    </para>
-
-    <para>
-      If you wish to add <application>Readline</application> support to
-      <application>Exim</application> when invoked in <quote>test
-      expansion</quote> (<option>-be</option>) mode, see the information in
-      the <option>-be</option> section of <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch05.html#id2525974"/>.
-    </para>
-
-    <para>
-      You may wish to modify the default configuration and send log files to
-      syslog instead of the default
-      <filename class='directory'>/var/spool/exim/log</filename> directory. See
-      the information at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch-log_files.html"/>.
-    </para>
-
-    <para>
-      A wealth of information can be also found at the <ulink url=
-      "https://github.com/Exim/exim/wiki">Exim Wiki</ulink>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Exim</title>
-
-    <sect3 id="exim-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/exim.conf</filename> and
-        <filename>/etc/aliases</filename>
-      </para>
-
-      <indexterm zone="exim exim-config">
-        <primary sortas="e-etc-exim.conf">/etc/exim.conf</primary>
-      </indexterm>
-
-      <indexterm zone="exim exim-config">
-        <primary sortas="e-etc-aliases">/etc/aliases</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Review the file <filename>/etc/exim.conf</filename>, and modify any
-        settings to suit your needs. Note that the default configuration
-        assumes that the <filename class="directory">/var/mail</filename>
-        directory is world writable, but has the sticky bit set. If you want
-        to use the default configuration, issue as the <systemitem
-        class="username">root</systemitem> user:
-     </para>
-
-<screen role="root"><userinput>chmod -v a+wt /var/mail</userinput></screen>
-
-      <para>
-        A default (nothing but comments) <filename>/etc/aliases</filename>
-        file is installed during the package installation if this file did not
-        exist on your system. Create the necessary aliases and start the
-        <application>Exim</application> daemon using the following commands:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
-<literal>postmaster: root
-MAILER-DAEMON: root</literal>
-EOF
-/usr/sbin/exim -bd -q15m</userinput></screen>
-
-      <note>
-        <para>
-          To protect an existing <filename>/etc/aliases</filename> file,
-          the command above appends these aliases to it. This file should be
-          checked and duplicate aliases removed, if present.
-        </para>
-      </note>
-
-      <para>
-        The <command>/usr/sbin/exim -bd -q15m</command> command starts
-        the <application>Exim</application> daemon with a 15 minute interval
-        in processing the mail queue. Adjust this parameter to suit your
-        desires.
-      </para>
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If you have built <application>Exim</application> with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following command as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/exim &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/exim
-
-auth    include system-auth
-account include system-account
-session include system-session
-
-# End /etc/pam.d/exim</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="exim-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automatically start <command>exim</command> at boot, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/exim</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>exim.service</filename>
-        unit</phrase>
-        included in the <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="exim exim-init">
-        <primary sortas="f-exim">exim</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-exim</userinput></screen>
-
-      <para revision="sysv">
-        The bootscript also starts the <application>Exim</application> daemon
-        and dispatches a queue runner process every 15 minutes. Modify the
-        <option>-q<replaceable>&lt;time interval&gt;</replaceable></option>
-        parameter in <filename>/etc/rc.d/init.d/exim</filename>, if necessary
-        for your installation.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>exicyclog, exigrep, exim, exim-&exim-daemon-version;, exim_checkaccess,
-        exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
-        eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
-        optionally, eximon, eximon.bin, and sendmail (symlink)</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/exim-&exim-version; and /var/spool/exim</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exicyclog">
-        <term><command>exicyclog</command></term>
-        <listitem>
-          <para>
-            cycles <application>Exim</application> log files
-          </para>
-          <indexterm zone="exim exicyclog">
-            <primary sortas="b-exicyclog">exicyclog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exigrep">
-        <term><command>exigrep</command></term>
-        <listitem>
-          <para>
-            searches <application>Exim</application> log files
-          </para>
-          <indexterm zone="exim exigrep">
-            <primary sortas="b-exigrep">exigrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-prog">
-        <term><command>exim</command></term>
-        <listitem>
-          <para>
-            is a symlink to the <command>exim-&exim-daemon-version;</command>
-            MTA daemon
-          </para>
-          <indexterm zone="exim exim-prog">
-            <primary sortas="b-exim">exim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-current_version">
-        <term><command>exim-&exim-daemon-version;</command></term>
-        <listitem>
-          <para>
-            is the <application>Exim</application> mail transport agent daemon
-          </para>
-          <indexterm zone="exim exim-current_version">
-            <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_checkaccess">
-        <term><command>exim_checkaccess</command></term>
-        <listitem>
-          <para>
-            states whether a given recipient address from a given host is
-            acceptable or not
-          </para>
-          <indexterm zone="exim exim_checkaccess">
-            <primary sortas="b-exim_checkaccess">exim_checkaccess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_dbmbuild">
-        <term><command>exim_dbmbuild</command></term>
-        <listitem>
-          <para>
-            creates and rebuilds <application>Exim</application> databases
-          </para>
-          <indexterm zone="exim exim_dbmbuild">
-            <primary sortas="b-exim_dbmbuild">exim_dbmbuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_dumpdb">
-        <term><command>exim_dumpdb</command></term>
-        <listitem>
-          <para>
-            writes the contents of <application>Exim</application>
-            databases to the standard output
-          </para>
-          <indexterm zone="exim exim_dumpdb">
-            <primary sortas="b-exim_dumpdb">exim_dumpdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_fixdb">
-        <term><command>exim_fixdb</command></term>
-        <listitem>
-          <para>
-            modifies data in <application>Exim</application> databases
-          </para>
-          <indexterm zone="exim exim_fixdb">
-            <primary sortas="b-exim_fixdb">exim_fixdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_lock">
-        <term><command>exim_lock</command></term>
-        <listitem>
-          <para>
-            locks a mailbox file
-          </para>
-          <indexterm zone="exim exim_lock">
-            <primary sortas="b-exim_lock">exim_lock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_tidydb">
-        <term><command>exim_tidydb</command></term>
-        <listitem>
-          <para>
-            removes old records from <application>Exim</application>
-            databases
-          </para>
-          <indexterm zone="exim exim_tidydb">
-            <primary sortas="b-exim_tidydb">exim_tidydb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximstats">
-        <term><command>eximstats</command></term>
-        <listitem>
-          <para>
-            generates mail statistics from <application>Exim</application>
-            log files
-          </para>
-          <indexterm zone="exim eximstats">
-            <primary sortas="b-eximstats">eximstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exinext">
-        <term><command>exinext</command></term>
-        <listitem>
-          <para>
-            queries remote host retry times
-          </para>
-          <indexterm zone="exim exinext">
-            <primary sortas="b-exinext">exinext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exipick">
-        <term><command>exipick</command></term>
-        <listitem>
-          <para>
-            selects messages based on various criteria
-          </para>
-          <indexterm zone="exim exipick">
-            <primary sortas="b-exipick">exipick</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiqgrep">
-        <term><command>exiqgrep</command></term>
-        <listitem>
-          <para>
-            is a utility for selective queue listing
-          </para>
-          <indexterm zone="exim exiqgrep">
-            <primary sortas="b-exiqgrep">exiqgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiqsumm">
-        <term><command>exiqsumm</command></term>
-        <listitem>
-          <para>
-            produces a summary of the messages in the mail queue
-          </para>
-          <indexterm zone="exim exiqsumm">
-            <primary sortas="b-exiqsumm">exiqsumm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiwhat">
-        <term><command>exiwhat</command></term>
-        <listitem>
-          <para>
-            queries running <application>Exim</application> processes
-          </para>
-          <indexterm zone="exim exiwhat">
-            <primary sortas="b-exiwhat">exiwhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximon">
-        <term><command>eximon</command></term>
-        <listitem>
-          <para>
-            is a start-up shell script for <command>eximon.bin</command>
-            used to set the required environment variables before running the
-            program
-          </para>
-          <indexterm zone="exim eximon">
-            <primary sortas="b-eximon">eximon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximon.bin">
-        <term><command>eximon.bin</command></term>
-        <listitem>
-          <para>
-            is a monitor program which displays current information in an
-            <application>X</application> window, and also contains a menu
-            interface to <application>Exim</application>'s command line
-            administration options
-          </para>
-          <indexterm zone="exim eximon.bin">
-            <primary sortas="b-eximon.bin">eximon.bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: server/mail/exim/exim.ent
===================================================================
--- server/mail/exim/exim.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/exim/exim.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY exim SYSTEM "../exim.xml">
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ server/mail/mail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,28 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="server-mail">
+<?dbhtml filename="mail.html" dir="server"?>
+<title>Mail Server Software</title>
 
-<chapter id="server-mail" xreflabel="MTA">
-  <?dbhtml filename="mail.html"?>
+<para>MTAs are the programs which transport mail from one machine to the
+other.  The traditional MTA is <emphasis>sendmail</emphasis> however
+there are several other choices.</para>
 
-  <title>Mail Server Software</title>
+<para>As well as SMTP servers there are two other packages here, a POP
+server (qpopper) and an IMAP server (Courier-IMAP).</para>
 
-  <para>
-    MTAs are the programs which transport mail from one machine to the
-    other. The traditional MTA is <application>Sendmail</application>, however
-    there are several other choices.
-  </para>
-
-  <para>
-    In addition to the SMTP servers, there is also a POP/IMAP server (Dovecot).
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dovecot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postfix.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sendmail.xml"/>
+&postfix;
+&qmail;
+&sendmail;
+&exim;
+&qpopper;
+&courier;
 
 </chapter>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ server/mail/postfix.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,760 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="postfix" xreflabel="postfix-&postfix-version;">
+<?dbhtml filename="postfix.html" dir="server"?>
+<title>postfix-&postfix-version;</title>
 
-  <!-- editors: upstream postfix is ftp only, some of the mirrors offer
-  https - http://www.porcupine.org/mirmon/postfix-source.html lists the
-  mirror status, some of the mirrors shown as http are actually https -->
-  <!ENTITY postfix-download-http "https://ghostarchive.org/postfix/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-download-ftp  " ">
-  <!ENTITY postfix-md5sum        "3eda9b945ed6cdf11ef58a731c574a04">
-  <!ENTITY postfix-size          "4.7 MB">
-  <!ENTITY postfix-buildsize     "208 MB">
-  <!ENTITY postfix-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="postfix" xreflabel="Postfix-&postfix-version;">
-  <?dbhtml filename="postfix.html"?>
-
-
-  <title>Postfix-&postfix-version;</title>
-
-  <indexterm zone="postfix">
-    <primary sortas="a-Postfix">Postfix</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Postfix</title>
-
-    <para>
-      The <application>Postfix</application> package contains a Mail Transport
-      Agent (MTA). This is useful for sending email to other users of your host
-      machine.  It can also be configured to be a central mail server for your
-      domain, a mail relay agent or simply a mail delivery agent to your local
-      Internet Service Provider.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&postfix-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&postfix-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &postfix-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &postfix-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &postfix-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &postfix-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/postfix-&postfix-version;-glibc230_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Postfix Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="libnsl"/>, and
-      <xref linkend="lmdb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> for Email Address Internationalization (SMTPUTF8) support,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      &berkeley-db;, and
-      <ulink url="https://cr.yp.to/cdb.html">CDB</ulink> or
-      <ulink url="https://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink>
-    </para>
-
-    <para>
-      Note that <application>SQLite</application>,
-      <application>MySQL</application>, <application>PostgreSQL</application>
-      and <application>CDB</application> are only useful if there is a known
-      need for them.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/postfix"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Postfix</title>
-
-    <sect3>
-      <title>Adding Users and Groups</title>
-
-      <para>
-        Before you compile the program, you need to create users and groups that
-        will be expected to be in place during the installation. Add the users
-        and groups with the following commands issued by the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 32 postfix &amp;&amp;
-groupadd -g 33 postdrop &amp;&amp;
-useradd -c "Postfix Daemon User" -d /var/spool/postfix -g postfix \
-        -s /bin/false -u 32 postfix &amp;&amp;
-chown -v postfix:postfix /var/mail</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Configuring the Build</title>
-
-      <para>
-        The README files are formatted to be read with a pager like
-        <application>less</application> or <application>more</application>.
-        If you want to use a text editor, make them legible with the
-        following sed:
-      </para>
-
-<screen><userinput>sed -i 's/.\x08//g' README_FILES/*</userinput></screen>
-
-      <para>
-        The <application>Postfix</application> source tree does not contain a
-        <filename>configure</filename> script, rather the makefile in the
-        top-level directory contains a <option>makefiles</option> target that
-        regenerates all the other makefiles in the build tree. If you wish to
-        use additional software such as a database back-end for virtual users,
-        or TLS/SSL authentication, you will need to regenerate the makefiles
-        using one or more of the appropriate <envar>CCARGS</envar> and
-        <envar>AUXLIBS</envar> settings listed below.
-      </para>
-
-      <note>
-        <para>
-          For all variants of the CCARGS you should ensure that -DNO_NIS is
-          specified so that the build does not attempt to access an rpcsvc
-          header which do not exist in BLFS.  If &berkeley-db; is
-          not installed, -DNO_DB needs to be specified as well.
-        </para>
-      </note>
-
-      <para>
-        For more details read the readme files.
-      </para>
-
-      <para>
-        Initialize the <envar>CCARGS</envar> and <envar>AUXLIBS</envar>
-        according to the note above:
-      </para>
-
-<screen><userinput>CCARGS="-DNO_NIS -DNO_DB"
-AUXLIBS=""</userinput></screen>
-
-      <para>
-        Next, the <envar>CCARGS</envar> and the <envar>AUXLIBS</envar>
-        variables are filled with settings depending on the actual
-        system configuration. If an optional package is installed but
-        should <emphasis>not</emphasis> be included in the
-        <application>Postfix</application> build, simply skip the
-        corresponding <code>if [ ... ]; then</code> scriptlets.
-      </para>
-
-      <sect4>
-        <title>Cyrus-SASL</title>
-
-        <para>
-          To use <application>Cyrus-SASL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libsasl2.so ]; then
-  CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-  AUXLIBS="$AUXLIBS -lsasl2"
-fi</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>LMDB</title>
-        <para>
-          To use <application>LMDB</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/liblmdb.so ]; then
-  CCARGS="$CCARGS -DHAS_LMDB"
-  AUXLIBS="$AUXLIBS -llmdb"
-fi</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>OpenLDAP</title>
-
-        <para>
-          To use <application>OpenLDAP</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libldap.so -a -r /usr/lib/liblber.so ]; then
-  CCARGS="$CCARGS -DHAS_LDAP"
-  AUXLIBS="$AUXLIBS -lldap -llber"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>Sqlite</title>
-
-        <para>
-          To use <application>Sqlite</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libsqlite3.so ]; then
-  CCARGS="$CCARGS -DHAS_SQLITE"
-  AUXLIBS="$AUXLIBS -lsqlite3 -lpthread"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>MySQL</title>
-
-        <para>
-          To use <application>MySQL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libmysqlclient.so ]; then
-  CCARGS="$CCARGS -DHAS_MYSQL -I/usr/include/mysql"
-  AUXLIBS="$AUXLIBS -lmysqlclient -lz -lm"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>PostgreSQL</title>
-
-        <para>
-          To use <application>PostgreSQL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libpq.so ]; then
-  CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/postgresql"
-  AUXLIBS="$AUXLIBS -lpq -lz -lm"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>CDB/TinyCDB</title>
-
-        <para>
-          To use <application>CDB</application> or
-          <application>TinyCDB</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><literal>if [ -r <replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a ]; then
-  CCARGS="$CCARGS -DHAS_CDB"
-  AUXLIBS="$AUXLIBS <replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a"
-fi</literal></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>StartTLS Authentication</title>
-
-        <para>
-          To use <application>OpenSSL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libssl.so -a -r /usr/lib/libcrypto.so ]; then
-  CCARGS="$CCARGS -DUSE_TLS -I/usr/include/openssl/"
-  AUXLIBS="$AUXLIBS -lssl -lcrypto"
-fi</userinput></screen>
-        <para>
-          <application>OpenSSL</application> is installed by LFS so it
-          should be always there. The <code>if ... then</code> is here
-          just for consistency.
-        </para>
-      </sect4>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing Postfix</title>
-
-      <para>
-        There might be duplicate settings in <envar>AUXLIBS</envar>
-        like <code>-lm</code> when both, <application>MariaDB</application>
-        and <application>PostgreSQL</application> are used. They do
-        not harm. Install <application>Postfix</application> by
-        running the following commands:
-      </para>
-
-<screen><userinput>make CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" makefiles &amp;&amp;
-make</userinput></screen>
-
-    <!-- There is a test suite, but it fails a lot. It seems to need
-         the host to be specifically setup for the tests.
-         Run with `make tests' and `make root_tests' -->
-    <para>
-      This package does not come with a useful test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: sh postfix-install -non-interactive install_root=<DESTDIR> ... -->
-
-<screen role="root"><userinput>sh postfix-install -non-interactive \
-   daemon_directory=/usr/lib/postfix \
-   manpage_directory=/usr/share/man \
-   html_directory=/usr/share/doc/postfix-&postfix-version;/html \
-   readme_directory=/usr/share/doc/postfix-&postfix-version;/readme</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make makefiles</command>: This command rebuilds the makefiles
-      throughout the source tree to use the options contained in the
-      <envar>CCARGS</envar> and <envar>AUXLIBS</envar> variables.
-    </para>
-
-    <para>
-      <command>sh postfix-install -non-interactive</command>: This keeps the
-      install script from asking any questions, thereby accepting default
-      destination directories in all but the few cases. If the
-      <option>html_directory</option> and <option>readme_directory</option>
-      options are not set then the documentation will not be installed.
-    </para>
-
-    <para>
-      <option>CCARGS="-DNO_EAI ..."</option>: this will turn off SMTPUTF8
-      support, for example  if the rest of your email address infrastructure
-      cannot handle UTF-8 email addresses and message header values.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Postfix</title>
-
-    <sect3 id="postfix-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/aliases</filename>,
-        <filename>/etc/postfix/main.cf</filename>, and
-        <filename>/etc/postfix/master.cf</filename>
-      </para>
-
-      <indexterm zone="postfix postfix-config">
-        <primary sortas="e-etc-aliases">/etc/aliases</primary>
-      </indexterm>
-
-      <indexterm zone="postfix postfix-config">
-        <primary sortas="e-etc-postfix-star">/etc/postfix/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        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
-        identity so mail addressed to
-        <systemitem class="username">root</systemitem> can be forwarded to you.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
-<literal># Begin /etc/aliases
-
-MAILER-DAEMON:    postmaster
-postmaster:       root
-
-root:             <replaceable>&lt;LOGIN&gt;</replaceable>
-# End /etc/aliases</literal>
-EOF</userinput></screen>
-
-      <para>
-        To protect an existing <filename>/etc/aliases</filename> file,
-        the above command appends these aliases to it if it exists. This file
-        should be checked and duplicate aliases removed, if present.
-      </para>
-
-      <para>
-        The BLFS editors recommend to use LMDB instead of Berkeley DB for
-        Postfix tables.  Add three lines into
-        <filename>/etc/postfix/main.cf</filename> to make
-        <command>postmap</command> encode the lookup tables in the LMDB
-        format by default and to change the default hash setting of the
-        alias tables:
-      </para>
-
-<screen role="root"><userinput>echo 'default_database_type = lmdb'       &gt;&gt; /etc/postfix/main.cf &amp;&amp;
-echo 'alias_database = lmdb:/etc/aliases' &gt;&gt; /etc/postfix/main.cf &amp;&amp;
-echo 'alias_maps = lmdb:/etc/aliases'     &gt;&gt; /etc/postfix/main.cf</userinput></screen>
-
-      <para>
-        To protect your server against the recent SMTP smuggling attacks,
-        additional steps are required. Add two lines into
-        <filename>/etc/postfix/main.cf</filename> to disconnect remote SMTP
-        clients that send bare newlines in the DATA section, while also
-        allowing clients on your network with non-standard SMTP implementations
-        to still send mail:
-      </para>
-
-<screen role="root"><userinput>echo 'smtpd_forbid_bare_newline = normalize' &gt;&gt; /etc/postfix/main.cf &amp;&amp;
-echo 'smtpd_forbid_bare_newline_exclusions = $mynetworks' &gt;&gt; /etc/postfix/main.cf</userinput></screen>
-
-      <para>
-        Note that if you are following an online tutorial to configure
-        Postfix, the tutorial may refer to a lookup table with
-        <literal>hash:/path/to/lookup_table</literal>.  You should replace
-        <literal>hash</literal> with <literal>lmdb</literal> in order to use
-        a lookup table encoded in the LMDB format.
-      </para>
-
-      <note>
-        <para>
-          The <filename>/etc/postfix/main.cf</filename> and
-          <filename>/etc/postfix/master.cf</filename> files must be personalized
-          for your system. The <filename>main.cf</filename> file needs your
-          fully qualified hostname. You will find that
-          <filename>main.cf</filename> is self documenting, so load it into your
-          editor to make the changes you need for your situation.
-        </para>
-      </note>
-
-      <note>
-        <para>
-          <application>Postfix</application> can also be set up to
-          run in a chroot jail. See the file in the source
-          <filename>examples/chroot-setup/LINUX2</filename> for details.
-        </para>
-      </note>
-
-      <para>
-        To ensure that all permissions are set properly, <application>postfix</application>
-        provides a tool which is to be run as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>/usr/sbin/postfix -c /etc/postfix set-permissions</userinput></screen>
-
-      <para>
-        If you have an existing configuration, you can run the
-        <command>postfix</command> utility to add any necessary definitions to
-        your existing files. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>/usr/sbin/postfix upgrade-configuration</userinput></screen>
-
-      <para>
-        Before starting <application>Postfix</application>, you should check
-        that your configuration and file permissions will work properly. Run the
-        following commands as the <systemitem class="username">root</systemitem>
-        user to check and start your <application>Postfix</application> server:
-      </para>
-
-<screen role="nodump"><userinput>/usr/sbin/postfix check &amp;&amp;
-/usr/sbin/postfix start</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="postfix-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automate the running of Postfix at startup, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/postfix</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>postfix.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="postfix postfix-init">
-        <primary sortas="f-postfix">postfix</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-postfix</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>
-          mailq (symlink), newaliases (symlink), postalias, postcat, postconf,
-          postdrop, postfix, postkick, postlock, postlog, postmap, postmulti,
-          postqueue, postsuper, and sendmail
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /{etc,usr/lib}/postfix,
-          /usr/share/doc/postfix-&postfix-version; and
-          /var/{lib,spool}/postfix
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mailq">
-        <term><command>mailq</command></term>
-        <listitem>
-          <para>
-            A symlink to <filename>sendmail</filename>
-          </para>
-          <indexterm zone="postfix mailq">
-            <primary sortas="b-mailq">mailq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newaliases">
-        <term><command>newaliases</command></term>
-        <listitem>
-          <para>
-            A symlink to <filename>sendmail</filename>
-          </para>
-          <indexterm zone="postfix newaliases">
-            <primary sortas="b-newaliases">newaliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postalias">
-        <term><command>postalias</command></term>
-        <listitem>
-          <para>
-            is a utility for <application>Postfix</application> alias database
-            maintenance
-          </para>
-          <indexterm zone="postfix postalias">
-            <primary sortas="b-postalias">postalias</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postcat">
-        <term><command>postcat</command></term>
-        <listitem>
-          <para>
-            Prints the contents of files from the
-            <application>Postfix</application> queue in human readable format
-          </para>
-          <indexterm zone="postfix postcat">
-            <primary sortas="b-postcat">postcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postconf">
-        <term><command>postconf</command></term>
-        <listitem>
-          <para>
-            Displays or changes the value of
-            <application>Postfix</application> configuration parameters
-          </para>
-          <indexterm zone="postfix postconf">
-            <primary sortas="b-postconf">postconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postdrop">
-        <term><command>postdrop</command></term>
-        <listitem>
-          <para>
-            Creates a file in the maildrop directory and copies its standard
-            input to the file
-          </para>
-          <indexterm zone="postfix postdrop">
-            <primary sortas="b-postdrop">postdrop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postfix-bin">
-        <term><command>postfix</command></term>
-        <listitem>
-          <para>
-            is the <application>Postfix</application> control program
-          </para>
-          <indexterm zone="postfix postfix-bin">
-            <primary sortas="b-postfix">postfix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postkick">
-        <term><command>postkick</command></term>
-        <listitem>
-          <para>
-            Sends requests to the specified service over a local transport
-            channel
-          </para>
-          <indexterm zone="postfix postkick">
-            <primary sortas="b-postkick">postkick</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postlock">
-        <term><command>postlock</command></term>
-        <listitem>
-          <para>
-            Locks a mail folder for exclusive use, and executes commands passed
-            to it
-          </para>
-          <indexterm zone="postfix postlock">
-            <primary sortas="b-postlock">postlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postlog">
-        <term><command>postlog</command></term>
-        <listitem>
-          <para>
-            A <application>Postfix</application>-compatible logging interface
-            for use in, for example, shell scripts
-          </para>
-          <indexterm zone="postfix postlog">
-            <primary sortas="b-postlog">postlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postmap">
-        <term><command>postmap</command></term>
-        <listitem>
-          <para>
-            Creates or queries one or more Postfix lookup tables, or updates an
-            existing one
-          </para>
-          <indexterm zone="postfix postmap">
-            <primary sortas="b-postmap">postmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postmulti">
-        <term><command>postmulti</command></term>
-        <listitem>
-          <para>
-            is the <application>Postfix</application> multi-instance manager.
-            It allows a system administrator to manage multiple
-            <application>Postfix</application> instances on a single host
-          </para>
-          <indexterm zone="postfix postmulti">
-            <primary sortas="b-postmulti">postmulti</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postqueue">
-        <term><command>postqueue</command></term>
-        <listitem>
-          <para>
-            The <application>Postfix</application> user interface for
-            queue management
-          </para>
-          <indexterm zone="postfix postqueue">
-            <primary sortas="b-postqueue">postqueue</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postsuper">
-        <term><command>postsuper</command></term>
-        <listitem>
-          <para>
-            The <application>Postfix</application> user interface for
-            superuser queue management
-          </para>
-          <indexterm zone="postfix postsuper">
-            <primary sortas="b-postsuper">postsuper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendmail-postfix">
-        <term><command>sendmail</command></term>
-        <listitem>
-          <para>
-            is the <application>Postfix</application> to
-            <application>Sendmail</application> compatibility interface
-          </para>
-          <indexterm zone="postfix sendmail-postfix">
-            <primary sortas="b-sendmail">sendmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&postfix-intro;
+&postfix-inst;
+&postfix-config;
+&postfix-desc;
 
 </sect1>
+
Index: server/mail/postfix/postfix-config.xml
===================================================================
--- server/mail/postfix/postfix-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,103 @@
+<sect2>
+<title>Configuring postfix</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/aliases, /etc/postfix/main.cf</userinput> and <userinput>/etc/postfix/master.cf</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><screen><userinput>cat > /etc/aliases << "EOF"</userinput>
+# Begin /etc/aliases
+
+MAILER-DAEMON:    postmaster
+postmaster:       root
+
+root:             LOGIN
+# End /etc/aliases
+<userinput>EOF</userinput></screen></para>
+
+<para>The /etc/aliases file that was just created, the main.cf and the 
+master.cf must be personalized for your system. The aliases file needs your 
+non-root login identity so mail addressed to root can be forwarded to 
+you at the user level.  The main.cf file needs your fully qualified 
+hostname.  The master.cf needs to be modified to prevent your machine from 
+becoming a relay for unauthorized entities.  All of these edits can be done 
+with sed commands entered into the console with appropriate substitutions of 
+your non-root login name for [user] and your fully qualified hostname for 
+[localhost.localdomain]. These edits will create a single host mail system, 
+other edits are necessary to perform the many other functions available.  
+You will find the main.cf file is self documenting, so load it into your editor to make the changes you need for your situation.</para>
+
+<para><screen><userinput>cp /etc/aliases /etc/aliases.bak
+cp /etc/postfix/main.cf /etc/postfix/main.cf.bak
+cp /etc/postfix/master.cf /etc/postfix/master.cf.bak
+sed "s/LOGIN/[user]/" /etc/aliases.bak > /etc/aliases
+sed "s/#myhostname = host.domain.tld/myhostname = \ 
+	[localhost.localdomain]/" \
+	/etc/postfix/main.cf.bak > /etc/postfix/main.cf
+sed '/^smtp.*smtpd$/s/inet/unix/' /etc/postfix/master.cf.bak > \
+	/etc/postfix/master.cf
+/usr/bin/newaliases
+/usr/sbin/postfix start</userinput></screen></para></sect3>
+
+<sect3><title>postfix init.d script</title>
+
+<para>To automate the running of postfix, use following command to create the init.d script:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/postfix &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/postfix
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+
+        start)
+        echo "Starting Mail Service..."
+        loadproc postfix start
+        ;;
+
+        stop)
+        echo "Stopping Mail Service..."
+        loadproc postfix stop
+        ;;
+		
+        reload)
+        echo "Reloading Mail Service..."
+        loadproc postfix reload
+        ;;
+
+        restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+
+        *)
+        echo "Usage: $0 {start|stop|reload|restart}"
+        exit 1
+        ;;
+esac
+
+# End $rc_base/init.d/postfix
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/postfix</userinput></screen></para>
+
+<para>Create the symbolic links to this file in the relevant rc.d directory with the following commands:
+
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/postfix ../rc0.d/K25postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc1.d/K25postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc2.d/K25postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc3.d/S35postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc4.d/S35postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc5.d/S35postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc6.d/K25postfix</userinput></screen></para>
+</sect3>
+
+</sect2>
Index: server/mail/postfix/postfix-desc.xml
===================================================================
--- server/mail/postfix/postfix-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,82 @@
+<sect2>
+<title>Contents</title>
+
+<para>The postfix package contains <userinput>bounce</userinput>,
+<userinput>cleanup</userinput>, <userinput>error</userinput>,
+<userinput>flush</userinput>, <userinput>lmtp</userinput>,
+<userinput>local</userinput>, <userinput>mailq</userinput>,
+<userinput>master</userinput>, <userinput>newaliases</userinput>,
+<userinput>nqmgr</userinput>, <userinput>pickup</userinput>,
+<userinput>pipe</userinput>, <userinput>postalias</userinput>,
+<userinput>postcat</userinput>, <userinput>postconf</userinput>,
+<userinput>postdrop</userinput>, <userinput>postfix</userinput>,
+<userinput>postkick</userinput>, <userinput>postlock</userinput>,
+<userinput>postlog</userinput>, <userinput>postmap</userinput>,
+<userinput>postqueue</userinput>, <userinput>postsuper</userinput>,
+<userinput>qmgr</userinput>, <userinput>qmqpd</userinput>,
+<userinput>sendmail</userinput>, <userinput>showq</userinput>,
+<userinput>smtp</userinput>, <userinput>smtpd</userinput>,
+<userinput>spawn</userinput>, <userinput>trivial-rewrite</userinput>,
+and <userinput>virtual</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>postfix</title>
+<para>postfix is the program that starts and stops the mail delivery system.</para></sect3>
+
+<sect3><title>master</title>
+<para>master is the resident process that runs bounce, cleanup, error, flush, 
+lmtp, local, nqmgr, pickup, pipe, qmgr, qmqpd, showq, smtp, smtpd, spawn, 
+trivial-rewrite and virtual on demand. These programs are not designed to 
+work as user commands.</para></sect3>
+
+<sect3><title>postqueue</title>
+<para>postqueue implements the Postfix user interface for queue management.  
+It implements all the operations that are traditionally available via the 
+sendmail command.</para></sect3>
+
+<sect3><title>sendmail</title>
+<para>sendmail implements the Postfix to Sendmail compatibility interface.  
+mailq and newaliases are symlinks to sendmail.</para></sect3>
+
+<sect3><title>showq</title>
+<para>showq will emulate the mailq command when the Postfix mail system is 
+not running.</para></sect3>
+
+<sect3><title>postsuper</title>
+<para>postsuper does maintenance jobs on the Postfix queue.</para></sect3>
+
+<sect3><title>postalias</title>
+<para>postalias creates, queries or updates Postfix alias 
+databases.</para></sect3>
+
+<sect3><title>postcat</title>
+<para>postcat prints the contents of a Postfix queue file in human-readable 
+form.</para></sect3>
+
+<sect3><title>postconf</title>
+<para>postconf prints or changes the value of configuration 
+parameters.</para></sect3>
+
+<sect3><title>postdrop</title>
+<para>postdrop creates a file in the maildrop directory and copies its standard input to the file.</para></sect3>
+
+<sect3><title>postkick</title>
+<para>postkick makes the mail system private IPC accessible for use in shell 
+scripts.</para></sect3>
+
+<sect3><title>postlock</title>
+<para>postlock locks a file for exclusive access and executes a command
+on that file.</para></sect3>
+
+<sect3><title>postlog</title>
+<para>postlog implements a logging interface for use in shell 
+scripts.</para></sect3>
+
+<sect3><title>postmap</title>
+<para>postmap creates, queries or updates Postfix lookup tables.</para></sect3>
+
+</sect2>
+
Index: server/mail/postfix/postfix-inst.xml
===================================================================
--- server/mail/postfix/postfix-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Installation of postfix</title>
+
+<para>Before you compile the program, you need to create users and groups that will be expected to be in place when the install script executes.  Add the users and groups with the following commands:</para>
+
+<para><screen><userinput>groupadd postfix &amp;&amp;
+groupadd postdrop &amp;&amp;
+groupadd -g 65534 nogroup &amp;&amp;
+useradd -c postfix -d /dev/null -g postfix -s /bin/false postfix &amp;&amp;
+useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody &amp;&amp;
+chown postfix:postfix /var/mail</userinput></screen></para>
+
+<para>Install postfix by running the following commands:</para>
+
+<para><screen><userinput>make &amp;&amp;
+make install</userinput></screen></para>
+
+<para>The install script will enter an interactive stage with questions in the form of '*_directory:[default]input'.  Defaults can be accepted in all but three cases.  The following shows the three cases and the modified response.</para>
+
+<para><screen><userinput>daemon_directory:[/usr/libexec/postfix]/usr/sbin
+manpage_directory:[/usr/local/man]/usr/share/man
+sample_directory:[/etc/postfix]/usr/share/doc/postfix</userinput></screen></para>
+
+<para>The final installation step is to install the program's documentation with this command:</para>
+
+<para><screen><userinput>cp -rf html/* /usr/share/doc/postfix</userinput></screen></para>
+
+</sect2>
+
Index: server/mail/postfix/postfix-intro.xml
===================================================================
--- server/mail/postfix/postfix-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to postfix</title>
+
+<screen>Download location:              <ulink url="&postfix-download;"/>
+Version used:                   &postfix-version;
+Package size:                   &postfix-size;
+Estimated Disk space required:  &postfix-buildsize;</screen>
+
+<para>The postfix package contains a Mail Transport Agent (MTA). This
+is useful for sending email to other users of your host machine.  It can
+also be configured to be a central mail server for your domain, a mail
+relay agent or simply a mail delivery agent to your local Internet
+Service Provider (ISP).</para>
+
+<screen>postfix depends on: 
+<xref linkend="db"/></screen>
+
+</sect2>
Index: server/mail/postfix/postfix.ent
===================================================================
--- server/mail/postfix/postfix.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY postfix SYSTEM "../postfix.xml">
+<!ENTITY postfix-intro SYSTEM "postfix-intro.xml">
+<!ENTITY postfix-inst SYSTEM "postfix-inst.xml">
+<!ENTITY postfix-desc SYSTEM "postfix-desc.xml">
+<!ENTITY postfix-config SYSTEM "postfix-config.xml">
+<!ENTITY postfix-buildsize "47 MB">
+<!ENTITY postfix-version "1.1.11">
+<!ENTITY postfix-download "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-1.1.11.tar.gz">
+<!ENTITY postfix-size "1.2 MB">
Index: server/mail/qmail.xml
===================================================================
--- server/mail/qmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="qmail" xreflabel="qmail">
+<?dbhtml filename="qmail.html" dir="server"?>
+<title>qmail</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/mail/qmail/qmail.ent
===================================================================
--- server/mail/qmail/qmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qmail/qmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY qmail SYSTEM "../qmail.xml">
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qpopper.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="qpopper" xreflabel="qpopper">
+<?dbhtml filename="qpopper.html" dir="server"?>
+<title>qpopper</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/mail/qpopper/qpopper.ent
===================================================================
--- server/mail/qpopper/qpopper.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qpopper/qpopper.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY qpopper SYSTEM "../qpopper.xml">
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ server/mail/sendmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,521 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="sendmail" xreflabel="sendmail">
+<?dbhtml filename="sendmail.html" dir="server"?>
+<title>sendmail</title>
 
-  <!ENTITY sendmail-download-http "https://ftp.sendmail.org/sendmail.&sendmail-version;.tar.gz">
-  <!ENTITY sendmail-download-ftp  " ">
-  <!ENTITY sendmail-md5sum        "b6b332295b5779036d4c9246f96f673c">
-  <!ENTITY sendmail-size          "2.3 MB">
-  <!ENTITY sendmail-buildsize     "21 MB">
-  <!ENTITY sendmail-time          "0.1 SBU">
-]>
-
-<sect1 id="sendmail" xreflabel="sendmail-&sendmail-version;">
-  <?dbhtml filename="sendmail.html"?>
-
-
-  <title>sendmail-&sendmail-version;</title>
-
-  <indexterm zone="sendmail">
-    <primary sortas="a-sendmail">sendmail</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sendmail</title>
-
-    <para>
-      The <application>sendmail</application> package contains a Mail
-      Transport Agent (MTA).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sendmail-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sendmail-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sendmail-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sendmail-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sendmail-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sendmail-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Sendmail 8.16.1 does have official support for OpenSSL 1.1
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/sendmail.&sendmail-version;-openssl-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">sendmail Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openldap"/> (client)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/> (for creating PDF documentation),
-      <xref linkend="procmail"/> (the configuration proposed below requires
-      that <command>procmail</command> be present at run-time), and
-      <ulink url="https://github.com/chaos/nph">nph</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sendmail</title>
-
-    <para>
-      Before building <application>sendmail</application>, create the
-      required user, group and directory with the following commands issued as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 26 smmsp                               &amp;&amp;
-useradd -c "Sendmail Daemon" -g smmsp -d /dev/null \
-        -s /bin/false -u 26 smmsp                  &amp;&amp;
-chmod -v 1777 /var/mail                            &amp;&amp;
-install -v -m700 -d /var/spool/mqueue</userinput></screen>
-
-    <note>
-      <para>
-        See the source tree <filename>sendmail/README</filename> file
-        for information on linking optional packages into the build. Use the
-        example below, which adds support for SASL, StartTLS
-        (<application>OpenSSL</application>) and
-        <application>OpenLDAP</application>, as a starting point.  Of course,
-        modify it to suit your particular needs.
-      </para>
-    </note>
-
-<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP -DHASFLOCK')
-APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber')
-APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>sendmail</application> with the following commands:
-    </para>
-
-<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>define(`confMANGRP',`root')
-define(`confMANOWN',`root')
-define(`confSBINGRP',`root')
-define(`confUBINGRP',`root')
-define(`confUBINOWN',`root')</literal>
-EOF
-
-sed -i 's|/usr/man/man|/usr/share/man/man|' \
-    devtools/OS/Linux           &amp;&amp;
-
-cd sendmail                     &amp;&amp;
-sh Build                        &amp;&amp;
-cd ../cf/cf                     &amp;&amp;
-cp generic-linux.mc sendmail.mc &amp;&amp;
-sh Build sendmail.cf</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-<!-- When doing a DESTDIR= build, for example, for an update to check for new
-     installed files, you need to create $DEST/usr/{bin,sbin,share/man/man{1,5,8}
-     first. "sh Build" is a wrapper for Make, so it will accept DESTDIR=
-     as an argument. -->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /etc/mail &amp;&amp;
-sh Build install-cf &amp;&amp;
-
-cd ../..            &amp;&amp;
-sh Build install    &amp;&amp;
-
-install -v -m644 cf/cf/{submit,sendmail}.mc /etc/mail &amp;&amp;
-cp -v -R cf/* /etc/mail                               &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/sendmail-&sendmail-version;/{cf,sendmail} &amp;&amp;
-
-install -v -m644 CACerts FAQ KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
-        /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-
-install -v -m644 sendmail/{README,SECURITY,TRACEFLAGS,TUNING} \
-        /usr/share/doc/sendmail-&sendmail-version;/sendmail &amp;&amp;
-
-install -v -m644 cf/README /usr/share/doc/sendmail-&sendmail-version;/cf &amp;&amp;
-
-for manpage in sendmail editmap mailstats makemap praliases smrsh
-do
-    install -v -m644 $manpage/$manpage.8 /usr/share/man/man8
-done &amp;&amp;
-
-install -v -m644 sendmail/aliases.5    /usr/share/man/man5 &amp;&amp;
-install -v -m644 sendmail/mailq.1      /usr/share/man/man1 &amp;&amp;
-install -v -m644 sendmail/newaliases.1 /usr/share/man/man1 &amp;&amp;
-install -v -m644 vacation/vacation.1   /usr/share/man/man1</userinput></screen>
-
-    <para>
-      Install the <application>sendmail</application> Installation and
-      Operations Guide with the following commands:
-    </para>
-
-    <note>
-      <para>
-        Remove <filename>op.pdf</filename> from the <command>make</command>
-        and <command>install</command> commands below if
-        you don't have <application>Ghostscript</application> installed.
-      </para>
-    </note>
-
-<screen remap="doc"><userinput>cd doc/op                                       &amp;&amp;
-sed -i 's/groff/GROFF_NO_SGR=1 groff/' Makefile &amp;&amp;
-make op.txt op.pdf</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-install -v -m644 op.ps op.txt op.pdf /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-cd ../..</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</command>:
-      This creates a configuration file changing some of the default settings.
-    </para>
-
-    <para>
-      <command>sed ... devtools/OS/Linux</command>: The site.config.m4
-      does not honor a change to the man directory, so fix it in the OS
-      definitions.
-    </para>
-
-<!-- No longer valid with 8.16.1
-    <para>
-      <command>sed ... include/sm/bdb.h</command>: This allows sendmail to
-      build properly with <xref linkend='db'/> versions 5 and above.
-    </para>
--->
-
-    <para>
-      <command>sh Build; sh Build sendmail.cf; sh Build install-cf;
-      sh Build install</command>: <application>sendmail</application> uses an
-      <application>m4</application> based build script to create the various
-      <filename>Makefile</filename>s. These commands build and install the
-      package.
-    </para>
-
-    <para>
-      <command>for manpage in...;do...;done; install ...</command>: The man
-      pages are installed already formatted and <command>man</command> displays
-      them somewhat garbled. These commands replace the formatted pages with
-      pages <command>man</command> can display properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring sendmail</title>
-
-    <sect3 id="sendmail-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mail/*</filename>
-      </para>
-
-      <indexterm zone="sendmail sendmail-config">
-        <primary sortas="e-etc-mail">/etc/mail/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <note>
-        <para>
-          Ensure you have a fully qualified domain name defined
-          in <filename>/etc/hosts</filename> for your system before proceeding.
-        </para>
-      </note>
-
-      <para>
-        Create the <filename>/etc/mail/local-host-names</filename> and
-        <filename>/etc/mail/aliases</filename> files using the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo $(hostname) > /etc/mail/local-host-names
-cat &gt; /etc/mail/aliases &lt;&lt; "EOF"
-<literal>postmaster: root
-MAILER-DAEMON: root</literal>
-
-EOF
-# Does not work if there is no database backend compiled in:
-#newaliases</userinput></screen>
-
-      <para>
-        <application>sendmail</application>'s primary configuration file,
-        <filename>/etc/mail/sendmail.cf</filename>, is complex and not meant to
-        be directly edited. The recommended method for changing it is to modify
-        <filename>/etc/mail/sendmail.mc</filename> and various
-        <application>m4</application> files, then run the <command>m4</command>
-        macro processor from within
-        <filename class='directory'>/etc/mail</filename> as follows:
-      </para>
-
-<screen role="root"><userinput>cd /etc/mail &amp;&amp;
-m4 m4/cf.m4 sendmail.mc > sendmail.cf</userinput></screen>
-
-      <para>
-        A full explanation of the files to modify, and the available
-        parameters can be found in <filename>/etc/mail/README</filename>.
-      </para>
-
-    </sect3>
-
-    <sect3  id="sendmail-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automate the running of <application>sendmail</application>
-        at startup, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/sendmail</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>sendmail.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="sendmail sendmail-init">
-        <primary sortas="f-sendmail-init">sendmail</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-sendmail</userinput></screen>
-
-      <note>
-        <para>
-          The -qNm option to <command>sendmail</command>, where N is number
-          of minutes, controls how often <application>sendmail</application>
-          will process the mail queue. A default of 5 minutes is used in the
-          <phrase revision="sysv">init script.</phrase>
-          <phrase revision="systemd">systemd unit.</phrase> Individual
-          workstation users may want to set this as low as 1 minute, large
-          installations handling more mail may want to set it higher.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>editmap, mailstats, makemap, praliases, sendmail, smrsh,
-        and vacation; symlinks to /usr/sbin/sendmail: hoststat, mailq,
-        newaliases, and purgestat</seg>
-        <seg>None</seg>
-        <seg>/etc/mail, /usr/share/doc/sendmail-&sendmail-version;,
-        and /var/spool/clientmqueue</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="editmap">
-        <term><command>editmap</command></term>
-        <listitem>
-          <para>
-            queries and edits <application>sendmail</application> map files
-          </para>
-          <indexterm zone="sendmail editmap">
-            <primary sortas="b-editmap">editmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hoststat">
-        <term><command>hoststat</command></term>
-        <listitem>
-          <para>
-            prints <application>sendmail</application>'s persistent host status
-          </para>
-          <indexterm zone="sendmail hoststat">
-            <primary sortas="b-hoststat">hoststat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailstats">
-        <term><command>mailstats</command></term>
-        <listitem>
-          <para>
-            displays <application>sendmail</application> statistics
-          </para>
-          <indexterm zone="sendmail mailstats">
-            <primary sortas="b-mailstats">mailstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailq-sendmail">
-        <term><command>mailq</command></term>
-        <listitem>
-          <para>
-            prints a summary of outbound mail messages waiting for delivery
-          </para>
-          <indexterm zone="sendmail mailq-sendmail">
-            <primary sortas="b-mailq">mailq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makemap">
-        <term><command>makemap</command></term>
-        <listitem>
-          <para>
-            creates <application>sendmail</application> map files
-          </para>
-          <indexterm zone="sendmail makemap">
-            <primary sortas="b-makemap">makemap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newaliases-sendmail">
-        <term><command>newaliases</command></term>
-        <listitem>
-          <para>
-            rebuilds <filename>/etc/mail/aliases.db</filename> from the
-            contents of <filename>/etc/mail/aliases</filename>
-          </para>
-          <indexterm zone="sendmail newaliases-sendmail">
-            <primary sortas="b-newaliases">newaliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="praliases">
-        <term><command>praliases</command></term>
-        <listitem>
-          <para>
-            displays current <application>sendmail</application> aliases
-          </para>
-          <indexterm zone="sendmail praliases">
-            <primary sortas="b-praliases">praliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purgestat">
-        <term><command>purgestat</command></term>
-        <listitem>
-          <para>
-            causes <application>sendmail</application> to clear (purge)
-            all its host-status information
-          </para>
-          <indexterm zone="sendmail purgestat">
-            <primary sortas="b-purgestat">purgestat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendmail-prog-sendmail">
-        <term><command>sendmail</command></term>
-        <listitem>
-          <para>
-            is the <application>sendmail</application> mail transport agent
-          </para>
-          <indexterm zone="sendmail sendmail-prog-sendmail">
-            <primary sortas="b-sendmail">sendmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smrsh">
-        <term><command>smrsh</command></term>
-        <listitem>
-          <para>
-            is a restricted shell for <application>sendmail</application>
-          </para>
-          <indexterm zone="sendmail smrsh">
-            <primary sortas="b-smrsh">smrsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacation-sendmail">
-        <term><command>vacation</command></term>
-        <listitem>
-          <para>
-            is an email auto responder
-          </para>
-          <indexterm zone="sendmail vacation-sendmail">
-            <primary sortas="b-vacation">vacation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: server/mail/sendmail/sendmail.ent
===================================================================
--- server/mail/sendmail/sendmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/sendmail/sendmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY sendmail SYSTEM "../sendmail.xml">
Index: rver/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,548 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apache-download-http
-           "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
-  <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "9f77eb01b2fddfb4b32d469af90fb01b">
-  <!ENTITY apache-size          "7.2 MB">
-  <!ENTITY apache-buildsize     "88 MB">
-  <!ENTITY apache-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="apache" xreflabel="Apache-&apache-version;">
-  <?dbhtml filename="apache.html"?>
-
-
-  <title>Apache-&apache-version;</title>
-
-  <indexterm zone="apache">
-    <primary sortas="a-Apache">Apache</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apache HTTPD</title>
-
-    <para>
-      The <application>Apache HTTPD</application> package contains an open-source HTTP
-      server. It is useful for creating local intranet web sites or running huge
-      web serving operations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apache-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apache-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apache-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apache-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apache-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apache-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/httpd-&apache-version;-blfs_layout-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Apache HTTPD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="brotli"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="jansson"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="lynx"/> or
-      <xref linkend="Links"/> or
-      <ulink url="&elinks-url;">ELinks</ulink>,
-      <xref linkend="nghttp2"/>,
-      <xref linkend="openldap"/> (<xref linkend="apr-util"/> needs to be
-      installed with ldap support),
-      <xref linkend="rsync"/>, 
-      &berkeley-db;, and
-      <ulink url="https://sourceforge.net/projects/distcache">Distcache</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apache HTTPD</title>
-
-    <para>
-      For security reasons, running the server as an unprivileged user and group
-      is strongly encouraged. Create the following group and user using the
-      following commands as <systemitem class="username">root</systemitem>:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 25 apache &amp;&amp;
-useradd -c "Apache Server" -d /srv/www -g apache \
-        -s /bin/false -u 25 apache</userinput></screen>
-
-    <para>
-      Build and install <application>Apache HTTPD</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch             &amp;&amp;
-
-sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in              &amp;&amp;
-
-sed -e '/HTTPD_ROOT/s:${ap_prefix}:/etc/httpd:'       \
-    -e '/SERVER_CONFIG_FILE/s:${rel_sysconfdir}/::'   \
-    -e '/AP_TYPES_CONFIG_FILE/s:${rel_sysconfdir}/::' \
-    -i configure  &amp;&amp;
-
-sed -e '/encoding.h/a # include &lt;libxml/xmlstring.h&gt;' \
-    -i modules/filters/mod_xml2enc.c  &amp;&amp;
-
-./configure --enable-authnz-fcgi                              \
-            --enable-layout=BLFS                              \
-            --enable-mods-shared="all cgi"                    \
-            --enable-mpms-shared=all                          \
-            --enable-suexec=shared                            \
-            --with-apr=/usr/bin/apr-1-config                  \
-            --with-apr-util=/usr/bin/apu-1-config             \
-            --with-suexec-bin=/usr/lib/httpd/suexec           \
-            --with-suexec-caller=apache                       \
-            --with-suexec-docroot=/srv/www                    \
-            --with-suexec-logfile=/var/log/httpd/suexec.log   \
-            --with-suexec-uidmin=100                          \
-            --with-suexec-userdir=public_html                 &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>
-<!-- changing the patch allows doing DESTDIR install as a normal user
-    <note>
-      <para>
-        This package does not install properly using <envar>DESTDIR</envar>
-        techniques as an unpriviledged user.
-      </para>
-    </note>
--->
-<screen role="root"><userinput>make install  &amp;&amp;
-
-mv -v /usr/sbin/suexec /usr/lib/httpd/suexec &amp;&amp;
-chgrp apache           /usr/lib/httpd/suexec &amp;&amp;
-chmod 4754             /usr/lib/httpd/suexec &amp;&amp;
-
-chown -v -R apache:apache /srv/www</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed '/dir.*CFG_PREFIX/s@^@#@'...</command>: Forces the
-      <application>apxs</application> utility to use absolute pathnames for
-      modules, when instructed to do so.
-    </para>
-
-    <para>
-      <command>sed -e '/HTTPD_ROOT/s ...</command>: Fixes some paths.
-    </para>
-
-    <para>
-      <command>sed -e '/encoding.h/a ...</command>; Fix building against
-      libxml-2.12.x.
-    </para>
-
-    <para>
-      <parameter>--enable-authnz-fcgi</parameter>: Build FastCGI
-      authorizer-based authentication and authorization (mod_authnz_fcgi.so
-      fast CGI module).
-    </para>
-
-    <para>
-      <parameter>--enable-mods-shared="all cgi"</parameter>: The modules should be
-      compiled and used as Dynamic Shared Objects (DSOs) so they can be included
-      and excluded from the server using the run-time configuration directives.
-    </para>
-
-    <para>
-      <parameter>--enable-mpms-shared=all</parameter>: This switch ensures that
-      all MPM (Multi Processing Modules) are built as Dynamic Shared Objects
-      (DSOs), so the user can choose which one to use at runtime.
-    </para>
-
-    <para>
-      <parameter>--enable-suexec</parameter>: This switch enables building of the
-      <application>Apache</application> suEXEC module which can be used to allow
-      users to run CGI and SSI scripts under user IDs different from the user ID
-      of the calling web server.
-    </para>
-
-    <para>
-      <parameter>--with-suexec-*</parameter>: These switches control suEXEC module
-      behavior, such as default document root, minimal UID that can be used to
-      run the script under the suEXEC. Please note that with minimal UID 100, you
-      can't run CGI or SSI scripts under suEXEC as the
-      <systemitem class="username">apache</systemitem> user.
-    </para>
-
-    <para>
-      <command>... /usr/lib/httpd/suexec</command>: These commands put
-      <command>suexec</command> wrapper into proper location, since it
-      is not meant to be run directly. They also adjust proper
-      permissions of the binary, making it setgid
-      <systemitem class="username">apache</systemitem>.
-    </para>
-
-    <para>
-      <command>chown -R apache:apache /srv/www</command>: By default, the
-      installation process installs files (documentation, error messages,
-      default icons, etc.) with the ownership of the user that extracted the
-      files from the tar file. If you want to change the ownership to another
-      user, you should do so at this point. The only requirement is that the
-      document directories need to be accessible by the <command>httpd</command>
-      process with (r-x) permissions and files need to be readable (r--) by the
-      <systemitem class="username">apache</systemitem> user.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Apache</title>
-
-    <sect3 id="apache-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/httpd/httpd.conf</filename> and
-        <filename>/etc/httpd/extra/*</filename>
-      </para>
-
-      <indexterm zone="apache apache-config">
-        <primary sortas="e-etc-httpd-httpd.conf">/etc/httpd/httpd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="apache apache-config">
-        <primary sortas="e-etc-httpd-extra-star">/etc/httpd/extra/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        See <ulink url="file:///usr/share/httpd/manual/configuring.html"/>
-        for detailed instructions on customising your
-        <application>Apache</application> HTTP server configuration file.
-      </para>
-
-      <para>
-        There is no reason, at least for internet facing sites, not
-        to use SSL encryption. Setting up a secured website does not cost
-        anything except installing one additional small tool and a few
-        minutes of configuration work. Use this guideline at
-        <ulink url="&blfs-wiki;/Securing_a_website"/> to create
-        world-wide accepted certificates and renew them on a regular basis.
-      </para>
-
-    </sect3>
-
-    <sect3  id="httpd-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        If you want the <application>Apache</application> server to
-        start automatically when the system is booted, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/httpd</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>httpd.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="apache httpd-init">
-        <primary sortas="f-apache">apache</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-httpd</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>
-          ab,           apachectl, apxs,     checkgid, dbmmanage, fcgistarter,
-          htcacheclean, htdbm,     htdigest, htpasswd, httpd,
-          httxt2dbm,    logresolve, and  rotatelogs
-          <!-- not executable from path, and suexec -->
-        </seg>
-        <seg>
-          Several libraries under /usr/lib/httpd/modules/
-        </seg>
-        <seg>
-          /etc/httpd,
-          /srv/www,
-          /usr/include/httpd,
-          /usr/lib/httpd,
-          /usr/share/httpd,
-          /var/log/httpd, and
-          /var/run/httpd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ab">
-        <term><command>ab</command></term>
-        <listitem>
-          <para>
-            is a tool for benchmarking your <application>Apache</application>
-            HTTP server
-          </para>
-          <indexterm zone="apache ab">
-            <primary sortas="b-ab">ab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apachectl">
-        <term><command>apachectl</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="apache apachectl">
-            <primary sortas="b-apachectl">apachectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apxs">
-        <term><command>apxs</command></term>
-        <listitem>
-          <para>
-            is a tool for building and installing extension modules for the
-            <application>Apache</application> HTTP server
-          </para>
-          <indexterm zone="apache apxs">
-            <primary sortas="b-apxs">apxs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="checkgid">
-        <term><command>checkgid</command></term>
-        <listitem>
-          <para>
-            is a program that checks whether it can setgid to the group
-            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
-          </para>
-          <indexterm zone="apache checkgid">
-            <primary sortas="b-checkgid">checkgid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbmmanage">
-        <term><command>dbmmanage</command></term>
-        <listitem>
-          <para>
-            is used to create and update the DBM format files used to store
-            usernames and passwords for basic authentication of HTTP users
-          </para>
-          <indexterm zone="apache dbmmanage">
-            <primary sortas="b-dbmmanage">dbmmanage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcgistarter">
-        <term><command>fcgistarter</command></term>
-        <listitem>
-          <para>
-            is a tool to start a FastCGI program
-          </para>
-          <indexterm zone="apache fcgistarter">
-            <primary sortas="b-fcgistarter">fcgistarter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htcacheclean">
-        <term><command>htcacheclean</command></term>
-        <listitem>
-          <para>
-            is used to clean up the disk cache
-          </para>
-          <indexterm zone="apache htcacheclean">
-            <primary sortas="b-htcacheclean">htcacheclean</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htdbm">
-        <term><command>htdbm</command></term>
-        <listitem>
-          <para>
-            is used to manipulate the DBM password databases
-          </para>
-          <indexterm zone="apache htdbm">
-            <primary sortas="b-htdbm">htdbm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htdigest">
-        <term><command>htdigest</command></term>
-        <listitem>
-          <para>
-            is used to create and update the flat-files used to store usernames,
-            realms and passwords for digest authentication of HTTP users
-          </para>
-          <indexterm zone="apache htdigest">
-            <primary sortas="b-htdigest">htdigest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htpasswd">
-        <term><command>htpasswd</command></term>
-        <listitem>
-          <para>
-            is used to create and update the flat-files used to store usernames
-            and passwords for basic authentication of HTTP users
-          </para>
-          <indexterm zone="apache htpasswd">
-            <primary sortas="b-htpasswd">htpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="httpd">
-        <term><command>httpd</command></term>
-        <listitem>
-          <para>
-            is the <application>Apache</application> HTTP server program
-          </para>
-          <indexterm zone="apache httpd">
-            <primary sortas="b-httpd">httpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="httxt2dbm">
-        <term><command>httxt2dbm</command></term>
-        <listitem>
-          <para>
-            is used to generate DBM files from text, for use in RewriteMap
-          </para>
-          <indexterm zone="apache httxt2dbm">
-            <primary sortas="b-httxt2dbm">httxt2dbm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logresolve">
-        <term><command>logresolve</command></term>
-        <listitem>
-          <para>
-            is a post-processing program to resolve IP-addresses in
-            <application>Apache</application>'s access log files
-          </para>
-          <indexterm zone="apache logresolve">
-            <primary sortas="b-logresolve">logresolve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rotatelogs">
-        <term><command>rotatelogs</command></term>
-        <listitem>
-          <para>
-            is a simple program for use in conjunction with
-            <application>Apache</application>'s piped log file feature
-          </para>
-          <indexterm zone="apache rotatelogs">
-            <primary sortas="b-rotatelogs">rotatelogs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="suexec">
-        <term><command>suexec</command></term>
-        <listitem>
-          <para>
-            allows users to run CGI and SSI applications as a different user
-          </para>
-          <indexterm zone="apache suexec">
-            <primary sortas="b-suexec">suexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,980 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bind-download-http "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-download-ftp  " ">
-  <!ENTITY bind-md5sum        "&bind-md5;">
-  <!ENTITY bind-size          "5.3 MB">
-  <!ENTITY bind-buildsize     "127 MB (21 MB installed)">
-  <!ENTITY bind-time          "0.5 SBU (with parallelism=4; about 40 minutes somewhat processor independent, to run the complete test suite)">
-]>
-
-<sect1 id="bind" xreflabel="BIND-&bind-version;">
-  <?dbhtml filename="bind.html"?>
-
-
-  <title>BIND-&bind-version;</title>
-
-  <indexterm zone="bind">
-    <primary sortas="a-BIND">BIND</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to BIND</title>
-
-    <para>
-      The <application>BIND</application> package provides a DNS server
-      and client utilities. If you are only interested in the utilities, refer
-      to the <xref linkend="bind-utils"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bind-time;
-        </para>
-      </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>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libuv"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="json-c"/>,
-      <xref linkend="libcap-pam"/>, and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="libidn2"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lmdb"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pytest"/>,
-      <xref linkend="sphinx"/> (required to build documentation),
-      <ulink url="https://cmocka.org/">cmocka</ulink>,
-      <ulink url="https://github.com/cjheath/geoip">geoip</ulink>,
-      <ulink url="https://github.com/jemalloc/jemalloc">jemalloc</ulink>,
-      <ulink url="&w3m-url;">w3m</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional database backends</bridgehead>
-    <para role="optional">
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>, 
-      <xref linkend="unixodbc"/>, and
-      &berkeley-db;
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to run the test suite)</bridgehead>
-    <para role="optional">
-      <xref linkend="perl-net-dns"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/bind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of BIND</title>
-
-<!--
-    <para>
-      To ensure <application>BIND</application> will build dnssec-keymgr,
-      install a python module as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>pip3 install ply</userinput></screen>
--->
-
-    <note>
-      <para>
-         Starting with bind-9.18.20, the IP addresses for B.ROOT-SERVERS.NET
-         have changed.
-      </para>
-    </note>
-
-    <para>
-      Install <application>BIND</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --localstatedir=/var    \
-            --mandir=/usr/share/man \
-            --disable-static        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Issue the following commands to run the complete suite of tests.
-      First, as the <systemitem class="username">root</systemitem> user, set up
-      some test interfaces:
-    </para>
-
-    <note>
-      <para>
-        If IPv6 is not enabled in the kernel, there will be several
-        error messages: "RTNETLINK answers: Operation not permitted".  These
-        messages do not affect the tests.
-      </para>
-    </note>
-
-<screen role="root"
-        remap="test"><userinput>bin/tests/system/ifconfig.sh up</userinput></screen>
-
-    <para>
-      The test suite may indicate some skipped tests depending on
-      what configuration options are used. Some tests are marked
-      <quote>UNTESTED</quote> or do even fail if <xref linkend="perl-net-dns"/>
-      is not installed. Two tests, <filename>resolver</filename> and
-      <filename>dispatch</filename>, are known to fail.
-      To run the tests, as an unprivileged user, execute:
-    </para>
-
-<screen remap="test"><userinput>make -k check</userinput></screen>
-
-    <para>
-      Again as <systemitem class="username">root</systemitem>, clean up the
-      test interfaces:
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>bin/tests/system/ifconfig.sh down</userinput></screen>
-
-    <para>
-      Finally, install the package as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<!-- Documentation is an issue - The docs are now all in .rst format and appear
-to be sphinx based. install source .rst files for now...
-
-leave docs untouched as they does only use disk space when not
-used to recreate the docs via Sphinx. I've added a note regarding
-the documentation. (thomas)
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -vdm 755 /usr/share/doc/bind-&bind-version;/{arm,dnssec-guide} &amp;&amp;
-install doc/arm/* /usr/share/doc/bind-&bind-version;/arm               &amp;&amp;
-install doc/dnssec-guide/* /usr/share/doc/bind-&bind-version;/dnssec-guide</userinput></screen>
--->
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This parameter forces
-      <application>BIND</application> to look for configuration
-      files in <filename class='directory'>/etc</filename> instead of
-      <filename class='directory'>/usr/etc</filename>.
-    </para>
-
-    <!-- Seems to be removed in 9.18.0
-    <para>
-      <parameter>- -with-libtool</parameter>: This parameter forces the
-      building of dynamic libraries and links the installed binaries to these
-      libraries.
-    </para>
-    -->
-
-    <para>
-      <option>--with-libidn2</option>: This parameter enables
-      the IDNA2008 (Internationalized Domain Names in Applications)
-      support.
-    </para>
-
-    <para>
-      <option>--enable-fetchlimit</option>: Use this option if you want
-      to be able to limit the rate of recursive client queries. This may be
-      useful on servers which receive a large number of queries.
-    </para>
-
-    <para>
-      <option>--disable-linux-caps</option>: BIND can also be built without
-      capability support by using this option, at the cost of some loss of
-      security.
-    </para>
-
-    <para>
-      <option>--with-dlz-{mysql,bdb,filesystem,ldap,odbc,stub}</option>: Use
-      one (or more) of those options to add Dynamically Loadable Zones support.
-      For more information refer to <ulink
-      url="https://bind-dlz.sourceforge.net/">bind-dlz.sourceforge.net</ulink>.
-    </para>
-
-    <para>
-      <option>--disable-doh</option>: Use this option if you do not have
-      <xref linkend="nghttp2" role="nodep"/> installed and do not need support
-      for DNS over HTTPS.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring BIND</title>
-
-    <sect3 id="bind-config">
-      <title>Config files</title>
-
-      <para>
-        <filename>named.conf</filename>,
-        <filename>root.hints</filename>,
-        <filename>127.0.0</filename>,
-        <filename>rndc.conf</filename>, and
-        <filename>resolv.conf</filename>
-      </para>
-
-      <indexterm zone="bind bind-config">
-        <primary sortas="e-etc-named.conf">/etc/named.conf</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-      <primary sortas="e-etc-rndc.conf">/etc/rndc.conf</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-        <primary
-        sortas="e-etc-namedb-root.hints">/etc/namedb/root.hints</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-        <primary
-        sortas="e-etc-namedb-pz-127.0.0.0">/etc/namedb/pz/127.0.0.0</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>BIND</application> will be configured to run in a
-        <command>chroot</command> jail as an unprivileged user (<systemitem
-        class="username">named</systemitem>). This configuration is more secure
-        in that a DNS compromise can only affect a few files in the <systemitem
-        class="username">named</systemitem> user's <envar>HOME</envar>
-        directory.
-      </para>
-
-      <para>
-        Create the unprivileged user and group <systemitem
-        class="username">named</systemitem>:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 20 named &amp;&amp;
-useradd -c "BIND Owner" -g named -s /bin/false -u 20 named &amp;&amp;
-install -d -m770 -o named -g named /srv/named</userinput></screen>
-
-      <para>
-        Set up some files, directories and devices needed by
-        <application>BIND</application>:
-      </para>
-
-<screen role="root"><userinput>mkdir -p /srv/named &amp;&amp;
-cd       /srv/named &amp;&amp;
-mkdir -p dev etc/named/{slave,pz} usr/lib/engines var/run/named &amp;&amp;
-mknod /srv/named/dev/null c 1 3 &amp;&amp;
-mknod /srv/named/dev/urandom c 1 9 &amp;&amp;
-chmod 666 /srv/named/dev/{null,urandom} &amp;&amp;
-cp /etc/localtime etc</userinput></screen>
-
-      <para>
-        The <filename>rndc.conf</filename> file contains information for
-        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>
-        with the <command>rndc-confgen</command> command:
-      </para>
-
-<screen role="root"><userinput>rndc-confgen -a -b 512 -t /srv/named</userinput></screen>
-
-      <para>
-        Create the <filename>named.conf</filename> file from which
-        <command>named</command> will read the location of zone files, root
-        name servers and secure DNS keys:
-      </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt;&gt; /srv/named/etc/named.conf &lt;&lt; "EOF"
-<literal>options {
-    directory "/etc/named";
-    pid-file "/var/run/named.pid";
-    statistics-file "/var/run/named.stats";
-
-};
-zone "." {
-    type hint;
-    file "root.hints";
-};
-zone "0.0.127.in-addr.arpa" {
-    type master;
-    file "pz/127.0.0";
-};
-
-// Bind 9 now logs by default through syslog (except debug).
-// These are the default logging rules.
-
-logging {
-    category default { default_syslog; default_debug; };
-    category unmatched { null; };
-
-  channel default_syslog {
-      syslog daemon;                      // send to syslog's daemon
-                                          // facility
-      severity info;                      // only send priority info
-                                          // and higher
-  };
-
-  channel default_debug {
-      file "named.run";                   // write to named.run in
-                                          // the working directory
-                                          // Note: stderr is used instead
-                                          // of "named.run"
-                                          // if the server is started
-                                          // with the '-f' option.
-      severity dynamic;                   // log at the server's
-                                          // current debug level
-  };
-
-  channel default_stderr {
-      stderr;                             // writes to stderr
-      severity info;                      // only send priority info
-                                          // and higher
-  };
-
-  channel null {
-      null;                               // toss anything sent to
-                                          // this channel
-  };
-};</literal>
-EOF</userinput></screen>
-
-      <para>
-        Create a zone file with the following contents:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /srv/named/etc/named/pz/127.0.0 &lt;&lt; "EOF"
-<literal>$TTL 3D
-@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
-                        1       ; Serial
-                        8H      ; Refresh
-                        2H      ; Retry
-                        4W      ; Expire
-                        1D)     ; Minimum TTL
-                NS      ns.local.domain.
-1               PTR     localhost.</literal>
-EOF</userinput></screen>
-
-      <para>
-        Create the <filename>root.hints</filename> file with the following
-        commands:
-      </para>
-
-      <note>
-        <para>
-          Caution must be used to ensure there are no leading spaces in
-          this file.
-        </para>
-      </note>
-
-<screen role="root"><userinput>cat &gt; /srv/named/etc/named/root.hints &lt;&lt; "EOF"
-<literal>.                       6D  IN      NS      A.ROOT-SERVERS.NET.
-.                       6D  IN      NS      B.ROOT-SERVERS.NET.
-.                       6D  IN      NS      C.ROOT-SERVERS.NET.
-.                       6D  IN      NS      D.ROOT-SERVERS.NET.
-.                       6D  IN      NS      E.ROOT-SERVERS.NET.
-.                       6D  IN      NS      F.ROOT-SERVERS.NET.
-.                       6D  IN      NS      G.ROOT-SERVERS.NET.
-.                       6D  IN      NS      H.ROOT-SERVERS.NET.
-.                       6D  IN      NS      I.ROOT-SERVERS.NET.
-.                       6D  IN      NS      J.ROOT-SERVERS.NET.
-.                       6D  IN      NS      K.ROOT-SERVERS.NET.
-.                       6D  IN      NS      L.ROOT-SERVERS.NET.
-.                       6D  IN      NS      M.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
-A.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:503:ba3e::2:30
-B.ROOT-SERVERS.NET.     6D  IN      A       170.247.170.2
-B.ROOT-SERVERS.NET.     6D  IN      AAAA    2801:1b8:10::b
-C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
-C.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:2::c
-D.ROOT-SERVERS.NET.     6D  IN      A       199.7.91.13
-D.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:2d::d
-E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
-E.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:a8::e
-F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
-F.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:2f::f
-G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
-G.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:12::d0d
-H.ROOT-SERVERS.NET.     6D  IN      A       198.97.190.53
-H.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:1::53
-I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
-I.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:7fe::53
-J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
-J.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:503:c27::2:30
-K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
-K.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:7fd::1
-L.ROOT-SERVERS.NET.     6D  IN      A       199.7.83.42
-L.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:500:9f::42
-M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-M.ROOT-SERVERS.NET.     6D  IN      AAAA    2001:dc3::35</literal>
-EOF</userinput></screen>
-
-      <para>
-        The <filename>root.hints</filename> file is a list of root name
-        servers. This file must be updated periodically with the
-        <command>dig</command> utility. A current copy of root.hints can be
-        obtained from <ulink url="https://www.internic.net/domain/named.root"/>.
-        For details, consult the "BIND 9 Administrator Reference Manual".
-      </para>
-
-      <para>
-        Create or modify <filename>resolv.conf</filename> to use the new
-        name server with the following commands:
-      </para>
-
-      <note>
-        <para>
-          Replace <replaceable>&lt;yourdomain.com&gt;</replaceable> with
-          your own valid domain name.
-        </para>
-      </note>
-
-<screen role="root"><userinput>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
-cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
-<literal>search <replaceable>&lt;yourdomain.com&gt;</replaceable>
-nameserver 127.0.0.1</literal>
-EOF</userinput></screen>
-
-      <para>
-        Set permissions on the <command>chroot</command> jail with the
-        following command:
-      </para>
-
-<screen role="root"><userinput>chown -R named:named /srv/named</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="bind-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To start the DNS server at boot, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/bind</filename> init
-        script</phrase>
-        <phrase revision="systemd"><filename>named.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="bind bind-init">
-        <primary sortas="f-bind">bind</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-bind</userinput></screen>
-<screen role="root" revision="systemd"><userinput>make install-named</userinput></screen>
-
-      <para>
-        Now start <application>BIND</application> with the following command:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/bind start</userinput></screen>
-<screen role="root" revision="systemd"><userinput>systemctl start named</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Testing BIND</title>
-
-      <para>
-        Test out the new <application>BIND</application> 9 installation.
-        First query the local host address with <command>dig</command>:
-      </para>
-
-<screen><userinput>dig -x 127.0.0.1</userinput></screen>
-
-      <para>
-        Now try an external name lookup, taking note of the speed
-        difference in repeated lookups due to the caching. Run the
-        <command>dig</command> command twice on the same address:
-      </para>
-
-<screen><userinput>dig www.&lfs-domainname; &amp;&amp;
-dig www.&lfs-domainname;</userinput></screen>
-
-      <para>
-        You can see almost instantaneous results with the named caching
-        lookups. Consult the <application>BIND</application> Administrator
-        Reference Manual (see below) for further configuration options.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Administrator Reference Manual (ARM)</title>
-
-    <para>
-      The ARM documentation (do not confuse with the processor architecture)
-      is included in the source package. The documentation is in .rst
-      format which means that it can be converted in human readable formats
-      if <xref linkend="sphinx"/> is installed.
-    </para>
-
-    <para>
-      When <application>BIND</application> is set up, especially if it is going
-      to be operating in a real live scenario, it is <emphasis>highly</emphasis>
-      recommended to consult the ARM documentation. ISC provides an
-      updated set of excellent documentation along with every release
-      so it can be easily viewed and/or downloaded &ndash; so there is
-      no excuse to not read the docs. The formats ISC provides are PDF,
-      epub and html at <ulink url="https://downloads.isc.org/isc/bind9/&bind-version;/doc/arm/"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-
-        <seg>arpaname, ddns-confgen, delv, dig, dnssec-cds,
-        dnssec-dsfromkey, dnssec-importkey, dnssec-keyfromlabel, dnssec-keygen,
-        dnssec-revoke, dnssec-settime, dnssec-signzone,
-        dnssec-verify, host, mdig, named, named-checkconf,
-        named-checkzone, named-compilezone, named-journalprint,
-        named-nzd2nzf, named-rrchecker, nsec3hash, nslookup, nsupdate, rndc,
-        rndc-confgen, and tsig-keygen (symlink)</seg>
-
-        <seg>libbind9.so, libdns.so, libirs.so, libisc.so, libisccc.so,
-        libisccfg.so, and libns.so</seg>
-
-        <seg>/usr/include/{bind9,dns,dst,irs,isc,isccc,isccfg,ns},
-        /usr/lib/bind,
-        and /srv/named</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="arpaname">
-        <term><command>arpaname</command></term>
-        <listitem>
-          <para>
-            translates IP addresses to the corresponding ARPA names
-          </para>
-          <indexterm zone="bind arpaname">
-            <primary sortas="b-arpaname">arpaname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ddns-confgen">
-        <term><command>ddns-confgen</command></term>
-        <listitem>
-          <para>
-            generates a key for use by nsupdate and named
-          </para>
-          <indexterm zone="bind ddns-confgen">
-            <primary sortas="b-ddns-confgen">ddns-confgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="delv">
-        <term><command>delv</command></term>
-        <listitem>
-          <para>
-            is a new debugging tool that is a successor to
-            <command>dig</command>
-          </para>
-          <indexterm zone="bind delv">
-            <primary sortas="b-delv">delv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dig">
-        <term><command>dig</command></term>
-        <listitem>
-          <para>
-            interrogates DNS servers
-          </para>
-          <indexterm zone="bind dig">
-            <primary sortas="b-dig">dig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-cds">
-        <term><command>dnssec-cds</command></term>
-        <listitem>
-          <para>
-            changes DS records for a child zone based on
-            CDS/CDNSKEY
-          </para>
-          <indexterm zone="bind dnssec-cds">
-            <primary sortas="b-dnssec-cds">dnssec-cds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-dsfromkey">
-        <term><command>dnssec-dsfromkey</command></term>
-        <listitem>
-          <para>
-            outputs the Delegation Signer (DS) resource record (RR)
-          </para>
-          <indexterm zone="bind dnssec-dsfromkey">
-            <primary sortas="b-dnssec-dsfromkey">dnssec-dsfromkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-importkey">
-        <term><command>dnssec-importkey</command></term>
-        <listitem>
-          <para>
-             reads a public DNSKEY record and generates a pair of
-             .key/.private files
-          </para>
-          <indexterm zone="bind dnssec-importkey">
-            <primary sortas="b-dnssec-importkey">dnssec-importkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-keyfromlabel">
-        <term><command>dnssec-keyfromlabel</command></term>
-        <listitem>
-          <para>
-            gets keys with the given label from a cryptography hardware device
-            and builds key files for DNSSEC
-          </para>
-          <indexterm zone="bind dnssec-keyfromlabel">
-            <primary sortas="b-dnssec-keyfromlabel">dnssec-keyfromlabel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-keymgr">
-        <term><command>dnssec-keymgr</command></term>
-        <listitem>
-          <para>
-            ensures correct DNSKEY coverage based on a defined policy
-          </para>
-          <indexterm zone="bind dnssec-keymgr">
-            <primary sortas="b-dnssec-keymgr">dnssec-keymgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-revoke">
-        <term><command>dnssec-revoke</command></term>
-        <listitem>
-          <para>
-            sets the REVOKED bit on a DNSSEC key
-          </para>
-          <indexterm zone="bind dnssec-revoke">
-            <primary sortas="b-dnssec-revoke">dnssec-revoke</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-settime">
-        <term><command>dnssec-settime</command></term>
-        <listitem>
-          <para>
-            sets the key timing metadata for a DNSSEC key
-          </para>
-          <indexterm zone="bind dnssec-settime">
-            <primary sortas="b-dnssec-settime">dnssec-settime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-signzone">
-        <term><command>dnssec-signzone</command></term>
-        <listitem>
-          <para>
-            generates signed versions of zone files
-          </para>
-          <indexterm zone="bind dnssec-signzone">
-            <primary sortas="b-dnssec-signzone">dnssec-signzone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-verify">
-        <term><command>dnssec-verify</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="bind dnssec-verify">
-            <primary sortas="b-dnssec-verify">dnssec-verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="host">
-        <term><command>host</command></term>
-        <listitem>
-          <para>
-            is a utility for DNS lookups
-          </para>
-          <indexterm zone="bind host">
-            <primary sortas="b-host">host</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdig">
-        <term><command>mdig</command></term>
-        <listitem>
-          <para>
-            is a version of dig that allows multiple queries at once
-          </para>
-          <indexterm zone="bind mdig">
-            <primary sortas="b-mdig">mdig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named">
-        <term><command>named</command></term>
-        <listitem>
-          <para>
-            is the name server daemon
-          </para>
-          <indexterm zone="bind named">
-            <primary sortas="b-named">named</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-checkconf">
-        <term><command>named-checkconf</command></term>
-        <listitem>
-          <para>
-            checks the syntax of <filename>named.conf</filename>
-            files
-          </para>
-          <indexterm zone="bind named-checkconf">
-            <primary sortas="b-named-checkconf">named-checkconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-checkzone">
-        <term><command>named-checkzone</command></term>
-        <listitem>
-          <para>
-            checks zone file validity
-          </para>
-          <indexterm zone="bind named-checkzone">
-            <primary sortas="b-named-checkzone">named-checkzone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-compilezone">
-        <term><command>named-compilezone</command></term>
-        <listitem>
-          <para>
-            is similar to <command>named-checkzone</command>, but it always
-            dumps the zone contents to a specified file in a specified format
-          </para>
-          <indexterm zone="bind named-compilezone">
-            <primary sortas="b-named-compilezone">named-compilezone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-journalprint">
-        <term><command>named-journalprint</command></term>
-        <listitem>
-          <para>
-            prints the zone journal in human-readable form
-          </para>
-          <indexterm zone="bind named-journalprint">
-            <primary sortas="b-named-journalprint">named-journalprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-rrchecker">
-        <term><command>named-rrchecker</command></term>
-        <listitem>
-          <para>
-            reads an individual DNS resource record from standard input and
-            checks if it is syntactically correct
-          </para>
-          <indexterm zone="bind named-rrchecker">
-            <primary sortas="b-named-rrchecker">named-rrchecker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-nzd2nzf">
-        <term><command>named-nzd2nzf</command></term>
-        <listitem>
-          <para>
-            converts an NZD database to NZF text format
-          </para>
-          <indexterm zone="bind named-nzd2nzf">
-            <primary sortas="b-named-nzd2nzf">named-nzd2nzf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsec3hash">
-        <term><command>nsec3hash</command></term>
-        <listitem>
-          <para>
-            generates an NSEC3 hash based on a set of NSEC3 parameters
-          </para>
-          <indexterm zone="bind nsec3hash">
-            <primary sortas="b-nsec3hash">nsec3hash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nslookup">
-        <term><command>nslookup</command></term>
-        <listitem>
-          <para>
-            is a program used to query Internet domain nameservers
-          </para>
-          <indexterm zone="bind nslookup">
-            <primary sortas="b-nslookup">nslookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsupdate">
-        <term><command>nsupdate</command></term>
-        <listitem>
-          <para>
-            is used to submit DNS update requests
-          </para>
-          <indexterm zone="bind nsupdate">
-            <primary sortas="b-nsupdate">nsupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rndc">
-        <term><command>rndc</command></term>
-        <listitem>
-          <para>
-            controls the operation of <application>BIND</application>
-          </para>
-          <indexterm zone="bind rndc">
-            <primary sortas="b-rndc">rndc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rndc-confgen">
-        <term><command>rndc-confgen</command></term>
-        <listitem>
-          <para>
-            generates <filename>rndc.conf</filename> files
-          </para>
-          <indexterm zone="bind rndc-confgen">
-            <primary sortas="b-rndc-confgen">rndc-confgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tsig-keygen">
-        <term><command>tsig-keygen</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ddns-confgen</command>
-          </para>
-          <indexterm zone="bind tsig-keygen">
-            <primary sortas="b-tsig-keygen">tsig-keygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/major/kea-kernel.xml
===================================================================
--- server/major/kea-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  N<emphasis role='blue'>e</emphasis>tworking options ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>P</emphasis>acket socket                                                 [PACKET]
-    [*]   <emphasis role='blue'>T</emphasis>CP/IP networking                                               [INET]
-    &lt;*&gt;     <emphasis role='blue'>T</emphasis>he IPv6 protocol ---&gt;                                        [IPV6]</screen>
Index: rver/major/kea.xml
===================================================================
--- server/major/kea.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,807 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kea-download-http "https://downloads.isc.org/isc/kea/&kea-dhcp-version;/kea-&kea-dhcp-version;.tar.gz">
-  <!ENTITY kea-download-ftp  " ">
-  <!ENTITY kea-md5sum        "ad23d02b3ce0475eb077da05b0ae2429">
-  <!ENTITY kea-size          "10 MB">
-  <!ENTITY kea-buildsize     "1.5 GB (332 MB installed; add 4 GB for tests)">
-  <!ENTITY kea-time          "4.1 SBU (with parallelism=4; add 12 SBU for tests)">
-  <!ENTITY kea-arm-vers      "&kea-dhcp-version;">
-]>
-
-<sect1 id="kea" xreflabel="Kea-&kea-dhcp-version; DHCP Server">
-  <?dbhtml filename="kea.html"?>
-
-  <title>Kea &kea-dhcp-version; DHCP Server</title>
-
-  <indexterm zone="kea">
-    <primary sortas="a-KEA">Kea DHCP Server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ISC Kea DHCP Server</title>
-
-    <para>
-      The <application>ISC Kea</application> package contains the
-      server programs for DHCP. It is the successor of the
-      old ISC DHCP server which is end-of-life since December 2022.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kea-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kea-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kea-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kea-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kea-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kea-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Kea Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/> and
-      <xref linkend="log4cplus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/>,
-      <xref linkend="valgrind"/>; for documentation:
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="sphinx_rtd_theme"/>; for tests:
-      <ulink url="https://google.github.io/googletest/">GoogleTest</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional database backends</bridgehead>
-    <para role="optional">
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>, and
-      <xref linkend="postgresql"/>
-    </para>
-<!--
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/kea"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="kernel" id="kea-dhcp-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      You must have Packet Socket support. IPv6 support is optional.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="kea-kernel.xml"/>
-
-    <indexterm zone="kea kea-dhcp-kernel">
-      <primary sortas="d-KEA">Kea</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ISC Kea DHCP Server</title>
-
-    <para>
-      First fix detection of Python-3.12 by the build system:
-    </para>
-
-<screen><userinput>sed -e 's/:3/:4/' \
-    -i configure</userinput></screen>
-
-    <para>
-      Remove one installation step that uses an obsolete python module:
-    </para>
-
-<screen><userinput>sed -e '/dlist="/d' \
-    -i src/bin/shell/Makefile.in</userinput></screen>
-
-    <para>
-      Install <application>ISC Kea DHCP Server</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --enable-shell       \
-            --with-openssl       \
-            --disable-static     \
-            --docdir=/usr/share/doc/kea-&kea-dhcp-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, you must have installed GoogleTest and kept
-      its source. You should also have passed
-      <option>--with-gtest-source=/path/to/googletest/sourcedir</option> to
-      <command>configure</command> above. Run the tests with
-      <command>make check</command>. Three tests in the TLSTest suite are
-      known to fail.
-    </para>
-
-    <para>
-      To install the <application>ISC Kea DHCP Server</application> suite,
-      issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -j1 install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-shell</parameter>: Allows building
-      <command>kea-shell</command>, a command line interface for
-      the control agent.
-    </para>
-
-    <para>
-      <parameter>--with-openssl</parameter>: Allows using OpenSSL for
-      communicating with the control-agent and for DNS updates.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-pgsql</option> or <option>--with-mysql</option>:
-      <application>ISC Kea</application> can store the leases on a
-      database. This might be useful in large environments running
-      a cluster of DHCP servers. Using the <emphasis>memfile</emphasis>
-      backend (which is a CSV file stored locally) is possible anyhow.
-    </para>
-
-    <para>
-      <option>--enable-generate-docs</option>:
-      If documentation is to be rebuilt, add that option. Several
-      dependencies must be installed for generating the documentation.
-    </para>
-
-    <para>
-      <command>make -j1 install</command>: ISC does not recommend
-      any form of parallel or job server options when doing the install.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ISC Kea DHCP Server</title>
-
-    <para>
-      The support of IPv4, IPv6 and DDNS has been split into
-      separate servers which runs independently from each other. Each
-      of them has its own configuration file.<phrase revision="sysv">
-      Additional configuration files come from the keactrl agent which
-      is used to control the servers in an easy way.</phrase>
-    </para>
-
-    <para>
-      Consult the <ulink
-        url="https://kea.readthedocs.io/en/kea-&kea-arm-vers;/">
-        Kea Administrator Reference Manual</ulink>
-      for detailed information about the configuration of
-      <application>ISC Kea</application> as it is a quite capable system.
-      The configuration shown below is a bare minimum to get a DHCP server
-      running but it already includes configuration for DDNS (Dynamic DNS).
-      That setup might be working for small networks with a few clients and
-      low traffic. For greater installations with thousands of clients,
-      <application>ISC Kea</application> can be configured to use databases
-      (mariadb or postgresql) to store the leases and build a cluster with
-      multiple nodes. It can be integrated to
-      <ulink url="https://www.isc.org/categories/stork/">ISC Stork</ulink>
-      which is a management dashboard to <application>ISC Kea</application>.
-    </para>
-
-    <para>
-      If you want to start the DHCP Server at boot, install the
-      <phrase revision="sysv"><filename>/etc/rc.d/init.d/kea-dhcpd</filename>
-      init script</phrase>
-      <phrase revision="systemd"><filename>kea-dhcpd.service</filename>
-      unit</phrase> included in the
-      <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/>
-      package:
-    </para>
-
-<screen role="root"><userinput>make install-kea-dhcpd</userinput></screen>
-
-    <sect3 id="kea-dhcp-config">
-      <title>Config Files</title>
-
-      <para>
-        <phrase revision="sysv">
-          <filename>/etc/kea/keactrl.conf</filename>,
-        </phrase>
-        <filename>/etc/kea/kea-ctrl-agent.conf</filename>,
-        <filename>/etc/kea/kea-dhcp4.conf</filename>,
-        <filename>/etc/kea/kea-dhcp6.conf</filename>, and
-        <filename>/etc/kea/kea-dhcp-ddns.conf</filename>
-      </para>
-
-      <indexterm zone="kea keactrl-config" revision="sysv">
-        <primary sortas="e-etc-kea-keactrl.conf">/etc/kea/keactrl.conf</primary>
-      </indexterm>
-
-      <indexterm zone="kea kea-ctrl-agent-config">
-        <primary sortas="e-etc-kea-kea-ctrl-agent.conf">/etc/kea/kea-ctrl-agent.conf</primary>
-      </indexterm>
-
-      <indexterm zone="kea kea-dhcp4-config">
-        <primary sortas="e-etc-kea-dhcp4.conf">/etc/kea/kea-dhcp4.conf</primary>
-      </indexterm>
-
-      <indexterm zone="kea kea-dhcp6-config">
-        <primary sortas="e-etc-kea-dhcp6.conf">/etc/kea/kea-dhcp6.conf</primary>
-      </indexterm>
-
-      <indexterm zone="kea kea-dhcp-ddns-config">
-        <primary sortas="e-etc-kea-dhcp-ddns.conf">/etc/kea/kea-dhcp-ddns.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 id="keactrl-config" revision="sysv">
-      <title>Kea Control Configuration</title>
-
-      <para><command>keactrl</command> is used to control the
-      independent servers (IPv4, IPv6, DDNS). Its configuration file
-      <filename>/etc/kea/keactrl.conf</filename> is installed by
-      default and includes many path settings which are defined
-      due to the <command>configure</command> at build time. It also
-      includes settings to specify which of the servers should be
-      started.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Control Agent</para>
-          <para>The Control Agent is a daemon which allows the
-          (re)configuration of the Kea DHCP service via REST API.
-          Set <literal>ctrl_agent=yes</literal> to start the
-          control agent (service providing a REST API), set
-          <literal>ctrl_agent=no</literal> in case the control agent
-          is not needed.</para>
-        </listitem>
-        <listitem>
-          <para>IPv4 DHCP server</para>
-          <para>This daemon handles requests for IPv4 addresses.
-          Set <literal>dhcp4=yes</literal> to start it, set
-          <literal>dhcp4=no</literal> in case DHCP service for IPv4
-          is not wanted.</para>
-        </listitem>
-        <listitem>
-          <para>IPv6 DHCP server</para>
-          <para>This daemon handles requests for IPv6 addresses.
-          Set <literal>dhcp6=yes</literal> to start it, set
-          <literal>dhcp6=no</literal> in case DHCP service for IPv6
-          is not wanted.</para>
-        </listitem>
-        <listitem>
-          <para>Dynamic DNS</para>
-          <para>This daemon is used to update a DNS server dynamically
-          when Kea assigns an IP address to a device.
-          Set <literal>dhcp_ddns=yes</literal> to enable it, set
-          <literal>dhcp_ddns=no</literal> in case dynamic DNS updates
-          are not wanted.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        The Netconf service is not installed because required
-        dependencies are not covered by the current BLFS book.
-.    </para>
-
-      <para>
-        With the following command, Kea will be configured to
-        start the dhcp service for IPv4 and the
-        dynamic DNS update, while the control agent and
-        the dhcp service for IPv6 remain down. Tweak the command to
-        match your needs on started services and execute as the
-        &root; user:
-      </para>
-
-<screen role="root"><userinput>sed -e "s/^dhcp4=.*/dhcp4=yes/" \
-    -e "s/^dhcp6=.*/dhcp6=no/" \
-    -e "s/^dhcp_ddns=.*/dhcp_ddns=yes/" \
-    -e "s/^ctrl_agent=.*/ctrl_agent=no/" \
-    -i /etc/kea/keactrl.conf
-</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="kea-sysd-config" revision="systemd">
-      <title>Kea Configuration Using Systemd Units</title>
-
-      <para>
-        Four service units are used to start various daemons
-        provided by Kea:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Control Agent</para>
-          <para>
-            The Control Agent is a daemon which allows the
-            (re)configuration of the Kea DHCP service via REST API.
-            Run <command>systemctl enable kea-ctrl-agent</command>
-            if this daemon is needed.
-          </para>
-        </listitem>
-        <listitem>
-          <para>IPv4 DHCP server</para>
-          <para>
-            This daemon handles requests for IPv4 addresses.
-            Run <command>systemctl enable kea-dhcp4-server</command> to
-            have it started by systemd.
-          </para>
-        </listitem>
-        <listitem>
-          <para>IPv6 DHCP server</para>
-          <para>
-            This daemon handles requests for IPv6 addresses.
-            Run <command>systemctl enable kea-dhcp6-server</command> to
-            have it started by systemd.
-          </para>
-        </listitem>
-        <listitem>
-          <para>Dynamic DNS</para>
-          <para>
-            This daemon is used to update a DNS server dynamically
-            when Kea assigns an IP address to a device.
-            Run <command>systemctl enable kea-ddns-server</command> to
-            have it started by systemd.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The Netconf service is not installed because required
-      dependencies are not covered by the current BLFS book.</para>
-
-    </sect3>
-
-    <sect3 id="kea-ctrl-agent-config">
-      <title>Control Agent Configuration</title>
-
-      <para>
-        The provided configuration could be used without changes
-        but in BLFS, objects like sockets are stored in
-        <filename class="directory">/run</filename>
-        rather than in
-        <filename class="directory">/tmp</filename>.
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/kea/kea-ctrl-agent.conf &lt;&lt; "EOF"
-<literal>// Begin /etc/kea/kea-ctrl-agent.conf
-{
-  // This is a basic configuration for the Kea Control Agent.
-  // RESTful interface to be available at http://127.0.0.1:8000/
-  "Control-agent": {
-    "http-host": "127.0.0.1",
-    "http-port": 8000,
-    "control-sockets": {
-      "dhcp4": {
-        "socket-type": "unix",
-        "socket-name": "/run/kea4-ctrl-socket"
-      },
-      "dhcp6": {
-        "socket-type": "unix",
-        "socket-name": "/run/kea6-ctrl-socket"
-      },
-      "d2": {
-        "socket-type": "unix",
-        "socket-name": "/run/kea-ddns-ctrl-socket"
-      }
-    },
-
-    "loggers": [
-      {
-        "name": "kea-ctrl-agent",
-        "output_options": [
-          {
-            "output": "/var/log/kea-ctrl-agent.log",
-            "pattern": "%D{%Y-%m-%d %H:%M:%S.%q} %-5p %m\n"
-          }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-      }
-    ]
-  }
-}
-// End /etc/kea/kea-ctrl-agent.conf</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="kea-dhcp4-config">
-      <title>IPv4 DHCP Server Configuration</title>
-
-      <para>
-        A sample configuration file is created in <filename>/etc/kea/kea-dhcp4.conf</filename>.
-        Adjust the file to suit your needs or overwrite it by running
-        the following command as the &root; user (you'll need to edit this
-        file anyway: at least the <emphasis>interfaces</emphasis> field,
-        the <emphasis>ddns-qualifying-suffix</emphasis> field, and almost
-        all the fields in <emphasis>Subnet4</emphasis>:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/kea/kea-dhcp4.conf &lt;&lt; "EOF"
-<literal>// Begin /etc/kea/kea-dhcp4.conf
-{
-  "Dhcp4": {
-    // Add names of your network interfaces to listen on.
-    "interfaces-config": {
-      "interfaces": [ "eth0", "eth2" ]
-    },
-
-    "control-socket": {
-      "socket-type": "unix",
-      "socket-name": "/run/kea4-ctrl-socket"
-    },
-
-    "lease-database": {
-      "type": "memfile",
-      "lfc-interval": 3600
-    },
-
-    "expired-leases-processing": {
-      "reclaim-timer-wait-time": 10,
-      "flush-reclaimed-timer-wait-time": 25,
-      "hold-reclaimed-time": 3600,
-      "max-reclaim-leases": 100,
-      "max-reclaim-time": 250,
-      "unwarned-reclaim-cycles": 5
-    },
-
-    "renew-timer": 900,
-    "rebind-timer": 1800,
-    "valid-lifetime": 3600,
-
-    // Enable DDNS - Kea will dynamically update the DNS
-    "ddns-send-updates" : true,
-    "ddns-qualifying-suffix": "your.domain.tld",
-    "dhcp-ddns" : {
-      "enable-updates": true
-    },
-
-    "subnet4": [
-      {
-        "subnet": "192.168.56.0/24",
-        "pools": [ { "pool": "192.168.56.16 - 192.168.56.254" } ],
-        "option-data": [
-          {
-            "name": "domain-name",
-            "data": "your.domain.tld"
-          },
-          {
-            "name": "domain-name-servers",
-            "data": "192.168.56.2, 192.168.3.7"
-          },
-          {
-            "name": "domain-search",
-            "data": "your.domain.tld"
-          },
-          {
-            "name": "routers",
-            "data": "192.168.56.2"
-          }
-        ]
-      }
-    ],
-
-    "loggers": [
-      {
-        "name": "kea-dhcp4",
-        "output_options": [
-          {
-            "output": "/var/log/kea-dhcp4.log",
-            "pattern": "%D{%Y-%m-%d %H:%M:%S.%q} %-5p %m\n"
-          }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-      }
-    ]
-  }
-}
-// End /etc/kea/kea-dhcp4.conf</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="kea-dhcp6-config">
-      <title>IPv6 DHCP Server Configuration</title>
-
-      <para>
-        The configuration for IPv6 is similar to the configuration
-        of IPv4. The configuration file is
-        <filename>/etc/kea/kea-dhcp6.conf</filename>.
-      </para>
-
-    </sect3>
-
-    <sect3 id="kea-dhcp-ddns-config">
-      <title>Dynamic DNS Configuration</title>
-
-      <para>
-        If there is a <xref linkend="bind"/> server running,
-        <application>ISC Kea</application> can update the DNS when
-        it gives an IP address to a client. A sample configuration
-        file is created in <filename>/etc/kea/kea-dhcp-ddns.conf</filename>.
-        Adjust the file to suit your needs or overwrite it by running
-        the following command as the &root; user:
-      </para>
-
-<screen role="nodump" ><userinput>cat &gt; /etc/kea/kea-dhcp-ddns.conf &lt;&lt; "EOF"
-<literal>// Begin /etc/kea/kea-dhcp-ddns.conf
-{
-  "DhcpDdns": {
-    "ip-address": "127.0.0.1",
-    "port": 53001,
-    "control-socket": {
-      "socket-type": "unix",
-      "socket-name": "/run/kea-ddns-ctrl-socket"
-    },
-
-    "tsig-keys": [
-      {
-        "name"      : "rndc-key",
-        "algorithm" : "hmac-sha256",
-        "secret"    : "1FU5hD7faYaajQCjSdA54JkTPQxbbPrRnzOKqHcD9cM="
-      }
-    ],
-
-    "forward-ddns" : {
-      "ddns-domains" : [
-        {
-          "name" : "your.domain.tld.",
-          "key-name": "rndc-key",
-          "dns-servers" : [
-            {
-              "ip-address" : "127.0.0.1",
-              "port" : 53
-            }
-          ]
-        }
-      ]
-    },
-
-    "reverse-ddns" : {
-      "ddns-domains" : [
-        {
-          "name" : "56.168.192.in-addr.arpa.",
-          "key-name": "rndc-key",
-          "dns-servers" : [
-            {
-              "ip-address" : "127.0.0.1",
-              "port" : 53
-            }
-          ]
-        }
-      ]
-    },
-
-    "loggers": [
-      {
-        "name": "kea-dhcp-ddns",
-        "output_options": [
-          {
-            "output": "/var/log/kea-ddns.log",
-            "pattern": "%D{%Y-%m-%d %H:%M:%S.%q} %-5p %m\n"
-          }
-        ],
-        "severity": "INFO",
-        "debuglevel": 0
-      }
-    ]
-  }
-}
-// End /etc/kea/kea-dhcp-ddns.conf</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          The value of <literal>secret</literal> is just an example.
-          Generate the key for your installation by using the
-          <command>rndc-confgen -a</command> command or the
-          <command>tsig-keygen</command> command which both are
-          provided by <xref linkend="bind"/>.
-        </para>
-        <para>
-          In this example configuration, it is assumed that the DNS server
-          runs on the same machine as Kea does (accessible via
-          <literal>127.0.0.1</literal>) and that this machine has
-          the IP <literal>192.168.56.2</literal>.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          keactrl, kea-admin, kea-ctrl-agent, kea-dhcp4, kea-dhcp6,
-          kea-dhcp-ddns, kea-lfc, kea-shell
-        </seg>
-        <seg>
-          libkea-asiodns.so,
-          libkea-asiolink.so,
-          libkea-cc.so,
-          libkea-cgfclient.so,
-          libkea-cryptolink.so,
-          libkea-d2srv.so,
-          libkea-database.so,
-          libkea-dhcp_ddns.so,
-          libkea-dhcp++.so,
-          libkea-dhcpsrv.so,
-          libkea-dns++.so,
-          libkea-eval.so,
-          libkea-exceptions.so,
-          libkea-hooks.so,
-          libkea-http.so,
-          libkea-log.so,
-          libkea-process.so,
-          libkea-stats.so,
-          libkea-tcp.so,
-          libkea-util.so, and
-          libkea-util-io.so
-        </seg>
-        <seg>
-          /etc/kea,
-          /usr/include/kea,
-          /usr/lib/kea,
-          /usr/lib/python&python3-majorver;/site-packages/kea,
-          /usr/share/kea,
-          /usr/share/doc/kea-&kea-dhcp-version;, and
-          /var/lib/kea
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keactrl">
-        <term><command>keactrl</command></term>
-        <listitem>
-          <para>
-            Tool to control (start/stop) the server processes.
-          </para>
-          <indexterm zone="kea keactrl">
-            <primary sortas="b-keactrl">keactrl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="kea-admin">
-        <term><command>kea-admin</command></term>
-        <listitem>
-          <para>
-            kea-admin is a shell script which offers database maintenance.
-          </para>
-          <indexterm zone="kea kea-admin">
-            <primary sortas="b-kea-admin">kea-admin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="kea-ctrl-agent">
-        <term><command>kea-ctrl-agent</command></term>
-        <listitem>
-          <para>
-            Daemon which exposes a RESTful control interface for
-            managing Kea servers.
-          </para>
-          <indexterm zone="kea kea-ctrl-agent">
-            <primary sortas="b-kea-ctrl-agent">kea-ctrl-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="kea-dhcp4">
-        <term><command>kea-dhcp4</command></term>
-        <listitem>
-          <para>
-            The server daemon providing IPv4 addresses.
-          </para>
-          <indexterm zone="kea kea-dhcp4">
-            <primary sortas="b-kea-dhcp4">kea-dhcp4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="kea-dhcp6">
-        <term><command>kea-dhcp6</command></term>
-        <listitem>
-          <para>
-            The server daemon providing IPv6 addresses.
-          </para>
-          <indexterm zone="kea kea-dhcp6">
-            <primary sortas="b-kea-dhcp6">kea-dhcp6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="kea-dhcp-ddns">
-        <term><command>kea-dhcp-ddns</command></term>
-        <listitem>
-          <para>
-            The server daemon performing the dynamic DNS updates.
-          </para>
-          <indexterm zone="kea kea-dhcp-ddns">
-            <primary sortas="b-kea-dhcp-ddns">kea-dhcp-ddns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="kea-lfc">
-        <term><command>kea-lfc</command></term>
-        <listitem>
-          <para>
-            The kea-lfc service process removes redundant information
-            from the files used to provide persistent storage for the
-            memfile database backend. It is run by the Kea DHCP server.
-          </para>
-          <indexterm zone="kea kea-lfc">
-            <primary sortas="b-kea-lfc">kea-lfc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="keashell">
-        <term><command>keashell</command></term>
-        <listitem>
-          <para>
-            RESTful client to the <application>ISC Kea</application>
-            services.
-          </para>
-          <indexterm zone="kea keashell">
-            <primary sortas="b-keashell">keashell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/major/major.xml
===================================================================
--- server/major/major.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="server-major">
-  <?dbhtml filename="majorservers.html"?>
-
-  <title>Major Servers</title>
-
-  <para>
-    Major servers are the programs that provide content or services
-    to users or other programs.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kea.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/>
-
-</chapter>
Index: rver/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,469 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 proftpd-download-http "https://github.com/proftpd/proftpd/archive/v&proftpd-version;/proftpd-&proftpd-version;.tar.gz">
-  <!ENTITY proftpd-download-ftp  " ">
-  <!ENTITY proftpd-md5sum        "778cdeeac86e1d26451112bb7d4662af">
-  <!ENTITY proftpd-size          "19 MB">
-  <!ENTITY proftpd-buildsize     "66 MB">
-  <!ENTITY proftpd-time          "0.3 SBU">
-]>
-
-<sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">
-  <?dbhtml filename="proftpd.html"?>
-
-
-  <title>ProFTPD-&proftpd-version;</title>
-
-  <indexterm zone="proftpd">
-    <primary sortas="a-proftpd">Proftpd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ProFTPD</title>
-
-    <para>
-      The <application>ProFTPD</application> package contains a secure
-      and highly configurable FTP daemon. This is useful for serving large
-      file archives over a network.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&proftpd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&proftpd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &proftpd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &proftpd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &proftpd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &proftpd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/proftpd-&proftpd-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">ProFTPD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="postgresql"/>, and
-      <ulink url="https://metacpan.org/pod/Net::SSH2">Net::SSH2</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ProFTPD</title>
-
-    <para>
-      For security reasons, you should install
-      <application>ProFTPD</application> using an unprivileged user and group.
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 46 proftpd                             &amp;&amp;
-useradd -c proftpd -d /srv/ftp -g proftpd \
-        -s /usr/bin/proftpdshell -u 46 proftpd     &amp;&amp;
-
-install -v -d -m775 -o proftpd -g proftpd /srv/ftp &amp;&amp;
-ln -v -s /usr/bin/false /usr/bin/proftpdshell      &amp;&amp;
-echo /usr/bin/proftpdshell &gt;&gt; /etc/shells</userinput></screen>
-<!--
-    <para>
-      First, apply a patch containing various security fixes from
-      the upstream developers:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../proftpd-&proftpd-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>ProFTPD</application> as an unprivileged user by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/run &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This packages does not come with a usable test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                   &amp;&amp;
-install -d -m755 /usr/share/doc/proftpd-&proftpd-version; &amp;&amp;
-cp -Rv doc/*     /usr/share/doc/proftpd-&proftpd-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>install -v -d -m775 -o proftpd -g proftpd /srv/ftp</command>:
-      Create the home directory for <application>ProFTPD</application>.
-    </para>
-
-    <para>
-      <command>ln -v -s /usr/bin/false /usr/bin/proftpdshell</command>:
-      Set the default shell as a link to an invalid shell.
-    </para>
-
-    <para>
-      <command>echo /usr/bin/proftpdshell &gt;&gt; /etc/shells</command>:
-      Fake a valid shell for compatibility purposes.
-    </para>
-
-    <note>
-      <para>
-        The above two commands can be omitted if the following directive is
-        placed in the configuration file:
-      </para>
-
-<screen><literal>RequireValidShell off</literal></screen>
-
-      <para>
-        By default, proftpd will require that users logging in have valid
-        shells. The RequireValidShell directive turns off this requirement.
-        This is only recommended if you are setting up your FTP server
-        exclusively for anonymous downloads.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        Support for most of the dependency packages requires using options
-        passed to the <command>configure</command> script. View the output
-        from <command>./configure --help</command> for complete information
-        about enabling dependency packages.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ProFTPD</title>
-
-    <sect3 id='proftpd-config'>
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/proftpd.conf</filename>
-      </para>
-
-      <indexterm zone="proftpd proftpd-config">
-        <primary sortas="e-etc-proftpd">/etc/proftpd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        This is a simple, download-only sample configuration. See the
-        <application>ProFTPD</application> documentation in
-        <filename class="directory">/usr/share/doc/proftpd</filename> and
-        consult the website at <ulink url="http://www.proftpd.org/"/> for
-        example configurations.
-      </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"
-<literal># This is a basic ProFTPD configuration file
-# It establishes a single server and a single anonymous login.
-
-ServerName                      "ProFTPD Default Installation"
-ServerType                      standalone
-DefaultServer                   on
-
-# Port 21 is the standard FTP port.
-Port                            21
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask                           022
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit maximum number of processes per service
-<!--# (such as xinetd)-->
-MaxInstances                    30
-
-# Set the user and group that the server normally runs at.
-User                            proftpd
-Group                           proftpd
-
-# To cause every FTP user to be "jailed" (chrooted) into their home
-# directory, uncomment this line.
-#DefaultRoot ~
-
-
-# Normally, files should be overwritable.
-&lt;Directory /*&gt;
-  AllowOverwrite                on
-&lt;/Directory&gt;
-
-# A basic anonymous configuration, no upload directories.
-&lt;Anonymous ~proftpd&gt;
-  User                          proftpd
-  Group                         proftpd
-  # Clients should be able to login with "anonymous" as well as "proftpd"
-  UserAlias                     anonymous proftpd
-
-  # Limit the maximum number of anonymous logins
-  MaxClients                    10
-
-  # 'welcome.msg' should be displayed at login, and '.message' displayed
-  # in each newly chdired directory.
-  DisplayLogin                  welcome.msg
-  DisplayChdir                  .message
-
-  # Limit WRITE everywhere in the anonymous chroot
-  &lt;Limit WRITE&gt;
-    DenyAll
-  &lt;/Limit&gt;
-&lt;/Anonymous&gt;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="proftpd-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        Install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/proftpd</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>proftpd.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/>
-        package:
-      </para>
-
-      <indexterm zone="proftpd proftpd-init">
-        <primary sortas="f-proftpd">proftpd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-proftpd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          ftpasswd, ftpcount, ftpdctl, ftpmail, ftpquota, ftpscrub, ftpshut,
-          ftptop, ftpwho, in.proftpd (symlink to proftpd), proftpd, and prxs
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/{include,lib}/proftpd,
-          /usr/share/doc/proftpd-&proftpd-version;, and
-          /srv/ftp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="proftpd-prog">
-        <term><command>proftpd</command></term>
-        <listitem>
-          <para>
-            is the FTP daemon
-          </para>
-          <indexterm zone="proftpd proftpd-prog">
-            <primary sortas="b-proftpd">proftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpcount">
-        <term><command>ftpcount</command></term>
-        <listitem>
-          <para>
-            shows the current number of connections
-          </para>
-          <indexterm zone="proftpd ftpcount">
-            <primary sortas="b-ftpcount">ftpcount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpdctl">
-        <term><command>ftpdctl</command></term>
-        <listitem>
-          <para>
-            is used to control the  proftpd daemon while it is running
-          </para>
-          <indexterm zone="proftpd ftpdctl">
-            <primary sortas="b-ftpdctl">ftpdctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpasswd">
-        <term><command>ftpasswd</command></term>
-        <listitem>
-          <para>
-            is a Perl script designed to create and manage
-            AuthUserFiles and AuthGroupFiles of the correct format for proftpd
-          </para>
-          <indexterm zone="proftpd ftpasswd">
-            <primary sortas="b-ftpasswd">ftpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpmail">
-        <term><command>ftpmail</command></term>
-        <listitem>
-          <para>
-            is a Perl script for sending email based on the proftpd TransferLog
-          </para>
-          <indexterm zone="proftpd ftpmail">
-            <primary sortas="b-ftpmail">ftpmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpquota">
-        <term><command>ftpquota</command></term>
-        <listitem>
-          <para>
-            is a Perl script designed to create and manage limits and tally
-            files for the mod_quotatab + mod_quotatab_file module combination
-            for proftpd
-          </para>
-          <indexterm zone="proftpd ftpquota">
-            <primary sortas="b-ftpquota">ftpquota</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpscrub">
-        <term><command>ftpscrub</command></term>
-        <listitem>
-          <para>
-            provides a way to scrub the scoreboard file on demand
-          </para>
-          <indexterm zone="proftpd ftpscrub">
-            <primary sortas="b-ftpscrub">ftpscrub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpshut">
-        <term><command>ftpshut</command></term>
-        <listitem>
-          <para>
-            shuts down all <application>proftpd</application> servers
-            at a given time
-          </para>
-          <indexterm zone="proftpd ftpshut">
-            <primary sortas="b-ftpshut">ftpshut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftptop">
-        <term><command>ftptop</command></term>
-        <listitem>
-          <para>
-            displays running status on connections
-          </para>
-          <indexterm zone="proftpd ftptop">
-            <primary sortas="b-ftptop">ftptop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpwho">
-        <term><command>ftpwho</command></term>
-        <listitem>
-          <para>
-            shows current process information for each session
-          </para>
-          <indexterm zone="proftpd ftpwho">
-            <primary sortas="b-ftpwho">ftpwho</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prxs">
-        <term><command>prxs</command></term>
-        <listitem>
-          <para>
-            is a Perl script designed to compile and install third-party
-            modules, from source code, as DSO modules for the installed
-            proftpd
-          </para>
-          <indexterm zone="proftpd prxs">
-            <primary sortas="b-prxs">prxs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: rver/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,328 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-time          "less than 0.1 SBU">
-  <!ENTITY vsftpd-empty         "/usr/share/vsftpd/empty">
-]>
-
-<sect1 id="vsftpd" xreflabel="vsftpd-&vsftpd-version;">
-  <?dbhtml filename="vsftpd.html"?>
-
-
-  <title>vsftpd-&vsftpd-version;</title>
-
-  <indexterm zone="vsftpd">
-    <primary sortas="a-vsftpd">vsftpd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to vsftpd</title>
-
-    <para>
-      The <application>vsftpd</application> package contains a very
-      secure and very small FTP daemon. This is useful for serving files
-      over a network.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vsftpd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vsftpd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vsftpd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vsftpd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vsftpd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vsftpd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">vsftpd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="linux-pam"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of vsftpd</title>
-
-    <para>
-      For security reasons, running <application>vsftpd</application>
-      as an unprivileged user and group is encouraged. Also, a user should be
-      created to map anonymous users. As the <systemitem
-      class="username">root</systemitem> user, create the needed directories,
-      users, and groups with the following commands:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m 0755 &vsftpd-empty; &amp;&amp;
-install -v -d -m 0755 /home/ftp               &amp;&amp;
-groupadd -g 47 vsftpd                         &amp;&amp;
-groupadd -g 45 ftp                            &amp;&amp;
-
-useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
-useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
-
-    <para>
-      Gcc-10 and later flags an error for an implicit type cast. Make it
-      explicit:
-    </para>
-
-<screen><userinput>sed -e "s/kVSFSysStrOpenUnknown;/(enum EVSFSysUtilOpenMode)&amp;/" -i sysstr.c</userinput></screen>
-
-    <para>
-      Build <application>vsftpd</application> as an unprivileged user
-      using the following command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Once again, become the <systemitem class="username">root</systemitem>
-      user and install <application>vsftpd</application> with the following
-      commands:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 vsftpd        /usr/sbin/vsftpd    &amp;&amp;
-install -v -m 644 vsftpd.8      /usr/share/man/man8 &amp;&amp;
-install -v -m 644 vsftpd.conf.5 /usr/share/man/man5 &amp;&amp;
-install -v -m 644 vsftpd.conf   /etc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>install -v -d ...</command>: This creates the
-      directory that anonymous users will use (<filename
-      class='directory'>/home/ftp</filename>)
-      and the directory the daemon will chroot into
-      (<filename class='directory'>&vsftpd-empty;</filename>).
-    </para>
-
-    <note>
-      <para>
-        <filename class="directory">/home/ftp</filename> should not be
-        owned by the user <systemitem class="username">vsftpd</systemitem>,
-        or the user <systemitem class="username">ftp</systemitem>.
-      </para>
-    </note>
-
-    <para>
-      <command>echo "#define VSF_BUILD_TCPWRAPPERS" >>builddefs.h</command>:
-      Use this prior to <command>make</command> to add support for
-      <application>tcpwrappers</application>.
-    </para>
-
-    <para>
-      <command>echo "#define VSF_BUILD_SSL" >>builddefs.h</command>:
-      Use this prior to <command>make</command> to add support for SSL.
-    </para>
-
-    <para>
-      <command>install -v -m ...</command>:
-      The <filename>Makefile</filename> uses non-standard installation paths.
-      These commands install the files in
-      <filename class='directory'>/usr</filename> and
-      <filename class='directory'>/etc</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring vsftpd</title>
-
-    <sect3 id="vsftpd-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/vsftpd.conf</filename>
-      </para>
-
-      <indexterm zone="vsftpd vsftpd-config">
-        <primary sortas="e-etc-vsftpd.conf">/etc/vsftpd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>vsftpd</application> comes with a basic
-        anonymous-only configuration file that was copied to
-        <filename class='directory'>/etc</filename> above. While still as
-        <systemitem class="username">root</systemitem>, this file should be
-        modified because it is now recommended to run <command>vsftpd</command>
-        in standalone mode. Also, you
-        should specify the privilege separation user created above. Finally,
-        you should specify the <command>chroot</command> directory.
-        <command>man vsftpd.conf</command> will give you all the details.
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
-<literal>background=YES
-nopriv_user=vsftpd
-secure_chroot_dir=&vsftpd-empty;</literal>
-EOF</userinput></screen>
-
-      <!-- recheck this issue when vsftpd is updated -->
-<!-- Aug'23:  Cannot see any difference in behavior of vsftpd
-              when that option is set or not
-
-      <para>
-        The vsftpd daemon uses seccomp to improve security by default.
-        But it's known to cause vsftpd unable to handle ftp
-        <literal>LIST</literal> command with recent kernel versions.  Append
-        a line to <filename>/etc/vsftpd.conf</filename> (as the
-        <systemitem class="username">root</systemitem> user) to disable
-        seccomp and workaround this issue:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
-<literal>seccomp_sandbox=NO</literal>
-EOF</userinput></screen>
--->
-      <para>
-        To enable local logins, append the following to the
-        <filename>/etc/vsftpd.conf</filename> file (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
-<literal>local_enable=YES</literal>
-EOF</userinput></screen>
-
-      <para>
-        In addition, if using <application>Linux-PAM</application> and
-        <application>vsftpd</application> with local user logins, you will need
-        a <application>Linux-PAM</application> configuration file. As the
-        <systemitem class="username">root</systemitem> user, create the
-        <filename>/etc/pam.d/vsftpd</filename> file, and add the needed
-        configuration changes for <application>Linux-PAM</application> session
-        support using the following commands:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/vsftpd &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/vsftpd
-auth       required     /lib/security/pam_listfile.so item=user sense=deny \
-                                                      file=/etc/ftpusers \
-                                                      onerr=succeed
-auth       required     pam_shells.so
-auth       include      system-auth
-account    include      system-account
-session    include      system-session</literal>
-EOF
-
-cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
-<literal>session_support=YES
-pam_service_name=vsftpd</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="vsftpd-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        Install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/vsftpd</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>vsftpd.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-<screen role="root"><userinput>make install-vsftpd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>vsftpd</seg>
-        <seg>None</seg>
-        <seg>/usr/share/vsftpd, /home/ftp</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vsftpd-prog">
-        <term><command>vsftpd</command></term>
-        <listitem>
-          <para>
-            is the FTP daemon
-          </para>
-          <indexterm zone="vsftpd vsftpd-prog">
-            <primary sortas="b-vsftpd">vsftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/bind.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="bind" xreflabel="bind">
+<?dbhtml filename="bind.html" dir="server"?>
+<title>bind</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/other/bind/bind.ent
===================================================================
--- server/other/bind/bind.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/bind/bind.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY bind SYSTEM "../bind.xml">
Index: server/other/cvsserver.xml
===================================================================
--- server/other/cvsserver.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/cvsserver.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="server-other-cvsserver">
+<?dbhtml filename="cvsserver.html" dir="server"?>
+<title>Running a cvs server</title>
+
+<para>???</para>
+
+</sect1>
Index: server/other/dhcp.xml
===================================================================
--- server/other/dhcp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="dhcp" xreflabel="dhcp-&dhcp-version;">
+<?dbhtml filename="dhcp.html" dir="server"?>
+<title>dhcp-&dhcp-version;</title>
+
+&dhcp-intro;
+&dhcp-inst;
+&dhcp-exp;
+&dhcp-config;
+&dhcp-desc;
+
+</sect1>
+
Index: server/other/dhcp/dhcp-config.xml
===================================================================
--- server/other/dhcp/dhcp-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp/dhcp-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,87 @@
+<sect2>
+<title>Configuring dhcp</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/dhclient.conf</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Information on configuring the dhcp client can be found in
+Chapter 06.</para>
+
+<para>Note that you only want to start the dhcp server if you want to
+issue LAN addresses over your network.  The dhcp client doesn't need
+this script to be used.  Also note that this script is coded for the
+'eth1' INTERFACE, which may need to be modified for your hardware
+configuration. With that in mind the dhcp init.d script can be created
+using the following commands.</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/dhcp &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/dhcp
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+        start)
+                echo "Starting DHCP Server..."
+                loadproc dhcpd -q eth1
+                ;;
+
+        stop)
+                echo "Stopping DHCP Server..."
+                killproc dhcpd
+                ;;
+
+        reload)
+                echo "Reloading DHCP Server..."
+                reloadproc dhcpd
+                ;;
+
+        restart)
+                $0 stop
+                sleep 1
+                $0 start
+                ;;
+
+        status)
+                statusproc dhcpd
+                ;;
+
+        *)
+                echo "Usage: $0 {start|stop|reload|restart|status}"
+                exit 1
+                ;;
+esac
+
+# End $rc_base/init.d/dhcp
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/dhcp</userinput></screen></para>
+
+<para>The follow commands will create a base configuration file for a
+dhcp server.  There are several options that you may want to
+add (information that is passed back to the dhcp client) and those are
+covered in the man pages for <filename>dhcp.conf</filename>.</para>
+
+<para><screen><userinput>cat &gt; /etc/dhcpd.conf &lt;&lt; "EOF"</userinput>
+default-lease-time 72000;
+max-lease-time 144000;
+
+subnet 192.168.5.0 netmask 255.255.255.0 {
+  range 192.168.5.10 192.168.5.240;
+  option broadcast-address 195.168.5.255;
+  option routers 192.168.5.1;
+}
+<userinput>EOF</userinput></screen></para>
+
+<para>All addresses should be changed to meet your circumstance.</para>
+
+</sect3>
+
+</sect2>
+
Index: server/other/dhcp/dhcp-desc.xml
===================================================================
--- server/other/dhcp/dhcp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp/dhcp-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Contents</title>
+
+<para>The dhcp package contains <userinput>dhclient</userinput>,
+<userinput>dhcpd</userinput>
+and <userinput>dhcrelay</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>dhclient</title>
+<para>dhclient is the implemtation of the DHCP client.</para></sect3>
+
+<sect3><title>dhcpd</title>
+<para>dhcpd implements Dynamic Host Configuration Protocol (DHCP)
+and Internet Bootstrap Protocol (BOOTP) requests for network
+addresses.</para></sect3>
+
+<sect3><title>dhcrelay</title>
+<para>dhcrelay 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.</para></sect3>
+
+</sect2>
+
Index: server/other/dhcp/dhcp-exp.xml
===================================================================
--- server/other/dhcp/dhcp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp/dhcp-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>make CC="gcc $CFLAGS" :</userinput> This makes dhcp
+compile using our CFLAGS for optimizations.</para>
+
+<para><userinput>LIBDIR=/usr/lib INCDIR=/usr/include:</userinput> This
+command installs the library and include files in <filename
+class="directory">/usr</filename> instead of <filename
+class="directory">/usr/local</filename>.</para>
+
+</sect2>
+
Index: server/other/dhcp/dhcp-inst.xml
===================================================================
--- server/other/dhcp/dhcp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp/dhcp-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of dhcp</title>
+
+<para>Install dhcp by running the following commands:</para>
+
+<para><screen><userinput>./configure &amp;&amp;
+make CC="gcc $CFLAGS" &amp;&amp;
+make LIBDIR=/usr/lib INCDIR=/usr/include install</userinput></screen></para>
+
+</sect2>
+
Index: server/other/dhcp/dhcp-intro.xml
===================================================================
--- server/other/dhcp/dhcp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp/dhcp-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to dhcp</title>
+
+<screen>Download location:              &dhcp-download;
+Version used:                   &dhcp-version;
+Package size:                   &dhcp-size;
+Estimated Disk space required:  &dhcp-buildsize;</screen>
+
+<para>The dhcp package contains both the client and server programs for
+DHCP. dhclient (the client) is useful for connecting your computer to a
+network which uses DHCP to assign network addresses. dhcpd (the server)
+is useful for assigning network addresses on your private network.</para>
+
+<screen>dhcp needs nothing to compile but you must have Packet Socket
+support compiled in the kernel and Socket Filtering either compiled in
+or as a kernel module to use it.</screen>
+
+</sect2>
Index: server/other/dhcp/dhcp.ent
===================================================================
--- server/other/dhcp/dhcp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/dhcp/dhcp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<!ENTITY dhcp SYSTEM "../dhcp.xml">
+<!ENTITY dhcp-intro SYSTEM "dhcp-intro.xml">
+<!ENTITY dhcp SYSTEM "dhcp.xml">
+<!ENTITY dhcp-intro SYSTEM "dhcp-intro.xml">
+<!ENTITY dhcp-inst SYSTEM "dhcp-inst.xml">
+<!ENTITY dhcp-exp SYSTEM "dhcp-exp.xml">
+<!ENTITY dhcp-desc SYSTEM "dhcp-desc.xml">
+<!ENTITY dhcp-config SYSTEM "dhcp-config.xml">
+<!ENTITY dhcp-buildsize "23 MB">
+<!ENTITY dhcp-version "3.0pl1">
+<!ENTITY dhcp-download "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0pl1.tar.gz">
+<!ENTITY dhcp-size "845 KB">
Index: server/other/leafnode.xml
===================================================================
--- server/other/leafnode.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/leafnode.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="leafnode" xreflabel="leafnode">
+<?dbhtml filename="leafnode.html" dir="server"?>
+<title>leafnode</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/other/leafnode/leafnode.ent
===================================================================
--- server/other/leafnode/leafnode.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/leafnode/leafnode.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY leafnode SYSTEM "../leafnode.xml">
Index: rver/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,892 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 openldap-download-http "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-download-ftp  " ">
-  <!ENTITY openldap-md5sum        "cf71b4b455ab8dfc8fdd4e247d697ccd">
-  <!ENTITY openldap-size          "6.2 MB">
-  <!ENTITY openldap-buildsize     "82 MB (client and server)">
-  <!ENTITY openldap-time          "0.4 SBU (client), 1.1 SBU (server)">
-]>
-
-<sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
-  <?dbhtml filename="openldap.html"?>
-
-
-  <title>OpenLDAP-&openldap-version;</title>
-
-  <indexterm zone="openldap">
-    <primary sortas="a-OpenLDAP">OpenLDAP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenLDAP</title>
-
-    <para>
-      The <application>OpenLDAP</application> package provides an open
-      source implementation of the Lightweight Directory Access Protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openldap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openldap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openldap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openldap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openldap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openldap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/openldap-&openldap-version;-consolidated-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenLDAP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnutls"/>,
-      <xref linkend="unixodbc"/>,
-        <xref linkend="mariadb"/> or
-        <xref linkend="postgresql"/> or
-        <ulink url="https://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
-      &berkeley-db; (for slapd, also deprecated)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenLDAP</title>
-
-    <note>
-      <para>
-        If you only need to install the client side <command>ldap*</command>
-        binaries, corresponding man pages, libraries and header files (referred
-        to as a <quote>client-only</quote> install), issue these commands
-        instead of the following ones (no test suite available):
-      </para>
-
-<screen role="nodump"><userinput>patch -Np1 -i ../openldap-&openldap-version;-consolidated-1.patch &amp;&amp;
-autoconf &amp;&amp;
-
-./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-static     \
-            --enable-dynamic     \
-            --disable-debug      \
-            --disable-slapd &amp;&amp;
-
-make depend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Then, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>make install</userinput></screen>
-
-    </note>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>slapd</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 83 ldap &amp;&amp;
-useradd  -c "OpenLDAP Daemon Owner" \
-         -d /var/lib/openldap -u 83 \
-         -g ldap -s /bin/false ldap</userinput></screen>
-
-    <para>
-      Install <application>OpenLDAP</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-consolidated-1.patch &amp;&amp;
-autoconf &amp;&amp;
-
-./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --libexecdir=/usr/lib \
-            --disable-static      \
-            --disable-debug       \
-            --with-tls=openssl    \
-            --with-cyrus-sasl     \
-            --without-systemd     \
-            --enable-dynamic      \
-            --enable-crypt        \
-            --enable-spasswd      \
-            --enable-slapd        \
-            --enable-modules      \
-            --enable-rlookups     \
-            --enable-backends=mod \
-            --disable-sql         \
-            --disable-wt          \
-            --enable-overlays=mod &amp;&amp;
-
-make depend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The tests are fragile, and errors may cause the tests to abort
-      prior to finishing. Some errors may happen due to timing problems.
-      The tests take around an hour, and the time is CPU independent due
-      to delays in the tests. On most systems, the tests will run up to the
-      <filename>test065-proxyauth for mdb</filename> test.
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-sed -e "s/\.la/.so/" -i /etc/openldap/slapd.{conf,ldif}{,.default} &amp;&amp;
-
-install -v -dm700 -o ldap -g ldap /var/lib/openldap     &amp;&amp;
-
-install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &amp;&amp;
-chmod   -v    640     /etc/openldap/slapd.{conf,ldif}   &amp;&amp;
-chown   -v  root:ldap /etc/openldap/slapd.{conf,ldif}   &amp;&amp;
-
-install -v -dm755 /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp      -vfr      doc/{drafts,rfc,guide} \
-                  /usr/share/doc/openldap-&openldap-version;</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>
-      <parameter>--disable-debug</parameter>: This switch disables
-      the debugging code in <application>OpenLDAP</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-dynamic</parameter>: This switch forces the
-      <application>OpenLDAP</application> libraries to be dynamically
-      linked to the executable programs.
-    </para>
-
-    <para>
-      <parameter>--enable-crypt</parameter>: This switch enables using
-      <ulink role='man' url='&man;crypt.3'>crypt(3)</ulink> passwords.
-    </para>
-
-    <para>
-      <parameter>--enable-spasswd</parameter>: This switch enables
-      <application>SASL</application> password verification.
-    </para>
-
-    <para>
-      <parameter>--enable-modules</parameter>: This switch enables dynamic
-      module support.
-    </para>
-
-    <para>
-      <parameter>--enable-rlookups</parameter>: This switch enables
-      reverse lookups of client hostnames.
-    </para>
-
-    <para>
-      <parameter>--enable-backends</parameter>: This switch enables
-      all available backends.
-    </para>
-
-    <para>
-      <parameter>--enable-overlays</parameter>: This switch enables
-      all available overlays.
-    </para>
-
-<!--
-    <para>
-      <parameter>- -disable-ndb</parameter>: This switch disables
-      <application>MySQL</application> NDB Cluster backend
-      which causes configure to fail if
-      <application>MySQL</application> is present.
-    </para>
--->
-
-    <para>
-      <parameter>--disable-sql</parameter>: This switch explicitly
-      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>
-
-    <para>
-     <parameter>--libexecdir=/usr/lib</parameter>: This switch controls where
-     the <filename class="directory">/usr/lib/openldap</filename> directory is
-     installed.  Everything in that directory is a library, so it belongs under
-     <filename class="directory">/usr/lib</filename> instead of
-     <filename class="directory">/usr/libexec</filename>.
-    </para>
-
-    <para>
-      <option>--enable-slp</option>: This switch enables
-      SLPv2 support. Use it if you have installed
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>.
-    </para>
-
-    <para>
-      <option>--disable-versioning</option>: This switch disables
-      symbol versioning in the <application>OpenLDAP</application> libraries.
-      The default is to have symbol versioning. Note that if you have
-      built applications using this package with symbol versioning, and
-      remove the symbols, the applications may fail to run.
-    </para>
-
-    <note>
-      <para>
-        You can run <command>./configure --help</command> to see if there
-        are other switch you can pass to the <command>configure</command>
-        command to enable other options or dependency packages.
-      </para>
-    </note>
-
-    <para>
-      <command>install ...</command>, <command>chown ...</command>,
-      and <command>chmod ...</command>:
-      Having slapd configuration files and ldap databases in /var/lib/openldap
-      readable by anyone is a SECURITY ISSUE, especially since a file stores the
-      admin password in PLAIN TEXT. That's why mode 640 and root:ldap ownership
-      were used. The owner is root, so only root can modify the file, and group is
-      ldap, so that the group which owns slapd daemon could read but not modify
-      the file in case of a security breach.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenLDAP</title>
-
-    <sect3 id="openldap-config">
-      <title>Config Files</title>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            For LDAP client: <filename>/etc/openldap/ldap.conf</filename> and
-            <filename>~/.ldaprc</filename>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            For LDAP server, two configuration mechanisms are used:
-            a legacy <filename>/etc/openldap/slapd.conf</filename>
-            configuration file and the recommended
-            <emphasis>slapd-config</emphasis> system, using an LDIF database
-            stored in
-            <filename class="directory">/etc/openldap/slapd.d</filename>.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <indexterm zone="openldap openldap-config">
-        <primary
-          sortas="e-etc-openldap-ldap.conf">/etc/openldap/ldap.conf</primary>
-      </indexterm>
-
-      <indexterm zone="openldap openldap-config">
-        <primary sortas="e-AA.ldaprc">~/.ldaprc</primary>
-      </indexterm>
-
-      <indexterm zone="openldap openldap-config">
-        <primary
-          sortas="e-etc-openldap-slapd.conf">/etc/openldap/slapd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="openldap openldap-config">
-        <primary
-          sortas="e-etc-openldap-slapd.d">/etc/openldap/slapd.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Configuring the <command>slapd</command> servers can be complex.
-        Securing the LDAP directory, especially if you are storing non-public
-        data such as password databases, can also be a challenging task. In
-        order to set up <application>OpenLDAP</application>, you'll need to
-        modify either the <filename>/etc/openldap/slapd.conf</filename>
-        file (old method), or the <filename>/etc/openldap/slapd.ldif</filename>
-        file and then use <command>ldapadd</command> to create the LDAP
-        configuration database in
-        <filename class="directory">/etc/openldap/slapd.d</filename>
-        (recommended by the OpenLDAP documentation).
-      </para>
-<!--
-      <para>
-        The shipped configuration files suppose the loadable modules are
-        installed with their <filename class="extension">.la</filename>
-        files, which may not be true if you remove those files as instructed
-        in <xref linkend="libtool"/>. If this is the case, issue, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed 's/\.la$/.so/' -i /etc/openldap/slapd.{conf,ldif}{,.default}</userinput></screen>
--->
-      <warning>
-        <para>
-          The instructions above install an empty LDAP structure and a default
-          <filename>/etc/openldap/slapd.conf</filename> file, which are
-          suitable for testing the build and other packages using LDAP. Do not
-          use them on a production server.
-        </para>
-      </warning>
-
-      <para>
-        Resources to assist you with topics such as choosing a directory
-        configuration, backend and database definitions, access control
-        settings, running as a user other than
-        <systemitem class="username">root</systemitem>
-        and setting a <command>chroot</command> environment include:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            The <ulink role='man' url='&man;slapd.8'>slapd(8)</ulink> man
-            page.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <ulink role='man'
-            url='&man;slapd.conf.5'>slapd.conf(5)</ulink> and
-            <ulink role='man'
-            url='&man;slapd-config.5'>slapd-config(5)</ulink> man pages.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <ulink url="https://www.openldap.org/doc/admin26/"> OpenLDAP 2.6
-            Administrator's Guide</ulink> (also installed locally in
-            <filename class="directory">
-            /usr/share/doc/openldap-&openldap-version;/guide/admin</filename>).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Documents located at
-            <ulink url="https://www.openldap.org/pub/"/>.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-<!--
-    <sect3>
-      <title>Mozilla Address Directory</title>
-
-      <para>
-        By default, LDAPv2 support is disabled in the
-        <filename>slapd.conf</filename> file. Once the database is properly
-        set up and <application>Mozilla</application> is configured to use the
-        directory, you must add <option>allow bind_v2</option> to the
-        <filename>slapd.conf</filename> file.
-      </para>
-
-    </sect3>
- -->
-
-    <sect3 id="openldap-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automate the startup of the LDAP server at system bootup,
-        install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/slapd</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>slapd.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/>
-        package using the following command:
-      </para>
-
-      <indexterm zone="openldap openldap-init">
-        <primary sortas="f-slapd">slapd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-slapd</userinput></screen>
-
-      <note>
-        <para>
-          You'll need to modify
-          <phrase revision="sysv"><filename>/etc/sysconfig/slapd</filename></phrase>
-          <phrase revision="systemd"><filename>/etc/default/slapd</filename></phrase>
-          to include the parameters needed for your specific configuration. See
-          the <command>slapd</command> man page for parameter information.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3>
-      <title>Testing the Configuration</title>
-
-      <para>
-        Start the LDAP server using
-        <phrase revision="sysv">the init script:</phrase>
-        <phrase revision="systemd">systemctl:</phrase>
-      </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/slapd start</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl start slapd</userinput></screen>
-
-      <para>
-        Verify access to the LDAP server with the following command:
-      </para>
-
-<screen><userinput>ldapsearch -x -b '' -s base '(objectclass=*)' namingContexts</userinput></screen>
-
-      <para>
-        The expected result is:
-      </para>
-
-<screen><computeroutput># extended LDIF
-#
-# LDAPv3
-# base &lt;&gt; with scope baseObject
-# filter: (objectclass=*)
-# requesting: namingContexts
-#
-
-#
-dn:
-namingContexts: dc=my-domain,dc=com
-
-# search result
-search: 2
-result: 0 Success
-
-# numResponses: 2
-# numEntries: 1</computeroutput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ldapadd, ldapcompare, ldapdelete, ldapexop, ldapmodify, ldapmodrdn,
-          ldappasswd, ldapsearch, ldapurl, ldapvc, ldapwhoami, slapacl, slapadd,
-          slapauth, slapcat, slapd, slapdn, slapindex, slapmodify, slappasswd,
-          slapschema, and slaptest
-        </seg>
-        <seg>
-          liblber.so, libldap.so, and several under /usr/lib/openldap
-        </seg>
-        <seg>
-          /etc/openldap,
-          /{usr,var}/lib/openldap, and
-          /usr/share/doc/openldap-&openldap-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ldapadd">
-        <term><command>ldapadd</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and adds entries
-          </para>
-          <indexterm zone="openldap ldapadd">
-            <primary sortas="b-ldapadd">ldapadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapcompare">
-        <term><command>ldapcompare</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and performs
-            a compare using specified parameters
-          </para>
-          <indexterm zone="openldap ldapcompare">
-            <primary sortas="b-ldapcompare">ldapcompare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapdelete">
-        <term><command>ldapdelete</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and deletes
-            one or more entries
-          </para>
-          <indexterm zone="openldap ldapdelete">
-            <primary sortas="b-ldapdelete">ldapdelete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapexop">
-        <term><command>ldapexop</command></term>
-        <listitem>
-          <para>
-            issues the LDAP extended operation specified by
-            oid or one of the  special  keywords  whoami,
-            cancel, or refresh
-          </para>
-          <indexterm zone="openldap ldapexop">
-            <primary sortas="b-ldapexop">ldapexop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapmodify">
-        <term><command>ldapmodify</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and modifies entries
-          </para>
-          <indexterm zone="openldap ldapmodify">
-            <primary sortas="b-ldapmodify">ldapmodify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapmodrdn">
-        <term><command>ldapmodrdn</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and modifies
-            the RDN of entries
-          </para>
-          <indexterm zone="openldap ldapmodrdn">
-            <primary sortas="b-ldapmodrdn">ldapmodrdn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldappasswd">
-        <term><command>ldappasswd</command></term>
-        <listitem>
-          <para>
-            is a tool used to set the password of an LDAP user
-          </para>
-          <indexterm zone="openldap ldappasswd">
-            <primary sortas="b-ldappasswd">ldappasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapsearch">
-        <term><command>ldapsearch</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and performs
-            a search using specified parameters
-          </para>
-          <indexterm zone="openldap ldapsearch">
-            <primary sortas="b-ldapsearch">ldapsearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapurl">
-        <term><command>ldapurl</command></term>
-        <listitem>
-          <para>
-            is a command that allows to either compose or
-            decompose LDAP URIs
-          </para>
-          <indexterm zone="openldap ldapurl">
-            <primary sortas="b-ldapurl">ldapurl</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and displays
-            whoami information
-          </para>
-          <indexterm zone="openldap ldapwhoami">
-            <primary sortas="b-ldapwhoami">ldapwhoami</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapacl">
-        <term><command>slapacl</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="openldap slapacl">
-            <primary sortas="b-slapacl">slapacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapadd">
-        <term><command>slapadd</command></term>
-        <listitem>
-          <para>
-            is used to add entries specified in LDAP Directory Interchange
-            Format (LDIF) to an LDAP database
-          </para>
-          <indexterm zone="openldap slapadd">
-            <primary sortas="b-slapadd">slapadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapauth">
-        <term><command>slapauth</command></term>
-        <listitem>
-          <para>
-            is used to check the behavior of the slapd
-            in mapping identities for authentication and
-            authorization purposes, as specified in slapd.conf
-          </para>
-          <indexterm zone="openldap slapauth">
-            <primary sortas="b-slapauth">slapauth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapcat">
-        <term><command>slapcat</command></term>
-        <listitem>
-          <para>
-            is used to generate an LDAP LDIF output based upon the
-            contents of a slapd database
-          </para>
-          <indexterm zone="openldap slapcat">
-            <primary sortas="b-slapcat">slapcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapd">
-        <term><command>slapd</command></term>
-        <listitem>
-          <para>
-            is the standalone LDAP server
-          </para>
-          <indexterm zone="openldap slapd">
-            <primary sortas="b-slapd">slapd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapdn">
-        <term><command>slapdn</command></term>
-        <listitem>
-          <para>
-            checks a list of string-represented DNs based on schema syntax
-          </para>
-          <indexterm zone="openldap slapdn">
-            <primary sortas="b-slapdn">slapdn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapindex">
-        <term><command>slapindex</command></term>
-        <listitem>
-          <para>
-            is used to regenerate slapd indexes based upon the current
-            contents of a database
-          </para>
-          <indexterm zone="openldap slapindex">
-            <primary sortas="b-slapindex">slapindex</primary>
-          </indexterm>
-        </listitem>
-      </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
-          </para>
-          <indexterm zone="openldap slappasswd">
-            <primary sortas="b-slappasswd">slappasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapschema">
-        <term><command>slapschema</command></term>
-        <listitem>
-          <para>
-            is used to check schema compliance of the contents
-            of a slapd database
-          </para>
-          <indexterm zone="openldap slapschema">
-            <primary sortas="b-slapschema">slapschema</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slaptest">
-        <term><command>slaptest</command></term>
-        <listitem>
-          <para>
-            checks the sanity of the <filename>slapd.conf</filename> file
-          </para>
-          <indexterm zone="openldap slaptest">
-            <primary sortas="b-slaptest">slaptest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblber">
-        <term><filename class="libraryfile">liblber.so</filename></term>
-        <listitem>
-          <para>
-            is a set of Lightweight Basic Encoding Rules routines. These
-            routines are used by the LDAP library routines to encode and decode
-            LDAP protocol elements using the (slightly simplified) Basic
-            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
-          </para>
-          <indexterm zone="openldap liblber">
-            <primary sortas="c-liblber">liblber.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libldap">
-        <term><filename class="libraryfile">libldap.so</filename></term>
-        <listitem>
-          <para>
-            supports the LDAP programs and provide functionality for
-            other programs interacting with LDAP
-          </para>
-          <indexterm zone="openldap libldap">
-            <primary sortas="c-libldap">libldap.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="libldap_r">
-        <term><filename class="libraryfile">libldap_r.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions required by the LDAP programs to
-            produce the results from LDAP requests
-          </para>
-          <indexterm zone="openldap libldap_r">
-            <primary sortas="c-libldap_r">libldap_r.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="openssh" xreflabel="openssh-&openssh-version;">
+<?dbhtml filename="openssh.html" dir="server"?>
+<title>OpenSSH-&openssh-version;</title>
+
+&openssh-intro;
+&openssh-inst;
+&openssh-exp;
+&openssh-config;
+&openssh-desc;
+
+</sect1>
+
Index: server/other/openssh/openssh-config.xml
===================================================================
--- server/other/openssh/openssh-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh/openssh-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,79 @@
+<sect2>
+<title>Configuring OpenSSH</title>
+
+<sect3><title>Config files</title>
+
+<para><userinput>/etc/ssh/ssh_config, /etc/ssh/sshd_config </userinput></para>
+<para>There are no required changes in either of these files.  However
+you may wish to view them to make changes for appropriate security to
+your system. Configuration information can be found in the man pages for sshd, ssh and ssh-agent</para>
+</sect3>
+
+<sect3><title>sshd init.d script</title>
+
+<para>Note that you only want to start the sshd server if you want to be
+able to ssh <emphasis>into</emphasis> your machine.  The ssh client
+doesn't need this script to be used.  Having said that, if you want to
+run the ssh daemon, the sshd init.d script can be created using the following 
+commands:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/sshd &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/sshd
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+        start)
+	        echo "Starting SSH Server..."
+	        loadproc sshd
+	        ;;
+
+	stop)
+	        echo "Stopping SSH Server..."
+	        killproc sshd
+	        ;;
+
+	reload)
+	        echo "Reloading SSH Server..."
+	        reloadproc sshd
+	        ;;
+	     
+	restart)
+	        $0 stop
+	        sleep 1
+	        $0 start
+	        ;;
+
+	status)
+	        statusproc sshd
+	        ;;
+
+	*)
+	        echo "Usage: $0 {start|stop|reload|restart|status}"
+	        exit 1
+	        ;;
+esac
+
+# End $rc_base/init.d/sshd
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/sshd</userinput></screen></para>
+
+<para>Create the symbolic links to this file in the relevant rc.d directories with the following commands:
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/sshd ../rc0.d/K30sshd &amp;&amp;
+ln -sf ../init.d/sshd ../rc1.d/K30sshd &amp;&amp;
+ln -sf ../init.d/sshd ../rc2.d/K30sshd &amp;&amp;
+ln -sf ../init.d/sshd ../rc3.d/S30sshd &amp;&amp;
+ln -sf ../init.d/sshd ../rc4.d/S30sshd &amp;&amp;
+ln -sf ../init.d/sshd ../rc5.d/S30sshd &amp;&amp;
+ln -sf ../init.d/sshd ../rc6.d/K30sshd</userinput></screen></para>
+
+</sect3>
+
+</sect2>
+
Index: server/other/openssh/openssh-desc.xml
===================================================================
--- server/other/openssh/openssh-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh/openssh-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,43 @@
+<sect2>
+<title>Contents</title>
+
+<para>The OpenSSH package contains <userinput>ssh</userinput>,
+<userinput>sshd</userinput>, <userinput>ssh-agent</userinput>,
+<userinput>ssh-add</userinput>, <userinput>sftp</userinput>,
+<userinput>scp</userinput>, <userinput>ssh-keygen</userinput>,
+<userinput>sftp-server</userinput> and
+<userinput>ssh-keyscan</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ssh</title>
+<para>The basic rlogin/rsh-like client program.</para></sect3>
+
+<sect3><title>sshd</title>
+<para>The daemon that permits you to login.</para></sect3>
+
+<sect3><title>ssh-agent</title>
+<para>An authentication agent that can store private keys.</para></sect3>
+
+<sect3><title>ssh-add</title>
+<para>Tool which adds keys to the ssh-agent.</para></sect3>
+
+<sect3><title>sftp</title>
+<para>FTP-like program that works over SSH1 and SSH2 protocol.</para></sect3>
+
+<sect3><title>scp</title>
+<para>File copy program that acts like rcp.</para></sect3>
+
+<sect3><title>ssh-keygen</title>
+<para>Key generation tool.</para></sect3>
+
+<sect3><title>sftp-server</title>
+<para>SFTP server subsystem.</para></sect3>
+
+<sect3><title>ssh-keyscan</title>
+<para>Utility for gathering public host keys from a number of hosts.</para></sect3>
+
+</sect2>
+
Index: server/other/openssh/openssh-exp.xml
===================================================================
--- server/other/openssh/openssh-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh/openssh-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,22 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--sysconfigdir=/etc/ssh :</userinput> This prevents the 
+configuration files from going to /usr/etc.</para>
+
+<para><userinput>--with-md5-passwords :</userinput> This is required
+if you made the changes recommended by the shadowpasswd_plus lfs hint on
+your ssh server when you installed the Shadow Password Suite or if you
+access a ssh server that authenticates by user passwords encrypted with
+md5. </para>
+
+<para><userinput>--libexecdir=/usr/sbin :</userinput> OpenSSH puts
+programs called by programs in /usr/libexec.  sftp-server is a sshd
+utility and ssh-askpass is a ssh-add utility that is installed as a
+link to X11-ssh-askpass.  Both of these should go in <filename
+class="directory">/usr/sbin</filename> not <filename
+class="directory">/usr/libexec</filename>.</para>
+
+
+</sect2>
+
Index: server/other/openssh/openssh-inst.xml
===================================================================
--- server/other/openssh/openssh-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh/openssh-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Installation of OpenSSH</title>
+
+<para>OpenSSH runs as two processes when connecting to other
+computers. The first process is a priviledged process and controls the
+issuance of privileges as necessary. The second process communicates
+with the network. Additional installation steps are necessary to set up
+the proper environment which are preformed by the following
+commands:</para>
+
+<para><screen><userinput>mkdir /var/empty &amp;&amp;
+chown root:sys /var/empty &amp;&amp;
+chmod 755 /var/empty &amp;&amp;
+groupadd sshd &amp;&amp;
+useradd -g sshd sshd</userinput></screen></para>
+
+<para>Install OpenSSH by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc/ssh \
+&nbsp;&nbsp;&nbsp;--libexecdir=/usr/sbin --with-md5-passwords &amp;&amp;
+make &amp;&amp;
+make install </userinput></screen></para>
+
+</sect2>
+
Index: server/other/openssh/openssh-intro.xml
===================================================================
--- server/other/openssh/openssh-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh/openssh-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to OpenSSH</title>
+
+<screen>Download location:              <ulink url="&openssh-download;"/>
+Version used:                   &openssh-version;
+Package size:                   &openssh-size;
+Estimated Disk space required:  &openssh-buildsize;</screen>
+
+<para>The OpenSSH package contains ssh clients and the sshd daemon.  This is 
+useful for encrypting all traffic over a network.</para>
+
+<screen>OpenSSH depends on: 
+<xref linkend="zlib"/> and <xref linkend="openssl"/>.
+OpenSSH will utilize: 
+X11-ssh-askpass and PAM if they are installed prior to OpenSSH.</screen>
+
+</sect2>
Index: server/other/openssh/openssh.ent
===================================================================
--- server/other/openssh/openssh.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/openssh/openssh.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY openssh SYSTEM "../openssh.xml">
+<!ENTITY openssh-intro SYSTEM "openssh-intro.xml">
+<!ENTITY openssh-inst SYSTEM "openssh-inst.xml">
+<!ENTITY openssh-exp SYSTEM "openssh-exp.xml">
+<!ENTITY openssh-desc SYSTEM "openssh-desc.xml">
+<!ENTITY openssh-config SYSTEM "openssh-config.xml">
+<!ENTITY openssh-buildsize "7.9 MB">
+<!ENTITY openssh-version "3.4p1">
+<!ENTITY openssh-download "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.4p1.tar.gz">
+<!ENTITY openssh-size "816 KB">
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ server/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,28 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="server-other">
+<?dbhtml filename="other.html" dir="server"?>
+<title>Other Server Software</title>
 
-<chapter id="server-other">
-  <?dbhtml filename="other.html"?>
-
-  <title>Other Server Software</title>
-
-  <para>
-    Here you will find many ways to share your machine with the rest
-    of the world or your local network.  Before installing
-    any packages in this chapter, you need to be sure you understand what
-    the package does and how to set it up correctly.  It might also be
-    helpful to learn about the consequences of an improper setup so
-    that you can analyze the risks.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soprano.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unbound.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtuoso.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>-->
+&openssh;
+&server-other-cvsserver;
+&bind;
+&dhcp;
+&xinetd;
+&leafnode;
+&samba;
 
 </chapter>
Index: server/other/samba.xml
===================================================================
--- server/other/samba.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/samba.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="samba" xreflabel="samba">
+<?dbhtml filename="samba.html" dir="server"?>
+<title>samba</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/other/samba/samba.ent
===================================================================
--- server/other/samba/samba.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/samba/samba.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY samba SYSTEM "../samba.xml">
Index: rver/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,369 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unbound-download-http "https://nlnetlabs.nl/downloads/unbound/unbound-&unbound-version;.tar.gz">
-  <!ENTITY unbound-download-ftp  " ">
-  <!ENTITY unbound-md5sum        "00bf61460c87c2542bcb68d52a2e5195">
-  <!ENTITY unbound-size          "6.1 MB">
-  <!ENTITY unbound-buildsize     "145 MB (with docs; add 13 MB for tests)">
-  <!ENTITY unbound-time          "0.3 SBU (Using parallelism=4; with docs; add 0.4 SBU for tests)">
-]>
-
-<sect1 id="unbound" xreflabel="Unbound-&unbound-version;">
-  <?dbhtml filename="unbound.html"?>
-
-
-  <title>Unbound-&unbound-version;</title>
-
-  <indexterm zone="unbound">
-    <primary sortas="a-Unbound">Unbound</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Unbound</title>
-
-    <para>
-      <application>Unbound</application> is a validating, recursive, and caching
-      DNS resolver. It is designed as a set of modular components that
-      incorporate modern features, such as enhanced security (DNSSEC)
-      validation, Internet Protocol Version 6 (IPv6), and a client resolver
-      library API as an integral part of the architecture.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unbound-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unbound-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unbound-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unbound-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unbound-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unbound-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Unbound Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openssl"/>
- broken?
-      or <xref linkend="nss"/>
-    </para>
--->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libevent"/>,
-      <xref linkend="nettle"/>,
-      <xref linkend="protobuf-c"/> (for dnstap),
-      <xref linkend="python2"/>,
-      <xref linkend="sphinx"/> (for Python bindings documentation),
-      <xref linkend="swig"/> (for Python bindings),
-      <xref linkend="doxygen"/> (for html documentation), and
-      <ulink url="https://dnstap.info/">dnstap</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Unbound</title>
-
-    <para>
-      There should be a dedicated user and group to take control of the
-      <command>unbound</command> daemon after it is started. Issue the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 88 unbound &amp;&amp;
-useradd -c "Unbound DNS Resolver" -d /var/lib/unbound -u 88 \
-        -g unbound -s /bin/false unbound</userinput></screen>
-
-    <para>
-      Install <application>Unbound</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  \
-            --with-pidfile=/run/unbound.pid &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> package installed and want to build
-      html documentation, run the following command:
-    </para>
-
-<screen remap="doc"><userinput>make doc</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mv -v /usr/sbin/unbound-host /usr/bin/</userinput></screen>
-
-    <para>
-      If you built the 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 -m755 -d /usr/share/doc/unbound-&unbound-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/unbound-&unbound-version;</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>
-      <option>--with-libevent</option>: This option enables libevent support
-      allowing use of large outgoing port ranges.
-    </para>
-
-    <para>
-      <option>--with-pyunbound</option>: This option enables building of the Python
-      bindings.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Unbound</title>
-
-    <sect3 id="unbound-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/unbound/unbound.conf</filename>
-      </para>
-
-      <indexterm zone="unbound unbound-config">
-        <primary sortas="e-etc-unbound-unbound.conf">/etc/unbound/unbound.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        In the default configuration, <command>unbound</command> will bind to
-        localhost (127.0.0.1 IP address) and allow recursive queries only from
-        localhost clients. If you want to use <command>unbound</command> for
-        local DNS resolution, run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo "nameserver 127.0.0.1" > /etc/resolv.conf</userinput></screen>
-
-      <para>
-        For advanced configuration see
-        <filename>/etc/unbound/unbound.conf</filename> file and the
-        documentation.
-      </para>
-
-      <para revision="sysv">
-        When <application>Unbound</application> is installed, some package
-        builds fail if the file <filename>/etc/unbound/root.key</filename> is
-        not found. This file is created by running the boot script (install
-        instructions below).  Alternatively, it can be created by running the
-        following command as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-      <para revision="systemd">
-        When <application>Unbound</application> is installed, some package
-        builds fail if the file <filename>/etc/unbound/root.key</filename> is
-        not found. Create this file by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>unbound-anchor</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="unbound-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        If you want the <application>Unbound</application> server to
-        start automatically when the system is booted, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/unbound</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>unbound.service</filename>
-        unit</phrase> included
-        in the <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="unbound unbound-init">
-        <primary sortas="f-unbound">unbound</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-unbound</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          unbound, unbound-anchor, unbound-checkconf, unbound-control,
-          unbound-control-setup, and unbound-host
-        </seg>
-        <seg>
-          libunbound.so and (optional)
-          /usr/lib/python&python2-majorver;/site-packages/_unbound.so
-        </seg>
-        <seg>
-          /etc/unbound and /usr/share/doc/unbound-&unbound-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="unbound-prog">
-        <term><command>unbound</command></term>
-        <listitem>
-          <para>
-            is a DNS resolver daemon
-          </para>
-          <indexterm zone="unbound unbound-prog">
-            <primary sortas="b-unbound">unbound</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-anchor">
-        <term><command>unbound-anchor</command></term>
-        <listitem>
-          <para>
-            performs setup or update of the root trust anchor for DNSSEC
-            validation
-          </para>
-          <indexterm zone="unbound unbound-anchor">
-            <primary sortas="b-unbound-anchor">unbound-anchor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-checkconf">
-        <term><command>unbound-checkconf</command></term>
-        <listitem>
-          <para>
-            checks the <command>unbound</command> configuration file for syntax
-            and other errors
-          </para>
-          <indexterm zone="unbound unbound-checkconf">
-            <primary sortas="b-unbound-checkconf">unbound-checkconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-control">
-        <term><command>unbound-control</command></term>
-        <listitem>
-          <para>
-            performs remote administration on the <command>unbound</command> DNS
-            resolver
-          </para>
-          <indexterm zone="unbound unbound-control">
-            <primary sortas="b-unbound-control">unbound-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-control-setup">
-        <term><command>unbound-control-setup</command></term>
-        <listitem>
-          <para>
-            generates a self-signed certificate and private keys for the server
-            and client
-          </para>
-          <indexterm zone="unbound unbound-control-setup">
-            <primary sortas="b-unbound-control-setup">unbound-control-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-host">
-        <term><command>unbound-host</command></term>
-        <listitem>
-          <para>
-            is a DNS lookup utility similar to <command>host</command> from
-            <xref linkend="bind-utils"/>
-          </para>
-          <indexterm zone="unbound unbound-host">
-            <primary sortas="b-unbound-host">unbound-host</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libunbound">
-        <term><filename class="libraryfile">libunbound.so</filename></term>
-        <listitem>
-          <para>
-            provides the <application>Unbound</application> API functions to
-            programs
-          </para>
-          <indexterm zone="unbound libunbound">
-            <primary sortas="c-libunbound">libunbound.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/xinetd.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="xinetd" xreflabel="xinetd">
+<?dbhtml filename="xinetd.html" dir="server"?>
+<title>xinetd</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/other/xinetd/xinetd.ent
===================================================================
--- server/other/xinetd/xinetd.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/other/xinetd/xinetd.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY xinetd SYSTEM "../xinetd.xml">
Index: server/server.ent
===================================================================
--- server/server.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/server.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,33 @@
+<!ENTITY server SYSTEM "server.xml">
+
+<!-- Mail server software -->
+<!ENTITY server-mail SYSTEM "mail/mail.xml">
+<!ENTITY % postfix SYSTEM "mail/postfix/postfix.ent">
+<!ENTITY % qmail SYSTEM "mail/qmail/qmail.ent">
+<!ENTITY % sendmail SYSTEM "mail/sendmail/sendmail.ent">
+<!ENTITY % exim SYSTEM "mail/exim/exim.ent">
+<!ENTITY % qpopper SYSTEM "mail/qpopper/qpopper.ent">
+<!ENTITY % courier SYSTEM "mail/courier/courier.ent">
+%postfix;
+%qmail;
+%sendmail;
+%exim;
+%qpopper;
+%courier;
+
+<!-- Other server software -->
+<!ENTITY server-other SYSTEM "other/other.xml">
+<!ENTITY server-other-cvsserver SYSTEM "other/cvsserver.xml">
+<!ENTITY % openssh SYSTEM "other/openssh/openssh.ent">
+<!ENTITY % bind SYSTEM "other/bind/bind.ent">
+<!ENTITY % dhcp SYSTEM "other/dhcp/dhcp.ent">
+<!ENTITY % xinetd SYSTEM "other/xinetd/xinetd.ent">
+<!ENTITY % leafnode SYSTEM "other/leafnode/leafnode.ent">
+<!ENTITY % samba SYSTEM "other/samba/samba.ent">
+
+%openssh;
+%bind;
+%dhcp;
+%xinetd;
+%leafnode;
+%samba;
Index: server/server.xml
===================================================================
--- server/server.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ server/server.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="server" xreflabel="Server Networking">
+<?dbhtml filename="server.html" dir="server"?>
+<title>Server Networking</title>
 
-<part id="server" xreflabel="Servers">
-  <?dbhtml filename="server.html" dir="server"?>
-
-  <title>Servers</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="major/major.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mail/mail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="databases/databases.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other/other.xml"/>
+&server-mail;
+&server-other;
 
 </part>
Index: ylesheets/blfs-chunked.xsl
===================================================================
--- stylesheets/blfs-chunked.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-    <!-- LFS top-level chunk templates. -->
-  <xsl:import href="lfs-xsl/chunkfast.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">blfs</xsl:param>
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no
-           Note: Activating this will increase a lot rendering time. -->
-  <xsl:param name="section.autolabel" select="0"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="0"/>
-
-</xsl:stylesheet>
Index: ylesheets/blfs-nochunks.xsl
===================================================================
--- stylesheets/blfs-nochunks.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-    <!-- LFS top-level no-chunk templates. -->
-  <xsl:import href="lfs-xsl/nochunks.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">blfs</xsl:param>
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no
-           Note: Activating this will increase a lot rendering time. -->
-  <xsl:param name="section.autolabel" select="0"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="0"/>
-
-</xsl:stylesheet>
Index: ylesheets/blfs-pdf.xsl
===================================================================
--- stylesheets/blfs-pdf.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-    <!-- LFS top-level pdf templates. -->
-  <xsl:import href="lfs-xsl/pdf.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">blfs</xsl:param>
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no
-           Note: Activating this will increase a lot rendering time. -->
-  <xsl:param name="section.autolabel" select="0"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="0"/>
-
-</xsl:stylesheet>
Index: ylesheets/dump-commands.xsl
===================================================================
--- stylesheets/dump-commands.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:exsl="http://exslt.org/common"
-    extension-element-prefixes="exsl"
-    version="1.0">
-
-<!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//sect1"/>
-  </xsl:template>
-
-  <xsl:template match="sect1">
-      <!-- The dirs names -->
-    <xsl:variable name="pi-dir" select="../../processing-instruction('dbhtml')"/>
-    <xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/>
-    <xsl:variable name="quote-dir" select="substring($pi-dir-value,1,1)"/>
-    <xsl:variable name="dirname" select="substring-before(substring($pi-dir-value,2),$quote-dir)"/>
-      <!-- The file names -->
-    <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
-    <xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
-    <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
-      <!-- The build order -->
-    <xsl:variable name="position" select="position()"/>
-    <xsl:variable name="order">
-      <xsl:choose>
-        <xsl:when test="string-length($position) = 1">
-          <xsl:text>00</xsl:text>
-          <xsl:value-of select="$position"/>
-        </xsl:when>
-        <xsl:when test="string-length($position) = 2">
-          <xsl:text>0</xsl:text>
-          <xsl:value-of select="$position"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$position"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-      <!-- Creating dirs and files -->
-    <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-      <xsl:apply-templates select=".//screen"/>
-    </exsl:document>
-  </xsl:template>
-
-  <xsl:template match="screen">
-    <xsl:if test="child::* = userinput">
-      <xsl:choose>
-        <xsl:when test="@role = 'nodump'"/>
-        <xsl:when test="@role = 'root'">
-          <xsl:text>
-# Run this as root</xsl:text>
-          <xsl:apply-templates select="userinput"/>
-          <xsl:text># End root commands
-</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="userinput"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="userinput">
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:if test=".//replaceable">
-      <xsl:text># This block must be edited to suit your needs.</xsl:text>
-    </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:if test=".//replaceable">
-      <xsl:text># End of editable block.</xsl:text>
-    </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="replaceable">
-    <xsl:text>**EDITME</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>EDITME**</xsl:text>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- stylesheets/lfs-xsl/chunk-master.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Top-level chunked code for normal processing.
-        Import customized output templates.
-        Include customized chunk templates.
-        Replaces {docbook-xsl}/xhtml/chunk.xsl -->
-
-    <!-- Our master non-chunking presentation templates -->
-  <xsl:import href="chunk-slave.xsl"/>
-
-    <!-- Upstream chunk code named templates -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk-common.xsl"/>
-
-    <!-- Upstream chunk code match templates -->
-  <xsl:include href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk-code.xsl"/>
-
-    <!-- Including our customized chunks templates -->
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
-  <xsl:include href="xhtml/lfs-navigational.xsl"/>
-  <xsl:include href="xhtml/lfs-glossary.xsl"/>
-
-    <!-- sect1:
-           Prevent creation of dummy sect1 files used to emulate sub-chapters. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-code.xsl
-         It match also others sect* tags. The code for that tags is unchanged. -->
-  <xsl:template match="sect1">
-    <xsl:variable name="ischunk">
-      <xsl:call-template name="chunk"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:when test="not(parent::*)">
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:when>
-      <xsl:when test="$ischunk = 0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- stylesheets/lfs-xsl/chunk-slave.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Second level chunked output template.
-        Sets global params and include customized elements templates. -->
-
-    <!-- Upstream XHTML presentation templates -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-
-    <!-- Including our customized elements templates -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="xhtml/lfs-admon.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/>
-  <xsl:include href="xhtml/lfs-sections.xsl"/>
-  <xsl:include href="xhtml/lfs-titles.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
-  <xsl:include href="xhtml/lfs-xref.xsl"/>
-
-  <!-- The CSS Stylesheets. The path is relative to the top level html
-       directory. The templates compute automatically the position of
-       the CSS relative to the current file. So no need to fix the paths
-       in the Makefile. -->
-  <xsl:param name="html.stylesheet" select="'stylesheets/lfs.css'"/>
-    <!-- Print CSS Stylesheet
-    The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-     <link rel="stylesheet" href="../stylesheets/lfs-print.css" type="text/css" media="print"/>
-  </xsl:template>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"/>
-  <xsl:param name="css.decoration" select="0"/>
-
-    <!-- No XML declaration -->
-<!--  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>-->
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   toc
-    part      toc
-    chapter   toc
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/chunkfast.xsl
===================================================================
--- stylesheets/lfs-xsl/chunkfast.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                version="1.0"
-                exclude-result-prefixes="cf exsl">
-
-   <!-- Top-level chunked code for fast processing.
-        Import standart customized chunk code.
-        Replaces {docbook-xsl}/xhtml/chunkfast.xsl
-
-        Note: Using this file as the top-level for chunked output implies that
-              profiling must be done on a previous step. -->
-
-    <!-- Our master chunking templates -->
-  <xsl:import href="chunk-master.xsl"/>
-
-    <!-- Use chunk.fast code? 1 = yes, 0 = no -->
-  <xsl:param name="chunk.fast" select="1"/>
-
-  <!-- The code below was copied as-is from {docbook-xsl}/xhtml/chunkfast.xsl -->
-
-  <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-
-  <xsl:template name="process-chunk-element">
-    <xsl:choose>
-      <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-        <xsl:variable name="genid" select="generate-id()"/>
-
-        <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-        <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-        <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-        <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-        <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and parent::*">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="process-chunk">
-              <xsl:with-param name="prev" select="$prev"/>
-              <xsl:with-param name="next" select="$next"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and not(parent::*)">
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:when>
-          <xsl:when test="$onechunk != 0">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:when test="$chunk.first.sections = 0">
-            <xsl:call-template name="chunk-first-section-with-parent"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/common.xsl
===================================================================
--- stylesheets/lfs-xsl/common.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,453 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet contains common params and templates for all outputs. -->
-
-    <!-- This file contains our localization strings (for internationalization) -->
-  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
-
-
-<!-- INDEX -->
-
-    <!-- Should the Index be generated? 1 = yes, 0 = no -->
-  <xsl:param name="generate.index" select="1"></xsl:param>
-
-    <!-- The indexing method used. Only 'basic' is supported by xsltproc -->
-  <xsl:param name="index.method" select="'basic'"></xsl:param>
-
-    <!-- The Index title:
-           We create this param to can have gentext support in both
-           the Index page title and links that point to the Index page.
-           It also allow us to change the title, if wanted.
-           Note: To change the title involves creating the appropriate
-           entries in lfs-l10n.xml -->
-  <xsl:param name="index-title">Index</xsl:param>
-
-    <!-- Index title generation. -->
-    <!-- The original template is in {docbook-xsl}/common/titles.xsl -->
-  <xsl:template match="index" mode="title.markup">
-    <xsl:param name="allow-anchors" select="0"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="$index-title"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- indexterm:
-           Dropping unneeded anchors and fo:wraper elemments. -->
-    <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
-  <xsl:template match="indexterm"/>
-
-<!-- -->
-
-<!-- LABELS -->
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no -->
-  <xsl:param name="section.autolabel" select="1"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-
-    <!-- sect1 label.markup:
-           Use lowercase roman numbers for sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl -->
-  <xsl:template match="sect1" mode="label.markup">
-    <!-- if the parent is a component, maybe label that too -->
-    <xsl:variable name="parent.is.component">
-      <xsl:call-template name="is.component">
-        <xsl:with-param name="node" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="component.label">
-      <xsl:if test="$section.label.includes.component.label != 0
-                    and $parent.is.component != 0">
-        <xsl:variable name="parent.label">
-          <xsl:apply-templates select=".." mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$parent.label != ''">
-          <xsl:apply-templates select=".." mode="label.markup"/>
-          <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@label">
-        <xsl:value-of select="@label"/>
-      </xsl:when>
-      <xsl:when test="$section.autolabel != 0">
-        <xsl:copy-of select="$component.label"/>
-        <xsl:choose>
-          <xsl:when test="ancestor::preface">
-            <xsl:number format="i" count="sect1"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:number format="1" count="sect1"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect2 label.markup:
-           Skip numeration for sect2 with empty title. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl
-         It match also sect3, sect4, and sect5, that are unchanged. -->
-  <xsl:template match="sect2" mode="label.markup">
-      <!-- label the parent -->
-      <xsl:variable name="parent.section.label">
-        <xsl:call-template name="label.this.section">
-          <xsl:with-param name="section" select=".."/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="$parent.section.label != '0'">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="@label">
-          <xsl:value-of select="@label"/>
-        </xsl:when>
-        <xsl:when test="$section.autolabel != 0">
-          <xsl:choose>
-            <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
-            <xsl:when test="string-length(../sect2[1]/title) = 0">
-              <xsl:variable name="totalsect2">
-                <xsl:number count="sect2"/>
-              </xsl:variable>
-              <xsl:number value="$totalsect2 - 1"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:number count="sect2"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-
-    <!-- object.title.template:
-           Skip numeration for sectX > sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl. -->
-  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect|bridgehead"
-                mode="object.title.template">
-    <xsl:variable name="is.numbered">
-      <xsl:call-template name="label.this.section"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$is.numbered != 0 and not(ancestor::preface/sect1)">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'title-numbered'"/>
-          <xsl:with-param name="name">
-            <xsl:call-template name="xpath.location"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'title-unnumbered'"/>
-          <xsl:with-param name="name">
-            <xsl:call-template name="xpath.location"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-<!-- XREF (see {xhtml,pdf}/xref.xsl) -->
-
-    <!-- mode object.xref.markup:
-           Propagate role to named template substitute-markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template match="*" mode="object.xref.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:variable name="template">
-      <xsl:choose>
-        <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
-          <xsl:call-template name="make.gentext.template">
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
-          <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="object.xref.template">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="$template = '' and $verbose != 0">
-      <xsl:message>
-        <xsl:text>object.xref.markup: empty xref template</xsl:text>
-        <xsl:text> for linkend="</xsl:text>
-        <xsl:value-of select="@id|@xml:id"/>
-        <xsl:text>" and @xrefstyle="</xsl:text>
-        <xsl:value-of select="$xrefstyle"/>
-        <xsl:text>"</xsl:text>
-      </xsl:message>
-    </xsl:if>
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="template" select="$template"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- substitute-markup:
-           Propagate role to mode insert.title.markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template name="substitute-markup">
-    <xsl:param name="template" select="''"/>
-    <xsl:param name="allow-anchors" select="'0'"/>
-    <xsl:param name="title" select="''"/>
-    <xsl:param name="subtitle" select="''"/>
-    <xsl:param name="docname" select="''"/>
-    <xsl:param name="label" select="''"/>
-    <xsl:param name="pagenumber" select="''"/>
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="contains($template, '%')">
-        <xsl:value-of select="substring-before($template, '%')"/>
-        <xsl:variable name="candidate"
-                      select="substring(substring-after($template, '%'), 1, 1)"/>
-        <xsl:choose>
-          <xsl:when test="$candidate = 't'">
-            <xsl:apply-templates select="." mode="insert.title.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="title">
-                <xsl:choose>
-                  <xsl:when test="$title != ''">
-                    <xsl:copy-of select="$title"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="title.markup">
-                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                      <xsl:with-param name="verbose" select="$verbose"/>
-                    </xsl:apply-templates>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 's'">
-            <xsl:apply-templates select="." mode="insert.subtitle.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="subtitle">
-                <xsl:choose>
-                  <xsl:when test="$subtitle != ''">
-                    <xsl:copy-of select="$subtitle"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="subtitle.markup">
-                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                    </xsl:apply-templates>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'n'">
-            <xsl:apply-templates select="." mode="insert.label.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="label">
-                <xsl:choose>
-                  <xsl:when test="$label != ''">
-                    <xsl:copy-of select="$label"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="label.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'p'">
-            <xsl:apply-templates select="." mode="insert.pagenumber.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="pagenumber">
-                <xsl:choose>
-                  <xsl:when test="$pagenumber != ''">
-                    <xsl:copy-of select="$pagenumber"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="pagenumber.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'o'">
-            <!-- olink target document title -->
-            <xsl:apply-templates select="." mode="insert.olink.docname.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="docname">
-                <xsl:choose>
-                  <xsl:when test="$docname != ''">
-                    <xsl:copy-of select="$docname"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="olink.docname.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'd'">
-            <xsl:apply-templates select="." mode="insert.direction.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="direction">
-                <xsl:choose>
-                  <xsl:when test="$referrer">
-                    <xsl:variable name="referent-is-below">
-                      <xsl:for-each select="preceding::xref">
-                        <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
-                      </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:choose>
-                      <xsl:when test="$referent-is-below = ''">
-                        <xsl:call-template name="gentext">
-                          <xsl:with-param name="key" select="'above'"/>
-                        </xsl:call-template>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:call-template name="gentext">
-                          <xsl:with-param name="key" select="'below'"/>
-                        </xsl:call-template>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = '%' ">
-            <xsl:text>%</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <!-- recurse with the rest of the template string -->
-        <xsl:variable name="rest"
-              select="substring($template,
-              string-length(substring-before($template, '%'))+3)"/>
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template" select="$rest"/>
-          <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-          <xsl:with-param name="title" select="$title"/>
-          <xsl:with-param name="subtitle" select="$subtitle"/>
-          <xsl:with-param name="docname" select="$docname"/>
-          <xsl:with-param name="label" select="$label"/>
-          <xsl:with-param name="pagenumber" select="$pagenumber"/>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-          <xsl:with-param name="verbose" select="$verbose"/>
-          <xsl:with-param name="role" select="$role"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$template"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-<!-- Total packages size calculation -->
-
-    <!-- returnvalue:
-            If the tag is not empty, apply the original template.
-            Otherwise apply the calculation template. -->
-  <xsl:template match="returnvalue">
-    <xsl:choose>
-      <xsl:when test="count(*)&gt;0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="../../variablelist"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made calculation template. -->
-  <xsl:template name="calculation">
-    <xsl:param name="scope"/>
-    <xsl:param name="total">0</xsl:param>
-    <xsl:param name="position">1</xsl:param>
-    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
-    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
-    <xsl:variable name="size" select="substring-before($token,' KB')"/>
-    <xsl:variable name="rawsize">
-      <xsl:choose>
-        <xsl:when test="contains($size,',')">
-          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$size"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$position &lt;= $tokens">
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="position" select="$position +1"/>
-          <xsl:with-param name="total" select="$total + $rawsize"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$total &lt; '1000'">
-            <xsl:value-of select="$total"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:when test="$total &gt; '1000' and $total &lt; '5000'">
-            <xsl:value-of select="substring($total,1,1)"/>
-            <xsl:text>,</xsl:text>
-            <xsl:value-of select="substring($total,2)"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="round($total div 1024)"/>
-            <xsl:text>  MB</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/lfs-l10n.xml
===================================================================
--- stylesheets/lfs-xsl/lfs-l10n.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE l:i18n SYSTEM "http://cdn.docbook.org/release/xsl-nons/current/common/l10n.dtd">
-
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-
-    <!-- Template to add more languages -->
-  <l:l10n language="xx" english-language-name="xxxxx">
-
-    <l:gentext key="description" text=""/>
-    <l:gentext key="Bootscripts" text=""/>
-    <l:gentext key="Configuration Files" text=""/>
-    <l:gentext key="Kernel Configuration" text=""/>
-    <l:gentext key="Libraries" text=""/>
-    <l:gentext key="Others" text=""/>
-    <l:gentext key="Packages" text=""/>
-    <l:gentext key="Programs" text=""/>
-    <l:gentext key="Scripts" text=""/>
-
-  </l:l10n>
-
-
-    <!-- English -->
-  <l:l10n language="en" english-language-name="English">
-
-    <l:gentext key="description" text="description"/>
-    <l:gentext key="Bootscripts" text="Bootscripts"/>
-    <l:gentext key="Configuration Files" text="Configuration Files"/>
-    <l:gentext key="Kernel Configuration" text="Kernel Configuration"/>
-    <l:gentext key="Libraries" text="Libraries"/>
-    <l:gentext key="Others" text="Others"/>
-    <l:gentext key="Packages" text="Packages"/>
-    <l:gentext key="Programs" text="Programs"/>
-    <l:gentext key="Scripts" text="Scripts"/>
-
-  </l:l10n>
-
-    <!-- French -->
-  <l:l10n language="fr" english-language-name="French">
-
-    <l:gentext key="description" text="description"/>
-    <l:gentext key="Bootscripts" text="Scripts de démarrage"/>
-    <l:gentext key="Configuration Files" text="Fichiers de configuration"/>
-    <l:gentext key="Kernel Configuration" text="Configuration du noyau"/>
-    <l:gentext key="Libraries" text="Bibliothèques"/>
-    <l:gentext key="Others" text="Autres"/>
-    <l:gentext key="Packages" text="Paquets"/>
-    <l:gentext key="Programs" text="Programmes"/>
-    <l:gentext key="Scripts" text="Scripts"/>
-
-  </l:l10n>
-
-    <!-- Italian -->
-  <l:l10n language="it" english-language-name="Italian">
-
-    <l:gentext key="description" text="descrizione"/>
-    <l:gentext key="Bootscripts" text="Script di avvio"/>
-    <l:gentext key="Configuration Files" text="File di configurazione"/>
-    <l:gentext key="Kernel Configuration" text="Configurazione del kernel"/>
-    <l:gentext key="Libraries" text="Librerie"/>
-    <l:gentext key="Others" text="Altri"/>
-    <l:gentext key="Packages" text="Pacchetti"/>
-    <l:gentext key="Programs" text="Programmi"/>
-    <l:gentext key="Scripts" text="Script"/>
-
-  </l:l10n>
-
-    <!-- Spanish -->
-  <l:l10n language="es" english-language-name="Spanish">
-
-    <l:gentext key="description" text="descripción"/>
-    <l:gentext key="Bootscripts" text="Guiones de arranque"/>
-    <l:gentext key="Configuration Files" text="Ficheros de configuración"/>
-    <l:gentext key="Kernel Configuration" text="Configuración del núcleo"/>
-    <l:gentext key="Libraries" text="Librerías"/>
-    <l:gentext key="Others" text="Otros"/>
-    <l:gentext key="Packages" text="Paquetes"/>
-    <l:gentext key="Programs" text="Programas"/>
-    <l:gentext key="Scripts" text="Guiones"/>
-
-  </l:l10n>
-
-      <!-- German -->
-  <l:l10n language="de" english-language-name="German">
-
-    <l:gentext key="description" text="Beschreibung"/>
-    <l:gentext key="Bootscripts" text="Bootskripte"/>
-    <l:gentext key="Configuration Files" text="Einrichtungsdateien"/>
-    <l:gentext key="Kernel Configuration" text="Kernel-Konfiguration"/>
-    <l:gentext key="Libraries" text="Bibliotheken"/>
-    <l:gentext key="Others" text="Sonstige"/>
-    <l:gentext key="Packages" text="Pakete"/>
-    <l:gentext key="Programs" text="Programme"/>
-    <l:gentext key="Scripts" text="Skripte"/>
-
-  </l:l10n>
-
-    <!-- Simplified Chinese -->
-  <l:l10n language="zh_cn" english-language-name="Simplified Chinese">
-
-    <l:gentext key="description" text="描述"/>
-    <l:gentext key="Bootscripts" text="引导脚本"/>
-    <l:gentext key="Configuration Files" text="配置文件"/>
-    <l:gentext key="Kernel Configuration" text="内核配置"/>
-    <l:gentext key="Libraries" text="库"/>
-    <l:gentext key="Others" text="其他"/>
-    <l:gentext key="Packages" text="软件包"/>
-    <l:gentext key="Programs" text="程序"/>
-    <l:gentext key="Scripts" text="脚本"/>
-
-    <l:context name="title-numbered">
-      <l:template name="part" text="第 %n 部分 %t"/>
-    </l:context>
-
-    <l:gentext key="Copyright" text="版权所有"/>
-
-  </l:l10n>
-
-</l:i18n>
Index: ylesheets/lfs-xsl/lfs-print.css
===================================================================
--- stylesheets/lfs-xsl/lfs-print.css	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,5 +1,0 @@
-@import url(lfs.css);
-
-.navfooter, .headerlinks {
-   display: none;
-}
Index: ylesheets/lfs-xsl/lfs.css
===================================================================
--- stylesheets/lfs-xsl/lfs.css	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,628 +1,0 @@
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book .titlepage {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0 -1em;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-/* Section titles */
-h1.sect1, h1.preface, h1.part, h1.chapter, h1.appendix, .glossary h1, .index h1 {
-  background: #f5f6f7;
-  border-bottom: .1em solid #dbddec;
-  margin-bottom:1em;
-  margin-top: 0;
-  padding: .4em;
-}
-
-/* Scrolling parts
-   The header is taller for sect1 and chapter pages than on the
-   other pages. Since we want a fix box, it's top has to be calculated
-   by trial and errors to fit below the static header fox.*/
-
-div.sect1, div.chapter {
-  top: 11.9em;
-}
-div.appendix, div.preface, div.part, div.glossdiv, .index div.index {
-  top: 10.4em;
-}
-div.sect1, div.appendix, div.preface, div.part, div.chapter, div.glossdiv, .index div.index {
-  padding-left: .3em;
-  overflow:auto;
-  height: auto;
-  position: fixed;
-  left:1em;
-  right:1em;
-  bottom: 1em;
-  border-bottom: 1em solid #dbddec;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-}
-
-.wrap h1 {
-  background: #f5f6f7;
-  margin: 0;
-  padding: .4em;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-.appendix h2 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* Navigation */
-div.navheader, div.navfooter {
-  background: #ecedef;
-  margin: 0;
-  padding: 0.1em .5em;
-}
-
-div.navheader {
-  border-bottom: .1em solid #dbddec;
-}
-
-/* no need for a footer now that the header is always visible */
-div.navfooter {
-  display:none;
-}
-
-/* Except for the forst page (TOC), where the bottom is the only
-   place where navigation is displayed. */
-
-div.book + div.navfooter {
-  display:block
-}
-
-div.navheader h4 {
-  margin-top: .4em;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-div.navheader h3 {
-  margin-top: .2em;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-div.navheader ul, div.navfooter ul {
-  padding: .2em .5em .5em .5em; /*top right bottom left*/
-  margin: .5em 0;
-  position: relative;
-  background: #dbddec;
-}
-
-div.navheader ul li, div.navfooter ul li {
-  display: inline;
-  width: 40%;
-}
-
-div.navheader ul li.prev, div.navfooter ul li.prev {
-  position: absolute;
-  display: block;
-  left: 0;
-  text-align: left;
-  padding: 0.2em 1em;
-  margin-left: .4em;
-}
-
-div.navheader ul li.next, div.navfooter ul li.next {
-  position: absolute;
-  display: block;
-  text-align: right;
-  right: 0;
-  padding: 0.2em 1em;
-  margin-right: .4em;
-}
-
-div.navheader ul li.prev p, div.navfooter ul li.prev p,
-div.navheader ul li.next p, div.navfooter ul li.next p {
-  padding: 0;
-  margin: .1em 0;
-}
-
-div.navheader ul li.home, div.navheader ul li.up,
-div.navfooter ul li.home, div.navfooter ul li.up {
-  text-align: center;
-  padding: 0;
-  margin: 0 auto;
-  display: block;
-  color: #dbddec;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-span.blue {
-  color: #2ac;
-}
-
-/* Index */
-.item {
-    float: left;
-    margin-right: 1em
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-    margin-right: 1em
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 22em;
-}
-
-.secitem + .indexref {
-    margin-left: 19em;
-}
-
-
-/* Admonitions */
-div.admon img {
-  padding: .3em;
-}
-
-div.admon h3 {
-  display: inline;
-  margin-left: 2em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-div.note, div.tip {
-  background-color: #fffff6;
-  border: 2px solid #dbddec;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-table.simplelist {
-  margin-left: 5em;
-}
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table, .informaltable {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-code.systemitem {
-  font-weight: bold;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
Index: ylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- stylesheets/lfs-xsl/nochunks.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,635 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Stylesheet for non-chunked XHTML output
-        Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
-
-    <!-- Upstream XHTML templates -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-
-   <!-- Including our others customized templates -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/>
-  <xsl:include href="xhtml/lfs-sections.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
-  <xsl:include href="xhtml/lfs-xref.xsl"/>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   nop
-    part      nop
-    chapter   nop
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"></xsl:param>
-  <xsl:param name="css.decoration" select="0"></xsl:param>
-
-    <!-- Don't use graphics in admonitions -->
-  <xsl:param name="admon.graphics" select="0"/>
-
-    <!-- Changing the admonitions output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="nongraphical.admonition">
-    <div class="admon {name(.)}">
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface (actually, skip the hardcoded dot). -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h3 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h3>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- The CSS Stylesheet:
-           Note: there is some diferences with lfs.css code releated
-                 to h* values, admonitions and no navigational code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-    <style type="text/css">
-      <xsl:text>
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book {
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-/*.book h1,*/ .book .authorgroup, .book .copyright, .book .legalnotice .revhistory {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: .1em 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  border-bottom: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-  background: #f5f6f7;
-  border-top: .2em solid #dbddec;
-  border-bottom: .2em solid #dbddec;
-  text-align: center;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.preface h2, .part h1, .chapter h2, .appendix h2, .index h1, .sect1 h2, .part h2 {
-  background: #f5f6f7;
-  border-top: .2em solid #dbddec;
-  border-bottom: .2em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 1em;
-  padding: .4em;
-  text-align: center;
-}
-
-.sect1 h2, .appendix h2 {
-  margin-left: -.2em;
-}
-
-.wrap h2 {
-  background: #f5f6f7;
-  border-bottom: 0;
-  margin-top: 1em;
-  margin-bottom: 0;
-  padding-top: .4em;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-.appendix h3 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-
-/* Index */
-.item {
-    float: left;
-    margin-right: 1em
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-    margin-right: 1em
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 20em;
-}
-
-.secitem + .indexref {
-    margin-left: 19em;
-}
-
-
-/* Admonitions */
-div.admon h3 {
-  padding-left: 2.5em;
-  padding-top: 1em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-div.note, div.tip {
-  background-color: #fffff6;
-  border: 2px solid #dbddec;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-.variablelist td p {
-  margin-top: 0;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
-      </xsl:text>
-    </style>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-   <!-- Stylesheet for FO output used to generate PDF
-        Sets global params and include customization stylesheets. -->
-
-    <!-- Upstream FO templates. Profiled version is not supported by
-         xsltproc, thus pofiling must be done in two steps (see Makefile) -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
-
-    <!-- Uncomment the next for debugging the raw FO code.
-         Note that FOP will complaints about a lot of paragraph overflows
-         due that verbatim output is also indented.
-         Remember to comment the "rm $(BASEDIR)/lfs-pdf.fo" in
-         the Makefile. -->
-  <!--<xsl:output  encoding="UTF-8" indent="yes" />-->
-
-    <!-- Including our others customized templates. -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="pdf/lfs-admon.xsl"/>
-  <xsl:include href="pdf/lfs-index.xsl"/>
-  <xsl:include href="pdf/lfs-lists.xsl"/>
-  <xsl:include href="pdf/lfs-mixed.xsl"/>
-  <xsl:include href="pdf/lfs-pagesetup.xsl"/>
-  <xsl:include href="pdf/lfs-xref.xsl"/>
-
-    <!-- Activating FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
-  <xsl:param name="fop1.extensions" select="1"/>
-
-    <!-- Desactivate draft mode at all. -->
-  <xsl:param name="draft.mode" select="'no'"/>
-
-   <!-- Paper size -->
-  <xsl:param name="paper.type" select="'USletter'"/>
-
-    <!-- Paper size required by the publisher
-  <xsl:param name="paper.type" select="'Customized'"/>
-  <xsl:param name="page.width">7.25in</xsl:param>
-  <xsl:param name="page.height">9.25in</xsl:param>
-    -->
-
-    <!-- Is the document to be printed double sided? 1 = yes, 0 = no -->
-    <!-- Change "double.sided" to "1" for published versions. -->
-  <xsl:param name="double.sided" select="0"/>
-
-    <!-- Hyphenate? -->
-  <xsl:param name="hyphenate">false</xsl:param>
-
-    <!-- Allow URLs to be automatically hyphenated.
-         We have expanded the support to several inline tags.
-         See pdf/lfs-mixed.xsl. The character in the
-         select attribute is a zero width space -->
-  <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
-
-    <!-- List of characters to allow ulink URLs, and supported inline tags,
-         to be automatically hyphenated on.
-         Note: the / character is in the list but FOP-0.93 ignores it. -->
-  <xsl:param name="ulink.hyphenate.chars" select="'/._-'"/>
-
-    <!-- Specify the default text alignment. -->
-  <xsl:param name="alignment">justify</xsl:param>
-
-    <!-- Specifies the default point size for body text.
-         Used for titles size calculation. -->
-  <xsl:param name="body.font.master">9</xsl:param>
-
-    <!-- Specifies the default font size for body text. -->
-  <xsl:param name="body.font.size">12pt</xsl:param>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    part      nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- Amount of indentation for TOC entries. -->
-  <xsl:param name="toc.indent.width" select="18"/>
-
-    <!-- Turns page numbers in xrefs on and off. -->
-  <xsl:param name="insert.xref.page.number">no</xsl:param>
-
-    <!-- Display URLs after ulinks? 1 = yes, 0 = no
-         Set to 0 to prevent duplicate e-mails in the Acknowledgments pages. -->
-  <xsl:param name="ulink.show" select="0"/>
-
-    <!-- Processing instruction for hard page breaks.
-         FOP-0.93 supports now @keep-*.*, @orphans, and @widows attributes,
-         that solves several page break issues.
-         It also supports the soft page break procesing instruction included
-         in the DocBook stylesheets.
-         But some times we may need hard page breaks for final book versions. -->
-    <!-- To know how to use all that page break features, see
-         http://www.sagehill.net/docbookxsl/PageBreaking.html -->
-  <xsl:template match="processing-instruction('hard-pagebreak')">
-    <fo:block break-before='page'/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf/lfs-admon.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how admonitions are displayed -->
-
-    <!-- Use graphics in admonitions? 1 = yes, 0 = no -->
-  <xsl:param name="admon.graphics" select="1"/>
-
-    <!-- Path to admonition graphics relative to index.xml -->
-  <xsl:param name="admon.graphics.path" select="'images/'"/>
-
-    <!-- Global admonitions properties -->
-  <xsl:attribute-set name="graphical.admonition.properties">
-    <xsl:attribute name="keep-together.within-column">
-      <xsl:variable name="keep.together">
-        <xsl:call-template name="pi.dbfo_keep-together"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$keep.together != ''">
-          <xsl:value-of select="$keep.together"/>
-        </xsl:when>
-        <xsl:otherwise>always</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="padding-start">5pt</xsl:attribute>
-    <xsl:attribute name="padding-top">5pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">5pt</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="background-color">#FFFFE6</xsl:attribute>
-    <xsl:attribute name="border-color">
-      <xsl:choose>
-        <xsl:when test="self::note | self::tip">#E0E0E0</xsl:when>
-        <xsl:otherwise>#DCC</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties for admonitions titles -->
-  <xsl:attribute-set name="admonition.title.properties">
-    <xsl:attribute name="font-size">14pt</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="color">
-      <xsl:choose>
-        <xsl:when test="ancestor-or-self::important | ancestor-or-self::warning
-                        | ancestor-or-self::caution">#500</xsl:when>
-        <xsl:otherwise>#000</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties for admonitions text -->
-  <xsl:attribute-set name="admonition.properties">
-    <xsl:attribute name="margin-right">5pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- admon.graphic.width:
-           Making the graphic smaller. -->
-    <!-- The original template is in {docbook-xsl}/fo/admon.xsl -->
-  <xsl:template match="*" mode="admon.graphic.width">
-    <xsl:param name="node" select="."/>
-    <xsl:text>24pt</xsl:text>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf/lfs-index.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂăĄąǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌǅǲȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚǈȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠǋǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how the Index is generated.
-       Entities comes from {docbook-xsl}/common/entities.ent -->
-
-    <!-- Override for punctuation separating an index term from its list
-         of page references. -->
-  <xsl:param name="index.term.separator" select="': '"></xsl:param>
-
-    <!-- Divisions title properties. -->
-  <xsl:attribute-set name="index.div.title.properties">
-    <xsl:attribute name="margin-left">0pt</xsl:attribute>
-    <xsl:attribute name="font-size">14.4pt</xsl:attribute>
-    <xsl:attribute name="font-family">
-      <xsl:value-of select="$title.fontset"/>
-    </xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.5em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.3em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.7em</xsl:attribute>
-    <xsl:attribute name="start-indent">0pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties applied to the block containing entries in an Index. -->
-  <xsl:attribute-set name="index.entry.properties">
-    <xsl:attribute name="start-indent">0.5pc</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Divisions:
-          Translate alphabetical divisions titles to by-type titles. -->
-    <!-- The original template is in {docbook-xsl}/fo/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-div-basic">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="role" select="''"/>
-    <xsl:param name="type" select="''"/>
-    <xsl:variable name="key"
-                  select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-    <xsl:if test="key('letter', $key)[&scope;]
-                  [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <fo:block>
-        <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-          <xsl:call-template name="indexdiv.title">
-            <xsl:with-param name="titlecontent">
-              <xsl:choose>
-                <xsl:when test="$divtitle = 'A'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Packages</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'B'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Programs</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'C'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Libraries</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'D'">
-                  <xsl:choose>
-                    <xsl:when test="$book-type = 'blfs'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Kernel Configuration</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Scripts</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'E'">
-                  <xsl:choose>
-                    <xsl:when test="$book-type = 'blfs'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Configuration Files</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Others</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'F'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Bootscripts</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'G'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Others</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$divtitle"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:block xsl:use-attribute-sets="index.entry.properties">
-          <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                      [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                              mode="index-primary">
-            <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-          </xsl:apply-templates>
-        </fo:block>
-      </fo:block>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf/lfs-lists.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how list are generated. -->
-
-    <!-- What spacing do you want before and after lists? -->
-  <xsl:attribute-set name="list.block.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- What spacing do you want between list items? -->
-  <xsl:attribute-set name="list.item.spacing">
-    <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.2em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties that apply to each list-block generated by itemizedlist. -->
-  <xsl:attribute-set name="itemizedlist.properties"
-                     use-attribute-sets="list.block.properties">
-    <xsl:attribute name="text-align">left</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Format variablelists lists as blocks? 1 = yes, 0 = no
-           Default variablelist format. We override it when necessary
-           using the list-presentation processing instruction. -->
-  <xsl:param name="variablelist.as.blocks" select="1"/>
-
-    <!-- Specifies the longest term in variablelists.
-         Used when list-presentation = list -->
-  <xsl:param name="variablelist.max.termlength">35</xsl:param>
-
-    <!-- varlistentry mode block:
-           Addibg a bullet, left alignament, and @kepp-*.* attributes
-           for packages and paches list. -->
-    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
-  <xsl:template match="varlistentry" mode="vl.as.blocks">
-    <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-    <xsl:choose>
-      <xsl:when test="ancestor::variablelist/@role = 'materials'">
-        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always" font-weight="bold"
-                  keep-with-next.within-column="always" text-align="left">
-          <xsl:text>•   </xsl:text>
-          <xsl:apply-templates select="term"/>
-        </fo:block>
-        <fo:block text-align="left"
-                  keep-together.within-column="always"
-                  keep-with-previous.within-column="always">
-          <xsl:apply-templates select="listitem"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always"
-                  keep-with-next.within-column="always" margin-left="1em">
-          <xsl:apply-templates select="term"/>
-        </fo:block>
-        <fo:block margin-left="2em">
-          <xsl:apply-templates select="listitem"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- segmentedlist:
-           Making it an actual FO list to can indent items.
-           Adjust vertical space. -->
-    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
-  <xsl:template match="segmentedlist">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <fo:list-block id="{$id}" provisional-distance-between-starts="12em"
-                   provisional-label-separation="1em"
-                   keep-together.within-column="always">
-      <xsl:choose>
-        <xsl:when test="ancestor::appendix[@id='appendixc']">
-          <xsl:attribute name="space-before.optimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-after.optimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-after.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-after.maximum">0.4em</xsl:attribute>
-          <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-          <xsl:attribute name="space-after.optimum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-after.minimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="seglistitem/seg"/>
-    </fo:list-block>
-  </xsl:template>
-
-    <!-- seg:
-           Self-made template based on the original seg template
-           found in {docbook-xsl}/fo/list.xsl
-           Making segmentedlist an actual FO list to can indent items. -->
-  <xsl:template match="seglistitem/seg">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-    <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-    <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-    <fo:list-item xsl:use-attribute-sets="compact.list.item.spacing">
-      <fo:list-item-label end-indent="label-end()" text-align="start">
-        <fo:block>
-          <fo:inline font-weight="bold">
-            <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                                 mode="segtitle-in-seg"/>
-            <xsl:text>:</xsl:text>
-          </fo:inline>
-        </fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block id="{$id}">
-          <xsl:apply-templates/>
-        </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-    <!-- simplelist:
-           Self-made template. Wrap it into a fo:block and process member childs.
-           If @type is specified, the original templates will be used.
-           NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints
-             about not supported table-layout="auto" -->
-  <xsl:template match="simplelist">
-    <fo:block xsl:use-attribute-sets="simplelist.properties">
-      <xsl:apply-templates mode="condensed"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- member:
-           Self-made template to wrap it into a fo:block using customized
-           properties. -->
-  <xsl:template match="member" mode="condensed">
-    <fo:block xsl:use-attribute-sets="simplelist.properties">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:apply-templates/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-    <!-- Properties associated with our simplelist format. -->
-  <xsl:attribute-set name="simplelist.properties">
-    <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-  </xsl:attribute-set>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf/lfs-mixed.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,355 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet contains misc params, attribute sets and templates
-       for output formating.
-       This file is for that templates that don't fit in other files. -->
-
-    <!-- What space do you want between normal paragraphs. -->
-  <xsl:attribute-set name="normal.para.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="orphans">3</xsl:attribute>
-    <xsl:attribute name="widows">3</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties associated with verbatim text. -->
-  <xsl:attribute-set name="verbatim.properties">
-    <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-    <xsl:attribute name="white-space-collapse">false</xsl:attribute>
-    <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="text-align">start</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Should verbatim environments be shaded? 1 =yes, 0 = no -->
-  <xsl:param name="shade.verbatim" select="1"/>
-
-    <!-- Properties that specify the style of shaded verbatim listings -->
-  <xsl:attribute-set name="shade.verbatim.style">
-    <xsl:attribute name="background-color">#E9E9E9</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-color">#888</xsl:attribute>
-    <xsl:attribute name="padding-start">5pt</xsl:attribute>
-    <xsl:attribute name="padding-top">2pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">2pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- para:
-           Skip empty "Home page" in packages.xml.
-           Allow forced line breaks inside paragraphs emulating literallayout.
-           Removed vertical space in variablelist. -->
-    <!-- The original template is in {docbook-xsl}/fo/block.xsl -->
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="child::ulink[@url=' ']"/>
-      <xsl:when test="./@remap='verbatim'">
-        <fo:block xsl:use-attribute-sets="verbatim.properties">
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="ancestor::variablelist">
-        <fo:block>
-          <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- screen, literallayout:
-          Self-made template that creates a fo:block wrapper with keep-together
-          processing instruction support around the output generated by
-          original screen templates. -->
-  <xsl:template match="screen|literallayout">
-    <xsl:variable name="keep.together">
-      <xsl:call-template name="pi.dbfo_keep-together"/>
-    </xsl:variable>
-    <fo:block>
-      <xsl:attribute name="keep-together.within-column">
-        <xsl:choose>
-          <xsl:when test="$keep.together != ''">
-            <xsl:value-of select="$keep.together"/>
-          </xsl:when>
-          <xsl:otherwise>always</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-imports/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- literal:
-           Be sure that literal will use allways normal font weight. -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template match="literal">
-    <fo:inline  font-weight="normal">
-      <xsl:call-template name="inline.monoseq"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- inline.monoseq:
-           Added hyphenate-url support to classname, exceptionname, interfacename,
-           methodname, computeroutput, constant, envar, filename, function, code,
-           literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template name="inline.monoseq">
-    <xsl:param name="content">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
-              <xsl:call-template name="hyphenate-url">
-                <xsl:with-param name="url">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:param>
-    <fo:inline xsl:use-attribute-sets="monospace.properties">
-      <xsl:if test="@dir">
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- inline.italicmonoseq:
-           Added hyphenate-url support to parameter, replaceable, structfield,
-           function/parameter, and function/replaceable -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template name="inline.italicmonoseq">
-    <xsl:param name="content">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
-              <xsl:call-template name="hyphenate-url">
-                <xsl:with-param name="url">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:param>
-    <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="@dir">
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- Show external URLs in italic font -->
-  <xsl:attribute-set name="xref.properties">
-    <xsl:attribute name="font-style">
-      <xsl:choose>
-        <xsl:when test="self::ulink">italic</xsl:when>
-        <xsl:otherwise>inherit</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-   <!-- Center table title. -->
-  <xsl:attribute-set name="formal.title.properties">
-    <xsl:attribute name="text-align">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'table'">center</xsl:when>
-        <xsl:otherwise>left</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- table.layout:
-           We want all tables centered. Based on a hack posted
-           by Ellen Juhlin on docbook-apps mailing list. -->
-    <!-- The original template is in {docbook-xsl}/fo/table.xsl -->
-  <xsl:template name="table.layout">
-    <xsl:param name="table.content" select="NOTANODE"/>
-    <fo:table table-layout="fixed" width="100%">
-      <fo:table-column column-width ="proportional-column-width(1)"/>
-      <fo:table-column>
-        <!-- Set center column width equal to table width -->
-        <xsl:attribute name="column-width">
-          <xsl:call-template name="table.width"/>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-width ="proportional-column-width(1)"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell column-number="2">
-            <xsl:copy-of select="$table.content"/>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:template>
-
-
-  <!-- Revision History -->
-
-    <!-- revhistory titlepage:
-           Self-made template to add missing support on bookinfo. -->
-  <xsl:template match="revhistory" mode="book.titlepage.verso.auto.mode">
-    <fo:block space-before.optimum="2em"
-              space-before.minimum="1.5em"
-              space-before.maximum="2.5em">
-      <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- revhitory title properties -->
-  <xsl:attribute-set name="revhistory.title.properties">
-    <xsl:attribute name="text-align">center</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- revhistory/revision mode titlepage.mode:
-           Removed authorinitials | author support placing
-           revremark | revdescription instead on that table-cell. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.xsl -->
-  <xsl:template match="revhistory/revision" mode="titlepage.mode">
-    <xsl:variable name="revnumber" select="revnumber"/>
-    <xsl:variable name="revdate"   select="date"/>
-    <xsl:variable name="revremark" select="revremark|revdescription"/>
-    <fo:table-row>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:if test="$revnumber">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'Revision'"/>
-            </xsl:call-template>
-            <xsl:call-template name="gentext.space"/>
-            <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-          </xsl:if>
-        </fo:block>
-      </fo:table-cell>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revdate[1]"/>
-        </fo:block>
-      </fo:table-cell>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:template>
-
-
-  <!-- Dummy sect1 -->
-
-    <!-- sect1:
-           Self-made template to skip dummy sect1 pages generation. -->
-  <xsl:template match="sect1">
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect1 mode fop1.outline:
-           Self-made template to skip dummy sect1 bookmarks generation. -->
-  <xsl:template match="sect1" mode="fop1.outline">
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- toc.line:
-           For dummy sect1 output only the title. -->
-    <!-- The original template is in {docbook-xsl}/fo/autotoc.xsl -->
-  <xsl:template name="toc.line">
-    <xsl:param name="toc-context" select="NOTANODE"/>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'">
-        <fo:block text-align="left">
-          <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="toc.line.properties">
-          <fo:inline keep-with-next.within-line="always">
-            <fo:basic-link internal-destination="{$id}">
-              <xsl:if test="$label != ''">
-                <xsl:copy-of select="$label"/>
-                <xsl:value-of select="$autotoc.label.separator"/>
-              </xsl:if>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </fo:basic-link>
-          </fo:inline>
-          <fo:inline keep-together.within-line="always">
-            <xsl:text> </xsl:text>
-            <fo:leader leader-pattern="dots"
-                       leader-pattern-width="3pt"
-                       leader-alignment="reference-area"
-                       keep-with-next.within-line="always"/>
-            <xsl:text> </xsl:text>
-            <fo:basic-link internal-destination="{$id}">
-              <fo:page-number-citation ref-id="{$id}"/>
-            </fo:basic-link>
-          </fo:inline>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,244 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls page margins, sections page break,
-       header content and titles size. -->
-
-    <!-- The inner page margin. -->
-  <xsl:param name="page.margin.inner" select="'0.32in'"/>
-
-    <!-- The outer page margin. -->
-  <xsl:param name="page.margin.outer" select="'0.32in'"/>
-
-    <!-- The bottom margin of the page. -->
-  <xsl:param name="page.margin.bottom" select="'0.35in'"/>
-
-    <!-- The top margin of the page. -->
-  <xsl:param name="page.margin.top" select="'0.35in'"/>
-
-    <!-- The bottom margin of the body text. -->
-  <xsl:param name="body.margin.bottom" select="'0.4in'"/>
-
-    <!-- The top margin of the body text. -->
-  <xsl:param name="body.margin.top" select="'0.4in'"/>
-
-    <!-- Specifies the height of the header. -->
-  <xsl:param name="region.before.extent" select="'0.25in'"/>
-
-    <!-- Specifies the height of the footer. -->
-  <xsl:param name="region.after.extent" select="'0.25in'"/>
-
-    <!-- The start-indent for the body text. -->
-  <xsl:param name="body.start.indent" select="'0pc'"/>
-
-    <!-- Adjust the left margin for titles. -->
-  <xsl:param name="title.margin.left">-0.8pc</xsl:param>
-
-    <!-- Default table width on tables that do not specify an alternate
-         width using the dbfo processing instruction.
-         This value is used also on bookinfo/revhistory table. -->
-  <xsl:param name="default.table.width" select="'70%'"/>
-
-    <!-- Properties for component titles -->
-  <xsl:attribute-set name="component.title.properties">
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">
-      <xsl:value-of select="concat($body.font.master, 'pt')"/>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.minimum">
-      <xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.maximum">
-      <xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="text-align">
-      <xsl:choose>
-        <xsl:when test="((parent::article | parent::articleinfo |
-                          parent::info/parent::article)
-                          and not(ancestor::book) and not(self::bibliography))
-                        or (parent::slides | parent::slidesinfo)
-                        or self::index">center</xsl:when>
-        <xsl:otherwise>left</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="start-indent">
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Rule under headers? 1 =yes, 0 = no -->
-  <xsl:param name="header.rule" select="0"/>
-
-    <!-- Rule over footers? 1 =yes, 0 = no -->
-  <xsl:param name="footer.rule" select="0"></xsl:param>
-
-    <!-- Control depth of sections shown in running headers or footers.
-         Be sure that no unneeded fo:marker are generated. -->
-  <xsl:param name="marker.section.level" select="-1"></xsl:param>
-
-     <!-- Force package's sect1 onto a new page -->
-  <xsl:attribute-set name="section.level1.properties">
-    <xsl:attribute name="break-before">
-      <xsl:choose>
-        <!--<xsl:when test="not(. = //*/sect1[1])">
-          <xsl:text>page</xsl:text>
-        </xsl:when>-->
-        <xsl:when test="preceding-sibling::sect1[position()=1]/sect2/@role='package'
-                        or self::sect1/sect2/@role='package'">page</xsl:when>
-        <xsl:otherwise>
-          <xsl:text>auto</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- part/partintro:
-           Be sure that partintro is on a new page. -->
-    <!-- The original template is in {docbook-xsl}/fo/divisions.xsl -->
-  <xsl:template match="part/partintro">
-    <xsl:apply-templates select=".." mode="part.titlepage.mode">
-      <xsl:with-param name="additional.content">
-        <fo:block break-before="page"/>
-        <xsl:if test="title">
-          <xsl:call-template name="partintro.titlepage"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:apply-templates>
-    <xsl:call-template name="generate.part.toc">
-      <xsl:with-param name="part" select=".."/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- book title:
-          Centered the title and removed unused code.
-          Removed book.titlepage.separator. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage">
-    <fo:block margin-top="3in">
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.recto"/>
-        <xsl:call-template name="book.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.verso"/>
-        <xsl:call-template name="book.titlepage.verso"/>
-      </fo:block>
-    </fo:block>
-  </xsl:template>
-
-    <!-- book titlepage verso:
-           Added missing bibliosource and revhistory support.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage.verso">
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/corpauthor"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/releaseinfo"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/pubdate"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/bibliosource"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/abstract"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/revhistory"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
-  </xsl:template>
-
-    <!-- bibliosource:
-           Self-made template to handle bibliosource when inside bookinfo. -->
-  <xsl:template match="bibliosource" mode="book.titlepage.verso.auto.mode">
-    <fo:block font-size="8pt">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- part title:
-           Centered the title and removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="part.titlepage">
-    <fo:block>
-      <fo:block margin-top="3.5in">
-        <xsl:call-template name="part.titlepage.before.recto"/>
-        <xsl:call-template name="part.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="part.titlepage.before.verso"/>
-        <xsl:call-template name="part.titlepage.verso"/>
-      </fo:block>
-      <xsl:call-template name="part.titlepage.separator"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- chapter title:
-           Small font size and left alignament. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-    <fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"
-              font-size="21pt" font-weight="bold" text-align="left">
-      <xsl:call-template name="component.title">
-        <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-    <!-- sect2 title:
-           Skip sect2.titlepage run when title is empty.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/sections.xsl -->
-  <xsl:template match="sect2">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <fo:block xsl:use-attribute-sets="section.level2.properties">
-      <xsl:attribute name="id">
-        <xsl:value-of select="$id"/>
-      </xsl:attribute>
-      <xsl:if test="not(string-length(title)=0)">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-   <!-- header.table:
-          Re-made template to not generate a fo:table in the header,
-          allowing a more simple header.content customization. -->
-    <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
-  <xsl:template name="header.table">
-    <xsl:param name="sequence" select="''"/>
-    <xsl:param name="gentext-key" select="''"/>
-    <xsl:choose>
-      <xsl:when test="$gentext-key = 'book' or $sequence = 'blank'"/>
-      <xsl:otherwise>
-        <xsl:call-template name="header.content">
-          <xsl:with-param name="sequence" select="$sequence"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- header.content
-           Re-made template to show the book title and version on all pages. -->
-    <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
-  <xsl:template name="header.content">
-    <xsl:param name="sequence" select="''"/>
-    <fo:block>
-      <xsl:attribute name="text-align">
-        <xsl:choose>
-          <xsl:when test="$sequence = 'first' or $sequence = 'odd'">right</xsl:when>
-          <xsl:otherwise>left</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:value-of select="/book/bookinfo/title"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="/book/bookinfo/subtitle"/>
-    </fo:block>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/pdf/lfs-xref.xsl
===================================================================
--- stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-
-  <!-- This stylesheet fixes English punctuation in xref links
-       (as was requested by the publisher) via adding @role propagation
-       in xref tags.
-       This hack may not work with xref flavours not used in the book.
-       For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
-       this file in lfs-pdf.xsl -->
-
-     <!--  xref:
-           Added role variable and use it when calling mode xref-to.
-           Also remove code for xlink:href attribute in xref elements,
-           since we don't use it.-->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="xref" name="xref">
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="$linkend.targets[1]"/>
-    <xsl:param name="refelem" select="local-name($target)"/>
-      <!-- Added role variable -->
-    <xsl:variable name="role" select="@role"/>
-    <xsl:variable name="xrefstyle">
-      <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle)
-                        and $use.role.as.xrefstyle != 0">
-          <xsl:value-of select="@role"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@xrefstyle"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="content">
-      <fo:inline xsl:use-attribute-sets="xref.properties">
-        <xsl:choose>
-          <xsl:when test="@endterm">
-            <xsl:variable name="etargets" select="key('id',@endterm)"/>
-            <xsl:variable name="etarget" select="$etargets[1]"/>
-            <xsl:choose>
-              <xsl:when test="count($etarget) = 0">
-                <xsl:message>
-                  <xsl:value-of select="count($etargets)"/>
-                  <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                  <xsl:value-of select="@endterm"/>
-                </xsl:message>
-                <xsl:text>???</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="$etarget" mode="endterm"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="$target/@xreflabel">
-            <xsl:call-template name="xref.xreflabel">
-              <xsl:with-param name="target" select="$target"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$target">
-            <xsl:if test="not(parent::citation)">
-              <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-            </xsl:if>
-            <xsl:apply-templates select="$target" mode="xref-to">
-              <xsl:with-param name="referrer" select="."/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <!-- Propagate role -->
-              <xsl:with-param name="role" select="$role"/>
-            </xsl:apply-templates>
-            <xsl:if test="not(parent::citation)">
-              <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-            </xsl:if>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>ERROR: xref linking to </xsl:text>
-              <xsl:value-of select="@linkend"/>
-              <xsl:text> has no generated link text.</xsl:text>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:inline>
-    </xsl:variable>
-    <!-- Convert it into an active link -->
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-    <!-- Add standard page reference? -->
-    <xsl:choose>
-      <xsl:when test="not($target)">
-        <!-- page numbers only for local targets -->
-      </xsl:when>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')
-                    and contains($xrefstyle, 'nopage')">
-        <!-- negative xrefstyle in instance turns it off -->
-      </xsl:when>
-      <!-- positive xrefstyle already handles it -->
-      <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:')
-                    and (contains($xrefstyle, 'page')
-                        or contains($xrefstyle, 'Page')))
-                    and ( $insert.xref.page.number = 'yes'
-                      or $insert.xref.page.number = '1')
-                    or local-name($target) = 'para'">
-        <xsl:apply-templates select="$target" mode="page.citation">
-          <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
-        </xsl:apply-templates>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect* mode xref-to:
-           Propagate role to mode object.xref.markup (see ../lfs-common.xsl) -->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5
-                      |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-    <xsl:param name="referrer"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:apply-templates select="." mode="object.xref.markup">
-      <xsl:with-param name="purpose" select="'xref'"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-    <!-- insert.title.markup:
-           Apply the role value. -->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="*" mode="insert.title.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="title"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$title"/>
-        <xsl:value-of select="$role"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/profile.xsl
===================================================================
--- stylesheets/lfs-xsl/profile.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <!-- Stylesheet to create profiled XML output.
-       Replaces {docbook-xsl}/profiling/profile.xsl -->
-
-  <!-- Include common profiling stylesheet -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/profiling/profile-mode.xsl"/>
-
-    <!-- This file must be included, because profile-mode is using
-         templates from it -->
-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/common/stripns.xsl"/>
-
-    <!-- In the two pass processing there is no need for base URI fixup -->
-  <xsl:param name="profile.baseuri.fixup" select="false()"/>
-
-  <!-- Generate DocBook instance with correct DOCTYPE -->
-  <xsl:output method="xml"
-              doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
-              doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
-
-  <!-- Profiling parameters:
-         profile.separator changed from ";" to "," to let it work
-         at command line. -->
-  <xsl:param name="profile.arch" select="''"/>
-  <xsl:param name="profile.audience" select="''"/>
-  <xsl:param name="profile.condition" select="''"/>
-  <xsl:param name="profile.conformance" select="''"/>
-  <xsl:param name="profile.lang" select="''"/>
-  <xsl:param name="profile.os" select="''"/>
-  <xsl:param name="profile.revision" select="''"/>
-  <xsl:param name="profile.revisionflag" select="''"/>
-  <xsl:param name="profile.role" select="''"/>
-  <xsl:param name="profile.security" select="''"/>
-  <xsl:param name="profile.status" select="''"/>
-  <xsl:param name="profile.userlevel" select="''"/>
-  <xsl:param name="profile.vendor" select="''"/>
-  <xsl:param name="profile.wordsize" select="''"/>
-  <xsl:param name="profile.attribute" select="''"/>
-  <xsl:param name="profile.value" select="''"/>
-  <xsl:param name="profile.separator" select="','"/>
-
-  <!-- Call common profiling mode -->
-  <xsl:template match="/">
-    <xsl:apply-templates select="." mode="profile"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-admon.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how admonitions are displayed -->
-
-    <!-- Use graphics in admonitions? 1 = yes, 0 = no -->
-  <xsl:param name="admon.graphics" select="1"/>
-
-    <!-- Relative path to images directory. We set here relative path
-    from sub-dirs HTML files. The path from top-level HTML files (index.html,
-    partX.html, etc) MUST be fixed via a sed in the Makefile. -->
-  <xsl:param name="admon.graphics.path">../images/</xsl:param>
-
-    <!-- The images files extension -->
-  <xsl:param name="admon.graphics.extension" select="'.png'"/>
-
-    <!-- Changing the output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature
-           Changed the output format from table to nested divs -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="graphical.admonition">
-    <xsl:variable name="admon.type">
-      <xsl:choose>
-        <xsl:when test="local-name(.)='note'">Note</xsl:when>
-        <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-        <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-        <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-        <xsl:when test="local-name(.)='important'">Important</xsl:when>
-        <xsl:otherwise>Note</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="alt">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$admon.type"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <div class="admon {name(.)}">
-      <img alt="[{$alt}]">
-        <xsl:attribute name="src">
-          <xsl:call-template name="admon.graphic"/>
-        </xsl:attribute>
-      </img>
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-glossary.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-glossary.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-<!-- glossary:
-     Output title before the containing <div>, so that it can be at a fixed
-     position
-     Simplify due to the fact that we have only one glossdiv children, and
-     no other glossxxx child -->
-<!-- the original template is in {docbook-xsl}/xhtml/glossary.xsl -->
-  <xsl:template match="glossary">
-
-    <xsl:variable name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:variable>
-
-    <xsl:variable name="lowercase">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="uppercase">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="id.warning"/>
-
-    <xsl:call-template name="glossary.titlepage"/>
-
-    <xsl:element name="div" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:apply-templates select="." mode="common.html.attributes"/>
-      <xsl:call-template name="id.attribute">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-
-      <xsl:apply-templates select="(glossdiv[1]/preceding-sibling::*)"/>
-
-      <xsl:apply-templates select="glossdiv"/>
-    </xsl:element>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-index.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'AaÀàÁáÂâÃãÄäÅåĀāĂăĄąǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌǅǲȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚǈȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠǋǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node())">
-<!ENTITY section   "(ancestor-or-self::set |ancestor-or-self::book |ancestor-or-self::part |ancestor-or-self::reference |ancestor-or-self::partintro |ancestor-or-self::chapter |ancestor-or-self::appendix |ancestor-or-self::preface |ancestor-or-self::article |ancestor-or-self::section |ancestor-or-self::sect1 |ancestor-or-self::sect2 |ancestor-or-self::sect3 |ancestor-or-self::sect4 |ancestor-or-self::sect5 |ancestor-or-self::refentry |ancestor-or-self::refsect1 |ancestor-or-self::refsect2 |ancestor-or-self::refsect3 |ancestor-or-self::simplesect |ancestor-or-self::bibliography |ancestor-or-self::glossary |ancestor-or-self::index |ancestor-or-self::webpage)[last()]">
-<!ENTITY section.id "generate-id(&section;)">
-<!ENTITY sep '" "'>
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- Change the file name of the index page from the default ix01.html.
-       There is no upstream template with match="index", only a global
-       match="*", thus the following is enough to override the index
-       filename. -->
-
-  <xsl:template match="index" mode="recursive-chunk-filename">
-    <xsl:text>longindex.html</xsl:text>
-  </xsl:template>
-
-  <!-- The original template in {docbook-xsl}/xhtml/autoidx.xsl has
-  a bug (https://github.com/docbook/xslt10-stylesheets/issues/239)
-  that generates a <div> with a wrong xmlns:xlink attribute. So copy it
-  here where the bug does not occur, (and simplify it a lot).-->
-
-  <xsl:template name="generate-basic-index">
-    <xsl:param name="scope" select="NOTANODE"/>
-
-    <xsl:variable name="terms" select="//indexterm
-      [count(.|key('letter',
-                   translate(substring(&primary;, 1, 1),
-                             &lowercase;,
-                             &uppercase;
-                            )
-                  ) [&scope;][1]) = 1]"/>
-    <div class="index">
-      <xsl:apply-templates select="$terms" mode="index-div-basic">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </div>
-  </xsl:template>
-
-  <!-- Divisions:
-       Override the default division titles, translating them from the default
-       'A', 'B', etc. to 'Packages', 'Programs', etc.
-       Add gentext support to division titles.
-       Use h2 for division titles instead of the default h3.
-       Change main listings from dl to ul format.
-       The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-
-  <xsl:template match="indexterm" mode="index-div-basic">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-    <!-- Make sure that we don't generate a div if there are no terms in scope
-   -->
-    <xsl:if test="key('letter', $key)[&scope;] [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-        <h2>
-          <xsl:choose>
-            <xsl:when test="$divtitle = 'A'">
-              <a id="package-index" name="package-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Packages</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'B'">
-              <a id="program-index" name="program-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Programs</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'C'">
-              <a id="library-index" name="library-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Libraries</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'D'">
-              <xsl:choose>
-                <xsl:when test="$book-type = 'blfs'">
-                  <a id="kernel-config-index" name="kernel-config-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Kernel Configuration</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a id="scripts-index" name="scripts-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Scripts</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'E'">
-              <xsl:choose>
-                <xsl:when test="$book-type = 'blfs'">
-                  <a id="config-file-index" name="config-file-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Configuration Files</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a id="other-index" name="other-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Others</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'F'">
-                <a id="bootscript-index" name="bootscript-index"/>
-                <xsl:call-template name="gentext">
-                  <xsl:with-param name="key">Bootscripts</xsl:with-param>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'G'">
-              <a id="other-index" name="other-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Others</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$divtitle"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </h2>
-      </xsl:if>
-      <ul>
-      <xsl:apply-templates select="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node())][count(.|key('primary', normalize-space(concat(primary/@sortas, &quot; &quot;, primary)))[count(ancestor::node()|$scope) = count(ancestor::node())][1])=1]" mode="index-primary">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Primary items:
-       Place term and separator into strong tags.
-       Place target links into a div.
-       Change main listings from dl to ul format.
-       Removed code for unused see and sealso children.
-       The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-primary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="normalize-space(concat(primary/@sortas, &quot; &quot;, primary))"/>
-    <xsl:variable name="refs" select="key('primary', $key)[count(ancestor::node()|$scope) = count(ancestor::node())]"/>
-    <li>
-      <strong class="item">
-        <xsl:value-of select="primary"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class='indexref'>
-        <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section',concat($key, &sep;, &section.id;))[&scope;][1])]">
-        <!--<xsl:for-each select="$refs[not(see) and not(secondary)][count(ancestor::node()|$scope) = count(ancestor::node()) = 0]">-->
-          <xsl:apply-templates select="." mode="reference">
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </span>
-      <xsl:if test="$refs/secondary">
-        <ul>
-          <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &quot; &quot;, normalize-space(concat(secondary/@sortas, &quot; &quot;, secondary))))[count(ancestor::node()|$scope) = count(ancestor::node()) ][1]) = 1]" mode="index-secondary">
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-          </xsl:apply-templates>
-         </ul>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-  <!-- Secondary items:
-       Place term and separator into strong tags.
-       Place target links into a div.
-       Change main listings from dl to ul format.
-       Removed code for unused tertiary, see and sealso children.
-       The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-secondary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, &quot; &quot;, primary)), &quot; &quot;, normalize-space(concat(secondary/@sortas, &quot; &quot;, secondary)))"/>
-    <xsl:variable name="refs" select="key('secondary', $key)[count(ancestor::node()|$scope) = count(ancestor::node())]"/>
-    <li>
-      <strong class="secitem">
-        <xsl:value-of select="secondary"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class='indexref'>
-        <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
-          <xsl:apply-templates select="." mode="reference">
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </span>
-    </li>
-  </xsl:template>
-
-  <!-- Drop $term.separator and $number.separator from here as customized ones
-       are added in the output flow.
-       As all the indexterms in the book have @zone attributes, removed a lot of
-       unused code.
-       The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:call-template name="reference">
-      <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-      <xsl:with-param name="scope" select="$scope"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- The target links:
-       Changed link separator
-       On the second @zone link, we use a fixed string for the text with gentext
-       support.
-       Assume that there are no more than 2 @zone in a indexterm.
-       Use href.target.uri named template to resolve the links. It is faster
-       than the default href.target named template.
-       The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template name="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="zones"/>
-    <xsl:choose>
-      <xsl:when test="contains($zones, ' ')">
-        <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-        <xsl:variable name="zone2" select="substring-after($zones, ' ')"/>
-        <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
-        <xsl:variable name="target2" select="key('sections', $zone2)[&scope;]"/>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-        </a>
-        <xsl:text> -- </xsl:text>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target2[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">description</xsl:with-param>
-          </xsl:call-template>
-        </a>
-        <br/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="zone" select="$zones"/>
-        <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-        </a>
-        <br/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how legalnotice page is created -->
-
-    <!-- Generating the legalnotice page:
-           We are forcing separate legalnotice page generation.
-           Removed the default link to legalnotice page. We want it in Copyright.
-           Added footer navigational link to Home.  -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="legalnotice" mode="titlepage.mode">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="filename" select="concat($base.dir, 'legalnotice.html')"/>
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      <xsl:with-param name="content">
-        <html>
-          <xsl:call-template name="html.head"/>
-          <body>
-            <xsl:call-template name="body.attributes"/>
-            <div class="{local-name(.)}">
-              <xsl:apply-templates mode="titlepage.mode"/>
-            </div>
-            <div class="navfooter">
-              <ul class="footerlinks">
-                <li class="home">
-                  <a accesskey="h" href="index.html">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="/book/bookinfo/title"/>
-                      <xsl:text> - </xsl:text>
-                      <xsl:value-of select="/book/bookinfo/subtitle"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'home'"/>
-                    </xsl:call-template>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </body>
-        </html>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- Making the legalnotice link:
-         We make the "Copyright" word a link to legalnotice page. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="copyright" mode="titlepage.mode">
-    <p class="{name(.)}">
-      <a href="legalnotice.html">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Copyright'"/>
-        </xsl:call-template>
-      </a>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat">copyright</xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years" select="year"/>
-        <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-        <xsl:with-param name="single.year.ranges" select="$make.single.year.ranges"/>
-      </xsl:call-template>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,309 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet contains misc templates for output formating.
-       This file is for that templates that don't fit in other files
-       and that not afect the chunk algorithm. -->
-
-  <!-- Individual elements templates -->
-
-    <!-- para:
-           Added a choose to skip empty "Home page" in packages.xml.
-           Added an if for HLFS features. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/block.xsl -->
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="child::ulink[@url=' ']"/>
-      <xsl:otherwise>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="class">
-            <xsl:if test="@role">
-              <xsl:if test="$book-type = 'hlfs'">
-                <xsl:if test="contains($hlfs-features,concat(',',@role,','))">
-                  <xsl:text>feature-</xsl:text>
-                </xsl:if>
-              </xsl:if>
-              <xsl:value-of select="@role"/>
-            </xsl:if>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:if test="position() = 1 and parent::listitem">
-              <xsl:call-template name="anchor">
-                <xsl:with-param name="node" select="parent::listitem"/>
-              </xsl:call-template>
-            </xsl:if>
-            <xsl:call-template name="anchor"/>
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- screen:
-           Changed class attribute asignament to fit our look needs.
-           Removed unused line numbering support. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/verbatim.xsl
-         It match also programlisting and synopsis. The code for that tags
-         is unchanged. -->
-  <xsl:template match="screen">
-    <pre>
-      <xsl:attribute name="class">
-        <xsl:choose>
-          <xsl:when test="@role and not(@role = 'nodump')">
-            <xsl:if test="$book-type = 'hlfs'">
-              <xsl:if test="contains($hlfs-features,concat(',',@role,','))">
-                <xsl:text>feature-</xsl:text>
-              </xsl:if>
-            </xsl:if>
-            <xsl:value-of select="@role"/>
-          </xsl:when>
-          <xsl:when test="child::* = userinput">userinput</xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="name(.)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </pre>
-  </xsl:template>
-
-    <!-- userinput:
-           Using a customized output when inside screen.
-           In other cases, use the original template. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/inline.xsl -->
-  <xsl:template match="userinput">
-    <xsl:choose>
-      <xsl:when test="ancestor::screen">
-        <kbd class="command">
-          <xsl:apply-templates/>
-        </kbd>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- itemizadlist:
-           @compact is not allowed in XHTML 1.0 Strict DTD. Changing it
-           to @class. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="itemizedlist">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="title">
-        <xsl:call-template name="formal.object.heading"/>
-      </xsl:if>
-      <xsl:apply-templates select="*[not(self::listitem or self::title
-                              or self::titleabbrev)]
-                              |comment()[not(preceding-sibling::listitem)]
-                              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-      <ul>
-        <xsl:if test="@spacing='compact'">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@spacing"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="listitem |comment()[preceding-sibling::listitem]
-                                |processing-instruction()[preceding-sibling::listitem]"/>
-      </ul>
-    </div>
-  </xsl:template>
-
-    <!-- orderedlist:
-           @start, @type, and @compact sre not allowed in XHTML 1.0 Strict DTD.
-           @start and @type can be replaced by CSS code.
-           Changing @compact to @class. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="orderedlist">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="title">
-        <xsl:call-template name="formal.object.heading"/>
-      </xsl:if>
-      <xsl:apply-templates select="*[not(self::listitem or self::title
-                              or self::titleabbrev)]
-                              |comment()[not(preceding-sibling::listitem)]
-                              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-       <ol>
-        <xsl:if test="@spacing='compact'">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@spacing"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="listitem |comment()[preceding-sibling::listitem]
-                                |processing-instruction()[preceding-sibling::listitem]"/>
-      </ol>
-    </div>
-  </xsl:template>
-
-    <!-- seg in segementedlist:
-           Added a span around seg text to can match it with CSS code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="seg">
-    <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-    <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-    <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-      <!-- Note: segtitle is only going to be the right thing in a well formed
-      SegmentedList.  If there are too many Segs or too few SegTitles,
-      you'll get something odd...maybe an error -->
-    <div class="seg">
-      <strong class="segtitle">
-        <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                              mode="segtitle-in-seg"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class="segbody">
-        <xsl:if test="@id">
-          <a id="{@id}" name="{@id}"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </span>
-    </div>
-  </xsl:template>
-
-    <!-- variablelist:
-           If it have a role attribute, wrap the default output into a div with
-           a class attribute matching that role attribute.
-           Apply the original template in all cases. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="variablelist">
-    <xsl:choose>
-      <xsl:when test="@role">
-        <div class="{@role}">
-          <xsl:apply-imports/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- para/simplelist:
-           Self-made template. Add a line break and process the childs.
-           If @type is specified, the original templates should be used,
-           but not tested. -->
-  <xsl:template match="para/simplelist">
-    <br/>
-    <xsl:apply-templates mode="condensed"/>
-  </xsl:template>
-
-    <!-- member:
-           Self-made template to process it and add a line break. -->
-  <xsl:template match="member" mode="condensed">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <br/>
-  </xsl:template>
-
-
-  <!-- Named formating templates -->
-
-    <!-- Body attributes:
-           Add to the body XHTML output tag a class attribute with the book type
-           and a id attribute with the book type and version. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name="body.attributes">
-    <xsl:attribute name="class">
-      <xsl:value-of select="$book-type"/>
-    </xsl:attribute>
-    <xsl:attribute name="id">
-      <xsl:value-of select="$book-type"/>
-      <xsl:text>-</xsl:text>
-      <xsl:value-of select="substring-after(/book/bookinfo/subtitle, ' ')"/>
-    </xsl:attribute>
-  </xsl:template>
-
-  <!-- Revision History -->
-
-    <!-- revhistory mode titlepage.mode:
-           Removed hardcoded style attributes.
-           Removed support for separate revhistory file. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="revhistory" mode="titlepage.mode">
-    <xsl:variable name="numcols">
-      <xsl:choose>
-        <xsl:when test="//authorinitials">4</xsl:when>
-        <xsl:otherwise>3</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="title">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">RevHistory</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="contents">
-      <table summary="{$title}" class="{name(.)}">
-        <tr>
-          <th colspan="{$numcols}">
-            <b>
-              <xsl:value-of select="$title"/>
-            </b>
-          </th>
-        </tr>
-        <xsl:apply-templates mode="titlepage.mode">
-          <xsl:with-param name="numcols" select="$numcols"/>
-        </xsl:apply-templates>
-      </table>
-    </xsl:variable>
-    <xsl:copy-of select="$contents"/>
-  </xsl:template>
-
-    <!-- revhistory/revision mode titlepage.mode:
-           Removed hardcoded style attributes. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="revhistory/revision" mode="titlepage.mode">
-    <xsl:param name="numcols" select="'3'"/>
-    <xsl:variable name="revnumber" select="revnumber"/>
-    <xsl:variable name="revdate" select="date"/>
-    <xsl:variable name="revauthor" select="authorinitials|author"/>
-    <xsl:variable name="revremark" select="revremark|revdescription"/>
-    <tr>
-      <td>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-        </xsl:if>
-      </td>
-      <td>
-        <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-      </td>
-      <xsl:choose>
-        <xsl:when test="$revauthor">
-          <td>
-            <xsl:for-each select="$revauthor">
-              <xsl:apply-templates select="." mode="titlepage.mode"/>
-              <xsl:if test="position() != last()">
-                <xsl:text>, </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </td>
-        </xsl:when>
-        <xsl:when test="$numcols &gt; 3">
-        <!-- the character in the <td> element is a non breaking space
-             (unicode A0) -->
-          <td>&#xA0;</td>
-        </xsl:when>
-        <xsl:otherwise/>
-      </xsl:choose>
-      <td>
-        <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-      </td>
-    </tr>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,359 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how page header and navigational links
-       are generated. -->
-
-    <!-- html.head:
-           Drop all navigational links from inside head xhtml output. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="html.head">
-    <head>
-      <xsl:call-template name="system.head.content"/>
-      <xsl:call-template name="head.content"/>
-      <xsl:call-template name="user.head.content"/>
-    </head>
-  </xsl:template>
-
-    <!-- header.navigation:
-           Self-made template that full replaces the original one -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="header.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="home" select="/*[1]"/>
-      <!-- Don't generate the header in index.html -->
-    <xsl:if test="$home != .">
-      <div class="navheader">
-          <!-- Book title and version -->
-        <h4>
-          <xsl:apply-templates select="$home" mode="object.title.markup"/>
-          <xsl:text> - </xsl:text>
-          <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
-        </h4>
-          <!-- Except for preface, part, and index, add the title of the parent -->
-        <xsl:if test="$up != $home">
-          <h3>
-            <xsl:apply-templates select="$up" mode="object.title.markup"/>
-          </h3>
-        </xsl:if>
-          <!-- Create header navigational links -->
-        <xsl:call-template name="navigational.links">
-          <xsl:with-param name="prev" select="$prev"/>
-          <xsl:with-param name="next" select="$next"/>
-          <xsl:with-param name="up" select="$up"/>
-          <xsl:with-param name="home" select="$home"/>
-        </xsl:call-template>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- footer.navigation:
-           Self-made template that full replaces the original one -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="footer.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="home" select="/*[1]"/>
-      <!-- Create footer navigational links -->
-    <div class="navfooter">
-      <xsl:call-template name="navigational.links">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="up" select="$up"/>
-        <xsl:with-param name="home" select="$home"/>
-      </xsl:call-template>
-    </div>
-      <!-- In HLFS, add the features.js call -->
-    <xsl:if test="$book-type = 'hlfs'">
-      <script type="text/javascript">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="local-name(.)='book' or local-name(.)='part' or
-                            local-name(.)='index'">../features.js</xsl:when>
-            <xsl:otherwise>../../features.js</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </script>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- navigational.links:
-           Self-made template to generate navigational links.
-           Most of the code come from the original header.navigation and
-           footer.navigation templates, with this changes:
-             Changed the output format from table to ul.
-             Placed the same links on both header and footer.
-             Added a title attribute to the link containing the target title
-               (it content is displayed when placing the mouse over the link)
-             For "Prev" and "Next" links, added the target title under it.
-             When "Next" target is the Index, added gentext support for the
-               Index title.
-             Skip links to dummy sect1. -->
-  <xsl:template name="navigational.links">
-    <xsl:param name="prev"/>
-    <xsl:param name="next"/>
-    <xsl:param name="up"/>
-    <xsl:param name="home"/>
-    <ul>
-        <!-- No prev link when prev is home -->
-      <xsl:if test="count($prev)&gt;0 and $prev != $home">
-        <li class="prev">
-          <xsl:choose>
-
-              <!-- If prev is a dummy sect1 that is the first one in a chapter,
-                   links to the parent chapter.-->
-            <xsl:when test="$prev[@role='dummy'] and
-                            count(preceding-sibling::sect1)=1">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select=".."/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="../title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="../title"/>
-              </p>
-            </xsl:when>
-
-              <!-- If prev is a dummy sect1 that is not the first one in a chapter,
-                   links to the previous sect1.-->
-            <xsl:when test="$prev[@role='dummy'] and
-                            count(preceding-sibling::sect1)&gt;1">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="preceding-sibling::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="preceding-sibling::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="preceding-sibling::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$prev[@id='ch-chroot-devices'] or $prev[@id='ch-boot-whatnext']">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="//sect1[@id='ch-temp-system-choose']"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="//sect1[@id='ch-temp-system-choose']/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="//sect1[@id='ch-temp-system-choose']/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Normal prev links -->
-            <xsl:otherwise>
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$prev"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$prev/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="$prev/title"/>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </li>
-      </xsl:if>
-
-
-        <!-- Next link except in the last page and in the CLFS "choose" page -->
-      <xsl:if test="count($next)&gt;0 and (not(@id) or @id!='ch-temp-system-choose')">
-        <li class="next">
-          <xsl:choose>
-
-              <!-- Current page is sect1 a next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'sect1'">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="following-sibling::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="following-sibling::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="following-sibling::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Current page is chapter and next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'chapter'">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="descendant::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="descendant::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="descendant::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$next[@id='chapter-chroot'] or $next[@id='chapter-boot']">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="//part[@id='part5']"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="//part[@id='part5']/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="//part[@id='part5']/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Normal next links. Take care of Index gentext support. -->
-            <xsl:otherwise>
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$next"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:choose>
-                    <xsl:when test="local-name($next)='index'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Index</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="$next/title"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:choose>
-                  <xsl:when test="local-name($next)='index'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Index</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="$next/title"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </li>
-      </xsl:if>
-
-
-      <li class="up">
-        <xsl:choose>
-            <!-- Up link except if up is home -->
-          <xsl:when test="count($up)&gt;0 and $up != $home">
-            <a accesskey="u">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$up"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:attribute name="title">
-                <xsl:apply-templates select="$up" mode="object.title.markup"/>
-              </xsl:attribute>
-              <xsl:call-template name="navig.content">
-                <xsl:with-param name="direction" select="'up'"/>
-              </xsl:call-template>
-            </a>
-          </xsl:when>
-            <!-- Hack to let the CSS code do its work when there is no up link -->
-          <xsl:otherwise>
-            <xsl:text>.</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </li>
-
-
-      <li class="home">
-        <xsl:choose>
-            <!-- No home link in home page -->
-          <xsl:when test="$home != .">
-            <a accesskey="h">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$home"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:attribute name="title">
-                <xsl:value-of select="$home/bookinfo/title"/>
-                <xsl:text> - </xsl:text>
-                <xsl:value-of select="$home/bookinfo/subtitle"/>
-              </xsl:attribute>
-              <xsl:call-template name="navig.content">
-                <xsl:with-param name="direction" select="'home'"/>
-              </xsl:call-template>
-            </a>
-          </xsl:when>
-            <!-- Hack to let the CSS code do its work when there is no home link -->
-          <xsl:otherwise>
-            <xsl:text>.</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </li>
-    </ul>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-sections.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,252 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how preface, chapter, and sections are handled -->
-
-    <!-- Chunk the first top-level section? 1 = yes, 0 = no
-         If preface and chapters TOC are generated, this must be 1. -->
-  <xsl:param name="chunk.first.sections" select="1"/>
-
-    <!-- preface:
-         Output non sect1 child elements before the TOC
-         Output title outside of the <div> because we want to be able to
-         use it at a fixed position -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="preface">
-    <xsl:call-template name="id.warning"/>
-    <xsl:call-template name="preface.titlepage"/>
-    <xsl:call-template name="component.separator"/>
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="dir">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:call-template name="process.footnotes"/>
-    </div>
-  </xsl:template>
-
-    <!-- part:
-         Output non sect1 child elements before the TOC
-         Output title outside of the <div> because we want to be able to
-         use it at a fixed position -->
-    <!-- The original template is in {docbook-xsl}/xhtml/divisions.xsl -->
-  <xsl:template match="part">
-    <xsl:call-template name="id.warning"/>
-
-    <xsl:call-template name="part.titlepage"/>
-
-    <div>
-      <xsl:apply-templates select="." mode="common.html.attributes"/>
-      <xsl:call-template name="id.attribute">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
-        <xsl:call-template name="division.toc"/>
-      </xsl:if>
-    </div>
-  </xsl:template>
-
-    <!-- chapter:
-           Output non sect1 child elements before the TOC
-           Output title before div to be able to fix the title position -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="chapter">
-    <xsl:call-template name="id.warning"/>
-    <xsl:call-template name="chapter.titlepage"/>
-    <xsl:call-template name="component.separator"/>
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="dir">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:call-template name="process.footnotes"/>
-    </div>
-  </xsl:template>
-
-    <!-- appendix:
-           Output non sect1 child elements before the TOC
-           Output title before div to be able to fix the title position -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="appendix">
-
-    <xsl:call-template name="id.warning"/>
-
-    <xsl:call-template name="appendix.titlepage"/>
-
-    <xsl:element name="div" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:call-template name="common.html.attributes">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="id.attribute">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-
-      <xsl:apply-templates/>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:if>
-
-    </xsl:element>
-  </xsl:template>
-
-    <!-- sect1:
-           When there is a role attibute, use it as the class value.
-           Process the SVN keywords found in sect1info as a footnote.
-           Output title before the containing <div> so that the title
-           can be at a fixed position.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect1">
-    <xsl:call-template name="sect1.titlepage"/>
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:apply-templates/>
-      <xsl:apply-templates select="sect1info" mode="svn-keys"/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2:
-           When there is a role attibute, use it as the class value.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect2">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="class">
-            <xsl:value-of select="name(.)"/>
-          </xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect2.titlepage"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect3: treat as sect2 (for Python and Perl modules
-           When there is a role attibute, use it as the class value.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect3">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="class">
-            <xsl:value-of select="name(.)"/>
-          </xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect3.titlepage"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect1info mode svn-keys:
-           Self-made template to process SVN keywords found in sect1info. -->
-  <xsl:template match="sect1info" mode="svn-keys">
-    <!-- <p class="updated">Last updated --><!-- by
-      <xsl:apply-templates select="othername" mode="svn-keys"/> -->
-    <!--  on
-      <xsl:apply-templates select="date" mode="svn-keys"/>
-    </p> -->
-  </xsl:template>
-
-    <!-- othername mode svn-keys:
-           Self-made template to process the $LastChangedBy SVN keyword. -->
-  <xsl:template match="othername" mode="svn-keys">
-    <xsl:variable name="author">
-      <xsl:value-of select="."/>
-    </xsl:variable>
-    <xsl:variable name="nameonly">
-      <xsl:value-of select="substring($author,16)"/>
-    </xsl:variable>
-    <xsl:value-of select="substring-before($nameonly,'$')"/>
-  </xsl:template>
-
-    <!-- date mode svn-keys:
-           Self-made template to process the $Date SVN keyword. -->
-  <xsl:template match="date" mode="svn-keys">
-    <xsl:variable name="date">
-      <xsl:value-of select="."/>
-    </xsl:variable>
-    <xsl:value-of select="substring($date,7,26)"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-titles.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls the h* xhtml tags used for several titles -->
-
-    <!-- preface.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           No label in preface. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="preface.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- part.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the part label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="part.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- partintro.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="partintro.titlepage">
-    <xsl:if test="title">
-      <h2 class="{name(.)}">
-        <xsl:if test="@id">
-          <a id="{@id}" name="{@id}"/>
-        </xsl:if>
-        <xsl:value-of select="title"/>
-      </h2>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- appendix.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the appendix label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="appendix.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- chapter.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the chapter label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="chapter.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- sect1.titlepage:
-           Uses h1 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect1.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Uses h2 and removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h2 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h2>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect3.titlepage:
-         Same as sect2 except it uses h3 -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect3.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h3 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h3>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-    <!-- dedication.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="dedication.titlepage">
-    <h2>
-      <xsl:value-of select="title"/>
-    </h2>
-  </xsl:template>
-
-    <!-- bridgehead:
-           We use always renderas attributes and want the output h* level
-           matching the defined sect* level.
-           Create the anchor only if there is an @id. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="bridgehead">
-    <xsl:variable name="hlevel">
-      <xsl:choose>
-        <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-        <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-        <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-        <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-        <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-    <!-- book.titlepage.verso:
-           Process bookinfo/bibliosource from here. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage.verso">
-    <xsl:apply-templates select="bookinfo/bibliosource"/>
-  </xsl:template>
-
-    <!-- bookinfo/bibliosource:
-           Self-made template to handle bibliosource when inside bookinfo. -->
-  <xsl:template match="bookinfo/bibliosource">
-    <p class="copyright">
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-toc.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how the TOC are generated -->
-
-    <!-- make.toc:
-           Using h3 for TOC title.
-           Using ul for TOC list style.
-           Removed code for $manual.toc and $qanda.in.toc -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="make.toc">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/>
-    <xsl:if test="$nodes">
-      <div class="toc">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">TableofContents</xsl:with-param>
-          </xsl:call-template>
-        </h3>
-        <ul>
-          <xsl:apply-templates select="$nodes" mode="toc">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </ul>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- subtoc:
-           Using ul for TOC list style.
-           Removed code for $qanda.in.toc
-           Removed code for sect* others than sect1 -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="subtoc">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-    <xsl:variable name="subtoc">
-      <ul>
-        <xsl:apply-templates mode="toc" select="$nodes">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </ul>
-    </xsl:variable>
-    <xsl:variable name="depth">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="depth.from.context"
-                  select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-    <li class="{name(.)}">
-      <xsl:call-template name="toc.line">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-      <xsl:if test="$toc.section.depth &gt; $depth and count($nodes)&gt;0
-                    and $toc.max.depth &gt; $depth.from.context">
-        <xsl:copy-of select="$subtoc"/>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-    <!-- toc.line:
-           Adding the h* tags and dropping unneded links.
-           This template is a full re-made version of the original one. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="toc.line">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:choose>
-        <!-- For non dummy sect1 targets, create a link. -->
-      <xsl:when test="local-name(.) = 'sect1'">
-        <xsl:choose>
-          <xsl:when test="@role='dummy'">
-            <span class="dummy">
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </span>
-          </xsl:when>
-          <xsl:otherwise>
-            <a>
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="context" select="$toc-context"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For part, preface, and chapter, use hX and add the label.
-             For BLFS, make it a link. -->
-      <xsl:when test="local-name(.) = 'part' or local-name(.) = 'preface'
-                      or local-name(.) = 'chapter'">
-        <xsl:choose>
-          <xsl:when test="$book-type = 'blfs'">
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="1"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="0"/>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For appendix , create a link and add the label.
-             For BLFS, use hX. -->
-      <xsl:when test="local-name(.) = 'appendix'">
-        <xsl:choose>
-          <xsl:when test="$book-type = 'blfs'">
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="1"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="add.link">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For other targets like Index, use hX, create a link, and label it. -->
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="add.hX">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-          <xsl:with-param name="with-link" select="1"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made template to add hX tags to toc lines. -->
-  <xsl:template match="*" mode="add.hX">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="with-link" select="0"/>
-    <xsl:param name="hlevel">
-      <xsl:choose>
-        <xsl:when test="local-name(.)='chapter' or local-name(.)='preface'">4</xsl:when>
-        <xsl:otherwise>3</xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:choose>
-        <xsl:when test="$with-link != 0">
-          <xsl:apply-templates select="." mode="add.link">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="label.and.title"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:template>
-
-    <!-- Self-made template to made toc line a link. -->
-  <xsl:template match="*" mode="add.link">
-    <xsl:param name="toc-context" select="."/>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="context" select="$toc-context"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:apply-templates select="." mode="label.and.title"/>
-    </a>
-  </xsl:template>
-
-    <!-- Self-made template to write the target title and label it. -->
-  <xsl:template match="*" mode="label.and.title">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/lfs-xsl/xhtml/lfs-xref.xsl
===================================================================
--- stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet fixes English punctuation in xref links
-       (as was requested by the publisher) via adding @role propagation
-       in xref tags.
-       This hack may not work with xref flavours not used in the book.
-       For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
-       this file in lfs-chunked2.xsl -->
-
-    <!-- xref:
-           Added role variable and use it when calling mode xref-to.
-           Also remove code for xlink:href attributes in xref elements
-           since we don't use it.-->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="xref" name="xref">
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="$linkend.targets[1]"/>
-      <!-- Added role variable -->
-    <xsl:variable name="role" select="@role"/>
-    <xsl:variable name="xrefstyle">
-      <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-          <xsl:value-of select="@role"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@xrefstyle"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="anchor"/>
-    <xsl:variable name="content">
-      <xsl:choose>
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:when test="$target/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$target"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$target">
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-          </xsl:if>
-          <xsl:apply-templates select="$target" mode="xref-to">
-            <xsl:with-param name="referrer" select="."/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-             <!-- Propagate role -->
-            <xsl:with-param name="role" select="$role"/>
-          </xsl:apply-templates>
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: xref linking to </xsl:text>
-            <xsl:value-of select="@linkend"/>
-            <xsl:text> has no generated link text.</xsl:text>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- sect* mode xref-to:
-           Propagate role to mode object.xref.markup (see ../lfs-common.xsl) -->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5|refsect1
-                       |refsect2|refsect3|refsection" mode="xref-to">
-    <xsl:param name="referrer"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:apply-templates select="." mode="object.xref.markup">
-      <xsl:with-param name="purpose" select="'xref'"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-    <!-- insert.title.markup:
-           Apply the role value. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="*" mode="insert.title.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="title"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$title"/>
-        <xsl:value-of select="$role"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/patcheslist.xsl
===================================================================
--- stylesheets/patcheslist.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,115 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<!--
-  This stylesheet creates a script to copy the patches referenced
-  in the BLFS book from the patches repository to the blfs
-  download area.  It is very specific to the installation on
-  the home server.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:output method="text"/>
-
-    <!-- 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:param>
-
-  <xsl:template match="/">
-    <xsl:text>#! /bin/bash
-
-function copy
-{
-   cp $1 $2 >>copyerrs 2>&amp;1
-}
-
-# Create dest.dir if it doesn't exist
-# Change to it
-# Remove old patches and possible list of missing patches
-# Ensure correct ownership
-
-mkdir -p </xsl:text>
-    <xsl:value-of select="$dest.dir"/>
-    <xsl:text> &amp;&amp;
-cd </xsl:text>
-    <xsl:value-of select="$dest.dir"/>
-    <xsl:text> &amp;&amp;
-
-    rm -f *.patch copyerrs &amp;&amp;
-
-</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>
-chgrp lfswww *.patch &amp;&amp;
-if [ `wc -l copyerrs|sed 's/ *//' |cut -f1 -d' '` -gt 0 ]; then
-  mail -s "Missing BLFS patches" blfs-book@lists.linuxfromscratch.org &lt; copyerrs
-fi
-exit</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="//text()"/>
-
-  <xsl:template match="//ulink">
-      <!-- Match only local patches links and skip duplicated URLs splitted for PDF output-->
-    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patch-root;')
-            and not(ancestor-or-self::*/@condition = 'pdf')">
-      <xsl:variable name="patch.name" select="substring-after(@url, '&patch-root;')"/>
-      <xsl:text>copy /srv/www/www.linuxfromscratch.org/patches/downloads</xsl:text>
-      <xsl:choose>
-          <!-- cdparanoia -->
-        <xsl:when test="contains($patch.name, '-III')">
-          <xsl:text>/cdparanoia</xsl:text>
-        </xsl:when>
-          <!-- Open Office -->
-        <xsl:when test="contains($patch.name, 'OOo')">
-          <xsl:text>/OOo</xsl:text>
-        </xsl:when>
-          <!-- QT -->
-        <xsl:when test="contains($patch.name, 'qt-x')">
-          <xsl:text>/qt</xsl:text>
-        </xsl:when>
-          <!-- XOrg -->
-        <xsl:when test="contains($patch.name, 'X11R6')">
-          <xsl:text>/xorg</xsl:text>
-        </xsl:when>
-          <!-- net-tools -->
-        <xsl:when test="contains($patch.name, 'net-tools')">
-          <xsl:text>/net-tools</xsl:text>
-        </xsl:when>
-          <!-- junit -->
-        <xsl:when test="contains($patch.name, 'junit')">
-          <xsl:text>/junit</xsl:text>
-        </xsl:when>
-          <!-- x265 -->
-        <xsl:when test="contains($patch.name, 'x265')">
-          <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>
-          <xsl:variable name="cut"
-                  select="translate(substring-after($patch.name, '-'), '0123456789', '0000000000')"/>
-          <xsl:variable name="patch.name2">
-            <xsl:value-of select="substring-before($patch.name, '-')"/>
-            <xsl:text>-</xsl:text>
-            <xsl:value-of select="$cut"/>
-          </xsl:variable>
-          <xsl:value-of select="substring-before($patch.name2, '-0')"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:value-of select="$patch.name"/>
-      <xsl:text> .&#xA;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
-
Index: ylesheets/test-options.xsl
===================================================================
--- stylesheets/test-options.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-
-  <xsl:output method="text"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//sect1[./sect2[@role='installation']]"/>
-  </xsl:template>
-
-  <xsl:template match="sect1">
-    <xsl:variable name="config-string">
-      <xsl:apply-templates
-        select=".//screen/userinput[contains(string(),'configure') or
-                                    contains(string(),'autogen') or
-                                    contains(string(),'cmake') or
-                                    contains(string(),'meson') or
-                                    contains(string(),'b2') or
-                                    contains(string(),'Local/Makefile') or
-                                    contains(string(),'testlog') or
-                                    contains(string(),'make')]"/>
-    </xsl:variable>
-    <xsl:text>
--------------------
-</xsl:text>
-    <xsl:value-of select="@xreflabel"/>
-    <xsl:text>
--------------------
-</xsl:text>
-    <xsl:apply-templates select=".//sect2[@role='commands']//option">
-      <xsl:with-param name="config-string"
-                      select="normalize-space($config-string)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select=".//sect2[@role='commands']//parameter">
-      <xsl:with-param name="config-string"
-                      select="normalize-space($config-string)"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template match="parameter">
-    <xsl:param name="config-string"/>
-    <xsl:variable name="param-string">
-      <xsl:choose>
-        <xsl:when test="contains(string(),'...')">
-          <xsl:copy-of
-            select="normalize-space(substring-before(string(),'...'))"/>
-        </xsl:when>
-        <xsl:when test="contains(string(),'*')">
-          <xsl:copy-of
-            select="normalize-space(substring-before(string(),'*'))"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="normalize-space(string())"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="not(contains($config-string, $param-string))">
-      <xsl:copy-of select="string()"/>
-      <xsl:text> is a parameter, but is not in config string
-</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="option">
-    <xsl:param name="config-string"/>
-    <xsl:variable name="option-string">
-      <xsl:choose>
-        <xsl:when test="contains(string(),'...')">
-          <xsl:copy-of
-            select="normalize-space(substring-before(string(),'...'))"/>
-        </xsl:when>
-        <xsl:when test="contains(string(),'*')">
-          <xsl:copy-of
-            select="normalize-space(substring-before(string(),'*'))"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="normalize-space(string())"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="contains($config-string, $option-string)">
-      <xsl:copy-of select="string()"/>
-      <xsl:text> is an option, but is in config string
-</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: ylesheets/wget-list.xsl
===================================================================
--- stylesheets/wget-list.xsl	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Create a list of upstream URLs for packages and patches to be used
-     with wget. -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-
-  <xsl:output method="text"/>
-
-  <!-- Define the generated wget file type:
-       ftpmirror - the one used to check FTP mirrors (default)
-       full - the one used to test all download links found in the book
-  -->
-  <xsl:param name="list_mode" select="ftpmirror"/>
-
-  <xsl:template match="/">
-    <xsl:choose>
-      <xsl:when test="$list_mode = 'full'">
-       <xsl:apply-templates select="//ulink" mode="full"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="//itemizedlist"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="itemizedlist">
-    <xsl:choose>
-      <!-- If both http and ftp URLs are available, output the ftp one if not empty,
-           otherwise output the http URL.-->
-      <xsl:when test="contains(listitem[1]/para,'(HTTP)')
-                      and contains(listitem[2]/para,'(FTP)')">
-        <xsl:choose>
-          <xsl:when test="string-length(listitem[2]/para/ulink/@url) &gt; '10'">
-            <xsl:apply-templates select="listitem[2]/para/ulink"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="listitem[1]/para/ulink"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- Additional packages and patches.-->
-      <xsl:otherwise>
-        <xsl:apply-templates select="listitem/para/ulink"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="listitem/para/ulink">
-      <!-- The next strings need be revised periodically to add missing
-      files or to skip false positives. Skip also possible
-      duplicated URLs that may be splitted for PDF output -->
-    <xsl:if test="(contains(@url, '.gz') or contains(@url, '.bz2')
-                  or contains(@url, '.tgz') or contains(@url, '.tar')
-                  or contains(@url, 'patch.txt') or contains(@url, '.zip')
-                  or contains(@url, '.patch') or contains(@url, '/patch.'))
-                  and not(ancestor-or-self::*/@condition = 'pdf')">
-      <xsl:choose>
-        <!-- Fix SourceForge links-->
-        <xsl:when test="contains(@url,'?download')">
-          <xsl:value-of select="substring-before(@url,'?download')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@url"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="ulink" mode="full">
-      <!-- The next strings need be revised periodically to add missing
-      files or to skip false positives. Skip also possible
-      duplicated URLs that may be splitted for PDF output -->
-    <xsl:if test="(contains(@url, '.gz') or contains(@url, '.bz2')
-                  or contains(@url, '.tgz') or contains(@url, '.tar')
-                  or contains(@url, '.txt') or contains(@url, 'compressdoc')
-                  or contains(@url, '.zip') or contains(@url, '.patch')
-                  or contains(@url, '/patch.') or contains(@url, 'md5sums')
-                  or contains(@url, 'mozconfig'))
-                  and not(contains(@url, '?url'))
-                  and not(ancestor-or-self::*/@condition = 'pdf')">
-      <!-- To list all URls, included html files, wiki pages, home pages, and
-      mailto: links, comment-out the above xsl:if and uncomment the next one. -->
-    <!--
-    <xsl:if test="not(ancestor-or-self::*/@condition = 'pdf')">
-    -->
-      <xsl:value-of select="@url"/>
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: template/README
===================================================================
--- template/README	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/README	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,6 @@
+These files are generic templates.
+ 
+The newitem script makes a copy of the files and changes all occurances
+of template in them to the package name to save a lot of tedious work.
+
+Not all will always be needed
Index: template/newitem
===================================================================
--- template/newitem	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/newitem	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# Copies the template files and replaces template with the supplied package
+# name, greatly simplifying the process of adding a new package.
+
+if [ -z "$1" ]
+then
+  echo "Creates template files for a package and fills in the package name."
+  echo "Usage: $0 <written-package-name> <package-filename>"
+  echo
+  echo "Note that if you want to create the package Glib, you should"
+  echo "call the script as: '$0 Glib glib' so that the filenames are in"
+  echo "lower case.  If you only specify the first option, it is used"
+  echo "for both the written and filenames."
+  echo "Note also that *all* filenames in BLFS should be lower-case only"
+  exit 1
+fi
+
+WRITTENNAME=$1
+
+if [ -z "$2" ]
+then
+ FILENAME=$WRITTENNAME
+else
+ FILENAME=$2
+fi
+
+pushd `dirname $0`
+TEMPLDIR=`pwd`
+popd
+ 
+for i in $TEMPLDIR/template*
+do
+  NEWFILE=`echo $i | sed s@$TEMPLDIR/template@$FILENAME@`
+  echo $NEWFILE
+  sed s/template/$WRITTENNAME/g $i > $NEWFILE
+done
Index: template/template-config.xml
===================================================================
--- template/template-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/template-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect3>
+<title>Configuring template</title>
+
+<sect4><title>Config files</title>
+<para><userinput>List of config files</userinput></para>
+</sect4>
+
+<sect4><title>Configuration Information</title>
+
+<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
+</para>
+</sect4>
+
+</sect3>
+
Index: template/template-desc.xml
===================================================================
--- template/template-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/template-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect3>
+<title>Contents</title>
+
+<para>The template package contains <userinput>LISTOFFILES</userinput></para>
+
+</sect3>
+
+<sect3><title>Description</title>
+
+<sect4><title>item1</title>
+<para>item1 does this</para></sect4>
+
+<sect4><title>item2</title>
+<para>item2 does that</para></sect4>
+
+</sect3>
+
Index: template/template-exp.xml
===================================================================
--- template/template-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/template-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect3>
+<title>Command explanations</title>
+
+<para><userinput>COMMAND:</userinput> This command does something.</para>
+
+</sect3>
+
Index: template/template-inst.xml
===================================================================
--- template/template-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/template-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect3>
+<title>Installation of template</title>
+
+<para>Install template by running the following commands:</para>
+
+<para><screen><userinput>./configure </userinput></screen></para>
+
+</sect3>
+
Index: template/template-intro.xml
===================================================================
--- template/template-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ template/template-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect3>
+<title>Introduction to template</title>
+
+<screen>Download location:              &template-download;
+Version used:                   &template-version;
+Package size:                   &template-size;
+Estimated Disk space required:  &template-buildsize;</screen>
+
+<para>The template package contains... This is useful for...</para>
+
+<screen>template depends on:
+DEPENDENCY LIST (if any)</screen>
+
+</sect3>
Index: mplate/template-perl-module.xml
===================================================================
--- template/template-perl-module.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
- <!-- for modules referenced outside of perl, put them in general/prog/perl-modules/
-   and use a link to &perl_authors;/id/X/XY/XYZZY/Fu-Bar-$Fu-Bar-version; -->
-  <!ENTITY my-download-http "&perl_authors;/id/X/XY/XYZZY/Fu-Bar-&Fu-Bar-version;.tar.gz">
- <!-- but for modules which are only dependencies of other modules, put them in
-   general/pprog/perl-deps with a link to &metacpan_authors; that includes the /id part -->
-  <!ENTITY my-download-http "&metacpan_authors;/X/XY/XYZZY/Fu-Bar-&Fu-Bar-version;.tar.gz">
- <!-- only one of the above choices -->
-  <!ENTITY my-md5sum "fix-me-please-editor-0cc7774186c">
-
-]>
-
-  <!-- Begin Fu::Bar -->
-  <sect2 id="perl-fu-bar" xreflabel="Fu-Bar-&Fu-Bar-version;">
-
-    <title>Fu::Bar-&Fu-Bar-version;</title>
-
-    <indexterm zone="perl-fu-bar">
-      <primary sortas="a-Fu-Bar">Fu::Bar</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Fu::Bar</title>
-
-      <para>
-        Fu::Bar does something.
-      </para>
-
-<!--  &lfs8x_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>
-
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/Fu-Bar-&Fu-Bar-version;-do_something-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <!-- omit dependencies if not needed.
-       If module A currently brings in the required dep of B, add a comment that
-       B is pulled in by A.  This is to keep it maintainable as deps change. -->
-      <bridgehead renderas="sect4">Fu::Bar Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-bar-baz"/>,
-        <!-- perl-bar-baz pulls in perl-mojotasticity -->
-        <xref linkend="perl-wibble"/> and
-        <xref linkend="perl-wobble"/>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-silly"/>,
-        <!-- perl-silly pulls in perl-bar-eejit for its own test suite -->
-        <xref linkend="perl-teststuff"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Fu::Bar</title>
-
-      <para>
-        First, apply a patch to do something ...
-      </para>
-
-<!-- Any specific action for the module (patches, etc) should come first -->
-<screen><userinput>patch -Np1 -i ../Fu-Bar-https-&Fu-Bar-version;-do_something-1.patch</userinput></screen>
-
-<!-- If the module uses standard installation instructions: -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-<!-- If the module uses installation instructions using Build.PL: -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-<!-- Exceptionally, if a scripted build requires a value to be passed to 'yes',
-  copy the xinclude inline and add the command explanation -->
-    </sect3>
-
-    <!-- only include a command explanation if yes or similar is needed in
-       scripting -->
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes 'n'</command>: Perl will ask if you wish to do ...
-        and will wait for a response. Using 'yes' allows you to script this.
-      </para>
-
-    </sect3>
-
-    <!-- omit content unless prog(s) or lib is installed in /usr -->
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <!-- omit libraries entirely unless present in /usr, there are often
-         perl libraries in site-perl so 'none' can be misleading -->
-        <segtitle>Installed Libraries</segtitle>
-
-        <seglistitem>
-          <seg>
-            dibbler
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="dibbler-prog">
-          <term><command>dibbler</command></term>
-          <listitem>
-            <para>
-              sells sausage inna bun.
-            </para>
-            <!-- the -prog is for while (old) and new- perl module pages
-             are both in the book, without it the link to the package is
-             correct, but the link to the prog goes to the progs in old
-             perl-modules.xml -->
-            <indexterm zone="perl-fu-bar dibbler-prog">
-              <primary sortas="b-dibbler">dibbler</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ template/template.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,441 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
+<sect2 id="template" xreflabel="template-&template-version;">
+<title>template-&template-version;</title>
 
-  <!-- Place this in the packages.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
+&template-intro;
+&template-inst;
+&template-exp;
+&template-config;
+&template-desc;
 
-  <!ENTITY TEMPLATE-download-http "https://">
-  <!ENTITY TEMPLATE-md5sum        "MD5 sum">
-  <!ENTITY TEMPLATE-size          "?? MB">
-  <!ENTITY TEMPLATE-buildsize     "?? MB">
-  <!ENTITY TEMPLATE-time          "?? SBU">
-<!-- SBU should be rounded to nearer integer if greater than 10, to one
-     decimal if less than 10, and should be "less than 0.1 SBU" if
-     less than 0.1. If the SBU without parallelisation is too long,
-     it is acceptable to give the value "with parallelism=N", where
-     N is the number of threads used. Note that some build systems
-     automatically fix N equal to the number of available CPU cores
-     on the machine. -->
-]>
+</sect2>
 
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
-  <?dbhtml filename="TEMPLATE.html"?>
-
-
-  <!-- No other tags inside any title.
-       Generally use Title Case in All Titles,
-       but use the same capitalization for
-       the tarball name in the main <title> section.
-       For instance Appstream should be capitalized,
-       but abseil-cpp should not.
-       (otherwise Capitalize Everything
-       *Except* Articles, Short Prepositions,
-       and Coordinating Conjunctions.-->
-  <title>TEMPLATE-&TEMPLATE-version;</title>
-
-  <indexterm zone="TEMPLATE">
-    <primary sortas="a-TEMPLATE">TEMPLATE</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to TEMPLATE</title>
-
-    <para>
-      The <application>TEMPLATE</application> package contains...
-      This is useful for...
-    </para>
-
-    <!-- if it builds but hasn't been tested: -->
-    &lfs1?_built;
-    <!-- if it works: -->
-    &lfs1?_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&TEMPLATE-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &TEMPLATE-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &TEMPLATE-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &TEMPLATE-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &TEMPLATE-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- As required -->
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
-      a sentence. If there are more than two, they must be separated by commas
-      with the last member having "and" in front of it. The use of a serial
-      comma is preferred (a comma after the next to last member before the
-      "and"). BLFS_DEPENDENCY should be an "id" attribute defined somewhere
-      in the book (usually in a <sect1>). -->
-      <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/> (runtime)
-      <!-- Specifying that a dependency is a runtime one may avoid circular
-      dependencies. Add role="runtime" to help jhalfs -->
-    </para>
-
-    <!-- It may be nice to have a separate section for runtime dependencies.
-    Do it as follows. -->
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/>
-    </para>
-
-    <!-- As required -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
-      a sentence. See above for the use of "and" and commas. Normally, neither
-      required nor recommended dependencies should be <ulink>. -->
-      <xref linkend="ANOTHER_RECOMMENDED_DEP"/> (required if building
-        <xref role="nodep" linkend="SOME_FANCY_PACKAGE"/>) <!-- You may need
-      to refer to another package, which is not a dependency. Use the role
-      attibute with value "nodep". -->
-      <!-- See above for runtime dependencies -->
-    </para>
-
-    <!-- As required -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="BLFS_DEPENDENCY"/> and
-      <ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>
-      <!-- notice no period as this is not a sentence. See above for the use
-      of commas and "and". The order should be <xref> before <ulink>.-->
-      <!-- See above for references to another package which is not a
-      dependency. -->
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
-    </para>
-    -->
-  </sect2>
-
-  <!-- Optional section for packages that need a specific kernel
-  configuration-->
-  <sect2 role="kernel" id="TEMPLATE-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <!-- Create a .toml file in the kernel-config tree to describe the
-         needed configuration.  Then run
-         "make -C kernel-config KERNEL_TREE=</usr/src/linux-x.y.z> -j<N>"
-         to regenerate the XML file.  Please use the latest kernel patch release
-         with the same major.minor version as the LFS development book.  -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="template-kernel.xml"/>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options are
-      selected. As much as possible, the layout should be the same as in
-      kernel configuration menus.
-    </para>
-
-    <indexterm zone="TEMPLATE TEMPLATE-kernel">
-      <primary sortas="d-TEMPLATE">TEMPLATE</primary>
-    </indexterm>
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="installation">
-    <title>Installation of TEMPLATE</title>
-
-    <para>
-      Install <application>TEMPLATE</application> by running the following
-      commands:
-    </para>
-
-<!-- Spaces are significant in <screen> sections -->
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- Optional paragraph. Add it when some instructions for building
-         documentation need optional or external packages. The remap="doc"
-         attribute signals that kind of instructions. Note: instructions
-         for generating documentation that can be built with
-         recommended/required/LFS book packages may be included in the
-         same block as configure and make. -->
-
-    <para>
-      If you have installed <xref linkend="optional-dep"/>, you can build
-      the documentation (or additional formats of the documentation) by issuing:    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf</userinput></screen>
-
-    <!-- adjust the instructions as needed. -->
-
-    <!-- Optional paragraph. Use one of the two formats below about the test
-         suite; delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than 'make check', revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <!-- Sometimes, more complex instructions are needed for running tests, or
-         they need to be run as root. They can then be put inside screen
-         tags using the remap="test" attribute as in the following example: -->
-
-    <para>
-      If you want to run the tests, first create some needed files:
-    </para>
-
-<screen remap="test"><userinput>make prepare-tests</userinput></screen>
-
-    <para>
-      Then run the tests as the &root; user:
-    </para>
-
-<screen role="root" remap="test"><userinput>make tests</userinput></screen>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <!-- Optional paragraph for documentation that has been generated using
-         optional/external packages: -->
-
-    <para>
-      If you have built the optional documentation, install it as the
-      &root; user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm 755 /usr/share/doc/template-&template-version; &amp;&amp;
-mv doc/* /usr/share/doc/template-&template-version;</userinput></screen>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <command>COMMAND</command>: This command does something.
-    </para>
-
-    <para>
-      <parameter>--PARAMETER</parameter>: This parameter does something
-      mandatory for BLFS purposes. It will be in the instructions above. It is
-      not optional and is why it is listed as a parameter and not an option.
-    </para>
-
-    <para>
-      <option>--OPTION</option>: This option does something optionally per the
-      user's desires. It is not listed in the instructions above, but instead,
-      is listed here because many (some) readers may want to include it.
-    </para>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="using">
-    <title>Using TEMPLATE</title>
-
-    <para>
-      Stuff about how to use TEMPLATE to do something. This section is rarely
-      used.
-    </para>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="configuration">
-    <title>Configuring TEMPLATE</title>
-
-    <sect3 id="TEMPLATE-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.Configfilename1</filename> and
-        <filename>/etc/path/Configfilename2</filename> <!-- notice no period as this is not a sentence-->
-      </para>
-
-      <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
-      </indexterm>
-
-      <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary
-        sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Blah blah blah about config.
-      </para>
-
-<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
-
-<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
-
-      <!-- File creation. Add the appropriate <indexterm> block if needed.-->
-      <para>
-        Create the file .... for ...
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /PATH/FILENAME &lt;&lt; "EOF"
-<literal># Begin FILENAME
-
-TEXT
-
-# End FILENAME</literal>
-EOF</userinput></screen>
-    </sect3>
-
-    <sect3  id="TEMPLATE-init">
-      <title>Boot Script</title>
-
-      <para>
-        To automatically start the <command>TEMPLATE</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package as the
-        &root; user:
-      </para>
-
-      <indexterm zone="TEMPLATE TEMPLATE-init">
-        <primary sortas="f-TEMPLATE">TEMPLATE</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program(s)</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <!-- If there were no programs, libraries, or directories created, then
-           we would list the section as "None". However, a decision must have
-           been made to change the "None" to just removing the whole section
-           because I've noticed that many packages have had the "None"
-           removed and the section completely removed as well. The reasoning
-           was that by putting "None", it appears as if we know there are none.
-           Without anything it appears as we are not sure. -->
-
-      <seglistitem>
-        <seg>
-          PROGRAM1, PROGRAM2 and PROGRAM3<!-- no period here since it is not
-          a sentence -->
-        </seg>
-        <seg>
-          libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so<!-- no period here
-          since it is not a sentence -->
-        </seg>
-        <seg>
-          /etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
-          /usr/share/TEMPLATE-&TEMPLATE-version;,
-          /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
-          /var/lib/TEMPLATE<!-- no period here
-          since it is not a sentence -->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts with (is the same as) the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="PROGRAM1">
-        <term><command>PROGRAM1</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM1">
-            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="PROGRAM2">
-        <term><command>PROGRAM2</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM2">
-            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: dy.conf
===================================================================
--- tidy.conf	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,16 +1,0 @@
-# Tidy configuration file
-#
-
-indent-spaces: 2
-wrap: 78
-tab-size: 8
-newline: LF
-write-back: yes
-markup: yes
-indent: yes
-uppercase-tags: no
-logical-emphasis: no
-tidy-mark: no
-numeric-entities: no
-show-warnings: no
-quiet: yes
Index: dm/dm.xml
===================================================================
--- x/dm/dm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="x-dm">
-  <?dbhtml filename="dm.html" ?>
-
-  <title>Display Managers</title>
-
-  <para>
-    Display Managers are graphical programs used for starting the graphical
-    display (currently, the X server) and providing a login capability for
-    a Window Manager or Desktop Environment.
-  </para>
-
-  <para>
-    There are many Display Managers available. Some of the more well
-    known include:
-    <application>gdm</application>,
-    <application>kdm</application> (deprecated),
-    <application>LightDM</application>,
-    <application>lxdm</application>,
-    <application>Slim</application>, and
-    <application>sddm</application>.
-  </para>
-
-  <para>
-    Among the Desktop Environments available for Linux you find:
-    <application>Enlightenment</application>,
-    <application>GNOME</application>,
-    <application>Plasma</application>,
-    <application>lxde</application>,
-    <application>LXQt</application>, and
-    <application>xfce</application>.
-  </para>
-
-  <para>
-    Choosing a Display Manager or Desktop Environment is highly subjective.
-    The choice depends on the look and feel of the packages, the resources
-    (memory and disk space) required, and the utilities included.
-  </para>
-
-  <para>
-    In this chapter, the installation instructions of some Display Managers
-    are presented. Later in the book, you will find other ones, which are
-    provided as part of some Desktop Environments.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lightdm.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxdm.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sddm.xml"/>
-
-</chapter>
Index: dm/gdm.xml
===================================================================
--- x/dm/gdm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,377 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gdm-download-http "&gnome-download-http;/gdm/&gnome-46;/gdm-&gdm-version;.tar.xz">
-  <!ENTITY gdm-download-ftp  " ">
-  <!ENTITY gdm-md5sum        "7c633379109fe5fb23734888649cdab0">
-  <!ENTITY gdm-size          "904 KB">
-  <!ENTITY gdm-buildsize     "44 MB">
-  <!ENTITY gdm-time          "0.2 SBU">
-]>
-
-<sect1 id="gdm" xreflabel="GDM-&gdm-version;">
-  <?dbhtml filename="gdm.html"?>
-
-
-  <title>GDM-&gdm-version;</title>
-
-  <indexterm zone="gdm">
-    <primary sortas="a-GDM">GDM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GDM</title>
-
-    <para>
-      <application>GDM</application> is a system service that is
-      responsible for providing graphical logins and managing local
-      and remote displays.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gdm-&gdm-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">GDM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="accountsservice"/>,
-      <xref linkend="dconf"/>,
-      <xref linkend="libcanberra"/> (built after
-        <xref role="nodep" linkend="gtk3"/>), and
-      <xref linkend="linux-pam"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="keyutils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="gnome-session"/>,
-      <xref role="runtime" linkend="gnome-shell"/>, and
-      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/></phrase>
-      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/></phrase>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GDM</title>
-
-    <para>
-      It is recommended to have a dedicated user and group to take
-      control of the <command>gdm</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 21 gdm &amp;&amp;
-useradd -c "GDM Daemon Owner" -d /var/lib/gdm -u 21 \
-        -g gdm -s /bin/false gdm &amp;&amp;
-passwd -ql gdm</userinput></screen>
-
-<!--
-    <para revision="sysv">
-      First, adapt GDM to build without systemd present:
-    </para>
-
-<screen revision="sysv"><userinput remap="pre">sed -i -r '/(^| )systemd_dep/d' meson.build</userinput></screen>
--->
-
-    <para>
-      Install <application>GDM</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>sed -e 's@systemd@elogind@'                                \
-    -e '/elogind/isession  required       pam_loginuid.so' \
-    -i data/pam-lfs/gdm-launch-environment.pam &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                  \
-      --prefix=/usr             \
-      --buildtype=release       \
-      -Dgdm-xsession=true       \
-      -Drun-dir=/run/gdm        \
-      -Dlogind-provider=elogind \
-      -Dsystemd-journal=false   \
-      -Dsystemdsystemunitdir=no \
-      -Dsystemduserunitdir=no   &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgdm-xsession=true \
-      -Drun-dir=/run/gdm  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a usable 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"/>
-
-    <para>
-      <option>-Dinitial-vt=7</option>: Use this switch
-      to make <application>GDM</application> start on VT7
-      instead of the first free VT.
-    </para>
-
-    <para>
-      <option>-Ddefault-pam-config=lfs</option>: Use this
-      switch if you did not create the
-      <filename>/etc/lfs-release</filename> file or distribution
-      auto detection will fail and you will be unable to use
-      <application>GDM</application>.
-    </para>
-
-    <para>
-      <parameter>-Dgdm-xsession=true</parameter>: This enables the
-      installation of the <application>GDM</application> Xsession file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GDM</title>
-
-    <sect3 id="gdm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gdm/custom.conf</filename>
-      </para>
-
-      <indexterm zone="gdm gdm-config">
-        <primary sortas="e-etc-gdm-custom.conf">/etc/gdm/custom.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The GDM daemon is configured using the
-        <filename>/etc/gdm/custom.conf</filename> file. Default values
-        are stored in GSettings in the <filename>gdm.schemas</filename>
-        file. It is recommended that end-users modify the
-        <filename>/etc/gdm/custom.conf</filename> file because the schemas
-        file may be overwritten when the user updates their system to have
-        a newer version of <application>GDM</application>.
-      </para>
-
-      <para>
-        On some systems with NVIDIA GPUs, GDM will hide Wayland sessions by
-        default. This is often done to prevent users from encountering problems
-        with buggy drivers, which can result in system lockups, application
-        crashes, power management problems, and graphics slowdowns. If you have
-        an NVIDIA GPU and still want to try running Wayland sessions anyway,
-        execute the following command as the &root; user:
-      </para>
-
- <screen role="nodump"><userinput>ln -s /dev/null /etc/udev/rules.d/61-gdm.rules</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="gdm-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <indexterm zone="gdm gdm-init">
-        <primary sortas="f-gdm">gdm</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        To start <command>gdm</command> automatically when the system is
-        switched to runlevel 5, install the
-        <filename>/etc/rc.d/init.d/xdm</filename> script and the
-        <filename>/etc/sysconfig/xdm</filename> configuration file
-        included in the <xref linkend="bootscripts"/> package
-        and adjust <filename>/etc/inittab</filename> by running
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-gdm</userinput></screen>
-
-      <para revision="sysv">
-        In order to permanently set the default runlevel to 5, starting the
-        <command>gdm</command> greeter screen automatically, you can modify
-        <filename>/etc/inittab</filename>. As the  <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>sed /initdefault/s/3/5/ -i /etc/inittab</userinput></screen>
-
-      <para revision="systemd">
-        To start the <command>gdm</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable gdm</userinput></screen>
-
-<!-- [pierre October 2020] I don't understand why this is here: power
-     management works perfectly well
-      <para revision="sysv">
-          You should also disable default elogind power management:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt;&gt; /etc/elogind/logind.conf &lt;&lt; "EOF"
-<literal>AllowSuspend=no
-AllowHibernation=no</literal>
-EOF</userinput></screen>
--->
-
-    </sect3>
-
-    <sect3 id="gdm-auto-suspend">
-      <title>Configuring GDM Auto-Suspend</title>
-
-      <para>
-        GDM will suspend the system when the greeter screen has been running
-        for a while without any interactive input.  If you want to disable
-        auto-suspending for any reason (for example if the system is hosting
-        some services besides functioning as a desktop system), as the
-        &root; user, issue:
-      </para>
-
-      <screen role='nodump'><userinput>su gdm -s /bin/bash                                                \
-       -c "dbus-run-session                                        \
-             gsettings set org.gnome.settings-daemon.plugins.power \
-                           sleep-inactive-ac-type                  \
-                           nothing"</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>
-          gdm, gdmflexiserver, and gdm-screenshot
-        </seg>
-        <seg>
-          libgdm.so and pam_gdm.so (PAM Module)
-        </seg>
-        <seg>
-          /etc/gdm,
-          /usr/include/gdm,
-          /usr/share/gdm, and
-          /usr/share/help/*/gdm
-<!-- seems those diretories are not created at install, but at
-     runtime
-          /var/cache/gdm,
-          /var/lib/gdm,
-          /var/log/gdm, and
-          /var/run/gdm-->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdm-prog">
-        <term><command>gdm</command></term>
-        <listitem>
-          <para>
-            is a login prompt for <application>GNOME</application>
-          </para>
-          <indexterm zone="gdm gdm-prog">
-            <primary sortas="b-gdm">gdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdm-screenshot">
-        <term><command>gdm-screenshot</command></term>
-        <listitem>
-          <para>
-            is a screenshot tool for <application>GDM</application>
-          </para>
-          <indexterm zone="gdm gdm-screenshot">
-            <primary sortas="b-gdm-screenshot">gdm-screenshot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: dm/lightdm.xml
===================================================================
--- x/dm/lightdm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,454 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- lightdm -->
-  <!ENTITY lightdm-download-http "https://github.com/CanonicalLtd/lightdm/releases/download/&lightdm-version;/lightdm-&lightdm-version;.tar.xz">
-  <!ENTITY lightdm-download-ftp  " ">
-  <!ENTITY lightdm-md5sum        "e62a5da6c35f612e4d9575eda5c8d467">
-  <!ENTITY lightdm-size          "508 KB">
-  <!ENTITY lightdm-buildsize     "20 MB">
-  <!ENTITY lightdm-time          "0.2 SBU ">
-
-<!-- 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-ftp  " ">
-  <!ENTITY lightdm-gtk-greeter-md5sum        "35752d730f39293c2bbe884ef6963830">
-  <!ENTITY lightdm-gtk-greeter-size          "592 KB">
-  <!ENTITY lightdm-gtk-greeter-buildsize     "5.2 MB">
-  <!ENTITY lightdm-gtk-greeter-time          "less than 0.1 SBU ">
-]>
-
-<sect1 id="lightdm" xreflabel="lightdm-&lightdm-version;">
-  <?dbhtml filename="lightdm.html"?>
-
-
-  <title>lightdm-&lightdm-version;</title>
-
-  <indexterm zone="lightdm">
-    <primary sortas="a-lightdm">lightdm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lightdm</title>
-
-    <para>
-      The <application>lightdm</application> package contains a lightweight
-      display manager based upon GTK.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Lightdm Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lightdm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lightdm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lightdm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lightdm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lightdm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lightdm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional download</bridgehead>
-
-    <note>
-      <para>
-        The greeter is a program to present a graphical login screen.  There
-        are several alternative greeters, but the gtk+ package is the reference
-        implementation.  For a list of other greeters, see <ulink
-        url="https://en.wikipedia.org/wiki/LightDM"/>.
-      </para>
-    </note>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lightdm-gtk-greeter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lightdm-gtk-greeter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lightdm-gtk-greeter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lightdm-gtk-greeter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lightdm-gtk-greeter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lightdm-gtk-greeter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Lightdm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/> (for the greeter),
-<!-- required by exo      <xref linkend="gtk3"/>, -->
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="linux-pam"/>, and
-      <xref role='runtime' linkend='xorg-server'/> (Runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="libxklavier"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="accountsservice"/> (run time),
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="gtk-doc"/>,
-      &qt5-deps;,
-      <ulink url="https://launchpad.net/ido">libido</ulink>, and
-      <ulink url="https://launchpad.net/libindicator">libindicator</ulink>
-
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lightdm</title>
-
-    <para>
-      First, create a dedicated user and group to take
-      control of the <command>lightdm</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 65 lightdm       &amp;&amp;
-useradd  -c "Lightdm Daemon" \
-         -d /var/lib/lightdm \
-         -u 65 -g lightdm    \
-         -s /bin/false lightdm</userinput></screen>
-
-    <para revision="sysv">
-      Then change the <application>Linux-PAM</application> configuration files
-      so that <application>elogind</application> is used:
-    </para>
-
-<screen revision="sysv"><userinput>sed -i s/systemd/elogind/ data/pam/*</userinput></screen>
-
-    <para>
-      Install <application>lightdm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                 \
-            --libexecdir=/usr/lib/lightdm \
-            --localstatedir=/var          \
-            --sbindir=/usr/bin            \
-            --sysconfdir=/etc             \
-            --disable-static              \
-            --disable-tests               \
-            --with-greeter-user=lightdm   \
-            --with-greeter-session=lightdm-gtk-greeter \
-            --docdir=/usr/share/doc/lightdm-&lightdm-version; &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;
-cp tests/src/lightdm-session /usr/bin                         &amp;&amp;
-sed -i '1 s/sh/bash --login/' /usr/bin/lightdm-session        &amp;&amp;
-rm -rf /etc/init                                              &amp;&amp;
-install -v -dm755 -o lightdm -g lightdm /var/lib/lightdm      &amp;&amp;
-install -v -dm755 -o lightdm -g lightdm /var/lib/lightdm-data &amp;&amp;
-install -v -dm755 -o lightdm -g lightdm /var/cache/lightdm    &amp;&amp;
-install -v -dm770 -o lightdm -g lightdm /var/log/lightdm</userinput></screen>
-
-     <para>
-       Now build the greeter:
-     </para>
-
-<screen><userinput>tar -xf ../lightdm-gtk-greeter-&lightdm-gtk-greeter-version;.tar.gz &amp;&amp;
-cd lightdm-gtk-greeter-&lightdm-gtk-greeter-version; &amp;&amp;
-
-./configure --prefix=/usr                 \
-            --libexecdir=/usr/lib/lightdm \
-            --sbindir=/usr/bin            \
-            --sysconfdir=/etc             \
-            --with-libxklavier            \
-            --enable-kill-on-sigterm      \
-            --disable-libido              \
-            --disable-libindicator        \
-            --disable-static              \
-            --disable-maintainer-mode     \
-            --docdir=/usr/share/doc/lightdm-gtk-greeter-&lightdm-gtk-greeter-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<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 role="nodump"><userinput>ln -sf /opt/xorg/bin/Xorg /usr/bin/X</userinput></screen>
-  </note>
-
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <para>
-
-      <command>sed ... /usr/bin/lightdm-session</command>:
-      This command ensures that the initial login via the greeter sources
-      /etc/profile and ~/.bash_profile.  Without this, commands that depend on
-      different environment variables may not work as expected.
-    </para>
-<!--
-    <para>
-      <parameter>ITSTOOL=/bin/true</parameter>: although
-      <xref linkend="itstool"/> is not needed in a normal build,
-      <command>configure</command> throws an error if it is not found on the
-      system. This parameter prevents the error.
-    </para>
-
-    <para>
-      <parameter>HAVE_EXO_CSOURCE=yes</parameter>: although
-      <command>exo-csource</command> is not needed in a normal build,
-      <command>configure</command> throws an error if it is not found on the
-      system. This parameter prevents the error.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring lightdm</title>
-
-    <sect3 id="lightdm-config">
-      <title>Config Files</title>
-
-      <para>
-        /etc/lightdm/{lightdm,users,keys,lightdm-gtk-greeter}.conf
-      </para>
-
-      <para>
-        The configuration files offer many options. If, for instance, you have
-        a multiple monitor setup but prefer the login window to be displayed on
-        only one monitor, set 'active-monitor=&lt;monitor-name&gt;' in
-        <filename>lightdm-gtk-greeter.conf</filename>. For example you could
-        use <option>active-monitor=HDMI-1</option>.  You can determine the
-        monitor-names with <command>xrandr --listmonitors</command>. Note that 
-        the monitor names may change if you change the graphics driver
-        and you may have to adjust the configuration accordingly.
-      </para>
-
-      <indexterm zone="lightdm lightdm-config">
-        <primary sortas="e-etc-lightdm-lightdm.conf">/etc/lightdm/lightdm.conf</primary>
-      </indexterm>
-
-      <indexterm zone="lightdm lightdm-config">
-        <primary sortas="e-users.conf">/etc/lightdm/users.conf</primary>
-      </indexterm>
-
-      <indexterm zone="lightdm lightdm-config">
-        <primary sortas="e-keys.conf">/etc/lightdm/keys.conf</primary>
-      </indexterm>
-
-      <indexterm zone="lightdm lightdm-config">
-        <primary sortas="e-lightdm-gtk-greeter.conf">
-          /etc/lightdm/lightdm-gtk-greeter.conf</primary>
-      </indexterm>
-
-   </sect3>
-
-    <sect3 id="lightdm-bootscript">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <indexterm zone="lightdm lightdm-bootscript">
-        <primary sortas="f-lightdm">lightdm</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        To start <command>lightdm</command> automatically when the system is
-        switched to runlevel 5, install the
-        <filename>/etc/rc.d/init.d/xdm</filename> script and the
-        <filename>/etc/sysconfig/xdm</filename> configuration file
-        included in the <xref linkend="bootscripts"/> package
-        and adjust <filename>/etc/inittab</filename> by running
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-lightdm</userinput></screen>
-
-      <para revision="systemd">
-        Install the <filename>lightdm.service</filename> unit included in
-        the <xref linkend="systemd-units"/> package:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>make install-lightdm</userinput></screen>
-
-    </sect3>
-    <sect3 id="lightdm-init" revision="sysv">
-      <title>Starting lightdm</title>
-
-      <para>
-        The <command>lightdm</command> greeter can be started from the
-        command line as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="nodump"><userinput>telinit 5</userinput></screen>
-
-<!-- "make install-lightdm already does this already
-      <para>
-        Alternatively the runlevel can be permanently set to 5, starting the
-        <command>lightdm</command> greeter screen automatically, by modifying
-        <filename>/etc/inittab</filename>.  As the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
-sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
--->
-    </sect3>
-
-    <sect3 id="lightdm-sessions">
-      <title>Available Sessions</title>
-
-      <para>
-        The greeter offers a list of available sessions,
-        depending on the Window Managers and Desktop Environments installed. The
-        list includes sessions which have a corresponding
-        <filename>.desktop</filename> file installed under
-        <filename class="directory">/usr/share/xsessions</filename>. Most of the
-        Window Managers and Desktop Environments automatically provide those
-        files, but if necessary, you may include a custom one.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dm-tool,
-          lightdm, and
-          lightdm-gtk-greeter
-        </seg>
-        <seg>
-          liblightdm-gobject-1.so
-        </seg>
-        <seg>
-          /etc/lightdm,
-          /etc/apparmor.d,
-          /usr/lib/lightdm,
-          /usr/include/lightdm-gobject-1,
-          /usr/share/help/C/lightdm
-          /usr/share/gtk-doc/html/lightdm-gobject-1,
-          /usr/share/doc/lightdm-gtk-greeter-&lightdm-gtk-greeter-version;,
-          /var/lib/lightdm,
-          /var/lib/lightdm-data,
-          /var/cache/lightdm, and
-          /var/log/lightdm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lightdm-prog">
-        <term><command>lightdm</command></term>
-        <listitem>
-          <para>
-            is a display and login manager
-          </para>
-          <indexterm zone="lightdm lightdm-prog">
-            <primary sortas="b-lightdm">lightdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lightdm-gtk-greeter">
-        <term><command>lightdm-gtk-greeter</command></term>
-        <listitem>
-          <para>
-            is an auxiliary process that displays the greeter,
-            a graphical user interface that performs user
-            authentication and initiates the selected window manager
-            or display environment
-          </para>
-          <indexterm zone="lightdm lightdm-gtk-greeter">
-            <primary sortas="b-lightdm-gtk-greeter">lightdm-gtk-greeter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: dm/sddm.xml
===================================================================
--- x/dm/sddm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,607 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sddm-download-http "https://github.com/sddm/sddm/archive/v&sddm-version;/sddm-&sddm-version;.tar.gz">
-  <!ENTITY sddm-download-ftp  " ">
-  <!ENTITY sddm-md5sum        "e32a35c282d9be3360737eefbe25b5fa">
-  <!ENTITY sddm-size          "3.4 MB">
-  <!ENTITY sddm-buildsize     "24 MB">
-  <!ENTITY sddm-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="sddm" xreflabel="sddm-&sddm-version;">
-  <?dbhtml filename="sddm.html"?>
-
-  <title>sddm-&sddm-version;</title>
-
-  <indexterm zone="sddm">
-    <primary sortas="a-sddm">sddm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sddm</title>
-
-    <para>
-      The <application>sddm</application> package contains a lightweight
-      display manager based upon <application>Qt</application> and QML.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sddm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sddm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sddm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sddm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sddm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sddm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SDDM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="extra-cmake-modules"/>, and
-      &qt5-deps;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="docutils"/> (for the man pages),
-      <xref linkend="linux-pam"/>, and
-      <xref linkend="upower"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/sddm"/>
-    </para>
--->
-  </sect2>
-  <sect2 role="installation">
-    <title>Installation of SDDM</title>
-
-    <para>
-      First, create a dedicated user and group to take
-      control of the <command>sddm</command> daemon after it is
-      started. Issue the following commands as the
-      &root; user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 64 sddm &amp;&amp;
-useradd  -c "sddm Daemon" \
-         -d /var/lib/sddm \
-         -u 64 -g sddm    \
-         -s /bin/false sddm</userinput></screen>
-<!--
-    <para revision="sysv">
-      Next, fix the application to start <command>upowerd</command>,
-      if necessary, and after login, start the session with
-      <command>ck-launch-session</command>:
-    </para>
-
-<screen revision="sysv"><userinput>sed -e '/UPOWER_SERVICE)/ s:^://:' \
-    -i src/daemon/PowerManager.cpp &amp;&amp;
-
-sed -e '/\$@$/s/exec/&amp; ck-launch-session/' \
-    -i data/scripts/Xsession</userinput></screen>
-
-    <para revision="sysv">
-      For sddm-0.16.0, ConsoleKit support has been added, but is broken. Remove
-      it with:
-    </para>
--->
-<!-- This removes also logind support. Hopefully should be fixed for next
-     version
-<screen revision="sysv"><userinput>sed -e '/available.*true/s/true/false/' \
-    -i src/daemon/LogindDBusTypes.cpp</userinput></screen>
--->
-    <para>
-      Install <application>sddm</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DENABLE_JOURNALD=OFF       \
-      -DNO_SYSTEMD=ON             \
-      -DRUNTIME_DIR=/run/sddm     \
-      -DUSE_ELOGIND=ON            \
-      -DBUILD_MAN_PAGES=ON        \
-      -DDATA_INSTALL_DIR=/usr/share/sddm \
-      -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \
-      .. &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DRUNTIME_DIR=/run/sddm     \
-      -DBUILD_MAN_PAGES=ON        \
-      -DDATA_INSTALL_DIR=/usr/share/sddm \
-      -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \
-      .. &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;
-install -v -dm755 -o sddm -g sddm /var/lib/sddm
-/usr/bin/sddm --example-config > /etc/sddm.conf</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      apply additional compiler optimizations.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-DENABLE_JOURNALD=OFF</parameter> and
-      <parameter>-DNO_SYSTEMD=ON</parameter>: These switchs are used because
-      this version of BLFS does not support <application>systemd</application>.
-    </para>
-
-    <para>
-      <parameter>-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf</parameter>:
-      This switch prevents the file <filename>
-      /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf</filename> from
-      being overwritten, as it may be used by other DM's.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_MAN_PAGES=ON</parameter>: This switch is used to build
-      and install man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SDDM</title>
-
-    <sect3 id="sddm-config">
-      <title>Config Files</title>
-
-      <para>
-        /etc/sddm.config
-      </para>
-
-      <indexterm zone="sddm sddm-config">
-        <primary sortas="e-sddm.conf">/etc/sddm.conf</primary>
-      </indexterm>
-
-      <para>
-        Normally, you want to edit this file. For example, if Xorg is installed
-        in /opt, use your preferred editor as the &root; user to replace the
-        default <emphasis>XauthPath</emphasis> value by
-        <emphasis>/opt/xorg/bin/xauth</emphasis>. Or, as the &root; user,
-        issue:
-      </para>
-
-<screen role="nodump"><userinput>sed -i.orig '/ServerPath/ s|usr|opt/xorg|' /etc/sddm.conf</userinput></screen>
-
-      <para>
-        This command will do the substitution and create a copy of the original
-        file with name <filename>/etc/sddm.conf.orig</filename>.
-      </para>
-
-      <para>
-        From now on, we will describe how to modify configurations using sed.
-        Of course, you may instead use your preferred editor as the &root;
-        user.
-      </para>
-
-      <para>
-        For security reasons, you normally want the default
-        <emphasis>ServerArguments=-nolisten tcp</emphasis>, unless a remote
-        machine needs access to the local X server. In that case, as the
-        &root; user, issue:
-      </para>
-
-<screen role="nodump"><userinput>sed -i 's/-nolisten tcp//' /etc/sddm.conf</userinput></screen>
-
-      <para>
-        Desktop (Notebook) users, normally want the Num Lock key on (off).  For
-        that, as &root;, issue:
-      </para>
-
-<screen role="root"><userinput>sed -i '/Numlock/s/none/on/' /etc/sddm.conf</userinput></screen>
-
-      <para>
-        for Desktop users. For Notebook users, replace /on/ by /off/
-        in the command above.
-      </para>
-
-      <para>
-        By default, a virtual keyboard is presented for the user.  If this is
-        not desired, run as &root;:
-      </para>
-
-<screen role="root"><userinput>sed -i 's/qtvirtualkeyboard//' /etc/sddm.conf</userinput></screen>
-
-   </sect3>
-
-    <sect3 id="sddm-bootscript">
-      <title>Boot Script</title>
-
-      <para revision="sysv">
-        Install the <filename revision="sysv">/etc/rc.d/init.d/xdm</filename>
-        init script from the <xref linkend="bootscripts" revision="sysv"/>
-        package, as the &root; user:
-      </para>
-
-      <para revision="systemd">
-        Enable the pre-installed systemd unit by running the following command
-        as the &root; user:
-      </para>
-
-      <indexterm zone="sddm sddm-bootscript">
-        <primary sortas="f-sddm">sddm</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-sddm</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable sddm</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <note>
-        <para>
-          The install procedure above installed a set of PAM configuration
-          files. These procedures overwrite them and use versions compatible
-          with a BLFS environment.
-        </para>
-      </note>
-
-      <para>
-        If you have built <application>sddm</application>
-        with <application>Linux PAM</application> support,
-        create the necessary configuration files by running
-        the following commands as the &root; user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-autologin &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm-autologin
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-
-password required       pam_deny.so
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm-autologin</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-greeter &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm-greeter
-
-auth     required       pam_env.so
-auth     required       pam_permit.so
-
-account  required       pam_permit.so
-password required       pam_deny.so
-session  required       pam_unix.so
--session optional       pam_systemd.so
-
-# End /etc/pam.d/sddm-greeter</literal>
-EOF</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>cat &gt; /etc/pam.d/sddm &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/sddm
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-autologin &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/pam.d/sddm-autologin
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-
-password required       pam_deny.so
-
-session  required       pam_limits.so
-session  include        system-session
-
-# End /etc/pam.d/sddm-autologin</literal>
-EOF
-
-cat &gt; /etc/pam.d/sddm-greeter &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/sddm-greeter
-
-auth     required       pam_env.so
-auth     required       pam_permit.so
-
-account  required       pam_permit.so
-password required       pam_deny.so
-session  required       pam_unix.so
--session optional       pam_systemd.so
-
-# End /etc/pam.d/sddm-greeter</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="sddm-init" revision="sysv">
-      <title>Starting sddm</title>
-
-      <para>
-        If the sddm bootscript has been installed, start sddm by running, as the
-        &root; user:
-      </para>
-
-<screen role="nodump"><userinput>/etc/rc.d/init.d/xdm start</userinput></screen>
-
-      <para>
-        By convention, X should be executed at runlevel 5, consequently, the
-        same is true for <application>sddm</application>. However, the default
-        runlevel is 3. Changing to runlevel 5, from a console terminal, as
-        <systemitem class="username">root</systemitem> user, starts the
-        <command>sddm</command> bootscript, bringing up the greeter screen:
-      </para>
-
-<screen role="nodump"><userinput>init 5</userinput></screen>
-
-      <para>
-        In order to permanently set the default to 5, starting the
-        <command>sddm</command> greeter screen automatically, modify
-        <filename>/etc/inittab</filename> as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cp -v /etc/inittab{,-orig} &amp;&amp;
-sed -i '/initdefault/ s/3/5/' /etc/inittab</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="sddm-sessions">
-      <title>Available Sessions</title>
-
-      <para>
-        The greeter offers a list of available sessions, depending on the
-        Window Managers and Desktop Environments installed. The list includes
-        sessions which have a corresponding <filename>.desktop</filename> file
-        installed under
-        <filename class="directory">/usr/share/xsessions</filename> or
-        <filename class="directory">/usr/share/wayland-sessions</filename>.
-        Most of the Window Managers and Desktop Environments automatically
-        provide those files, but if necessary, you may include a custom one.
-      </para>
-
-    </sect3>
-
-    <sect3 id="sddm-themes">
-      <title>Themes</title>
-
-      <para>
-        Three themes are installed at <filename class="directory">
-        /usr/share/sddm/themes</filename>:
-        elarun,
-        maldives, and
-        maya.
-        There is also a default theme, which is not present in that directory.
-        You can install other themes in that directory. In order to change the
-        theme, you need to edit <filename>/etc/sddm.conf</filename>,
-        to change the default (empty) theme, replacing <quote>Current=</quote>
-        with <quote>Current=&lt;new theme&gt;</quote>, e.g.
-        <quote>Current=maldives</quote>.
-      </para>
-
-      <para>
-        In order to see the theme without leaving the session, issue:
-      </para>
-
-<screen role="nodump"><userinput>sddm-greeter --test-mode --theme <replaceable>&lt;theme path&gt;</replaceable></userinput></screen>
-
-    </sect3>
-<!--
-    <sect3 id="sddm-Issues">
-      <title>Known Issues</title>
-
-      <para>
-        This application works well, but there are issues. You find the
-        mainstream known issues at
-        <ulink url="https://github.com/sddm/sddm/issues">Issues</ulink>.
-        The BLFS development team have found some issues.
-      </para>
-
-      <note>
-        <para>
-          In the next couple of paragraphs, due to a problem with sddm-greeter,
-          we mention how to define the keyboard used there. Notice that this is
-          also the keyboard that will be used in the X session, unless there is
-          a configuration in the Desktop Environment or in the Window Manager
-          overriding it, afterwards.
-        </para>
-      </note>
-
-      <para>
-        Keyboard selection: the greeter shows a double question mark or the
-        wrong keyboard. When you start to type the password or user name
-        (depending on the theme, only password), the right keyboard selection
-        magically appears. Optionally, a workaround is to include the keyboard
-        list in <command>/usr/share/sddm/scripts/Xsetup</command> script, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo 'setxkbmap <replaceable>"&lt;your keyboard comma separated list&gt;"</replaceable>' &gt;&gt; \
-     /usr/share/sddm/scripts/Xsetup</userinput></screen>
-
-      <para>
-        E.g. <command>echo 'setxkbmap "fr,gb,br,us"' &gt;&gt;
-        /usr/share/sddm/scripts/Xsetup</command>. A very accurate definition
-        of the keyboard(s) is possible, for example: <command>echo 'setxkbmap
-        -model pc105 -layout br,us -variant abnt2,dvorak -keycodes evdev'
-        &gt;&gt; /usr/share/sddm/scripts/Xsetup</command>. See man setxkbmap.
-      </para>
-
-      <para>
-        Dircolors: the <filename>/etc/dircolors</filename> file is not
-        honoured. Particularly, the compressed files are not displayed in red
-        colour. If this happens, a workaround is to issue, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo "source /etc/profile.d/dircolors.sh" &gt;&gt; /etc/bashrc</userinput></screen>
-
-      <para>
-        It has been reported that problems may happen with this package, if
-        Xorg is installed with a prefix other than <filename
-        class="directory">/usr</filename>. So far, BLFS development team has
-        not hit any problem, in this case.
-      </para>
-
-    </sect3>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sddm and
-          sddm-greeter
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $QT5DIR/qml/SddmComponents,
-          /usr/share/sddm, and
-          /var/lib/sddm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sddm-prog">
-        <term><command>sddm</command></term>
-        <listitem>
-          <para>
-            is a display and login manager based on
-            <application>Qt</application> libraries.
-          </para>
-          <indexterm zone="sddm sddm-prog">
-            <primary sortas="b-sddm">sddm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sddm-greeter">
-        <term><command>sddm-greeter</command></term>
-        <listitem>
-          <para>
-            is an auxiliary process that displays the greeter,
-            a graphical user interface that performs user
-            authentication and initiates the selected window manager
-            or display environment.
-          </para>
-          <indexterm zone="sddm sddm-greeter">
-            <primary sortas="b-sddm-greeter">sddm-greeter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: icons/adwaita-icon-theme.xml
===================================================================
--- x/icons/adwaita-icon-theme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 adwaita-icon-theme-download-http
-   "&gnome-download-http;/adwaita-icon-theme/&gnome-46;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
-  <!ENTITY adwaita-icon-theme-download-ftp  " ">
-  <!ENTITY adwaita-icon-theme-md5sum        "5da8657eb7b6eead02db7e35bbaea442">
-  <!ENTITY adwaita-icon-theme-size          "4.4 MB">
-  <!ENTITY adwaita-icon-theme-buildsize     "30 MB">
-  <!ENTITY adwaita-icon-theme-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="adwaita-icon-theme" xreflabel="adwaita-icon-theme-&adwaita-icon-theme-version;">
-  <?dbhtml filename="adwaita-icon-theme.html"?>
-
-  <title>adwaita-icon-theme-&adwaita-icon-theme-version;</title>
-
-  <indexterm zone="adwaita-icon-theme">
-    <primary sortas="a-adwaita-icon-theme">adwaita-icon-theme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Adwaita Icon Theme</title>
-
-    <para>
-      The <application>Adwaita Icon Theme</application> package contains an
-      icon theme for <application>GTK+ 3</application> and
-      <application>GTK 4</application> applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&adwaita-icon-theme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&adwaita-icon-theme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &adwaita-icon-theme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &adwaita-icon-theme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &adwaita-icon-theme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &adwaita-icon-theme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Adwaita Icon Theme Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk4"/>, and
-      <xref linkend="librsvg"/>
-      <!-- Meson now unconditionally runs gtk-update-icon-cache and
-           gtk-encode-symbolic-svg after installing. See
-           https://lists.linuxfromscratch.org/sympa/arc/blfs-dev/2023-09/msg00128.html -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/>,
-<!--
-      <xref linkend="gtk4"/> or <xref linkend="gtk3"/>
-      (if present, <xref linkend="librsvg"/> is also
-      required, and <command>gtk-update-icon-cache
-      </command> and <command>gtk-encode-symbolic-svg</command> are run
-      after installing),
--->
-      <xref linkend="inkscape"/>, and
-      <ulink url="https://launchpad.net/icontool/">Icon Tools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Adwaita Icon Theme</title>
-
-    <para>
-      Install <application>Adwaita Icon Theme</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Remove any old icons and install the new ones. As the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -rf /usr/share/icons/Adwaita/ &amp;&amp;
-ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-       <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/icons/Adwaita
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: icons/breeze-icons.xml
===================================================================
--- x/icons/breeze-icons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 breeze-icons-download-http "&kf6-download-http;/breeze-icons-&kf6-version;.tar.xz">
-  <!ENTITY breeze-icons-download-ftp  " ">
-  <!ENTITY breeze-icons-md5sum        "97bcb1e182e8f1cf20417ca65ce17a8f">
-  <!ENTITY breeze-icons-size          "2.2 MB">
-  <!ENTITY breeze-icons-buildsize     "79 MB">
-  <!ENTITY breeze-icons-time          "0.1 SBU">
-]>
-
-<sect1 id="breeze-icons" xreflabel="breeze-icons-&kf6-version;">
-  <?dbhtml filename="breeze-icons.html"?>
-
-
-  <title>breeze-icons-&kf6-version;</title>
-
-  <indexterm zone="breeze-icons">
-    <primary sortas="a-breeze-icons">breeze-icons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Breeze Icons</title>
-
-    <para>
-      The <application>Breeze Icons</application> package contains the
-      default icons for <application>KDE Plasma</application> applications,
-      but it can be used for other window environments.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&breeze-icons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&breeze-icons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &breeze-icons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &breeze-icons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &breeze-icons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &breeze-icons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Breeze Icons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="kf6-frameworks"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="lxml"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Breeze Icons</title>
-
-    <para>
-      Install <application>Breeze Icons</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_TESTING=OFF         \
-      -Wno-dev ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This parameter disables
-      building the testing framework, which requires some modules from
-      <xref linkend="kf6-frameworks"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-       <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/icons/breeze{,-dark}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: icons/gnome-icon-theme-extras.xml
===================================================================
--- x/icons/gnome-icon-theme-extras.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-icon-theme-extras-download-http
-           "&gnome-download-http;/gnome-icon-theme-extras/&gnome-minor;/gnome-icon-theme-extras-&gnome-icon-theme-extras-version;.tar.xz">
-  <!ENTITY gnome-icon-theme-extras-download-ftp  " ">
-  <!ENTITY gnome-icon-theme-extras-md5sum        "91f8f7e35a3d8d926716d88b8b1e9a29">
-  <!ENTITY gnome-icon-theme-extras-size          "1.7 MB">
-  <!ENTITY gnome-icon-theme-extras-buildsize     "12 MB">
-  <!ENTITY gnome-icon-theme-extras-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-icon-theme-extras" xreflabel="gnome-icon-theme-extras-&gnome-icon-theme-extras-version;">
-  <?dbhtml filename="gnome-icon-theme-extras.html"?>
-
-
-  <title>gnome-icon-theme-extras-&gnome-icon-theme-extras-version;</title>
-
-  <indexterm zone="gnome-icon-theme-extras">
-    <primary sortas="a-gnome-icon-theme-extras">gnome-icon-theme-extras</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Icon Theme Extras</title>
-
-    <para>
-      The <application>GNOME Icon Theme Extras</application> package contains
-      extra icons for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-icon-theme-extras-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-icon-theme-extras-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-icon-theme-extras-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-icon-theme-extras-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-icon-theme-extras-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-icon-theme-extras-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Icon Theme Extras Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="inkscape"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Icon Theme Extras</title>
-
-    <para>
-      Install <application>GNOME Icon Theme Extras</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>
-
-</sect1>
Index: icons/gnome-icon-theme-symbolic.xml
===================================================================
--- x/icons/gnome-icon-theme-symbolic.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-icon-theme-symbolic-download-http
-   "&gnome-download-http;/gnome-icon-theme-symbolic/&gnome-minor;/gnome-icon-theme-symbolic-&gnome-icon-theme-symbolic-version;.tar.xz">
-  <!ENTITY gnome-icon-theme-symbolic-download-ftp  " ">
-  <!ENTITY gnome-icon-theme-symbolic-md5sum        "3c9c0e6b9fa04b3cbbb84da825a26fd9">
-  <!ENTITY gnome-icon-theme-symbolic-size          "228 KB">
-  <!ENTITY gnome-icon-theme-symbolic-buildsize     "6.8 MB">
-  <!ENTITY gnome-icon-theme-symbolic-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-icon-theme-symbolic" xreflabel="gnome-icon-theme-symbolic-&gnome-icon-theme-symbolic-version;">
-  <?dbhtml filename="gnome-icon-theme-symbolic.html"?>
-
-
-  <title>gnome-icon-theme-symbolic-&gnome-icon-theme-symbolic-version;</title>
-
-  <indexterm zone="gnome-icon-theme-symbolic">
-    <primary sortas="a-gnome-icon-theme-symbolic">gnome-icon-theme-symbolic</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Icon Theme Symbolic</title>
-
-    <para>
-      The <application>GNOME Icon Theme Symbolic</application> package contains
-      symbolic icons for the default <application>GNOME</application> icon theme.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-icon-theme-symbolic-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-icon-theme-symbolic-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-icon-theme-symbolic-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-icon-theme-symbolic-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-icon-theme-symbolic-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-icon-theme-symbolic-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Icon Theme Symbolic Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="inkscape"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Icon Theme Symbolic</title>
-
-    <para>
-      Install <application>GNOME Icon Theme Symbolic</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/icons/gnome/scalable
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: icons/gnome-icon-theme.xml
===================================================================
--- x/icons/gnome-icon-theme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-icon-theme-download-http
-   "&gnome-download-http;/gnome-icon-theme/3.12/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
-  <!ENTITY gnome-icon-theme-download-ftp  " ">
-  <!ENTITY gnome-icon-theme-md5sum        "f14bed7f804e843189ffa7021141addd">
-  <!ENTITY gnome-icon-theme-size          "17 MB">
-  <!ENTITY gnome-icon-theme-buildsize     "85 MB">
-  <!ENTITY gnome-icon-theme-time          "0.5 SBU">
-]>
-
-<sect1 id="gnome-icon-theme" xreflabel="gnome-icon-theme-&gnome-icon-theme-version;">
-  <?dbhtml filename="gnome-icon-theme.html"?>
-
-
-  <title>gnome-icon-theme-&gnome-icon-theme-version;</title>
-
-  <indexterm zone="gnome-icon-theme">
-    <primary sortas="a-gnome-icon-theme">gnome-icon-theme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Icon Theme</title>
-
-    <para>
-      The <application>GNOME Icon Theme</application> package contains
-      an assortment of non-scalable icons of different sizes and themes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-icon-theme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-icon-theme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-icon-theme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-icon-theme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-icon-theme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-icon-theme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Icon Theme Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="hicolor-icon-theme"/>, and
-      <xref linkend="icon-naming-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Icon Theme</title>
-
-    <para>
-      Install <application>GNOME Icon Theme</application>
-      by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/icons/gnome
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: icons/gnome-themes-extra.xml
===================================================================
--- x/icons/gnome-themes-extra.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-themes-extra-download-http
-   "&gnome-download-http;/gnome-themes-extra/&gnome-minor-28;/gnome-themes-extra-&gnome-themes-extra-version;.tar.xz">
-  <!ENTITY gnome-themes-extra-download-ftp  " ">
-  <!ENTITY gnome-themes-extra-md5sum        "f9f2c6c521948da427f702372e16f826">
-  <!ENTITY gnome-themes-extra-size          "2.8 MB">
-  <!ENTITY gnome-themes-extra-buildsize     "40 MB">
-  <!ENTITY gnome-themes-extra-time          "0.3 SBU">
-]>
-
-<sect1 id="gnome-themes-extra" xreflabel="gnome-themes-extra-&gnome-themes-extra-version;">
-  <?dbhtml filename="gnome-themes-extra.html"?>
-
-
-  <title>gnome-themes-extra-&gnome-themes-extra-version;</title>
-
-  <indexterm zone="gnome-themes-extra">
-    <primary sortas="a-gnome-themes-extra">gnome-themes-extra</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Themes Extra</title>
-
-    <para>
-      The <application>GNOME Themes Extra</application> package, formerly
-      known as <application>GNOME Themes Standard</application>, contains
-      various components of the default <application>GNOME</application> theme.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-themes-extra-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-themes-extra-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-themes-extra-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-themes-extra-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-themes-extra-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-themes-extra-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Themes Extra Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> with
-      <xref linkend="librsvg"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Themes Extra</title>
-
-    <para>
-      Install <application>GNOME Themes Extra</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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-gtk2-engine</option>: This switch disables the GTK+-2
-      theming engine.
-    </para>
-
-    <para>
-      <option>--disable-gtk3-engine</option>: This switch disables the GTK+-3
-      theming engine.
-    </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>
-          libadwaita.so
-        </seg>
-        <seg>
-          /usr/lib/gtk-2.0/2.10.0/engines,
-          /usr/share/icons/HighContrast,
-          /usr/share/themes/Adwaita,
-          /usr/share/themes/Adwaita-dark, and
-          /usr/share/themes/HighContrast
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libadwaita">
-        <term><filename class="libraryfile">libadwaita.so</filename></term>
-        <listitem>
-          <para>
-            is the Adwaita <application>GTK+-2</application> engine theme
-          </para>
-          <indexterm zone="gnome-themes-extra libadwaita">
-            <primary sortas="c-libadwaita">libadwaita.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: icons/hicolor-icon-theme.xml
===================================================================
--- x/icons/hicolor-icon-theme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 hicolor-icon-theme-download-http "https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">
-  <!ENTITY hicolor-icon-theme-download-ftp  " ">
-  <!ENTITY hicolor-icon-theme-md5sum        "84eec8d6f810240a069c731f1870b474">
-  <!ENTITY hicolor-icon-theme-size          "52 KB">
-  <!ENTITY hicolor-icon-theme-buildsize     "340 KB">
-  <!ENTITY hicolor-icon-theme-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hicolor-icon-theme"
-xreflabel="hicolor-icon-theme-&hicolor-icon-theme-version;">
-  <?dbhtml filename="hicolor-icon-theme.html" ?>
-
-
-  <title>hicolor-icon-theme-&hicolor-icon-theme-version;</title>
-
-  <indexterm zone="hicolor-icon-theme">
-    <primary sortas="a-Hicolor-icon-theme">Hicolor-icon-theme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to hicolor-icon-theme</title>
-
-    <para>
-      The <application>hicolor-icon-theme</application> package
-      contains a default fallback theme for implementations of the icon
-      theme specification.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hicolor-icon-theme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hicolor-icon-theme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hicolor-icon-theme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hicolor-icon-theme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hicolor-icon-theme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hicolor-icon-theme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of hicolor-icon-theme</title>
-
-    <para>
-      Install <application>hicolor-icon-theme</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>/usr/share/icons/hicolor</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hicolor-icon-themes">
-        <term>/usr/share/icons/hicolor/*</term>
-        <listitem>
-          <para>
-            contains icon definitions used as defaults
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: icons/icon-naming-utils.xml
===================================================================
--- x/icons/icon-naming-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 icon-naming-utils-download-http "http://tango.freedesktop.org/releases/icon-naming-utils-&icon-naming-utils-version;.tar.bz2">
-  <!ENTITY icon-naming-utils-download-ftp  " ">
-  <!ENTITY icon-naming-utils-md5sum        "dd8108b56130b9eedc4042df634efa66">
-  <!ENTITY icon-naming-utils-size          "57 KB">
-  <!ENTITY icon-naming-utils-buildsize     "440 KB">
-  <!ENTITY icon-naming-utils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="icon-naming-utils"
-       xreflabel="icon-naming-utils-&icon-naming-utils-version;">
-  <?dbhtml filename="icon-naming-utils.html"?>
-
-
-  <title>icon-naming-utils-&icon-naming-utils-version;</title>
-
-  <indexterm zone="icon-naming-utils">
-    <primary sortas="a-icon-naming-utils">Icon-naming-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to icon-naming-utils</title>
-
-    <para>
-      The <application>icon-naming-utils</application> package contains
-      a <application>Perl</application> script used for maintaining backwards
-      compatibility with current desktop icon themes, while migrating to the
-      names specified in the <ulink
-      url="https://specifications.freedesktop.org/icon-naming-spec/latest/">
-      Icon Naming Specification</ulink>.
-    </para>
-
-   &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&icon-naming-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&icon-naming-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &icon-naming-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &icon-naming-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &icon-naming-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &icon-naming-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">icon-naming-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="perl-xml-simple"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of icon-naming-utils</title>
-
-    <para>
-      Install <application>icon-naming-utils</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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-    </para>
-
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>icon-name-mapping</seg>
-        <seg>None</seg>
-        <seg>/usr/share/dtds and /usr/share/icon-naming-utils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="icon-name-mapping">
-        <term><command>icon-name-mapping</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script used for maintaining
-            backwards compatibility with current desktop icon themes,
-            while migrating to the names specified in the Icon Naming
-            Specification
-          </para>
-          <indexterm zone="icon-naming-utils icon-name-mapping">
-            <primary sortas="b-icon-name-mapping">icon-name-mapping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: icons/icons.xml
===================================================================
--- x/icons/icons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="x-icons">
-  <?dbhtml filename="icons.html" ?>
-
-  <title>Icons</title>
-
-  <para>
-    Window Managers and Desktop Environments can use icons from different
-    sources.  Generally icons are installed in <filename class='directory'>
-    /usr/share/icons</filename> and are independent of distribution.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adwaita-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="breeze-icons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-icon-theme-extras.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-icon-theme-symbolic.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-themes-extra.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icon-naming-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
-
-</chapter>
Index: icons/lxde-icon-theme.xml
===================================================================
--- x/icons/lxde-icon-theme.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxde-icon-theme-download-http "&sourceforge-dl;/lxde/lxde-icon-theme-&lxde-icon-theme-version;.tar.xz">
-  <!ENTITY lxde-icon-theme-download-ftp  " ">
-  <!ENTITY lxde-icon-theme-md5sum        "7467133275edbbcc79349379235d4411">
-  <!ENTITY lxde-icon-theme-size          "4.3 MB">
-  <!ENTITY lxde-icon-theme-buildsize     "18 MB">
-  <!ENTITY lxde-icon-theme-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxde-icon-theme" xreflabel="lxde-icon-theme-&lxde-icon-theme-version;">
-  <?dbhtml filename="lxde-icon-theme.html"?>
-
-
-  <title>lxde-icon-theme-&lxde-icon-theme-version;</title>
-
-  <indexterm zone="lxde-icon-theme">
-    <primary sortas="a-lxde-icon-theme">lxde-icon-theme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXDE Icon Theme</title>
-
-    <para>
-      The <application>LXDE Icon Theme</application> package contains
-      nuoveXT 2.2 Icon Theme for <application>LXDE</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxde-icon-theme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxde-icon-theme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxde-icon-theme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxde-icon-theme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxde-icon-theme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxde-icon-theme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXDE Icon Theme Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/>
-      (for <command>gtk-update-icon-cache</command> command)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXDE Icon Theme</title>
-
-    <para>
-      Install <application>LXDE Icon Theme</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr</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>
-
-    <para>
-      If you have installed one of the optional dependencies, run the following
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>gtk-update-icon-cache -qf /usr/share/icons/nuoveXT2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/icons/nuoveXT2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: icons/oxygen-icons.xml
===================================================================
--- x/icons/oxygen-icons.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 oxygen-icons-download-http "https://download.kde.org/stable/oxygen-icons/oxygen-icons-&oxygen-icons-version;.tar.xz">
-  <!ENTITY oxygen-icons-download-ftp  " ">
-  <!ENTITY oxygen-icons-md5sum        "7de8aed8caa14ccf5b4906e68c020d55">
-  <!ENTITY oxygen-icons-size          "231 MB">
-  <!ENTITY oxygen-icons-buildsize     "453 MB">
-  <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&oxygen-icons-version;">
-  <?dbhtml filename="oxygen-icons.html"?>
-
-
-  <title>oxygen-icons-&oxygen-icons-version;</title>
-
-  <indexterm zone="oxygen-icons">
-    <primary sortas="a-oxygen-icons">oxygen-icons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to oxygen-icons</title>
-
-    <para>
-      The oxygen icons theme is a photo-realistic icon style, with a
-      high standard of graphics quality.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&oxygen-icons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&oxygen-icons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &oxygen-icons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &oxygen-icons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &oxygen-icons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &oxygen-icons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">oxygen-icons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of oxygen-icons</title>
-
-    <para>
-      First, enable scalable icons:
-    </para>
-
-<screen><userinput>sed -i '/( oxygen/ s/)/scalable )/' CMakeLists.txt</userinput></screen>
-
-    <para>
-      Install <application>oxygen-icons</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>/usr/share/icons/oxygen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/TTF-and-OTF-fonts.xml
===================================================================
--- x/installing/TTF-and-OTF-fonts.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,806 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="TTF-and-OTF-fonts">
-  <?dbhtml filename="TTF-and-OTF-fonts.html"?>
-
-
-  <title>TTF and OTF fonts</title>
-
-  <indexterm zone="TTF-and-OTF-fonts">
-    <primary sortas="a-TTF-and-OTF-fonts">TTF and OTF fonts</primary>
-  </indexterm>
-
-  <!-- although indexterm entries can be added for the individual fonts, and
-   will link to the correct part of the page, that seems unnecessary unless
-   the font is linked from other pages -->
-
-    <sect2 role="configuration">
-    <title>About TTF and OTF fonts</title>
-
-    <para>
-      Originally, Xorg provided only bitmap fonts. Later, some scalable
-      Type1 fonts were added, but the desktop world moved on to using TrueType
-      and Open Type fonts. To support these, Xorg uses Xft, the X FreeType
-      interface library, with <application>Fontconfig</application> (see
-      previous page for details including how fonts are selected and various
-      reasons why a font might be ignored).
-    </para>
-
-    <para>
-      A few fonts are provided as collections (TTC or OTC) where font data
-      is shared between different fonts, which saves disk space. These should
-      be treated in exactly the same way as individual TTF or OTF files.
-    </para>
-
-    <para>
-      If a font provides both TTF and OTF forms, you should prefer the OTF form
-      in Linux, as it may provide more features for programs which know how to
-      use them (such as xelatex). The TTF files of these fonts usually contain
-      hinting, see <xref linkend="hinting-and-antialiasing"/> and <xref
-      linkend="items-which-can-override-fontconfig"/> for reasons why hinting
-      may be undesirable or unusable.
-    </para>
-
-    <para>
-      A font may have multiple variations.  For example, Noto Sans
-      has 9 weights (ExtraLight, Light, Thin, Normal, Medium, SemiBold,
-      Bold, ExtraBold, and Black) and 2 styles (Regular and Italic), thus
-      18 variations in total.  Normally each variation is provided as a
-      separate TTF or OTF file.  For full coverage you need to install
-      all these TTF or OTF files.  Even if you are low on disk space, you
-      should still install two weights (Regular and Bold) by two styles
-      (Normal and Italic) if the font has these variations.  Some fonts
-      do not have Italic style (for example most CJK fonts and some
-      monospace fonts), and some fonts only have one variation (for example
-      Noto Sans Math, it only provides the glyph of some mathematic
-      symbols).
-    </para>
-
-    <para>
-      Some fonts are also available as <emphasis>variable</emphasis> font
-      files.  Unlike a normal font file which only contains one variation,
-      a variable font file contains infinite variations.  Each variation
-      can be defined by the application using this font by assigning
-      number(s) to one or more variables.  There are also pre-defined
-      <emphasis>named instances</emphasis> analogous to the traditional
-      variations.  For example, with the variable version of Noto Sans, the
-      weight variable can be assigned any number not less than 100 and not
-      greater than 900, and 9 named instances are pre-defined: ExtraLight
-      for weight=100, Regular for weight=400, Bold for weight=700, etc.  So
-      once a variable font file for Noto Sans is installed, all the
-      9 named instances (or <quote>variations</quote>) are available.  Note
-      that the slope is not defined as a variable in the variable version
-      of Noto Sans, so Regular and Italic are still traditional variations
-      and a separate variable font file is needed for the Italic variation.
-    </para>
-
-    <para>
-      A variable font file is obviously more flexible than the normal
-      (static) font files.  It's extremely useful for fine tuning the
-      font for Web pages or publications.  And, the size of a variable font
-      file is usually significantly smaller than the total size of several
-      static font files for multiple variations.  For example, the variable
-      font file for Noto Sans SC is only 11M, while the total size of 9
-      static font files for Noto Sans SC is 91M.  But you must make sure
-      your applications really support variable fonts before installing one.
-      For example, <command>lualatex</command> supports variable font but
-      <command>xelatex</command> does not.  So if you want to use a font for
-      an article and use <command>xelatex</command> for typesetting, you
-      must not install the variable font files.
-    </para>
-
-    <para>
-      For information about variable fonts, please see <ulink
-      url="https://fonts.google.com/knowledge/introducing_type/introducing_variable_fonts/">
-      Variable Fonts</ulink>.
-    </para>
-
-    <para>
-      For some scripts, <application>Pango</application> is required to
-      render things correctly, either by selecting different glyph forms, or by
-      combining glyphs - in both cases, according to the context. This applies
-      particularly to Arabic and Indic scripts.
-    </para>
-
-    <para>
-      Standard scalable fonts that come with <application>X</application>
-      provide very poor Unicode coverage. You may notice in applications that
-      use <application>Xft</application> that some characters appear as a box
-      with four binary digits inside.  In this case, a font with the
-      required glyphs has not been found.  Other times, applications that
-      don't use other font families by default and don't accept substitutions
-      from <application>Fontconfig</application> will display blank lines when
-      the default font doesn't cover the orthography of the user's language.
-    </para>
-
-    <para>
-      The fonts available to a program are those which were present when
-      it was started, so if you add an extra font and wish to use it in a program
-      which is currently running, then you will have to close and restart that
-      program.
-    </para>
-
-    <para>
-      Some people are happy to have dozens, or even hundreds, of font files
-      available, but if you ever wish to select a specific font in a desktop
-      application (for example in a word processor) then scrolling through a lot of
-      fonts to find the right one is slow and awkward - fewer is better. So, for
-      some font packages you might decide to install only one of the fonts - but
-      nevertheless install the different variants (italic, bold, etc) as these are
-      all variations for the same font name.
-    </para>
-
-    <para>
-      In the past, everybody recommended running <command>fc-cache</command>
-      as the &root; user after installing or removing fonts, but this is not
-      necessary anymore on Linux, <application>Fontconfig</application> will do
-      it automatically if needed as well as if the font caches are more than 30
-      seconds old. However, if you add a font and want to use it immediately,
-      you can run that command as a normal user.
-    </para>
-
-    <para>
-      There are several references below to CJK characters. This stands for
-      Chinese, Japanese and Korean, although modern Korean is now almost all
-      written using the phonetic Hangul glyphs (it used to sometimes use Hanja
-      glyphs which are similar to Chinese and Japanese). Unicode decided to go
-      for <ulink
-      url="https://en.wikipedia.org/wiki/Han_unification">Han Unification</ulink>
-      and to map some Chinese and Japanese glyphs to the same codepoints. This
-      was very unpopular in Japan, and the result is that different fonts will
-      render some codepoints in quite different shapes. In addition, Simplified
-      Chinese will sometimes use the same codepoint as Traditional Chinese but
-      will show it differently, somewhat analogous to the different shapes used
-      for the letters 'a' and 'g' in English (single-storey and two-storey),
-      except that in a language context one will look "wrong" rather than just
-      "different".
-    </para>
-
-    <para>
-      Unlike most other packages in this book, the BLFS editors do not
-      monitor the versions of the fonts on this page - once a font is good enough
-      for general use, the typical additions in a new version are minor (e.g. new
-      currency symbols, or glyphs not for a modern language, such as emojis or
-      playing cards). Therefore, none of these fonts show version or md5
-      information.
-    </para>
-
-    <para>
-      The list below will not provide complete Unicode coverage.
-      Unicode is updated every year, and most additions are now for historic
-      writing systems. For almost-complete coverage you can install the
-      full set of <xref linkend="noto-fonts"/> (there are separate fonts for
-      different writing systems). We used to recommend the <ulink
-      url="https://unifont.org/fontguide/">Unicode Font Guide</ulink>, but that
-      has not been updated since 2008 and many of its links are dead.
-    </para>
-
-    <para>
-      Rendered examples of most of these fonts, and many others, with
-      details of what languages they cover, can be found at a
-      <ulink url="http://zarniwhoop.uk/ttf-otf-notes.html">font-comparison</ulink>
-      website.
-    </para>
-
-    <para>
-      Fonts are often supplied in zip files, requiring <xref linkend="unzip"/>
-      to list and extract them, but even if the current release is a tarball,
-      you should still check to see if it will create a directory (scattering
-      the contents of a zipfile or tarball across the current directory can be
-      very messy, and a few fonts create __MACOSX/ directories). In addition,
-      many fonts are supplied with permissions which do not let 'other' users
-      read them - if a font is to be installed for system-wide use, any 
-      directories must be mode 755 and all the files mode 644, so you need to
-      change them if the permissions are different. If you forget, the root
-      user may be able to see a particular font in <command>fc-list</command>,
-      but a normal user will not be able to use them.
-    </para>
-
-    <para>
-      As a font installation example, consider the installation of the
-      <xref linkend="dejavu-fonts"/>. In this particular package, the TTF files
-      are in a subdirectory. From the unpacked source directory, run the
-      following commands as the &root;  user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/fonts/dejavu &amp;&amp;
-install -v -m644 ttf/*.ttf /usr/share/fonts/dejavu &amp;&amp;
-fc-cache -v /usr/share/fonts/dejavu</userinput></screen>
-
-    <para>
-      If you wish, you can also install any licenses or other documentation,
-      either alongside the font or in a corresponding directory under
-      <filename class="directory">/usr/share/doc/</filename>.
-    </para>
-
-    <para>
-      A few fonts ship with source as well as the completed TTF or OTF
-      file(s). Unless you intend to modify the font, and have the correct tools
-      (sometimes <xref linkend="fontforge"/>, but often commercial tools), the
-      source will provide no benefit, so do not install it. One or two fonts even
-      ship with Web Open Font Format (WOFF) files - this is useful if you run a
-      webserver and want to use that font on your website, but not useful for
-      a desktop system.
-    </para>
-
-    <para>
-      To provide greater Unicode coverage, you should install some of the
-      following fonts, depending on what websites and languages you want to
-      read. The next part of this page details some fonts which cover at least
-      Latin alphabets, and the final part deals with some CJK issues.
-    </para>
-
-    <note>
-      <para>
-        Installation of the <xref
-        linkend="dejavu-fonts"/> is strongly recommended. 
-      </para>
-    </note>
-
-    <!-- fonts covering at least Latin languages, order alphabetically
-    NB the xreflabel in the bridgehead is used in any link names, the
-    associated text is embiggened for the heading, the text for the
-    sortas appears as the key in the longindex -->
-
-    <bridgehead renderas="sect3" id="Caladea"
-    xreflabel="Caladea">Caladea</bridgehead>
-
-    <para>
-      <ulink url="https://fonts.google.com/specimen/Caladea">Caladea</ulink>
-      (created as a Chrome OS extra font)
-      is metrically compatible with MS Cambria and can be used if you
-      have to edit a document which somebody started in Microsoft Office using
-      Cambria.
-    </para>
-
-    <bridgehead renderas="sect3" id="cantarell-fonts"
-    xreflabel="Cantarell fonts">Cantarell fonts</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts cantarell-fonts">
-      <primary sortas="a-cantarell-fonts">Cantarell fonts</primary>
-    </indexterm>
-
-    <para>
-      <ulink url="https://fonts.google.com/specimen/Cantarell">Cantarell fonts</ulink>
-      &ndash; The Cantarell typeface family provides a contemporary Humanist
-      Sans Serif. It is particularly optimised for legibility at small sizes
-      and is the preferred font family for the
-      <application>GNOME</application> user interface.
-    </para>
-
-    <bridgehead renderas="sect3" id="Carlito"
-    xreflabel="Carlito">Carlito</bridgehead>
-
-    <para>
-      <ulink url=
-      "https://github.com/googlefonts/carlito">Carlito</ulink>
-      (created as another Chrome OS extra font)
-      is metrically compatible with MS Calibri and
-      can be used if you have to edit a document which somebody started in
-      Microsoft Office using Calibri.
-    </para>
-
-    <bridgehead renderas="sect3" id="dejavu-fonts"
-    xreflabel="Dejavu fonts">DejaVu fonts</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts dejavu-fonts">
-      <primary sortas="a-dejavu-fonts">DejaVu fonts</primary>
-    </indexterm>
-
-    <para>
-      <ulink
-      url="https://sourceforge.net/projects/dejavu/files/dejavu/">DejaVu
-      fonts</ulink> &ndash; These fonts are an extension of, and replacement
-      for, the Bitstream Vera fonts and provide Latin-based scripts with
-      accents and punctuation such as "smart-quotes" and variant spacing
-      characters, as well as Cyrillic, Greek, Arabic, Hebrew, Armenian,
-      Georgian and some other glyphs. In the absence of the Bitstream Vera
-      fonts (which had much less coverage), these were the default fallback
-      fonts for 'Latin' languages. As of Fontconfig-2.14, if the Noto 'Latin'
-      fonts have been installed they will be prioritised ahead of DejaVu.
-    </para>
-
-    <bridgehead renderas="sect3" id="freefont"
-    xreflabel="freefont">GNU FreeFont</bridgehead>
-
-    <para>
-      <ulink url="https://ftpmirror.gnu.org/gnu/freefont/">GNU FreeFont</ulink>
-      &ndash; This set of fonts covers many non-CJK characters, but the glyphs
-      are comparatively small (unlike Noto and DejaVu fonts which are
-      comparatively large) and rather light weight ("less black" when black on
-      white is used) which means that in some contexts such as terminals they
-      are not visually pleasing, for example when most other glyphs are provided
-      by another font. On the other hand, some fonts used primarily for printed
-      output, and many CJK fonts, are also light weight.
-    </para>
-
-    <bridgehead renderas="sect3" id="Gelasio"
-    xreflabel="Gelasio">Gelasio</bridgehead>
-
-    <para>
-      <ulink url="https://fonts.google.com/specimen/Gelasio">Gelasio</ulink> is
-      metrically compatible with MS Georgia and
-      <application>Fontconfig</application> will use it if MS Georgia is
-      requested but is not installed.
-    </para>
-
-    <bridgehead renderas="sect3" id="liberation-fonts"
-    xreflabel="Liberation fonts">Liberation fonts</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts liberation-fonts">
-      <primary sortas="a-liberation-fonts">Liberation fonts</primary>
-    </indexterm>
-
-    <para>
-      The <ulink url="https://github.com/liberationfonts/"> Liberation
-      fonts</ulink> provide libre substitutes for Arial, Courier New, and Times
-      New Roman. <application>Fontconfig</application> will use them as
-      substitutes for those fonts, and also for the similar Helvetica, Courier,
-      and Times Roman, though for these it can prefer a different font (see
-      the examples in the 'Substitutes' PDFs at <ulink
-      url="http://zarniwhoop.uk/files/PDF-substitutes/">zarniwhoop.uk.)</ulink>
-    </para>
-
-    <para>
-      Many people will find the Liberation fonts useful for pages where one of
-      those fonts is requested.
-    </para>
-
-    <bridgehead renderas="sect3" id="corefonts"
-    xreflabel="corefonts">Microsoft Core Fonts</bridgehead>
-
-    <para>
-      The <ulink url="https://corefonts.sourceforge.net/">Microsoft Core
-      Fonts</ulink> date from 2002. They were supplied with old versions of
-      Microsoft Windows and were apparently made available for general use.
-      You can extract them from the '.exe' files using
-      <application>bsd-tar</application> from <xref linkend="libarchive"/>.
-      Make sure that you read the license before using them. At one time some
-      of these fonts (particularly Arial, Times New Roman, and to a lesser
-      extent Courier New) were widely used on web pages. The full set
-      contains Andale Mono, Arial, Arial Black, Comic Sans MS, Courier
-      New, Georgia, Impact, Times New Roman, Trebuchet MS, Verdana and
-      Webdings.
-    </para>
-
-    <para>
-      Please note that if you only want to use a font with the same metrics
-      (character size, etc) as Arial, Courier New, or Times New Roman you can
-      use the libre Liberation Fonts (above), and similarly you can replace
-      Georgia with Gelasio.
-    </para>
-
-    <para>
-      Although many old posts recommend installing these fonts for
-      output which looks better, less old posts say that these are
-      'ugly' or 'broken' with modern <application>Fontconfig</application>,
-      <application>Freetype</application> and <application>Pango.</application>
-      Most people will not want to install any of these fonts.
-    </para>
-
-    <para>
-      The newer fonts which Microsoft made their defaults in later releases of
-      MS Windows or MS Office (Calibri and Cambria) have never been freely
-      available. However, if you do not have them installed you can find metric
-      equivalents (Carlito and Caladea) above.
-    </para>
-
-    <bridgehead renderas="sect3" id="noto-fonts"
-    xreflabel="Noto fonts">Noto fonts</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts noto-fonts">
-      <primary sortas="a-noto-fonts">Noto fonts</primary>
-    </indexterm>
-
-    <para>
-      The <ulink
-      url="https://fonts.google.com/noto/">Noto fonts</ulink> ('No Tofu', i.e.
-      avoiding boxes with dots [hex digits] when a glyph cannot be found) are a
-      set of fonts which aim to cover <emphasis>every glyph in Unicode, no
-      matter how obscure</emphasis>.
-    </para>
-
-    <para>
-      People using languages written in Latin, Greek or Cyrillic alphabets only
-      need to install Noto Sans, Noto Serif and/or Noto Sans Mono.
-      For more details on the organization of Noto fonts see <ulink
-      url="https://fonts.google.com/noto/use#how-are-noto-fonts-organized/">how
-      are noto fonts organized</ulink>. There are also separate fonts for every
-      other current writing system, but those do not cover text in Latin
-      languages.
-    </para>
-
-    <para>
-      Those three fonts are the first-choice preferences of
-      <application>Fontconfig</application> for text
-      in those three alphabets, and they are updated frequently to cover recent
-      Unicode additions such as the extensions for phonetic transcription in
-      Latin and Cyrillic alphabets.
-    </para>
-
-    <para>
-      It may be easier to download a specific Noto font by going to <ulink
-      url="https://fonts.google.com/specimen/Noto+Sans">Noto Sans</ulink>
-      and changing the font name as appropriate, with '+' between each word,
-      e.g. 'Noto+Kufi+Arabic', 'Noto+Serif+Georgian' or whatever, then clicking
-      on 'Download family'.
-    </para>
-
-    <para>
-      For the Noto CJK fonts it is easier to find the specific zip archive
-      you desire at Github. Go to <ulink
-      url="https://github.com/notofonts/noto-cjk/releases/"></ulink> and
-      look for the newest Sans or Serif version with its own updated Download
-      guide and its assets. The Download guides should help you to identify
-      which zip file best matches your requirements.
-    </para>
-
-    <para>
-      Noto Sans is the preferred font for KDE Plasma and applications, except
-      for monospace fonts where <ulink
-      url="https://github.com/source-foundry/Hack">Hack</ulink> is preferred.
-    </para>
-
-    <para>
-      For writing systems not using the Latin, Greek or Cyrillic alphabets the
-      Noto fonts are not preferred by <application>Fontconfig</application>.
-      If you use a Noto font for
-      a modern language where another installed font also covers it (e.g. the
-      DejaVu fonts cover several Right-to-Left alphabets), you might need to
-      set a preference for <application>Fontconfig</application> - see the
-      previous page.
-    </para>
-
-<!--<bridgehead renderas="sect3" id="oxygen-fonts"
-    xreflabel="Oxygen fonts">Oxygen fonts</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts oxygen-fonts">
-      <primary sortas="a-oxygen-fonts">Oxygen fonts</primary>
-    </indexterm>
-
-    <para>
-      When KDE Frameworks 5 was first released, it used the <ulink url=
-      "https://fonts.google.com/specimen/Oxygen">Oxygen Sans</ulink> and
-      <ulink url=
-      "https://fonts.google.com/specimen/Oxygen+Mono">OxygenMono</ulink> fonts
-      which were designed for integrated use with the KDE desktop. Those fonts
-      are not actively maintained anymore, so KDE made a decision to switch to
-      <xref linkend="noto-fonts"/>, but for the moment they are still
-      <emphasis>required</emphasis> by 'startkde'.
-    </para>-->
-
-    <bridgehead renderas="sect3" id="source-code-pro"
-    xreflabel="Source Code Pro">Source Code Pro</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts source-code-pro">
-      <primary sortas="a-source-code-pro">Source Code Pro</primary>
-    </indexterm>
-
-    <para>
-      This set of fonts from Adobe (seven different weights) includes what is
-      now the preferred monospace font for those applications which use <xref
-      linkend="gsettings-desktop-schemas"/>. The github release <ulink url=
-      "https://github.com/adobe-fonts/source-code-pro.git#release">
-      source-code-pro</ulink>
-      contains OTF (preferred) and TTF as well as the source and WOFF fonts.
-    </para>
-
-    <para>
-      To use this in terminals, you probably will only want the Regular font.
-    </para>
-
-    <para>
-      There is also an older TTF version of this available from <ulink url=
-      "https://fonts.google.com/specimen/Source+Code+Pro?selection.family=Source+Code+Pro">
-      Google fonts</ulink> but that has very limited coverage (adequate for most
-      European languages using a Latin alphabet).
-    </para>
-
-    <bridgehead renderas="sect3" id="lohit-fonts"
-    xreflabel="Lohit fonts">Lohit fonts</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts lohit-fonts">
-      <primary sortas="a-lohit-fonts">Lohit fonts</primary>
-    </indexterm>
-
-    <para>
-      For Indic languages, <application>Fontconfig</application> now prefers
-      Lohit fonts (Sanskrit for 'red'). They can be found at <ulink url=
-      "https://releases.pagure.org/lohit/">pagure.org</ulink>          
-    </para>
-
-  </sect2>
-
-  <!-- use sect2 so that title for CJK fonts is bigger than for the items
-       which follow (same as for the first title in the page) -->
-  <sect2 id='CJKfonts' xreflabel="CJK fonts:">
-  <title>CJK fonts</title>
-
-    <para>
-      As indicated earlier, usage of a combination of Chinese, Japanese
-      and Korean characters can be tricky - each font only covers a subset
-      of the available codepoints, the preferred shapes of the glyphs can differ
-      between the languages, and many of the CJK fonts do not actually support
-      modern Korean.
-    </para>
-
-    <para>
-      Also, <application>Fontconfig</application> prefers Chinese to Japanese
-      by default. Tuning that is covered at <xref linkend="prefer-chosen-CJK-fonts"/>.
-    </para>
-
-    <para>
-      Although Unicode has been extended to allow a very large number of CJK
-      codepoints, those outside the Base Plane (greater than U+0xFFFF) are not
-      commonly used in Mandarin (the normal form of written Chinese, whether
-      Simplified (Mainland China, Malaysia, and Singapore) or Traditional
-      (Hong Kong and Taiwan)), or Japanese.
-    </para>
-
-    <para>
-      For Hong Kong, which uses Traditional Chinese and where Cantonese is the
-      dominant language, the Hong Kong Supplementary Character Set was added to
-      Unicode in 2005 and revised in 2009 (it is part of CJK Extension B and
-      contains more than 1900 characters). Earlier fonts will not be able to
-      support either Cantonese or use these characters where local names are
-      written in Mandarin. The UMing HK, Noto Sans HK and WenQuanYi Zen Hei
-      fonts all seem to cover Hong Kong usage
-      (<application>Fontconfig</application> disagrees about Noto Sans HK).
-    </para>
-
-    <para>
-      The Han glyphs are double width, and other glyphs in the same font may be
-      narrower. For their CJK content, all of these fonts can be regarded as
-      monospaced (i.e. fixed width).
-    </para>
-
-    <para>
-      If you wish to use Noto fonts, there are also Serif versions of their
-      various CJK fonts.  The Noto Sans/Serif SC/TC/HK/JP/KR fonts are
-      derived from a monolithic <ulink
-        url="https://github.com/notofonts/noto-cjk">noto-cjk</ulink>
-      repository and you can find the
-      <filename class='extension'>.ttc</filename> files for the entire
-      Noto Sans CJK (including SC/TC/HK/JP/KR) or Noto Serif CJK font family
-      there. Google recommends the normal users to use the separate Noto
-      Sans/Serif SC/TC/HK/JP/KR fonts instead, but if you are capable and
-      willing to read texts in more than one CJK character systems it may be
-      easier to use a monolithic
-      <filename class='extension'>.ttc</filename> file for full coverage.
-    </para>
-
-    <para>
-      If all you wish to do is render CJK glyphs, installing
-      <xref linkend="wenquanyi-zenhei"/> may be a good place to start if you do
-      not already have a preference.
-    </para>
-
-    <bridgehead renderas="sect3" id="Chinese-fonts"
-    xreflabel="Chinese fonts">Chinese fonts:</bridgehead>
-
-    <para>
-      In Chinese, there are three font styles in common use: Sung (also
-      known as Song or Ming), which is the most-common ornamented ("serif")
-      form, Kai ("brush strokes") which is an earlier ornamented style that
-      looks quite different, and modern Hei ("sans"). Unless you appreciate the
-      differences, you probably do not want to install Kai fonts.
-    </para>
-
-    <para>
-      The current versions of Chinese Noto Sans fonts can be found at <ulink
-      url="https://fonts.google.com/specimen/Noto+Sans+SC">Noto Sans SC</ulink>
-      for Simplified Chinese, <ulink
-      url="https://fonts.google.com/specimen/Noto+Sans+TC">Noto Sans TC</ulink>
-      for Traditional Chinese, and as mentioned above <ulink
-      url="https://fonts.google.com/specimen/Noto+Sans+HK">Noto Sans HK</ulink>
-      for use in Hong Kong.
-    </para>
-
-<!-- prefer the less-old Opendesktop-fonts to fireflysung
-    <bridgehead renderas="sect4" id="fireflysung"
-    xreflabel="fireflysung">Fireflysung</bridgehead>
-
-    <para>
-      <ulink url=
-      "http://ftp.osuosl.org/pub/blfs/conglomeration/Xorg//fireflysung-1.3.0.tar.gz">fireflysung</ulink>
-      &ndash; This font ('AR PL New Sung') was one of the first libre fonts to
-      provides Chinese coverage. <application>fontconfig</application> knows
-      it is to be treated as a Serif font.
-    </para> -->
-
-<!-- the get/noto/help/cjk url now gives general info on the organization of
-    Noto fonts, linked from above.  The current versions are no-longer in
-    ttc packages, there is a separate set of files for each CJK language.
-    Therefore, this appears to be redundant.
-
-    <bridgehead renderas="sect4" id="NotoSansCJK"
-    xreflabel="Noto Sans CJK">Noto Sans CJK</bridgehead>
-
-    <!\-\- indexterm entry retained for future linkage from kde \-\->
-    <indexterm zone="TTF-and-OTF-fonts NotoSansCJK">
-      <primary sortas="a-noto-sans-cjk">Noto Sans CJK</primary>
-    </indexterm>
-
-    <para>
-      <ulink url="https://www.google.com/get/noto/help/cjk/">
-        Noto Sans CJK
-      </ulink>
-      &ndash; Sans-Serif sets of all CJK fonts in a ttc &ndash; as the link
-      says, you can choose to install the TTC and cover all the languages in
-      all weights in a 110MB file, or you can download subsets. There are
-      also Monospace versions.
-    </para> -->
-
-    <bridgehead renderas="sect4" id="Opendesktop-fonts"
-    xreflabel="Opendesktop-fonts">Opendesktop fonts</bridgehead>
-
-    <para>
-      A copy of version 1.4.2 of the
-      <ulink url="https://sources.archlinux.org/other/opendesktop-fonts/">
-        opendesktop-fonts
-      </ulink>
-      is preserved at Arch. This was a later development of fireflysung which
-      BLFS used to recommend, adding Kai and Mono fonts. The name of the Sung
-      font remains 'AR PL New Sung' so they cannot both be installed together.
-    </para>
-
-    <para>
-      At one time there was a 1.6 release, and more recently some versions at
-      github, which also included a Sans font (Odohei), but those have dropped
-      off the web and it is unclear if there was a problem.
-      <application>Fontconfig</application> does not know anything about the
-      later fonts (AR PL New Kai, AR PL New Sung Mono) and will default to
-      treating them as Sans.
-    </para>
-
-<!-- comment, because not recommended
-    <bridgehead renderas="sect4" id="UKai"
-    xreflabel="UKai">UKai</bridgehead>
-
-    <para>
-      <ulink
-      url="http://packages.debian.org/sid/fonts-arphic-ukai">UKai fonts</ulink>
-      &ndash; sets of Chinese Kai fonts in a ttc which contain variations of
-      Simplified and Traditional (Taiwanese, second variant for different
-      <ulink url="https://en.wikipedia.org/wiki/Bopomofo">bopomofo</ulink>,
-      and Cantonese). This ships with old-syntax files which can install to
-      <filename class="directory">/etc/fonts/conf.d/</filename> but see <xref
-      linkend="editing-old-style-conf-files"/>.
-    </para>
--->
-
-    <bridgehead renderas="sect4" id="UMing"
-    xreflabel="UMing">UMing</bridgehead>
-
-    <para>
-      <ulink url=
-      "http://ftp.debian.org/debian/pool/main/f/fonts-arphic-uming/">UMing fonts</ulink>
-      &ndash; sets of Chinese Ming fonts (from Debian, use the '.orig' tarball)
-      in a ttc which contain variations of Simplified and Traditional Chinese
-      (Taiwanese, with second variant for different
-      <ulink url="https://en.wikipedia.org/wiki/Bopomofo">bopomofo</ulink>,
-      and Cantonese for Hong Kong). This ships with old-syntax files which you
-      can install to
-      <filename class="directory">/etc/fonts/conf.d/</filename> but see <xref
-      linkend="editing-old-style-conf-files"/>.
-    </para>
-
-    <bridgehead renderas="sect4" id="wenquanyi-zenhei"
-    xreflabel="WenQuanYi ZenHei">WenQuanYi Zen Hei</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts wenquanyi-zenhei">
-      <primary sortas="a-wenquanyi-zenhei">WenQuanYi Zen Hei</primary>
-    </indexterm>
-
-    <para>
-      <ulink
-      url="https://sourceforge.net/projects/wqy/files/wqy-zenhei/">WenQuanYi
-      Zen Hei</ulink> provides a Sans-Serif font which covers all CJK scripts
-      including Korean. Although it includes old-style conf files, these are
-      not required: <application>Fontconfig</application> will already treat
-      these fonts (the 'sharp' contains bitmaps, the monospace appears not
-      to be Mono in its ASCII part) as Sans, Serif, and Monospace. If all
-      you wish to do is to be able to render Han and Korean text without
-      worrying about the niceties of the shapes used, the main font from
-      this package is a good font to use.
-    </para>
-
-    <bridgehead renderas="sect3" id="Japanese-fonts"
-    xreflabel="Japanese fonts">Japanese fonts:</bridgehead>
-
-    <para>
-      In Japanese, Gothic fonts are Sans, and Mincho are Serif. BLFS used to
-      only mention the Kochi fonts, but those appear to now be the
-      least-preferred of the Japanese fonts.
-    </para>
-
-    <para>
-      Apart from the fonts detailed below, also consider <ulink
-      url="https://fonts.google.com/specimen/Noto+Sans+JP">Noto Sans
-      JP</ulink>.
-
-    </para>
-
-    <bridgehead renderas="sect4" id="IPAex"
-    xreflabel="IPAex fonts">IPAex fonts</bridgehead>
-
-     <!-- indexterm retained for expected link from tuning fontconfig -->
-    <indexterm zone="TTF-and-OTF-fonts IPAex">
-      <primary sortas="a-ipaex-fonts">IPAex fonts</primary>
-    </indexterm>
-
-    <para>
-      The <ulink url="https://moji.or.jp/ipafont/">IPAex fonts</ulink> are
-      the current version of the IPA fonts. Use
-      <ulink url='https://moji-or-jp.translate.goog/ipafont/?_x_tr_sl=auto&amp;_x_tr_tl=en&amp;_x_tr_hl=en&amp;_x_tr_pto=wapp'>Google Translate</ulink>
-      on the home page, then click on the download link for IPAex Font Ver.004.01.
-      Unfortunately, <application>Fontconfig</application> only knows about
-      the older IPAfonts and the forked IPA Mona font (which is not easily
-      available and which apparently does not meet Debian's Free Software
-      guidelines). If you install the IPAex fonts, you may want to make it known
-      to <application>Fontconfig</application>. Please see <xref
-      linkend="prefer-chosen-CJK-fonts"/> for one way to accomplish this.
-    </para>
-
-    <bridgehead renderas="sect4" id="Kochi"
-    xreflabel="Kochi">Kochi fonts</bridgehead>
-
-    <para>
-      The <ulink url="https://osdn.net/projects/efont/releases/p1357">Kochi
-      Substitute fonts</ulink> were the first truly libre Japanese fonts (the
-      earlier Kochi fonts were allegedly plagiarized from a commercial font).
-    </para>
-
-    <bridgehead renderas="sect4" id="VLGothic"
-    xreflabel="VL Gothic">VL Gothic</bridgehead>
-
-    <indexterm zone="TTF-and-OTF-fonts VLGothic">
-      <primary sortas="a-vlgothic-fonts">VL Gothic</primary>
-    </indexterm>
-
-    <para>
-      The <ulink url="https://osdn.net/projects/vlgothic/releases/">VL
-      Gothic</ulink> font is a modern Japanese font in two variants with
-      monotonic or proportional spacing for the non-Japanese characters.
-    </para>
-
-    <bridgehead renderas="sect3" id="Korean-fonts"
-    xreflabel="Korean fonts">Korean fonts:</bridgehead>
-
-    <para>
-      In Korean, Batang or Myeongjo (the older name) are Serif, Dotum or
-      Gothic are the main Sans fonts. BLFS previously recommended the
-      Baekmuk fonts, but the Nanum and Un fonts are now preferred to Baekmuk by
-      <application>Fontconfig</application> because of user requests.
-    </para>
-
-    <!-- when testing, my previous Nanum link gave permission errors, so
-    link to a general page, at the cost of making it more complicated to
-    download -->
-
-    <para>
-      A convenient place to see examples of these and many other Korean
-      fonts is <ulink url="https://www.freekoreanfont.com/">Free Korean
-      Fonts</ulink>. Click on 'Gothic Fonts' or 'All Categories -> Myeongjo
-      Fonts', then click on the font example to see more details including the
-      License, and click on the link to download it. For Nanum, you will need
-      to be able to read Korean to find the download link on the page you get
-      to. For Un there are direct links and you can find the un-fonts-core
-      tarball in the <filename class="directory">releases/</filename>
-      directory.
-    </para>
-
-    <para>
-      Alternatively, consider <ulink
-      url="https://fonts.google.com/specimen/Noto+Sans+KR">Noto Sans
-      KR</ulink> or <xref linkend="wenquanyi-zenhei"/>.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: x/installing/dri.xml
===================================================================
--- x/installing/dri.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/dri.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,299 @@
+<sect1 id="x-installing-dri">
+<?dbhtml filename="dri.html" dir="x"?>
+<title>Adding Direct Rendering Infrastructure (DRI) Support to XFree86</title>
+
+<para><screen>DRI installation depends on: <xref linkend="cvs"/></screen>
+</para>
+
+<para>The DRI provides 3D graphics hardware acceleration for the XFree86 
+project.</para> 
+
+<note><para>These instructions were developed from the DRI Compilation Guide at 
+<userinput><ulink url="http://www.xfree86.org/4.2.0/DRIcomp.html"/></userinput> 
+and modified for more recent versions of the DRI.
+</para></note>
+
+<para>
+The DRI drivers generally work on systems with Intel or AMD CPUs. However, 
+there is limited support for Alpha and PowerPC support underway.
+</para>
+
+<para>
+DRI support is currently in beta status.  The following video cards are 
+presently supported:</para>
+<itemizedlist> 
+ <listitem><para>3dfx (Voodoo 5 5500, Voodoo4 4500, Voodoo3 3500 TV, 
+ Voodoo3 3000 {AGP, PCI}, Voodoo3 2000 {AGP, PCI}, Voodoo Banshee, 
+ Velocity 100/200)
+ </para></listitem>
+ <listitem><para>Matrox (G200, G400)
+ </para></listitem>
+ <listitem><para>Intel Motherboard Chipsets (i810, i810-dc100, i810e, i815, 
+ i830)
+ </para></listitem>
+ <listitem><para>ATI (Rage {128, Fury, Magnum}, XPERT {2000, 128, 99}, 
+ All-in-Wonder 128, Radeon {SDR AGP, DDR AGP, 32MB SDR PCI}
+ </para></listitem>
+ <listitem><para>3Dlabs (Oxygen 2000) [No longer actively being developed]
+ </para></listitem>
+</itemizedlist>
+
+<para>
+For 3dfx Voodoo3 hardware, you'll also need Glide3 headers and runtime library.
+These can be obtained from 
+<userinput><ulink url="http://linux.3dfx.com"/></userinput>.
+</para>
+
+<sect2><title>Updating the Kernel</title>
+<para>
+In the kernel configuration "Character Devices" section, 
+if you havn't already done so, <emphasis>enable</emphasis> Direct Rendering 
+Manager. Also select the type of video card(s) that you want to support as 
+a <emphasis>module</emphasis>.  This is necessary to ensure the kernel
+has the proper linkages when the DRI code is compiled.
+</para>
+<para>If necessary, recompile the kernel with
+<screen>make dep &amp;&amp;
+make bzImage&amp;&amp;
+make modules &amp;&amp;
+make modules_install</screen>
+</para>
+<para>
+Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
+<filename>/usr/src/linux/System.map</filename> to 
+<filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
+appropriately and run <userinput>lilo</userinput>.
+</para>
+</sect2>
+
+<sect2>
+<title>Getting the DRI driver source code</title>
+<para>
+Get the DRI sources by
+<screen>cd /usr/src
+mkdir DRI-CVS
+cd DRI-CVS
+cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
+    (hit ENTER when prompted for a password)
+cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc</screen>
+</para> 
+<note><para>The -z3 flag causes compression to be used in order to reduce the 
+download time.</para></note>
+
+<para>Since, the DRI drivers are beta, you can update the sources by
+<screen>cd /usr/src/DRI-CVS
+cvs -z3 update -dA xc</screen></para>
+      
+<para>There is no need to download or install the Mesa source files separately.
+</para>
+</sect2>
+
+<sect2><title>Building the DRI</title>
+<para>DRI drivers will be built in a separate directory from the main XFree86 
+sources.  To access the proper files, link the files to a build directoy:
+<screen>cd /usr/src/DRI-CVS
+ln -s xc XFree40
+mkdir build
+cd build
+lndir -silent -ignorelinks ../XFree40</screen>
+</para>
+            
+<para>Now update the <filename>host.def</filename> file. The only change 
+necessary is to uncomment the <parameter>BuildXF86DRM</parameter> define.
+Sinece DRI is still in Beta, changing the optimizations is not recommended.
+</para>
+<para>
+If you do not want to build all the drivers, change 
+<parameter>XF86CardDrivers</parameter> and <parameter>DriDrivers</parameter>
+to eliminate those that you don't want.
+</para>
+<para>Ensure the Linux 2.4.x headers are available in 
+<filename>/usr/src/linux/include/linux</filename>.</para>
+
+<para>You will also need to create <filename>modversions.h</filename> for the 
+drivers to compile correctly.
+<screen>touch /lib/modules/2.4.18/build/include/linux/modversions.h</screen>
+Of course you need to change the version 2.4.18 to your current kernel version
+number.</para>
+
+
+<sect3><title>Compiling the DRI</title>
+<para>Build the system by                    
+<screen>cd xc &amp;&amp;
+make World 2&gt;&amp;1 | tee World.log</screen></para>
+
+<warning><para>Do not use -j option for <filename>make</filename></para>
+</warning>
+
+<para>Using <userinput>less</userinput> or an editor, examine 
+<filename>World.log</filename>
+for errors by searching for the pattern ***.  Also examine the directory
+<filename>/usr/src/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/</filename>
+for the drivers you built:</para>
+<itemizedlist>
+<listitem><para>For the 3dfx Voodoo, you should see <filename>tdfx.o</filename>
+</para></listitem>
+<listitem><para>For the Matrox G200/G400, you should see i
+<filename>mga.o</filename>
+</para></listitem>
+<listitem><para>For the ATI Rage 128, you should see <filename>r128.o</filename>
+</para></listitem>
+<listitem><para>For the ATI Radeon, you should see <filename>radeon.o</filename>
+</para></listitem>
+<listitem><para>For the Intel i81x, you should see <filename>i810.o</filename>
+</para></listitem>
+<listitem><para>For the Intel i830, you should see <filename>i830.o</filename>
+</para></listitem>
+</itemizedlist>
+
+</sect3>
+</sect2>
+
+<sect2><title>Installing the DRI drivers</title>
+<para>Copy the kernel module that for your video card to 
+<filename>/lib/modules/2.4.x/kernel/drivers/char/drm/</filename> 
+then run <userinput>modprobe &lt;module name&gt;</userinput>.</para>
+ 
+<note><para>Some DRI modules require that the agpgart module be loaded first, 
+if it is not compiled into the kernel.</para></note>
+
+<para>Now install the other portions of the DRI that were built and ensure the
+libraries can be found correctly
+<screen>make install &amp;&amp;
+ldconfig</screen></para>
+
+<para>
+If you use X locale information, do the following
+<screen>cd /usr/src/DRI-CVS/build/xc/nls
+../config/util/xmkmf -a
+make
+make install</screen></para>
+                        
+</sect2>
+ 
+<sect2><title>Configuring XFree86 for the DRI</title>
+      
+<para>On the DRI web site, 
+<userinput><ulink url="http://dri.sourceforge.net"/></userinput>, 
+in the resources section, you'll find example 
+<filename>XF86Config</filename> 
+files for a number of graphics cards. These configuration files also setup 
+DRI options so it's highly recommended that you look at these examples.
+</para>      
+                                             
+<para>Generally you can start with your existing configuration file,
+<filename>/etc/X11/XFConfig</filename>, but if you run into trouble
+you may want to start with a new file as in the basic XFree86 installation.
+</para>
+
+<para>Edit <filename>XF86Config</filename> to ensure
+the following sections are present
+<screen>Section "Module"
+     ...
+# This loads the GLX module
+     Load       "glx"
+# This loads the DRI module
+     Load       "dri"
+EndSection</screen></para>
+
+<para>If you want all of the users on your system to be able to use 
+direct rendering, then use a simple DRI section like this:
+
+<screen>Section "DRI"
+     Mode 0666
+EndSection</screen></para>
+
+<para>Make any other changes for font paths, screen modes, etc., as needed 
+and save the configuration file.
+</para>
+
+<note><para>
+DMA-based DRI drivers (that's most DRI drivers) cannot function unless 
+bus mastering is enabled for your graphics card. By default, some systems 
+don't having bus mastering on. You should enable it in your BIOS.
+</para></note>
+</sect2>
+ 
+<sect2><title>Testing the DRI installation</title>
+
+<para>Start (or restart) XFree86 with <userinput>startx</userinput>.</para>
+
+<para>
+Check the XFree86 log file, <filename>/var/log/XFree86.0.log</filename>,
+for a statements like
+<screen>(II) R128(0): [drm] installed DRM signal handler
+(II) R128(0): [DRI] installation complete
+(II) R128(0): [drm] Added 128 16384 byte vertex/indirect buffers
+(II) R128(0): [drm] Mapped 128 vertex/indirect buffers
+(II) R128(0): Direct rendering enabled</screen></para>
+
+<para>From an <filename>xterm</filename>, run <userinput>glxinfo</userinput>.
+The output should look something like:
+<screen>name of display: :0.0
+display: :0  screen: 0
+direct rendering: Yes
+server glx vendor string: SGI
+server glx version string: 1.2
+server glx extensions:
+    GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_EXT_import_context
+client glx vendor string: SGI
+client glx version string: 1.2
+client glx extensions:
+    GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_EXT_import_context
+GLX extensions:
+    GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_EXT_import_context
+OpenGL vendor string: VA Linux Systems, Inc.
+OpenGL renderer string: Mesa DRI Rage128 20020221 Pro AGP 1x x86/MMX/SSE
+OpenGL version string: 1.2 Mesa 4.0.2
+OpenGL extensions:
+    GL_ARB_imaging, GL_ARB_multitexture, GL_ARB_texture_env_add,
+    GL_ARB_transpose_matrix, GL_EXT_abgr, GL_EXT_bgra, GL_EXT_blend_color,
+    GL_EXT_blend_minmax, GL_EXT_blend_subtract, GL_EXT_clip_volume_hint,
+    GL_EXT_convolution, GL_EXT_compiled_vertex_array, GL_EXT_histogram,
+    GL_EXT_packed_pixels, GL_EXT_polygon_offset, GL_EXT_rescale_normal,
+    GL_EXT_texture3D, GL_EXT_texture_env_add, GL_EXT_texture_object,
+    GL_EXT_vertex_array, GL_IBM_rasterpos_clip, GL_MESA_window_pos,
+    GL_NV_texgen_reflection, GL_SGI_color_matrix, GL_SGI_color_table
+glu version: 1.3
+glu extensions:
+    GLU_EXT_nurbs_tessellator, GLU_EXT_object_space_tess
+ 
+   visual  x  bf lv rg d st colorbuffer ax dp st accumbuffer  ms  cav
+ id dep cl sp sz l  ci b ro  r  g  b  a bf th cl  r  g  b  a ns b eat
+----------------------------------------------------------------------
+0x23 16 tc  0 16  0 r  y  .  5  6  5  0  0 16  0  0  0  0  0  0 0 None
+0x24 16 tc  0 16  0 r  y  .  5  6  5  0  0 16  8  0  0  0  0  0 0 Slow
+0x25 16 tc  0 16  0 r  y  .  5  6  5  0  0 16  0 16 16 16  0  0 0 Slow
+0x26 16 tc  0 16  0 r  y  .  5  6  5  0  0 16  8 16 16 16  0  0 0 Slow
+0x27 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  0  0  0  0  0  0 0 None
+0x28 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  8  0  0  0  0  0 0 Slow
+0x29 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  0 16 16 16  0  0 0 Slow
+0x2a 16 dc  0 16  0 r  y  .  5  6  5  0  0 16  8 16 16 16  0  0 0 Slow</screen>
+</para>
+
+<para>Run <userinput>ldd /usr/X11R6/bin/glxgears</userinput> and look for 
+the <filename>libGL</filename> library.  For example
+<screen>      libGL.so.1 =&gt; /usr/lib/libGL.so.1 (0x4001b000)
+      libXext.so.6 =&gt; /usr/X11R6/lib/libXext.so.6 (0x40089000)
+      libX11.so.6 =&gt; /usr/X11R6/lib/libX11.so.6 (0x40097000)
+      libpthread.so.0 =&gt; /lib/libpthread.so.0 (0x40158000)
+      libm.so.6 =&gt; /lib/libm.so.6 (0x4016e000)
+      libc.so.6 =&gt; /lib/libc.so.6 (0x40192000)
+      libdl.so.2 =&gt; /lib/libdl.so.2 (0x402c6000)
+      libgcc_s.so.1 =&gt; /lib/libgcc_s.so.1 (0x402ca000)
+      /lib/ld-linux.so.2 =&gt; /lib/ld-linux.so.2 (0x40000000)</screen></para>
+
+<para>You can also run the test program <userinput>glxgears</userinput>.
+This program brings up a window with three gears turning.  The 
+<filename>xterm</filename> will display how many frames were drawn every 
+five seconds so this is a reasonable benchmark.  The window is scalable, and 
+the frames drawn per second is highly dependent on the size of the window.
+</para>
+
+<para>
+For troubleshooting problems, check the DRI Users Guide at
+<userinput><ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/></userinput>.
+</para>
+</sect2>
+</sect1>
+
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/installing/installing.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,110 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="x-installing">
+<?dbhtml filename="installing.html" dir="x"?>
+<title>Installing X</title>
 
-<chapter id="x-window-system" xreflabel="a graphical environment">
-  <?dbhtml filename="installing.html" ?>
+&xfree86;
+&x-installing-truetype;
+&x-installing-dri;
 
-  <title id="xorg" xreflabel="Xorg Chapter">Graphical Environments</title>
-
-  <para>
-    This chapter contains instructions to build and configure a graphical
-    user environment.
-  </para>
-
-<!-- Historical but not very useful now
-  <para>
-    <application>Xorg</application>, in addition to clearing up some
-    licensing issues with <ulink url="http://www.xfree86.org/">XFree86</ulink>,
-    introduced a completely auto-tooled build for the X Window system. This
-    means that the packages build and install using the conventional
-    <command>configure</command>, <command>make</command>, and <command>make
-    install</command> commands, as opposed to a proprietary build system that
-    required hand editing of configuration parameters in a C-like syntax.
-  </para>
-
-  <para>
-    <application>Xorg</application> also brought with it a modular build
-    system. While this separation into modules resulted in full control of the
-    features available to the X server on any given installation, it also made
-    the installation more tedious as it requires installing more than 100
-    different packages to obtain a functional X Window environment. Most large
-    commercial distributions have elected to use <application>Xorg</application>
-    over the <application>XFree86</application> distribution due to both
-    licensing issues and the increased functionality provided by it over
-    <application>XFree86</application>. With the modular build system, also came
-    incremental updates to individual packages. The distribution of
-    <application>Xorg</application> is given a release number by the developers,
-    in this case Xorg-&xorg-version;, and is referred to as the "katamari" by
-    the upstream developers.
-  </para>
-
-  <para>
-    Additionally, the BLFS book appends a build number
-    to the end of version string to indicate whether a group of incremental
-    updates has been applied, while still retaining the versioning scheme of the
-    upstream developers. For instance, Xorg-&xorg-version;-1 would indicate that
-    this is the 1st release, and is consistent with the katamari, while
-    Xorg-&xorg-version;-2 would indicate that individual package updates have
-    been applied to the katamari.
-  </para>
--->
-
-  <para>
-    For a long time the only graphical environment usable with GNU/Linux has
-    been the <emphasis>X Window System</emphasis>. It uses a client/server
-    model which allows writing applications completely independent of
-    the graphical hardware. This has the drawback that accessing modern
-    hardware acceleration is difficult, so another approach named
-    <emphasis>Wayland</emphasis> is developed.
-    It is a simpler replacement for X, easier to develop and maintain, using
-    the OpenGL framework. The main desktop environments GNOME and KDE have
-    been ported to it.
-  </para>
-
-  <para>
-    This chapter provides the basic components of the X Window System and
-    Wayland. For X, the chosen implementation is Xorg, which is a modular
-    implementation and requires more than 100 packages to be installed.  The
-    distribution of Xorg is given a release number by the developers, in this
-    case Xorg-&xorg-version;. Individual packages are updated as needed without
-    changing this number.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-macros.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorgproto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXau.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXdmcp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-proto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcvt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-image.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-keysyms.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-renderutil.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-wm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-cursor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="luit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursor-themes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xwayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tuning-fontconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="TTF-and-OTF-fonts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7legacy.xml"/>
 </chapter>
Index: installing/libXau.xml
===================================================================
--- x/installing/libXau.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libXau-download-http "&xorg-download-http;/lib/libXau-&libXau-version;.tar.xz">
-  <!ENTITY libXau-download-ftp  " ">
-  <!ENTITY libXau-md5sum        "7f14ba9c84a81a2b9dd023706febab38">
-  <!ENTITY libXau-size          "268 KB">
-  <!ENTITY libXau-buildsize     "2.8 MB (with test)">
-  <!ENTITY libXau-time          "less than 0.1 SBU (with test)">
-]>
-
-<sect1 id="libXau" xreflabel="libXau-&libXau-version;">
-  <?dbhtml filename="libXau.html"?>
-
-
-  <title>libXau-&libXau-version;</title>
-
-  <indexterm zone="libXau">
-    <primary sortas="a-libXau">libXau</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libXau</title>
-
-    <para>
-      The <application>libXau</application> package contains a library
-      implementing the X11 Authorization Protocol. This is useful for
-      restricting client access to the display.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libXau-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libXau-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libXau-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libXau-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libXau-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libXau-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libXau Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorgproto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libXau</title>
-
-    <para>
-      Install <application>libXau</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libXau.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libXau-x7">
-        <term><filename class="libraryfile">libXau.so</filename></term>
-        <listitem>
-          <para>
-            is the library of X authority database routines
-          </para>
-          <indexterm zone="libXau libXau-x7">
-            <primary sortas="c-libXau">libXau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/libXdmcp.xml
===================================================================
--- x/installing/libXdmcp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libXdmcp-download-http "&xorg-download-http;/lib/libXdmcp-&libXdmcp-version;.tar.xz">
-  <!ENTITY libXdmcp-download-ftp  " ">
-  <!ENTITY libXdmcp-md5sum        "ce0af51de211e4c99a111e64ae1df290">
-  <!ENTITY libXdmcp-size          "292 KB">
-  <!ENTITY libXdmcp-buildsize     "3.0 MB (with test)">
-  <!ENTITY libXdmcp-time          "less than 0.1 SBU (with test)">
-]>
-
-<sect1 id="libXdmcp" xreflabel="libXdmcp-&libXdmcp-version;">
-  <?dbhtml filename="libXdmcp.html"?>
-
-
-  <title>libXdmcp-&libXdmcp-version;</title>
-
-  <indexterm zone="libXdmcp">
-    <primary sortas="a-libXdmcp">libXdmcp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libXdmcp</title>
-
-    <para>
-      The <application>libXdmcp</application> package contains a library
-      implementing the X Display Manager Control Protocol. This is useful for
-      allowing clients to interact with the X Display Manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libXdmcp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libXdmcp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libXdmcp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libXdmcp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libXdmcp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libXdmcp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libXdmcp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorgproto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>,
-      <xref linkend="fop"/>,
-      <xref linkend="libxslt"/>,
-      and <ulink url="https://gitlab.freedesktop.org/xorg/doc/xorg-sgml-doctools">Xorg-SGML-doctools</ulink> (for documentation)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libXdmcp</title>
-
-    <para>
-      Install <application>libXdmcp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG --docdir=/usr/share/doc/libXdmcp-&libXdmcp-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libXdmcp.so</seg>
-        <seg><envar>$XORG_PREFIX</envar>/share/doc/libXdmcp-&libXdmcp-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libXdmcp-x7">
-        <term><filename class="libraryfile">libXdmcp.so</filename></term>
-        <listitem>
-          <para>
-            is the X Display Manager Control Protocol library
-          </para>
-          <indexterm zone="libXdmcp libXdmcp-x7">
-            <primary sortas="c-libXdmcp">libXdmcp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/libevdev-kernel.xml
===================================================================
--- x/installing/libevdev-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>I</emphasis>nput device support ---&gt;
-    -*-   <emphasis role='blue'>G</emphasis>eneric input layer (needed for keyboard, mouse, ...)          [INPUT]
-    &lt;*/M&gt;   <emphasis role='blue'>E</emphasis>vent interface                                        [INPUT_EVDEV]</screen>
Index: installing/libevdev-test-kernel.xml
===================================================================
--- x/installing/libevdev-test-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>I</emphasis>nput device support ---&gt;
-    -*- <emphasis role='blue'>G</emphasis>eneric input layer (needed for keyboard, mouse, ...)            [INPUT]
-    [*]   M<emphasis role='blue'>i</emphasis>scellaneous devices ---&gt;                                [INPUT_MISC]
-      &lt;*/M&gt;   <emphasis role='blue'>U</emphasis>ser level driver support                           [INPUT_UINPUT]</screen>
Index: installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libevdev-version "1.13.1">
-
-  <!ENTITY libevdev-download-http "https://www.freedesktop.org/software/libevdev/libevdev-&libevdev-version;.tar.xz">
-  <!ENTITY libevdev-download-ftp  " ">
-  <!ENTITY libevdev-md5sum        "58fe71aa6fd5e80d0928e9b691761311">
-  <!ENTITY libevdev-size          "448 KB">
-  <!ENTITY libevdev-buildsize     "6.0 MB (with tests)">
-  <!ENTITY libevdev-time          "0.1 SBU (with tests)">
-]>
-
-  <!-- Begin Xorg libevdev Driver -->
-  <sect2 id="libevdev" xreflabel="libevdev-&libevdev-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>libevdev &libevdev-version;</title>
-
-    <indexterm zone="libevdev">
-      <primary sortas="a-libevdev">libevdev</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to libevdev</title>
-
-      <para>
-        The <application>libevdev</application> package contains common
-        functions for Xorg input drivers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libevdev-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libevdev-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libevdev-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libevdev-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libevdev-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libevdev-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libevdev Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/> and
-        <xref linkend="valgrind"/> (optional for tests)
-      </para>
-
-    </sect3>
-
-    <sect3 role="kernel" id="libevdev-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        Enable the following options in the kernel configuration and recompile
-        the kernel if necessary:
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="libevdev-kernel.xml"/>
-
-      <para>
-        If you want to test this package with full coverage,
-        the following options are needed as well:
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="libevdev-test-kernel.xml"/>
-
-      <para>
-        If you build this as a module, it needs to be inserted before the test suite
-        runs.
-      </para>
-
-      <indexterm zone="libevdev libevdev-kernel">
-        <primary sortas="d-libevdev">libevdev</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libevdev</title>
-
-      <para>
-        Install <application>libevdev</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=$XORG_PREFIX    \
-      --buildtype=release      \
-      -Ddocumentation=disabled &amp;&amp;
-ninja</userinput></screen>
-
-      <para>
-        The regression tests can be run as the <systemitem
-        class="username">root</systemitem> user with <command>ninja
-        test</command>, in a graphical session. You need to have enabled
-        the CONFIG_INPUT_UINPUT setting in the kernel for full test coverage.
-        If it is enabled as a module, the module is named
-        <command>uinput</command> and needs to be loaded before running the
-        tests. Note that on some systems, the
-        tests may cause a hard lockup and require a reboot. On laptops, the
-        system will go into Sleep and need to be woken up to finish the test
-        suites.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Programs</segtitle>
-        <segtitle>Installed Xorg Library</segtitle>
-        <segtitle>Installed Xorg Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            libevdev-tweak-device, mouse-dpi-tool, and touchpad-edge-detector
-          </seg>
-          <seg>
-            libevdev.so
-          </seg>
-          <seg>
-            $XORG_PREFIX/include/libevdev-1.0
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libevdev-tweak-device">
-          <term><command>libevdev-tweak-device</command></term>
-          <listitem>
-            <para>
-              is a tool to change some kernel device properties
-            </para>
-            <indexterm zone="libevdev libevdev-tweak-device">
-              <primary sortas="b-libevdev-tweak-device">libevdev-tweak-device</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="mouse-dpi-tool">
-          <term><command>mouse-dpi-tool</command></term>
-          <listitem>
-            <para>
-              is a tool to estimate the resolution of a mouse
-            </para>
-            <indexterm zone="libevdev mouse-dpi-tool">
-              <primary sortas="b-mouse-dpi-tool">mouse-dpi-tool</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="touchpad-edge-detector">
-          <term><command>touchpad-edge-detector</command></term>
-          <listitem>
-            <para>
-              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
-            </para>
-            <indexterm zone="libevdev touchpad-edge-detector">
-              <primary sortas="b-touchpad-edge-detector">touchpad-edge-detector</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libevdev-lib">
-          <term><filename class="libraryfile">libevdev.so</filename></term>
-          <listitem>
-            <para>
-              is a library of Xorg driver input functions
-            </para>
-            <indexterm zone="libevdev libevdev-lib">
-              <primary sortas="c-libevdev-lib">ebvdev.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,297 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libinput-version "1.25.0">
-
-<!--  <!ENTITY libinput-download-http "https://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">-->
-  <!ENTITY libinput-download-http "https://gitlab.freedesktop.org/libinput/libinput/-/archive/&libinput-version;/libinput-&libinput-version;.tar.gz"
->
-  <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "fc582c553e40be99bea49adf6d4aa669">
-  <!ENTITY libinput-size          "996 KB">
-  <!ENTITY libinput-buildsize     "11 MB (add 23 MB for documentation and 9.6 MB for tests)">
-  <!ENTITY libinput-time          "0.1 SBU (add 0.1 SBU for documentation and 4.9 SBU for tests)">
-]>
-
-  <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>
-
-      &lfs121_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),
-        <xref linkend="gtk3"/> (to build the GUI event viewer),
-        <xref linkend="libunwind"/> (required for tests),
-        <xref linkend="libwacom"/>,
-        <xref linkend="sphinx"/> (required to build documentation), and
-        <xref linkend="pyparsing"/> (for one non-root test)
-      </para>
-
-    </sect3>
-
-    <sect3 role="kernel" id="libinput-kernel">
-      <title>Kernel Configuration for Running the Libinput Test Suite</title>
-
-      <para>
-        Although libinput works with the same kernel configuration used by <xref
-        linkend="libevdev"/>, its extensive test suite requires the presence of
-        <filename>/dev/uinput</filename>  (as well as both <xref linkend="valgrind"/>
-        and <xref linkend="libunwind"/>).
-      </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>
-
-      <!-- Yes, "libevdev" is not a typo.  libinput test suite needs the
-           same option as libevdev.  -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="libevdev-test-kernel.xml"/>
-
-      <para>
-        If you build this as a module, it needs to be inserted before the test suite
-        runs.
-      </para>
-
-      <para>
-        On an Xorg system you will also need to prevent the events generated
-        during the test suite 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;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX    \
-            --buildtype=release      \
-            -Ddebug-gui=false        \
-            -Dtests=false            \
-            -Dlibwacom=false         \
-            -Dudev-dir=/usr/lib/udev \
-            ..                      &amp;&amp;
-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 test suite" (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. One test fails on wayland.
-        </para>
-      </note>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-      <para>
-        If you have passed <option>-Ddocumentation=true</option> to
-        <command>meson</command>, you can install the generated documentation
-        by running the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<!-- seems the api doc is not generated because the directory is not a git
-     repository... -->
-<screen role="root"
-        remap="doc"><userinput>install -v -dm755      /usr/share/doc/libinput-&libinput-version;/html &amp;&amp;
-cp -rv Documentation/* /usr/share/doc/libinput-&libinput-version;/html</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
-        <xref linkend="pyparsing"/> is not installed.
-      </para>
-
-      <para>
-        <parameter>-Dlibwacom=false</parameter>: Remove this option if you
-        have <xref linkend="libwacom"/> installed, or if you are installing
-        GNOME.
-      </para>
-
-      <para>
-        <parameter>-Dudev-dir=/usr/lib/udev</parameter>: In case that the
-        value of <envar>XORG_PREFIX</envar> is not set to
-        <filename class='directory'>/usr</filename>, this option prevents
-        the package from installing Udev rules and helpers into
-        <filename class='directory'>$XORG_PREFIX/lib/udev</filename> which
-        is not searched by Udev daemon.  This option is not needed for
-        systems with <envar>XORG_PREFIX</envar> set to
-        <filename class='directory'>/usr</filename>, but does no harm.
-      </para>
-
-      <para>
-        <option>-Ddocumentation=true</option>: This switch enables
-        generation of the documentation. Add it if you want to generate
-        the documentation. You must have <xref linkend="doxygen"/> and
-        <xref linkend="graphviz"/> installed.
-      </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>
-            /etc/libinput,
-            $XORG_PREFIX/libexec/libinput,
-            $XORG_PREFIX/share/libinput, and (optionally)
-            $XORG_PREFIX/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-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: installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxcb-download-http "https://xorg.freedesktop.org/archive/individual/lib/libxcb-&libxcb-version;.tar.xz">
-  <!ENTITY libxcb-download-ftp  " ">
-  <!ENTITY libxcb-md5sum        "96565523e9f9b701fcb35d31f1d4086e">
-  <!ENTITY libxcb-size          "448 KB">
-  <!ENTITY libxcb-buildsize     "30 MB (with tests, add 62 MB for doxygen docs)">
-  <!ENTITY libxcb-time          "0.2 SBU (with tests, add 1.4 SBU for doxygen docs)">
-]>
-
-<sect1 id="libxcb" xreflabel="libxcb-&libxcb-version;">
-  <?dbhtml filename="libxcb.html"?>
-
-
-  <title>libxcb-&libxcb-version;</title>
-
-  <indexterm zone="libxcb">
-    <primary sortas="a-libxcb">libxcb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxcb</title>
-
-    <para>
-      The <application>libxcb</application> package provides an interface to
-      the X Window System protocol, which replaces the current Xlib interface.
-      Xlib can also use XCB as a transport layer, allowing software to make
-      requests and receive responses with both.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxcb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxcb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxcb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxcb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxcb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxcb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libXau"/> and
-      <xref linkend="xcb-proto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libXdmcp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to generate API documentation) and
-      <xref linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxcb</title>
-
-    <para>
-      Install <application>libxcb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG      \
-            --without-doxygen \
-            --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If the package was built as a non-&root; user, the installed
-      documentation is now owned by this user.  As the &root; user,
-      fix the ownership:
-    </para>
-
-<screen role="root"><userinput>chown -Rv root:root $XORG_PREFIX/share/doc/libxcb-&libxcb-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/72
-    <para>
-      <envar>LC_ALL=en_US.UTF-8</envar>: Some Python 3 script in the
-      building system of this package may fail with certain system
-      locale settings.  This environment variable forces a locale setting
-      known to work.
-    </para>
-    -->
-
-    <para>
-      <parameter>--without-doxygen</parameter>: Do not use doxygen to
-      generate API documentation (default: auto). Without it, if
-      <xref linkend="doxygen"/> is installed, the API documentation will be
-      generated and installed.
-    </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>
-          libxcb.so, libxcb-composite.so, libxcb-damage.so, libxcb-dbe.so,
-          libxcb-dpms.so, libxcb-dri2.so, libxcb-dri3.so, libxcb-glx.so,
-          libxcb-present.so, libxcb-randr.so, libxcb-record.so,
-          libxcb-render.so, libxcb-res.so, libxcb-screensaver.so,
-          libxcb-shape.so, libxcb-shm.so, libxcb-sync.so, libxcb-xf86dri.so,
-          libxcb-xfixes.so, libxcb-xinerama.so, libxcb-xinput.so,
-          libxcb-xkb.so, libxcb-xtest.so, libxcb-xvmc.so, and libxcb-xv.so
-        </seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/include/xcb and
-          <envar>$XORG_PREFIX</envar>/share/doc/libxcb-&libxcb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-lib">
-        <term><filename class="libraryfile">libxcb.so</filename></term>
-        <listitem>
-          <para>
-            is an interface to the X Window System protocol
-          </para>
-          <indexterm zone="libxcb libxcb-lib">
-            <primary sortas="c-libxcb">libxcb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/libxcvt.xml
===================================================================
--- x/installing/libxcvt.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxcvt-download-http "&xorg-download-http;/lib/libxcvt-&libxcvt-version;.tar.xz">
-  <!ENTITY libxcvt-download-ftp  " ">
-  <!ENTITY libxcvt-md5sum        "b553fdb6024c5a137ff925bf4c337724">
-  <!ENTITY libxcvt-size          "12 KB">
-  <!ENTITY libxcvt-buildsize     "476 KB">
-  <!ENTITY libxcvt-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libxcvt" xreflabel="libxcvt-&libxcvt-version;">
-  <?dbhtml filename="libxcvt.html"?>
-
-
-  <title>libxcvt-&libxcvt-version;</title>
-
-  <indexterm zone="libxcvt">
-    <primary sortas="a-libxcvt">libxcvt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxcvt</title>
-
-    <para>
-      <application>libxcvt</application> is a library providing a standalone
-      version of the X server implementation of the VESA CVT standard timing
-      modelines generator. It is meant to be a direct replacement to the
-      version formerly provided by the Xorg server.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxcvt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxcvt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxcvt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxcvt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxcvt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxcvt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxcvt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg-env"/> (should be set for the following instructions
-      to work)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxcvt</title>
-
-    <para>
-      Install <application>libxcvt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX --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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          cvt
-        </seg>
-        <seg>
-          libxcvt.so
-        </seg>
-        <seg>
-          $XORG_PREFIX/include/libxcvt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvt">
-        <term><command>cvt</command></term>
-        <listitem>
-          <para>
-            calculates VESA Coordinated Video Timing (CVT) modelines for use
-            with X
-          </para>
-          <indexterm zone="libxcvt cvt">
-            <primary sortas="b-cvt">cvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxcvt-lib">
-        <term><filename class="libraryfile">libxcvt.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for calculating VESA CVT
-          </para>
-          <indexterm zone="libxcvt libxcvt-lib">
-            <primary sortas="c-libxcvt">libxcvt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: installing/luit.xml
===================================================================
--- x/installing/luit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 luit-download-http "https://invisible-mirror.net/archives/luit/luit-&luit-version;.tgz">
-  <!ENTITY luit-download-ftp  " ">
-  <!ENTITY luit-md5sum        "b69a0819905ad8dc4bf82d25f24037a4">
-  <!ENTITY luit-size          "208 KB">
-  <!ENTITY luit-buildsize     "1.8 MB">
-  <!ENTITY luit-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="luit" xreflabel="luit-&luit-version;">
-  <?dbhtml filename="luit.html"?>
-
-  <title>luit-&luit-version;</title>
-
-  <indexterm zone="luit">
-    <primary sortas="a-luit">luit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to luit</title>
-
-    <para>
-      The <application>luit</application> package is a filter
-      that can be run between an arbitrary application and a UTF-8 
-      terminal emulator. It will convert application output from the 
-      locale’s encoding into UTF‐8, and convert terminal input from 
-      UTF‐8 into the locale’s encoding.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&luit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&luit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &luit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &luit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &luit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &luit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">luit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-app"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of luit</title>
-
-    <para>
-      Install <application>luit</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>luit</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/mesa-kernel.xml
===================================================================
--- x/installing/mesa-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt;*/M&gt;   <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-                                                                      ...  [DRM]
-    # For r300 or r600:
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>TI Radeon                                              [DRM_RADEON]
-    # For radeonsi:
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD GPU                                                 [DRM_AMDGPU]
-    [*]       <emphasis role='blue'>E</emphasis>nable amdgpu support for SI parts                 [DRM_AMDGPU_SI]
-    [*]       <emphasis role='blue'>E</emphasis>nable amdgpu support for CIK parts               [DRM_AMDGPU_CIK]
-      <emphasis role='blue'>D</emphasis>isplay Engine Configuration ---&gt;
-      [*]   <emphasis role='blue'>A</emphasis>MD DC - Enable new display engine                      [DRM_AMD_DC]
-    # For nouveau:
-    &lt; /*/M&gt; N<emphasis role='blue'>o</emphasis>uveau (NVIDIA) cards                                 [DRM_NOUVEAU]
-    # For i915, crocus, or iris:
-    &lt; /*/M&gt; <emphasis role='blue'>I</emphasis>ntel 8xx/9xx/G3x/G4x/HD Graphics                         [DRM_I915]
-    # For swrast:
-    &lt; /*/M&gt; <emphasis role='blue'>V</emphasis>irtual GEM provider                                      [DRM_VGEM]
-    # For svga:
-    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>RM driver for VMware Virtual GPU                       [DRM_VMWGFX]</screen>
Index: installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,592 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-download-ftp  " ">
-  <!ENTITY mesa-md5sum        "8d8c4bb8d938adcf1aaaaa9381570d45">
-  <!ENTITY mesa-size          "20 MB">
-  <!ENTITY mesa-buildsize     "641 MB (with docs, add 263 MB for tests)">
-  <!ENTITY mesa-time          "2.7 SBU (with docs; add 0.6 SBU for tests; both with parallelism=4)">
-]>
-
-<sect1 id="mesa" xreflabel="Mesa-&mesa-version;">
-  <?dbhtml filename="mesa.html"?>
-
-  <title>Mesa-&mesa-version;</title>
-
-  <indexterm zone="mesa">
-    <primary sortas="a-Mesa">Mesa</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mesa</title>
-
-    <para>
-      <application>Mesa</application> is an OpenGL compatible 3D graphics
-      library.
-    </para>
-
-    <note>
-      <para>
-        <application>Mesa</application> is updated relatively often. You may
-        want to use the latest available &mesa-major-minor;.x mesa version.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mesa-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mesa-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mesa-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mesa-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mesa-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mesa-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-    <!-- 9 Apr 23.  Change to unversioned patch since it never changes. -->
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/mesa-add_xdemos-2.patch"/>
-          (installs 2 demo programs for testing Mesa - not needed if you
-          install the <ulink url="https://archive.mesa3d.org/demos/">
-          mesa-demos</ulink> package)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mesa Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="libdrm"/>, and
-      <xref linkend="Mako"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-
-      <xref linkend="glslang"/> (required for Vulkan support),
-
-      <xref role="first" linkend="libva"/> (to provide VA-API support for some
-      gallium drivers, note that there is a circular dependency. You must
-      build <application>libva</application> first without EGL and GLX support,
-      install this package, and rebuild <application>libva</application>),
-
-      <xref linkend="libvdpau"/> (to build VDPAU drivers),
-
-      <xref linkend="llvm"/> (required for the r300, r600, and radeonsi
-      drivers, and the LLVMpipe software rasterizer which can make the
-      swrast driver much faster),
-
-      <xref linkend="wayland-protocols"/> (required for
-        <xref role="nodep" linkend='plasma-build'/>,
-        GNOME, and recommended for <xref role="nodep" linkend='gtk3'/>), and
-
-      <xref linkend="vulkan-loader"/> (required for Vulkan support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libunwind"/>,
-      <xref linkend="lm_sensors"/> <!-- for libsensors according to Meson -->,
-      <xref linkend="nettle"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://archive.mesa3d.org/demos/">mesa-demos</ulink>
-      (provides more than 300 extra demos to test
-      <application>Mesa</application>; this includes the same programs added by
-      the patch above),
-      <ulink url="https://omxil.sourceforge.net/">Bellagio OpenMAX Integration
-      Layer</ulink> (for mobile platforms), and
-      <!--<ulink url="https://github.com/KhronosGroup/glslang">glslang</ulink>
-      (for vulkan drivers),-->
-      <ulink url="https://github.com/tizonia/tizonia-openmax-il/wiki/Tizonia-OpenMAX-IL/">
-      libtizonia</ulink>,
-      <!-- <ulink url="https://github.com/KhronosGroup/Vulkan-Loader">Vulkan-Loader</ulink> -->
-    </para>
-<!--
-    <note>
-      <para>
-        The instructions below assume that
-        <application>LLVM</application> with the r600/amdgpu and host backends
-        and run-time type information (RTTI - needed for nouveau) are installed.
-        You will need to modify the instructions if you
-        choose not to install all of these. For an explanation of Gallium3D see
-        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"/>.
-      </para>
-    </note>
--->
-  </sect2>
-
-  <sect2 role="kernel" id="mesa-kernel"
-         xreflabel='Mesa Kernel Configuration'>
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and
-      recompile the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="mesa-kernel.xml"/>
-
-    <note>
-      <para>
-        The corresponding Mesa Gallium3D driver name is provided as the
-        comment for the configuration entries.  If you don't know the name
-        of the Mesa Gallium3D driver for your GPU, see <xref
-        linkend="mesa-gallium-drivers"/> below.
-      </para>
-
-      <para>
-        <option>CONFIG_DRM_RADEON</option>,
-        <option>CONFIG_DRM_AMDGPU</option>,
-        <option>CONFIG_DRM_NOUVEAU</option>, and
-        <option>CONFIG_DRM_I915</option> may require firmware.
-        See <xref linkend='postlfs-firmware'/> for details.
-      </para>
-
-      <para>
-        Selecting <option>CONFIG_DRM_RADEON</option> or
-        <option>CONFIG_DRM_AMDGPU</option> as
-        <quote><literal>y</literal></quote> is not recommended. If it is, any
-        required firmware must be built as a part of the kernel image or the
-        initramfs for the driver to function correctly.
-      </para>
-
-      <para>
-        The sub-entries under <option>CONFIG_DRM_AMDGPU</option> are used
-        to ensure the AMDGPU kernel driver supports all GPUs using the
-        <literal>radeonsi</literal> driver.  They are not needed if you
-        won't need <option>CONFIG_DRM_AMDGPU</option> itself. They
-        may be unneeded for some GPU models.
-      </para>
-
-      <para>
-        For <literal>swrast</literal>, <option>CONFIG_DRM_VGEM</option>
-        is not strictly needed but recommended as an optimization.
-      </para>
-    </note>
-    <indexterm zone="mesa mesa-kernel">
-      <primary sortas="d-mesa">mesa</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mesa</title>
-    <para>
-      If you have downloaded the xdemos patch (needed if testing the Xorg
-      installation per BLFS instructions), apply it by running the following
-      command:
-    </para>
-
-<!--<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-1.patch</userinput></screen>-->
-<screen><userinput>patch -Np1 -i ../mesa-add_xdemos-2.patch</userinput></screen>
-
-   <!-- Note that freedreno, vc4, and virgl all need special support from
-        libdrm - renodr
-        For me, libdrm does not mention virgl, but mesa accepts it. AFAICS
-        freedreno is for qualcom hardware, libdrm will build for it on suitable
-        systems. VC4 is for the Broadcom VC4 used in the raspberry pi - ken -->
-<!--
-    <note>
-      <para>
-        The measurements above, and the Contents below, are for a full build.
-        Many people will not wish to install drivers they cannot use, so the
-        following paragraphs explain how to limit the drivers, and give an
-        example which can be be reduced or amended as necessary.
-      </para>
-    </note>
-
--->
-<!--
-    <para>
-      The (non-gallium) DRI drivers available in X86 are auto, <emphasis>or
-      alternatively a choice from</emphasis> i915, i965, nouveau, r100, r200,
-      and swrast. Use 'auto' to build all available DRI drivers, or use an
-      empty string (DRI_DRIVERS="") if you wish to only build gallium drivers.
-    </para>
-
-    <para>
-      The platforms ("window systems") available for X86 linux are x11, wayland,
-     drm, and surfaceless. By not specifying anything, the meson
-      build-system will build for all these platforms if you have the
-      dependencies, identical to if you had specified '-Dplatforms=auto'.
-    </para>
-
-    <para>
-      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.
-    </para>
-
-    <note>
-      <para>
-        Although the nouveau drivers can be built for both gallium and dri, the
-        i915 driver can only be built for one or the other.
-      </para>
-    </note>
-
-<screen><userinput>GALLIUM_DRV="crocus,i915,iris,nouveau,r600,radeonsi,svga,swrast,virgl"
-DRI_DRIVERS="i965,nouveau"</userinput></screen>
--->
-
-    <!-- https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22021 -->
-<!-- No longer needed
-    <para>
-      Remove two unneeded references to LLVM headers to avoid a build
-      failure with LLVM 17 or later:
-    </para>
-
-<screen><userinput>sed '/Scalar.h/d;/Utils.h/d' \
-    -i src/gallium/auxiliary/gallivm/lp_bld_init.c</userinput></screen>
--->
-    <para>
-      Install <application>Mesa</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup                   \
-      --prefix=$XORG_PREFIX   \
-      --buildtype=release     \
-      -Dplatforms=x11,wayland \
-      -Dgallium-drivers=auto  \
-      -Dvulkan-drivers=auto   \
-      -Dvalgrind=disabled     \
-      -Dlibunwind=disabled    \
-      ..                      &amp;&amp;
-
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>meson configure -Dbuild-tests=true &amp;&amp; ninja test</command>.
-    </para>
-<!-- All 88 tests passed for me for 22.3.3 [pierre]
-     All 90 tests passed for me for 23.1.0 [bdubbs]
-     89 Tests passed for me, 1 timeout on 23.1.8 [rahul]
-     All 98 tests passed for me for 23.3.1 [bdubbs]
--->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If desired, install the optional documentation by running
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>cp -rv ../docs -T /usr/share/doc/mesa-&mesa-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--buildtype=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
-      switch, build sizes can span into the 2GB range.
-    </para>
-
-    <para>
-      <anchor id='mesa-gallium-drivers' xreflabel='Mesa Gallium3D Drivers'/>
-      <parameter>-Dgallium-drivers=auto</parameter>: This parameter
-      controls which Gallium3D drivers should be built.
-      <literal>auto</literal> selects all Gallium3D drivers available
-      for x86: <literal>r300</literal> (for ATI Radeon 9000 or Radeon X
-      series), <literal>r600</literal> (for AMD/ATI Radeon HD 2000-6000
-      series), <literal>radeonsi</literal> (for AMD Radeon HD 7000 or newer
-      AMD GPU models), <literal>nouveau</literal>
-      (for Supported NVIDIA GPUs, they are listed as all
-      <quote>3D features</quote> either <quote>DONE</quote> or
-      <quote>N/A</quote> in <ulink
-      url='https://nouveau.freedesktop.org/FeatureMatrix.html'>the Nouveau
-      status page</ulink>), <literal>virgl</literal> (for QEMU virtual GPU
-      with <application>virglrender</application> support; note that BLFS
-      <xref linkend='qemu'/> is not built with
-      <application>virglrender</application>), <literal>svga</literal>
-      (for VMWare virtual GPU), <literal>swrast</literal> (using CPU for 3D
-      rasterisation; note that it's much slower than using a modern
-      3D-capable GPU, so it should be only used if the GPU is not supported
-      by other drivers), <literal>iris</literal> (for Intel GPUs shipped
-      with Broadwell or newer CPUs), <literal>crocus</literal> (for Intel
-      GMA 3000, X3000 series, 4000 series, or X4000 series GPUs shipped with
-      chipsets, or Intel HD GPUs shipped with pre-Broadwell CPUs),
-      <literal>i915</literal> (for Intel GMA 900, 950, 3100, or 3150 GPUs
-      shipped with chipsets or Atom D/N 4xx/5xx CPUs).  You may replace
-      <literal>auto</literal> with a comma-separated list to build only
-      a subset of these drivers if you precisely know which drivers you
-      need, for example
-      <option>-Dgallium-drivers=radeonsi,iris,swrast</option>.
-    </para>
-<!--
-    <para>
-      <parameter>-Dosmesa=true</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>
-      <parameter>-Dplatforms=...</parameter>: This parameter
-      controls which windowing systems will be supported. Available
-      linux platforms are x11 and wayland.
-    </para>
-
-    <para>
-      <parameter>-Dvulkan-drivers=auto</parameter>: This switch enables support
-      for the Vulkan graphics API. It automatically builds all graphics drivers
-      that are available for Vulkan. If you wish to build specific drivers,
-      valid options include 'amd', 'intel', 'intel_hasvk', and 'swrast'. If you
-      do not want Vulkan support, change 'auto' to "".
-    </para>
-
-    <para>
-      <parameter>-Dvalgrind=disabled</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.
-    </para>
-
-    <para>
-      <parameter>-Dlibunwind=disabled</parameter>: This parameter disables
-      the usage of libunwind.
-    </para>
-
-    <para>
-      <command>meson configure -Dbuild-tests=true</command>: This command will
-      reconfigure the build to set <option>-Dbuild-tests=true</option>, but
-      keep the other options specified in the <command>meson setup</command>
-      command unchanged.  It allows <command>ninja test</command> to build and
-      run unit tests.
-    </para>
-
-    <para>
-      <option>-Degl-native-platform="..."</option>: This parameter
-      controls which Embedded Graphics Library support will be built. Available
-      linux options are auto (default), x11, wayland, surfaceless, and drm.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle><!-- in /usr/lib -->
-      <segtitle>Installed DRI Drivers</segtitle><!-- in /usr/lib/dri -->
-      <segtitle>Installed VDPAU Drivers</segtitle><!-- in /usr/lib/vdpau -->
-      <segtitle>Installed Vulkan Drivers</segtitle><!-- in /usr/lib -->
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glxgears and glxinfo
-        </seg>
-        <seg>
-          libEGL.so,
-          libGL.so,
-          libGLESv1_CM.so,
-          libGLESv2.so,
-          libgbm.so,
-          libglapi.so, and
-          libxatracker.so
-        </seg>
-        <seg>
-          <!-- d3dadapter9.so (optional)
-               I guess this is useless today, Wine applications use Vulkan
-               through libvkd3d, and new games with native Linux support
-               likely uses Vulkan directly.  -->
-          <!-- Begin gallium DRI drivers (*_dri.so) and VA-API drivers
-               (*_drv_video.so): this is the full set -->
-          crocus_dri.so,
-          i915_dri.so,
-          iris_dri.so,
-          kms_swrast_dri.so,
-          nouveau_dri.so,
-          nouveau_drv_video.so,
-          r300_dri.so,
-          r600_dri.so,
-          r600_drv_video.so,
-          radeonsi_dri.so,
-          radeonsi_drv_video.so,
-          swrast_dri.so,
-          virtio_gpu_dri.so,
-          virtio_gpu_drv_video.so, and
-          vmwgfx_dri.so
-          <!-- End DRI Drivers -->
-        </seg>
-        <seg>
-          <!-- Begin VDPAU drivers -->
-          libvdpau_nouveau.so,
-          libvdpau_r300.so
-          libvdpau_r600.so, and
-          libvdpau_radeonsi.so
-          libvdpau_virtio_gpu.so
-          <!-- End VDPAU drivers -->
-          (Many of these drivers are hard-linked).
-        </seg>
-        <seg>
-          libvulkan_intel_hasvk.so,
-          libvulkan_intel.so,
-          libvulkan_lvp.so, and
-          libvulkan_radeon.so
-        </seg>
-        <seg>
-          <!-- $XORG_PREFIX/include/GL is installed by xorg-protos -->
-          $XORG_PREFIX/{include/{EGL,GLES,GLES2,GLES3,KHR},
-          $XORG_PREFIX/lib/{dri,vdpau}},
-          $XORG_PREFIX/share/drirc.d (contains workarounds for various applications,
-          particularly browsers and games),
-          $XORG_PREFIX/share/vulkan,
-          and /usr/share/doc/mesa-&mesa-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glxgears">
-        <term><command>glxgears</command></term>
-        <listitem>
-          <para>
-            is a GL demo useful for troubleshooting graphics
-            problems
-          </para>
-          <indexterm zone="mesa glxgears">
-            <primary sortas="b-glxgears">glxgears</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glxinfo">
-        <term><command>glxinfo</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program that displays information about the
-            graphics hardware and installed GL libraries
-          </para>
-          <indexterm zone="mesa glxinfo">
-            <primary sortas="b-glxinfo">glxinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libEGL">
-        <term><filename class="libraryfile">libEGL.so</filename></term>
-        <listitem>
-          <para>
-            provides a native platform graphics interface as
-            defined by the EGL-1.4 specification
-          </para>
-          <indexterm zone="mesa libEGL">
-            <primary sortas="c-libGL">libEGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgbm">
-        <term><filename class="libraryfile">libgbm.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> Graphics Buffer
-            Manager library
-          </para>
-          <indexterm zone="mesa libgbm">
-            <primary sortas="c-libgbm">libgbm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLESv1_CM">
-        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 1.1 library
-          </para>
-          <indexterm zone="mesa libGLESv1_CM">
-            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLES2">
-        <term><filename class="libraryfile">libGLES2.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 2.0 library
-          </para>
-          <indexterm zone="mesa libGLES2">
-            <primary sortas="c-libGLES2">libGLES2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGL">
-        <term><filename class="libraryfile">libGL.so</filename></term>
-        <listitem>
-          <para>
-            is the main <application>Mesa</application> OpenGL library
-          </para>
-          <indexterm zone="mesa libGL">
-            <primary sortas="c-libGL">libGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/truetype.xml
===================================================================
--- x/installing/truetype.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/truetype.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,109 @@
+<sect1 id="x-installing-truetype">
+<?dbhtml filename="truetype.html" dir="x"?>
+<title>Adding TrueType font support to XFree86</title>
+
+<para>
+TrueType font support is now built into XFree86.  The following items need to 
+be completed to make the fonts available.
+</para>
+<itemizedlist>
+
+<listitem><para>Establish a directory for the fonts and move any TrueType fonts
+you want into that directory.
+</para></listitem>
+<listitem><para>Create the <filename>fonts.scale</filename> and 
+<filename>fonts.dir</filename> files in the TrueType font directory.
+</para></listitem>
+<listitem><para>Ensure the truetype module is loaded in 
+<filename>XF86Config</filename>.
+</para></listitem>
+<listitem><para>Ensure the <parameter>FontPath</parameter> in 
+<filename>XF86Config</filename> contains the TrueType font directory.
+</para></listitem>
+</itemizedlist>
+
+<sect2><title>Establish a TrueType font directory</title>
+<para>The build of XFree86 as given above automatically creates a TrueType
+font directory: <filename>/usr/X11R6/lib/Xll/fonts/TTF</filename>.  This
+directory is already has some TrueType fonts and is set up correctly.
+If this directory is satisfactory, copy any other TrueType fonts you want
+into that directory.  If not, create a new directory, preferably in
+the <filename>/usr/X11R6/lib/Xll/fonts/</filename> directory and put 
+your TrueType fonts there.
+</para></sect2>
+
+<sect2><title>Create <filename>fonts.scale</filename> and 
+<filename>fonts.dir</filename></title>
+<para>To make the <filename>fonts.scale</filename> file, you have to build the
+program <filename>ttmkfdir</filename>. Unfortunately, this program needs 
+libraries from the <filename>freetype</filename> project, so we need to make 
+that first.</para>
+
+<screen>Download location: 
+   <ulink url="http://prdownloads.sourceforge.net/freetype/freetype-1.3.1.tar.gz"/></screen>
+
+<para>Unpack the file and build with
+<screen>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ldconfig</screen>
+</para>
+
+<para>
+Now build the <filename>ttmkfdir</filename> utility. 
+
+<screen>Download location: <ulink url="http://freshmeat.net/projects/ttmkfdir"/></screen> 
+The filename is <filename>ttmkfdir.tar.gz</filename>.
+</para>
+
+<para>
+This is a very short  program that unpacks it is files in the current 
+directory, so its best to make a separate directory.
+<screen>mkdir ttmkfdir &amp;&amp; 
+cd ttmkfdir &amp;&amp; 
+tar zxvf ../ttmkfdir.tar.gz</screen>
+</para>
+
+<para>Edit the <filename>Makefile</filename> to make the following changes:
+<screen>FREETYPE_BASE=/usr
+FREETYPE_INCL=$(FREETYPE_BASE)/include/freetype
+FREETYPE_LIB=-L$(FREETYPE_BASE)/lib -lttf</screen>
+</para>
+
+<para>Run
+<screen>make &amp;&amp;
+install -m755 ttmkfdir /usr/bin</screen>
+</para>
+
+<para>Now change to the directory where you have your TrueType fonts and run
+<screen>ttmkfdir -o fonts.scale &amp;&amp;
+mkfontdir</screen></para>
+</sect2>
+
+<sect2><title>Ensure TrueType is loaded in <filename>XF86Config</filename>
+</title> 
+<para>The "Module" section should look like:
+<screen>Section "Module"
+        ...
+        Load  "freetype"
+        Load  "speedo"
+EndSection</screen>
+</para></sect2>
+
+<sect2><title>Ensure the <parameter>FontPath</parameter> in
+<filename>XF86Config</filename> points to the TrueType font directory</title>
+<para>The "Files"section should look like
+<screen>Section "Files"
+        ...
+        FontPath     "/usr/X11R6/lib/X11/fonts/TTF/"
+EndSection</screen>
+</para>
+
+<para>XFree86 will now be able to use TrueType fonts when it is restarted.
+You can check to see if the new fonts are available with the
+<userinput>xlsfonts</userinput> program.
+</para>
+</sect2>
+
+</sect1>
+
Index: installing/tuning-fontconfig.xml
===================================================================
--- x/installing/tuning-fontconfig.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="tuning-fontconfig">
-  <?dbhtml filename="tuning-fontconfig.html"?>
-
-
-  <title>Tuning Fontconfig</title>
-
-  <indexterm zone="tuning-fontconfig">
-    <primary sortas="g-tuning-fontconfig">Tuning Fontconfig</primary>
-  </indexterm>
-
-    <sect2 id='fontconfig-overview' xreflabel="Overview of Fontconfig">
-    <title>Overview of Fontconfig</title>
-
-<!-- do not add individual indexterm entries for items within this page, they
- all belong in section G (others) and not only do they add noise in longindex,
- the links all point to the top of the page. -->
-
-    <para>
-      If you only read text in English, and are happy with the common libre
-      fonts listed on the next page, you may never need to worry about the
-      details of how <application>Fontconfig</application> works. But there are
-      many things which can be altered if they do not suit your needs.
-    </para>
-
-    <para>
-      However, before spending a long time trying out different settings please
-      be aware that modern applications and desktop environments may ignore the
-      settings of fontconfig - see <xref
-      linkend="items-which-can-override-fontconfig"/>.
-    </para>
-
-    <para>
-      Although this page is long, it barely scratches the surface and you will
-      be able to find many alternative views on the web (but please remember
-      that some things have changed over the years, for example the autohinter
-      is no longer the default). The aim here is to give you enough information
-      to understand the changes you are making, why they may not always work,
-      and to identify online information which is no-longer appropriate.
-    </para>
-
-    <para>
-      Unfortunately, some of the terminology is ambiguous (e.g. 'font face' can
-      mean a name known to Fontconfig, <emphasis>or</emphasis> the ordinary,
-      condensed, etc variations of a font) and 'style' can be used to
-      differentiate 'ordinary' from 'italic', or in describing some classes of
-      Serif fonts.
-    </para>
-
-    <para>The following links are to assist navigation in this page.</para>
-    <itemizedlist>
-      <listitem>
-        <para><xref linkend="xft-font-protocol"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="useful-commands"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="the-various-files"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="rules-to-choose-a-font"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="hinting-and-antialiasing"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="disabling-bitmap-fonts"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="synthetic-changes"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="adding-extra-directories"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="preferring-certain-fonts"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="fontconfig-user-docs"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="prefer-a-specific-font"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="prefer-chosen-CJK-fonts"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="editing-old-style-conf-files"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="font-weights"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="items-which-can-override-fontconfig"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="external-links"/></para>
-      </listitem>
-    </itemizedlist>
-
-    </sect2>
-
-    <sect2 role="configuration" id="xft-font-protocol" xreflabel="The Xft Font Protocol">
-    <title>The Xft Font Protocol</title>
-
-    <para>
-      The Xft font protocol provides antialiased font rendering through
-      <application>freetype</application>, and fonts are controlled from the
-      client side using <application>Fontconfig</application> (except for
-      <xref linkend="rxvt-unicode"/> which can use fonts listed in
-      <filename>~/.Xresources</filename>, and <xref linkend="abiword"/> which
-      only uses the specified font). The default search path is <filename
-      class="directory">/usr/share/fonts</filename> and <filename
-      class="directory">~/.local/share/fonts</filename>, although for the moment
-      the old and deprecated location <filename
-      class="directory">~/.fonts</filename> still works.
-      <application>Fontconfig</application> searches directories in its path
-      recursively and maintains a cache of the font characteristics in each
-      directory. If the cache appears to be out of date, it is ignored, and
-      information is fetched from the fonts themselves (that can take a few
-      seconds if you have a lot of fonts installed).
-    </para>
-
-    <para>
-      If you've installed <application>Xorg</application> in any prefix
-      other than <filename class="directory">/usr</filename>, any
-      <application>X</application> fonts were not installed in a
-      location known to <application>Fontconfig</application>. Symlinks were
-       <!-- fonts-misc-ethiopic installs an OTF directory ! -->
-      created from the <filename class="directory">OTF</filename> and <filename
-      class="directory">TTF</filename> <application>X</application> font
-      directories to <filename
-      class="directory">/usr/share/fonts/X11-{OTF,TTF}</filename> in Xorg Fonts.
-      This allows <application>Fontconfig</application> to use the OpenType and
-      TrueType fonts provided by <application>X</application>, although many
-      people will prefer to use more modern fonts.
-    </para>
-
-    <para>
-      <application>Fontconfig</application> uses names to define fonts.
-      Applications generally use generic font names such as "Monospace", "Sans"
-      and "Serif". <application>Fontconfig</application> resolves these names
-      to a font that has all characters that cover the orthography of the
-      language indicated by the locale settings.
-    </para>
-
-    </sect2>
-
-    <sect2 role="configuration" id="useful-commands" xreflabel="Useful Commands">
-    <title>Useful Commands</title>
-
-    <para>
-      The following commands may be helpful when working with
-      <application>Fontconfig</application>,
-      particularly if you are interested in overriding which font will be
-      chosen.
-    </para>
-
-    <para>
-      <command>fc-list | less</command> : shows a list of all available fonts
-      (/path/to/filename: Font Name:style). If you installed a font and it
-      doesn't show, then the directory it is contained in is not readable by
-      your user.
-    </para>
-
-    <para>
-      <command>fc-match 'Font Name'</command> : tells you which font will
-      be used if the named font is requested. Typically you would use this to
-      see what happens if a font you have not installed is requested, but you
-      can also use it if the system is giving you a different font from
-      what you expected (perhaps because <application>Fontconfig</application>
-      does not think that the font supports your language).
-    </para>
-
-    <para>
-      <command>fc-match <replaceable>TYPE</replaceable></command> : shows which
-      font will be used in the current language for that
-      <!-- match style of TYPE in command and explanations -->
-      <replaceable>TYPE</replaceable> (Monospace, Sans, Serif <emphasis>(initial
-      capital letter is optional)</emphasis>). If that font does not map a
-      codepoint, <application>Fontconfig</application> can take a glyph from any
-      available font, even if it is not of the specified type. Any other value
-      for <replaceable>TYPE</replaceable> will be assumed to be Sans.
-    </para>
-
-    <para>
-      <command>fc-match 'Serif :lang=ja:weight=bold'</command> will tell you
-      which font and weight will be chosen for Japanese text in bold weight.
-      It does not mean that the reported font will necessarily be able to show
-      Japanese ideograms, so a fallback might be used, or some glyphs may be
-      missing. For language codes, use ISO-639 values such as 'fr', 'ja', 'zh-cn'.
-      Note that an unrecognized value such as just 'zh' will not return any
-      match. To illustrate the fallback, on a system where both Noto Sans Mono
-      and DejaVu Sans Mono are installed, <command>fc-match 'monospace
-      :lang=en</command> shows Noto Sans Mono will be used, but if the lang is
-      changed to 'ar' (arabic) DejaVu Sans will be used.
-    </para>
-
-    <para>
-      If you want to determine if a font file has hinting (many older fonts do not,
-      because it was patented) use <command>fc-query
-      <replaceable>/path/to/fontfile</replaceable> | grep 'fonthashint:'</command>:
-      which will report 'True(s)' or 'False(s)'. Some recent fonts with both TTF
-      and OTF versions will have hinting in the TTF files.
-    </para>
-
-    <para>
-      If you wish to know which font will be used for a string of text
-      (i.e. one or more glyphs, preceded by a space), paste the following
-      command and replace the <literal>xyz</literal> by the text you care
-      about:
-    </para>
-
-    <para>
-      <command>FC_DEBUG=4 pango-view --font=monospace -t xyz | grep
-      family</command> : this requires <xref linkend="pango"/> and <xref
-      linkend="imagemagick"/> - it will invoke <xref linkend="display"/>
-      to show the text in a tiny window, and after closing that the last
-      line of the output will show which font was chosen. This is
-      particularly useful for CJK languages, and you can also pass a
-      language, e.g. PANGO_LANGUAGE=en;ja (English, then assume Japanese)
-      or just zh-cn (or other variants such as zh-sg or zh-tw).
-    </para>
-
-    </sect2>
-
-    <sect2 role="configuration" id="the-various-files" xreflabel="The configuration files">
-    <title>The configuration files</title>
-
-    <para>
-      The main files are in <filename class="directory">/etc/fonts/conf.d/</filename>,
-      which was intended to be a directory populated by symlinks to some of the files
-      in <filename class="directory">/usr/share/fontconfig/conf.avail/</filename>.
-      But many people, and some packages, create the files directly. Each file name
-      must be in the form of two digits, a dash, somename.conf and they are read in
-      sequence.
-    </para>
-
-    <para>
-      By convention, the numbers are assigned as follows:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          00-09 extra font directories
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          10-19 system rendering defaults (such as antialiasing)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          20-29 font rendering options
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          30-39 family substitution
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          40-49 map family to generic type
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          50-59 load alternate config files
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          60-69 generic aliases, map generic to family
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          70-79 adjust which fonts are available
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          80-89 match target scan (modify scanned patterns)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          90-99 font synthesis
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      You can also have a personal <filename>fonts.conf</filename> in
-      $XDG_CONFIG_HOME (which is <filename
-      class="directory">~/.config/fontconfig/</filename>).
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="rules-to-choose-a-font" xreflabel="The rules to choose a font">
-  <title>The rules to choose a font</title>
-
-    <para>
-      If the requested font is installed, and provided it contains the
-      codepoints <emphasis>required</emphasis> for the current language (in the
-      source, see the .orth files in the <filename
-    class="directory">fc-lang/</filename> directory), it will be used.
-    </para>
-
-    <para>
-      However, if the document or page requested a font which is not installed
-      (or, occasionally, does not contain all the required codepoints) the
-      following rules come into play: First,
-      <filename>30-metric-aliases.conf</filename> is used to map aliases for
-      some fonts with the same metrics (same size, etc). Note that there are
-      both weak and strong aliases so that aliases for one form such as
-      Helvetica or Times New Roman can be satisfied by the other style, i.e.
-      anything which is an alias of Arial or Times in those examples. some
-      examples of Latin fonts with the same metrics can be found in the
-      'Substitutes' PDFs at <ulink
-      url="http://zarniwhoop.uk/files/PDF-substitutes/">zarniwhoop.uk.</ulink>
-    </para>
-
-    <para>
-      After that, an unknown font will be searched for in
-      <filename>45-latin.conf</filename>:
-      'Latin' covers Cyrillic and Greek, and now also maps system-ui fonts which
-      are used for User Interface messages in other alphabets. If the font
-      is found it will be mapped as serif, sans-serif, monospace, fantasy,
-      cursive, or system-ui.  Otherwise, 49-sansserif.conf will assume it is
-      Sans.
-    </para>
-    <para>
-      Then <filename>60-latin.conf</filename>
-      provides ordered lists of the fallbacks - <xref linkend="noto-fonts"/>
-      will be used if you installed them. Cyrillic and Greek appear to be
-      treated in the same way.All of these files prefer
-      commercial fonts if they are present, although modern libre fonts are
-      often at least equal. Finally, if a codepoint is still not found it can
-      be taken from any available system font. The following details only
-      mention freely available fonts.
-    </para>
-
-    <para>
-      Default Persian fonts are dealt with in
-      <filename>65-fonts-persian.conf</filename>. It looks as if all the listed
-      fonts are commercial. Using fonts that support Persian (which has its own
-      variant of the arabic alphabet, and its own font styles) is outside the
-      skills of the BLFS editors.
-    </para>
-
-    <para>
-      All remaining scripts for which <application>Fontconfig</application> has
-      preferences (CJK scripts,
-      Indic scripts) are dealt with in <filename>65-nonlatin.conf</filename>.
-      These are again nominally grouped as Serif, Sans-Serif, Monospace. Of the
-      free fonts, WenQuanYi Zen Hei (Pan-CJK Sans) comes first for both Serif
-      and for Sans. Therefore, if you install this as a fallback but want to
-      use different fonts for Japanese or Korean you will need to set up a
-      preference. Similarly, the old fireflysung Serif font is also listed for
-      Sans.
-    </para>
-
-    <para>
-      After Pan-CJK and Chinese fonts come several Japanese fonts and then
-      several Korean fonts (both split appropriately between Sans and Serif).
-      Finally come the various Lohit Indic families (one font file per script),
-      labelled as both Sans and Serif.
-    </para>
-
-    <para>
-      The Monospace fonts listed in <filename>65-nonlatin.conf</filename> do
-      not include WenQuanYi Zen Hei although that will be available as a
-      fallback if installed. Several Japanese Gothic fonts are listed, followed
-      by AR PL KaitiM GB (a zh-sc 'Brush' font), AR PL Serif fonts for zh-sc
-      (SungtiL) and zh-tw (Mingti2L), some Korean Sans fonts and the various
-     Lohit Indic families.
-    </para>
-
-    <para>
-     For UI fonts, various Noto Sans UI fonts are the only listed free fonts.
-    </para>
-
-    <para>
-      The various Noto CJK fonts are <emphasis>not</emphasis> among the listed
-      fonts, possibly the RedHat developers preferred other fonts.  These now
-      come in many variations, and most users  who use these will not install
-      any other CJK fonts.
-    </para>
-
-    <para>
-      Before Fontconfig-2.14, the first preferred Latin font family was Bitstream
-      Vera. In practice that was rarely used because it covered so little. After
-      that, DejaVu was the next preferred family, so people were recommended to
-      install that. That has now changed, Bitstream Vera has been replaced by the
-      relevant Noto fonts (Serif, Sans, Sans Mono), so these will be preferred if
-      they have been installed, followed by DejaVu.
-    </para>
-
-    <para>
-      For serif, Times New Roman could have been aliased from Liberation Serif or
-      Tinos, and Times from TeX Gyre Termes, so although the named fonts are not
-      free, the metric-compatible fonts can be used. Ignoring other non-free fonts,
-      the remaining order for serif is: Times New Roman, Luxi Serif, Nimbus Roman
-      No9 L, and Times. In practice, that means those fonts at the end of the list
-      are unlikely to be used unless a web page asks for them.
-    </para>
-
-    <para>
-      For sans-serif, the remaining order is anything mapped to Arial, Luxi Sans,
-      Nimbus Sans L, and anything mapped to Helvetica.
-    </para>
-
-    <para>
-      The remaining alternatives for monospace are Inconsolata, anything mapped
-      to Courier New, Luxi Mono, Nimbus Mono, and anything mapped to Courier.
-    </para>
-
-    <para>
-      For 'fantasy' there are no free fonts, so
-      <application>Fontconfig</application> will fall back to sans-serif.
-    </para>
-
-    <para>
-      For 'cursive', the only free font is TeX Gyre Chorus as an alias for
-      ITC Zapf chancery, otherwise <application>Fontconfig</application> will
-      again fall back to sans-serif.
-    </para>
-
-    <para>
-      The system-ui category is unusual. It is for interface messages, so some
-      scripts need special versions to fit in the available space. For Latin,
-      Greek and Cyrillic an ordinary sans font should fit without problems. However,
-      the first preferred font is Cantarell, followed by Noto Sans UI. Cantarell
-      started as a Latin sans-serif font, that has been forked in Gnome under
-      the same name but they only provide the source. The Noto Sans UI fonts are
-      for other languages.
-    </para>
-
-    <para>
-      Since Fontconfig-2.12.5, there is also generic family matching for some
-      emoji and math fonts, please see {45,60}-generic.conf.
-    </para>
-
-    <para>
-      In the rare cases where a font does not contain all the expected
-      codepoints, see 'Trial the First:' at <xref
-      linkend="I-stared-into-the-fontconfig"/> for the long details.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="hinting-and-antialiasing" xreflabel="Hinting and Anti-aliasing">
-  <title>Hinting and Anti-aliasing</title>
-
-    <para>
-      It is possible to change how, or if, fonts are hinted. The following
-      example file contains the default settings, but with comments. The
-      settings are very much down to the user's preferences and to the choice
-      of fonts, so a change which improves some pages may worsen others. The
-      preferred location for this file is:
-     <filename>~/.config/fontconfig/fonts.conf</filename>
-    </para>
-
-    <para>
-      To try out different settings, you may need to exit from Xorg and then
-      run <command>startx</command> again so that all applications use the new
-      settings. Several things can override the fontconfig settings, see
-      <xref linkend="items-which-can-override-fontconfig"/> below for more
-      details. To explore the possibilities, create a file for your user:
-    </para>
-
-<screen><userinput>mkdir -pv ~/.config/fontconfig &amp;&amp;
-cat > ~/.config/fontconfig/fonts.conf &lt;&lt; "EOF"
-<literal>&lt;?xml version='1.0'?&gt;
-&lt;!DOCTYPE fontconfig SYSTEM 'fonts.dtd'&gt;
-&lt;fontconfig&gt;
-
-  &lt;match target="font" &gt;
-    &lt;!-- autohint was the old automatic hinter when hinting was patent
-    protected, so turn it off to ensure any hinting information in the font
-    itself is used, this is the default --&gt;
-    &lt;edit mode="assign" name="autohint"&gt;  &lt;bool&gt;false&lt;/bool&gt;&lt;/edit&gt;
-
-    &lt;!-- hinting is enabled by default --&gt;
-    &lt;edit mode="assign" name="hinting"&gt;   &lt;bool&gt;true&lt;/bool&gt;&lt;/edit&gt;
-
-    &lt;!-- for the lcdfilter see https://www.spasche.net/files/lcdfiltering/ --&gt;
-    &lt;edit mode="assign" name="lcdfilter"&gt; &lt;const&gt;lcddefault&lt;/const&gt;&lt;/edit&gt;
-
-    &lt;!-- options for hintstyle:
-    hintfull: is supposed to give a crisp font that aligns well to the
-    character-cell grid but at the cost of its proper shape. However, anything
-    using Pango >= 1.44 will not support full hinting, Pango now uses harfbuzz
-    for hinting. Apps which use Skia (e.g. Chromium, Firefox) should not be
-    affected by this. <!-- https://github.com/harfbuzz/harfbuzz/issues/2394 -->
-
-    hintmedium: is reported to be broken.
-    hintslight is the default: - supposed to be more fuzzy but retains shape.
-
-    hintnone: seems to turn hinting off.
-    The variations are marginal and results vary with different fonts --&gt;
-    &lt;edit mode="assign" name="hintstyle"&gt; &lt;const&gt;hintslight&lt;/const&gt;&lt;/edit&gt;
-
-    &lt;!-- antialiasing is on by default and really helps for faint characters
-    and also for 'xft:' fonts used in rxvt-unicode --&gt;
-    &lt;edit mode="assign" name="antialias"&gt; &lt;bool&gt;true&lt;/bool&gt;&lt;/edit&gt;
-
-    &lt;!-- subpixels are usually rgb, see
-    http://www.lagom.nl/lcd-test/subpixel.php --&gt;
-    &lt;edit mode="assign" name="rgba"&gt;      &lt;const&gt;rgb&lt;/const&gt;&lt;/edit&gt;
-
-    &lt;!-- thanks to the Arch wiki for the lcd and subpixel links --&gt;
-  &lt;/match&gt;
-
-&lt;/fontconfig&gt;</literal>
-EOF</userinput></screen>
-
-    <para>
-      You will now need to edit the file in your preferred editor. Many of the
-      different settings give very subtle differences and the results may differ
-      for some of the fonts you use.
-    </para>
-
-    <note>
-      <para>
-        Hinting, if enabled, is done in <application>FreeType</application>.
-        Since FreeType-2.7 the default TrueType interpreter is v40. The
-        original v35 hinter could be enabled by an environment variable, but
-        is only really appropriate to original Microsoft TTF fonts (Arial, etc).
-        The v38 hinter (Infinality) is not built by default and all the options
-        to tune it have been removed. For full details see <xref
-        linkend="subpixel-hinting"/> (Spoiler: there is NO sub-pixel hinting,
-        the code simply ignores <emphasis>all</emphasis> horizontal hinting
-        instructions).
-      </para>
-
-      <para>
-        Xorg assumes screens have 96 dots per inch (DPI). Most LCD screens are
-        close to this, but some people detect colour fringing if their screen
-        diverges from that size. See <xref linkend="calc-dpi"/>.
-      </para>
-
-      <para>
-        If you have a High DPI screen (often described as '4K' or larger) you
-        will probably use larger font sizes and benefit from disabling hinting.
-      </para>
-    </note>
-
-    <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>,
-      particularly <ulink
-      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00137.html">2016-09/00137</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>.
-      There are other examples in <xref linkend="arch-fontconfig"/> and <xref
-      linkend="gentoo-fontconfig"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="disabling-bitmap-fonts" xreflabel="Disabling Bitmap fonts">
-  <title>Disabling Bitmap Fonts</title>
-
-    <para>
-      In previous versions of BLFS, the ugly old Xorg bitmap fonts were
-      installed. Now, many people will not need to install any of them. But if
-      for some reason you have installed one or more bitmap fonts, you can
-      prevent them from being used by <application>Fontconfig</application> by
-      creating the following file as the &root; user :
-    </para>
-
-<screen role="root"><userinput>cat > /etc/fonts/conf.d/70-no-bitmaps.conf &lt;&lt; "EOF"
-<literal>&lt;?xml version='1.0'?&gt;
-&lt;!DOCTYPE fontconfig SYSTEM 'fonts.dtd'&gt;
-&lt;fontconfig&gt;
-&lt;!-- Reject bitmap fonts --&gt;
- &lt;selectfont&gt;
-  &lt;rejectfont&gt;
-   &lt;pattern&gt;
-     &lt;patelt name="scalable"&gt;&lt;bool&gt;false&lt;/bool&gt;&lt;/patelt&gt;
-   &lt;/pattern&gt;
-  &lt;/rejectfont&gt;
- &lt;/selectfont&gt;
-&lt;/fontconfig&gt;</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration" id="synthetic-changes" xreflabel="Synthetic changes">
-  <title>Synthetic changes</title>
-
-  <para>
-    In <filename>90-synthetic.conf</filename> there are examples of applying
-    synthetic slanting and emboldening to a font. The synthetic emboldening can
-    be applied to a visibly faint font, but the results are not always as
-    expected: With just the embolden, <application>Epiphany</application> showed
-    darker fonts while <application>Firefox</application> did not - so although
-    <application>Cairo</application> is now used by
-    <application>firefox</application> the comment about setting Weight is still
-    valid. But setting both, <application>Epiphany</application> will show bold
-    text by default, but it will show heavy text if markup for bold is used. In both
-    cases, neither
-    <application>libreOffice</application> nor <application>falkon</application>
-    showed bolder text.
-  </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="adding-extra-directories" xreflabel="Adding extra font directories">
-  <title>Adding extra font directories</title>
-
-    <para>
-      Normally, system fonts and user fonts are installed in directories beneath
-      the locations specified in <xref linkend="xft-font-protocol"/> and there
-      is no obvious reason to put them elsewhere. However, a full BLFS install
-      of <xref linkend="texlive"/> puts many fonts in <filename
-      class="directory">/opt/texlive/&texlive-year;/texmf-dist/fonts/</filename>
-      in the <filename class="directory">opentype/</filename> and <filename
-      class="directory">truetype/</filename> subdirectories. Although pulling in
-      all of these files may appear useful (it allows you to use them in non
-      <application>TeX</application> programs), there are several problems with
-      such an approach:
-    </para>
-
-    <orderedlist>
-      <listitem>
-        <para>
-          There are hundreds of files, which makes selecting fonts difficult.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Some of the files do odd things, such as displaying semaphore flags
-          instead of ASCII letters, or mapping cyrillic codepoints to character
-          forms appropriate to Old Church Slavonic instead of the expected
-          current shapes: fine if that is what you need, but painful for normal
-          use.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Several fonts have multiple sizes and impenetrable short names, which
-          both make selecting the correct font even more difficult.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          When a font is added to CTAN, it is accompanied by TeX packages to use
-          it in the old engines (<application>xelatex</application> does not
-          normally need this), and then the version is often frozen whilst the
-          font is separately maintained. Some of these fonts such as <xref
-          linkend="dejavu-fonts"/> are probably already installed on your BLFS
-          system in a newer version, and if you have multiple versions of a font
-          it is unclear which one will be used by
-          <application>Fontconfig</application>.
-        </para>
-      </listitem>
-    </orderedlist>
-
-    <para>
-      However, it is sometimes useful to look at these fonts in non-TeX
-      applications, if only to see whether you wish to install a current
-      version. If you have installed all of <application>texlive</application>,
-      the following example will make one of the Arkandis Open Type fonts
-      available to other applications, and all three of the ParaType TrueType
-      fonts. Adjust or repeat the lines as desired, to either make all the
-      <filename class="directory">opentype/</filename> or <filename
-      class="directory">truetype</filename>fonts available, or to select
-      different font directories. As the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat > /etc/fonts/conf.d/09-texlive.conf &lt;&lt; "EOF"
-<literal>&lt;?xml version='1.0'?&gt;
-&lt;!DOCTYPE fontconfig SYSTEM 'fonts.dtd'&gt;
-&lt;fontconfig&gt;
-  &lt;dir&gt;/opt/texlive/&texlive-year;/texmf-dist/fonts/opentype/arkandis/berenisadf&lt;/dir&gt;
-  &lt;dir&gt;/opt/texlive/&texlive-year;/texmf-dist/fonts/truetype/paratype&lt;/dir&gt;
-&lt;/fontconfig&gt;</literal>
-EOF</userinput></screen>
-
-    <para>
-      If you do this, remember to change all instances of the year in that file
-      when you upgrade <application>texlive</application> to a later release.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="preferring-certain-fonts" xreflabel="Preferring certain fonts">
-  <title>Preferring certain fonts</title>
-
-    <para>
-      With the exception of web pages which use WOFF fonts and either supply
-      them or link to google to download them, web pages have traditionally
-      suggested a list of preferred font family names if they cared (e.g.
-      Times New Roman, Serif). There are many reasons why people may wish to
-      have pages which specify a  preferred font use a different font, or
-      prefer specific fonts in Monospace or Sans or Serif. As you will expect,
-      there a number of different ways of achieving this.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="fontconfig-user-docs" xreflabel="Fontconfig user documentation">
-  <title>Fontconfig user documentation</title>
-
-    <para>
-      <application>Fontconfig</application> installs user documentation that
-      includes an example 'User configuration file' which among other things
-      prefers <xref linkend="wenquanyi-zenhei"/> (a Sans font) if a
-      <emphasis>Serif</emphasis> font is requested for Chinese (this part
-      might be anachronistic unless you have non-free Chinese fonts, because
-      in <filename>65-nonlatin.conf</filename> this font is already among the
-      preferred fonts when Serif is specified for Chinese) and to prefer the
-      modern <xref linkend="VLGothic"/> font if a Sans font is specified on a
-      Japanese page (otherwise a couple of other fonts would be preferred if
-      they have been installed).
-    </para>
-
-    <para>
-      If you have installed the current version, the user documentation is
-      available in HTML, PDF, and text versions at <filename
-      class="directory">/usr/share/doc/fontconfig-&fontconfig-version;/</filename>
-      : change the version if you installed a different one.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="prefer-a-specific-font" xreflabel="Prefer a specific font">
-  <title>Prefer a specific font</title>
-
-    <para>
-      As an example, if for some reason you wished to use the <ulink
-      url="https://www.fontsquirrel.com/fonts/nimbus-roman-no9-l">Nimbus Roman
-      No9 L</ulink> font wherever Times New Roman is referenced (it is
-      metrically similar, and preferred for Times Roman, but the Serif font
-      from <xref linkend="liberation-fonts"/> will be preferred for the Times
-      <emphasis>New</emphasis> Roman font if installed), as an individual user
-      you could install the font and then create the following file:
-    </para>
-
-<screen><userinput>mkdir -pv ~/.config/fontconfig/conf.d &amp;&amp;
-cat >  ~/.config/fontconfig/conf.d/35-prefer-nimbus-for-timesnew.conf &lt;&lt; "EOF"
-<literal>&lt;?xml version='1.0'?&gt;
-&lt;!DOCTYPE fontconfig SYSTEM 'fonts.dtd'&gt;
-&lt;fontconfig&gt;
-&lt;!-- prefer Nimbus Roman No9 L for Times New Roman as well as for Times,
- without this Tinos and Liberation Serif take precedence for Times New Roman
- before Fontconfig falls back to whatever matches Times --&gt;
-    &lt;alias binding="same"&gt;
-        &lt;family&gt;Times New Roman&lt;/family&gt;
-        &lt;accept&gt;
-            &lt;family&gt;Nimbus Roman No9 L&lt;/family&gt;
-        &lt;/accept&gt;
-    &lt;/alias&gt;
-&lt;/fontconfig&gt;</literal>
-EOF</userinput></screen>
-
-    <para>
-      This is something you would normally do in an individual user's
-      settings, but the file in this case has been prefixed '35-' so that it
-      could, if desired, be used system-wide in <filename
-      class="directory">/etc/fonts/conf.d/</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="prefer-chosen-CJK-fonts" xreflabel="Preferring chosen CJK fonts">
-  <title>Prefer chosen CJK fonts</title>
-
-    <para>
-      The following example of a local configuration (i.e. one that applies
-      for all users of the machine) does several things. It is particularly
-      appropriate where no language is specified, or for reading CJK text
-      in a non-CJK locale, and where the Japanese forms of the codepoints
-      shared with Chinese are preferred. In particular, alternative
-      approaches would be to specify a Chinese font ahead of the Japanese
-      font, meaning that only Kana symbols will be used from the Japanese
-      font, or to not specify DejaVu so that the first font in each set
-      of preferences is preferred for text using Latin alphabets.
-    </para>
-
-    <orderedlist>
-      <listitem>
-        <para>
-          If a Serif font is specified, it prefers <xref linkend="dejavu-fonts"/>.
-          If Han codepoints are found, or the Japanese language is specified,
-          the Mincho font from <xref linkend="IPAex"/> will be used. If Hangul
-          codepoints are found or the Korean language is specified, UnBatang
-          (see <xref linkend="Korean-fonts"/>) will be used: Change that line
-          If you installed a different Korean serif font. After that,
-          <xref linkend="wenquanyi-zenhei"/>  (Sans, but a default for Serif
-          and monospace) is used. A previous version of this page mentioned
-          using UMing which is a Traditional Chinese font that ships
-          with an old conf file preferring it for zh-tw and zh-hk language
-          codes (and for sans-serif and monospace). But without the conf file,
-          <application>Fontconfig</application> will only treat it as suitable
-          for zh-hk.
-          The conf file needs to be edited to current style and will then be
-          prepended, so specifying UMing does not belong in this
-          <filename>local.conf</filename> file.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          For Sans Serif preferences again start with <xref linkend="dejavu-fonts"/>,
-          then <xref linkend="VLGothic"/> for Japanese before falling back to
-          WenQuanYi Zen Hei which is Sans and covers both Chinese and Korean
-          Hangul.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The Monospace fonts are forced to the preferred Sans fonts. If the
-          text is in Chinese or Korean then <xref
-          linkend="wenquanyi-zenhei"/> will be used.
-        </para>
-      </listitem>
-    </orderedlist>
-
-    <para>
-      In a non-CJK locale, the result is that suitable fonts will be used for
-      all variants of Chinese, Japanese and Hangul Korean (but Japanese variants
-      of the glyphs shared with Chinese Han will be used). All other languages
-      should already work if a font is present. As the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat > /etc/fonts/local.conf &lt;&lt; "EOF"
-<literal>&lt;?xml version='1.0'?&gt;
-&lt;!DOCTYPE fontconfig SYSTEM 'fonts.dtd'&gt;
-&lt;fontconfig&gt;
-    &lt;alias&gt;
-        &lt;family&gt;serif&lt;/family&gt;
-        &lt;prefer&gt;
-            &lt;family&gt;DejaVu Serif&lt;/family&gt;
-            &lt;family&gt;IPAexMincho&lt;/family&gt;
-            &lt;!-- WenQuanYi is preferred as Serif in 65-nonlatin.conf,
-            override that so a real Korean font can be used for Serif --&gt;
-            &lt;family&gt;UnBatang&lt;/family&gt;
-        &lt;/prefer&gt;
-    &lt;/alias&gt;
-    &lt;alias&gt;
-         &lt;family&gt;sans-serif&lt;/family&gt;
-         &lt;prefer&gt;
-             &lt;family&gt;DejaVu Sans&lt;/family&gt;
-             &lt;family&gt;VL Gothic&lt;/family&gt;
-         &lt;!-- This assumes WenQuanYi is good enough for Korean Sans --&gt;
-         &lt;/prefer&gt;
-    &lt;/alias&gt;
-    &lt;alias&gt;
-         &lt;family&gt;monospace&lt;/family&gt;
-         &lt;prefer&gt;
-             &lt;family&gt;DejaVu Sans Mono&lt;/family&gt;
-             &lt;family&gt;VL Gothic&lt;/family&gt;
-         &lt;!-- This assumes WenQuanYi is good enough for Korean Monospace --&gt;
-         &lt;/prefer&gt;
-    &lt;/alias&gt;
-&lt;/fontconfig&gt;</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration" id="editing-old-style-conf-files"
-  xreflabel="Editing Old-Style conf files">
-  <title>Editing Old-Style conf files</title>
-
-    <para>
-      Some fonts, particularly Chinese fonts, ship with conf files which can be
-      installed in <filename class="directory">/etc/fonts/conf.d</filename>.
-      However, if you do that and then use a terminal to run any command which
-      uses <application>Fontconfig</application> you may see error messages such
-      as :
-    </para>
-
-    <para>
-      <literal>Fontconfig warning: "/etc/fonts/conf.d/69-odofonts.conf", line
-      14: Having multiple &lt;family&gt; in &lt;alias&gt; isn't supported and
-      may not work as expected</literal>.
-    </para>
-
-    <para>
-      In practice, these old rules do not work. For non-CJK users,
-      <application>Fontconfig</application> will usually do a good job
-      <emphasis>without</emphasis> these rules. Their origin dates back to when
-      CJK users needed handcrafted bitmaps to be legible at small sizes, and
-      those looked ugly next to antialiased Latin glyphs - they preferred to
-      use the same CJK font for the Latin glyphs. There is a side-effect of
-      doing this : the (Serif) font is often also used for Sans, and in such a
-      situation the (English) text in <application>Gtk</application> menus will
-      use this font - compared to system fonts, as well as being serif it is
-      both faint and rather small. That can make it uncomfortable to read.
-    </para>
-
-    <para>
-      Nevertheless, these old conf files can be fixed if you wish to use them.
-      The following example is the first part of
-      <filename>64-arphic-uming.conf</filename> from <xref linkend="UMing"/> -
-      there are many more similar items which also need changing :
-    </para>
-
-<screen role="root">
-   &lt;match target="pattern"&gt;
-       &lt;test qual="any" name="lang" compare="contains"&gt;
-           &lt;string&gt;zh-cn&lt;/string&gt;
-           &lt;string&gt;zh-sg&lt;/string&gt;
-       &lt;/test&gt;
-       &lt;test qual="any" name="family"&gt;
-           &lt;string&gt;serif&lt;/string&gt;
-       &lt;/test&gt;
-       &lt;edit name="family" mode="prepend" binding="strong"&gt;
-           &lt;string&gt;AR PL UMing CN&lt;/string&gt;
-       &lt;/edit&gt;
-   &lt;/match&gt;
-</screen>
-
-    <para>
-      The process to correct this is straightforward but tedious - for every
-      item which produces an error message, using your editor (as the &root;
-      user), edit the installed
-      file to repeat the whole block as many times as there are multiple
-      variables, then reduce each example to have only one of them. You may
-      wish to work on one error at a time, save the file after each fix, and
-      from a separate term run a command such as <command>fc-list 2>&amp;1 |
-      less</command> to see that the fix worked. For the block above, the fixed
-      version will be :
-    </para>
-
-<screen role="root">
-   &lt;match target="pattern"&gt;
-       &lt;test qual="any" name="lang" compare="contains"&gt;
-           &lt;string&gt;zh-cn&lt;/string&gt;
-       &lt;/test&gt;
-       &lt;test qual="any" name="family"&gt;
-           &lt;string&gt;serif&lt;/string&gt;
-       &lt;/test&gt;
-       &lt;edit name="family" mode="prepend" binding="strong"&gt;
-           &lt;string&gt;AR PL UMing CN&lt;/string&gt;
-       &lt;/edit&gt;
-    &lt;/match&gt;
-   &lt;match target="pattern"&gt;
-       &lt;test qual="any" name="lang" compare="contains"&gt;
-           &lt;string&gt;zh-sg&lt;/string&gt;
-       &lt;/test&gt;
-       &lt;test qual="any" name="family"&gt;
-           &lt;string&gt;serif&lt;/string&gt;
-       &lt;/test&gt;
-       &lt;edit name="family" mode="prepend" binding="strong"&gt;
-           &lt;string&gt;AR PL UMing CN&lt;/string&gt;
-       &lt;/edit&gt;
-    &lt;/match&gt;
-</screen>
-
-  </sect2>
-
-  <sect2 role="configuration" id="font-weights" xreflabel="About font weights">
-  <title>About font weights</title>
-
-    <para>
-      When this page and the next page were first created, Latin fonts came
-      with a  maximum of two weights - either Regular or Book (Book typically
-      has a larger X-height to make it easier to read in large blocks of text),
-      and  Bold - and perhaps an Italic (or Slant) style. A few fonts also had
-      Condensed faces (to fit more text into a line and usually only used when
-      specified). Without CSS (Cascading Style Sheets) markup, text used the
-      Regular or Book weight except when &lt;b&gt; ... &lt;/b&gt; markup was
-      used for bold text. Italic styles would be invoked by &lt;i&gt; ... &lt;/i&gt;
-      markup, along with the bold markup for Bold Italic.
-    </para>
-
-    <para>
-      Some faces now contain up to 9 weights, possibly also with a variable font
-      (to save space by including all the alternatives in one file and possibly
-      allowing intermediate weights). For most desktop users who do not need this
-      wide range of weights for creating content, it is simpler to only install
-      one or two weights. If a face has individual weights plus a variable font,
-      the variable font is usually in the top level of the supplied directory,
-      with individual weights in a <filename class="directory">static/</filename>
-      subdirectory. Except when initially reviewing a font, it makes no sense to
-      install both static and variable, nor all the possible weights.
-    </para>
-
-    <para>
-      The weights are labelled from 100 (Thin) to 900 (Black or Heavy) in CSS
-      terminology, with 400 being normal and 700 bold. The full set of weights
-      is described at <xref linkend="css-weights"/>.
-    </para>
-
-    <para>
-      If you have installed a font with a range of weights, you can copy <ulink
-      url="https://&lfs-domainname;/~ken/font-weights.html">font-weights.html</ulink>
-      to your local machine. As shipped it will use your default Serif font assuming
-      you have one. Edit it to point to a specific installed font using the name
-      known to <application>Fontconfig</application> (also in the *EDITME FONTNAME*
-      text items) and open it
-      from your desktop browser. You can also use it to look at a font with only
-      two installed weights, e.g. for testing to see if you prefer other weights.
-    </para>
-
-    <para>
-      Despite the details in that Mozilla link, it appears that if only normal and
-      bold weights are installed, SemiBold (600) will be shown using bold.
-    </para>
-
-    <para>
-      There seems to be a little scope for changing which weights are used for
-      normal and bold <emphasis>if only two weights have been installed</emphasis>.
-      Firefox, and probably other browsers, will look for the next weight heavier
-      than normal. If that is less than bold (Medium, maybe SemiBold - uncertain)
-      it will be used for normal and then the next higher weight, if any will be
-      used for bold, allowing you to make the fonts slightly darker. Conversely,
-      if only a weight less than normal has been installed, such as Light, that
-      will be used for both normal and bold weights (the upward search happens
-      first).
-    </para>
-
-    <para>
-      If you remove some weights of a system font, you may need to run
-      <command>fc-cache</command> as the &root; user and then log out completely
-      to clear caches associated with your user.
-      <!-- I don't know for sure that there are user caches retained until you
-     log out, but certainly leaving X and restarting the browser is not always
-     adequate : ken -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="items-which-can-override-fontconfig" xreflabel="Items which can override Fontconfig">
-  <title>Items which can override Fontconfig</title>
-
-    <para>
-      Several desktop environments, as well as some programs, will use
-      <application>Fontconfig</application>
-      to find fonts but may override certain things.
-    </para>
-
-    <para>
-      <application>GNOME</application>: The settings in
-      org.gnome.desktop.interface can be updated with
-      <application>dconf-editor</application>. You can set the fonts to your
-      preference and desired point size. To use the fonts chosen by
-      <application>Fontconfig</application> specify e.g. 'Sans 12', Serif 11',
-      'Mono 10' as desired. Also review the antialiasing, hinting and rgba
-      settings. Alternatively, <xref linkend="gnome-tweaks"/> can also update
-      the font settings in a GUI form.
-    </para>
-
-    <para>
-      <application>LXQt</application>: Change font settings as necessary to
-      match <application>Fontconfig</application> in
-      <application>lxqt-config-appearance</application>.
-    </para>
-
-    <para>
-      <application>KDE Plasma</application>: The settings can be adjusted in
-      <application>System Settings</application> under Appearance -> Fonts or in
-      Edit -> Preferences of the individual application.
-    </para>
-
-    <para>
-      <application>Xfce desktop</application>: The settings can be adjusted in
-      <application>Settings</application> -> Appearance -> Fonts. Specify your
-      preferred fonts, e.g. 'Sans Regular' (to use the normal face and weight
-      rather than Bold and/or Italic) and adjust the point size in the option.
-      Review the Rendering and DPI options.
-    </para>
-
-    <para>
-      <application>Firefox</application>: This browser allows you to specify its
-      default fonts. For the 115esr series use the 'Hamburger' menu to go to
-      Preferences, General, and under Fonts -> Advanced select Sans Serif, Serif
-      or Monospace as appropriate if you wish to use the fonts which match
-      <application>Fontconfig</application>.  Set the point sizes as desired. In
-      later versions, the settings are at Preferences -> Fonts.
-    </para>
-
-    <para>
-      <application>Libreoffice</application>: Tests using English text with an
-      old Japanese font (HanaMinA) which supports several European languages but
-      had only one weight and no italics or slant showed that although
-      <application>Libreoffice</application> uses
-      <application>Fontconfig</application> to find the font, it created its own
-      bold or slanted text. It is not clear if it will do the same where a font
-      actually has bold weight or an italic style. Also, documentation shows
-      that <application>Libreoffice</application> has its own substitution rules
-      for when a codepoint is not found in the selected font, but is unclear if
-      those rules apply on Linux using Fontconfig.
-    </para>
-
-    <para>
-      <application>Pango</application>: as noted in the example
-      <filename>~/.config/fontconfig</filename> above, anything using Pango-1.44
-      (from 2019) or later now uses <application>Harfbuzz</application> for
-      hinting, not <application>FreeType</application>, and
-      <literal>hintfull</literal> is not supported.
-    </para>
-
-    <para>
-      <application>Thunderbird</application>: The font settings can be changed
-      by going to "Edit -> Settings" and then scrolling down to "Fonts &amp;
-      Colors".
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="external-links" xreflabel="External Links">
-  <title>External Links</title>
-
-    <bridgehead renderas="sect3" id="I-stared-into-the-fontconfig"
-    xreflabel="I stared into the fontconfig">I stared into the fontconfig ...</bridgehead>
-
-    <para>
-      The blog entries by <ulink
-      url="https://eev.ee/blog/2015/05/20/i-stared-into-the-fontconfig-and-the-fontconfig-stared-back-at-me/">Eevee</ulink>
-      are particularly useful if <application>Fontconfig</application> does not
-      think your chosen font supports your language, and for preferring some
-      non-MS Japanese fonts when an ugly MS font is already installed.
-    </para>
-
-    <bridgehead renderas="sect3" id="subpixel-hinting"
-    xreflabel="subpixel-hinting">subpixel-hinting</bridgehead>
-
-    <para>The documentation of the FreeType v40 interpreter at <ulink
-      url="https://freetype.org/freetype2/docs/hinting/subpixel-hinting.html">freetype
-      docs</ulink>
-      explains how the current hinter works, and why the previous (slow) Infinality
-      interpreter was replaced.
-    </para>
-
-    <bridgehead renderas="sect3" id="calc-dpi"
-    xreflabel="calc-dpi">Calculating DPI</bridgehead>
-
-    <para>An old answer at <ulink
-      url="https://askubuntu.com/questions/197828/how-to-find-and-change-the-screen-dpi/">askubuntu</ulink>
-      gives some detail on calculating a screen's dots per inch, but essentially
-      you just measure the width and height of the visible panel, convert to
-      inches if using metric measurements, and divide by the number of pixels.
-      You can then pass <option>-dpi <replaceable>90</replaceable></option> when
-      you start Xorg, using your own value.
-    </para>
-
-    <bridgehead renderas="sect3" id="css-weights"
-    xreflabel="Table of CSS font weights">Table of CSS font weights</bridgehead>
-
-    <para>Perhaps more than you ever wished to know is at <ulink
-      url="https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight">Mozilla
-      CSS docs</ulink>.
-    </para>
-
-    <bridgehead renderas="sect3" id="ttfautohint"
-    xreflabel="Applying autohinting to a font">Applying autohinting to a font</bridgehead>
-
-    <para>
-      If you are using hinting and have a TTF (not OTF) font which lacks hints
-      but permits you to fork it, you might be able to apply hints using <ulink
-      url="https://freetype.org/ttfautohint/">ttfautohint</ulink> which is based
-      on the old autohinter. As of version 1.8.4 it fails to build without Qt5.
-      <!-- switch exists, configure passes but build fails -->
-    </para>
-
-    <bridgehead renderas="sect3" id="arch-fontconfig"
-    xreflabel="Fontconfig in the Arch wiki">Fontconfig in the Arch wiki</bridgehead>
-
-    <para>
-      Arch has a lot of information in its wiki at <ulink
-      url="https://wiki.archlinux.org/index.php/font_configuration">font_configuration</ulink>.
-    </para>
-
-    <bridgehead renderas="sect3" id="gentoo-fontconfig"
-    xreflabel="Fontconfig in the Gentoo wiki">Fontconfig in the Gentoo wiki</bridgehead>
-
-    <para>
-      Gentoo has some information in its wiki at <ulink
-      url="https://wiki.gentoo.org/wiki/Fontconfig">Fontconfig</ulink> although
-      a lot of the details (what to enable, and Infinality) are specific to
-      Gentoo.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: installing/twm.xml
===================================================================
--- x/installing/twm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 twm-download-http "&xorg-download-http;/app/twm-&twm-version;.tar.xz">
-  <!ENTITY twm-download-ftp  " ">
-  <!ENTITY twm-md5sum        "805ee08b5a87e1103dfe2eb925b613b4">
-  <!ENTITY twm-size          "260 KB">
-  <!ENTITY twm-buildsize     "3.8 MB">
-  <!ENTITY twm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="twm" xreflabel="twm-&twm-version;">
-  <?dbhtml filename="twm.html"?>
-
-
-  <title>twm-&twm-version;</title>
-
-  <indexterm zone="twm">
-    <primary sortas="a-twm">twm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to twm</title>
-
-    <para>
-      The <application>twm</application> package contains a very minimal
-      window manager.
-    </para>
-
-    &not-katamari;
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&twm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&twm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &twm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &twm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &twm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &twm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">twm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg-server"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-legacy"/>
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of twm</title>
-
-    <para>
-      Install <application>twm</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i -e '/^rcdir =/s,^\(rcdir = \).*,\1/etc/X11/app-defaults,' src/Makefile.in &amp;&amp;
-./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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <para>
-      <command>sed -i -e '/^rcdir =/s...</command>: This command ensures
-      the <application>twm</application> configuration file gets installed in
-      the proper location.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>twm</seg>
-        <seg>None</seg>
-        <seg>/etc/X11/app-defaults</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="twm-bin">
-        <term><command>twm</command></term>
-        <listitem>
-          <para>
-            is the Tab Window Manager for the X Window System
-          </para>
-          <indexterm zone="twm twm">
-            <primary sortas="b-twm">twm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: installing/util-macros.xml
===================================================================
--- x/installing/util-macros.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 util-macros-download-http "&xorg-download-http;/util/util-macros-&util-macros-version;.tar.xz">
-  <!ENTITY util-macros-download-ftp  " ">
-  <!ENTITY util-macros-md5sum        "35a4f264a9852be4ae66f07d4100356e">
-  <!ENTITY util-macros-size          "84 KB">
-  <!ENTITY util-macros-buildsize     "520 KB">
-  <!ENTITY util-macros-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="util-macros" xreflabel="util-macros-&util-macros-version;">
-  <?dbhtml filename="util-macros.html"?>
-
-
-  <title>util-macros-&util-macros-version;</title>
-
-  <indexterm zone="util-macros">
-    <primary sortas="a-util-macros">util-macros</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to util-macros</title>
-
-    <para>
-      The <application>util-macros</application> package contains the
-      <application>m4</application> macros used by all of the
-      <application>Xorg</application> packages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&util-macros-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&util-macros-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &util-macros-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &util-macros-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &util-macros-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &util-macros-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">util-macros Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg-env"/> (should be set for the following instructions
-      to work)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of util-macros</title>
-
-    <para>
-      Install <application>util-macros</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/share/pkgconfig and
-          <envar>$XORG_PREFIX</envar>/share/util-macros
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,824 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 x7apps-download-http "&xorg-download-http;/app/">
-  <!ENTITY x7apps-download-ftp  " ">
-  <!ENTITY x7apps-size          "4.9 MB">
-  <!-- Ken : reminder to self - this is size of DESTDIR install, plus the
-      downloaded tarballs, plus the *largest* compiled source directory,
-      currently xkbcomp -->
-  <!ENTITY x7apps-buildsize     "48 MB">
-  <!ENTITY x7apps-time          "1.5 SBU (ignoring the time to download)">
-
-  <!ENTITY iceauth-version                 "1.0.10">
-  <!ENTITY iceauth-md5sum                  "30f898d71a7d8e817302970f1976198c">
-
-  <!ENTITY mkfontscale-version             "1.2.3">
-  <!ENTITY mkfontscale-md5sum              "7dcf5f702781bdd4aaff02e963a56270">
-
-  <!ENTITY sessreg-version                 "1.1.3">
-  <!ENTITY sessreg-md5sum                  "05423bb42a006a6eb2c36ba10393de23">
-
-  <!ENTITY setxkbmap-version               "1.3.4">
-  <!ENTITY setxkbmap-md5sum                "1d61c9f4a3d1486eff575bf233e5776c">
-
-  <!ENTITY smproxy-version                 "1.0.7">
-  <!ENTITY smproxy-md5sum                  "9f7a4305f0e79d5a46c3c7d02df9437d">
-
-  <!ENTITY x11perf-version                 "1.6.1">
-  <!ENTITY x11perf-md5sum                  "e96b56756990c56c24d2d02c2964456b">
-
-  <!ENTITY xauth-version                   "1.1.3">
-  <!ENTITY xauth-md5sum                    "595c941d9aff6f6d6e038c4e42dcff58">
-
-  <!ENTITY xbacklight-version              "1.2.3">
-  <!ENTITY xbacklight-md5sum               "5b6405973db69c0443be2fba8e1a8ab7">
-
-  <!ENTITY xcmsdb-version                  "1.0.6">
-  <!ENTITY xcmsdb-md5sum                   "82a90e2feaeab5c5e7610420930cc0f4">
-
-  <!ENTITY xcursorgen-version              "1.0.8">
-  <!ENTITY xcursorgen-md5sum               "89e81a1c31e4a1fbd0e431425cd733d7">
-
-  <!ENTITY xdpyinfo-version                "1.3.4">
-  <!ENTITY xdpyinfo-md5sum                 "933e6d65f96c890f8e96a9f21094f0de">
-
-  <!ENTITY xdriinfo-version                "1.0.7">
-  <!ENTITY xdriinfo-md5sum                 "34aff1f93fa54d6a64cbe4fee079e077">
-
-  <!ENTITY xev-version                     "1.2.6">
-  <!ENTITY xev-md5sum                      "f29d1544f8dd126a1b85e2f7f728672d">
-
-  <!ENTITY xgamma-version                  "1.0.7">
-  <!ENTITY xgamma-md5sum                   "41afaa5a68cdd0de7e7ece4805a37f11">
-
-  <!ENTITY xhost-version                   "1.0.9">
-  <!ENTITY xhost-md5sum                    "48ac13856838d34f2e7fca8cdc1f1699">
-
-  <!ENTITY xinput-version                  "1.6.4">
-  <!ENTITY xinput-md5sum                   "8e4d14823b7cbefe1581c398c6ab0035">
-
-  <!ENTITY xkbcomp-version                 "1.4.7">
-  <!ENTITY xkbcomp-md5sum                  "83d711948de9ccac550d2f4af50e94c3">
-
-  <!ENTITY xkbevd-version                  "1.1.5">
-  <!ENTITY xkbevd-md5sum                   "05ce1abd8533a400572784b1186a44d0">
-
-  <!ENTITY xkbutils-version                "1.0.6">
-  <!ENTITY xkbutils-md5sum                 "07483ddfe1d83c197df792650583ff20">
-
-  <!ENTITY xkill-version                   "1.0.6">
-  <!ENTITY xkill-md5sum                    "f62b99839249ce9a7a8bb71a5bab6f9d">
-
-  <!ENTITY xlsatoms-version                "1.1.4">
-  <!ENTITY xlsatoms-md5sum                 "da5b7a39702841281e1d86b7349a03ba">
-
-  <!ENTITY xlsclients-version              "1.1.5">
-  <!ENTITY xlsclients-md5sum               "ab4b3c47e848ba8c3e47c021230ab23a">
-
-  <!ENTITY xmessage-version                "1.0.7">
-  <!ENTITY xmessage-md5sum                 "ba2dd3db3361e374fefe2b1c797c46eb">
-
-  <!ENTITY xmodmap-version                 "1.0.11">
-  <!ENTITY xmodmap-md5sum                  "0d66e07595ea083871048c4b805d8b13">
-
-  <!ENTITY xpr-version                     "1.2.0">
-  <!ENTITY xpr-md5sum                      "ab6c9d17eb1940afcfb80a72319270ae">
-
-  <!ENTITY xprop-version                   "1.2.7">
-  <!ENTITY xprop-md5sum                    "d050642a667b518cb3429273a59fa36d">
-
-  <!ENTITY xrandr-version                  "1.5.2">
-  <!ENTITY xrandr-md5sum                   "f822a8d5f233e609d27cc22d42a177cb">
-
-  <!ENTITY xrdb-version                    "1.2.2">
-  <!ENTITY xrdb-md5sum                     "c8629d5a0bc878d10ac49e1b290bf453">
-
-  <!ENTITY xrefresh-version                "1.1.0">
-  <!ENTITY xrefresh-md5sum                 "55003733ef417db8fafce588ca74d584">
-
-  <!ENTITY xset-version                    "1.2.5">
-  <!ENTITY xset-md5sum                     "18ff5cdff59015722431d568a5c0bad2">
-
-  <!ENTITY xsetroot-version                "1.1.3">
-  <!ENTITY xsetroot-md5sum                 "fa9a24fe5b1725c52a4566a62dd0a50d">
-
-  <!ENTITY xvinfo-version                  "1.1.5">
-  <!ENTITY xvinfo-md5sum                   "d698862e9cad153c5fefca6eee964685">
-
-  <!ENTITY xwd-version                     "1.0.9">
-  <!ENTITY xwd-md5sum                      "b0081fb92ae56510958024242ed1bc23">
-
-  <!ENTITY xwininfo-version                "1.1.6">
-  <!ENTITY xwininfo-md5sum                 "c91201bc1eb5e7b38933be8d0f7f16a8">
-
-  <!ENTITY xwud-version                    "1.0.6">
-  <!ENTITY xwud-md5sum                     "5ff5dc120e8e927dc3c331c7fee33fc3">
-
-]>
-
-<sect1 id="xorg7-app" xreflabel="Xorg Applications">
-  <?dbhtml filename="x7app.html"?>
-
-
-  <title>Xorg Applications</title>
-
-  <indexterm zone="xorg7-app">
-    <primary sortas="a-xorg7-app">Xorg-&xorg-version; Applications</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Applications</title>
-
-    <para>
-      The <application>Xorg</application> applications provide the
-      expected applications available in previous X Window implementations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&x7apps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&x7apps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &x7apps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &x7apps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &x7apps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="xbitmaps"/>, and
-      <xref linkend="xcb-util"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/> and
-      both <ulink url="https://www.cairographics.org/releases/">cairo-5c</ulink> and
-      <ulink url="https://nickle.org/">Nickle</ulink> (only if you wish to try to
-      run the undocumented <command>xkeyhost</command> script).
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Applications</title>
-
-    <para>
-      First, create a list of files to be downloaded. This file will also
-      be used to verify the integrity of the downloads when complete:
-    </para>
-
-<screen><userinput>cat &gt; app-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&iceauth-md5sum;  iceauth-&iceauth-version;.tar.xz
-&mkfontscale-md5sum;  mkfontscale-&mkfontscale-version;.tar.xz
-&sessreg-md5sum;  sessreg-&sessreg-version;.tar.xz
-&setxkbmap-md5sum;  setxkbmap-&setxkbmap-version;.tar.xz
-&smproxy-md5sum;  smproxy-&smproxy-version;.tar.xz
-&x11perf-md5sum;  x11perf-&x11perf-version;.tar.bz2
-&xauth-md5sum;  xauth-&xauth-version;.tar.xz
-#&xbacklight-md5sum;  xbacklight-&xbacklight-version;.tar.bz2
-&xcmsdb-md5sum;  xcmsdb-&xcmsdb-version;.tar.xz
-&xcursorgen-md5sum;  xcursorgen-&xcursorgen-version;.tar.xz
-&xdpyinfo-md5sum;  xdpyinfo-&xdpyinfo-version;.tar.xz
-&xdriinfo-md5sum;  xdriinfo-&xdriinfo-version;.tar.xz
-&xev-md5sum;  xev-&xev-version;.tar.xz
-&xgamma-md5sum;  xgamma-&xgamma-version;.tar.xz
-&xhost-md5sum;  xhost-&xhost-version;.tar.xz
-&xinput-md5sum;  xinput-&xinput-version;.tar.xz
-&xkbcomp-md5sum;  xkbcomp-&xkbcomp-version;.tar.xz
-&xkbevd-md5sum;  xkbevd-&xkbevd-version;.tar.xz
-&xkbutils-md5sum;  xkbutils-&xkbutils-version;.tar.xz
-&xkill-md5sum;  xkill-&xkill-version;.tar.xz
-&xlsatoms-md5sum;  xlsatoms-&xlsatoms-version;.tar.xz
-&xlsclients-md5sum;  xlsclients-&xlsclients-version;.tar.xz
-&xmessage-md5sum;  xmessage-&xmessage-version;.tar.xz
-&xmodmap-md5sum;  xmodmap-&xmodmap-version;.tar.xz
-&xpr-md5sum;  xpr-&xpr-version;.tar.xz
-&xprop-md5sum;  xprop-&xprop-version;.tar.xz
-&xrandr-md5sum;  xrandr-&xrandr-version;.tar.xz
-&xrdb-md5sum;  xrdb-&xrdb-version;.tar.xz
-&xrefresh-md5sum;  xrefresh-&xrefresh-version;.tar.xz
-&xset-md5sum;  xset-&xset-version;.tar.xz
-&xsetroot-md5sum;  xsetroot-&xsetroot-version;.tar.xz
-&xvinfo-md5sum;  xvinfo-&xvinfo-version;.tar.xz
-&xwd-md5sum;  xwd-&xwd-version;.tar.xz
-&xwininfo-md5sum;  xwininfo-&xwininfo-version;.tar.xz
-&xwud-md5sum;  xwud-&xwud-version;.tar.xz</literal>
-EOF</userinput></screen>
-
-   <!-- Removed because it is also installed with mkfontscale
-   &mkfontdir-md5sum;  mkfontdir-&mkfontdir-version;.tar.bz2
-   -->
-
-    <para>
-      To download the needed files using <xref linkend='wget'/>,
-      use the following commands:
-    </para>
-
-<screen><userinput>mkdir app &amp;&amp;
-cd app &amp;&amp;
-grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
-    -B &xorg-download-http;/app/ &amp;&amp;
-md5sum -c ../app-&xorg-version;.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Applications</title>
-
-&as_root;
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Install all of the packages by running the following commands:
-    </para>
-
-<screen><userinput>for package in $(grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}')
-do
-  packagedir=${package%.tar.?z*}
-  tar -xf $package
-  pushd $packagedir
-     ./configure $XORG_CONFIG
-     make
-     as_root make install
-  popd
-  rm -rf $packagedir
-done</userinput></screen>
-
-    <para>
-      Finally, exit the shell that was started earlier:
-    </para>
-
-<screen><userinput>exit</userinput></screen>
-
-    <para>
-      Unless you installed the optional dependencies, remove an undocumented
-      script which is reported to be broken (<command>xkeystone</command>
-      provided by the <application>xrandr</application> package).
-    </para>
-
-<screen><userinput>as_root rm -f $XORG_PREFIX/bin/xkeystone</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i
-      man/Makefile.in</command>: with <application>gcc-5</application> the
-      behavior of <command>cpp</command> was changed to emit line numbers.
-      That results in unterminated <application>sed</application> commands in
-      <filename>filenames.sed</filename>. Adding <literal>-P</literal> restores
-      the old behavior.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-
-        <seg>iceauth, mkfontdir, mkfontscale, sessreg,
-        setxkbmap, smproxy, x11perf, x11perfcomp, xauth, xbacklight,
-        xcmsdb, xcursorgen, xdpr, xdpyinfo, xdriinfo, xev, xgamma, xhost,
-        xinput, xkbbell, xkbcomp, xkbevd, xkbvleds, xkbwatch, xkill,
-        xlsatoms, xlsclients, xmessage, xmodmap, xpr, xprop, xrandr, xrdb,
-        xrefresh, xset, xsetroot, xvinfo, xwd, xwininfo, and xwud</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="iceauth-x7">
-        <term><command>iceauth</command></term>
-        <listitem>
-          <para>
-            is the ICE authority file utility
-          </para>
-          <indexterm zone="xorg7-app iceauth-x7">
-            <primary sortas="b-iceauth">iceauth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfontdir-x7">
-        <term><command>mkfontdir</command></term>
-        <listitem>
-          <para>
-            creates an index of X font files in a directory
-          </para>
-          <indexterm zone="xorg7-app mkfontdir-x7">
-            <primary sortas="b-mkfontdir">mkfontdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfontscale-x7">
-        <term><command>mkfontscale</command></term>
-        <listitem>
-          <para>
-            creates an index of scalable font files for X
-          </para>
-          <indexterm zone="xorg7-app mkfontscale-x7">
-            <primary sortas="b-mkfontscale">mkfontscale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sessreg-x7">
-        <term><command>sessreg</command></term>
-        <listitem>
-          <para>
-            manages utmp/wtmp entries for non-init clients
-          </para>
-          <indexterm zone="xorg7-app sessreg-x7">
-            <primary sortas="b-sessreg">sessreg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setxkbmap-x7">
-        <term><command>setxkbmap</command></term>
-        <listitem>
-          <para>
-            sets the keyboard using the X Keyboard Extension
-          </para>
-          <indexterm zone="xorg7-app setxkbmap-x7">
-            <primary sortas="b-setxkbmap">setxkbmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smproxy-x7">
-        <term><command>smproxy</command></term>
-        <listitem>
-          <para>
-            is the Session Manager Proxy
-          </para>
-          <indexterm zone="xorg7-app smproxy-x7">
-            <primary sortas="b-smproxy">smproxy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="x11perf-x7">
-        <term><command>x11perf</command></term>
-        <listitem>
-          <para>
-            is an X11 server performance test program
-          </para>
-          <indexterm zone="xorg7-app x11perf-x7">
-            <primary sortas="b-x11perf">x11perf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="x11perfcomp-x7">
-        <term><command>x11perfcomp</command></term>
-        <listitem>
-          <para>
-            is an X11 server performance comparison program
-          </para>
-          <indexterm zone="xorg7-app x11perfcomp-x7">
-            <primary sortas="b-x11perfcomp">x11perfcomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xauth-x7">
-        <term><command>xauth</command></term>
-        <listitem>
-          <para>
-            is the X authority file utility
-          </para>
-          <indexterm zone="xorg7-app xauth-x7">
-            <primary sortas="b-xauth">xauth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xbacklight-x7">
-        <term><command>xbacklight</command></term>
-        <listitem>
-          <para>
-            adjusts backlight brightness using RandR extension
-          </para>
-          <indexterm zone="xorg7-app xbacklight-x7">
-            <primary sortas="b-xbacklight">xbacklight</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xcmsdb-x7">
-        <term><command>xcmsdb</command></term>
-        <listitem>
-          <para>
-            is the Device Color Characterization utility for the X
-            Color Management System
-          </para>
-          <indexterm zone="xorg7-app xcmsdb-x7">
-            <primary sortas="b-xcmsdb">xcmsdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xcursorgen-x7">
-        <term><command>xcursorgen</command></term>
-        <listitem>
-          <para>
-            creates an X cursor file from a collection of PNG images
-          </para>
-          <indexterm zone="xorg7-app xcursorgen-x7">
-            <primary sortas="b-xcursorgen">xcursorgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdpr-x7">
-        <term><command>xdpr</command></term>
-        <listitem>
-          <para>
-            dumps an X window directly to a printer
-          </para>
-          <indexterm zone="xorg7-app xdpr-x7">
-            <primary sortas="b-xdpr">xdpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdpyinfo-x7">
-        <term><command>xdpyinfo</command></term>
-        <listitem>
-          <para>
-            is a display information utility for X
-          </para>
-          <indexterm zone="xorg7-app xdpyinfo-x7">
-            <primary sortas="b-xdpyinfo">xdpyinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdriinfo-x7">
-        <term><command>xdriinfo</command></term>
-        <listitem>
-          <para>
-            queries configuration information of DRI drivers
-          </para>
-          <indexterm zone="xorg7-app xdriinfo-x7">
-            <primary sortas="b-xdriinfo">xdriinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xev-x7">
-        <term><command>xev</command></term>
-        <listitem>
-          <para>
-            prints contents of X events
-          </para>
-          <indexterm zone="xorg7-app xev-x7">
-            <primary sortas="b-xev">xev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xgamma-x7">
-        <term><command>xgamma</command></term>
-        <listitem>
-          <para>
-            alters a monitor's gamma correction through the X server
-          </para>
-          <indexterm zone="xorg7-app xgamma-x7">
-            <primary sortas="b-xgamma">xgamma</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xhost-x7">
-        <term><command>xhost</command></term>
-        <listitem>
-          <para>
-            is a server access control program for X
-          </para>
-          <indexterm zone="xorg7-app xhost-x7">
-            <primary sortas="b-xhost">xhost</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xinput-x7">
-        <term><command>xinput</command></term>
-        <listitem>
-          <para>
-            is a utility to configure and test X input devices
-          </para>
-          <indexterm zone="xorg7-app xinput-x7">
-            <primary sortas="b-xinput">xinput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkbbell-x7">
-        <term><command>xkbbell</command></term>
-        <listitem>
-          <para>
-            is an XKB utility program that raises a bell event
-          </para>
-          <indexterm zone="xorg7-app xkbbell-x7">
-            <primary sortas="b-xkbbell">xkbbell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkbcomp-x7">
-        <term><command>xkbcomp</command></term>
-        <listitem>
-          <para>
-            compiles an XKB keyboard description
-          </para>
-          <indexterm zone="xorg7-app xkbcomp-x7">
-            <primary sortas="b-xkbcomp">xkbcomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkbevd-x7">
-        <term><command>xkbevd</command></term>
-        <listitem>
-          <para>
-            is the XKB event daemon
-          </para>
-          <indexterm zone="xorg7-app xkbevd-x7">
-            <primary sortas="b-xkbevd">xkbevd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkbvleds-x7">
-        <term><command>xkbvleds</command></term>
-        <listitem>
-          <para>
-            shows the XKB status of keyboard LEDs
-          </para>
-          <indexterm zone="xorg7-app xkbvleds-x7">
-            <primary sortas="b-xkbvleds">xkbvleds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkbwatch-x7">
-        <term><command>xkbwatch</command></term>
-        <listitem>
-          <para>
-            monitors modifier keys and LEDs
-          </para>
-          <indexterm zone="xorg7-app xkbwatch-x7">
-            <primary sortas="b-xkbwatch">xkbwatch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkill-x7">
-        <term><command>xkill</command></term>
-        <listitem>
-          <para>
-            kills a client by its X resource
-          </para>
-          <indexterm zone="xorg7-app xkill-x7">
-            <primary sortas="b-xkill">xkill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xlsatoms-x7">
-        <term><command>xlsatoms</command></term>
-        <listitem>
-          <para>
-            lists interned atoms defined on the server
-          </para>
-          <indexterm zone="xorg7-app xlsatoms-x7">
-            <primary sortas="b-xlsatoms">xlsatoms</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xlsclients-x7">
-        <term><command>xlsclients</command></term>
-        <listitem>
-          <para>
-            lists client applications running on a display
-          </para>
-          <indexterm zone="xorg7-app xlsclients-x7">
-            <primary sortas="b-xlsclients">xlsclients</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmessage-x7">
-        <term><command>xmessage</command></term>
-        <listitem>
-          <para>
-            displays a message or query in a window
-          </para>
-          <indexterm zone="xorg7-app xmessage-x7">
-            <primary sortas="b-xmessage">xmessage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmodmap-x7">
-        <term><command>xmodmap</command></term>
-        <listitem>
-          <para>
-            is a utility for modifying keymaps and pointer button
-            mappings in X
-          </para>
-          <indexterm zone="xorg7-app xmodmap-x7">
-            <primary sortas="b-xmodmap">xmodmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpr-x7">
-        <term><command>xpr</command></term>
-        <listitem>
-          <para>
-            prints an X window dump
-          </para>
-          <indexterm zone="xorg7-app xpr-x7">
-            <primary sortas="b-xpr">xpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xprop-x7">
-        <term><command>xprop</command></term>
-        <listitem>
-          <para>
-            is a property displayer for X
-          </para>
-          <indexterm zone="xorg7-app xprop-x7">
-            <primary sortas="b-xprop">xprop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xrandr-x7">
-        <term><command>xrandr</command></term>
-        <listitem>
-          <para>
-            is a primitive command line interface to RandR extension
-          </para>
-          <indexterm zone="xorg7-app xrandr-x7">
-            <primary sortas="b-xrandr">xrandr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xrdb-x7">
-        <term><command>xrdb</command></term>
-        <listitem>
-          <para>
-            is the X server resource database utility
-          </para>
-          <indexterm zone="xorg7-app xrdb-x7">
-            <primary sortas="b-xrdb">xrdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xrefresh-x7">
-        <term><command>xrefresh</command></term>
-        <listitem>
-          <para>
-            refreshes all or part of an X screen
-          </para>
-          <indexterm zone="xorg7-app xrefresh-x7">
-            <primary sortas="b-xrefresh">xrefresh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xset-x7">
-        <term><command>xset</command></term>
-        <listitem>
-          <para>
-            is the user preference utility for X
-          </para>
-          <indexterm zone="xorg7-app xset-x7">
-            <primary sortas="b-xset">xset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xsetroot-x7">
-        <term><command>xsetroot</command></term>
-        <listitem>
-          <para>
-            is the root window parameter setting utility for X
-          </para>
-          <indexterm zone="xorg7-app xsetroot-x7">
-            <primary sortas="b-xsetroot">xsetroot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xvinfo-x7">
-        <term><command>xvinfo</command></term>
-        <listitem>
-          <para>
-            prints out X-Video extension adaptor information
-          </para>
-          <indexterm zone="xorg7-app xvinfo-x7">
-            <primary sortas="b-xvinfo">xvinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xwd-x7">
-        <term><command>xwd</command></term>
-        <listitem>
-          <para>
-            dumps an image of an X window
-          </para>
-          <indexterm zone="xorg7-app xwd-x7">
-            <primary sortas="b-xwd">xwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xwininfo-x7">
-        <term><command>xwininfo</command></term>
-        <listitem>
-          <para>
-            is a window information utility for X
-          </para>
-          <indexterm zone="xorg7-app xwininfo-x7">
-            <primary sortas="b-xwininfo">xwininfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xwud-x7">
-        <term><command>xwud</command></term>
-        <listitem>
-          <para>
-            is an image displayer for X
-          </para>
-          <indexterm zone="xorg7-app xwud-x7">
-            <primary sortas="b-xwud">xwud</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/x7driver-evdev.xml
===================================================================
--- x/installing/x7driver-evdev.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xorg-evdev-driver-version "2.10.6">
-
-  <!ENTITY xorg-evdev-driver-download-http "&xorg-download-http;/driver/xf86-input-evdev-&xorg-evdev-driver-version;.tar.bz2">
-  <!ENTITY xorg-evdev-driver-download-ftp  " ">
-  <!ENTITY xorg-evdev-driver-md5sum        "e8bd1edc6751f92e425cae7eba3c61eb">
-  <!ENTITY xorg-evdev-driver-size          "400 KB">
-  <!ENTITY xorg-evdev-driver-buildsize     "3.9 MB">
-  <!ENTITY xorg-evdev-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg Evdev Driver -->
-  <sect2 id="xorg-evdev-driver" xreflabel="Xorg Evdev Driver-&xorg-evdev-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg Evdev Driver-&xorg-evdev-driver-version;</title>
-
-    <indexterm zone="xorg-evdev-driver">
-      <primary sortas="a-xorg-evdev-driver">xorg-evdev-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Evdev Driver</title>
-
-      <para>
-        The <application>Xorg Evdev Driver</application> package contains a Generic
-        Linux input driver for the Xorg X server. It handles keyboard, mouse, touchpads
-        and wacom devices, though for touchpad and wacom advanced handling,
-        additional drivers are required.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-evdev-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-evdev-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-evdev-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-evdev-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-evdev-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-evdev-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Evdev Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libevdev"/>,
-        <xref linkend="mtdev"/>, and
-        <xref linkend="xorg-server"/>
-      </para>
-<!--
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="mtdev"/>
-      </para>-->
-
-    </sect3>
-<!-- No need to give kernel configuration here, since already done for
-     libevdev. If for any reason you want to uncomment, this configuration
-     is not complete.
-    <sect3 role="kernel" id="xorg-evdev-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  - - -&gt;
-  Input device support - - -&gt;
-    <*> Generic input layer (needed ...) [CONFIG_INPUT]
-    <*>   Event interface                [CONFIG_INPUT_EVDEV]</literal></screen>
-
-      <indexterm zone="xorg-evdev-driver xorg-evdev-driver-kernel">
-        <primary sortas="d-xorg-evdev-driver">xorg-evdev-driver</primary>
-      </indexterm>
-    </sect3>
--->
-    <sect3 role="installation">
-      <title>Installation of Xorg Evdev Driver</title>
-
-      <para>
-        Install <application>Xorg Evdev Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            evdev_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="evdev_drv">
-          <term><filename class="libraryfile">evdev_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for Linux generic event devices
-            </para>
-            <indexterm zone="xorg-evdev-driver evdev_drv">
-              <primary sortas="c-evdev_drv">evdev_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: installing/x7driver-libinput.xml
===================================================================
--- x/installing/x7driver-libinput.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xorg-libinput-driver-version "1.4.0">
-
-  <!ENTITY xorg-libinput-driver-download-http "&xorg-download-http;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.xz">
-  <!ENTITY xorg-libinput-driver-download-ftp  " ">
-  <!ENTITY xorg-libinput-driver-md5sum        "b52a1fc7456cf6595a9a1004287551a3">
-  <!ENTITY xorg-libinput-driver-size          "320 KB">
-  <!ENTITY xorg-libinput-driver-buildsize     "3.9 MB (with tests)">
-  <!ENTITY xorg-libinput-driver-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <!-- Begin Xorg input-libinput Driver -->
-  <sect2 id="xorg-libinput-driver" xreflabel="xorg-libinput-&xorg-libinput-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg Libinput Driver-&xorg-libinput-driver-version;</title>
-
-    <indexterm zone="xorg-libinput-driver">
-      <primary sortas="a-xorg-libinput-driver">xorg-libinput-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Libinput Driver</title>
-
-      <para>
-        The <application>X.Org Libinput Driver</application> is a thin wrapper
-        around libinput and allows for libinput to be used for input devices in
-        X. This driver can be used as drop-in replacement for evdev and
-        synaptics.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-libinput-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-libinput-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-libinput-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-libinput-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-libinput-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-libinput-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Libinput Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libinput"/> and
-        <xref linkend="xorg-server"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Libinput Driver</title>
-
-      <para>
-        Install <application>Xorg Libinput Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        To test the results, issue <command>make check</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            libinput_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libinput_drv">
-          <term><filename class="libraryfile">libinput_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for mouse, keyboard, touchpad,
-              touchscreen, and tablet devices
-            </para>
-            <indexterm zone="xorg-libinput-driver libinput_drv">
-              <primary sortas="c-libinput_drv">libinput_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: installing/x7driver-synaptics.xml
===================================================================
--- x/installing/x7driver-synaptics.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xorg-synaptics-driver-version "1.9.2">
-
-  <!ENTITY xorg-synaptics-driver-download-http "&xorg-download-http;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.xz">
-  <!ENTITY xorg-synaptics-driver-download-ftp  " ">
-  <!ENTITY xorg-synaptics-driver-md5sum        "3b95e7baf4428b114e9910f999e96601">
-  <!ENTITY xorg-synaptics-driver-size          "424 KB">
-  <!ENTITY xorg-synaptics-driver-buildsize     "5.2 MB">
-  <!ENTITY xorg-synaptics-driver-time          "less than 0.1 SBU">
-]>
-
-<!-- Begin Xorg Synaptics Driver -->
-  <sect2 id="xorg-synaptics-driver" xreflabel="Xorg Synaptics Driver-&xorg-synaptics-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg Synaptics Driver-&xorg-synaptics-driver-version;</title>
-
-    <indexterm zone="xorg-synaptics-driver">
-      <primary sortas="a-xorg-synaptics-driver">xorg-synaptics-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Synaptics Driver</title>
-
-      <para>
-        The <application>Xorg Synaptics Driver</application> package contains
-        the X.Org Input Driver, support programs and SDK for Synaptics
-        touchpads. Even though the evdev driver can handle touchpads very well,
-        this driver is required if you want to use advanced features like multi
-        tapping, scrolling with touchpad, turning the touchpad off while
-        typing, etc.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-synaptics-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-synaptics-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-synaptics-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-synaptics-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-synaptics-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-synaptics-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Synaptics Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libevdev"/> and
-        <xref linkend="xorg-server"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Synaptics Driver</title>
-
-      <para>
-        Install <application>Xorg Synaptics Driver</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            synclient and syndaemon
-          </seg>
-          <seg>
-            synaptics_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="synclient">
-          <term><command>synclient</command></term>
-          <listitem>
-            <para>
-              is a command line utility used to query and modify Synaptics
-              driver options
-            </para>
-            <indexterm zone="xorg-synaptics-driver synclient">
-              <primary sortas="b-synclient">synclient</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="syndaemon">
-          <term><command>syndaemon</command></term>
-          <listitem>
-            <para>
-              is a program that monitors keyboard activity and disables the
-              touchpad when the keyboard is being used
-            </para>
-            <indexterm zone="xorg-synaptics-driver syndaemon">
-              <primary sortas="b-syndaemon">syndaemon</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="synaptics_drv">
-          <term><filename class="libraryfile">synaptics_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for touchpads
-            </para>
-            <indexterm zone="xorg-synaptics-driver synaptics_drv">
-              <primary sortas="c-synaptics_drv">synaptics_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: installing/x7driver-wacom-kernel.xml
===================================================================
--- x/installing/x7driver-wacom-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] H<emphasis role='blue'>I</emphasis>D bus support ---&gt;                                         [HID_SUPPORT]
-    {*/M} H<emphasis role='blue'>I</emphasis>D bus core support                                             [HID]
-      <emphasis role='blue'>S</emphasis>pecial HID drivers ---&gt;
-      &lt;*/M&gt;   <emphasis role='blue'>W</emphasis>acom Intuos/Graphire tablet support (USB)             [HID_WACOM]
-    <emphasis role='blue'>U</emphasis>SB HID support ---&gt;
-      &lt;*/M&gt; <emphasis role='blue'>U</emphasis>SB HID transport layer                                    [USB_HID]
-  [*] <emphasis role='blue'>U</emphasis>SB support ---&gt;                                             [USB_SUPPORT]
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>upport for Host-side USB                                        [USB]</screen>
Index: installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xorg-wacom-driver-version "1.2.2">
-
-  <!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        "bd72f813b094b79b450e50a95476977b">
-  <!ENTITY xorg-wacom-driver-size          "636 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "8.1 MB (with tests)">
-  <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with tests)">
-]>
-
-  <!-- Begin Xorg Wacom Driver -->
-  <sect2 id="xorg-wacom-driver" xreflabel="Xorg Wacom Driver-&xorg-wacom-driver-version;">
-
-  <sect2info>
-    <date>$Date$</date>
-  </sect2info>
-
-    <title>Xorg Wacom Driver-&xorg-wacom-driver-version;</title>
-
-    <indexterm zone="xorg-wacom-driver">
-      <primary sortas="a-xorg-wacom-driver">xorg-wacom-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Wacom Driver</title>
-
-      <para>
-        The <application>Xorg Wacom Driver</application> package contains the
-        X.Org X11 driver and SDK for Wacom and Wacom-like tablets. It is not
-        required to use a Wacom tablet, the
-        <application>xf86-input-evdev</application> driver can handle these
-        devices without problems.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-wacom-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-wacom-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-wacom-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-wacom-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-wacom-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-wacom-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Wacom Drivers Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/> and
-        <xref linkend="graphviz"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-wacom-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        To use a Wacom tablet with USB interface, enable the following
-        options in your kernel configuration and recompile. Note that
-        other configuration options could be required for tablet with a
-        serial or bluetooth interface:
-      </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="x7driver-wacom-kernel.xml"/>
-
-      <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
-        <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Wacom Driver</title>
-
-      <para>
-        Install <application>Xorg Wacom Driver</application> by running the following
-        commands:
-      </para>
-
-<screen revision="sysv"><userinput>./configure $XORG_CONFIG --with-systemd-unit-dir=no &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>make check</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            isdv4-serial-debugger, isdv4-serial-inputattach, and xsetwacom
-          </seg>
-          <seg>
-            wacom_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="xsetwacom">
-          <term><command>xsetwacom</command></term>
-          <listitem>
-            <para>
-              is a commandline utility used to query
-              and modify wacom driver settings
-            </para>
-            <indexterm zone="xorg-wacom-driver xsetwacom">
-              <primary sortas="b-xsetwacom">xsetwacom</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="wacom_drv">
-          <term><filename class="libraryfile">wacom_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for Wacom devices
-            </para>
-            <indexterm zone="xorg-wacom-driver wacom_drv">
-              <primary sortas="c-wacom_drv">wacom_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="xorg7-input-driver" xreflabel="Xorg Input Drivers">
-  <?dbhtml filename="x7driver.html"?>
-
-
-  <title>Xorg Input Drivers</title>
-
-  <indexterm zone="xorg7-input-driver">
-    <primary sortas="a-xorg7-input-driver">xorg7-input-driver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Input Drivers</title>
-
-    <para>
-      The <application>Xorg Input Drivers</application> page contains the
-      instructions for building Xorg input drivers that are necessary in
-      order for Xorg Server to respond user inputs.
-    </para>
-
-    <sect3 id="xorg-input-drivers">
-      <title>Xorg Input Drivers</title>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            <xref linkend="libevdev"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <xref linkend="xorg-evdev-driver"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <xref linkend="libinput"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <xref linkend="xorg-libinput-driver"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <xref linkend="xorg-synaptics-driver"/>
-          </para>
-        </listitem>
-        <!-- With Kernel 5.1, VMMouse is now entirely unusable/obsolete.
-        VMWare has a replacement in the kernel that works for both Qemu and
-        VMWare, that allows the VMMouse instruction set to run through
-        EVDEV events.
-        I archived it on 2019-05-19 as a result. - renodr
-        <listitem>
-          <para>
-            <xref linkend="xorg-vmmouse-driver"/>
-          </para>
-        </listitem>
-        -->
-        <listitem>
-          <para>
-            <xref linkend="xorg-wacom-driver"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libevdev.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-evdev.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libinput.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-libinput.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-synaptics.xml"/>
-
- <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-vmmouse.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-wacom.xml"/>
-
-</sect1>
Index: installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 x7fonts-download-http "&xorg-download-http;/font/">
-  <!ENTITY x7fonts-download-ftp  " ">
-  <!ENTITY x7fonts-size          "3.0 MB">
-  <!ENTITY x7fonts-buildsize     "8.8 MB">
-  <!ENTITY x7fonts-time          "0.1 SBU">
-
-  <!ENTITY encodings-version               "1.1.0">
-  <!ENTITY encodings-md5sum                "a56b1a7f2c14173f71f010225fa131f1">
-
-  <!ENTITY font-adobe-utopia-type1-version "1.0.5">
-  <!ENTITY font-adobe-utopia-type1-md5sum  "546d17feab30d4e3abcf332b454f58ed">
-
-  <!ENTITY font-alias-version              "1.0.5">
-  <!ENTITY font-alias-md5sum               "79f4c023e27d1db1dfd90d041ce89835">
-
-  <!ENTITY font-bh-ttf-version             "1.0.4">
-  <!ENTITY font-bh-ttf-md5sum              "063bfa1456c8a68208bf96a33f472bb1">
-
-  <!ENTITY font-bh-type1-version           "1.0.4">
-  <!ENTITY font-bh-type1-md5sum            "51a17c981275439b85e15430a3d711ee">
-
-  <!ENTITY font-ibm-type1-version          "1.0.4">
-  <!ENTITY font-ibm-type1-md5sum           "00f64a84b6c9886040241e081347a853">
-
-  <!ENTITY font-misc-ethiopic-version      "1.0.5">
-  <!ENTITY font-misc-ethiopic-md5sum       "fe972eaf13176fa9aa7e74a12ecc801a">
-
-  <!ENTITY font-util-version               "1.4.1">
-  <!ENTITY font-util-md5sum                "a6541d12ceba004c0c1e3df900324642">
-
-  <!ENTITY font-xfree86-type1-version      "1.0.5">
-  <!ENTITY font-xfree86-type1-md5sum       "3b47fed2c032af3a32aad9acc1d25150">
-
-]>
-
-<sect1 id="xorg7-font" xreflabel="Xorg Fonts">
-  <?dbhtml filename="x7font.html"?>
-
-
-  <title>Xorg Fonts</title>
-
-  <indexterm zone="xorg7-font">
-    <primary sortas="a-xorg7-font">Xorg Fonts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Fonts</title>
-
-    <para>
-      The <application>Xorg</application> font packages provide some scalable
-      fonts and supporting packages for <application>Xorg</application>
-      applications. Many people will want to install other TTF or OTF fonts in
-      addition to, or instead of, these. Some are listed at <xref
-      linkend="TTF-and-OTF-fonts"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&x7fonts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&x7fonts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &x7fonts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &x7fonts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &x7fonts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Fonts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xcursor-themes"/>
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Fonts</title>
-
-    <para>
-      First, create a list of files to be downloaded. This file will also
-      be used to verify the integrity of the downloads when complete:
-    </para>
-
-<screen><userinput>cat &gt; font-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&font-util-md5sum;  font-util-&font-util-version;.tar.xz
-&encodings-md5sum;  encodings-&encodings-version;.tar.xz
-&font-alias-md5sum;  font-alias-&font-alias-version;.tar.xz
-&font-adobe-utopia-type1-md5sum;  font-adobe-utopia-type1-&font-adobe-utopia-type1-version;.tar.xz
-&font-bh-ttf-md5sum;  font-bh-ttf-&font-bh-ttf-version;.tar.xz
-&font-bh-type1-md5sum;  font-bh-type1-&font-bh-type1-version;.tar.xz
-&font-ibm-type1-md5sum;  font-ibm-type1-&font-ibm-type1-version;.tar.xz
-&font-misc-ethiopic-md5sum;  font-misc-ethiopic-&font-misc-ethiopic-version;.tar.xz
-&font-xfree86-type1-md5sum;  font-xfree86-type1-&font-xfree86-type1-version;.tar.xz</literal>
-EOF</userinput></screen>
-
-    <para>
-      To download the needed files using <xref linkend='wget'/>,
-      use the following commands:
-    </para>
-
-<screen><userinput>mkdir font &amp;&amp;
-cd font &amp;&amp;
-grep -v '^#' ../font-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
-    -B &xorg-download-http;/font/ &amp;&amp;
-md5sum -c ../font-&xorg-version;.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Fonts</title>
-
-&as_root;
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Install all of the packages by running the following commands:
-    </para>
-
-<screen><userinput>for package in $(grep -v '^#' ../font-&xorg-version;.md5 | awk '{print $2}')
-do
-  packagedir=${package%.tar.?z*}
-  tar -xf $package
-  pushd $packagedir
-    ./configure $XORG_CONFIG
-    make
-    as_root make install
-  popd
-  as_root rm -rf $packagedir
-done</userinput></screen>
-
-    <para>
-      Finally, exit the shell that was started earlier:
-    </para>
-
-<screen><userinput>exit</userinput></screen>
-
-    <para>
-      When all of the fonts have been installed, the system must be
-      configured so that <application>Fontconfig</application> can find the
-      TrueType fonts. Since the fonts are outside of the default search path of
-      several packages <emphasis role="bold">if <envar>XORG_PREFIX</envar> is
-      not <filename class="directory">/usr</filename></emphasis>, make symlinks
-      to the <application>Xorg</application> TrueType font directories in
-      <filename class="directory">/usr/share/fonts</filename> by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/fonts                               &amp;&amp;
-ln -svfn $XORG_PREFIX/share/fonts/X11/OTF /usr/share/fonts/X11-OTF &amp;&amp;
-ln -svfn $XORG_PREFIX/share/fonts/X11/TTF /usr/share/fonts/X11-TTF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bdftruncate and ucs2any</seg>
-        <seg>None</seg>
-        <seg><envar>$XORG_PREFIX</envar>/share/fonts</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bdftruncate-x7">
-        <term><command>bdftruncate</command></term>
-        <listitem>
-          <para>
-            generates a truncated BDF font from an ISO 10646-1 encoded BDF font
-          </para>
-          <indexterm zone="xorg7-font bdftruncate-x7">
-            <primary sortas="b-bdftruncate">bdftruncate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ucs2any-x7">
-        <term><command>ucs2any</command></term>
-        <listitem>
-          <para>
-            generates BDF fonts in any encoding from an ISO 10646-1 encoded
-            BDF font
-          </para>
-          <indexterm zone="xorg7-font ucs2any-x7">
-            <primary sortas="b-ucs2any">ucs2any</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/x7legacy.xml
===================================================================
--- x/installing/x7legacy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 x7legacy-download-http "&xorg-download-http;/">
-  <!ENTITY x7legacy-download-ftp  " ">
-  <!ENTITY x7legacy-size          "4.2 MB">
-  <!ENTITY x7legacy-buildsize     "30 MB"> <!-- daewoo is largest build dir -->
-  <!ENTITY x7legacy-time          "0.3 SBU">
-
-  <!ENTITY bdftopcf-version                "1.1.1">
-  <!ENTITY bdftopcf-md5sum                 "e09b61567ab4a4d534119bba24eddfb1">
-
-  <!ENTITY font-adobe-100dpi-version       "1.0.4">
-  <!ENTITY font-adobe-100dpi-md5sum        "20239f6f99ac586f10360b0759f73361">
-
-  <!ENTITY font-adobe-75dpi-version        "1.0.4">
-  <!ENTITY font-adobe-75dpi-md5sum         "2dc044f693ee8e0836f718c2699628b9">
-
-  <!ENTITY font-jis-misc-version           "1.0.4">
-  <!ENTITY font-jis-misc-md5sum            "2c939d5bd4609d8e284be9bef4b8b330">
-
-  <!ENTITY font-daewoo-misc-version        "1.0.4">
-  <!ENTITY font-daewoo-misc-md5sum         "6300bc99a1e45fbbe6075b3de728c27f">
-
-  <!ENTITY font-isas-misc-version          "1.0.4">
-  <!ENTITY font-isas-misc-md5sum           "fe2c44307639062d07c6e9f75f4d6a13">
-
-  <!ENTITY font-misc-misc-version          "1.1.3">
-  <!ENTITY font-misc-misc-md5sum           "145128c4b5f7820c974c8c5b9f6ffe94">
-]>
-
-<sect1 id="xorg7-legacy" xreflabel="Xorg Legacy Fonts">
-  <?dbhtml filename="x7legacy.html"?>
-
-
-  <title>Xorg Legacy</title>
-
-  <indexterm zone="xorg7-legacy">
-    <primary sortas="a-xorg7-legacy">Xorg Legacy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Legacy</title>
-
-    <para>
-      <application>Xorg</application>&apos;s ancestor (X11R1, in 1987) at
-      first only provided bitmap fonts, with a tool
-      (<command>bdftopcf</command>) to assist in their installation. With the
-      introduction of <application>xorg-server-1.19.0</application> and
-      <application>libXfont2</application> many people will not need them.
-      There are still a few old packages which might require, or benefit from,
-      these deprecated fonts and so the following packages are shown here.
-    </para>
-
-    <note>
-      <para>
-        The font-adobe-100dpi package installs 100 dots per inch versions of
-        Courier, Helvetica, New Century Schoolbook and Times fonts.
-      </para>
-
-      <para>
-        The remaining font packages here provide 75dpi versions of those fonts,
-        and various miscellaneous fonts - mostly for legacy encodings. Those are
-        primarily to silence warnings when testing Xorg. In previous versions
-        of BLFS a lot more legacy fonts were installed.
-      </para>
-
-      <para revision="sysv">
-        Please consult the BLFS-7.10 book at <ulink
-        url="https://www.linuxfromscratch.org/blfs/view/7.10/x/x7font.html"/>
-        if you wish to install any of those other fonts.
-      </para>
-
-      <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"/>
-        if you wish to install any of those other fonts.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&x7legacy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&x7legacy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &x7legacy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &x7legacy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &x7legacy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Legacy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-font"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Legacy</title>
-
-    <para>
-      First, create a list of files to be downloaded. This file will also
-      be used to verify the integrity of the downloads when complete:
-    </para>
-
-<screen><userinput>cat &gt; legacy.dat &lt;&lt; "EOF"
-<literal>&bdftopcf-md5sum; util/ bdftopcf-&bdftopcf-version;.tar.xz
-&font-adobe-100dpi-md5sum; font/ font-adobe-100dpi-&font-adobe-100dpi-version;.tar.xz
-&font-adobe-75dpi-md5sum; font/ font-adobe-75dpi-&font-adobe-75dpi-version;.tar.xz
-&font-jis-misc-md5sum; font/ font-jis-misc-&font-jis-misc-version;.tar.xz
-&font-daewoo-misc-md5sum; font/ font-daewoo-misc-&font-daewoo-misc-version;.tar.xz
-&font-isas-misc-md5sum; font/ font-isas-misc-&font-isas-misc-version;.tar.xz
-&font-misc-misc-md5sum; font/ font-misc-misc-&font-misc-misc-version;.tar.xz</literal>
-EOF</userinput></screen>
-
-    <para>
-      To download the needed files using <xref linkend='wget'/>,
-      use the following commands:
-    </para>
-
-<screen><userinput>mkdir legacy &amp;&amp;
-cd    legacy &amp;&amp;
-grep -v '^#' ../legacy.dat | awk '{print $2$3}' | wget -i- -c \
-     -B &xorg-download-http;/ &amp;&amp;
-grep -v '^#' ../legacy.dat | awk '{print $1 " " $3}' > ../legacy.md5 &amp;&amp;
-md5sum -c ../legacy.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Legacy</title>
-
-&as_root;
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Install all of the packages by running the following commands:
-    </para>
-
-<screen><userinput>for package in $(grep -v '^#' ../legacy.md5 | awk '{print $2}')
-do
-  packagedir=${package%.tar.?z*}
-  tar -xf $package
-  pushd $packagedir
-    ./configure $XORG_CONFIG
-    make
-    as_root make install
-  popd
-  rm -rf $packagedir
-  as_root /sbin/ldconfig
-done</userinput></screen>
-
-    <para>
-      Finally, exit the shell that was started earlier:
-    </para>
-
-<screen><userinput>exit</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bdftopcf</seg>
-        <seg>None</seg>
-        <seg><envar>$XORG_PREFIX</envar>/share/fonts/100dpi,
-             <envar>$XORG_PREFIX</envar>/share/fonts/75dpi,
-             <envar>$XORG_PREFIX</envar>/share/fonts/misc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bdftopcf-x7">
-        <term><command>bdftopcf</command></term>
-        <listitem>
-          <para>
-            converts an X font from Bitmap Distribution Format to Portable
-            Compiled Format
-          </para>
-          <indexterm zone="xorg7-legacy bdftopcf-x7">
-            <primary sortas="b-bdftopcf">bdftopcf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,887 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 x7libs-download-http "&xorg-download-http;/lib/">
-  <!ENTITY x7libs-download-ftp  " ">
-  <!ENTITY x7libs-size          "12 MB">
-  <!ENTITY x7libs-buildsize     "225 MB (34 MB installed) - if source directories not deleted">
-  <!ENTITY x7libs-time          "2.1 SBU">
-
-  <!ENTITY xtrans-version                  "1.5.0">
-  <!ENTITY xtrans-md5sum                   "12344cd74a1eb25436ca6e6a2cf93097">
-
-  <!ENTITY libX11-version                  "1.8.9">
-  <!ENTITY libX11-md5sum                   "b006876e5b749d82801fe9450d700daf">
-
-  <!ENTITY libXext-version                 "1.3.6">
-  <!ENTITY libXext-md5sum                  "e59476db179e48c1fb4487c12d0105d1">
-
-  <!ENTITY libFS-version                   "1.0.9">
-  <!ENTITY libFS-md5sum                    "742863a552ecd53cdb957b7b276213cc">
-
-  <!ENTITY libICE-version                  "1.1.1">
-  <!ENTITY libICE-md5sum                   "b444a0e4c2163d1bbc7b046c3653eb8d">
-
-  <!ENTITY libSM-version                   "1.2.4">
-  <!ENTITY libSM-md5sum                    "ffa434ed96ccae45533b3d653300730e">
-
-  <!ENTITY libXScrnSaver-version           "1.2.4">
-  <!ENTITY libXScrnSaver-md5sum            "e613751d38e13aa0d0fd8e0149cec057">
-
-  <!ENTITY libXt-version                   "1.3.0">
-  <!ENTITY libXt-md5sum                    "4ea21d3b5a36d93a2177d9abed2e54d4">
-
-  <!ENTITY libXmu-version                  "1.2.1">
-  <!ENTITY libXmu-md5sum                   "85edefb7deaad4590a03fccba517669f">
-
-  <!ENTITY libXpm-version                  "3.5.17">
-  <!ENTITY libXpm-md5sum                   "05b5667aadd476d77e9b5ba1a1de213e">
-
-  <!ENTITY libXaw-version                  "1.0.16">
-  <!ENTITY libXaw-md5sum                   "2a9793533224f92ddad256492265dd82">
-
-  <!ENTITY libXfixes-version               "6.0.1">
-  <!ENTITY libXfixes-md5sum                "65b9ba1e9ff3d16c4fa72915d4bb585a">
-
-  <!ENTITY libXcomposite-version           "0.4.6">
-  <!ENTITY libXcomposite-md5sum            "af0a5f0abb5b55f8411cd738cf0e5259">
-
-  <!ENTITY libXrender-version              "0.9.11">
-  <!ENTITY libXrender-md5sum               "ebf7fb3241ec03e8a3b2af72f03b4631">
-
-  <!ENTITY libXcursor-version              "1.2.2">
-  <!ENTITY libXcursor-md5sum               "bf3a43ad8cb91a258b48f19c83af8790">
-
-  <!ENTITY libXdamage-version              "1.1.6">
-  <!ENTITY libXdamage-md5sum               "ca55d29fa0a8b5c4a89f609a7952ebf8">
-
-  <!ENTITY libfontenc-version              "1.1.8">
-  <!ENTITY libfontenc-md5sum               "8816cc44d06ebe42e85950b368185826">
-
-  <!ENTITY libXfont2-version               "2.0.6">
-  <!ENTITY libXfont2-md5sum                "c179daa707f5f432f1bc13977e5bb329">
-
-  <!ENTITY libXft-version                  "2.3.8">
-  <!ENTITY libXft-md5sum                   "cea0a3304e47a841c90fbeeeb55329ee">
-
-  <!ENTITY libXi-version                   "1.8.1">
-  <!ENTITY libXi-md5sum                    "89ac74ad6829c08d5c8ae8f48d363b06">
-
-  <!ENTITY libXinerama-version             "1.1.5">
-  <!ENTITY libXinerama-md5sum              "228c877558c265d2f63c56a03f7d3f21">
-
-  <!ENTITY libXrandr-version               "1.5.4">
-  <!ENTITY libXrandr-md5sum                "24e0b72abe16efce9bf10579beaffc27">
-
-  <!ENTITY libXres-version                 "1.2.2">
-  <!ENTITY libXres-md5sum                  "66c9e9e01b0b53052bb1d02ebf8d7040">
-
-  <!ENTITY libXtst-version                 "1.2.4">
-  <!ENTITY libXtst-md5sum                  "02f128fbf809aa9c50d6e54c8e57cb2e">
-
-  <!ENTITY libXv-version                   "1.0.12">
-  <!ENTITY libXv-md5sum                    "70bfdd14ca1a563c218794413f0c1f42">
-
-  <!ENTITY libXvMC-version                 "1.0.14">
-  <!ENTITY libXvMC-md5sum                  "a90a5f01102dc445c7decbbd9ef77608">
-
-  <!ENTITY libXxf86dga-version             "1.1.6">
-  <!ENTITY libXxf86dga-md5sum              "74d1acf93b83abeb0954824da0ec400b">
-
-  <!ENTITY libXxf86vm-version              "1.1.5">
-  <!ENTITY libXxf86vm-md5sum               "5b913dac587f2de17a02e17f9a44a75f">
-
-  <!ENTITY libpciaccess-version            "0.18.1">
-  <!ENTITY libpciaccess-md5sum             "57c7efbeceedefde006123a77a7bc825">
-
-  <!ENTITY libxkbfile-version              "1.1.3">
-  <!ENTITY libxkbfile-md5sum               "229708c15c9937b6e5131d0413474139">
-
-  <!ENTITY libxshmfence-version            "1.3.2">
-  <!ENTITY libxshmfence-md5sum             "faa74f7483074ce7d4349e6bdc237497">
-
-  <!ENTITY libXpresent-version             "1.0.1">
-  <!ENTITY libXpresent-md5sum              "bdd3ec17c6181fd7b26f6775886c730d">
-]>
-
-<sect1 id="xorg7-lib" xreflabel="Xorg Libraries">
-  <?dbhtml filename="x7lib.html"?>
-
-
-  <title>Xorg Libraries</title>
-
-  <indexterm zone="xorg7-lib">
-    <primary sortas="a-xorg7-lib">Xorg Libraries</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Libraries</title>
-
-    <para>
-      The <application>Xorg</application> libraries provide library
-      routines that are used within all X Window applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&x7libs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&x7libs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &x7libs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &x7libs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &x7libs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fontconfig"/> and
-      <xref linkend="libxcb"/>
-    </para>
-    <!-- not needed for libraries, only used by xorg-server later
-    <bridgehead renderas="sect4" revision="sysv">Recommended</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref linkend="elogind"/>
-    </para>
-    -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/>,
-      <xref linkend="xmlto"/> with one or more of the following:
-      <xref linkend="fop"/>,
-      <xref linkend="Links"/>,
-      <xref linkend="lynx"/>,
-      <ulink url="https://github.com/vapier/ncompress">ncompress</ulink> (for some tests), and
-      <ulink url="&w3m-url;">W3m</ulink> (to generate additional PDF or text
-      documentation for the libXfont package).
-    </para>
-
-    <bridgehead renderas="sect4" revision="systemd">Recommended at runtime</bridgehead>
-    <para role="recommended" revision="systemd">
-      <xref role="runtime" linkend="dbus"/>
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Libraries</title>
-
-    <para>
-      First, create a list of files to be downloaded. This file will also
-      be used to verify the integrity of the downloads when complete:
-    </para>
-
-<screen><userinput>cat &gt; lib-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&xtrans-md5sum;  xtrans-&xtrans-version;.tar.xz
-&libX11-md5sum;  libX11-&libX11-version;.tar.xz
-&libXext-md5sum;  libXext-&libXext-version;.tar.xz
-&libFS-md5sum;  libFS-&libFS-version;.tar.xz
-&libICE-md5sum;  libICE-&libICE-version;.tar.xz
-&libSM-md5sum;  libSM-&libSM-version;.tar.xz
-&libXScrnSaver-md5sum;  libXScrnSaver-&libXScrnSaver-version;.tar.xz
-&libXt-md5sum;  libXt-&libXt-version;.tar.xz
-&libXmu-md5sum;  libXmu-&libXmu-version;.tar.xz
-&libXpm-md5sum;  libXpm-&libXpm-version;.tar.xz
-&libXaw-md5sum;  libXaw-&libXaw-version;.tar.xz
-&libXfixes-md5sum;  libXfixes-&libXfixes-version;.tar.xz
-&libXcomposite-md5sum;  libXcomposite-&libXcomposite-version;.tar.xz
-&libXrender-md5sum;  libXrender-&libXrender-version;.tar.xz
-&libXcursor-md5sum;  libXcursor-&libXcursor-version;.tar.xz
-&libXdamage-md5sum;  libXdamage-&libXdamage-version;.tar.xz
-&libfontenc-md5sum;  libfontenc-&libfontenc-version;.tar.xz
-&libXfont2-md5sum;  libXfont2-&libXfont2-version;.tar.xz
-&libXft-md5sum;  libXft-&libXft-version;.tar.xz
-&libXi-md5sum;  libXi-&libXi-version;.tar.xz
-&libXinerama-md5sum;  libXinerama-&libXinerama-version;.tar.xz
-&libXrandr-md5sum;  libXrandr-&libXrandr-version;.tar.xz
-&libXres-md5sum;  libXres-&libXres-version;.tar.xz
-&libXtst-md5sum;  libXtst-&libXtst-version;.tar.xz
-&libXv-md5sum;  libXv-&libXv-version;.tar.xz
-&libXvMC-md5sum;  libXvMC-&libXvMC-version;.tar.xz
-&libXxf86dga-md5sum;  libXxf86dga-&libXxf86dga-version;.tar.xz
-&libXxf86vm-md5sum;  libXxf86vm-&libXxf86vm-version;.tar.xz
-&libpciaccess-md5sum;  libpciaccess-&libpciaccess-version;.tar.xz
-&libxkbfile-md5sum;  libxkbfile-&libxkbfile-version;.tar.xz
-&libxshmfence-md5sum;  libxshmfence-&libxshmfence-version;.tar.xz
-&libXpresent-md5sum;  libXpresent-&libXpresent-version;.tar.xz</literal>
-EOF</userinput></screen>
-
-    <para>
-      To download the needed files using <xref linkend='wget'/>,
-      use the following commands:
-    </para>
-
-<screen><userinput>mkdir lib &amp;&amp;
-cd lib &amp;&amp;
-grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
-    -B &xorg-download-http;/lib/ &amp;&amp;
-md5sum -c ../lib-&xorg-version;.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Libraries</title>
-
-&as_root;
-
-    <para>
-      Some libraries come with a test suite. If you wish to execute them,
-      either comment out the <command>rm -rf ...</command> below, so that,
-      after all libraries are installed, you can come back to the corresponding
-      directory and run <command>make check</command>, or do individual builds,
-      running the tests for each of those distributed with working test suites.
-      Alternatively, you can uncomment the line #<command>make check
-      ...</command>, and at the end, check the test results with:
-    </para>
-
-<screen><userinput>grep -A9 summary *make_check.log</userinput></screen>
-
-    <para>
-      BLFS developers have confirmed that <application>libX11</application>,
-      <application>libXt</application>, <application>libXmu</application>,
-      <application>libXpm</application>, and
-      <application>libxshmfence</application> are distributed with working test
-      suites.
-    </para>
-
-    <para>
-      First, start a subshell that will exit on error:
-    </para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>
-      Install all of the packages by running the following commands:
-    </para>
-
-<screen><userinput>for package in $(grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}')
-do
-  packagedir=${package%.tar.?z*}
-  echo "Building $packagedir"
-
-  tar -xf $package
-  pushd $packagedir
-  docdir="--docdir=$XORG_PREFIX/share/doc/$packagedir"
-  
-  case $packagedir in
-    libXfont2-[0-9]* )
-      ./configure $XORG_CONFIG $docdir --disable-devel-docs
-    ;;
-
-    libXt-[0-9]* )
-      ./configure $XORG_CONFIG $docdir \
-                  --with-appdefaultdir=/etc/X11/app-defaults
-    ;;
-
-    libXpm-[0-9]* )
-      ./configure $XORG_CONFIG $docdir --disable-open-zfile
-    ;;
-  
-    libpciaccess* )
-      mkdir build
-      cd    build
-        meson setup --prefix=$XORG_PREFIX --buildtype=release ..
-        ninja
-        #ninja test
-        as_root ninja install
-      popd     # $packagedir
-      continue # for loop
-    ;;
-
-    * )
-      ./configure $XORG_CONFIG $docdir
-    ;;
-  esac
-
-  make
-  #make check 2>&amp;1 | tee ../$packagedir-make_check.log
-  as_root make install
-  popd
-  rm -rf $packagedir
-  as_root /sbin/ldconfig
-done</userinput></screen>
-
-    <para>
-      Finally, exit the shell that was started earlier:
-    </para>
-
-<screen><userinput>exit</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>./configure $XORG_CONFIG - -disable-thread-safety-constructor</command>:
-      This fixes a bug in (at least) XFCE at runtime.
-    </para>
--->
-
-    <para>
-      <parameter>--disable-open-zfile</parameter>: Allow
-      <application>libXpm</application> to build without the
-      optional <command>compress</command> command present.
-    </para>
-
-    <para>
-      <parameter>--disable-devel-docs</parameter>: Disable generation of
-      text documentation in the libXfont2 package if
-      <xref linkend="xmlto"/> is installed without a text browser. Omit this
-      parameter (or the entire <command>case</command> statement) if a text
-      browser is installed.
-    </para>
-
-    <para>
-      <option>--with-fop</option>: Use <xref linkend="fop"/> to
-      generate PDF documentation (only for the libXfont package).
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuration of Xorg Libraries</title>
-
-    <para>
-      If you've chosen to install <application>Xorg</application> into
-      <filename class="directory">/usr</filename>, then no further
-      configuration is necessary and you can skip the rest of this section.
-      If you've opted for an alternate prefix, you should create two symlinks
-      to satisfy the expected environment of several packages.
-      Execute the following commands as the root user:
-    </para>
-
-<screen role="root"><userinput>ln -sv $XORG_PREFIX/lib/X11 /usr/lib/X11 &amp;&amp;
-ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cxpm and sxpm
-        </seg>
-        <seg>
-          libfontenc.so, libFS.so, libICE.so,
-          libpciaccess.so, libSM.so, libX11.so, libX11-xcb, libXaw6.so,
-          libXaw7.so, libXaw.so, libXcomposite.so,
-          libXcursor.so, libXdamage.so, libXext.so,
-          libXfixes.so, libXfont2.so, libXft.so, libXinerama.so,
-          libXi.so, libxkbfile.so, libXmu.so, libXmuu.so,
-          libXpm.so, libXpresent.so, libXrandr.so, libXrender.so, libXRes.so,
-          libxshmfence.so, libXss.so, libXt.so, libXtst.so, libXvMC.so,
-          libXvMCW.so, libXv.so, libXxf86dga.so and
-          libXxf86vm.so
-        </seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/include/X11/fonts,
-          <envar>$XORG_PREFIX</envar>/include/X11/ICE,
-          <envar>$XORG_PREFIX</envar>/include/X11/SM,
-          <envar>$XORG_PREFIX</envar>/include/X11/Xmu,
-          <envar>$XORG_PREFIX</envar>/include/X11/Xtrans,
-          <envar>$XORG_PREFIX</envar>/share/doc/libFS,
-          <envar>$XORG_PREFIX</envar>/share/doc/libICE-&libICE-version;,
-          <envar>$XORG_PREFIX</envar>/share/doc/libSM-&libSM-version;,
-          <envar>$XORG_PREFIX</envar>/share/doc/libX11-&libX11-version;,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXaw,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXext,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXi,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXmu-&libXmu-version;,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXrender,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXt,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXtst,
-          <envar>$XORG_PREFIX</envar>/share/doc/libXvMC,
-          <envar>$XORG_PREFIX</envar>/share/doc/xtrans and
-          <envar>$XORG_PREFIX</envar>/share/X11/locale
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cxpm">
-        <term><command>cxpm</command></term>
-        <listitem>
-          <para>
-            checks the format of an XPM file
-          </para>
-          <indexterm zone="xorg7-lib cxpm">
-            <primary sortas="b-cxpm">cxpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sxpm">
-        <term><command>sxpm</command></term>
-        <listitem>
-          <para>
-            shows an XPM file and/or converts XPM 1 or 2 files to XPM 3
-          </para>
-          <indexterm zone="xorg7-lib sxpm">
-            <primary sortas="b-sxpm">sxpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfontenc">
-        <term><filename class="libraryfile">libfontenc.so</filename></term>
-        <listitem>
-          <para>
-            is the X11 font encoding library
-          </para>
-          <indexterm zone="xorg7-lib libfontenc">
-            <primary sortas="c-libfontenc">libfontenc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libFS">
-        <term><filename class="libraryfile">libFS.so</filename></term>
-        <listitem>
-          <para>
-            is the library interface to the X Font Server
-          </para>
-          <indexterm zone="xorg7-lib libFS">
-            <primary sortas="c-libFS">libFS.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libICE">
-        <term><filename class="libraryfile">libICE.so</filename></term>
-        <listitem>
-          <para>
-            is the X Inter Client Exchange Library
-          </para>
-          <indexterm zone="xorg7-lib libICE">
-            <primary sortas="c-libICE">libICE.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpciaccess">
-        <term><filename class="libraryfile">libpciaccess.so</filename></term>
-        <listitem>
-          <para>
-            is the generic PCI Access library for X
-          </para>
-          <indexterm zone="xorg7-lib libpciaccess">
-            <primary sortas="c-libpciaccess">libpciaccess.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSM">
-        <term><filename class="libraryfile">libSM.so</filename></term>
-        <listitem>
-          <para>
-            is the X Session Management Library
-          </para>
-          <indexterm zone="xorg7-lib libSM">
-            <primary sortas="c-libSM">libSM.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libX11">
-        <term><filename class="libraryfile">libX11.so</filename></term>
-        <listitem>
-          <para>
-            is the Xlib Library
-          </para>
-          <indexterm zone="xorg7-lib libX11">
-            <primary sortas="c-libX11">libX11.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXaw6">
-        <term><filename class="libraryfile">libXaw6.so</filename></term>
-        <listitem>
-          <para>
-            is the X Athena Widgets Library, version 6
-          </para>
-          <indexterm zone="xorg7-lib libXaw6">
-            <primary sortas="c-libXaw6">libXaw6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXaw7">
-        <term><filename class="libraryfile">libXaw7.so</filename></term>
-        <listitem>
-          <para>
-            is the X Athena Widgets Library, version 7
-          </para>
-          <indexterm zone="xorg7-lib libXaw7">
-            <primary sortas="c-libXaw7">libXaw7.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXaw">
-        <term><filename class="libraryfile">libXaw.so</filename></term>
-        <listitem>
-          <para>
-            are symbolic links to the current X Athena Widgets Library,
-            version 7
-          </para>
-          <indexterm zone="xorg7-lib libXaw">
-            <primary sortas="c-libXaw">libXaw.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXcomposite">
-        <term><filename class="libraryfile">libXcomposite.so</filename></term>
-        <listitem>
-          <para>
-            is the X Composite Library
-          </para>
-          <indexterm zone="xorg7-lib libXcomposite">
-            <primary sortas="c-libXcomposite">libXcomposite.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXcursor">
-        <term><filename class="libraryfile">libXcursor.so</filename></term>
-        <listitem>
-          <para>
-            is the X Cursor management library
-          </para>
-          <indexterm zone="xorg7-lib libXcursor">
-            <primary sortas="c-libXcursor">libXcursor.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXdamage">
-        <term><filename class="libraryfile">libXdamage.so</filename></term>
-        <listitem>
-          <para>
-            is the X Damage Library
-          </para>
-          <indexterm zone="xorg7-lib libXdamage">
-            <primary sortas="c-libXdamage">libXdamage.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXext">
-        <term><filename class="libraryfile">libXext.so</filename></term>
-        <listitem>
-          <para>
-            is the Misc X Extension Library
-          </para>
-          <indexterm zone="xorg7-lib libXext">
-            <primary sortas="c-libXext">libXext.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXfixes">
-        <term><filename class="libraryfile">libXfixes.so</filename></term>
-        <listitem>
-          <para>
-            provides augmented versions of core protocol requests
-          </para>
-          <indexterm zone="xorg7-lib libXfixes">
-            <primary sortas="c-libXfixes">libXfixes.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXfont2">
-        <term><filename class="libraryfile">libXfont2.so</filename></term>
-        <listitem>
-          <para>
-            is the X font library
-          </para>
-          <indexterm zone="xorg7-lib libXfont2">
-            <primary sortas="c-libXfont2">libXfont2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXft">
-        <term><filename class="libraryfile">libXft.so</filename></term>
-        <listitem>
-          <para>
-            is the X FreeType interface library
-          </para>
-          <indexterm zone="xorg7-lib libXft">
-            <primary sortas="c-libXft">libXft.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXinerama">
-        <term><filename class="libraryfile">libXinerama.so</filename></term>
-        <listitem>
-          <para>
-            is the Xinerama Library
-          </para>
-          <indexterm zone="xorg7-lib libXinerama">
-            <primary sortas="c-libXinerama">libXinerama.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXi">
-        <term><filename class="libraryfile">libXi.so</filename></term>
-        <listitem>
-          <para>
-            is the X Input Extension Library
-          </para>
-          <indexterm zone="xorg7-lib libXi">
-            <primary sortas="c-libXi">libXi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbfile">
-        <term><filename class="libraryfile">libxkbfile.so</filename></term>
-        <listitem>
-          <para>
-            is the xkbfile Library
-          </para>
-          <indexterm zone="xorg7-lib libxkbfile">
-            <primary sortas="c-libxkbfile">libxkbfile.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXmu">
-        <term><filename class="libraryfile">libXmu.so</filename></term>
-        <listitem>
-          <para>
-            is the X interface library for miscellaneous utilities not
-            part of the Xlib standard
-          </para>
-          <indexterm zone="xorg7-lib libXmu">
-            <primary sortas="c-libXmu">libXmu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXmuu">
-        <term><filename class="libraryfile">libXmuu.so</filename></term>
-        <listitem>
-          <para>
-            is the Mini Xmu Library
-          </para>
-          <indexterm zone="xorg7-lib libXmuu">
-            <primary sortas="c-libXmuu">libXmuu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXpm">
-        <term><filename class="libraryfile">libXpm.so</filename></term>
-        <listitem>
-          <para>
-            is the X Pixmap Library
-          </para>
-          <indexterm zone="xorg7-lib libXpm">
-            <primary sortas="c-libXpm">libXpm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXpresent">
-        <term><filename class="libraryfile">libXpresent.so</filename></term>
-        <listitem>
-          <para>
-            is the library interface to the X Present Extension
-          </para>
-          <indexterm zone="xorg7-lib libXpresent">
-            <primary sortas="c-libXpresent">libXpresent.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXrandr">
-        <term><filename class="libraryfile">libXrandr.so</filename></term>
-        <listitem>
-          <para>
-            is the X Resize, Rotate and Reflection extension library
-          </para>
-          <indexterm zone="xorg7-lib libXrandr">
-            <primary sortas="c-libXrandr">libXrandr.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXrender">
-        <term><filename class="libraryfile">libXrender.so</filename></term>
-        <listitem>
-          <para>
-            is the X Render Library
-          </para>
-          <indexterm zone="xorg7-lib libXrender">
-            <primary sortas="c-libXrender">libXrender.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXRes">
-        <term><filename class="libraryfile">libXRes.so</filename></term>
-        <listitem>
-          <para>
-            is the X-Resource extension client library
-          </para>
-          <indexterm zone="xorg7-lib libXRes">
-            <primary sortas="c-libXRes">libXRes.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxshmfence">
-        <term><filename class="libraryfile">libxshmfence.so</filename></term>
-        <listitem>
-          <para>
-            exposes an event API on top of Linux futexes
-          </para>
-          <indexterm zone="xorg7-lib libxshmfence">
-            <primary sortas="c-libxshmfence">libxshmfence.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXss">
-        <term><filename class="libraryfile">libXss.so</filename></term>
-        <listitem>
-          <para>
-            is the X11 Screen Saver extension client library
-          </para>
-          <indexterm zone="xorg7-lib libXss">
-            <primary sortas="c-libXss">libXss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXt">
-        <term><filename class="libraryfile">libXt.so</filename></term>
-        <listitem>
-          <para>
-            is the X Toolkit Library
-          </para>
-          <indexterm zone="xorg7-lib libXt">
-            <primary sortas="c-libXt">libXt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXtst">
-        <term><filename class="libraryfile">libXtst.so</filename></term>
-        <listitem>
-          <para>
-            is the Xtst Library
-          </para>
-          <indexterm zone="xorg7-lib libXtst">
-            <primary sortas="c-libXtst">libXtst.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXvMC">
-        <term><filename class="libraryfile">libXvMC.so</filename></term>
-        <listitem>
-          <para>
-            is the X-Video Motion Compensation Library
-          </para>
-          <indexterm zone="xorg7-lib libXvMC">
-            <primary sortas="c-libXvMC">libXvMC.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXvMCW">
-        <term><filename class="libraryfile">libXvMCW.so</filename></term>
-        <listitem>
-          <para>
-            is the XvMC Wrapper including the Nonstandard VLD extension
-          </para>
-          <indexterm zone="xorg7-lib libXvMCW">
-            <primary sortas="c-libXvMCW">libXvMCW.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXv">
-        <term><filename class="libraryfile">libXv.so</filename></term>
-        <listitem>
-          <para>
-            is the X Window System video extension library
-          </para>
-          <indexterm zone="xorg7-lib libXv">
-            <primary sortas="c-libXv">libXv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXxf86dga">
-        <term><filename class="libraryfile">libXxf86dga.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for the XFree86-DGA extension
-          </para>
-          <indexterm zone="xorg7-lib libXxf86dga">
-            <primary sortas="c-libXxf86dga">libXxf86dga.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXxf86vm">
-        <term><filename class="libraryfile">libXxf86vm.so</filename></term>
-        <listitem>
-          <para>
-            is the client library for the XFree86-VidMode X extension
-          </para>
-          <indexterm zone="xorg7-lib libXxf86vm">
-            <primary sortas="c-libXxf86vm">libXxf86vm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xbitmaps-download-http "&xorg-download-http;/data/xbitmaps-&xbitmaps-version;.tar.xz">
-  <!ENTITY xbitmaps-download-ftp  " ">
-  <!ENTITY xbitmaps-md5sum        "2b03f89d78fb91671370e77d7ad46907">
-  <!ENTITY xbitmaps-size          "108 KB">
-  <!ENTITY xbitmaps-buildsize     "1.6 MB">
-  <!ENTITY xbitmaps-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xbitmaps" xreflabel="xbitmaps-&xbitmaps-version;">
-  <?dbhtml filename="xbitmaps.html"?>
-
-
-  <title>xbitmaps-&xbitmaps-version;</title>
-
-  <indexterm zone="xbitmaps">
-    <primary sortas="a-xbitmaps">xbitmaps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xbitmaps</title>
-
-    <para>
-      The <application>xbitmaps</application> package contains bitmap
-      images used by multiple applications built in Xorg chapter.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xbitmaps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xbitmaps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xbitmaps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xbitmaps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xbitmaps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xbitmaps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xbitmaps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="util-macros"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xbitmaps</title>
-
-    <para>
-      Install <application>xbitmaps</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$XORG_PREFIX</envar>/include/X11/bitmaps</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-proto-download-http "https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-&xcb-proto-version;.tar.xz">
-  <!ENTITY xcb-proto-download-ftp  " ">
-  <!ENTITY xcb-proto-md5sum        "c415553d2ee1a8cea43c3234a079b53f">
-  <!ENTITY xcb-proto-size          "152 KB">
-  <!ENTITY xcb-proto-buildsize     "1.3 MB">
-  <!ENTITY xcb-proto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-proto" xreflabel="xcb-proto-&xcb-proto-version;">
-  <?dbhtml filename="xcb-proto.html"?>
-
-
-  <title>xcb-proto-&xcb-proto-version;</title>
-
-  <indexterm zone="xcb-proto">
-    <primary sortas="a-xcb-proto">xcb-proto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-proto</title>
-
-    <para>
-      The <application>xcb-proto</application> package provides the
-      XML-XCB protocol descriptions that <application>libxcb</application>
-      uses to generate the majority of its code and API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-proto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-proto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-proto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-proto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-proto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-proto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">xcb-proto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg-env"/> (needed for the instructions below)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/> (required to run the tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-proto</title>
-
-    <para>
-      Install <application>xcb-proto</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 ./configure $XORG_CONFIG</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you are upgrading from version 1.15.1 or lower, the old pkgconfig
-      file needs to be removed. Issue, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>rm -f $XORG_PREFIX/lib/pkgconfig/xcb-proto.pc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$XORG_PREFIX</envar>/share/xcb and
-             <envar>$XORG_PREFIX</envar>/lib/python&python3-majorver;/site-packages/xcbgen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-util-cursor.xml
===================================================================
--- x/installing/xcb-util-cursor.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-util-cursor-download-http "https://xcb.freedesktop.org/dist/xcb-util-cursor-&xcb-util-cursor-version;.tar.xz">
-  <!ENTITY xcb-util-cursor-download-ftp  " ">
-  <!ENTITY xcb-util-cursor-md5sum        "0d244518ad54b886413fe782235d6210">
-  <!ENTITY xcb-util-cursor-size          "260 KB">
-  <!ENTITY xcb-util-cursor-buildsize     "2.5 MB">
-  <!ENTITY xcb-util-cursor-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-util-cursor" xreflabel="xcb-util-cursor-&xcb-util-cursor-version;">
-  <?dbhtml filename="xcb-util-cursor.html"?>
-
-
-  <title>xcb-util-cursor-&xcb-util-cursor-version;</title>
-
-  <indexterm zone="xcb-util-cursor">
-    <primary sortas="a-xcb-util-cursor">xcb-util-cursor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util-cursor</title>
-
-    <para>
-      The <application>xcb-util-cursor</application> package provides a module
-      that implements the XCB cursor library.  It is the
-      <application>XCB</application> replacement for libXcursor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-util-cursor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-util-cursor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-util-cursor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-util-cursor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-util-cursor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-util-cursor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util-cursor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xcb-util-image"/> and
-      <xref linkend="xcb-util-renderutil"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util-cursor</title>
-
-    <para>
-      Install <application>xcb-util-cursor</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>libxcb-cursor.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-cursor">
-        <term><filename class="libraryfile">libxcb-cursor.so</filename></term>
-        <listitem>
-          <para>
-             Is a port of Xlib's libXcursor functions
-          </para>
-          <indexterm zone="xcb-util-cursor libxcb-cursor">
-            <primary sortas="c-libxcb-cursor">libxcb-cursor.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-util-image-download-http "https://xcb.freedesktop.org/dist/xcb-util-image-&xcb-util-image-version;.tar.xz">
-  <!ENTITY xcb-util-image-download-ftp  " ">
-  <!ENTITY xcb-util-image-md5sum        "a67bfac2eff696170259ef1f5ce1b611">
-  <!ENTITY xcb-util-image-size          "284 KB">
-  <!ENTITY xcb-util-image-buildsize     "2.9 MB">
-  <!ENTITY xcb-util-image-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-util-image" xreflabel="xcb-util-image-&xcb-util-image-version;">
-  <?dbhtml filename="xcb-util-image.html"?>
-
-
-  <title>xcb-util-image-&xcb-util-image-version;</title>
-
-  <indexterm zone="xcb-util-image">
-    <primary sortas="a-xcb-util-image">xcb-util-image</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util-image</title>
-
-    <para>
-      The <application>xcb-util-image</application> package provides additional
-      extensions to the <application>XCB</application> library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-util-image-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-util-image-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-util-image-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-util-image-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-util-image-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-util-image-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util-image Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xcb-util"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util-image</title>
-
-    <para>
-      Install <application>xcb-util-image</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>LD_LIBRARY_PATH=$XORG_PREFIX/lib make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libxcb-image.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-image">
-        <term><filename class="libraryfile">libxcb-image.so</filename></term>
-        <listitem>
-          <para>
-             Is a port of Xlib's XImage and XShmImage functions
-          </para>
-          <indexterm zone="xcb-util-image libxcb-image">
-            <primary sortas="c-libxcb-image">libxcb-image.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-util-keysyms.xml
===================================================================
--- x/installing/xcb-util-keysyms.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-util-keysyms-download-http
-           "https://xcb.freedesktop.org/dist/xcb-util-keysyms-&xcb-util-keysyms-version;.tar.xz">
-  <!ENTITY xcb-util-keysyms-download-ftp  " ">
-  <!ENTITY xcb-util-keysyms-md5sum        "fbdc05f86f72f287ed71b162f1a9725a">
-  <!ENTITY xcb-util-keysyms-size          "256 KB">
-  <!ENTITY xcb-util-keysyms-buildsize     "2.3 MB">
-  <!ENTITY xcb-util-keysyms-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-util-keysyms" xreflabel="xcb-util-keysyms-&xcb-util-keysyms-version;">
-  <?dbhtml filename="xcb-util-keysyms.html"?>
-
-
-  <title>xcb-util-keysyms-&xcb-util-keysyms-version;</title>
-
-  <indexterm zone="xcb-util-keysyms">
-    <primary sortas="a-xcb-util-keysyms">xcb-util-keysyms</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util-keysyms</title>
-
-    <para>
-      The <application>xcb-util-keysyms</application> package contains a library
-      for handling standard X key constants and conversion to/from keycodes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-util-keysyms-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-util-keysyms-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-util-keysyms-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-util-keysyms-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-util-keysyms-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-util-keysyms-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util-keysyms Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxcb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to generate documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util-keysyms</title>
-
-    <para>
-      Install <application>xcb-util-keysyms</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.
-      <!--To test the results, issue:
-      <command>LD_LIBRARY_PATH=$XORG_PREFIX/lib make check</command>.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libxcb-keysyms.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-keysyms">
-        <term><filename class="libraryfile">libxcb-keysyms.so</filename></term>
-        <listitem>
-          <para>
-             provides the standard X key constants and API functions for
-             conversion to/from keycodes
-          </para>
-          <indexterm zone="xcb-util-keysyms libxcb-keysyms">
-            <primary sortas="c-libxcb-keysyms">libxcb-keysyms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-util-renderutil.xml
===================================================================
--- x/installing/xcb-util-renderutil.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-util-renderutil-download-http "https://xcb.freedesktop.org/dist/xcb-util-renderutil-&xcb-util-renderutil-version;.tar.xz">
-  <!ENTITY xcb-util-renderutil-download-ftp  " ">
-  <!ENTITY xcb-util-renderutil-md5sum        "193b890e2a89a53c31e2ece3afcbd55f">
-  <!ENTITY xcb-util-renderutil-size          "256 KB">
-  <!ENTITY xcb-util-renderutil-buildsize     "2.4 MB">
-  <!ENTITY xcb-util-renderutil-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-util-renderutil" xreflabel="xcb-util-renderutil-&xcb-util-renderutil-version;">
-  <?dbhtml filename="xcb-util-renderutil.html"?>
-
-
-  <title>xcb-util-renderutil-&xcb-util-renderutil-version;</title>
-
-  <indexterm zone="xcb-util-renderutil">
-    <primary sortas="a-xcb-util-renderutil">xcb-util-renderutil</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util-renderutil</title>
-
-    <para>
-      The <application>xcb-util-renderutil</application> package provides additional
-      extensions to the <application>XCB</application> library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-util-renderutil-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-util-renderutil-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-util-renderutil-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-util-renderutil-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-util-renderutil-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-util-renderutil-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util-renderutil Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxcb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util-renderutil</title>
-
-    <para>
-      Install <application>xcb-util-renderutil</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>libxcb-render-util.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-render-util">
-        <term><filename class="libraryfile">libxcb-render-util.so</filename></term>
-        <listitem>
-          <para>
-            Provides convenience functions for the Render extension
-          </para>
-          <indexterm zone="xcb-util-renderutil libxcb-render-util">
-            <primary sortas="c-libxcb-render-util">libxcb-render-util.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-util-wm.xml
===================================================================
--- x/installing/xcb-util-wm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-util-wm-download-http
-           "https://xcb.freedesktop.org/dist/xcb-util-wm-&xcb-util-wm-version;.tar.xz">
-  <!ENTITY xcb-util-wm-download-ftp  " ">
-  <!ENTITY xcb-util-wm-md5sum        "581b3a092e3c0c1b4de6416d90b969c3">
-  <!ENTITY xcb-util-wm-size          "280 KB">
-  <!ENTITY xcb-util-wm-buildsize     "3.2 MB">
-  <!ENTITY xcb-util-wm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-util-wm" xreflabel="xcb-util-wm-&xcb-util-wm-version;">
-  <?dbhtml filename="xcb-util-wm.html"?>
-
-
-  <title>xcb-util-wm-&xcb-util-wm-version;</title>
-
-  <indexterm zone="xcb-util-wm">
-    <primary sortas="a-xcb-util-wm">xcb-util-wm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util-wm</title>
-
-    <para>
-      The <application>xcb-util-wm</application> package contains libraries
-      which provide client and window-manager helpers for EWMH and ICCCM.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-util-wm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-util-wm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-util-wm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-util-wm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-util-wm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-util-wm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util-wm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxcb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util-wm</title>
-
-    <para>
-      Install <application>xcb-util-wm</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.
-      <!--To test the results, issue:
-      <command>LD_LIBRARY_PATH=$XORG_PREFIX/lib make check</command>.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libxcb-ewmh.so and libxcb-icccm.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-ewmh">
-        <term><filename class="libraryfile">libxcb-ewmh.so</filename></term>
-        <listitem>
-          <para>
-            provides the client and window-manager helpers for EWMH
-          </para>
-          <indexterm zone="xcb-util-wm libxcb-ewmh">
-            <primary sortas="c-libxcb-ewmh">libxcb-ewmh.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxcb-icccm">
-        <term><filename class="libraryfile">libxcb-icccm.so</filename></term>
-        <listitem>
-          <para>
-            provides the client and window-manager helpers for ICCCM
-          </para>
-          <indexterm zone="xcb-util-wm libxcb-icccm">
-            <primary sortas="c-libxcb-icccm">libxcb-icccm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcb-util-download-http "https://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.xz">
-  <!ENTITY xcb-util-download-ftp  " ">
-  <!ENTITY xcb-util-md5sum        "34d749eab0fd0ffd519ac64798d79847">
-  <!ENTITY xcb-util-size          "261 KB">
-  <!ENTITY xcb-util-buildsize     "2.6 MB">
-  <!ENTITY xcb-util-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-util" xreflabel="xcb-util-&xcb-util-version;">
-  <?dbhtml filename="xcb-util.html"?>
-
-
-  <title>xcb-util-&xcb-util-version;</title>
-
-  <indexterm zone="xcb-util">
-    <primary sortas="a-xcb-util">xcb-util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util</title>
-
-    <para>
-      The <application>xcb-util</application> package provides additional
-      extensions to the <application>XCB</application> library, many that were
-      previously found in <application>Xlib</application>, but are not part of
-      core X protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcb-util-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcb-util-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcb-util-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcb-util-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcb-util-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcb-util-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxcb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util</title>
-
-    <para>
-      Install <application>xcb-util</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </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>libxcb-util.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-util">
-        <term><filename class="libraryfile">libxcb-util.so</filename></term>
-        <listitem>
-          <para>
-            Provides utility functions for other XCB utilities
-          </para>
-          <indexterm zone="xcb-util libxcb-util">
-            <primary sortas="c-libxcb-util">libxcb-util.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xclock.xml
===================================================================
--- x/installing/xclock.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xclock-download-http "&xorg-download-http;/app/xclock-&xclock-version;.tar.xz">
-  <!ENTITY xclock-download-ftp  " ">
-  <!ENTITY xclock-md5sum        "1273e3f4c85f1801be11a5247c382d07">
-  <!ENTITY xclock-size          "156 KB">
-  <!ENTITY xclock-buildsize     "1.5 MB">
-  <!ENTITY xclock-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xclock" xreflabel="xclock-&xclock-version;">
-  <?dbhtml filename="xclock.html"?>
-
-
-  <title>xclock-&xclock-version;</title>
-
-  <indexterm zone="xclock">
-    <primary sortas="a-xclock">xclock</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xclock</title>
-
-    <para>
-      The <application>xclock</application> package contains a simple
-      clock application which is used in the default xinit configuration.
-    </para>
-
-    &not-katamari;
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xclock-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xclock-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xclock-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xclock-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xclock-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xclock-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xclock Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xclock</title>
-
-    <para>
-      Install <application>xclock</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>xclock</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xclock-bin">
-        <term><command>xclock</command></term>
-        <listitem>
-          <para>
-            is an analog/digital clock for X
-          </para>
-          <indexterm zone="xclock xclock">
-            <primary sortas="b-xclock">xclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xcursor-themes.xml
===================================================================
--- x/installing/xcursor-themes.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xcursor-themes-download-http "&xorg-download-http;/data/xcursor-themes-&xcursor-themes-version;.tar.xz">
-  <!ENTITY xcursor-themes-download-ftp  " ">
-  <!ENTITY xcursor-themes-md5sum        "070993be1f010b09447ea24bab2c9846">
-  <!ENTITY xcursor-themes-size          "1.4 MB">
-  <!ENTITY xcursor-themes-buildsize     "15 MB">
-  <!ENTITY xcursor-themes-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcursor-themes" xreflabel="xcursor-themes-&xcursor-themes-version;">
-  <?dbhtml filename="xcursor-themes.html"?>
-
-
-  <title>xcursor-themes-&xcursor-themes-version;</title>
-
-  <indexterm zone="xcursor-themes">
-    <primary sortas="a-xcursor-themes">xcursor-themes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcursor-themes</title>
-
-    <para>
-      The <application>xcursor-themes</application> package contains the
-      redglass and whiteglass animated cursor themes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xcursor-themes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xcursor-themes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xcursor-themes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xcursor-themes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xcursor-themes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xcursor-themes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcursor-themes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-app"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcursor-themes</title>
-
-    <note>
-      <para>
-        We explicitly install the cursor themes in /usr instead
-        of <envar>$XORG_PREFIX</envar> so non-Xorg desktop environments can
-        find them.
-      </para>
-    </note>
-
-    <para>
-      Install <application>xcursor-themes</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          /usr/share/icons/handhelds,
-          /usr/share/icons/redglass, and
-          /usr/share/icons/whiteglass
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="xfree86" xreflabel="xfree86-&xfree86-version;">
+<?dbhtml filename="xfree86.html" dir="x"?>
+<title>XFree86-&xfree86-version;</title>
+
+&xfree86-intro;
+&xfree86-inst;
+&xfree86-exp;
+&xfree86-config;
+&xfree86-desc;
+</sect1>
Index: x/installing/xfree86/xfree86-config.xml
===================================================================
--- x/installing/xfree86/xfree86-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86/xfree86-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,92 @@
+<sect2>
+<title>Configuring XFree86</title>
+
+<para>Edit <filename>/etc/ld.so.conf</filename> and add 
+<filename>/usr/X11R6/lib</filename>.
+Run <screen>ldconfig</screen></para>
+
+<para>Add <filename>/usr/X11R6/bin</filename> to your PATH environment 
+variable in <filename>.bash_profile</filename>.  The statement should
+look something like <userinput>PATH=$PATH:/usr/X11R6/bin</userinput>
+and be placed before the <userinput>export PATH</userinput> statement.
+
+Run
+<screen>source ~/.bash_profile</screen></para>
+
+<para>Set up your mouse 
+<screen>cd /dev
+ln -s psaux mouse</screen>
+
+Adjust the symbolic link as necessary for other types of mice.  For instance, 
+a serial mouse on the first serial port would be linked to ttyS1.
+</para>
+
+<para>Create the XF86Config file with
+<screen>cd ~
+XFree86 -configure</screen>
+The screen will go black and you may hear some clicking of the monitor.  This
+command will create a file, <filename>XF86Config.new</filename> in your home
+directory.
+</para>
+
+<para>
+Edit <filename>XF86Config.new</filename> to suit your system.  The details 
+of the file are located in the man page <userinput>man XF86Config</userinput>.
+Some things you may want to do are:</para>
+<itemizedlist>
+<listitem><para>Section "Files". Change the order of the font paths searched. 
+You may want to put
+100dpi fonts ahead of 75dpi fonts if your system normally comes up closer
+to 100 dots per inch.  You may want to remove some font directories completely.
+</para></listitem>
+<listitem><para>
+Section "Module".  Remove or comment out some of the modules.  The "glx"
+and "dri" sections are not operational until we install DRI below.  Leaving
+modules in does not hurt anything.
+</para></listitem>
+<listitem><para>
+Section "InputDevice".  You may want to change the keyboard autorepeat rate 
+by adding 
+<userinput>Option "Autorepeat" "250 30"</userinput>.
+</para></listitem>
+<listitem><para>
+Section "Screen".  Add a DefaultDepth statement such as:
+<userinput>DefaultDepth 16</userinput>. In the SubSection for your default
+depth, add a modes line such as: 
+<userinput> Modes "1280x1024" "1024x768"</userinput>.
+The first mode listed will normally be the starting resolution.
+</para></listitem>
+</itemizedlist>
+
+<para>
+Test the system with
+<screen>XFree86 -xf86config ~/XF86Config.new</screen>
+You will only get a grey background with an X-shaped mouse cursor, but it 
+confirms the system is working.  Exit with Control-Alt-Backspace.  If the 
+system does not work, take a look at 
+<filename>/var/log/XFree86.0.log</filename> to see what went wrong.
+</para>
+<para>
+Move the confiuration file to its final location
+<screen>mv ~/XF86Config.new /etc/X11/XF86Config</screen>
+</para>
+<para>
+Create <filename>.xinitrc</filename>
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+# Begin .xinitrc file
+xterm  -g 80x40+0+0   &amp;
+xclock -g 100x100-0+0 &amp;
+twm
+EOF</userinput></screen>
+This provides an initial screen with an xterm and a clock that is managed by a 
+simple window manager, Tab Winow Manager.  For details of twm, see the 
+man page.
+</para>
+
+<para>
+Start X with 
+<screen>startx</screen>
+to get basic funtional X Windows System.
+</para>
+</sect2>
+
Index: x/installing/xfree86/xfree86-desc.xml
===================================================================
--- x/installing/xfree86/xfree86-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86/xfree86-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,84 @@
+<sect2>
+<title>Contents</title>
+
+<para>The XFree86 package contains the X Windows system for Linux 
+(and other operating systems).  It includes
+the X server, fonts, xterm, a simple winow manager (twm), 
+various utilities, video output drivers, 
+and various input drivers including the mouse and keyboard.</para>
+
+<para>XFree86 also contains libraries and header files for development of
+X Windows programs.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<note><para>The following list of programs is not comprehensive. The
+full list is in <filename>/usr/X11R6/bin</filename>.  For additional
+information about these programs, see the respective man page.</para></note>
+
+<sect3>
+<title>XFree86</title>
+<para>XFree86 is the X11R6 implementation of the X Windows server.
+</para></sect3>
+
+<sect3><title>xf86config</title>
+<para>An interactive program for generating an XF86Config file for use with 
+XFree86 X servers.
+</para></sect3>
+
+<sect3><title>xf86cfg</title>
+<para>A tool to configure XFree86 that can be used to either write the 
+initial configuration file or make customizations to the current configuration.
+</para></sect3>
+
+<sect3><title>startx</title>
+<para>A script to initialize the X session. It runs xinit.
+</para></sect3>
+
+<sect3><title>xinit</title>
+<para>This program is used to start the X Window System server.
+</para></sect3>
+
+<sect3><title>twm</title>
+<para>A Tab Window Manager for the X Window System.
+</para></sect3>
+
+<sect3><title>xterm</title>
+<para>A terminal emulator for X.
+</para></sect3>
+
+<sect3><title>xwininfo</title>
+<para>A window information utility for X.
+</para></sect3>
+
+<sect3><title>x11perf</title>
+<para>An X11 server performance test program.
+</para></sect3>
+
+<sect3><title>xlsfonts</title>
+<para>A program to list fonts available to the X server.
+</para></sect3>
+
+<sect3><title>xvidtune</title>
+<para>A video mode tuner for XFree86.
+</para></sect3>
+
+<sect3><title>xload</title>
+<para>A system load average display for X.
+</para></sect3>
+
+<sect3><title>xcalc</title>
+<para>A scientific calculator for X.
+</para></sect3>
+
+<sect3><title>xclock and oclock</title>
+<para>Clock programs for X.
+</para></sect3>
+
+<sect3><title>xmodmap</title>
+<para>A utility for modifying keymaps and pointer button mappings in X.
+</para></sect3>
+
+</sect2>
Index: x/installing/xfree86/xfree86-exp.xml
===================================================================
--- x/installing/xfree86/xfree86-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86/xfree86-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Command explanations</title>
+
+<para>
+<userinput>make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;</userinput>
+: This command runs multiple makefiles to completely rebuild the system.  
+<userinput>2&gt;&amp;1</userinput> redirects error messages to the same location
+as normal output. The <userinput>tee</userinput>
+command allows viewing of the output while logging the results to a file.</para>
+
+<note><para>
+When rebuildng, a separate command that may be used if only minor changes 
+are made to the sources is <userinput>make Everything</userinput>.  This does 
+not automatically remove generated files and only rebuilds those files or 
+programs that are out of date.
+</para></note>
+
+<para>
+<userinput>ln -sf /usr/X11R6/bin /usr/bin/X11</userinput>,
+<userinput>ln -sf /usr/X11R6/lib/X11 /usr/lib/X11</userinput>, and
+<userinput>ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput>:
+These commands are present to enable other (broken) packages to build
+against XFree86.  We do this even though the Filesystem Hierarchy Standard
+says:
+"In general, software must not be installed or managed via the above 
+symbolic links. They are intended for utilization by users only."
+</para>
+</sect2>
+
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86/xfree86-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,183 @@
+<sect2>
+<title>Installation of XFree86</title>
+
+
+<sect3>
+<title>Kernel Compilation Settings</title>
+<para>
+If you have an Intel P6 (Pentium Pro, Pentium II and later) it is recommneded 
+that you compile MTRR (Memory Type Range Registers) support into the kernel.
+The kernel can map Cyrix and AMD CPUs to the MTRR interface so selecting this
+option is useful for those processors also.
+This option is found in the 
+"Processor type and features" menu.  It can increase performance of
+image write operations 2.5 times or more on PCI or AGP video cards. 
+</para>
+
+<para>
+In the "Character Devices" section, enable AGP Support and select the chipset
+support on your motherboard.  If you do not know the chipset, you may select
+all the chip types at the expense of extra kernel size. You can usually 
+determine your motherboard's chipset by doing:
+<screen><userinput>cat /proc/pci</userinput></screen>
+</para>
+
+<para>
+In the "Character Devices" section, <emphasis>disable</emphasis> Direct 
+Rendering Manager unless you have a Direct Rendering Infrastructure (DRI) 
+supported video card.  See the DRI section below for a list.  If you do
+enable DRI here, make sure you select the video card(s) you want to support
+as a <emphasis>module</emphasis>.
+</para>
+
+<para>If you made any changes to the kernel configuration, recompile with
+<screen>make dep &amp;&amp;
+make bzImage &amp;&amp;
+make modules &amp;&amp;
+make modules_install</screen>
+</para>
+
+<para>
+Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
+<filename>/usr/src/linux/System.map</filename> to
+<filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
+appropriately and run <userinput>lilo</userinput>.
+</para>
+
+</sect3>
+<sect3><title>Creating <filename>host.def</filename></title>
+
+<para>Although XFree86 will compile without a host.def file, the following file 
+is recommended for customizing the installation. Start from 
+the <filename>xc</filename> directory.</para>
+
+<para><screen><userinput>cat &gt; config/cf/host.def &lt;&lt; "EOF"
+# Begin XFree86 hosts.def file
+
+/* System Related Information.  If you read and configure only one
+ * section then it should be this one.  The Intel architecture defaults are 
+ * set for a i686 and higher.  Apx is for the Alpha architecture and Ppc is  
+ * for the Power PC. *******************************************************/
+
+#define DefaultGcc2i386Opt  -O2 -fomit-frame-pointer -march=i686  
+#define DefaultGcc2AxpOpt   -O2 -mcpu=ev6
+#define DefaultGcc2PpcOpt   -O2 -mcpu=750
+
+/* The following definitions are normally set properly by XFree86's scripts.
+ * You can uncomment them if you want to make sure. ************************/
+ 
+/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs */
+/* #define HasMMXSupport        NO         */ /* Any i586 or above */
+/* #define HasKatmaiSupport     NO  */ /* PIII SSE instuctions */
+/* #define Has3DNowSupport      NO  */ /* AMD instructions */
+
+
+/* This setting reduces compile time a little by omitting rarely used input 
+ * devices.  You can find the complete list in config/cf/xfree86.cf ********/
+ 
+#define XInputDrivers                 mouse void
+
+/* VIDEO DRIVERS ***********************************************************/
+
+/* If you are sure you only want the drivers for one or a few video cards,
+ * you can delete the drivers you do not want. *****************************/ 
+
+#define XF86CardDrivers mga glint nv tga s3virge rendition \
+                        cirrus vmware tseng chips apm \
+                        fbdev i128 \
+                        ati AgpGartDrivers DevelDrivers ark cyrix \
+                        vesa vga XF86OSCardDrivers
+
+/* FONT SERVER AND LIBRARY SETTINGS ****************************************/
+
+
+/* These setting should be set by default, but we are making sure. *********/
+
+#define BuildFontServer                YES  /* Need for GhostScript Print Server */
+#define BuildFreetype2Library          YES  /* For using TrueType Fonts */
+#define SharedLibFont                  YES  /* Needed for Truetype */
+#define CompressAllFonts               YES
+#define GzipFontCompression            YES
+#define SharedLibFont                  YES
+
+/* The font path can be redefined in the XF86Config file *******************/
+
+#define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
+$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
+$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
+
+/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
+ * the defaults. ***********************************************************/
+
+#define BuildCyrillicFonts            NO
+#define BuildArabicFonts              NO
+#define BuildISO8859_6Fonts           NO
+#define BuildGreekFonts               NO
+#define BuildISO8859_7Fonts           NO
+#define BuildHebrewFonts              NO
+#define BuildISO8859_8Fonts           NO
+#define BuildKOI8_RFonts              NO
+#define BuildJapaneseFonts            NO
+#define BuildJISX0201Fonts            NO
+#define BuildKoreanFonts              NO
+#define BuildChineseFonts             NO
+
+/* DOCUMENTATION SETTINGS **************************************************/
+
+/* These setting are the defaults. *****************************************/
+
+#define BuildLinuxDocHtml             NO    /* X Docs in Html format */
+#define BuildLinuxDocPS               NO    /* X Docs in PostScript format */
+#define BuildAllSpecsDocs             NO    /* Various docs */
+#define BuildHtmlManPages             NO
+
+/* Linux Distribution Information - Not essential that it is totally right.*/
+
+#define LinuxDistribution         LFS 
+#define LinuxCLimbMajorVersion    3
+#define LinuxCLimbMinorVersion    3        
+#define LinuxCLimbTeenyVersion    0
+
+/* GENERAL SETTINGS: You generally want to leave these alone when
+ * building X on an LFS system *********************************************/
+
+#define GccWarningOptions         -pipe
+#define TermcapLibrary            -lncurses
+#define XprtServer                YES /* Needed by realplayer */
+#define XnestServer               YES
+#define XAppLoadDir               EtcX11Directory/app-defaults
+#define VarLibDir                 /var/lib
+#define XFree86Devel               NO
+#define FSUseSyslog               YES
+#define ThreadedX                 YES
+#define HasZlib                   YES
+#define HasNCurses                YES
+#define HasPam                     NO        
+#define SystemManDirectory        /usr/share/man
+#define HasLibCrypt               YES
+#define InstallXinitConfig        YES
+#define InstallXdmConfig          YES
+#define ForceNormalLib            YES
+#define BuildSpecsDocs             NO
+
+# End XFree86 host.def file
+EOF</userinput></screen></para>
+
+<para>Edit the file for your hardware and desires.</para>
+</sect3>
+
+<sect3>
+<title>Build Commands</title>
+<para>Install XFree86 by running the following commands:</para>
+
+<para><screen><userinput>patch -Np1 -i ../4.2.0-libGLU-bad-extern.patch &amp;&amp;</userinput>
+<userinput>make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;</userinput>
+<userinput>make install &amp;&amp;</userinput>
+<userinput>make install.man &amp;&amp;</userinput>
+<userinput>ln -sf /usr/X11R6/bin /usr/bin/X11 &amp;&amp;</userinput>
+<userinput>ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &amp;&amp;</userinput>
+<userinput>ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput></screen></para>
+
+</sect3>
+</sect2>
+
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86/xfree86-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,35 @@
+<sect2>
+<title>Introduction to XFree86</title>
+
+<screen>Download location:              <ulink url="&xfree86-download;"/>
+Version used:                   &xfree86-version;
+Package size:                   &xfree86-size;
+Estimated Disk space required:  &xfree86-buildsize;
+Estimated build time:           63m (667 MHz)</screen>
+
+<para><screen>XFree86 depends on: <xref linkend="zlib"/></screen></para>
+
+<para>Because XFree86 is such a large package, you may find that 
+<xref linkend="hdparm"/> speeds up compilation and running the package
+by tuning your hard disk for optimal performance.</para>
+
+<para>XFree86 is a freely redistributable open-source implementation of the 
+X Window System. XFree86 provides a client/server interface between display 
+hardware (the mouse, keyboard, and video displays) and the desktop environment 
+while also providing both the windowing infrastructure and a standardized 
+application interface (API).
+</para>
+
+<para>
+There are several files that need to be fetched from the download location:
+<screen>X420src-1.tgz 25354 KB 
+X420src-2.tgz 22683 KB   
+X420src-3.tgz  9089 KB   
+</screen>
+</para>
+
+<para>
+In addition, the following file will be needed:
+<screen><ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-libGLU-bad-extern.patch"/></screen> 
+</para>
+</sect2>
Index: x/installing/xfree86/xfree86.ent
===================================================================
--- x/installing/xfree86/xfree86.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/installing/xfree86/xfree86.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY xfree86 SYSTEM "../xfree86.xml">
+<!ENTITY xfree86-intro SYSTEM "xfree86-intro.xml">
+<!ENTITY xfree86-inst SYSTEM "xfree86-inst.xml">
+<!ENTITY xfree86-exp SYSTEM "xfree86-exp.xml">
+<!ENTITY xfree86-desc SYSTEM "xfree86-desc.xml">
+<!ENTITY xfree86-config SYSTEM "xfree86-config.xml">
+<!ENTITY xfree86-buildsize "535 MB">
+<!ENTITY xfree86-version "4.2">
+<!ENTITY xfree86-download "ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/">
+<!ENTITY xfree86-size "108 MB">
Index: installing/xinit.xml
===================================================================
--- x/installing/xinit.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xinit-download-http "&xorg-download-http;/app/xinit-&xinit-version;.tar.xz">
-  <!ENTITY xinit-download-ftp  " ">
-  <!ENTITY xinit-md5sum        "0e9a1b9a82b84ab229c709c0f939c113">
-  <!ENTITY xinit-size          "153 KB">
-  <!ENTITY xinit-buildsize     "1.5 MB">
-  <!ENTITY xinit-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xinit" xreflabel="xinit-&xinit-version;">
-  <?dbhtml filename="xinit.html"?>
-
-
-  <title>xinit-&xinit-version;</title>
-
-  <indexterm zone="xinit">
-    <primary sortas="a-xinit">xinit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xinit</title>
-
-    <para>
-      The <application>xinit</application> package contains a usable script
-      to start the xserver.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xinit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xinit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xinit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xinit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xinit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xinit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xinit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (runtime only)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="twm"/>,
-      <xref role="runtime" linkend="xclock"/>, and
-      <xref role="runtime" linkend="xterm2"/> (used in the default <filename>
-      xinitrc</filename> file)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xinit</title>
-
-    <para>
-      Install <application>xinit</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG --with-xinitdir=/etc/X11/app-defaults &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;
-ldconfig</userinput></screen>
-
-    <note revision='sysv'>
-
-      <para>
-        If starting Xorg from the command line, the default instructions
-        above start Xorg on the current virtual terminal.  It may be
-        convenient to see Xorg and associated application messages on the
-        current virtual terminal, normally tty1, and start the graphical
-        environment on the first available unused virtual terminal, normally
-        tty7.  To do this, set the suid bit on the Xorg application as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>chmod u+s $XORG_PREFIX/bin/Xorg</userinput></screen>
-
-      <para>
-        At this point you can start Xorg on virtual terminal 7 with
-        <command>startx &lt;client arguments&gt; -- vt7</command>.  Now
-        you can toggle between tty1 and tty7 with the Ctrl-Alt-F1 and
-        Ctrl-Alt-F7 key combinations.
-      </para>
-
-      <para>
-        To automatically start Xorg on the first available virtual terminal,
-        modify the <command>startx</command> script as the  <systemitem
-        class="username">root</systemitem> user with:
-      </para>
-
-<screen role="nodump"><userinput>sed -i '/$serverargs $vtarg/ s/serverargs/: #&amp;/' $XORG_PREFIX/bin/startx</userinput></screen>
-
-      <para>
-        After this change, the virtual terminal does not need to be
-        specified on the <command>startx</command> command line.
-      </para>
-
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>xinit and startx</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="startx">
-        <term><command>startx</command></term>
-        <listitem>
-          <para>
-            initializes an X session
-          </para>
-          <indexterm zone="xinit startx">
-            <primary sortas="b-startx">startx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xinit-bin">
-        <term><command>xinit</command></term>
-        <listitem>
-          <para>
-            is the X Window System initializer
-          </para>
-          <indexterm zone="xinit xinit">
-            <primary sortas="b-xinit">xinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xkeyboard-config-download-http
-  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.xz">
-  <!ENTITY xkeyboard-config-download-ftp  " ">
-  <!ENTITY xkeyboard-config-md5sum        "2f0b843b5283b82cae0402cbc4f374b4">
-  <!ENTITY xkeyboard-config-size          "880 KB">
-  <!ENTITY xkeyboard-config-buildsize     "20 MB">
-  <!ENTITY xkeyboard-config-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="xkeyboard-config" xreflabel="xkeyboard-config-&xkeyboard-config-version;">
-  <?dbhtml filename="xkeyboard-config.html"?>
-
-
-  <title>XKeyboardConfig-&xkeyboard-config-version;</title>
-
-  <indexterm zone="xkeyboard-config">
-    <primary sortas="a-XKeyboardConfig">XKeyboardConfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XKeyboardConfig</title>
-
-    <para>
-      The <application>XKeyboardConfig</application> package contains
-      the keyboard configuration database for the X Window System.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xkeyboard-config-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xkeyboard-config-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xkeyboard-config-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xkeyboard-config-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xkeyboard-config-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xkeyboard-config-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XKeyboardConfig Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (required for tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="pytest"/>, and
-      <xref linkend="xorg7-app"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XKeyboardConfig</title>
-
-    <para>
-      Install <application>XKeyboardConfig</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                href="../../xincludes/meson-buildtype-release.xml"/>
-<!-- the default for the xorg symlinks is false. So the change to
-     the symlink command is not needed. Note that those symlinks have
-     been deprecated since 2005...
-    <para>
-      <command>sed ... rules/meson.build</command>: Make sure
-      a symlink is created even if it already exists.
-    </para>
-    <para>
-      <parameter>- -with-xkb-rules-symlink=xorg</parameter>: By default, the
-      XKB rules installed are named "base". This creates symlinks named
-      "xorg" to those rules, which is the default name used by Xorg.
-    </para>
--->
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/share/X11/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/xorg-config.xml
===================================================================
--- x/installing/xorg-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,524 +1,0 @@
-<!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="xorg-config">
-  <?dbhtml filename="xorg-config.html"?>
-
-
-  <title>Xorg-&xorg-version; Testing and Configuration</title>
-
-  <indexterm zone="xorg-config">
-    <primary sortas="g-configuring-xorg">Configuring Xorg</primary>
-  </indexterm>
-
-  <sect2 id='X11-testing' xreflabel="Testing Xorg">
-    <title>Testing Xorg</title>
-
-    <note>
-      <para>
-        Before starting Xorg for the first time, is useful to
-        rebuild the library cache by running <userinput>ldconfig</userinput>
-        as the <systemitem class="username">root</systemitem> user.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        Before starting Xorg for the first time, is often needed to
-        reboot the system to ensure all appropriate daemons are started
-        and appropriate security issues are properly set.
-        As an alternative, logging out and logging back in may work, but as
-        of this writing has not been tested.
-      </para>
-    </note>
-
-    <warning>
-      <para>
-        If Xorg hangs for some reason (for example, lacking a proper
-        input driver), the system may stop responding 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>
-      To test the <application>Xorg</application> installation, issue
-      <command>startx</command>. This command brings up a rudimentary window
-      manager called <emphasis>twm</emphasis> with three xterm windows and one
-      xclock window.  The xterm window in the upper left is a login terminal and
-      running <emphasis>exit</emphasis> from this terminal will exit the
-      <application>X Window</application> session.  The third xterm window may
-      be obscured on your system by the other two xterms.
-    </para>
-
-    <note>
-      <para>
-        When testing <application>Xorg</application> with the
-        <application>twm</application> window manager, there will be several
-        warnings in the Xorg log file, <!--<filename revision="sysv">
-        /var/log/Xorg.0.log</filename><filename revision="systemd">-->
-        $HOME/.local/share/xorg/Xorg.0.log<!--</filename>-->, about missing font
-        files. In addition, there will be several warnings on the text mode
-        terminal (usually tty1) about missing fonts. These warnings do not
-        affect functionality, but can be removed if desired by installing
-        the <xref linkend="xorg7-legacy"/>.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        On systems with NVIDIA GPUs which are using the Nouveau kernel driver,
-        you may encounter occasional GPU crashes and hangs. If this problem
-        occurs, downgrade to the latest version of the Linux 6.1 kernel.
-        <!--https://gitlab.freedesktop.org/drm/nouveau/-/issues/257-->
-      </para>
-    </note>
-
-    <para>
-      Generally, there is no specific configuration required for
-      <application>Xorg</application>, but customization is possible. For
-      details, see <xref linkend='xconfig'/> below.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="checking-dri" xreflabel="Checking the DRI
-  installation">
-    <title>Checking the Direct Rendering Infrastructure (DRI)
-    Installation</title>
-
-    <para>
-      DRI is a framework for allowing software to access graphics hardware in
-      a safe and efficient manner. It is installed in
-      <application>X</application> by default (using
-      <application>Mesa</application>) if you have a supported video card.
-    </para>
-
-    <para>
-      To check if DRI drivers are installed properly, check the log file
-      <filename>$HOME/.local/share/xorg/Xorg.0.log</filename> (or
-      <filename>/var/log/Xorg.0.log</filename> if you have
-      built <xref linkend="xorg-server"/> with the suid bit) for
-      statements such as:
-    </para>
-
-<screen><literal>(II) modeset(0): [DRI2] Setup complete
-(II) modeset(0): [DRI2]   DRI driver: crocus
-(II) modeset(0): [DRI2]   VDPAU driver: va_gl</literal></screen>
-
-    <note>
-      <para>
-        DRI configuration may differ if you are using alternate drivers, such
-        as traditional DDX drivers, or the proprietary drivers from
-        <ulink url="https://www.nvidia.com/page/home.html">NVIDIA</ulink> or
-        <ulink url="https://www.amd.com/">AMD</ulink>.
-      </para>
-    </note>
-
-<!-- With elogind, this is not needed anymore
-    <para>
-      Although all users can use software acceleration, any hardware
-      acceleration (DRI2) is only available to <systemitem
-      class="username">root</systemitem> and members of the <systemitem
-      class="groupname">video</systemitem> group, but
-      <phrase revision="sysv"><emphasis>ConsoleKit2</emphasis></phrase>
-      <phrase revision="systemd"><emphasis>systemd-logind</emphasis></phrase>
-      takes care of adding any logged in user to the user ACL's of
-      <filename>/dev/dri/card*</filename>, the special file(s) allowing access
-      to hardware acceleration.<phrase revision="systemd"> So, no further
-      configuration is needed.</phrase>
-    </para>
-
-    <para revision="sysv">
-      If your driver is supported and <emphasis>ConsoleKit2</emphasis> is not
-      installed, add any users that might use X to the <systemitem
-      class="groupname">video</systemitem> group:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>usermod -a -G video <replaceable>&lt;username&gt;</replaceable></userinput></screen>
--->
-    <para>
-      Another way to determine if DRI is working properly is to use one of the
-      two optionally installed OpenGL demo programs in <xref
-      linkend="mesa"/>. From an X terminal, run <command>glxinfo -B</command>
-      and look for the phrase:
-    </para>
-
-<screen><computeroutput>name of display: :0
-display: :0  screen: 0
-direct rendering: Yes</computeroutput></screen>
-
-    <para>
-      If direct rendering is enabled, you can add verbosity by running
-      <command>LIBGL_DEBUG=verbose glxinfo</command>. This will show the
-      drivers, device nodes and files used by the DRI system.
-    </para>
-
-    <para>
-      To confirm that DRI2 hardware acceleration is working, you can (still in
-      the X terminal) run the command <command>glxinfo | grep -E "(OpenGL
-      vendor|OpenGL renderer|OpenGL version)"</command>.
-      If that reports something <emphasis>other than</emphasis>
-      <literal>Software Rasterizer</literal> then you have working
-      acceleration for the user who ran the command.
-    </para>
-
-    <para>
-      If your hardware does not have any DRI2 driver available, it will use a
-      Software Rasterizer for Direct Rendering. In such cases, you can use a
-      new, LLVM-accelerated, Software Rasterizer called LLVMPipe. In order to
-      build LLVMPipe just make sure that <xref linkend="llvm"/> is present at
-      Mesa build time. Note that all decoding is done on the CPU instead of
-      the GPU, so the display will run slower than with hardware acceleration.
-      To check if you are using LLVMpipe, review the output of the glxinfo
-      command above.  An example of the output using the Software Rasterizer
-      is shown below:
-    </para>
-
-<screen><computeroutput>OpenGL vendor string: VMware, Inc.
-OpenGL renderer string: Gallium 0.4 on llvmpipe (LLVM 3.5, 256 bits)
-OpenGL version string: 3.0 Mesa 10.4.5</computeroutput></screen>
-
-    <para>
-      You can also force LLVMPipe by exporting the
-      <envar>LIBGL_ALWAYS_SOFTWARE=1</envar> environment variable when
-      starting Xorg.
-    </para>
-
-    <para>
-      Again, if you have built the Mesa OpenGL demos, you can also run the test
-      program <command>glxgears</command>. This program brings up a window with
-      three gears turning. The X terminal will display how many frames were
-      drawn every five seconds, so this will give a rough benchmark. The window
-      is scalable, and the frames drawn per second is highly dependent on the
-      size of the window. On some hardware, <command>glxgears</command> will
-      run synchronized with the vertical refresh signal and the frame rate will
-      be approximately the same as the monitor refresh rate.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id="xorg-debug" xreflabel="Debugging Xorg">
-    <title>Debugging Xorg</title>
-
-    <para>
-      When starting xorg, there are a couple of ways to check what any
-      issues you may have.  If the system comes up, you can see what driver
-      is being used by running <command>xdriinfo</command>. If there are
-      issues or you just want to check, look at <filename>Xorg.0.log</filename>.
-    </para>
-
-    <para>
-      The location of <filename>Xorg.0.log</filename> depends on how Xorg is
-      installed.  If the instructions in the book are followed closely and
-      Xorg is started from the command line, it will be located in the
-      <filename class="directory">$HOME/.local/share/xorg/</filename> directory.
-      If Xorg is started by a display manager (e.g. <xref linkend='lightdm'/>,
-      <xref linkend='sddm'/>, or <xref linkend='gdm'/>) or if
-      <filename>$XORG_PREFIX/bin/Xorg</filename> has the suid bit set,
-      it will be located in the <filename class="directory">/var/log/</filename>
-      directory.
-    </para>
-
-    <bridgehead renderas="sect3">Xorg.0.log Issues</bridgehead>
-
-    <para>
-      When you look at Xorg.0.log, check for entries like (EE) or (WW).
-      Below are some common entries:
-    </para>
-
-    <bridgehead renderas="sect5">(WW) Open ACPI failed (/var/run/acpid.socket)</bridgehead>
-
-    <para>
-      This warning is because <xref linkend='acpid'/> is not installed. If you
-      are not on a laptop, it can be safely ignored. On a laptop, install
-      <xref linkend='acpid'/> to enable actions like recognizing when the lid is
-      closed.
-    </para>
-
-    <bridgehead renderas="sect5">(WW) VGA arbiter: cannot open kernel arbiter, no multi-card support</bridgehead>
-
-    <para>
-      This warning is displayed when a regular user starts Xorg.  The library
-      <filename>libpciaccess.so</filename> issues this warning when it
-      tries to open <filename>/dev/vga_arbiter</filename>.  If there is no
-      more than one legacy PCI (not PCIe) graphic cards on the system, it
-      can safely be ignored.  If really necessary, the
-      permissions of this device can be changed by adding a udev rule and
-      adding the local user to the video group. As the &root; user:
-    </para>
-
-<screen role="root"><userinput>cat > /etc/udev/rules.d/99-vga-arbiter.rules &lt;&lt; EOF
-# /etc/udev/rules.d/99-vga-arbiter.rules: Set vga_arbiter group/mode
-
-ACTION=="add", KERNEL=="vga_arbiter", GROUP="video" MODE="0660"
-EOF
-
-usermod -a -G video &lt;user running xorg&gt;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration" id="hybrid-graphics" xreflabel="Hybrid Graphics">
-    <title>Hybrid Graphics</title>
-
-    <para>
-      Hybrid Graphics is still in experimental state for Linux. Xorg Developers
-      have developed a technology called PRIME that can be used for switching
-      between integrated and muxless discrete GPU at will. Automatic switching
-      is not possible at the moment.
-    </para>
-
-    <para>
-      In order to use PRIME for GPU switching, make sure that you are using
-      Linux Kernel 3.4 or later (recommended). You will need latest DRI and
-      DDX drivers for your hardware and <application>Xorg Server</application>
-      1.13 or later.
-    </para>
-
-    <para>
-      <application>Xorg Server</application> should load both GPU drivers
-      automatically. You can check that by running:
-    </para>
-
-<screen><userinput>xrandr --listproviders</userinput></screen>
-
-    <para>
-      There should be two (or more) providers listed, for example:
-    </para>
-
-<screen><computeroutput>Providers: number : 2
-Provider 0: id: 0x7d cap: 0xb, Source Output, Sink Output, Sink Offload crtcs: 3 outputs: 4 associated providers: 1 name:modesetting
-Provider 1: id: 0x56 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 6 outputs: 1 associated providers: 1 name:modesetting</computeroutput></screen>
-
-    <!-- Well, both "id" and "name" are supposed to work here but after
-         the xf86-video-* removal all the names will be modesetting unless
-         a proprietary driver used... -->
-    <para>
-      In order to be able to run a GLX application on a discrete GPU, you will
-      need to run the following command, where &lt;provider&gt; is the id of
-      the more powerful discrete card, and &lt;sink&gt; is the id of card
-      which has a display connected:
-    </para>
-
-<screen><userinput>xrandr --setprovideroffloadsink <replaceable>&lt;provider&gt; &lt;sink&gt;</replaceable></userinput></screen>
-
-    <note>
-      <para>
-        With the <application>Xorg</application> modesetting driver,
-        which is DRI3 capable, the above command is no longer
-        necessary. It does no harm however.
-      </para>
-    </note>
-
-    <para>
-      Then, you will need to export the <envar>DRI_PRIME=1</envar> environment
-      variable each time you want the powerful GPU to be used. For example,
-
-<screen><userinput>DRI_PRIME=1 glxinfo | grep -E "(OpenGL vendor|OpenGL renderer|OpenGL version)"</userinput></screen>
-
-      will show OpenGL vendor, renderer and version for the discrete GPU.
-    </para>
-
-    <para>
-      If the last command reports same OpenGL renderer with and without
-      <envar>DRI_PRIME=1</envar>, you will need to check your installation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration" id='xconfig'>
-    <title>Setting up Xorg Devices</title>
-
-    <para>
-      For most hardware configurations, modern Xorg will automatically
-      get the server configuration correct without any user intervention. There
-      are, however, some cases where auto-configuration will be incorrect.
-      Following are some example manual configuration items that may be of use
-      in these instances.
-    </para>
-
-    <sect3 id="xinput">
-      <title>Setting up X Input Devices</title>
-      <para>
-        For most input devices, no additional configuration will be
-        necessary. This section is provided for informational purposes only.
-      </para>
-
-      <para>
-        A sample default XKB setup could look like the following (executed as
-        the <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/xkb-defaults.conf &lt;&lt; "EOF"
-<literal>Section "InputClass"
-    Identifier "XKB Defaults"
-    MatchIsKeyboard "yes"
-    Option "XkbLayout" "fr"
-    Option "XkbOptions" "terminate:ctrl_alt_bksp"
-EndSection</literal>
-EOF</userinput></screen>
-
-      <para>
-        The <quote>XkbLayout</quote> line is an example for a French (AZERTY)
-        keyboard. Change it to your keyboard model. That line is not needed for
-        a QWERTY (US) keyboard.
-      </para>
-    </sect3>
-
-    <sect3 id="xdisplay">
-      <title>Fine Tuning Display Settings</title>
-
-      <para>
-        If you want to set the monitor resolution for Xorg, first run
-        <command>xrandr</command> in a X terminal to list the supported
-        resolutions and the corresponding refresh rates.  For example, it
-        outputs the following for one monitor:
-      </para>
-
-<screen><computeroutput>Screen 0: minimum 16 x 16, current 5760 x 2160, maximum 32767 x 32767
-DP-1 connected primary 3840x2160+0+0 (normal left inverted right x axis y axis) 600mm x 340mm
-   3840x2160     59.98*+
-   2048x1536     59.95
-   1920x1440     59.90
-   1600x1200     59.87
-   1440x1080     59.99
-   1400x1050     59.98
-   1280x1024     59.89
-   1280x960      59.94
-   1152x864      59.96
-   1024x768      59.92
-   800x600       59.86
-   640x480       59.38</computeroutput></screen>
-
-      <para>
-        From the output we can see the monitor is identified
-        <literal>DP-1</literal>.  Select a suitable resolution from the
-        output list, for example <literal>1920x1440</literal>.  Then
-        as the &root; user, create a configuration file for the Xorg server:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/monitor-DP-1.conf &lt;&lt; "EOF"
-<literal>Section "Monitor"
-    Identifier  "DP-1"
-    Option      "PerferredMode" "1920x1440"
-EndSection</literal>
-EOF</userinput></screen>
-
-      <para>
-        Sometimes <command>xrandr</command> may fail to detect some
-        resolution settings supported by the monitor.  It usually happens
-        with virtual monitors of virtual machine managers like
-        <xref linkend='qemu'/> or VMWare: a virtual monitor actually
-        supports all pairs of integers in a range as the resolution, but
-        <command>xrandr</command> will only list a few.  To use a
-        resolution not listed by <command>xrandr</command>, first run
-        <command>cvt</command> to get the mode line for the resolution.
-        For example:
-      </para>
-
-      <screen><userinput>cvt 1600 900</userinput>
-<computeroutput><literal># 1600x900 59.95 Hz (CVT 1.44M9) hsync: 55.99 kHz; pclk: 118.25 MHz
-Modeline "1600x900_60.00"  118.25  1600 1696 1856 2112  900 903 908 934 -hsync +vsync</literal></computeroutput></screen>
-
-      <para>
-        As the &root; user, create a Xorg server configuration file
-        containing this mode line, and specify the mode as preferred mode:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/monitor-DP-1.conf &lt;&lt; "EOF"
-<literal>Section "Monitor"
-    Identifier  "DP-1"
-    Modeline    "1600x900_60.00"  118.25  1600 1696 1856 2112  900 903 908 934 -hsync +vsync
-    Option      "PerferredMode"   "1600x900_60.00"
-EndSection</literal>
-EOF</userinput></screen>
-
-      <para>
-        Some high-end LCD monitors support a refresh rate higher than 100 Hz
-        but <command>xrandr</command> may fail to recognize the supported
-        refresh rate and use 60 Hz instead.  This issue would prevent you
-        from utilizing the full capability of the monitor, and may cause
-        the screen to flicker or show <quote>artifacts</quote> like meshes
-        or grids.  To resolve the issue, again use <command>cvt</command>
-        to get the mode line with a custom refresh rate:
-      </para>
-
-      <screen><userinput>cvt 3840 2160 144</userinput>
-<computeroutput><literal># 3840x2160 143.94 Hz (CVT) hsync: 338.25 kHz; pclk: 1829.25 MHz
-Modeline "3840x2160_144.00"  1829.25  3840 4200 4624 5408  2160 2163 2168 2350 -hsync +vsync</literal></computeroutput></screen>
-
-      <para>
-        Then paste it into the Xorg server configuration file and set it
-        as the preferred mode.
-      </para>
-
-      <para>
-        Another common setup is having multiple server layouts for use in
-        different environments. Though the server will automatically detect the
-        presence of another monitor, it may get the order incorrect:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/server-layout.conf &lt;&lt; "EOF"
-<literal>Section "ServerLayout"
-    Identifier     "DefaultLayout"
-    Screen      0  "Screen0" 0 0
-    Screen      1  "Screen1" LeftOf "Screen0"
-    Option         "Xinerama"
-EndSection</literal>
-EOF</userinput></screen>
-
-      <para>
-        When you drag a window in twm (or any non-compositing window
-        manager) horizontally, you may observe that the vertical borders
-        of the window are broken into multiple segments.  This is an example
-        of the visual artifacts called <emphasis>screen tearing</emphasis>.
-        To resolve the screen tearing problems, create a configuration file
-        that enables the TearFree option. Note that you must have the
-        Tearfree patch applied from <xref role="nodep"
-        linkend="xorg-server"/> for this to function properly, and it may
-        increase memory allocation and reduce performance.
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/20-tearfree.conf &lt;&lt; "EOF"
-<literal>Section "Device"
-   Identifier "Graphics Adapter"
-   Driver     "modesetting"
-   Option     "TearFree" "true"
-EndSection</literal>
-EOF</userinput></screen>
-
-      <para>
-        With modern Xorg, little or no additional graphic card configuration
-        is necessary. If you should need extra options passed to your video
-        driver, add them into the <literal>Device</literal> section as well.
-        The options supported by the modesetting driver are documented in
-        the man page <ulink role='man'
-        url='&man;modesetting.4'>modesetting(4)</ulink>.
-      </para>
-
-    </sect3>
-  </sect2>
-</sect1>
Index: installing/xorg-server-kernel.xml
===================================================================
--- x/installing/xorg-server-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt;*/M&gt;   <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-                                                                      ...  [DRM]
-    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>RM driver for VMware Virtual GPU                       [DRM_VMWGFX]
-    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>RM Support for bochs dispi vga interface (qemu stdvga)  [DRM_BOCHS]
-    &lt; /*/M&gt; <emphasis role='blue'>V</emphasis>irtual Box Graphics Card                            [DRM_VBOXVIDEO]</screen>
Index: installing/xorg-server-simpledrm-kernel.xml
===================================================================
--- x/installing/xorg-server-simpledrm-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
-    [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
-  <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-                                                                      ...  [DRM]
-    &lt;*&gt; <emphasis role='blue'>S</emphasis>imple framebuffer driver                                [DRM_SIMPLEDRM]</screen>
Index: installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,434 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz">
-  <!ENTITY xorg-server-download-ftp  " ">
-  <!ENTITY xorg-server-md5sum        "69dbed93746d0af6b46de76d711614e4">
-  <!ENTITY xorg-server-size          "4.7 MB">
-  <!ENTITY xorg-server-buildsize     "147 MB (with tests)">
-  <!ENTITY xorg-server-time          "0.3 SBU (using parallelism=4; with tests)">
-  <!ENTITY modesetting_drv
-           "<filename class='libraryfile'>modesetting_drv</filename>">
-  <!ENTITY BLFS113 "https://www.linuxfromscratch.org/blfs/view/11.3/x/x7driver.html">
-  <!ENTITY BLFS76 "https://www.linuxfromscratch.org/blfs/view/7.6/x/x7driver.html">
-]>
-
-<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
-  <?dbhtml filename="xorg-server.html"?>
-
-
-  <title>Xorg-Server-&xorg-server-version;</title>
-
-  <indexterm zone="xorg-server">
-    <primary sortas="a-xorg-server">xorg-server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Server</title>
-
-    <para>
-      The <application>Xorg</application> Server is the core
-      of the X Window system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xorg-server-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xorg-server-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xorg-server-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xorg-server-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xorg-server-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xorg-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          With the removal of the xf86-video-* drivers, the TearFree option
-          is no longer functional. To work around this, upstream has added the
-          TearFree option to the default modesetting driver. This patch
-          backports this feature. Apply this patch if you are going to use Xorg
-          in an environment without a compositor (such as TWM, IceWM, Openbox,
-          or Fluxbox).
-        </para>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-tearfree_backport-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxcvt"/>,
-      <xref linkend="pixman"/>,
-      <xref linkend="xorg7-font"/> (only font-util), and at runtime:
-      <xref role="runtime" linkend="xkeyboard-config"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend='dbus'/>,
-      <xref role="runtime" linkend="elogind"/> (runtime;
-      <systemitem class='library'>libelogind</systemitem> also referred
-      at build time but it's not really useful),</phrase>
-      <xref linkend="libepoxy"/> (needed for glamor),
-      <xref linkend="libtirpc"/>,
-      <phrase revision="systemd"><xref role="runtime"
-                                       linkend="systemd"/> (runtime),</phrase>
-      and <xref role='runtime' linkend='xorg-libinput-driver'/> (runtime)
-    </para>
-
-    <!-- TODO: Add -Dsystemd_logind=yes explicitly (like -Dglamor=true) to
-         make this more clear for BLFS 12.2.  Now (Feb 16 2024) this package
-         is already under 12.1 freeze. -->
-    <note>
-      <para>
-        Although it's possible to<phrase revision='sysv'> build this package
-        without <xref linkend='dbus'/> installed or</phrase> run the Xorg
-        server without
-        <phrase revision='sysv'><xref linkend='elogind'/></phrase><phrase
-        revision='systemd'><xref linkend='systemd'/>
-        (rebuilt with PAM)</phrase> functioning, it would require running
-        the Xorg server as the &root; user or Xorg server will malfunction
-        or even fail to start.  The BLFS editors strongly discourage
-        skipping <phrase revision='sysv'>these two
-        dependencies</phrase><phrase revision='systemd'>this
-        dependency</phrase>.  Do not attempt to do so unless you really know
-        what you are doing.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="acpid"/> (runtime),
-      <xref linkend="doxygen"/> (to build API documentation),
-      <xref linkend="fop"/> (to build documentation),
-      <xref linkend="libunwind"/>,
-      <xref linkend="nettle"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-renderutil"/>,
-      <xref linkend="xcb-util-wm"/> (all four to build Xephyr),
-      <xref linkend="xmlto"/> (to build documentation),
-      <xref linkend="xkeyboard-config"/> (for tests),
-      <ulink url="https://gitlab.freedesktop.org/xorg/test/rendercheck">rendercheck</ulink> (for tests), and
-      <ulink url="https://www.x.org/archive/individual/doc/">xorg-sgml-doctools</ulink> (to build documentation)
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="xorg-server-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      The traditional Device Dependent X (DDX) drivers have been removed
-      from BLFS in favor of the &modesetting_drv; driver which will be
-      built as a part of this package.  To use the &modesetting_drv; driver,
-      the kernel must provide a Direct Rendering Manager (DRM) driver for
-      your GPU.
-    </para>
-
-    <para>
-      If your GPU supports 3D acceleration and <xref linkend='mesa'/>
-      provides a Gallium3D driver for utilizing its 3D capability, you
-      should have already enabled the necessary kernel configuration options
-      in <xref linkend='mesa-kernel'/>.  Otherwise, you need to find the
-      kernel configuration option of the DRM driver for the GPU and enable
-      it.  Notably, the virtual GPUs provided by some virtual machine
-      managers:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="xorg-server-kernel.xml"/>
-
-    <para>
-      If the kernel does not provide a DRM driver for your GPU, on most x86
-      systems the <quote>simple frame buffer</quote> DRM driver running on
-      VESA or UEFI frame buffer can be used as a fallback.  Enable the
-      following options in the kernel configurations if you don't have a
-      dedicated DRM driver for the GPU, or you want to keep the simple
-      frame buffer driver as a fallback in case the dedicated driver fails:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="xorg-server-simpledrm-kernel.xml"/>
-
-    <para>
-      To allow the kernel to print debug messages at an early boot stage,
-      <option>CONFIG_DRM</option> and <option>CONFIG_DRM_SIMPLEDRM</option>
-      should not be built as kernel modules unless an initramfs will be
-      used.
-    </para>
-
-    <para>
-      If you want to use the simple frame buffer driver on a system booted
-      via BIOS (instead of UEFI), add the following line before the first
-      <literal>menuentry</literal> block in the
-      <filename>/boot/grub/grub.cfg</filename> file to initialize the VESA
-      frame buffer:
-    </para>
-
-<screen><literal>set gfxpayload=<replaceable>1024x768x32</replaceable></literal></screen>
-
-    <para>
-      You may replace <literal>1024</literal>, <literal>768</literal>, and
-      <literal>32</literal> with a resolution and color depth setting
-      suitable for your monitor.
-    </para>
-
-    <para>
-      If all of these DRM drivers do not work for you and you need to use
-      a DDX driver with a non-DRM kernel GPU driver (usually named
-      <option>CONFIG_FB_*</option> in the kernel configuration, or existing
-      as out-tree kernel modules), or you need an device specific
-      functionality requiring a DDX driver, consult
-      <ulink url="&BLFS113;">a prior version of BLFS</ulink>, or
-      <ulink url="&BLFS76;">an even earlier prior version</ulink> for more DDX
-      drivers.
-    </para>
-
-    <indexterm zone="xorg-server xorg-server-kernel">
-      <primary sortas="d-xorg-server">xorg-server</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Server</title>
-
-    <para>
-      First, if you need the TearFree option to work around screen tearing,
-      apply the backported patch:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../xorg-server-&xorg-server-version;-tearfree_backport-1.patch</userinput></screen>
-
-    <para>
-      Install the server by running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..              \
-      --prefix=$XORG_PREFIX \
-      --localstatedir=/var  \
-      -Dglamor=true         \
-      -Dxkb_output_dir=/var/lib/xkb &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. You
-      will need to run <command>ldconfig</command> as the <systemitem
-      class="username">root</systemitem> user first or some tests may fail.
-    </para>
-
-    <para>
-      Now as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-mkdir -pv /etc/X11/xorg.conf.d &amp;&amp;
-install -v -d -m1777 /tmp/.{ICE,X11}-unix &amp;&amp;
-cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-<literal>/tmp/.ICE-unix dir 1777 root root
-/tmp/.X11-unix dir 1777 root root</literal>
-EOF</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>ninja install &amp;&amp;
-mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dglamor=true</parameter>: Ensure building the Glamor
-      module.  It's needed to build the &modesetting_drv; driver
-      which replaces the traditional Device Dependent X (DDX) drivers.
-    </para>
-
-    <para>
-      <option>-Dsuid_wrapper=true</option>: Builds the suid-root
-      wrapper for legacy DDX driver support on rootless xserver systems.
-    </para>
-<!-- commented out because this option defaults to auto
-    <para>
-      <option>-Dsystemd_logind=false</option>:
-      This switch disables <phrase revision="systemd">systemd-logind</phrase>
-      <phrase revision="sysv">elogind</phrase> integration, allowing Xorg Server
-      to work without having the <phrase revision="systemd">systemd</phrase>
-      <phrase revision="elogind">elogind</phrase> PAM module configured.
-    </para>
--->
-    <para revision="sysv">
-      <command>cat &gt;&gt; /etc/sysconfig/createfiles...</command>: This
-      command creates the <filename class="directory">/tmp/.ICE-unix</filename>
-      and <filename class="directory">/tmp/.X11-unix</filename> directories at
-      startup, and ensures that the permissions and ownership are correct as
-      required by the server.
-    </para>
-
-    <para>
-      <option>-Dxephyr=true</option>: This option allows building Xephyr if its
-      dependencies are met.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtf, X, Xnest, Xorg, Xvfb, and optionally Xephyr
-        </seg>
-        <seg>
-          several under $XORG_PREFIX/lib/xorg/modules/ including the
-          &modesetting_drv; driver
-        </seg>
-        <seg>
-          /etc/X11/xorg.conf.d,
-          $XORG_PREFIX/include/xorg,
-          $XORG_PREFIX/lib/xorg, and
-          $XORG_PREFIX/share/X11/xorg.conf.d
-        </seg>
-
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtf-x7">
-        <term><command>gtf</command></term>
-        <listitem>
-          <para>
-            calculates VESA GTF mode lines
-          </para>
-          <indexterm zone="xorg-server gtf-x7">
-            <primary sortas="b-gtf">gtf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="X-x7">
-        <term><command>X</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to Xorg
-          </para>
-          <indexterm zone="xorg-server X-x7">
-            <primary sortas="b-X">X</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xephyr-x7">
-        <term><command>Xephyr</command></term>
-        <listitem>
-          <para>
-            is a nested X server which supports modern X extensions
-          </para>
-          <indexterm zone="xorg-server Xephyr-x7">
-            <primary sortas="b-Xephyr">Xephyr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xnest-x7">
-        <term><command>Xnest</command></term>
-        <listitem>
-          <para>
-            is a nested X server
-          </para>
-          <indexterm zone="xorg-server Xnest-x7">
-            <primary sortas="b-Xnest">Xnest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xorg-x7">
-        <term><command>Xorg</command></term>
-        <listitem>
-          <para>
-            is the X11R7 X Server
-          </para>
-          <indexterm zone="xorg-server Xorg-x7">
-            <primary sortas="b-Xorg">Xorg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xvfb-x7">
-        <term><command>Xvfb</command></term>
-        <listitem>
-          <para>
-            is the virtual framebuffer X server for X Version 11
-          </para>
-          <indexterm zone="xorg-server Xvfb-x7">
-            <primary sortas="b-Xvfb">Xvfb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modesetting_drv-x7">
-        <term><filename class="libraryfile">modesetting_drv.so</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="xorg-server modesetting_drv-x7">
-            <primary sortas="c-modesetting_drv">modesetting_drv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="xorg7" xreflabel="Xorg-&xorg-version;">
-  <?dbhtml filename="xorg7.html"?>
-
-
-  <title>Introduction to Xorg-&xorg-version;</title>
-
-  <indexterm zone="xorg7">
-    <primary sortas="a-xorg7">Xorg</primary>
-  </indexterm>
-
-
-  <para>
-    <application>Xorg</application> is a freely redistributable,
-    open-source implementation of the <application>X</application> Window
-    System. This system provides a client/server interface between display
-    hardware (the mouse, keyboard, and video displays) and the desktop
-    environment, while also providing both the windowing infrastructure and a
-    standardized application interface (API).
-  </para>
-
-  <bridgehead renderas="sect3">Xorg Download and Installation
-  Instructions</bridgehead>
-
-  <para>
-    Xorg-7.0 introduced a completely auto-tooled, modular build system.
-    With the new modular build system, it is no longer possible to download
-    the entire package in a single file. In fact, there will be well over 100
-    packages that need to be fetched from the download location. To assist
-    with such a large task, installing <xref linkend="wget"/> is strongly
-    recommended for downloading the needed files.  A complete
-    <application>wget</application> file list is provided for each page
-    that includes multiple packages.
-  </para>
-
-  <para>
-    Given the number of packages available, deciding which packages you
-    need to install for your particular setup may seem a bit overwhelming at
-    first.  Take a look at <ulink url=
-    "https://wiki.x.org/wiki/ModuleDescriptions">this page</ulink>
-    and <ulink url=
-    "https://lists.x.org/archives/xorg-modular/2005-November/000801.html">
-    this thread</ulink>
-    to get an idea of what you will need.  If you are unsure, you should
-    install all packages at the cost of extra disk space.
-  </para>
-
-  <note>
-    <para>
-      Even if you intend to download only the necessary packages, you
-      should download the wget file lists.  The list of files are ordered by
-      dependency, and the package versions listed in the files are known to
-      work well with each other. Further, the wget file lists contain comments
-      for specific packages that are deprecated or are not recommended to
-      install. Newer packages are likely intended for the
-      next release of <application>Xorg</application> and have already proved
-      to be incompatible with current versions of software installed in BLFS.
-      The installed size of <application>Xorg</application> can be reduced
-      considerably by installing only the packages that you will need and use,
-      however, the BLFS book cannot account for all dependencies and build
-      options for the individual <application>Xorg</application> packages.
-      The instructions assume that all packages have been built.
-    </para>
-  </note>
-
-  <para>
-    Additionally, because of the large number of repetitive commands,
-    you are encouraged to partially automate the build. Instructions have been
-    given that utilize the <xref linkend="sudo"/> package. It is recommended
-    that you use the <parameter>:NOPASSWD</parameter> configuration option
-    for the user that will be building the xorg packages.
-  </para>
-
-  <sect2 id="xorg-env" xreflabel="Xorg build environment">
-    <title>Setting up the Xorg Build Environment</title>
-
-    <note>
-      <para>
-        The following instructions assume that the shell
-        startup files have been set up as described in
-        <xref linkend="postlfs-config-profile" />.
-      </para>
-    </note>
-
-    <para>
-      As with previous releases of the X Window System, it may be
-      desirable to install <application>Xorg</application> into an alternate
-      prefix.  This is no longer common practice among Linux distributions.
-      The common installation prefix for <application>Xorg</application> on
-      Linux is <filename class="directory">/usr</filename>.  There is no
-      standard alternate prefix, nor is there any exception in the current
-      revision of the Filesystem Hierarchy Standard for Release 7 of the X
-      Window System.  Alan Coopersmith of Sun Microsystems, once
-      stated "At Sun, we were using
-      <filename class="directory">/usr/X11</filename> and plan to stick with
-      it."  Only the <filename class="directory">/opt/*</filename> prefix or
-      the <filename class="directory">/usr</filename> prefix adhere to the
-      current FHS guidelines.
-    </para>
-
-    <para>
-      The BLFS editors recommend using the <filename class="directory">/usr</filename>
-      prefix.
-    </para>
-
-    <para>
-      Choose your installation prefix, and set the <envar>XORG_PREFIX</envar>
-      variable with the following command:
-    </para>
-
-<screen><userinput>export XORG_PREFIX="<replaceable>&lt;PREFIX&gt;</replaceable>"</userinput></screen>
-
-    <para>
-      Throughout these instructions, you will use the following
-      <command>configure</command> switches for all of the packages. Create the
-      <envar>XORG_CONFIG</envar> variable to use for this parameter
-      substitution:
-    </para>
-
-<screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
-    --localstatedir=/var --disable-static"</userinput></screen>
-
-    <para>
-      Create an <filename>/etc/profile.d/xorg.sh</filename> configuration
-      file containing these variables as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/xorg.sh &lt;&lt; EOF
-<literal>XORG_PREFIX="$XORG_PREFIX"
-XORG_CONFIG="--prefix=\$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
-export XORG_PREFIX XORG_CONFIG</literal>
-EOF
-chmod 644 /etc/profile.d/xorg.sh</userinput></screen>
-
-    <note>
-      <para>
-        There is some confusion about the above 'here' document.
-        The backslash in front of the dollar sign is correct.  Bash
-        will remove it when creating /etc/profile.d/xorg.sh.  However, if
-        you are creating the file with an editor, a copy and paste operation
-        will not remove the backslash.  It must then be removed manually.
-      </para>
-    </note>
-
-    <para>
-      If you've installed <xref linkend="sudo"/>, ensure that
-      <envar>XORG_PREFIX</envar> and <envar>XORG_CONFIG</envar> are available
-      in the <application>sudo</application> environment. As the
-      <systemitem class="username">root</systemitem> user, run the following
-      command:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/xorg &lt;&lt; EOF
-<literal>Defaults env_keep += XORG_PREFIX
-Defaults env_keep += XORG_CONFIG</literal>
-EOF</userinput></screen>
-
-<bridgehead renderas="sect2">If you are not using the standard Xorg prefix...</bridgehead>
-
-    <warning>
-      <para>
-        If you've decided to use the standard <filename
-        class="directory">/usr</filename> prefix, you must omit the remainder of
-        this page and continue at <xref linkend='util-macros'/>.
-      </para>
-    </warning>
-
-    <para>
-      If you've decided to <emphasis>not</emphasis> use the standard
-      prefix, be sure to add <filename
-      class="directory">$XORG_PREFIX/bin</filename> to your <envar>PATH</envar>
-      environment variable, and <filename class="directory">
-      $XORG_PREFIX/lib/pkgconfig</filename> and <filename class="directory">
-      $XORG_PREFIX/share/pkgconfig</filename> to your
-      <envar>PKG_CONFIG_PATH</envar> variable. It is also helpful to specify
-      additional search paths for <command>gcc</command> and an include
-      directory for the <command>aclocal</command> program.  Issue the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
-<literal>
-pathappend $XORG_PREFIX/bin             PATH
-pathappend $XORG_PREFIX/lib/pkgconfig   PKG_CONFIG_PATH
-pathappend $XORG_PREFIX/share/pkgconfig PKG_CONFIG_PATH
-
-pathappend $XORG_PREFIX/lib             LIBRARY_PATH
-pathappend $XORG_PREFIX/include         C_INCLUDE_PATH
-pathappend $XORG_PREFIX/include         CPLUS_INCLUDE_PATH
-
-ACLOCAL="aclocal -I $XORG_PREFIX/share/aclocal"
-
-export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH</literal>
-EOF</userinput></screen>
-
-    <para>
-      The script above needs to be activated.  Normally it will be
-      automatic at login, but to activate it now, as a regular user, run:
-    </para>
-
-<screen role="nodump"><userinput>source /etc/profile.d/xorg.sh</userinput></screen>
-
-    <para>
-      You should also add
-      <filename class="directory"> $XORG_PREFIX/lib</filename> to the
-      <filename>/etc/ld.so.conf</filename> file. Again, as the
-      <systemitem class="username">root</systemitem> user, issue the following
-      command:
-    </para>
-
-<screen role="nodump"><userinput>echo "$XORG_PREFIX/lib" >> /etc/ld.so.conf</userinput></screen>
-
-    <para>
-      You should also modify
-      <filename>/etc/man_db.conf</filename>, adding appropriate
-      MANDATORY_MANPATH, MANPATH_MAP, and MANDB_MAP entries following the
-      examples for <filename class="directory">/usr/X11R6</filename>. Issue the
-      following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="nodump"><userinput>sed -e "s@<replaceable>X11R6/man</replaceable>@X11R6/share/man@g" \
-    -e "s@<replaceable>/usr/X11R6</replaceable>@$XORG_PREFIX@g"   \
-    -i /etc/man_db.conf</userinput></screen>
-
-    <para>
-      Some applications look for shared files in <filename
-      class="directory">/usr/share/X11</filename>.  Create a symbolic link to
-      the proper location as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="nodump"><userinput>ln -svf $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
-
-    <para>
-      If building KDE, some cmake files look for Xorg in places other than
-      $XORG_PREFIX.  Allow cmake to find Xorg with:
-    </para>
-
-<screen role="nodump"><userinput>ln -svf $XORG_PREFIX /usr/X11R6</userinput></screen>
-<!--
-    <para>
-      Finally, if building on x86_64, you will need to create the
-      <filename class="directory">$XORG_PREFIX/lib</filename> directory and the
-      <filename>$XORG_PREFIX/lib64</filename> symlink. Again, as the
-      <systemitem class="username">root</systemitem> user, issue the following
-      commands:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d $XORG_PREFIX &amp;&amp;
-install -v -m755 -d $XORG_PREFIX/lib &amp;&amp;
-ln -sf lib $XORG_PREFIX/lib64</userinput></screen>
--->
-  </sect2>
-
-</sect1>
Index: installing/xorgproto.xml
===================================================================
--- x/installing/xorgproto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xorgproto-download-http "https://xorg.freedesktop.org/archive/individual/proto/xorgproto-&xorgproto-version;.tar.xz">
-  <!ENTITY xorgproto-download-ftp  " ">
-  <!ENTITY xorgproto-md5sum        "12374d29fb5ae642cfa872035e401640">
-  <!ENTITY xorgproto-size          "744 KB">
-  <!ENTITY xorgproto-buildsize     "8.4 MB">
-  <!ENTITY xorgproto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xorgproto" xreflabel="xorgproto-&xorgproto-version;">
-  <?dbhtml filename="xorgproto.html"?>
-
-
-  <title>xorgproto-&xorgproto-version;</title>
-
-  <indexterm zone="xorgproto">
-    <primary sortas="a-xorgproto">xorgproto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xorgproto</title>
-
-    <para>
-      The <application>xorgproto</application> package provides the
-      header files required to build the X Window system, and to allow other
-      applications to build against the installed X Window system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xorgproto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xorgproto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xorgproto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xorgproto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xorgproto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xorgproto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xorgproto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="util-macros"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="fop"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/> (to build additional documentation)
-    </para>
-
-    <note>
-      <para>
-        There is a reciprocal dependency with <xref linkend="fop"/>. If
-        you wish to build the documentation, you'll need to re-install the
-        Protocol Headers after the installation is complete and
-        <xref linkend="fop"/> has been installed.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url='&blfs-wiki;/Xorg7ProtocolHeaders'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xorgproto</title>
-
-    <para>
-      Install <application>xorgproto</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX .. &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 &amp;&amp;
-mv -v $XORG_PREFIX/share/doc/xorgproto{,-&xorgproto-version;}</userinput></screen>
-<!--
-install -vdm 755 $XORG_PREFIX/share/doc/xorgproto-&xorgproto-version; &amp;&amp;
-install -vm 644 ../[^m]*.txt ../PM_spec $XORG_PREFIX/share/doc/xorgproto-&xorgproto-version;</userinput></screen>-->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dlegacy=true</option>: Installs legacy headers needed
-      by old programs (such as <ulink
-      url="https://lesstif.sourceforge.net/">LessTif</ulink>).
-    </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>None</seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/include/GL,
-          <envar>$XORG_PREFIX</envar>/include/X11, and
-          <envar>$XORG_PREFIX</envar>/share/doc/xorgproto-&xorgproto-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,265 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xterm-download-http "https://invisible-mirror.net/archives/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-download-ftp  " ">
-  <!ENTITY xterm-md5sum        "c3e71cfc6381d72fceb7165d324046d6">
-  <!ENTITY xterm-size          "1.5 MB">
-  <!ENTITY xterm-buildsize     "15 MB">
-  <!ENTITY xterm-time          "0.2 SBU (with parallelism=4)">
-]>
-
-<sect1 id="xterm2" xreflabel="xterm-&xterm-version;">
-  <?dbhtml filename="xterm.html"?>
-
-
-  <title>xterm-&xterm-version;</title>
-
-  <indexterm zone="xterm2">
-    <primary sortas="a-xterm2">xterm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xterm</title>
-
-    <para>
-      <application>xterm</application> is a terminal emulator for
-      the X Window System.
-    </para>
-
-    &not-katamari;
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xterm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xterm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xterm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xterm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xterm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xterm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xterm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="luit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (at runtime)</bridgehead>
-    <para role="required">
-      A monospace TTF or OTF font such as
-      <xref role="runtime" linkend="dejavu-fonts"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>, <!-- looks for ctags/etags -->
-      <xref linkend="pcre2"/>,
-      <xref linkend="valgrind"/> and
-      <ulink url="https://www.nongnu.org/man2html/">man2html</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xterm</title>
-
-    <para>
-      Install <application>xterm</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i '/v0/{n;s/new:/new:kb=^?:/}' termcap &amp;&amp;
-printf '\tkbs=\\177,\n' &gt;&gt; terminfo &amp;&amp;
-
-TERMINFO=/usr/share/terminfo \
-./configure $XORG_CONFIG     \
-    --with-app-defaults=/etc/X11/app-defaults &amp;&amp;
-
-make</userinput></screen>
-
-    <!--
-      there is a 'make check' but i havn't found a description
-      how the output should look like
-    -->
-    <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;
-
-mkdir -pv /usr/share/applications &amp;&amp;
-cp -v *.desktop /usr/share/applications/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... termcap</command>,
-      <command>printf ... >> terminfo</command>:
-      These commands modify the terminal description so that the Backspace
-      key is expected to send the character with ASCII code 127. This is done
-      for consistency with the Linux console.
-    </para>
-
-    <para>
-      <envar>TERMINFO=/usr/share/terminfo</envar>: This ensures
-      that the <command>xterm</command> terminfo files are installed to the
-      system terminfo database.
-    </para>
-
-    <para>
-      <parameter>--with-app-defaults=...</parameter>: Sets the location
-      for the <filename class="directory">app-defaults</filename>
-      directory.
-    </para>
-<!--
-    <para>
-      <command>make install-ti</command>: This command installs corrected
-      terminfo description files for use with
-      <application>xterm</application>.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xterm</title>
-
-    <para>
-      There are two ways to configure xterm.  You can add the X resource
-      definitions to the user's <filename>~/.Xresources</filename> file, or
-      add them to the system-wide
-      <filename>$XORG_PREFIX/share/X11/app-defaults/Xterm</filename> file.
-    </para>
-
-    <para>
-      In order for xterm to follow the locale settings in the environment,
-      use TrueType fonts, and follow the Linux convention about the code sent by
-      the Backspace key, add the following definitions as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/XTerm &lt;&lt; "EOF"
-<literal>*VT100*locale: true
-*VT100*faceName: Monospace
-*VT100*faceSize: 10
-*backarrowKeyIsErase: true
-*ptyInitialErase: true</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>koi8rxterm, resize, uxterm, and xterm</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="koi8rxterm">
-        <term><command>koi8rxterm</command></term>
-        <listitem>
-          <para>
-            is a wrapper script to set up xterm with a KOI8-R locale
-          </para>
-          <indexterm zone="xterm2 koi8rxterm">
-            <primary sortas="b-koi8rxterm">koi8rxterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resize">
-        <term><command>resize</command></term>
-        <listitem>
-          <para>
-            prints a shell command for setting the TERM and TERMCAP
-            environment  variables to indicate the current size of xterm
-            window
-          </para>
-          <indexterm zone="xterm2 resize">
-            <primary sortas="b-resize">resize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uxterm">
-        <term><command>uxterm</command></term>
-        <listitem>
-          <para>
-            is a wrapper script that modifies the current locale to use
-            UTF-8 and starts xterm with the proper settings
-          </para>
-          <indexterm zone="xterm2 uxterm">
-            <primary sortas="b-uxterm">uxterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xterm-bin">
-        <term><command>xterm</command></term>
-        <listitem>
-          <para>
-            is a terminal emulator for the X Window System
-          </para>
-          <indexterm zone="xterm2 xterm2">
-            <primary sortas="b-xterm2">xterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xwayland.xml
===================================================================
--- x/installing/xwayland.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,275 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xwayland-download-http "&xorg-download-http;/xserver/xwayland-&xwayland-version;.tar.xz">
-  <!ENTITY xwayland-download-ftp  " ">
-  <!ENTITY xwayland-md5sum        "8f2bb6789e22b5ea1f1f19694267e539">
-  <!ENTITY xwayland-size          "1.2 MB">
-  <!ENTITY xwayland-buildsize     "27 MB (add 362 MB for tests)">
-  <!ENTITY xwayland-time          "0.2 SBU (with parallelism=4; add 1.7 SBU for tests, not including clone time)">
-]>
-
-<sect1 id="xwayland" xreflabel="Xwayland-&xwayland-version;">
-  <?dbhtml filename="xwayland.html"?>
-
-
-  <title>Xwayland-&xwayland-version;</title>
-
-  <indexterm zone="xwayland">
-    <primary sortas="a-xwayland">xwayland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xwayland</title>
-
-    <para>
-      The <application>Xwayland</application> package is an Xorg server
-      running on top of the wayland server. It has been separated from the
-      main Xorg server package. It allows running X clients inside a
-      wayland session.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xwayland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xwayland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xwayland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xwayland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xwayland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xwayland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xwayland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxcvt"/>,
-      <xref linkend="pixman"/>,
-      <xref linkend="wayland-protocols"/>,
-      <xref role='runtime' linkend="xorg7-app"/> (runtime), and
-      <xref linkend="xorg7-font"/> (only font-util)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libepoxy"/>,
-      <xref linkend="libtirpc"/>, and
-      <xref linkend="mesa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (to download packages needed for the tests),
-      <xref linkend="libei"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="nettle"/>,
-      <xref linkend="xmlto"/>,
-      <xref linkend="xorg7-legacy"/>
-         (only bdftopcf, for building fonts required for the tests),
-      <ulink url="https://gitlab.freedesktop.org/xorg/test/rendercheck">rendercheck</ulink> (for tests), and
-      <ulink url="https://wayland.pages.freedesktop.org/weston/">weston</ulink> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xwayland</title>
-
-    <para>
-      Install <application>xwayland</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/install_man/,$d' meson.build &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX         \
-            --buildtype=release           \
-            -Dxkb_output_dir=/var/lib/xkb \
-            ..                            &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Building the test framework needs some work. First,
-      <ulink url="https://wayland.pages.freedesktop.org/weston/">weston</ulink>
-      brings in several dependencies, but the number can be reduced by
-      disabling unneeded features. The <command>meson</command> command
-      for a stripped down build of <application>weston</application> is shown
-      in <ulink
-      url="https://gitlab.freedesktop.org/xorg/xserver/-/blob/xwayland-22.1/.gitlab-ci/debian-install.sh">
-      Upstream continuous integration build</ulink>.
-<!-- keep 22.1 above: they used to build it in gitlab-ci because debian
-     had an obsolete version of weston, but now they take weston from
-     debian so the command to build it has been removed. -->
-    </para>
-<!--
-    <para>
-      Furthermore, an X server needs to be running during the build of
-      <application>xts</application>. If not running the tests in a
-      graphical environment, you'll need to enable <command>Xvfb</command>
-      by removing the <parameter>-Dxvfb=false</parameter> above. The
-      instructions below expect this has been done.
-    </para>
--->
-    <para>
-      Running the tests involves downloading two other frameworks, in addition
-      to the mentioned optional dependencies:
-    </para>
-
-<screen remap="test"><userinput>mkdir tools &amp;&amp;
-pushd tools &amp;&amp;
-
-git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1 &amp;&amp;
-cat &gt; piglit/piglit.conf &lt;&lt; EOF                                    &amp;&amp;
-<literal>[xts]
-path=$(pwd)/xts
-EOF</literal>
-
-git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1   &amp;&amp;
-
-export DISPLAY=:22           &amp;&amp;
-../hw/vfb/Xvfb $DISPLAY &amp;
-VFB_PID=$!                   &amp;&amp;
-cd xts                       &amp;&amp;
-CFLAGS=-fcommon ./autogen.sh &amp;&amp;
-make                         &amp;&amp;
-kill $VFB_PID                &amp;&amp;
-unset DISPLAY VFB_PID        &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      Then the tests can be run with:
-    </para>
-
-<screen remap="test"><userinput>XTEST_DIR=$(pwd)/tools/xts PIGLIT_DIR=$(pwd)/tools/piglit ninja test</userinput></screen>
-
-    <!-- The xfontset tests fail on my system -renodr -->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-<literal>/tmp/.X11-unix dir 1777 root root</literal>
-EOF</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If <xref linkend='xorg-server'/> is not installed and you do not plan
-      to install it later, you can install <command>Xvfb</command> from this
-      package.  As the &root; user:
-    </para>
-
-<screen role="nodump"><userinput>install -vm755 hw/vfb/Xvfb /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/install_man/,$d' meson.build</command>: Prevents
-      installing a manual page for <command>Xserver</command>,
-      which is also provided by <xref linkend='xorg-server'/>.  Remove this
-      command if <xref linkend='xorg-server'/> is not installed and you
-      don't plan to install it later.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-<!--
-    <para>
-      <parameter>-Dxvfb=false</parameter>: Prevents building the
-      <command>xvfb</command> program, which is also installed by
-      <xref linkend="xorg-server"/>. Remove this option if you do not plan to
-      install the X server.
-    </para>
-
-    <para>
-      <command>mkdir -pv /etc/X11/xorg.conf.d</command>: This directory is
-      needed to put configuration files for Xwayland. This command ensures
-      that it exists, as some applications might use it without first
-      creating it.
-    </para>
--->
-    <para revision="sysv">
-      <command>cat &gt;&gt; /etc/sysconfig/createfiles...</command>: This
-      command creates the <filename class="directory">/tmp/.X11-unix</filename>
-      directory at startup, and ensures that the permissions and ownership
-      are correct as required by applications using Xwayland.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          Xwayland
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="Xwayland">
-        <term><command>Xwayland</command></term>
-        <listitem>
-          <para>
-            Allows X clients to run under wayland
-          </para>
-          <indexterm zone="xwayland Xwayland">
-            <primary sortas="b-Xwayland">Xwayland</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: lib/at-spi2-core.xml
===================================================================
--- x/lib/at-spi2-core.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 at-spi2-core-download-http
-           "&gnome-download-http;/at-spi2-core/2.52/at-spi2-core-&at-spi2-core-version;.tar.xz">
-  <!ENTITY at-spi2-core-download-ftp  " ">
-  <!ENTITY at-spi2-core-md5sum        "e6591545b2bf204fe9a58f777bd0b78a">
-  <!ENTITY at-spi2-core-size          "564 KB">
-  <!ENTITY at-spi2-core-buildsize     "15 MB (with tests)">
-  <!ENTITY at-spi2-core-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="at-spi2-core" xreflabel="at-spi2-core-&at-spi2-core-version;">
-  <?dbhtml filename="at-spi2-core.html"?>
-
-
-  <title>at-spi2-core-&at-spi2-core-version;</title>
-
-  <indexterm zone="at-spi2-core">
-    <primary sortas="a-at-spi2-core">at-spi2-core</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to At-Spi2 Core</title>
-
-    <para>
-      The <application>At-Spi2 Core</application> package contains a
-      comprehensive accessibility framework for the Assistive Technologies
-      available on the <application>GNOME</application> platform. This includes
-      a set of interfaces which are implemented by other toolkits and
-      applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&at-spi2-core-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&at-spi2-core-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &at-spi2-core-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &at-spi2-core-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &at-spi2-core-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &at-spi2-core-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">At-Spi2 Core Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME),
-      <!-- Reports "Cannot get the default GSettingsSchemaSource" on
-           startup w/o it. -->
-      <xref role="runtime" linkend="gsettings-desktop-schemas"/> (Runtime),
-      and <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and <xref linkend='sphinx'/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of At-Spi2 Core</title>
-
-    <para>
-      Install <application>At-Spi2 Core</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dsystemd_user_dir=/tmp &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite requires the glib schemas of the package to be
-      installed already. The tests also need to run in a graphical
-      environment.  To test the results, install the package first,
-      then issue: <command>dbus-run-session ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
-<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-rm /tmp/at-spi-dbus-bus.service</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 revision="sysv">
-      <parameter>-Dsystemd_user_dir=/tmp</parameter>: This flag puts the
-      systemd unit file in /tmp where it will be removed. SysV is unable to
-      use this file.
-    </para>
-
-    <para>
-      <option>-Ddocs=true</option>: Use this switch if you want to build the
-      documentation. Note that you must have both
-      <xref role="nodep" linkend="gi-docgen"/>
-      and <xref linkend='sphinx'/> installed on your system.
-    </para>
-
-    <!-- For when we remove gtk2 from the book:
-    <para>
-      <parameter>-Dgtk2_atk_adaptor=false</parameter>: This switch disables
-      building the GTK+-2 module for this package.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <!-- <seg> No user executable programs
-          at-spi-bus-launcher and at-spi2-registryd in /usr/libexec
-        </seg> -->
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatk-1.0.so,
-          libatk-bridge-2.0.so,
-          libatspi.so, and
-          /usr/lib/gtk-2.0/modules/libatk-bridge.so
-        </seg>
-        <seg>
-          /usr/include/atk-1.0,
-          /usr/include/at-spi-2.0,
-          /usr/include/at-spi2-atk,
-          /usr/lib/gnome-settings-daemon-3.0,
-          /usr/share/defaults/at-spi2, and
-          /usr/share/gtk-doc/html/libatspi (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <!-- Not user executable programs
-      <varlistentry id="at-spi2-registryd">
-        <term><command>at-spi2-registryd</command></term>
-        <listitem>
-          <para>
-            is the <application>At-Spi2</application> registry daemon.
-          </para>
-          <indexterm zone="at-spi2-core at-spi2-registryd">
-            <primary sortas="b-at-spi2-registryd">at-spi2-registryd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    -->
-
-      <varlistentry id="libatk-1.0">
-        <term><filename class="libraryfile">libatk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that are used by assistive technologies to
-            interact with desktop applications
-          </para>
-          <indexterm zone="at-spi2-core libatk-1.0">
-            <primary sortas="c-libatk-1.0">libatk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatk-bridge">
-        <term><filename class="libraryfile">libatk-bridge.so</filename></term>
-        <listitem>
-          <para>
-            contains the Accessibility Toolkit GTK+-2 bridge
-          </para>
-          <indexterm zone="at-spi2-core libatk-bridge">
-            <primary sortas="c-libatk-bridge">libatk-bridge.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatk-bridge-2.0">
-        <term><filename class="libraryfile">libatk-bridge-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the Accessibility Toolkit GTK+ module
-          </para>
-          <indexterm zone="at-spi2-core libatk-bridge-2.0">
-            <primary sortas="c-libatk-bridge-2.0">libatk-bridge-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatspi">
-        <term><filename class="libraryfile">libatspi.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>At-Spi2</application> API functions
-          </para>
-          <indexterm zone="at-spi2-core libatspi">
-            <primary sortas="c-libatspi">libatspi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="ATK" xreflabel="ATK-&ATK-version;">
+<?dbhtml filename="atk.html" dir="x"?>
+<title>ATK-&ATK-version;</title>
+
+&ATK-intro;
+&ATK-inst;
+&ATK-config;
+&ATK-desc;
+
+</sect1>
+
Index: x/lib/atk/atk-config.xml
===================================================================
--- x/lib/atk/atk-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring ATK</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/atk/atk-desc.xml
===================================================================
--- x/lib/atk/atk-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The atk package contains <userinput>ATK Libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ATK Libraries</title>
+<para>ATK Libraries contain the API used by assistive technologies in order to 
+interact with the desktop and applications.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/atk/atk-inst.xml
===================================================================
--- x/lib/atk/atk-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of ATK</title>
+
+<para>Install ATK by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/atk/atk-intro.xml
===================================================================
--- x/lib/atk/atk-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to ATK</title>
+
+<screen>Download location:              <ulink url="&ATK-download;"/>
+Version used:                   &ATK-version;
+Package size:                   &ATK-size;
+Estimated Disk space required:  &ATK-buildsize;</screen>
+
+<para>The atk package contains the ATK libraries. They are useful for
+allowing accessibility solutions to be available for all GTK2
+applications.</para>
+
+<screen>ATK depends on:
+<xref linkend="GLib2"/></screen>
+
+</sect2>
Index: x/lib/atk/atk.ent
===================================================================
--- x/lib/atk/atk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY ATK SYSTEM "../atk.xml">
+<!ENTITY ATK-intro SYSTEM "atk-intro.xml">
+<!ENTITY ATK-inst SYSTEM "atk-inst.xml">
+<!ENTITY ATK-desc SYSTEM "atk-desc.xml">
+<!ENTITY ATK-config SYSTEM "atk-config.xml">
+<!ENTITY ATK-buildsize "3 MB">
+<!ENTITY ATK-version "1.0.2">
+<!ENTITY ATK-download "ftp://ftp.gtk.org/pub/gtk/v2.0/atk-1.0.2.tar.gz">
+<!ENTITY ATK-size "340 KB">
Index: lib/atkmm.xml
===================================================================
--- x/lib/atkmm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 atkmm-download-http "&gnome-download-http;/atkmm/2.28/atkmm-&atkmm-version;.tar.xz">
-  <!ENTITY atkmm-download-ftp  " ">
-  <!ENTITY atkmm-md5sum        "e0f7271990c89a6c9987f215ba47bfc5">
-  <!ENTITY atkmm-size          "724 KB">
-  <!ENTITY atkmm-buildsize     "14 MB">
-  <!ENTITY atkmm-time          "0.2 SBU">
-]>
-
-<sect1 id="atkmm" xreflabel="Atkmm-&atkmm-version;">
-  <?dbhtml filename="atkmm.html"?>
-
-
-  <title>Atkmm-&atkmm-version;</title>
-
-  <indexterm zone="atkmm">
-    <primary sortas="a-Atkmm">Atkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Atkmm</title>
-
-    <para>
-      <application>Atkmm</application> is the official C++ interface for the
-      ATK accessibility toolkit library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&atkmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&atkmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &atkmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &atkmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &atkmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &atkmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Atkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/> and
-      <xref linkend="glibmm"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Atkmm</title>
-
-    <para>
-      Install <application>Atkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatkmm-1.6.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/atkmm-1.6 and
-          /usr/share/{devhelp/books/atkmm-1.6,doc/atkmm-&atkmm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatkmm-1">
-        <term><filename class="libraryfile">libatkmm-1.6.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>ATK</application> API classes
-          </para>
-          <indexterm zone="atkmm libatkmm-1">
-            <primary sortas="c-libatkmm-1">libatkmm-1.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/atkmm2.xml
===================================================================
--- x/lib/atkmm2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 atkmm-download-http "&gnome-download-http;/atkmm/2.36/atkmm-&atkmm2-version;.tar.xz">
-  <!ENTITY atkmm-download-ftp  " ">
-  <!ENTITY atkmm-md5sum        "8b03a39a5e3dd0d3c040ece345f7a786">
-  <!ENTITY atkmm-size          "780 KB">
-  <!ENTITY atkmm-buildsize     "11 MB">
-  <!ENTITY atkmm-time          "0.2 SBU">
-]>
-
-<sect1 id="atkmm2" xreflabel="Atkmm-&atkmm-version;">
-  <?dbhtml filename="atkmm2.html"?>
-
-
-  <title>Atkmm-&atkmm2-version;</title>
-
-  <indexterm zone="atkmm2">
-    <primary sortas="a-Atkmm2">Atkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Atkmm</title>
-
-    <para>
-      <application>Atkmm</application> is the official C++ interface for the
-      ATK accessibility toolkit library. This version is part of a new API for
-      supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&atkmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&atkmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &atkmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &atkmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &atkmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &atkmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Atkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/> and
-      <xref linkend="glibmm2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Atkmm</title>
-
-    <para>
-      Install <application>Atkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatkmm-2.36.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/atkmm-2.36 and
-          /usr/share/{devhelp/books/atkmm-2.36,doc/atkmm-&atkmm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatkmm-2">
-        <term><filename class="libraryfile">libatkmm-2.36.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>ATK</application> API classes
-          </para>
-          <indexterm zone="atkmm2 libatkmm-2">
-            <primary sortas="c-libatkmm-2">libatkmm-2.36.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,299 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cairo-download-http "https://www.cairographics.org/releases/cairo-&cairo-version;.tar.xz">
-  <!--<!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-ftp  " ">
-  <!ENTITY cairo-md5sum        "3f0685fbadc530606f965b9645bb51d9">
-  <!ENTITY cairo-size          "32 MB">
-  <!ENTITY cairo-buildsize     "98 MB">
-  <!ENTITY cairo-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
-  <?dbhtml filename="cairo.html"?>
-
-
-  <title>Cairo-&cairo-version;</title>
-
-  <indexterm zone="cairo">
-    <primary sortas="a-Cairo">Cairo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cairo</title>
-
-    <para>
-      <application>Cairo</application> is a 2D graphics library with support for
-      multiple output devices. Currently supported output targets include the
-      <application>X</application> Window System, Win32, image buffers,
-      PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
-      XCB file output. <application>Cairo</application> is designed to produce
-      consistent output on all output media while taking advantage of display
-      hardware acceleration when available (e.g., through the X Render
-      Extension). The <application>Cairo</application> API provides operations
-      similar to the drawing operators of PostScript and PDF. Operations in
-      <application>Cairo</application> include stroking and filling cubic
-      B&eacute;zier splines, transforming and compositing translucent images,
-      and antialiased text rendering. All drawing operations can be transformed
-      by any
-      <ulink url="https://en.wikipedia.org/wiki/Affine_transformation">affine
-      transformation</ulink> (scale, rotation, shear, etc.).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/> and
-      <xref linkend="pixman"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="fontconfig"/>,
-      <xref linkend="glib2"/> (required for most GUIs), and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="cogl"/>,-->
-      <xref linkend="gs"/>,
-      <xref linkend="gtk3"/> and <xref linkend="gtk2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdrm"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="poppler"/>,
-      <!--&qt5-deps;,-->
-      <xref linkend="valgrind"/>,
-      <!--<ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>,-->
-      <ulink url="https://github.com/rillian/jbig2dec/">jbig2dec</ulink>,
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre/">libspectre</ulink>, and
-      <ulink url="https://skia.org/">Skia</ulink>
-      <!--<ulink url="https://download.qt.io/archive/qt/4.8/">Qt4</ulink>.-->
-    </para>
-
-    <note>
-      <para>
-        There is a circular dependency between cairo and harfbuzz.
-        If cairo is built before harfbuzz, it is necessary to rebuild cairo
-        after harfbuzz in order to build pango.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cairo</title>
-
-    <!-- /usr/include/ansidecl.h says "This file is part of the GNU C
-    Library", but it's actually installed by Binutils.  -->
-<!--
-    <para>
-      Adapt this package for Binutils-2.39 or later:
-    </para>
-
-<screen><userinput>sed 's/PTR/void */' -i util/cairo-trace/lookup-symbol.c</userinput></screen>
-
-    <para>
-      Fix a pkg-config file that may cause errors later:
-    </para>
-
-<screen><userinput>sed -e "/@prefix@/a exec_prefix=@exec_prefix@" \
-    -i util/cairo-script/cairo-script-interpreter.pc.in</userinput></screen>
--->
-
-    <para>
-      Install <application>Cairo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not have a working test suite.
-      <!-- The test suite can be run with 'ninja test', 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>
-
-    <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>
-
-<!-- Enabled by default in 1.18.0 (would be -Dtee=enabled otherwise)
-    <para>
-      <parameter>- -enable-tee</parameter>: This switch enables the
-      experimental tee surface backend which is required if using
-      system-installed <application>Cairo</application> with Mozilla applications.
-    </para>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dxlib-xcb=enabled</option>: This switch enables several
-      experimental Xlib/XCB functions used by some window managers.
-    </para>
-
-<!-- Removed in 1.18.0
-    <para>
-      <option>- -enable-gl</option>: This switch enables
-      <application>Cairo</application>'s experimental
-      <application>OpenGL</application> surface which
-      is required for <application>Wayland</application>
-      compositor and some other packages that are not
-      part of BLFS.
-    </para>
--->
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this parameter if GTK-Doc is
-      installed and you wish to create and install the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cairo-trace
-        </seg>
-        <seg>
-          libcairo.so,
-          libcairo-gobject.so, and
-          libcairo-script-interpreter.so
-        </seg>
-        <seg>
-          /usr/include/cairo and
-          /usr/lib/cairo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cairo-trace">
-        <term><command>cairo-trace</command></term>
-        <listitem>
-          <para>
-            generates a log of all calls made by an application to
-            <application>Cairo</application>
-          </para>
-          <indexterm zone="cairo cairo-trace">
-            <primary sortas="b-cairo-trace">cairo-trace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo">
-        <term><filename class="libraryfile">libcairo.so</filename></term>
-        <listitem>
-          <para>
-            contains the 2D graphics functions required for rendering to the
-            various output targets
-          </para>
-          <indexterm zone="cairo libcairo">
-            <primary sortas="c-libcairo">libcairo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-gobject">
-        <term><filename class="libraryfile">libcairo-gobject.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that integrate
-            <application>Cairo</application> with
-            <application>Glib</application>'s GObject type system
-          </para>
-          <indexterm zone="cairo libcairo-gobject">
-            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-script-interpreter">
-        <term><filename class="libraryfile">libcairo-script-interpreter.so</filename></term>
-        <listitem>
-          <para>
-            contains the script interpreter functions for executing and
-            manipulating <application>Cairo</application> execution traces
-          </para>
-          <indexterm zone="cairo libcairo-script-interpreter">
-            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/cairomm-1.0.xml
===================================================================
--- x/lib/cairomm-1.0.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-1.0-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-1.0-version;.tar.xz">
-  <!ENTITY cairomm-1.0-download-ftp  " ">
-  <!ENTITY cairomm-1.0-md5sum        "0974ef291d491f22df287f588580677d">
-  <!ENTITY cairomm-1.0-size          "638 KB">
-  <!ENTITY cairomm-1.0-buildsize     "9.5 MB (with tests)">
-  <!ENTITY cairomm-1.0-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="cairomm-1.0" xreflabel="libcairomm-&cairomm-1.0-version;">
-  <?dbhtml filename="cairomm-1.0.html"?>
-
-
-  <title>libcairomm-1.0 (cairomm-&cairomm-1.0-version;)</title>
-
-  <indexterm zone="cairomm-1.0">
-    <primary sortas="a-libcairomm-1.0">libcairomm-1.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcairomm-1.0</title>
-
-    <para>
-      The <application>libcairomm-1.0</application> package provides a C++
-      interface to <application>Cairo</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairomm-1.0-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairomm-1.0-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairomm-1.0-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairomm-1.0-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairomm-1.0-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairomm-1.0-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcairomm-1.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/> and
-      <xref linkend="libsigc"/>
-    </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>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcairomm-1.0</title>
-
-    <para>
-      Install <application>Cairomm-1.0</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -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.0.so
-        </seg>
-        <seg>
-          /usr/{lib,include}/cairomm-1.0 and
-          /usr/share/{devhelp/books,doc}/cairomm-1.0 (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcairomm-1">
-        <term><filename class="libraryfile">libcairomm-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cairo</application> API classes
-          </para>
-          <indexterm zone="cairomm-1.0 libcairomm-1">
-            <primary sortas="c-libcairomm-1">libcairomm-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/cairomm-1.16.xml
===================================================================
--- x/lib/cairomm-1.16.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-1.16-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-1.16-version;.tar.xz">
-  <!ENTITY cairomm-1.16-download-ftp  " ">
-  <!ENTITY cairomm-1.16-md5sum        "4c7afc4ab5177655724ea4b31794db30">
-  <!ENTITY cairomm-1.16-size          "620 KB">
-  <!ENTITY cairomm-1.16-buildsize     "25 MB (with tests)">
-  <!ENTITY cairomm-1.16-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="cairomm-1.16" xreflabel="libcairomm-&cairomm-1.16-version;">
-  <?dbhtml filename="cairomm-1.16.html"?>
-
-
-  <title>libcairomm-1.16 (cairomm-&cairomm-1.16-version;)</title>
-
-  <indexterm zone="cairomm-1.16">
-    <primary sortas="a-libcairomm-1.16">libcairomm-1.16</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcairomm-1.16</title>
-
-    <para>
-      The <application>libcairomm-1.16</application> package provides a C++
-      interface to <application>Cairo</application>. This version of the API
-      is needed to support gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairomm-1.16-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairomm-1.16-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairomm-1.16-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairomm-1.16-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairomm-1.16-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairomm-1.16-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcairomm-1.16 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>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcairomm-1.16</title>
-
-    <para>
-      Install <application>Cairomm-1.16</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -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-1.16 libcairomm-1.16">
-            <primary sortas="c-libcairomm-1.16">libcairomm-1.16.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/colord-gtk.xml
===================================================================
--- x/lib/colord-gtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,250 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 colord-gtk-download-http "https://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
-  <!ENTITY colord-gtk-download-ftp  " ">
-  <!ENTITY colord-gtk-md5sum        "d436740c06e42af421384f16b2a9a0a7">
-  <!ENTITY colord-gtk-size          "24 KB">
-  <!ENTITY colord-gtk-buildsize     "2.1 MB">
-  <!ENTITY colord-gtk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;">
-  <?dbhtml filename="colord-gtk.html"?>
-
-
-  <title>colord-gtk-&colord-gtk-version;</title>
-
-  <indexterm zone="colord-gtk">
-    <primary sortas="a-colord-gtk">colord-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord GTK</title>
-
-    <para>
-      The <application>Colord GTK</application> package contains
-      <application>GTK+</application> bindings for
-      <application>Colord</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord GTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="gtk4"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord GTK</title>
-
-    <warning>
-      <para>
-        If building the documentation <command>ninja -j1</command> must be used.
-      </para>
-    </warning>
-
-    <para>
-      Install <application>Colord GTK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk4=true         \
-            -Dvapi=true         \
-            -Ddocs=false        \
-            -Dman=false         \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests need to be run from an X session, and may require
-      a color profile for your primary display.
-      <!-- on an ASUS 32" IPS display, I have a color profile and it works
-           properly. On the other hand, with a Dell SP2208WFP LCD,
-           no color profile is available and the tests fail. It seems to
-           depend on the system/display. -->
-    </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>-Dvapi=true</parameter>: This switch enables
-      building of the Vala bindings. Remove this switch if you don't
-      have <xref linkend="vala" role="nodep"/> installed.
-    </para>
-
-    <para>
-      <parameter>-Dgtk4=true</parameter>: This switch enables building
-      the GTK-4 bindings for colord. Set this option to 'false' if you
-      do not have <xref linkend="gtk4" role="nodep"/> installed.
-    </para>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: This switch disables building
-      gtk-doc based documentation. Even if gtk-doc is installed, you will
-      need the namespaced versions of the Docbook XSL stylesheets.
-    </para>
-
-    <para>
-      <parameter>-Dman=false</parameter>: This switch disables generating
-      the manual pages for this package. Remove this switch if you have
-      namespaced versions of the Docbook XSL stylesheets installed.
-    </para>
-
-    <para>
-      <option>-Dgtk2=true</option>: This switch enables building
-      the GTK+-2 bindings for colord. However since gtk2 is deprecated 
-      it is not recommended to build these bindings.
-    </para>
-
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cd-convert
-        </seg>
-        <seg>
-          libcolord-gtk.so, and
-          libcolord-gtk4.so
-        </seg>
-        <seg>
-          /usr/include/colord-1/colord-gtk and
-          /usr/share/gtk-doc/html/colord-gtk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cd-convert">
-        <term><command>cd-convert</command></term>
-        <listitem>
-          <para>
-            is a Color Manager Testing Tool
-          </para>
-          <indexterm zone="colord-gtk cd-convert">
-            <primary sortas="b-cd-convert">cd-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord-gtk">
-        <term><filename class="libraryfile">libcolord-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application>
-            <application>GTK+</application> bindings
-          </para>
-          <indexterm zone="colord-gtk libcolord-gtk">
-            <primary sortas="c-libcolord-gtk">libcolord-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord-gtk4">
-        <term><filename class="libraryfile">libcolord-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application>
-            <application>GTK-4</application> bindings
-          </para>
-          <indexterm zone="colord-gtk libcolord-gtk4">
-            <primary sortas="c-libcolord-gtk4">libcolord-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Watch directory when updating -->
-  <!ENTITY fltk-download-http "https://fltk.org/pub/fltk/&fltk-version;/fltk-&fltk-version;-source.tar.gz">
-  <!ENTITY fltk-download-ftp  " ">
-  <!ENTITY fltk-md5sum        "6e7a389f97b420bc31f99edd3522a85e">
-  <!ENTITY fltk-size          "5.4 MB">
-  <!ENTITY fltk-buildsize     "122 MB (with documentation)">
-  <!ENTITY fltk-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="fltk" xreflabel="FLTK-&fltk-version;">
-  <?dbhtml filename="fltk.html"?>
-
-
-  <title>FLTK-&fltk-version;</title>
-
-  <indexterm zone="fltk">
-    <primary sortas="a-FLTK">FLTK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FLTK</title>
-
-    <para>
-      FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
-      FLTK provides modern GUI functionality and supports 3D graphics via
-      OpenGL and its built-in GLUT emulation libraries used for creating
-      graphical user interfaces for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fltk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fltk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fltk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fltk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fltk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fltk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FLTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="mesa"/>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FLTK</title>
-
-    <note>
-      <para>
-        The tar extraction directory is fltk-&fltk-version; and not
-        fltk-&fltk-version;-source as indicated by the tarball name.
-      </para>
-    </note>
-
-    <para>
-      Install <application>FLTK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i -e '/cat./d' documentation/Makefile       &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to create the API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make -C documentation html</userinput></screen>
-
-    <para>
-      The tests for the package are interactive.  To execute the tests, run
-      <command>test/unittests</command>. In addition, there are 70 other
-      executable test programs in the <filename
-      class='directory'>test</filename> directory that can be run individually.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/fltk-&fltk-version; install</userinput></screen>
-
-    <para>
-      If desired, install some example games built as a part of the tests,
-      extra documentation and example programs.  As the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make -C test          docdir=/usr/share/doc/fltk-&fltk-version; install-linux &amp;&amp;
-make -C documentation docdir=/usr/share/doc/fltk-&fltk-version; install-linux</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... documentation/Makefile</command>: Avoid installing
-      pages in <filename class='directory'>/usr/share/man/cat*</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          blocks,
-          checkers,
-          fltk-config,
-          fluid, and
-          sudoku
-        </seg>
-        <seg>
-          libfltk.{a,so},
-          libfltk_forms.{a,so},
-          libfltk_gl.{a,so}, and
-          libfltk_images.{a,so}
-        </seg>
-        <seg>
-          /usr/include/FL and
-          /usr/share/doc/fltk-&fltk-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="blocks">
-        <term><command>blocks</command></term>
-        <listitem>
-          <para>
-            is a FLTK-based block elimination game
-          </para>
-          <indexterm zone="fltk blocks">
-            <primary sortas="b-blocks">blocks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="checkers">
-        <term><command>checkers</command></term>
-        <listitem>
-          <para>
-            is a FLTK-based version of the game of checkers
-          </para>
-          <indexterm zone="fltk checkers">
-            <primary sortas="b-checkers">checkers</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fltk-config">
-        <term><command>fltk-config</command></term>
-        <listitem>
-          <para>
-            is a utility script that can be used to get information about the
-            current version  of  FLTK that is installed on the system
-          </para>
-          <indexterm zone="fltk fltk-config">
-            <primary sortas="b-fltk-config">fltk-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fluid">
-        <term><command>fluid</command></term>
-        <listitem>
-          <para>
-            is an interactive GUI designer for FLTK
-          </para>
-          <indexterm zone="fltk fluid">
-            <primary sortas="b-fluid">fluid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sudoku">
-        <term><command>sudoku</command></term>
-        <listitem>
-          <para>
-            is an implementation of the popular Sudoku game
-          </para>
-          <indexterm zone="fltk sudoku">
-            <primary sortas="b-sudoku">sudoku</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfltk">
-        <term><filename class="libraryfile">libfltk.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="fltk libfltk">
-            <primary sortas="c-libfltk">libfltk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 freeglut-download-http
-           "&sourceforge-dl;/freeglut/freeglut-&freeglut-version;.tar.gz">
-  <!ENTITY freeglut-download-ftp " ">
-  <!ENTITY freeglut-md5sum        "f1621464e6525d0368976870cab8f418">
-  <!ENTITY freeglut-size          "404 KB">
-  <!ENTITY freeglut-buildsize     "5.7 MB">
-  <!ENTITY freeglut-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="freeglut" xreflabel="Freeglut-&freeglut-version;">
-  <?dbhtml filename="freeglut.html"?>
-
-
-  <title>Freeglut-&freeglut-version;</title>
-
-  <indexterm zone="freeglut">
-    <primary sortas="a-Freeglut">Freeglut</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Freeglut</title>
-
-    <para>
-      <application>Freeglut</application> is intended to be a 100%
-      compatible, completely opensourced clone of the GLUT library.
-      GLUT is a window system independent toolkit for writing OpenGL
-      programs, implementing a simple windowing API, which makes
-      learning about and exploring OpenGL programming very easy.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freeglut-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&freeglut-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freeglut-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freeglut-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &freeglut-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &freeglut-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/freeglut-&freeglut-version;-gcc10_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Freeglut Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="mesa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glu"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Freeglut</title>
-<!--
-    <para>
-      First, fix an issue with multiple defined symbols exposed by GCC-10:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../freeglut-&freeglut-version;-gcc10_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>Freeglut</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        \
-      -DFREEGLUT_BUILD_DEMOS=OFF        \
-      -DFREEGLUT_BUILD_STATIC_LIBS=OFF  \
-      -Wno-dev .. &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DFREEGLUT_BUILD_DEMOS=OFF</parameter>: Disable building
-      optional demo programs.  Note that if you choose to build them, their
-      installation must be done manually.  The demo programs are limited and
-      installation is not recommended.
-    </para>
-
-    <para>
-      <parameter>-DFREEGLUT_BUILD_STATIC_LIBS=OFF</parameter>:
-      Do not build the static library.
-    </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>
-          libglut.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/FreeGLUT
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libglut">
-        <term><filename class="libraryfile">libglut.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the OpenGL Utility
-            Toolkit
-          </para>
-          <indexterm zone="freeglut libglut">
-            <primary sortas="c-libglut">libglut.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/gdk-pixbuf.xml
===================================================================
--- x/lib/gdk-pixbuf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gdk-pixbuf-download-http
-           "&gnome-download-http;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-download-ftp  " ">
-  <!ENTITY gdk-pixbuf-md5sum        "b2ba2f594122001ac7f89e7d02560497">
-  <!ENTITY gdk-pixbuf-size          "6.2 MB">
-  <!ENTITY gdk-pixbuf-buildsize     "33 MB (with tests)">
-  <!ENTITY gdk-pixbuf-time          "0.1 SBU (With tests; both using parallelism=4)">
-]>
-
-<sect1 id="gdk-pixbuf" xreflabel="gdk-pixbuf-&gdk-pixbuf-version;">
-  <?dbhtml filename="gdk-pixbuf.html"?>
-
-
-  <title>gdk-pixbuf-&gdk-pixbuf-version;</title>
-
-  <indexterm zone="gdk-pixbuf">
-    <primary sortas="a-gdk-pixbuf">gdk-pixbuf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gdk Pixbuf</title>
-
-    <para>
-      The <application>Gdk Pixbuf</application> package is a toolkit for image
-      loading and pixel buffer manipulation. It is used by
-      <application>GTK+ 2</application> and <application>GTK+ 3</application> to
-      load and manipulate images. In the past it was distributed as part of
-      <application>GTK+ 2</application> but it was split off into a separate
-      package in preparation for the change to <application>GTK+ 3</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdk-pixbuf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdk-pixbuf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdk-pixbuf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdk-pixbuf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdk-pixbuf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdk-pixbuf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gdk Pixbuf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="docutils"/>,
-      <xref role="runtime" linkend="librsvg"/> (runtime dependency, needed for
-         loading symbolic icons) and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-      (to generate documentation),
-      <xref role="runtime" linkend="libavif"/>
-      (runtime dependency, needed for loading AVIF images),
-      <xref role="runtime" linkend="libjxl"/>
-      (runtime dependency, needed for loading JPEG XL images), and
-      <xref role="runtime" linkend="webp-pixbuf-loader"/>
-      (runtime dependency, needed for loading WebP images)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gdk Pixbuf</title>
-
-    <para>
-      Install <application>Gdk Pixbuf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      --wrap-mode=nofallback &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/docs_dir =/s@\$@ / 'gdk-pixbuf-&gdk-pixbuf-version;'@" -i ../docs/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                                         &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. The tests
-      make a heavy use of disk.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        should be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-    </note>
-  </sect2>
-
-  <sect2 role="commands">
-    <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"/>
-
-    <!-- with 2.42.9, docutils must be installed to generate man pages.
-    Without this, you'll get the following output:
-    Program rst2man found: ../docs/meson.build:70:2: ERROR: Problem encountered:
-    No rst2man found, but man pages were explicitly enabled -->
-    <para>
-      <option>-Dman=false</option>: Use this option if you do not want to
-      generate manual pages, or if you do not want to install
-      <xref linkend="docutils" role="nodep"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gdk-pixbuf-csource,
-          gdk-pixbuf-pixdata,
-          gdk-pixbuf-query-loaders, and
-          gdk-pixbuf-thumbnailer
-        </seg>
-        <seg>
-          libgdk_pixbuf-2.0.so
-        </seg>
-        <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
-          /usr/share/thumbnailers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdk-pixbuf-csource">
-        <term><command>gdk-pixbuf-csource</command></term>
-        <listitem>
-          <para>
-            is a small utility that generates C code containing images, used
-            for compiling images directly into programs
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-csource">
-            <primary sortas="b-gdk-pixbuf-csource">gdk-pixbuf-csource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="gdk-pixbuf-pixdata">
-        <term><command>gdk-pixbuf-pixdata</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert GdkPixbuf to GdkPixdata
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-pixdata">
-            <primary sortas="b-gdk-pixbuf-pixdata">gdk-pixbuf-pixdata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdk-pixbuf-query-loaders">
-        <term><command>gdk-pixbuf-query-loaders</command></term>
-        <listitem>
-          <para>
-            collects information about loadable modules for
-            <application>Gdk Pixbuf</application> and writes it
-            to the default cache file location, or to stdout
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-query-loaders">
-            <primary sortas="b-gdk-pixbuf-query-loaders">gdk-pixbuf-query-loaders</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdk-pixbuf-thumbnailer">
-        <term><command>gdk-pixbuf-thumbnailer</command></term>
-        <listitem>
-          <para>
-            creates thumbnails of pictures for use in other applications
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-thumbnailer">
-            <primary sortas="b-gdk-pixbuf-thumbnailer">gdk-pixbuf-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk_pixbuf-2">
-        <term><filename class="libraryfile">libgdk_pixbuf-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to load and render images
-          </para>
-          <indexterm zone="gdk-pixbuf libgdk_pixbuf-2">
-            <primary sortas="c-libgdk_pixbuf-2">libgdk_pixbuf-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            contains functions used to manipulate images and interfaces with
-            <application>Xlib</application>
-          </para>
-          <indexterm zone="gdk-pixbuf libgdk_pixbuf_xlib-2">
-            <primary sortas="c-libgdk_pixbuf_xlib-2">libgdk_pixbuf_xlib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/glew.xml
===================================================================
--- x/lib/glew.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,193 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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-buildsize     "16 MB">
-  <!ENTITY glew-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="glew" xreflabel="GLEW-&glew-version;">
-  <?dbhtml filename="glew.html"?>
-
-
-  <title>GLEW-&glew-version;</title>
-
-  <indexterm zone="glew">
-    <primary sortas="a-GLEW">GLEW</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLEW</title>
-
-    <para>
-      <application>GLEW</application> is the OpenGL Extension Wrangler Library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glew-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glew-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glew-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glew-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glew-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glew-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">glew Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesa"/>
-    </para>
-
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="installation">
-    <title>Installation of GLEW</title>
-
-    <para>
-      Install <application>GLEW</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's%lib64%lib%g' config/Makefile.linux &amp;&amp;
-sed -i -e '/glew.lib.static:/d' \
-       -e '/0644 .*STATIC/d'    \
-       -e 's/glew.lib.static//' Makefile     &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.all</userinput></screen>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's%lib64%lib%g' ...</command>: This ensures that the
-      library is installed in <filename class="directory">/usr/lib</filename>.
-    </para>
-
-    <para>
-      <command>sed -i -e '/glew.lib.static:/d' ...</command>: This suppresses
-      the static library.
-    </para>
-
-    <para>
-      <command>make install.all</command>: This installs the programs as well as
-      the library.
-    </para>
-  </sect2>
-
-
-  <!--Required section-->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          glewinfo and visualinfo
-        </seg>
-        <seg>
-          libGLEW.so
-        </seg>
-        <seg>
-          /usr/include/GL
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="glewinfo">
-        <term><command>glewinfo</command></term>
-        <listitem>
-          <para>
-            provides information about the supported extensions
-          </para>
-          <indexterm zone="glew glewinfo">
-            <primary sortas="b-glewinfo">glewinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="visualinfo">
-        <term><command>visualinfo</command></term>
-        <listitem>
-          <para>
-            is an extended version of glxinfo
-          </para>
-          <indexterm zone="glew visualinfo">
-            <primary sortas="b-visualinfo">visualinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLEW.so">
-        <term><filename class="libraryfile">libGLEW.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to access OpenGL extensions
-          </para>
-          <indexterm zone="glew libGLEW.so">
-            <primary sortas="c-libGLEW.so">libGLEW.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/glslang.xml
===================================================================
--- x/lib/glslang.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,229 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glslang-download-http "https://github.com/KhronosGroup/glslang/archive/&glslang-version;/glslang-&glslang-version;.tar.gz">
-  <!ENTITY glslang-download-ftp  " ">
-  <!ENTITY glslang-md5sum        "b2d0ae963b44e23533409eb63ea06a56">
-  <!ENTITY glslang-size          "3.6 MB">
-  <!ENTITY glslang-buildsize     "161 MB (with tests">
-  <!ENTITY glslang-time          "0.2 SBU (with parallelism=8; with tests)">
-]>
-
-<sect1 id="glslang" xreflabel="Glslang-&glslang-version;">
-  <?dbhtml filename="glslang.html"?>
-
-  <title>Glslang-&glslang-version;</title>
-
-  <indexterm zone="glslang">
-    <primary sortas="a-glslang">Glslang</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Glslang</title>
-
-    <para>
-      The <application>Glslang</application> package contains an frontend and
-      validator for OpenGL, OpenGL ES, and Vulkan shaders.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glslang-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glslang-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glslang-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glslang-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glslang-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glslang-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Glslang Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="spirv-tools"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glslang</title>
-
-    <para>
-      Install <application>Glslang</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      \
-      -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DGLSLANG_TESTS=ON              \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DALLOW_EXTERNAL_SPIRV_TOOLS=ON</parameter>: This switch allows
-      the build system to use the system-installed copy of
-      <xref linkend="spirv-tools" role="nodep"/>, instead of downloading and
-      installing it's own copy.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch builds shared
-      versions of the libraries, and does not install static versions of them.
-    </para>
-
-    <para>
-      <parameter>-DGLSLANG_TESTS=ON</parameter>: This switch builds the 
-      tests for the package.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glslang,
-          glslang-validator (symlink to glslang), and
-          spirv-remap
-        </seg>
-        <seg>
-          libglslang.so,
-          libglslang-default-resource-limits.so,
-          libSPIRV.so, and
-          libSPVRemapper.so
-        </seg>
-        <seg>
-          /usr/include/glslang and
-          /usr/lib/cmake/glslang
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glslang-prog">
-        <term><command>glslang</command></term>
-        <listitem>
-          <para>
-            provides a front end and validator for OpenGL, OpenGL ES, and
-            Vulkan shaders
-          </para>
-          <indexterm zone="glslang glslang-prog">
-            <primary sortas="b-glslang">glslang</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglslang">
-        <term><filename class="libraryfile">libglslang.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a front-end and validator for
-            OpenGL, OpenGL ES, and Vulkan shaders to other programs
-          </para>
-          <indexterm zone="glslang libglslang">
-            <primary sortas="c-libglslang">libglslang.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Library removed in glslang-14.0.0
-      <varlistentry id="libHLSL">
-        <term><filename class="libraryfile">libHLSL.so</filename></term>
-        <listitem>
-          <para>
-            provides a front-end for shaders that are in HLSL format
-          </para>
-          <indexterm zone="glslang libHLSL">
-            <primary sortas="c-libHLSL">libHLSL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="libSPIRV">
-        <term><filename class="libraryfile">libSPIRV.so</filename></term>
-        <listitem>
-          <para>
-            provides a front-end and generator for SPIR-V binaries
-          </para>
-          <indexterm zone="glslang libSPIRV">
-            <primary sortas="c-libSPIRV">libSPIRV.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSPVRemapper">
-        <term><filename class="libraryfile">libSPVRemapper.so</filename></term>
-        <listitem>
-          <para>
-            provides a remapper for SPIR-V binaries
-          </para>
-          <indexterm zone="glslang libSPVRemapper">
-            <primary sortas="c-libSPVRemapper">libSPVRemapper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-</sect1>
Index: lib/glu.xml
===================================================================
--- x/lib/glu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glu-download-http "https://archive.mesa3d.org/glu/glu-&glu-version;.tar.xz">
-  <!ENTITY glu-download-ftp  " ">
-  <!ENTITY glu-md5sum        "06a4fff9179a98ea32ef41b6d83f6b19">
-  <!ENTITY glu-size          "216 KB">
-  <!ENTITY glu-buildsize     "5.9 MB">
-  <!ENTITY glu-time          "0.2 SBU">
-]>
-
-<sect1 id="glu" xreflabel="GLU-&glu-version;">
-  <?dbhtml filename="glu.html"?>
-
-
-  <title>GLU-&glu-version;</title>
-
-  <indexterm zone="glu">
-    <primary sortas="a-GLU">GLU</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLU</title>
-
-    <para>
-      This package provides the Mesa OpenGL Utility library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLU Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesa"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLU</title>
-
-    <para>
-      Install <application>GLU</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..              \
-      --prefix=$XORG_PREFIX \
-      -Dgl_provider=gl      \
-      --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 &amp;&amp;
-rm -vf /usr/lib/libGLU.a</userinput></screen>
-
-  </sect2>
-
-  <!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libGLU.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libGLU">
-        <term><filename class="libraryfile">libGLU.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL
-            Utility library
-          </para>
-          <indexterm zone="glu libGLU">
-            <primary sortas="c-libGLU">libGLU.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/goffice010.xml
===================================================================
--- x/lib/goffice010.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 goffice010-download-http
-           "&gnome-download-http;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
-  <!ENTITY goffice010-download-ftp  " ">
-  <!ENTITY goffice010-md5sum        "4c55f99d8fafe1f91276cb7538521fdb">
-  <!ENTITY goffice010-size          "2.4 MB">
-  <!ENTITY goffice010-buildsize     "81 MB (with tests)">
-  <!ENTITY goffice010-time          "0.4 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="goffice010" xreflabel="GOffice-&goffice010-version;">
-  <?dbhtml filename="goffice010.html"?>
-
-
-  <title>GOffice-&goffice010-version;</title>
-
-  <indexterm zone="goffice010">
-    <primary sortas="a-GOffice">GOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GOffice</title>
-
-    <para>
-      The <application>GOffice</application> package contains a library of
-      <application>GLib</application>/<application>GTK</application> document
-      centric objects and utilities. This is useful for performing common
-      operations for document centric applications that are conceptually simple,
-      but complex to implement fully. Some of the operations provided by the
-      <application>GOffice</application> library include support for plugins,
-      load/save routines for application documents and undo/redo functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&goffice010-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&goffice010-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &goffice010-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &goffice010-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &goffice010-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &goffice010-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/goffice-&goffice010-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libgsf"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &gobject-introspection;,
-      <xref linkend="gs"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="&gnome-download-http;/lasem/">Lasem</ulink>, and
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre">
-      libspectre</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GOffice</title>
-
-<!--
-    <para>
-      First, fix a problem with spreadsheets with graphs and some invalid data,
-      and resolve some GTK Critical warnings:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../goffice-&goffice010-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GOffice</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgoffice-0.10.so
-        </seg>
-        <seg>
-          /usr/include/libgoffice-0.10,
-          /usr/{lib,share}/goffice, and
-          /usr/share/gtk-doc/html/goffice-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgoffice010">
-        <term><filename class="libraryfile">libgoffice-0.10.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions to provide support for document centric
-            objects and utilities
-          </para>
-          <indexterm zone="goffice010 libgoffice010">
-            <primary sortas="c-libgoffice-0.10">libgoffice-0.10.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/grantlee.xml
===================================================================
--- x/lib/grantlee.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 grantlee-download-http
-    "https://github.com/steveire/grantlee/releases/download/v&grantlee-version;/grantlee-&grantlee-version;.tar.gz">
-<!--           "http://downloads.grantlee.org/grantlee-&grantlee-version;.tar.gz"> -->
-  <!ENTITY grantlee-download-ftp  " ">
-  <!ENTITY grantlee-md5sum        "4ef8eae5dd61e3c7603d76208eb4d922">
-  <!ENTITY grantlee-size          "1.1 MB">
-  <!ENTITY grantlee-buildsize     "27 MB">
-  <!ENTITY grantlee-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;">
-  <?dbhtml filename="grantlee.html"?>
-
-
-  <title>Grantlee-&grantlee-version;</title>
-
-  <indexterm zone="grantlee">
-    <primary sortas="a-grantlee">grantlee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to grantlee</title>
-
-    <para>
-       Grantlee is a set of free software libraries written using the Qt
-       framework. Currently two libraries are shipped with Grantlee: Grantlee
-       Templates and Grantlee TextDocument. The goal of Grantlee Templates is
-       to make it easier for application developers to separate the structure
-       of documents from the data they contain, opening the door for theming.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&grantlee-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&grantlee-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &grantlee-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &grantlee-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &grantlee-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &grantlee-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grantlee Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      &qt5-deps;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grantlee</title>
-
-    <para>
-      Install <application>Grantlee</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  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>
-          libGrantlee_Templates.so and
-          libGrantlee_TextDocument.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/Grantlee5,
-          /usr/lib/grantlee/5.2, and
-          /usr/include/grantlee</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libGrantlee_Templates">
-        <term><filename class="libraryfile">libGrantlee_Templates.so</filename></term>
-        <listitem>
-          <para>
-            contains common documentation templates for separating documents
-            from their structure
-          </para>
-          <indexterm zone="grantlee libGrantlee_Templates">
-            <primary sortas="c-libGrantlee_Templates">libGrantlee_Templates.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGrantlee_TextDocument">
-        <term><filename class="libraryfile">libGrantlee_TextDocument.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow separating the content of text
-            documents from their structure.
-          </para>
-          <indexterm zone="grantlee libGrantlee_TextDocument">
-            <primary sortas="c-libGrantlee_TextDocument">libGrantlee_TextDocument.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/graphene.xml
===================================================================
--- x/lib/graphene.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 graphene-download-http "&gnome-download-http;/graphene/1.10/graphene-&graphene-version;.tar.xz">
-  <!ENTITY graphene-download-ftp  " ">
-  <!ENTITY graphene-md5sum        "169e3c507b5a5c26e9af492412070b81">
-  <!ENTITY graphene-size          "328 KB">
-  <!ENTITY graphene-buildsize     "7.6 MB">
-  <!ENTITY graphene-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="graphene" xreflabel="graphene-&graphene-version;">
-  <?dbhtml filename="graphene.html"?>
-
-
-  <title>Graphene-&graphene-version;</title>
-
-  <indexterm zone="graphene">
-    <primary sortas="a-graphene">graphene</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Graphene</title>
-
-    <para>
-      The <application>Graphene</application> package provides a thin layer
-      of types for graphics libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&graphene-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&graphene-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &graphene-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &graphene-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &graphene-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &graphene-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Graphene Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Graphene</title>
-
-    <para>
-      Install <application>Graphene</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have
-      <xref role="nodep" linkend="gtk-doc"/> installed and wish to generate
-      the API documentation.
-    </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>
-          libgraphene-1.0.so
-        </seg>
-        <seg>
-          /usr/include/graphene-1.0,
-          /usr/lib/graphene-1.0,
-          /usr/{libexec,share}/installed-tests/graphene-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgraphene">
-        <term><filename class="libraryfile">libgraphene-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a thin layer of types for graphics
-            libraries
-          </para>
-          <indexterm zone="graphene libgraphene">
-            <primary sortas="c-libgraphene">libgraphene-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/gtk+.xml
===================================================================
--- x/lib/gtk+.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk+.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="GTK" xreflabel="GTK+-&GTK-version;">
+<?dbhtml filename="gtk.html" dir="x"?>
+<title>GTK+-&GTK-version;</title>
+
+&GTK-intro;
+&GTK-inst;
+&GTK-config;
+&GTK-desc;
+
+</sect1>
+
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/lib/gtk+2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,352 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="GTK2" xreflabel="GTK+2-&GTK2-version;">
+<?dbhtml filename="gtk2.html" dir="x"?>
+<title>GTK+-&GTK2-version;</title>
 
-  <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
-  <!ENTITY gtk2-download-ftp  " ">
-  <!ENTITY gtk2-md5sum        "0118e98dbe0e4dab90ce475f9f0e6c0c">
-  <!ENTITY gtk2-size          "12 MB">
-  <!ENTITY gtk2-buildsize     "285 MB">
-  <!ENTITY gtk2-time          "0.9 SBU (using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="gtk2" xreflabel="GTK+-&gtk2-version;">
-  <?dbhtml filename="gtk2.html" ?>
-
-
-  <title>GTK+-&gtk2-version;</title>
-
-  <indexterm zone="gtk2">
-    <primary sortas="a-GTK+2">GTK+2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK+ 2</title>
-
-    <para>
-      The <application>GTK+ 2</application> package contains
-      libraries used for creating graphical user interfaces
-      for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK+ 2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="gdk-pixbuf"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref role="runtime" linkend="gnome-themes-extra"/> (runtime, for
-      Adwaita and HighContrast themes),
-      &gobject-introspection; and
-      <xref linkend="gtk-doc"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK+ 2</title>
-
-    <para>
-      Install <application>GTK+ 2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e 's#l \(gtk-.*\).sgml#&amp; -o \1#' \
-    -i docs/{faq,tutorial}/Makefile.in      &amp;&amp;
-
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Note that you
-      must run the tests from a session with X Window Display capability (i.e.,
-      not a text-based terminal/console) as the tests attempt to open an X
-      window, and the tests can take an excessively long time. Using an X
-      Window, the tests should take less than 0.1 SBU. One test,
-      aliasfilescheck.sh, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        must be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gtk-query-immodules-2.0 --update-cache</userinput></screen>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#l \(gtk-.*\).sgml#&amp; -o \1#'
-      docs/{faq,tutorial}/Makefile.in</command>: If you have
-      <xref linkend="docbook-utils"/> installed (specifically, if configure
-      finds <command>db2html</command>) then it will try to use it to rebuild
-      some of its HTML documentation and fail due to bugs in some of the
-      <filename>Makefile</filename>s. This <command>sed</command> fixes the
-      <filename>Makefile</filename>s.
-    </para>
-    <!-- This still seems to have problems with docbook-utils installed.
-         However, since it's already been tagged, I'll leave it alone. -->
-<!--
-    <para>
-      <command>sed -i -e 's#pltcheck.sh#$(NULL)#g' gtk/Makefile.in</command>:
-      This <command>sed</command> disables one test known to fail.
-      Not necessary, if not running the tests.
-    </para>-->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GTK+ 2</title>
-
-    <sect3 id="gtk2-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.gtkrc-2.0</filename>,
-        <filename>/etc/gtk-2.0/gtkrc</filename>, and
-        <filename>/usr/share/gtk-2.0/gtkrc</filename>
-      </para>
-
-      <indexterm zone="gtk2 gtk2-config">
-        <primary sortas="e-AA.gtkrc-2.0">~/.gtkrc-2.0</primary>
-      </indexterm>
-
-      <indexterm zone="gtk2 gtk2-config">
-        <primary sortas="e-etc-gtk-2.0-gtkrc">/etc/gtk-2.0/gtkrc</primary>
-      </indexterm>
-
-      <indexterm zone="gtk2 gtk2-config">
-        <primary sortas="e-usr-share-gtk-2.0-gtkrc">/usr/share/gtk-2.0/gtkrc</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK+ 2</application> themes change the way a
-        <application>GTK+ 2</application> application looks. A
-        <application>GTK+ 2</application> icon theme can be used to change the
-        icons that appear on the application's toolbar. If you have installed a
-        <application>GTK+ 2</application> theme (such as
-        <xref linkend="gnome-themes-extra"/> or
-        <xref linkend="gtk-engines"/>), or a
-        <application>GTK+</application> icon theme (such as <xref
-        linkend="adwaita-icon-theme"/>) you can set your preferences in
-        <filename>~/.gtkrc-2.0</filename>:
-      </para>
-
-<screen><userinput>cat &gt; ~/.gtkrc-2.0 &lt;&lt; "EOF"
-<literal>include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <para>
-        There are many more themes available at
-        <ulink url="https://gnome-look.org/">Gnome-Look.org</ulink> and other
-        places.
-      </para>
-
-      <para>
-        Once you've settled on themes you like, you can (as the
-        <systemitem class="username">root</systemitem> user) make them the
-        default system wide:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/gtk-2.0/gtkrc &lt;&lt; "EOF"
-<literal>include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>elementary</replaceable>"</literal>
-EOF</userinput></screen>
-
-<!--
-      <para>
-        <xref linkend="lxappearance"/> is a <application>GTK+ 2</application>
-        application that can help you choose the themes you like.
-      </para>
--->
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtk-builder-convert, gtk-demo, gtk-query-immodules-2.0, and
-          gtk-update-icon-cache
-        </seg>
-        <seg>
-          libgailutil.so, libgdk-x11-2.0.so, and libgtk-x11-2.0.so
-        </seg>
-        <seg>
-          /etc/gtk-2.0,
-          /usr/include/{gail-1.0,gtk-2.0,gtk-unix-print-2.0},
-          /usr/lib/gtk-2.0,
-          /usr/share/doc/gtk+-&gtk2-version;,
-          /usr/share/gtk-2.0,
-          /usr/share/gtk-doc/html/{gail-libgail-util,gdk2,gtk2}, and
-          /usr/share/themes/{Default,Emacs,Raleigh}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtk-builder-convert">
-        <term><command>gtk-builder-convert</command></term>
-        <listitem>
-          <para>
-           converts glade files into XML files which can be loaded with
-           GtkBuilder
-          </para>
-          <indexterm zone="gtk2 gtk-builder-convert">
-            <primary sortas="b-gtk-builder-convert">gtk-builder-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-demo">
-        <term><command>gtk-demo</command></term>
-        <listitem>
-          <para>
-            demonstrates <application>GTK+ 2</application> functionality and
-            provides code for the examples
-          </para>
-          <indexterm zone="gtk2 gtk-demo">
-            <primary sortas="b-gtk-demo">gtk-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-immodules-2.0">
-        <term><command>gtk-query-immodules-2.0</command></term>
-        <listitem>
-          <para>
-            collects information about loadable input method modules for
-            <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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-update-icon-cache">
-        <term><command>gtk-update-icon-cache</command></term>
-        <listitem>
-          <para>
-            creates mmap()able cache files for icon themes. Starting with
-            <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
-          </para>
-          <indexterm zone="gtk2 gtk-update-icon-cache">
-            <primary sortas="b-gtk-update-icon-cache">gtk-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk-x11-2">
-        <term><filename class="libraryfile">libgdk-x11-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that act as a wrapper around the low-level
-            drawing and windowing functions provided by the underlying graphics
-            system
-          </para>
-          <indexterm zone="gtk2 libgdk-x11-2">
-            <primary sortas="c-libgdk-x11-2">libgdk-x11-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-x11-2">
-        <term><filename class="libraryfile">libgtk-x11-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="gtk2 libgtk-x11-2">
-            <primary sortas="c-libgtk-x11-2">libgtk-x11-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&GTK2-intro;
+&GTK2-inst;
+&GTK2-config;
+&GTK2-desc;
 
 </sect1>
+
Index: lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,502 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-download-ftp  " ">
-  <!ENTITY gtk3-md5sum        "2321e8158feac093b6ed82aac66dbbfd">
-  <!ENTITY gtk3-size          "13 MB">
-  <!ENTITY gtk3-buildsize     "238 MB (add 8 MB for tests)">
-  <!ENTITY gtk3-time          "0.8 SBU (using parallelism=4; add 0.2 SBU for tests)">
-]>
-
-<sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
-  <?dbhtml filename="gtk3.html"?>
-
-
-  <title>GTK+-&gtk3-version;</title>
-
-  <indexterm zone="gtk3">
-    <primary sortas="a-GTK+3">GTK+3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK+ 3</title>
-
-    <para>
-      The <application>GTK+ 3</application> package contains
-      libraries used for creating graphical user interfaces for
-      applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK+ 3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libepoxy"/>, and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role='runtime' linkend="adwaita-icon-theme"/>
-        (at runtime; default for some gtk+3 settings keys and
-        also needed for one test),
-      <xref linkend="docbook-xsl"/> (for generating manual pages),
-      <xref linkend="hicolor-icon-theme"/> (needed for tests),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="libxslt"/> (for generating manual pages),
-      <xref linkend="sassc"/>,
-      <xref linkend="wayland"/>, and
-      <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libcloudproviders"/>,
-      <xref linkend="pyatspi2"/> (for tests),
-      <xref linkend='tracker3'/>, and
-      <ulink url="https://icl.utk.edu/papi/">PAPI</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK+ 3</title>
-
-    <para>
-      Install <application>GTK+ 3</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-meson setup --prefix=/usr           \
-            --buildtype=release     \
-            -Dman=true              \
-            -Dbroadway_backend=true \
-            ..                      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results you need a graphical session, then issue
-      <command>dbus-run-session ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      One test named <filename>check-cursor-names</filename> is known
-      to fail if <xref linkend='adwaita-icon-theme'/> is not installed.
-    </para>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        must be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gtk-query-immodules-3.0 --update-cache</userinput></screen>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gsettings-destdir.xml"/>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dbroadway_backend=true</parameter>: This switch enables the
-      HTML5 GTK backend.
-    </para>
-
-    <para>
-      <parameter>-Dman=true</parameter>: This switch allows generating
-      manual pages.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: This switch enables building
-      documentation. It requires <xref linkend="gtk-doc"/>.
-    </para>
-
-    <para>
-      <option>-Dtracker3=true</option>: This switch enables the search
-      function based on Tracker 3 in the GTK+-3 file chooser dialog.
-      It requires <xref linkend="tracker3"/>.
-    </para>
-
-    <para>
-      <option>-Dcloudproviders=true</option>: Use this switch if you have
-      <xref linkend="libcloudproviders" role="nodep"/> installed and wish to
-      enable support for cloud providers in a file chooser window.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GTK+ 3</title>
-
-    <sect3 id="gtk3-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/gtk-3.0/settings.ini</filename> and
-        <filename>/etc/gtk-3.0/settings.ini</filename>
-      </para>
-
-      <indexterm zone="gtk3 gtk3-config">
-        <primary sortas="e-AA.home-settings.ini">~/.config/gtk-3.0/settings.ini</primary>
-      </indexterm>
-
-      <indexterm zone="gtk3 gtk3-config">
-        <primary sortas="e-etc-path-settings.ini">/etc/gtk-3.0/settings.ini</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK+ 3</application> themes change the way a
-        <application>GTK+ 3</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+ 3</application> theme (e.g.
-        the Adwaita theme built in <application>GTK+ 3</application>),
-        an icon theme (such as <xref
-        linkend="oxygen-icons"/>) and/or a font (<xref linkend="dejavu-fonts"/>),
-        you can set your preferences in <filename>~/.config/gtk-3.0/settings.ini</filename>,
-        or the default system wide configuration file (as the <systemitem
-        class="username">root</systemitem> user), in
-        <filename>/etc/gtk-3.0/settings.ini</filename>.  For the local user an
-        example is:
-      </para>
-
-<screen><userinput>mkdir -vp ~/.config/gtk-3.0
-cat &gt; ~/.config/gtk-3.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-cursor-theme-size = <replaceable>18</replaceable>
-gtk-toolbar-style = <replaceable>GTK_TOOLBAR_BOTH_HORIZ</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/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.
-      </para>
-
-      <para>
-        As part of GTK+-3.0's redesign, the scroll bar buttons are no longer
-        visible on the scrollbar in many applications. If this functionality
-        is desired, modify the <filename>gtk.css</filename> file and restore
-        them using the following command:
-      </para>
-
-<screen><userinput>cat &gt; ~/.config/gtk-3.0/gtk.css &lt;&lt; "EOF"
-<literal>*  {
-   -GtkScrollbar-has-backward-stepper: 1;
-   -GtkScrollbar-has-forward-stepper: 1;
-}</literal>
-EOF</userinput></screen>
-
-      <!-- This trick was discovered in the Seamonkey-2.53.2 release notes:
-           http://www.seamonkey-project.org/releases/seamonkey2.53.2/ -->
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          broadwayd,
-          gtk3-demo,
-          gtk3-demo-application,
-          gtk3-icon-browser,
-          gtk3-widget-factory,
-          gtk-builder-tool,
-          gtk-encode-symbolic-svg,
-          gtk-launch,
-          gtk-query-immodules-3.0,
-          gtk-query-settings, and
-          gtk-update-icon-cache
-        </seg>
-        <seg>
-          libgailutil-3.so, libgdk-3.so, and libgtk-3.so
-        </seg>
-        <seg>
-          /etc/gtk-3.0,
-          /usr/include/{gail,gtk}-3.0,
-          /usr/{lib,share}/gtk-3.0, and
-          /usr/share/themes/{Default,Emacs}/gtk-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="broadwayd">
-        <term><command>broadwayd</command></term>
-        <listitem>
-          <para>
-            provides support for displaying
-            <application>GTK+ 3</application> applications in a web browser,
-            using HTML5 and web sockets
-          </para>
-          <indexterm zone="gtk3 broadwayd">
-            <primary sortas="b-broadwayd">broadwayd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo">
-        <term><command>gtk3-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the tasks that can be
-            done with <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk3-demo">
-            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo-application">
-        <term><command>gtk3-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple <application>GTK+ 3</application> application
-          </para>
-          <indexterm zone="gtk3 gtk3-demo-application">
-            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-icon-browser">
-        <term><command>gtk3-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 where
-            available, as well as a description of the icon and its context
-          </para>
-          <indexterm zone="gtk3 gtk3-icon-browser">
-            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-widget-factory">
-        <term><command>gtk3-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view <application>GTK+ 3</application> themes and widgets
-          </para>
-          <indexterm zone="gtk3 gtk3-widget-factory">
-            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-builder-tool">
-        <term><command>gtk-builder-tool</command></term>
-        <listitem>
-          <para>
-            performs various operations on GtkBuilder .ui files
-          </para>
-          <indexterm zone="gtk3 gtk-builder-tool">
-            <primary sortas="b-gtk-builder-tool">gtk-builder-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-encode-symbolic-svg">
-        <term><command>gtk-encode-symbolic-svg</command></term>
-        <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
-          </para>
-          <indexterm zone="gtk3 gtk-encode-symbolic-svg">
-            <primary sortas="b-gtk-encode-symbolic-svg">gtk-encode-symbolic-svg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-launch">
-        <term><command>gtk-launch</command></term>
-        <listitem>
-          <para>
-            launches an application using the given name. The name should match
-            the application desktop file name, as residing in
-            <filename class="directory">/usr/share/applications</filename>, with
-            or without the '.desktop' suffix
-          </para>
-          <indexterm zone="gtk3 gtk-launch">
-            <primary sortas="b-gtk-launch">gtk-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-immodules-3.0">
-        <term><command>gtk-query-immodules-3.0</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="gtk3 gtk-query-immodules-3.0">
-            <primary sortas="b-gtk-query-immodules-3.0">gtk-query-immodules-3.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-settings">
-        <term><command>gtk-query-settings</command></term>
-        <listitem>
-          <para>
-            provides a complete listing of all settings related to
-            <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk-query-settings">
-            <primary sortas="b-gtk-query-settings">gtk-query-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-update-icon-cache3">
-        <term><command>gtk-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="gtk3 gtk-update-icon-cache3">
-            <primary sortas="b-gtk-update-icon-cache3">gtk-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgailutil-3">
-        <term><filename class="libraryfile">libgailutil-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the accessibility interfaces
-            defined by the <application>GNOME</application> Accessibility
-            Toolkit
-          </para>
-          <indexterm zone="gtk3 libgailutil-3">
-            <primary sortas="c-libgailutil-3">libgailutil-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk-3">
-        <term><filename class="libraryfile">libgdk-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that act as a wrapper around the low-level
-            drawing and windowing functions provided by the underlying graphics
-            system
-          </para>
-          <indexterm zone="gtk3 libgdk-3">
-            <primary sortas="c-libgdk-3">libgdk-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-3">
-        <term><filename class="libraryfile">libgtk-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="gtk3 libgtk-3">
-            <primary sortas="c-libgtk-3">libgtk-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtk-engines-download-http
-    "&gnome-download-http;/gtk-engines/2.20/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-download-ftp  " ">
-  <!ENTITY gtk-engines-md5sum        "5deb287bc6075dc21812130604c7dc4f">
-  <!ENTITY gtk-engines-size          "676 KB">
-  <!ENTITY gtk-engines-buildsize     "19 MB">
-  <!ENTITY gtk-engines-time          "0.4 SBU">
-]>
-
-<sect1 id="gtk-engines" xreflabel="GTK Engines-&gtk-engines-version;">
-  <?dbhtml filename="gtk-engines.html"?>
-
-
-  <title>GTK Engines-&gtk-engines-version;</title>
-
-  <indexterm zone="gtk-engines">
-    <primary sortas="a-GTK Engines">GTK Engines</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK Engines</title>
-
-    <para>
-      The <application>GTK Engines</application> package contains eight
-      themes/engines and two additional engines for
-      <application>GTK2</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-engines-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-engines-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-engines-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-engines-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-engines-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-engines-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK Engines Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lua"/> and
-      <xref linkend="which"/> (required for test suite)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK Engines</title>
-
-    <para>
-      Install <application>GTK Engines</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-lua --with-system-lua</option>: Use these switches if you
-      installed <application>Lua</application> and want to build Lua theming
-      engine.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <segtitle>Installed Themes</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libclearlooks.so,
-          libcrux-engine.so,
-          libglide.so,
-          libhcengine.so,
-          libindustrial.so,
-          libmist.so,
-          libredmond95.so and
-          libthinice.so (GTK-2 engines libraries)
-        </seg>
-        <seg>
-          /usr/lib/gtk-&gtk2-libdir;/engines,
-          /usr/share/gtk-engines,
-          /usr/share/themes/Clearlooks,
-          /usr/share/themes/Crux,
-          /usr/share/themes/Industrial,
-          /usr/share/themes/Mist,
-          /usr/share/themes/Redmond and
-          /usr/share/themes/ThinIce
-        </seg>
-        <seg>
-          Clearlooks,
-          Crux,
-          Industrial,
-          Mist,
-          Redmond and
-          ThinIce
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term>engine libraries</term>
-        <listitem>
-          <para>
-            are manager systems for specific themes
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,231 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/1.3/gtk-vnc-&gtk-vnc-version;.tar.xz">
-  <!ENTITY gtk-vnc-download-ftp  " ">
-  <!ENTITY gtk-vnc-md5sum        "27f0dc7f33cbfdaa6c9eb7cf169f4866">
-  <!ENTITY gtk-vnc-size          "220 KB">
-  <!ENTITY gtk-vnc-buildsize     "5.2 MB">
-  <!ENTITY gtk-vnc-time          "0.1 SBU">
-]>
-
-<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
-  <?dbhtml filename="gtk-vnc.html"?>
-
-
-  <title>gtk-vnc-&gtk-vnc-version;</title>
-
-  <indexterm zone="gtk-vnc">
-    <primary sortas="a-gtk-vnc">gtk-vnc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtk VNC</title>
-
-    <para>
-      The <application>Gtk VNC</application> package contains a VNC viewer widget
-      for <application>GTK+</application>. It is built using coroutines allowing
-      it to be completely asynchronous while remaining single threaded.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-vnc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-vnc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-vnc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-vnc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-vnc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-vnc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtk VNC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libgcrypt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/> and
-      <xref linkend="pulseaudio"/>
-      <!-- <ulink url="https://view.sourceforge.net/">libview</ulink> -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtk VNC</title>
-
-    <para>
-      Install <application>Gtk VNC</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-<!--
-    <para>
-      <parameter>- -with-gtk=3.0</parameter>: This switch enables
-      building of the <application>GTK+ 3</application> library
-      instead of the <application>GTK+ 2</application> one.
-    </para>
--->
-
-    <para>
-      <option>-Dwith-vala=false</option>: This switch disables
-      building of the Vala bindings. Add this if you decide to build gtk-vnc
-      without vala installed.
-    </para>
-
-<!--
-    <para>
-      <parameter>- -without-sasl</parameter>: This switch disables the
-      use of <application>Cyrus SASL</application> for authentication.
-      Remove it if you have installed
-      <application>Cyrus SASL</application> and wish to enable it for
-      authentication.
-    </para>
- -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gvnccapture
-        </seg>
-        <seg>
-          libgtk-vnc-2.0.so, libgvnc-1.0.so and libgvncpulse-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gtk-vnc-2.0,
-          /usr/include/gvnc-1.0 and
-          /usr/include/gvncpulse-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gvnccapture">
-        <term><command>gvnccapture</command></term>
-        <listitem>
-          <para>
-            is used to capture image from VNC server
-          </para>
-          <indexterm zone="gtk-vnc gvnccapture">
-            <primary sortas="b-gvnccapture">gvnccapture</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-vnc-2">
-        <term><filename class="libraryfile">libgtk-vnc-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GTK+ 3</application> bindings for
-            <application>Gtk VNC</application>
-          </para>
-          <indexterm zone="gtk-vnc libgtk-vnc-2">
-            <primary sortas="c-libgtk-vnc-2.0">libgtk-vnc-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvnc-1a">
-        <term><filename class="libraryfile">libgvnc-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the GObject bindings for <application>Gtk VNC</application>
-          </para>
-          <indexterm zone="gtk-vnc libgvnc-1a">
-            <primary sortas="c-libgvnc-1.0">libgvnc-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvncpulse-1">
-        <term><filename class="libraryfile">libgvncpulse-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>PulseAudio</application> bridge for
-            <application>Gtk VNC</application>
-          </para>
-          <indexterm zone="gtk-vnc libgvncpulse-1">
-            <primary sortas="c-libgvncpulse-1.0">libgvncpulse-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtk/gtk+-config.xml
===================================================================
--- x/lib/gtk/gtk+-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring GTK+</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/gtk/gtk+-desc.xml
===================================================================
--- x/lib/gtk/gtk+-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The GTK+ package contains <userinput>GTK+ Libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GTK+ Libraries</title>
+<para>GTK+ Libraries provide the API to implement graphical user
+interfaces.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/gtk/gtk+-inst.xml
===================================================================
--- x/lib/gtk/gtk+-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of GTK+</title>
+
+<para>Install GTK+ by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/gtk/gtk+-intro.xml
===================================================================
--- x/lib/gtk/gtk+-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to GTK+</title>
+
+<screen>Download location:              <ulink url="&GTK-download;"/>
+Version used:                   &GTK-version;
+Package size:                   &GTK-size;
+Estimated Disk space required:  &GTK-buildsize;</screen>
+
+<para>The GTK+ package contains GTK+ Libraries. This is useful for
+creating graphical user interfaces for applications.</para>
+
+<screen>GTK+ depends on:
+<xref linkend="GLib"/>, <xref linkend="libpng"/>, <xref linkend="libtiff"/> and <xref
+linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/gtk/gtk+2-config.xml
===================================================================
--- x/lib/gtk/gtk+2-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring GTK+</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/gtk/gtk+2-desc.xml
===================================================================
--- x/lib/gtk/gtk+2-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The GTK+ package contains <userinput>GTK+ Libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GTK+ Libraries</title>
+<para>GTK+ Libraries provide the API to implement graphical user
+interfaces.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/gtk/gtk+2-inst.xml
===================================================================
--- x/lib/gtk/gtk+2-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of GTK+</title>
+
+<para>Install GTK+ by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/gtk/gtk+2-intro.xml
===================================================================
--- x/lib/gtk/gtk+2-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to GTK+</title>
+
+<screen>Download location:              <ulink url="&GTK2-download;"/>
+Version used:                   &GTK2-version;
+Package size:                   &GTK2-size;
+Estimated Disk space required:  &GTK2-buildsize;</screen>
+
+<para>The GTK+ package contains GTK+ Libraries. This is useful for
+creating graphical user interfaces for applications.</para>
+
+<screen>GTK+ depends on:
+<xref linkend="GLib2"/>, <xref linkend="Pango"/>, <xref linkend="ATK"/>,
+<xref linkend="libpng"/>, <xref linkend="libtiff"/> and <xref
+linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<!ENTITY GTK SYSTEM "../gtk+.xml">
+<!ENTITY GTK-intro SYSTEM "gtk+-intro.xml">
+<!ENTITY GTK-inst SYSTEM "gtk+-inst.xml">
+<!ENTITY GTK-desc SYSTEM "gtk+-desc.xml">
+<!ENTITY GTK-config SYSTEM "gtk+-config.xml">
+<!ENTITY GTK-buildsize "54 MB">
+<!ENTITY GTK-version "1.2.10">
+<!ENTITY GTK-download "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz">
+<!ENTITY GTK-size "2.7 MB">
+
+<!ENTITY GTK2 SYSTEM "../gtk+2.xml">
+<!ENTITY GTK2-intro SYSTEM "gtk+2-intro.xml">
+<!ENTITY GTK2-inst SYSTEM "gtk+2-inst.xml">
+<!ENTITY GTK2-desc SYSTEM "gtk+2-desc.xml">
+<!ENTITY GTK2-config SYSTEM "gtk+2-config.xml">
+<!ENTITY GTK2-buildsize "62.4 MB">
+<!ENTITY GTK2-version "2.0.5">
+<!ENTITY GTK2-download "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.5.tar.gz">
+<!ENTITY GTK2-size "8.2 MB">
Index: lib/gtk4.xml
===================================================================
--- x/lib/gtk4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,520 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/&gtk4-minor;/gtk-&gtk4-version;.tar.xz">
-  <!ENTITY gtk4-download-ftp  " ">
-  <!ENTITY gtk4-md5sum        "b7d1d14307535649097a09fdf50f942c">
-  <!ENTITY gtk4-size          "17 MB">
-  <!ENTITY gtk4-buildsize     "711 MB (with docs; add 66 MB for tests)">
-  <!ENTITY gtk4-time          "1.3 SBU (using parallelism=4; with docs; add 1.3 SBU for tests)">
-]>
-
-<sect1 id="gtk4" xreflabel="GTK-&gtk4-version;">
-  <?dbhtml filename="gtk4.html"?>
-
-  <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>
-
-    &lfs121_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="pygobject3"/>, and
-      <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="gst10-plugins-bad"/>,
-      <xref role='runtime' linkend="gst10-plugins-good"/> (runtime,
-      built with <xref role='nodep' linkend='libvpx'/>),
-      <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">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="docutils"/>,
-      <xref linkend="ffmpeg"/> (built with
-      <xref role='nodep' linkend='libvpx'/>),
-      <xref linkend="gi-docgen"/>,
-      <xref role="runtime" linkend="highlight"/>
-        (runtime, only used by <command>gtk4-demo</command> for syntax
-        highlighting of demo source code),
-      <xref linkend="libcloudproviders"/>,
-      <xref linkend="sassc"/>,
-      <xref linkend="tracker3"/>,
-      <xref linkend="vulkan-loader"/>,
-      <ulink url="https://github.com/OpenPrinting/cpdb-libs">cpdb</ulink>,
-      <ulink url="https://github.com/google/shaderc">glslc</ulink>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-      <!--<ulink url="https://vulkan.lunarg.com/sdk/home">vulkan</ulink>-->
-    </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 setup --prefix=/usr           \
-            --buildtype=release     \
-            -Dbroadway-backend=true \
-            -Dintrospection=enabled \
-	    -Dvulkan=disabled       \
-            .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen remap='doc'><userinput>sed "s@'doc'@&amp; / 'gtk-&gtk4-version;'@" -i ../docs/reference/meson.build &amp;&amp;
-meson configure -Ddocumentation=true                             &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>dbus-run-session meson test --setup
-      x11</command>. If you are in a Wayland session, replace x11 with wayland.
-      Nine tests are known to fail if
-      <ulink url="https://gitlab.gnome.org/GNOME/cantarell-fonts">Cantrell fonts</ulink>
-      are not installed. Many tests will fail if
-      <filename>~/.config/gtk-4.0/settings.ini</filename> exists and the gtk-modules
-      line is not commented out.
-      On systems with NVIDIA graphics cards, the tests may take significantly
-      longer than the above test time.
-    </para>
-<!-- [pierre]: 4.6.0, wayland: 727 ok; 2 Expected Fail;  1 Fail; 1 Skipped
-     [bdubbs]: 4.6.3, x11,     724 OK, 2 Expected Fail, 12 Fail. 1 Skipped
-     [pierre]: 4.6.6, wayland, 738 OK, 2 Expected Fail,  1 Fail. 1 Skipped
-     [pierre]: 4.6.7, wayland, 737 OK, 2 Expected Fail,  1 Fail. 1 Skipped. 1 Timeout
-     [bdubbs]: 4.6.7, x11,     758 OK, 2 Expected Fail,  9 Fail. 1 Skipped. 1 Timeout
-     [pierre]: 4.8.1, wayland, 765 OK, 2 Expected Fail,  2 Fail. 1 Skipped
-     [bdubbs]: 4.8.2, x11,     753 OK, 2 Expected Fail, 14 Fail. 1 Skipped
-     [pierre]: 4.8.3, wayland, 760 OK, 2 Expected Fail,  5 Fail. 3 Skipped
-     [bdubbs]: 4.10.0, x11,    701 OK, 0 Expected Fail, 15 Fail. 1 Skipped, 2 Timeout
-               above over ssh
-     [bdubbs]: 4.10.0, x11,    712 OK, 0 Expected Fail,  6 Fail. 1 Skipped, 0 Timeout
-               above on native x11
-     [bdubbs]: 4.12.0, x11,   1453 OK, 0 Expected Fail,  9 Fail. 5 Skipped, 0 Timeout
-               above on native x11
-     [bdubbs]: 4.12.1, x11,   1455 OK, 0 Expected Fail,  7 Fail. 5 Skipped, 0 Timeout
-               above on native x11
-     [renodr]: 4.12.4, x11,   1535 OK, 0 Expected Fail,  8 Fail, 5 Skipped, 0 Timeout
-               above on native X11
-     [rahul]: 4.14.1, wayland,   4174 OK, 0 Expected Fail,  81 Fail, 2 Skipped, 0 Timeout
-               above on native wayland (Plasma 6)
-     [renodr]: 4.14.2, wayland,  4211 OK, 0 Expected Fail, 43 Fail, 2 Skipped, 0 Timeout
-               above on wayland in GNOME
-     [renodr]: 4.14.3, wayland,  4250 OK, 0 Expected Fail, 42 Fail, 2 Skipped, 0 Timeout
-               above on wayland in GNOME
--->
-
-    <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>
-      <parameter>-Dintrospection=enabled</parameter>: This switch enables
-      using GObject Introspection to generate GIR bindings
-      of this packages.  These bindings are required by GNOME.
-    </para>
-
-    <para>
-      <option>-Dcloudproviders=enabled</option>: Use this switch if you have
-      <xref linkend="libcloudproviders" role="nodep"/> installed and wish to
-      enable support for cloud providers in a file chooser window.
-    </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>-Dman-pages=true</option>: Use this switch if you have
-      <xref linkend='docutils'/> installed and wish to generate the man
-      pages.
-    </para>
-
-    <para>
-      <option>-Dsysprof=enabled</option>: Use this switch if you have
-      <ulink url="&sysprof-url;">sysprof</ulink> installed and wish to enable 
-      tracing support for GTK4-based applications.
-    </para>
-
-    <para>
-      <option>-Dvulkan=enabled</option>: Use this switch if you have
-      <xref linkend="vulkan-loader"/> installed and wish to build the
-      experimental Vulkan backend. Note that you must have
-      <ulink url="https://github.com/google/shaderc/blob/main/downloads.md">glslc</ulink>
-      installed if you decide to enable this option.
-    </para>
-
-  </sect2>
-
-  <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-icons"/>) 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-cursor-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-node-editor,
-          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-node-editor">
-        <term><command>gtk4-node-editor</command></term>
-        <listitem>
-          <para>
-            is a utility to show and edit render node files. Such render
-            node files can be obtained e.g. from the GTK inspector
-          </para>
-          <indexterm zone="gtk4 gtk4-node-editor">
-            <primary sortas="b-gtk4-node-editor">gtk4-node-editor</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: lib/gtkmm3.xml
===================================================================
--- x/lib/gtkmm3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtkmm3-download-http "&gnome-download-http;/gtkmm/&gnome-minor-24;/gtkmm-&gtkmm3-version;.tar.xz">
-  <!ENTITY gtkmm3-download-ftp  " ">
-  <!ENTITY gtkmm3-md5sum        "47871a7973e186c1189b2145b507de15">
-  <!ENTITY gtkmm3-size          "14 MB">
-  <!ENTITY gtkmm3-buildsize     "200 MB (with tests)">
-  <!ENTITY gtkmm3-time          "1.2 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gtkmm3" xreflabel="Gtkmm-&gtkmm3-version;">
-  <?dbhtml filename="gtkmm3.html"?>
-
-
-  <title>Gtkmm-&gtkmm3-version;</title>
-
-  <indexterm zone="gtkmm3">
-    <primary sortas="a-Gtkmm">Gtkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtkmm</title>
-
-    <para>
-      The <application>Gtkmm</application> package provides a C++ interface to
-      <application>GTK+ 3</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkmm3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkmm3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkmm3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkmm3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkmm3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkmm3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atkmm"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="pangomm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtkmm</title>
-
-    <para>
-      Install <application>Gtkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir gtkmm3-build &amp;&amp;
-cd    gtkmm3-build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that you
-      must be in a graphical environment, as the tests try to open some
-      windows.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you have built the documentation (see Command Explanations below) it
-      was installed to <filename
-      class="directory">/usr/share/doc/gtkmm-3.0</filename>. For consistency,
-      move it to a versioned directory as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>mv -v /usr/share/doc/gtkmm-3.0 /usr/share/doc/gtkmm-&gtkmm3-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: If you have installed
-      <xref linkend="doxygen"/> this define will build and install the
-      documentation.
-    </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>
-          libgdkmm-3.0.so and libgtkmm-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gdkmm-3.0,
-          /usr/include/gtkmm-3.0,
-          /usr/lib/gdkmm-3.0,
-          /usr/lib/gtkmm-3.0, and optionally
-          /usr/share/{devhelp/books/gtkmm-3.0,doc/gtkmm-&gtkmm3-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdkmm-3">
-        <term><filename class="libraryfile">libgdkmm-3.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the GDK API classes
-        </para>
-          <indexterm zone="gtkmm3 libgdkmm-3">
-            <primary sortas="c-libgdkmm-3">libgdkmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkmm-3">
-        <term><filename class="libraryfile">libgtkmm-3.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the <application>GTK+ 3</application> API classes
-        </para>
-          <indexterm zone="gtkmm3 libgtkmm-3">
-            <primary sortas="c-libgtkmm-3">libgtkmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/gtkmm4.xml
===================================================================
--- x/lib/gtkmm4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,193 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtkmm4-download-http "&gnome-download-http;/gtkmm/4.14/gtkmm-&gtkmm4-version;.tar.xz">
-  <!ENTITY gtkmm4-download-ftp  " ">
-  <!ENTITY gtkmm4-md5sum        "2e25e9c3f64793ff8b51bdd24196d78f">
-  <!ENTITY gtkmm4-size          "16 MB">
-  <!ENTITY gtkmm4-buildsize     "206 MB (with tests)">
-  <!ENTITY gtkmm4-time          "1.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gtkmm4" xreflabel="Gtkmm-&gtkmm4-version;">
-  <?dbhtml filename="gtkmm4.html"?>
-
-
-  <title>Gtkmm-&gtkmm4-version;</title>
-
-  <indexterm zone="gtkmm4">
-    <primary sortas="a-Gtkmm">Gtkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtkmm</title>
-
-    <para>
-      The <application>Gtkmm</application> package provides a C++ interface to
-      <application>GTK-4</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkmm4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkmm4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkmm4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkmm4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkmm4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkmm4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atkmm2"/>,
-      <xref linkend="gtk4"/>, and
-      <xref linkend="pangomm2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtkmm</title>
-
-    <para>
-      Install <application>Gtkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir gtkmm4-build &amp;&amp;
-cd    gtkmm4-build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that you
-      must be in a graphical environment, as the tests try to open some
-      windows.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you have built the documentation (see Command Explanations below) it
-      was installed to <filename
-      class="directory">/usr/share/doc/gtkmm-4.0</filename>. For consistency,
-      move it to a versioned directory as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>mv -v /usr/share/doc/gtkmm-4.0 /usr/share/doc/gtkmm-&gtkmm4-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: If you have installed
-      <xref linkend="doxygen"/> this define will build and install the
-      documentation.
-    </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>
-          libgdkmm-4.0.so and libgtkmm-4.0.so
-        </seg>
-        <seg>
-          /usr/include/gdkmm-4.0,
-          /usr/include/gtkmm-4.0,
-          /usr/lib/gdkmm-4.0,
-          /usr/lib/gtkmm-4.0, and optionally
-          /usr/share/{devhelp/books/gtkmm-4.0,doc/gtkmm-&gtkmm4-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdkmm-4">
-        <term><filename class="libraryfile">libgdkmm-4.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the GDK API classes
-        </para>
-          <indexterm zone="gtkmm4 libgdkmm-4">
-            <primary sortas="c-libgdkmm-4">libgdkmm-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkmm-4">
-        <term><filename class="libraryfile">libgtkmm-4.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the <application>GTK 4</application> API classes
-        </para>
-          <indexterm zone="gtkmm4 libgtkmm-4">
-            <primary sortas="c-libgtkmm-4">libgtkmm-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/gtksourceview.xml
===================================================================
--- x/lib/gtksourceview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtksourceview-download-http
-    "&gnome-download-http;/gtksourceview/&gnome-minor-24;/gtksourceview-&gtksourceview-version;.tar.xz">
-  <!ENTITY gtksourceview-download-ftp  " ">
-  <!ENTITY gtksourceview-md5sum        "b748da426a7d64e1304f0c532b0f2a67">
-  <!ENTITY gtksourceview-size          "1.4 MB">
-  <!ENTITY gtksourceview-buildsize     "80 MB (with tests)">
-  <!ENTITY gtksourceview-time          "0.2 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="gtksourceview" xreflabel="gtksourceview-&gtksourceview-version;">
-  <?dbhtml filename="gtksourceview.html"?>
-
-
-  <title>gtksourceview-&gtksourceview-version;</title>
-
-  <indexterm zone="gtksourceview">
-    <primary sortas="a-gtksourceview">gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="fop"/> (or
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>),
-      and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-
-    <para>
-      To test the results, issue <command>make check</command>. The tests need
-      to be run in a graphical environment.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </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>
-          libgtksourceview-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,share,share/gtk-doc/html}/gtksourceview-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-3">
-        <term><filename class="libraryfile">libgtksourceview-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget
-          </para>
-          <indexterm zone="gtksourceview libgtksourceview-3">
-            <primary sortas="c-libgtksourceview-3">libgtksourceview-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/gtksourceview4.xml
===================================================================
--- x/lib/gtksourceview4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtksourceview4-download-http
-    "&gnome-download-http;/gtksourceview/4.8/gtksourceview-&gtksourceview4-version;.tar.xz">
-  <!ENTITY gtksourceview4-download-ftp  " ">
-  <!ENTITY gtksourceview4-md5sum        "2bf056caaae27654ec3a5930dd5597d3">
-  <!ENTITY gtksourceview4-size          "1.1 MB">
-  <!ENTITY gtksourceview4-buildsize     "71 MB (with tests)">
-  <!ENTITY gtksourceview4-time          "0.1 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="gtksourceview4" xreflabel="gtksourceview4-&gtksourceview4-version;">
-  <?dbhtml filename="gtksourceview4.html"?>
-
-
-  <title>gtksourceview4-&gtksourceview4-version;</title>
-
-  <indexterm zone="gtksourceview4">
-    <primary sortas="a-gtksourceview4">gtksourceview4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview4-time;
-        </para>
-      </listitem>
-    </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>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="fop"/> (or
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>),
-      and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-<!--
-    <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:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue <command>ninja test</command>. The tests need
-      to be run in a graphical environment.
-    </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>: This option is normally
-      used 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>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgtksourceview-4.so
-        </seg>
-        <seg>
-          /usr/{include,share,share/gtk-doc/html}/gtksourceview-4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-4">
-        <term><filename class="libraryfile">libgtksourceview-4.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget
-          </para>
-          <indexterm zone="gtksourceview4 libgtksourceview-4">
-            <primary sortas="c-libgtksourceview-4">libgtksourceview-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/gtksourceview5.xml
===================================================================
--- x/lib/gtksourceview5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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.12/gtksourceview-&gtksourceview5-version;.tar.xz">
-  <!ENTITY gtksourceview5-download-ftp  " ">
-  <!ENTITY gtksourceview5-md5sum        "60ed6cd89cc877c2e7e08d314fa55e02">
-  <!ENTITY gtksourceview5-size          "1.2 MB">
-  <!ENTITY gtksourceview5-buildsize     "47 MB">
-  <!ENTITY gtksourceview5-time          "0.2 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="gtksourceview5" xreflabel="gtksourceview5-&gtksourceview5-version;">
-  <?dbhtml filename="gtksourceview5.html"?>
-
-
-  <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>
-
-    &lfs121_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">
-      &gobject-introspection; and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <!--<xref linkend="sysprof"/>,-->
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="vulkan-loader"/>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-      <!--<ulink url="https://www.vulkan.org/">Vulkan</ulink>-->
-    </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 setup --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>-Ddocumentation=true</option>: Use this switch if you have
-      <xref linkend="gi-docgen"/> installed and wish to generate the API
-      documentation.
-    </para>
-
-    <para>
-      <option>-Dsysprof=true</option>: Use this switch if you have
-      <ulink url="&sysprof-url;">sysprof</ulink> 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: lib/imlib2.xml
===================================================================
--- x/lib/imlib2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,299 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 imlib2-download-http "&sourceforge-dl;/enlightenment/imlib2-&imlib2-version;.tar.xz">
-  <!ENTITY imlib2-download-ftp  " ">
-  <!ENTITY imlib2-md5sum        "046e7b2c918ae612dbf61dea8b59f37a">
-  <!ENTITY imlib2-size          "816 KB">
-  <!ENTITY imlib2-buildsize     "14 MB (with docs)">
-  <!ENTITY imlib2-time          "0.2 SBU (with docs)">
-]>
-
-<sect1 id="imlib2" xreflabel="imlib2-&imlib2-version;">
-  <?dbhtml filename="imlib2.html"?>
-
-
-  <title>imlib2-&imlib2-version;</title>
-
-  <indexterm zone="imlib2">
-    <primary sortas="a-imlib2">imlib2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to imlib2</title>
-
-    <para>
-      <application>imlib2</application> is a graphics library for fast file
-      loading, saving, rendering and manipulation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&imlib2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&imlib2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &imlib2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &imlib2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &imlib2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &imlib2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">imlib2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="giflib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for API documentation),
-      <xref linkend="highway"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libjxl"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="x265"/>,
-      <!--<ulink url="https://github.com/google/highway/">highway</ulink>,-->
-      <ulink url="https://github.com/strukturag/libheif">libheif</ulink>,
-      <ulink url="https://sourceforge.net/projects/mad">libid3tag</ulink>,
-      <!--<ulink url="https://jpeg.org/jpegxl/">libjxl</ulink>, and-->
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre">libspectre</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of imlib2</title>
-
-    <para>
-      Install <application>imlib2</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you generated the API documentation, install it as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d            /usr/share/doc/imlib2-&imlib2-version;/html &amp;&amp;
-install -v -m644    doc/html/* /usr/share/doc/imlib2-&imlib2-version;/html</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>
-      <option>--enable-doc-build</option>: This switch generates
-      the API documentation.  <xref linkend="doxygen"/> must be installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- imlib2-config dropped in 1.7.5 -->
-      <seglistitem>
-        <seg>imlib2_bumpmap,
-             imlib2_colorspace,
-             imlib2_conv,
-             imlib2_grab,
-             imlib2_load,
-             imlib2_poly,
-             imlib2_show,
-             imlib2_test, and
-             imlib2_view</seg>
-        <seg>libImlib2.so and various filters and image loader modules.</seg>
-        <seg>/usr/lib/imlib2, /usr/share/doc/imlib2-&imlib2-version;, and
-        /usr/share/imlib2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="imlib2_bumpmap">
-        <term><command>imlib2_bumpmap</command></term>
-        <listitem>
-          <para>
-            is to test the <application>imlib2</application> bumpmap function
-          </para>
-          <indexterm zone="imlib2 imlib2_bumpmap">
-            <primary sortas="b-imlib2_bumpmap">imlib2_bumpmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_colorspace">
-        <term><command>imlib2_colorspace</command></term>
-        <listitem>
-          <para>
-            is to test the <application>imlib2</application> colorspace
-            function
-          </para>
-          <indexterm zone="imlib2 imlib2_colorspace">
-            <primary sortas="b-imlib2_colorspace">imlib2_colorspace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imlib2_conv">
-        <term><command>imlib2_conv</command></term>
-        <listitem>
-          <para>
-            converts images between formats
-          </para>
-          <indexterm zone="imlib2 imlib2_conv">
-            <primary sortas="b-imlib2_conv">imlib2_conv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_grab">
-        <term><command>imlib2_grab</command></term>
-        <listitem>
-          <para>
-            takes screenshots
-          </para>
-          <indexterm zone="imlib2 imlib2_grab">
-            <primary sortas="b-imlib2_grab">imlib2_grab</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="imlib2_load">
-        <term><command>imlib2_load</command></term>
-        <listitem>
-          <para>
-            loads and caches images
-          </para>
-          <indexterm zone="imlib2 imlib2_load">
-            <primary sortas="b-imlib2_load">imlib2_load</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="imlib2_poly">
-        <term><command>imlib2_poly</command></term>
-        <listitem>
-          <para>
-            is to test the <application>imlib2</application> poly function
-          </para>
-          <indexterm zone="imlib2 imlib2_poly">
-            <primary sortas="b-imlib2_poly">imlib2_poly</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_show">
-        <term><command>imlib2_show</command></term>
-        <listitem>
-          <para>
-            is an <application>imlib2</application> program test
-          </para>
-          <indexterm zone="imlib2 imlib2_show">
-            <primary sortas="b-imlib2_show">imlib2_show</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_test">
-        <term><command>imlib2_test</command></term>
-        <listitem>
-          <para>
-            is an <application>imlib2</application> program test
-          </para>
-          <indexterm zone="imlib2 imlib2_test">
-            <primary sortas="b-imlib2_test">imlib2_test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imlib2_view">
-        <term><command>imlib2_view</command></term>
-        <listitem>
-          <para>
-            displays image files
-          </para>
-          <indexterm zone="imlib2 imlib2_view">
-            <primary sortas="b-imlib2_view">imlib2_view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libImlib2">
-        <term><filename class="libraryfile">libImlib2.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions for programs to handle various
-            image data formats
-          </para>
-          <indexterm zone="imlib2 libImlib2">
-            <primary sortas="c-libImlib2">libImlib2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/kcolorpicker.xml
===================================================================
--- x/lib/kcolorpicker.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kcolorpicker-download-http "https://github.com/ksnip/kColorPicker/archive/v&kcolorpicker-version;/kColorPicker-&kcolorpicker-version;.tar.gz">
-  <!ENTITY kcolorpicker-download-ftp  " ">
-  <!ENTITY kcolorpicker-md5sum        "1efc91252446af0d7e5c467ea7d517e7">
-  <!ENTITY kcolorpicker-size          "16 KB">
-  <!ENTITY kcolorpicker-buildsize     "2.4 MB">
-  <!ENTITY kcolorpicker-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="kcolorpicker" xreflabel="kcolorpicker-&kcolorpicker-version;">
-  <?dbhtml filename="kcolorpicker.html"?>
-
-  <title>kColorPicker-&kcolorpicker-version;</title>
-
-  <indexterm zone="kcolorpicker">
-    <primary sortas="a-kcolorpicker">kcolorpicker</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kColorPicker</title>
-
-    <para>
-      kColorPicker is a QToolButton library with a color popup menu, which
-      lets you select colors. The popup menu features a color dialog button
-      which can be used to add custom colors to the popup menu.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kcolorpicker-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kcolorpicker-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kcolorpicker-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kcolorpicker-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kcolorpicker-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kcolorpicker-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kColorPicker Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kColorPicker</title>
-
-    <para>
-      Install <application>kColorPicker</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  \
-      -DBUILD_SHARED_LIBS=ON      \
-      -DBUILD_WITH_QT6=ON         \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>
-          libkColorPicker.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/kColorPicker
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: lib/keybinder3.xml
===================================================================
--- x/lib/keybinder3.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 keybinder3-download-http
-           "https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v&keybinder3-version;/keybinder-3.0-&keybinder3-version;.tar.gz">
-  <!ENTITY keybinder3-download-ftp " ">
-  <!ENTITY keybinder3-md5sum        "97260321fda721fce799174ea6ba10cf">
-  <!ENTITY keybinder3-size          "370 KB">
-  <!ENTITY keybinder3-buildsize     "2.6 MB">
-  <!ENTITY keybinder3-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="keybinder3" xreflabel="keybinder-3.0-&keybinder3-version;">
-  <?dbhtml filename="keybinder-3.html" ?>
-
-
-  <title>keybinder-3.0-&keybinder3-version;</title>
-
-  <indexterm zone="keybinder3">
-    <primary sortas="a-keybinder3">keybinder-3.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keybinder-3.0</title>
-
-    <para>
-      The <application>keybinder-3.0</application> package contains a utility
-      library registering global <application>X</application> keyboard
-      shortcuts for <application>GTK+-3</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keybinder3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keybinder3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keybinder3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keybinder3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keybinder3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keybinder3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">keybinder-3.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of keybinder-3.0</title>
-
-    <para>
-      Install <application>keybinder-3.0</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="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libkeybinder-3.0.so
-        </seg>
-        <seg>
-          /usr/include/keybinder-3.0 and
-          /usr/share/gtk-doc/html/keybinder-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keybinder3-lib">
-        <term><filename class="libraryfile">libkeybinder-3.0.so</filename></term>
-        <listitem>
-          <para>
-            is the library that registers global <application>X</application>
-            keyboard shortcuts
-          </para>
-          <indexterm zone="keybinder3 keybinder3-lib">
-            <primary sortas="c-keybinder3">libkeybinder-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/kimageannotator.xml
===================================================================
--- x/lib/kimageannotator.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kimageannotator-download-http "https://github.com/ksnip/kImageAnnotator/archive/v&kimageannotator-version;/kImageAnnotator-&kimageannotator-version;.tar.gz">
-  <!ENTITY kimageannotator-download-ftp  " ">
-  <!ENTITY kimageannotator-md5sum        "68990dfe7fe03f1aff5e0e5338b9f3bb">
-  <!ENTITY kimageannotator-size          "264 KB">
-  <!ENTITY kimageannotator-buildsize     "31 MB">
-  <!ENTITY kimageannotator-time          "0.6 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="kimageannotator" xreflabel="kimageannotator-&kimageannotator-version;">
-  <?dbhtml filename="kimageannotator.html"?>
-
-  <title>kImageAnnotator-&kimageannotator-version;</title>
-
-  <indexterm zone="kimageannotator">
-    <primary sortas="a-kimageannotator">kimageannotator</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kImageAnnotator</title>
-
-    <para>
-       kImageAnnotator is a tool for annotating images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kimageannotator-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kimageannotator-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kimageannotator-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kimageannotator-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kimageannotator-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kimageannotator-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kImageAnnotator Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kcolorpicker"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kImageAnnotator</title>
-
-    <para>
-      Install <application>kImageAnnotator</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  \
-      -DBUILD_SHARED_LIBS=ON      \
-      -DBUILD_WITH_QT6=ON         \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>
-          libkImageAnnotator.so
-        </seg>
-        <seg>
-          /usr/include/kImageAnnotator-Qt6,
-          /usr/lib/cmake/kImageAnnotator-Qt6, and
-          /usr/share/kImageAnnotator
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/lesstif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="lesstif" xreflabel="lesstif">
+<?dbhtml filename="lesstif.html" dir="x"?>
+<title>lesstif</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: x/lib/lesstif/lesstif.ent
===================================================================
--- x/lib/lesstif/lesstif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/lesstif/lesstif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY lesstif SYSTEM "../lesstif.xml">
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/lib/lib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,97 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="x-lib">
+<?dbhtml filename="lib.html" dir="x"?>
+<title>X Libraries</title>
 
-<chapter id="x-lib">
-  <?dbhtml filename="lib.html" ?>
-
-  <title>Graphical Environment Libraries</title>
-
-  <para>
-    This chapter does not contain libraries that are required to run
-    <application>X</application>. It does contain libraries that enhance
-    <application>X</application>. In some cases the enhancement is as simple as
-    font support. In others it is as complex as libraries that sit between
-    <application>X</application> and applications that run on
-    <application>X</application> whose purpose is to standardize the look and
-    feel and inter-process communications for different applications. They also
-    assist programmers by supplying common elements.
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amtk.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atkmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atkmm2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-core.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-atk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm-1.0.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm-1.16.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fltk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdk-pixbuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glslang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice010.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphene.xml"/>
-  <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"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc.xml"/>
-  <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="kcolorpicker.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kimageannotator.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder2.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libadwaita.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdazzle.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libei.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgedit-amtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgedit-gtksourceview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libepoxy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxklavier.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-alternate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-components.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt6.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebengine.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tepl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulkan-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulkan-loader.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-desktop-portal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-desktop-portal-gtk.xml"/>
+&lesstif;
+&qt;
+&GLib;
+&GLib2;
+&GTK;
+&GTK2;
+&ATK;
+&Pango;
 
 </chapter>
Index: lib/libadwaita.xml
===================================================================
--- x/lib/libadwaita.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,200 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libadwaita-download-http "&gnome-download-http;/libadwaita/&libadwaita-minor;/libadwaita-&libadwaita-version;.tar.xz">
-  <!ENTITY libadwaita-download-ftp  " ">
-  <!ENTITY libadwaita-md5sum        "71d5d50fc8f36298ef7393b4010baf68">
-  <!ENTITY libadwaita-size          "4.2 MB">
-  <!ENTITY libadwaita-buildsize     "57 MB (with tests)">
-  <!ENTITY libadwaita-time          "0.3 SBU (with parallelism=4; with tests)">
-]>
-
-<sect1 id="libadwaita1" xreflabel="libadwaita-&libadwaita-version;">
-  <?dbhtml filename="libadwaita.html"?>
-
-
-  <title>libadwaita-&libadwaita-version;</title>
-
-  <indexterm zone="libadwaita1">
-    <primary sortas="a-libadwaita">libadwaita</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libadwaita</title>
-
-    <para>
-      The <application>libadwaita</application> package provides additional
-      GTK4 UI widgets for use in developing user interfaces. It is used
-      primarily for GNOME applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libadwaita-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libadwaita-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libadwaita-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libadwaita-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libadwaita-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libadwaita-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libadwaita Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="appstream"/> and
-      <xref linkend="gtk4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libadwaita</title>
-
- <!-- Fixed in 1.4.2
-    <para>
-      Adapt some AppStream API usage for AppStream-1.0.0 or later:
-    </para>
-
-<screen><userinput>sed -e "/releases =/s/=.*/ =                             \
-        as_release_list_get_entries                      \
-        (as_component_get_releases_plain (component));/" \
-    -e "/ developer_name =/s/=.*/ =                      \
-        as_developer_get_name                            \
-        (as_component_get_developer (component));/"      \
-    -i src/adw-about-window.c</userinput></screen>
--->
-
-    <para>
-      Install <application>libadwaita</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "s/apiversion/'&libadwaita-version;'/" -i ../doc/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests must be run from a graphical session.
-    </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>
-          adwaita-1-demo
-        </seg>
-        <seg>
-          libadwaita-1.so
-        </seg>
-        <seg>
-          /usr/include/libadwaita-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="adwaita-1-demo">
-        <term><command>adwaita-1-demo</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the
-            <application>libadwaita</application> library
-          </para>
-          <indexterm zone="libadwaita1 adwaita-1-demo">
-            <primary sortas="b-adwaita-1-demo">adwaita-1-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libadwaita-1">
-        <term><filename class="libraryfile">libadwaita-1.so</filename></term>
-        <listitem>
-          <para>
-            provides additional GTK widgets for use in creating user interfaces
-          </para>
-          <indexterm zone="libadwaita1 libadwaita-1">
-            <primary sortas="c-libadwaita-1">libadwaita-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.xz">
-  <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "f8521de37ccbd15987b843a83fabd567">
-  <!ENTITY libdrm-size          "472 KB">
-  <!ENTITY libdrm-buildsize     "8.4 MB (with tests)">
-  <!ENTITY libdrm-time          "less than 0.1 SBU (with tests)">
-  <!-- With version 2.4.102, the tests add 1 second to my build. -->
-  <!-- The 'threaded' test adds about 15 seconds if you're on an NVIDIA system
-       due to it directly interacting with the GPU. -->
-]>
-
-<sect1 id="libdrm" xreflabel="libdrm-&libdrm-version;">
-  <?dbhtml filename="libdrm.html"?>
-
-
-  <title>Libdrm-&libdrm-version;</title>
-
-  <indexterm zone="libdrm">
-    <primary sortas="a-libdrm">libdrm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libdrm</title>
-
-    <para>
-      <application>Libdrm</application> provides a userspace library for
-      accessing the direct rendering manager (DRM) on operating systems that
-      support the ioctl interface. Libdrm is a low-level library, typically used
-      by graphics drivers such as the Mesa DRI drivers, the X drivers, libva and
-      similar projects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdrm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdrm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdrm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdrm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdrm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdrm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdrm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/> (for tests),
-      <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="libxslt"/> (to build manual pages),
-      <xref linkend="libatomic_ops"/> (required by architectures without native atomic operations),
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://cunit.sourceforge.net/">CUnit</ulink> (for AMDGPU tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libdrm</title>
-
-<!--
-    <para>
-      First fix a problem building the libdrm_intel library:
-    </para>
-
-<screen><userinput>sed -i '/not.*system/s/system/cpu_family/' meson.build</userinput></screen>
--->
-
-    <para>
-      Install <application>libdrm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX \
-            --buildtype=release   \
-            -Dudev=true           \
-            -Dvalgrind=disabled   \
-            ..                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To check the results, issue <command>ninja test</command>. <!--One test,
-      'threaded' in the nouveau subdirectory, is known to fail with a
-      30 second timeout.-->
-      <!-- Regarding the 'threaded' test, it's now skipped by default (2.4.102)
-           -renodr -->
-
-      <!-- Tests may hang
-      for unknown reasons. --><!-- If nouveau threaded test hangs, you can disable it
-      with
-      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
-
-      Now that tests are run with ninja, the test merely times out after 30 seconds.
-      -->
-    </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>-Dudev=true</parameter>: This parameter enables support for using
-      <application>Udev</application> instead of <command>mknod</command>.
-    </para>
-
-    <para>
-      <parameter>-Dvalgrind=disabled</parameter>: This parameter disables
-      building libdrm with valgrind support. This fixes building some packages
-      that use libdrm. Change this parameter to "enabled" (or remove it) if you
-      need support for valgrind.
-    </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>
-          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
-          libdrm_radeon.so, and libdrm.so<!--, and libkms.so-->
-        </seg>
-        <seg>
-           /usr/include/libdrm <!--,/usr/include/libkms,-->
-           and /usr/share/libdrm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdrm_amdgpu">
-        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
-        <listitem>
-          <para>
-            contains the AMDGPU specific Direct Rendering Manager functions
-          </para>
-          <indexterm zone="libdrm libdrm_amdgpu">
-            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_intel">
-        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
-        <listitem>
-          <para>
-            contains the Intel specific Direct Rendering Manager
-            functions
-          </para>
-          <indexterm zone="libdrm libdrm_intel">
-            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_nouveau">
-        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
-        <listitem>
-          <para>
-            contains the open source nVidia (Nouveau) specific Direct
-            Rendering Manager functions
-          </para>
-          <indexterm zone="libdrm libdrm_nouveau">
-            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_radeon">
-        <term><filename class="libraryfile">libdrm_radeon.so</filename></term>
-        <listitem>
-          <para>
-            contains the AMD Radeon specific Direct Rendering Manager
-            functions
-          </para>
-          <indexterm zone="libdrm libdrm_radeon">
-            <primary sortas="c-libdrm_radeon">libdrm_radeon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm-lib">
-        <term><filename class="libraryfile">libdrm.so</filename></term>
-        <listitem>
-          <para>
-            contains the Direct Rendering Manager API functions
-          </para>
-          <indexterm zone="libdrm libdrm-lib">
-            <primary sortas="c-libdrm">libdrm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- Removed in 2.4.111
-      <varlistentry id="libkms">
-        <term><filename class="libraryfile">libkms.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for kernel mode setting abstraction
-          </para>
-          <indexterm zone="libdrm libkms">
-            <primary sortas="c-libkms">libkms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/libei.xml
===================================================================
--- x/lib/libei.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libei-download-http "https://gitlab.freedesktop.org/libinput/libei/-/archive/&libei-version;/libei-&libei-version;.tar.gz">
-  <!ENTITY libei-download-ftp  " ">
-  <!ENTITY libei-md5sum        "39d18e5c56834d0b3e62b1e2af41a7a5">
-  <!ENTITY libei-size          "228 KB">
-  <!ENTITY libei-buildsize     "5.2 MB">
-  <!ENTITY libei-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libei" xreflabel="libei-&libei-version;">
-  <?dbhtml filename="libei.html"?>
-
-  <title>libei-&libei-version;</title>
-
-  <indexterm zone="libei">
-    <primary sortas="a-libei">libei</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libei</title>
-
-    <para>
-      The <application>libei</application> package contains a set of libraries
-      for handling emulated inputs. It is primarily aimed at the Wayland stack.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libei-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libei-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libei-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libei-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libei-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libei-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libei Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="attrs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="libevdev"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="libxml2"/>, and
-      <ulink url="https://github.com/nemequ/munit">munit</ulink>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libei</title>
-
-    <para>
-      Install <application>libei</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dtests=disabled .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires an external
-      dependency. If you have
-      <ulink url="https://github.com/nemequ/munit">munit</ulink> installed and
-      wish to run the test suite, run the following commands:
-    </para>
-
-<screen remap="test"><userinput>meson configure -Dtests=enabled .. &amp;&amp;
-ninja test</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"/>
-
-    <para>
-      <parameter>-Dtests=disabled</parameter>: This switch avoids a dependency
-      on <ulink url="https://github.com/nemequ/munit">munit</ulink>. Remove this
-      switch if you have <application>munit</application> installed and wish to
-      run the test suite.
-    </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>
-          libei.so,
-          libeis.so, and
-          liboeffis.so
-        </seg>
-        <seg>
-          /usr/include/libei-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libei-lib">
-        <term><filename class="libraryfile">libei.so</filename></term>
-        <listitem>
-          <para>
-            provides a client side implementation for handling Emulated Input
-          </para>
-          <indexterm zone="libei libei-lib">
-            <primary sortas="c-libei">libei.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libeis">
-        <term><filename class="libraryfile">libeis.so</filename></term>
-        <listitem>
-          <para>
-            provides a server side implementation for handling Emulated Input
-          </para>
-          <indexterm zone="libei libeis">
-            <primary sortas="c-libeis">libeis.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="liboffis">
-        <term><filename class="libraryfile">liboffis</filename></term>
-        <listitem>
-          <para>
-            provides DBus communication services between libei and the XDG
-            RemoteDesktop portal
-          </para>
-          <indexterm zone="libei liboffis">
-            <primary sortas="c-liboffis">liboffis.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libepoxy-download-http "&gnome-download-http;/libepoxy/&libepoxy-minor;/libepoxy-&libepoxy-version;.tar.xz">
-  <!ENTITY libepoxy-download-ftp  " ">
-  <!ENTITY libepoxy-md5sum        "10c635557904aed5239a4885a7c4efb7">
-  <!ENTITY libepoxy-size          "220 KB">
-  <!ENTITY libepoxy-buildsize     "13 MB (with tests)">
-  <!ENTITY libepoxy-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libepoxy" xreflabel="libepoxy-&libepoxy-version;">
-  <?dbhtml filename="libepoxy.html"?>
-
-
-  <title>libepoxy-&libepoxy-version;</title>
-
-  <indexterm zone="libepoxy">
-    <primary sortas="a-libepoxy">libepoxy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libepoxy</title>
-
-    <para>
-      <application>libepoxy</application> is a library for handling OpenGL
-      function pointer management.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libepoxy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libepoxy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libepoxy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libepoxy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libepoxy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libepoxy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libepoxy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libepoxy</title>
-
-    <para>
-      Install <application>libepoxy</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Ddocs=true</option>: If you have <xref linkend="doxygen"/>
-      installed, add this option to generate additional documentation.
-    </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>
-          libepoxy.so
-        </seg>
-        <seg>
-          /usr/include/epoxy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-
-      <varlistentry id="libepoxy-lib">
-        <term><filename class="libraryfile">libepoxy.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling OpenGL function
-            pointer management
-          </para>
-          <indexterm zone="libepoxy libepoxy-lib">
-            <primary sortas="c-libepoxy">libepoxy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/libgedit-amtk.xml
===================================================================
--- x/lib/libgedit-amtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgedit-amtk-download-http "https://gedit-technology.net/tarballs/libgedit-amtk/libgedit-amtk-&libgedit-amtk-version;.tar.xz">
-  <!ENTITY libgedit-amtk-download-ftp  " ">
-  <!ENTITY libgedit-amtk-md5sum        "1b2ad96c189dd1749b6526c6026e0618">
-  <!ENTITY libgedit-amtk-size          "60 KB">
-  <!ENTITY libgedit-amtk-buildsize     "2.6 MB">
-  <!ENTITY libgedit-amtk-time          "0.1 SBU">
-]>
-
-<sect1 id="libgedit-amtk" xreflabel="libgedit-amtk-&libgedit-amtk-version;">
-  <?dbhtml filename="libgedit-amtk.html"?>
-
-
-  <title>libgedit-amtk-&libgedit-amtk-version;</title>
-
-  <indexterm zone="libgedit-amtk">
-    <primary sortas="a-libgedit-amtk">libgedit-amtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgedit-amtk</title>
-
-    <para>
-      The <application>libgedit-amtk</application> package contains a basic
-      GTKUIManager replacement based on GAction.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgedit-amtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgedit-amtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgedit-amtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgedit-amtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgedit-amtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgedit-amtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgedit-amtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation) and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgedit-amtk</title>
-
-    <para>
-      Install <application>libgedit-amtk</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir amtk-build &amp;&amp;
-cd    amtk-build &amp;&amp;
-
-meson setup ..              \
-      --prefix=/usr         \
-      --buildtype=release   \
-      -Dgtk_doc=false       &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: This switch prevents the build
-      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.
-    </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>
-          libgedit-amtk-5.so
-        </seg>
-        <seg>
-          /usr/include/libgedit-amtk-5 and
-          /usr/share/gtk-doc/html/libgedit-amtk-5.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgedit-amtk-5">
-        <term><filename class="libraryfile">libgedit-amtk-5.so</filename></term>
-        <listitem>
-          <para>
-            provides a basic GTKUIManager replacement API based on GAction
-          </para>
-          <indexterm zone="libgedit-amtk libgedit-amtk-5">
-            <primary sortas="c-libgedit-amtk-5">libgedit-amtk-5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/libgedit-gtksourceview.xml
===================================================================
--- x/lib/libgedit-gtksourceview.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgedit-gtksourceview-download-http "https://github.com/gedit-technology/libgedit-gtksourceview/releases/download/&libgedit-gtksourceview-version;/libgedit-gtksourceview-&libgedit-gtksourceview-version;.tar.xz">
-  <!ENTITY libgedit-gtksourceview-download-ftp  " ">
-  <!ENTITY libgedit-gtksourceview-md5sum        "8ab58c6373c6f4e738b02688ff9788d3">
-  <!ENTITY libgedit-gtksourceview-size          "636 KB">
-  <!ENTITY libgedit-gtksourceview-buildsize     "22 MB (with tests)">
-  <!ENTITY libgedit-gtksourceview-time          "0.4 SBU (with tests)">
-
-]>
-
-<sect1 id="libgedit" xreflabel="libgeditsourceview-&libgedit-gtksourceview-version;">
-  <?dbhtml filename="libgedit-gtksourceview.html"?>
-
-
-  <title>libgedit-gtksourceview-&libgedit-gtksourceview-version;</title>
-
-  <indexterm zone="libgedit">
-    <primary sortas="a-libgedit-gtksourceview">libgedit-gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgedit-gtksourceview</title>
-
-    <para>
-      The <application>libgedit-gtksourceview</application> package
-      provides a library that extends GtkTextView.
-      This library adds support for syntax highlighting, undo/redo,
-      file loading and saving, search and replace, a
-      completion system, printing, displaying line numbers, and
-      other features typical of a source code editor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgedit-gtksourceview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgedit-gtksourceview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgedit-gtksourceview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgedit-gtksourceview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgedit-gtksourceview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgedit-gtksourceview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgedit-gtksourceview Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgedit-gtksourceview</title>
-
-    <para>
-      Install <application>libgedit-gtksourceview</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build-libgedit &amp;&amp;
-cd    build-libgedit &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            .. &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Disables building the API
-      documentation. Remove if you have <xref linkend="gtk-doc"/> installed
-      and wish to build the API documentation.
-    </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>
-          libgedit-gtksourceview-300.so
-        </seg>
-        <seg>
-          /usr/include/libgedit-gtksourceview-300 and
-          /usr/share/libgedit-gtksourceview-300
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgedit-gtksourceview-300">
-        <term><filename class="libraryfile">
-           libgedit-gtksourceview-300.so</filename></term>
-        <listitem>
-          <para>
-            contains convenience functions for text editing.
-          </para>
-          <indexterm zone="libgedit libgedit-gtksourceview-300">
-            <primary sortas="c-liblibgedit-gtksourceview-300">
-              liblibgedit-gtksourceview-300.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/libglade.xml
===================================================================
--- x/lib/libglade.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libglade-download-http "&gnome-download-http;/libglade/2.6/libglade-&libglade-version;.tar.bz2">
-  <!ENTITY libglade-download-ftp  " ">
-  <!ENTITY libglade-md5sum        "d1776b40f4e166b5e9c107f1c8fe4139">
-  <!ENTITY libglade-size          "348 KB">
-  <!ENTITY libglade-buildsize     "5 MB">
-  <!ENTITY libglade-time          "0.1 SBU">
-]>
-
-<sect1 id="libglade" xreflabel="libglade-&libglade-version;">
-  <?dbhtml filename="libglade.html"?>
-
-
-  <title>libglade-&libglade-version;</title>
-
-  <indexterm zone="libglade">
-    <primary sortas="a-Libglade">Libglade</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libglade</title>
-
-    <para>
-      The <application>libglade</application> package contains
-      <filename class="libraryfile">libglade</filename> libraries. These are
-      useful for loading Glade interface files in a program at runtime.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libglade-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libglade-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libglade-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libglade-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libglade-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libglade-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libglade Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/> and
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libglade</title>
-
-    <para>
-      Install <application>libglade</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      One of the tests, test-convert, is known to fail.
-    </para>
-    <!-- on this build run (2018-08-14), the tests skipped. Need to see if
-         there are any functionality issues later. -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/DG_DISABLE_DEPRECATED/d'</command>: Some of the
-      <application>glib</application> functions that
-      <application>libglade</application> uses were declared deprecated in
-      glib-2.30. This sed removes the G_DISABLE_DEPRECATED CFLAG.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      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">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>libglade-convert (requires <command>python</command>)</seg>
-        <seg>libglade-2.0.so</seg>
-        <seg>/usr/{include/libglade-2.0/glade,share/{gtk-doc/html/libglade,
-        xml/libglade}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libglade-convert">
-        <term><command>libglade-convert</command></term>
-        <listitem>
-          <para>
-            is used to convert old Glade interface files to
-            Glade-2.0 standards
-          </para>
-          <indexterm zone="libglade libglade-convert">
-            <primary sortas="b-libglade-convert">libglade-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglade-lib">
-        <term><filename class="libraryfile">libglade-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions necessary to load Glade interface files
-          </para>
-          <indexterm zone="libglade libglade-lib">
-            <primary sortas="c-libglade-2.0">libglade-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/libhandy1.xml
===================================================================
--- x/lib/libhandy1.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libhandy1-download-http "&gnome-download-http;/libhandy/1.8/libhandy-&libhandy1-version;.tar.xz">
-  <!ENTITY libhandy1-download-ftp  " ">
-  <!ENTITY libhandy1-md5sum        "af586a91ff6d4093a6e7e283dfab5f7f">
-  <!ENTITY libhandy1-size          "1.8 MB">
-  <!ENTITY libhandy1-buildsize     "24 MB (with tests)">
-  <!ENTITY libhandy1-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libhandy1" xreflabel="libhandy-&libhandy1-version;">
-  <?dbhtml filename="libhandy1.html"?>
-
-
-  <title>libhandy-&libhandy1-version;</title>
-
-  <indexterm zone="libhandy1">
-    <primary sortas="a-libhandy1">libhandy1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libhandy</title>
-
-    <para>
-      The <application>libhandy</application> package provides additional
-      GTK UI widgets for use in developing user interfaces.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libhandy1-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libhandy1-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libhandy1-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libhandy1-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libhandy1-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libhandy1-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libhandy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libhandy</title>
-
-    <para>
-      Install <application>libhandy</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests must be run from a graphical session.
-    </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>
-      <option>-Dgtk_doc=true</option>: Use this option if you have
-      <xref linkend="gtk-doc"/> installed and wish to install the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          handy-1-demo
-        </seg>
-        <seg>
-          libhandy-1.so
-        </seg>
-        <seg>
-          /usr/include/libhandy-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="handy-1-demo">
-        <term><command>handy-1-demo</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the
-            <application>libhandy</application> library
-          </para>
-          <indexterm zone="libhandy1 handy-1-demo">
-            <primary sortas="b-handy-1-demo">handy-1-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhandy-1">
-        <term><filename class="libraryfile">libhandy-1.so</filename></term>
-        <listitem>
-          <para>
-            provides additional GTK widgets for use in creating user interfaces
-          </para>
-          <indexterm zone="libhandy1 libhandy-1">
-            <primary sortas="c-libhandy-1">libhandy-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/libnotify.xml
===================================================================
--- x/lib/libnotify.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libnotify-download-http "&gnome-download-http;/libnotify/0.8/libnotify-&libnotify-version;.tar.xz">
-  <!ENTITY libnotify-download-ftp  " ">
-  <!ENTITY libnotify-md5sum        "952e55f45067b6a5b9eab4310c9cd658">
-  <!ENTITY libnotify-size          "104 KB">
-  <!ENTITY libnotify-buildsize     "2.3 MB">
-  <!ENTITY libnotify-time          "0.1 SBU">
-]>
-
-<sect1 id="libnotify" xreflabel="libnotify-&libnotify-version;">
-  <?dbhtml filename="libnotify.html"?>
-
-
-  <title>libnotify-&libnotify-version;</title>
-
-  <indexterm zone="libnotify">
-    <primary sortas="a-libnotify">libnotify</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnotify</title>
-
-    <para>
-      The <application>libnotify</application> library is used to send desktop
-      notifications to a notification daemon, as defined in the Desktop
-      Notifications spec. These notifications can be used to inform the user about
-      an event or display some form of information without getting in the user's
-      way.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnotify-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnotify-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnotify-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnotify-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnotify-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnotify-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnotify Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="notification-daemon"/>,
-      <xref role="nodep" linkend="xfce4-notifyd"/>, or
-      <xref role="nodep" linkend="lxqt-notificationd"/>
-    </para>
-
-    <note>
-      <para>
-        <application>GNOME Shell</application> and
-        <application>KDE KWin</application>
-        provide their own notification daemons.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnotify</title>
-
-    <para>
-      Install <application>libnotify</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            -Dman=false         \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-    <!-- No &libnotify-version; here because we'll mv the doc dir anyway -->
-<screen remap='doc'><userinput>sed "/docs_dir =/s@\$@ / 'libnotify'@" \
-    -i ../docs/reference/meson.build   &amp;&amp;
-meson configure -Dgtk_doc=true         &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-if [ -e /usr/share/doc/libnotify ]; then
-  rm -rf /usr/share/doc/libnotify-&libnotify-version;
-  mv -v  /usr/share/doc/libnotify{,-&libnotify-version;}
-fi</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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          notify-send
-        </seg>
-        <seg>
-          libnotify.so
-        </seg>
-        <seg>
-         /usr/include/libnotify and
-         /usr/share/gtk-doc/html/libnotify
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="notify-send">
-        <term><command>notify-send</command></term>
-        <listitem>
-          <para>
-            is a command used to send notifications
-          </para>
-          <indexterm zone="libnotify notify-send">
-            <primary sortas="b-notify-send">notify-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnotify-lib">
-        <term><filename class="libraryfile">libnotify.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libnotify</application> API functions
-          </para>
-          <indexterm zone="libnotify libnotify">
-            <primary sortas="c-libnotify">libnotify.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxklavier-download-http "https://people.freedesktop.org/~svu/libxklavier-&libxklavier-version;.tar.bz2">
-  <!ENTITY libxklavier-download-ftp  " ">
-  <!ENTITY libxklavier-md5sum        "13af74dcb6011ecedf1e3ed122bd31fa">
-  <!ENTITY libxklavier-size          "384 KB">
-  <!ENTITY libxklavier-buildsize     "5.2 MB">
-  <!ENTITY libxklavier-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libxklavier" xreflabel="libxklavier-&libxklavier-version;">
-  <?dbhtml filename="libxklavier.html" ?>
-
-
-  <title>libxklavier-&libxklavier-version;</title>
-
-  <indexterm zone="libxklavier">
-    <primary sortas="a-libxklavier">libxklavier</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxklavier</title>
-
-    <para>
-      The <application>libxklavier</application> package contains a
-      utility library for <application>X</application> keyboard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxklavier-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxklavier-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxklavier-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxklavier-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxklavier-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxklavier-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxklavier Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxklavier</title>
-
-    <para>
-      Install <application>libxklavier</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild-problem.xml"/>
-
-  </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>
-          libxklavier.so
-        </seg>
-        <seg>
-          /usr/include/libxklavier and
-          /usr/share/gtk-doc/html/libxklavier
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxklavier-lib">
-        <term><filename class="libraryfile">libxklavier.so</filename></term>
-        <listitem>
-          <para>
-            contains XKB utility functions
-          </para>
-          <indexterm zone="libxklavier libxklavier-lib">
-            <primary sortas="c-libxklavier">libxklavier.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/lib/pango.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,294 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="Pango" xreflabel="Pango-&Pango-version;">
+<?dbhtml filename="pango.html" dir="x"?>
+<title>Pango-&Pango-version;</title>
 
-  <!ENTITY pango-download-http "&gnome-download-http;/pango/&pango-minor;/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-download-ftp  " ">
-  <!ENTITY pango-md5sum        "ed3c57bdaff980ddc4c840919ce512ac">
-  <!ENTITY pango-size          "1.8 MB">
-  <!ENTITY pango-buildsize     "28 MB (with tests)">
-  <!ENTITY pango-time          "0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="pango" xreflabel="Pango-&pango-version;">
-  <?dbhtml filename="pango.html" ?>
-
-
-  <title>Pango-&pango-version;</title>
-
-  <indexterm zone="pango">
-    <primary sortas="a-Pango">Pango</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pango</title>
-
-    <para>
-      <application>Pango</application> is a library for laying out and rendering
-      text, with an emphasis on internationalization. It can be used anywhere
-      that text layout is needed, though most of the work on
-      <application>Pango</application> so far has been done in the context of
-      the <application>GTK+</application> widget toolkit.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pango-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pango-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pango-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pango-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pango-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pango-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pango Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fontconfig"/> (must be built with
-       <xref linkend="freetype2"/> using <xref linkend="harfbuzz"/>),
-      <xref linkend="fribidi"/>, and
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/> (built after <xref linkend="harfbuzz"/>) and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cantarell-fonts"/> (for tests),
-  <!--<xref linkend="gtk-doc"/>,-->
-  <!--<xref linkend="sysprof"/>,-->
-      <xref linkend="gi-docgen"/> (to generate documentation),
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man">help2man</ulink>,
-      <ulink url="https://linux.thai.net/projects/libthai">libthai</ulink>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pango</title>
-
-    <para>
-      Install <application>Pango</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            --wrap-mode=nofallback \
-            ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen remap='doc'><userinput>sed "/docs_dir =/s@\$@ / 'pango-&pango-version;'@" -i ../docs/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                                   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      One test (test-layout) is known to fail on i686 systems for
-      unknown reason.
-      <!-- One test,
-      <filename>test-font</filename> is known to fail.  Some tests may
-      fail if no Opentype or Truetype fonts are installed in
-      <filename class='directory'>/usr/share/fonts</filename>.
-      -->
-      <!--<filename>test-itemize</filename>, are are known to fail. if
-      <xref linkend="cantarell-fonts"/> are not installed.-->
-      <!-- the other problematic tests get skipped now -->
-      <!-- Even with cantarell-fonts, pango-1.50.9 test-font fails again. -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-<!--
-This requires the external help2man program to generate pango-view.1.  The version
-from lsb_release is insufficient.  I'm not sure if the command below is needed
-or not if the newer help2man is present. - Bruce
-
-install -vm 644 ../utils/pango-view.1.in /usr/share/man/man1/pango-view.1</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>
-      <option>-Dintrospection=disabled</option>: Use this switch if you do not
-      want to use 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>
-
-  <sect2 role="configuration">
-    <title>Configuring Pango</title>
-
-    <sect3 id="pango-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/pango/pangorc</filename>, <filename>~/.pangorc</filename>
-        and the file specified in the environment variable
-        <envar>PANGO_RC_FILE</envar>
-      </para>
-
-      <indexterm zone="pango pango-config">
-        <primary sortas="e-etc-pango-pangorc">/etc/pango/pangorc</primary>
-      </indexterm>
-
-      <indexterm zone="pango pango-config">
-        <primary sortas="e-AA.pangorc">~/.pangorc</primary>
-      </indexterm>
-    </sect3>
-<!--
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <application>Pango</application> module path is specified by the key
-        <userinput><parameter>Pango/ModulesPath</parameter></userinput> in the
-        <application>Pango</application> config database, which is read from the
-        config files listed above.
-      </para>
-
-    </sect3>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pango-list, pango-segmentation, and pango-view
-        </seg>
-        <seg>
-          libpango-1.0.so, libpangocairo-1.0.so, libpangoft2-1.0.so,
-          and libpangoxft-1.0.so
-        </seg>
-        <seg>
-          /usr/include/pango-1.0 and
-          /usr/share/doc/pango-&pango-version; (if gi-docgen is available)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pango-list">
-        <term><command>pango-list</command></term>
-        <listitem>
-          <para>
-            displays a list of fonts that <application>Pango</application>
-            can use that are currently installed on the system
-          </para>
-          <indexterm zone="pango pango-list">
-            <primary sortas="b-pango-list">pango-list</primary>
-          </indexterm>
-        </listitem>
-      </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>
-        <listitem>
-          <para>
-            renders a given text file through <application>Pango</application>
-            for viewing purposes
-          </para>
-          <indexterm zone="pango pango-view">
-            <primary sortas="b-pango-view">pango-view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpango-1">
-        <term><filename class="libraryfile">libpango-1.0.so</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="pango libpango-1">
-            <primary sortas="c-libpango-1">libpango-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&Pango-intro;
+&Pango-inst;
+&Pango-config;
+&Pango-desc;
 
 </sect1>
+
Index: x/lib/pango/pango-config.xml
===================================================================
--- x/lib/pango/pango-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring Pango</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/pango/pango-desc.xml
===================================================================
--- x/lib/pango/pango-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pango package contains <userinput>Pango libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>Pango libraries</title>
+<para>Pango libraries 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.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/pango/pango-inst.xml
===================================================================
--- x/lib/pango/pango-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of Pango</title>
+
+<para>Install Pango by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/pango/pango-intro.xml
===================================================================
--- x/lib/pango/pango-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to Pango</title>
+
+<screen>Download location:              <ulink url="&Pango-download;"/>
+Version used:                   &Pango-version;
+Package size:                   &Pango-size;
+Estimated Disk space required:  &Pango-buildsize;</screen>
+
+<para>The Pango package contains the pango library. This is useful for
+the layout and rendering of of text.</para>
+
+<screen>Pango depends on:
+<xref linkend="GLib2"/>
+Pango will utilize:
+freetype2 and <xref linkend="xfree86"/> if installed prior to pango. </screen>
+
+</sect2>
Index: x/lib/pango/pango.ent
===================================================================
--- x/lib/pango/pango.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY Pango SYSTEM "../pango.xml">
+<!ENTITY Pango-intro SYSTEM "pango-intro.xml">
+<!ENTITY Pango-inst SYSTEM "pango-inst.xml">
+<!ENTITY Pango-config SYSTEM "pango-config.xml">
+<!ENTITY Pango-desc SYSTEM "pango-desc.xml">
+<!ENTITY Pango-buildsize "10 MB">
+<!ENTITY Pango-version "1.0.3">
+<!ENTITY Pango-download "ftp://ftp.gtk.org/pub/gtk/v2.0/pango-1.0.3.tar.gz">
+<!ENTITY Pango-size "1.1 MB">
Index: lib/pangomm.xml
===================================================================
--- x/lib/pangomm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pangomm-download-http "&gnome-download-http;/pangomm/2.46/pangomm-&pangomm-version;.tar.xz">
-  <!ENTITY pangomm-download-ftp  " ">
-  <!ENTITY pangomm-md5sum        "5947d35899db62813531d7ea8faee60c">
-  <!ENTITY pangomm-size          "680 KB">
-  <!ENTITY pangomm-buildsize     "8.9 MB">
-  <!ENTITY pangomm-time          "0.2 SBU">
-]>
-
-<sect1 id="pangomm" xreflabel="Pangomm-&pangomm-version;">
-  <?dbhtml filename="pangomm.html"?>
-
-
-  <title>Pangomm-&pangomm-version;</title>
-
-  <indexterm zone="pangomm">
-    <primary sortas="a-Pangomm">Pangomm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pangomm</title>
-
-    <para>
-      The <application>Pangomm</application> package provides a C++
-      interface to <application>Pango</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pangomm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pangomm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pangomm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pangomm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pangomm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pangomm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pangomm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairomm-1.0"/>,
-      <xref linkend="glibmm"/> and
-      <xref linkend="pango"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pangomm</title>
-
-    <para>
-      Install <application>Pangomm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpangomm-1.4.so
-        </seg>
-        <seg>
-          /usr/include/pangomm-1.4,
-          /usr/lib/pangomm-1.4, and
-          /usr/share/{devhelp/books/pangomm-1.4,doc/pangomm-&pangomm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpangomm-1">
-        <term><filename class="libraryfile">libpangomm-1.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Pango</application> API classes
-          </para>
-          <indexterm zone="pangomm libpangomm-1">
-            <primary sortas="c-libpangomm-1">libpangomm-1.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/pangomm2.xml
===================================================================
--- x/lib/pangomm2.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pangomm-download-http "&gnome-download-http;/pangomm/2.52/pangomm-&pangomm2-version;.tar.xz">
-  <!ENTITY pangomm-download-ftp  " ">
-  <!ENTITY pangomm-md5sum        "fea622c95dce2f0300d83a73f5478ba4">
-  <!ENTITY pangomm-size          "764 KB">
-  <!ENTITY pangomm-buildsize     "12 MB">
-  <!ENTITY pangomm-time          "0.2 SBU">
-]>
-
-<sect1 id="pangomm2" xreflabel="Pangomm-&pangomm2-version;">
-  <?dbhtml filename="pangomm2.html"?>
-
-
-  <title>Pangomm-&pangomm2-version;</title>
-
-  <indexterm zone="pangomm2">
-    <primary sortas="a-Pangomm2">Pangomm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pangomm</title>
-
-    <para>
-      The <application>Pangomm</application> package provides a C++
-      interface to <application>Pango</application>. This version is part of a
-      new API for supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pangomm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pangomm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pangomm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pangomm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pangomm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pangomm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pangomm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairomm-1.16"/>,
-      <xref linkend="glibmm2"/> and
-      <xref linkend="pango"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pangomm</title>
-
-    <para>
-      Install <application>Pangomm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpangomm-2.48.so
-        </seg>
-        <seg>
-          /usr/include/pangomm-2.48,
-          /usr/lib/pangomm-2.48, and
-          /usr/share/{devhelp/books/pangomm-2.48,doc/pangomm-&pangomm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpangomm-2">
-        <term><filename class="libraryfile">libpangomm-2.48.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Pango</application> API classes
-          </para>
-          <indexterm zone="pangomm2 libpangomm-2">
-            <primary sortas="c-libpangomm-2">libpangomm-2.48.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect1 id="qt" xreflabel="qt-&qt-version;">
+<?dbhtml filename="qt.html" dir="x"?>
+<title>qt-&qt-version;</title>
+
+&qt-intro;
+&qt-inst;
+&qt1-intro;
+&qt1-inst;
+&qt-exp;
+&qt-config;
+&qt-desc;
+
+</sect1>
+
Index: x/lib/qt/qt-config.xml
===================================================================
--- x/lib/qt/qt-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,39 @@
+<sect2>
+<title>Configuring qt</title>
+
+<sect3><title>Configuration Information</title>
+
+<para>As with most libraries, there is no configuration to do, save that
+the library directory <userinput>/opt/qt/lib</userinput> should appear
+in <userinput>/etc/ld.so.conf</userinput> so that ldd can find the
+shared libraries. The following command will add it if it is missing:</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
+# Begin qt addition to /etc/ld.so.conf
+
+/opt/qt/lib
+
+# End qt addition
+<userinput>EOF
+ldconfig</userinput></screen></para>
+
+<para>You need to set a QTDIR environment variable which can be accomplished
+by putting the following in your ~/.bash_profile and/or ~/.bashrc:
+<screen><userinput>export QTDIR=/opt/qt
+export PATH=$PATH:$QTDIR/bin</userinput></screen></para>
+
+<para>You need to add the path for the qt man pages to the man.conf
+file.  This can be done with the following command:</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/man.conf &lt;&lt; "EOF"</userinput>
+# Begin qt addition to man.conf
+
+MANPATH /opt/qt/doc/man
+
+# End qt addition to man.conf
+<userinput>EOF</userinput></screen></para>
+
+</sect3>
+
+</sect2>
+
Index: x/lib/qt/qt-desc.xml
===================================================================
--- x/lib/qt/qt-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The qt package contains the <userinput>qt library</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>qt library</title>
+<para>The QT/X11 library contains API's necessary to use KDE programs.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/qt/qt-exp.xml
===================================================================
--- x/lib/qt/qt-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>-prefix /opt/qt-&qt-version;:</userinput> This command sets up
+the install destination.</para>
+
+<para><userinput>-qt-gif:</userinput> This command adds support for gif
+files to the libraries.</para>
+
+<para><userinput>-system-libpng -system-libmng -system-zlib
+-system-libjpeg:</userinput> This command forces the library to use the
+shared libraries that are on your system instead of recreating its own
+set of support libraries for these functions.</para>
+
+<para><userinput>-no-g++-exceptions:</userinput> This command disables
+the exceptions coding generated by the C++ compiler.</para>
+
+<para><userinput>-thread:</userinput> This command compiles the library
+to support multi-threading.</para>
+
+<para><userinput>ln -sf /opt/qt-&qt-version; /opt/qt:</userinput> This command
+standardizes the location of the qt libraries to the ld.so.conf entry
+described below.</para>
+
+</sect2>
+
Index: x/lib/qt/qt-inst.xml
===================================================================
--- x/lib/qt/qt-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Installation of qt</title>
+
+<para><screen><userinput>export QTDIR=$PWD &amp;&amp;
+./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
+   -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
+   -thread &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sf /opt/qt-&qt-version; /opt/qt &amp;&amp;
+cp -r doc/man /opt/qt/doc</userinput></screen></para>
+
+<note><para>
+The build time for qt is quite long.  If you want to save some time and don't want the 
+tutorials and examples, change the first make line above to:
+</para>
+
+<para>
+<userinput>make symlinks src-qmake src-moc sub-src sub-tools</userinput>
+</para>
+</note>
+
+</sect2>
+
Index: x/lib/qt/qt-intro.xml
===================================================================
--- x/lib/qt/qt-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to qt</title>
+
+<screen>Download location:              <ulink url="&qt-download;"/>
+Version used:                   &qt-version;
+Package size:                   &qt-size;
+Estimated Disk space required:  &qt-buildsize;</screen>
+
+<para>The qt package contains the C++ GUI library. This is useful for
+creating graphical applications or executing graphical applications that
+are dynamically linked to the qt library.</para>
+
+<screen>qt depends on:
+<xref linkend="xfree86"/>, <xref linkend="zlib"/>, <xref linkend="libpng"/>, <xref
+linkend="libmng"/>, and <xref linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/qt/qt.ent
===================================================================
--- x/lib/qt/qt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<!ENTITY qt SYSTEM "../qt.xml">
+<!ENTITY qt-intro SYSTEM "qt-intro.xml">
+<!ENTITY qt-inst SYSTEM "qt-inst.xml">
+<!ENTITY qt1-intro SYSTEM "qt1-intro.xml">
+<!ENTITY qt1-inst SYSTEM "qt1-inst.xml">
+<!ENTITY qt-exp SYSTEM "qt-exp.xml">
+<!ENTITY qt-desc SYSTEM "qt-desc.xml">
+<!ENTITY qt-config SYSTEM "qt-config.xml">
+<!ENTITY qt-buildsize "147 MB">
+<!ENTITY qt-version "3.0.4">
+<!ENTITY qt-download "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.4.tar.gz">
+<!ENTITY qt-size "15 MB">
Index: x/lib/qt/qt1-inst.xml
===================================================================
--- x/lib/qt/qt1-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt1-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Installation of qt using objprelink</title>
+
+<para><screen><userinput>export QTDIR=$PWD &amp;&amp;
+cd mkspecs/linux-g++ &amp;&amp;
+cp qmake.conf qmake.conf.bak &amp;&amp;
+sed '/^QMAKE_LINK/s/g++/objprelink $(OBJECTS) $(OBJMOC) \&\& g++/' \
+   qmake.conf.bak > qmake.conf &amp;&amp;
+cd ../.. &amp;&amp;
+./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
+   -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
+   -thread &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sf /opt/qt-&qt-version; /opt/qt &amp;&amp;
+cp -r doc/man /opt/qt/doc</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/qt/qt1-intro.xml
===================================================================
--- x/lib/qt/qt1-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt1-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to qt using objprelink</title>
+
+
+<para>This section covers a very specialized compile of qt which
+dramatically decreases the load time for kde desktop programs.  It is
+also known not to work under some conditions and will produce segfaults instead of faster load times.  The details of prelinking are discussed at
+<ulink url="http://objprelink.sourceforge.net"/>.  When you feel comfortable 
+with the risks and rewards, proceed to the installation section.</para>
+
+<screen>qt using objprelink depends on: <xref linkend="xfree86"/>, <xref linkend="objprelink"/>,  <xref linkend="zlib"/>, 
+<xref linkend="libpng"/>, <xref linkend="libmng"/>, and <xref linkend="libjpeg"/></screen>
+
+</sect2>
Index: lib/qt5-alternate.xml
===================================================================
--- x/lib/qt5-alternate.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,663 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qt5-major "5.15">
-  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
-  <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "8.5 GB (154 MB installed)">
-  <!ENTITY qt5-time          "7.4 SBU (using parallelism=4)">
-]>
-
-<sect1 id="qt5-alternate" xreflabel="qt-alternate-&qt5-version;">
-  <?dbhtml filename="qt5-alternate.html" ?>
-
-  <title>qt-alternate-&qt5-version;</title>
-
-  <indexterm zone="qt5-alternate">
-    <primary sortas="a-Qt5-alternate">Qt Alternate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qt5 (alternate)</title>
-
-    <para>
-      <application>Qt5</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases <application>qt5</application> is
-      classified as a widget toolkit), and also used for developing non-GUI
-      programs such as command-line tools and consoles for servers. Two of the
-      major users of <application>qt</application> are <application>KDE
-      Frameworks 5 (KF5)</application> and <application>LXQt</application>.
-    </para>
-
-    <important>
-      <para>
-         The full <application>qt5</application> package consists of 43 separate
-         components. These instructions use a small subset of the full
-         <application>qt5</application> installation instructions above.
-         They cover most, but not all, of the components needed to build
-         packages in BLFS. This page, and the next, are provided to
-         reduce the amount of time, space, and dependencies needed
-         to build these packages. <!--They are not recommended if you will build
-         the <xref linkend="kf5- frameworks"/> based <xref linkend="plasma-build"/> desktop
-         environment.-->
-      </para>
-    </important>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qt5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="cups"/>,
-      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
-      <xref linkend="double-conversion"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="wayland"/> (<application>Mesa</application>
-      must be built with <application>Wayland</application> EGL
-      backend),
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libinput"/>
-      <xref linkend="mariadb"/>
-        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="mtdev"/>
-      <xref linkend="postgresql"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="qt5-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>qt5</application> in a
-      directory other than <filename class="directory">/usr</filename>, i.e.
-      <filename class="directory">/opt/qt5</filename>.  To do this,  set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt5</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt5-version;</filename>. To create a
-        versioned <application>qt5</application> directory after the
-        installation is complete, you may rename the directory and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt5-version;
-ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>qt5</application>. To do that, just remove the symlink
-        and use <filename class="directory">/opt/qt5</filename> as the
-        prefix again. Which version of <application>qt5</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qt5</title>
-
-    <warning>
-      <para>
-        If <application>qt5</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-qt5 based
-        window manager. It overwrites <application>qt5</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing
-        <application>qt5</application> into the
-        <filename class="directory">/usr</filename> hierarchy because it
-        becomes difficult to find components and to update to a new version.
-        If you do want to install <application>qt5</application> in
-        <filename class="directory">/usr</filename>, the directories need to
-        be specified explicitly.  In this case, set
-        <envar>QT5PREFIX=/usr</envar> and add the following to the configure
-        arguments below:
-      </para>
-
-<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
-            -bindir         /usr/bin                    \
-            -plugindir      /usr/lib/qt5/plugins        \
-            -importdir      /usr/lib/qt5/imports        \
-            -headerdir      /usr/include/qt5            \
-            -datadir        /usr/share/qt5              \
-            -docdir         /usr/share/doc/qt5          \
-            -translationdir /usr/share/qt5/translations \
-            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
-    </note>
-
-    <para>
-      Now apply a patch to pull in the fixes curated by kde for those
-      modules which are required by packages mentioned in this book:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
-
-    <para>
-      The patch is supposed to be used in a git repository. Otherwise some
-      files that should be modified by <command>configure</command> after
-      applying the patch are not touched. Fortunately, it is enough to create a
-      <filename class="directory">.git</filename> directory in the
-      <filename class="directory">qmake</filename> directory where the
-      <command>configure</command> script is run:
-    </para>
-
-    <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
-
-    <para>
-      Fix a security vulnerability in qtbase:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      At this point we want to set up skipping most components.  Do that with:
-    </para>
-
-<screen><userinput>ls -Fd qt* | grep / | sed 's/^/-skip /;s@/@@' > tempconf &amp;&amp;
-sed -i -r '/base|tools|x11extras|svg|declarative|wayland/d' tempconf</userinput></screen>
-
-    <para>
-      Now, install <application>qt5</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure -prefix $QT5PREFIX   \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -dbus-linked         \
-            -openssl-linked      \
-            -system-harfbuzz     \
-            -system-sqlite       \
-            -nomake examples     \
-            -no-rpath            \
-            -syslog              \
-            $(cat tempconf)      \
-            &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            \
-            $(cat tempconf)      \
-            &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>
-
-    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      The <envar>QT5BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT5BINDIR</envar> variable is defined in root's
-      environment and as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>QT5BINDIR=$QT5PREFIX/bin
-
-install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
-
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png &amp;&amp;
-
-install -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=$QT5BINDIR/assistant
-Icon=assistant-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=$QT5BINDIR/designer
-Icon=designer-qt5.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=$QT5BINDIR/linguist
-Icon=linguist-qt5.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT5BINDIR/qdbusviewer
-Icon=qdbusviewer-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt5 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt5
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>qt</application>.
-    </para>
-
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked</parameter>
-      <parameter>-openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <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>
-
-    <para>
-      <command>$(cat tempconf)</command>: This command provides a list of
-      components that should not be built. These entries are in the form of
-      "-skip &lt;component&gt;".
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring qt5</title>
-
-    <sect3 id="qt5-alt-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
-        the super user as well. Execute the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT5DIR</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you installed qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>qt5</application> in
-        <filename class="directory">/usr</filename>, create an
-        environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/usr
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you did not install qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>qt5</application> in a location other
-        than <filename class="directory">/usr</filename>, you need to update the
-        following configuration files so that <application>qt5</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt5/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt5 qt5-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/qt5.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt_5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt_5.sh
-
-QT5DIR=/opt/qt5
-
-pathappend $QT5DIR/bin           PATH
-pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT5DIR
-
-# End /etc/profile.d/qt_5.sh</literal>
-EOF</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>
-          assistant, designer, fixqt4headers.pl, lconvert,
-          linguist, lprodump, lrelease, lrelease-pro, lupdate, lupdate-pro,
-          moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
-          qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc,
-          qhelpgenerator, qlalr, qmake, qml, qmlcachegen, qmleasing,
-          qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qmltime,
-          qmltyperegistrar,
-          qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
-          qtwaylandscanner, qvkgen, rcc, syncqt.pl, tracegen, and
-          uic
-        </seg>
-        <seg>
-          libQt5AccessibilitySupport.a,
-          libQt5Bootstrap.a,
-          libQt5Concurrent.so,
-          libQt5Core.so,
-          libQt5DBus.so,
-          libQt5Designer.so,
-          libQt5DesignerComponents.so,
-          libQt5DeviceDiscoverySupport.a,
-          libQt5EdidSupport.a,
-          libQt5EglFSDeviceIntegration.so,
-          libQt5EglFsKmsSupport.so,
-          libQt5EglSupport.a,
-          libQt5EventDispatcherSupport.a,
-          libQt5FbSupport.a,
-          libQt5FontDatabaseSupport.a,
-          libQt5GlxSupport.a,
-          libQt5Gui.so,
-          libQt5Help.so,
-          libQt5InputSupport.a,
-          libQt5KmsSupport.a,
-          libQt5LinuxAccessibilitySupport.a,
-          libQt5Network.so,
-          libQt5OpenGL.so,
-          libQt5OpenGLExtensions.a,
-          libQt5PacketProtocol.a,
-          libQt5PlatformCompositorSupport.a,
-          libQt5PrintSupport.so,
-          libQt5Qml.so,
-          libQt5QmlDebug.a,
-          libQt5QmlDevTools.a,
-          libQt5QmlModels.so,
-          libQt5QmlWorkerScript.so,
-          libQt5Quick.so,
-          libQt5QuickParticles.so,
-          libQt5QuickShapes.so,
-          libQt5QuickTest.so,
-          libQt5QuickWidgets.so,
-          libQt5ServiceSupport.a,
-          libQt5Sql.so,
-          libQt5Svg.so,
-          libQt5Test.so,
-          libQt5ThemeSupport.a,
-          libQt5UiTools.a,
-          libQt5WaylandClient.so,
-          libQt5WaylandCompositor.so,
-          libQt5Widgets.so,
-          libQt5X11Extras.so,
-          libQt5XcbQpa.so,
-          libQt5XkbCommonSupport.a,
-          libQt5Xml.so,
-          and several plugins under /opt/qt5/{plugins,qml}
-        </seg>
-        <seg>
-          /usr/include/qt5,
-          /usr/lib/qt5,
-          /usr/share/doc/qt5, and
-          /usr/share/qt5
-          OR
-          /opt/qt5 and
-          /opt/qt-&qt5-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-    <para>See <xref linkend="qt5-descriptions"/></para>
-
-  </sect2>
-
-</sect1>
Index: lib/qt5-components.xml
===================================================================
--- x/lib/qt5-components.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qt5-major "5.15">
-  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
-  <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "varies">
-  <!ENTITY qt5-time          "varies">
-]>
-
-<sect1 id="qt5-components" xreflabel="qt-components-&qt5-version;">
-  <?dbhtml filename="qt5-components.html" ?>
-
-  <title>qt-components-&qt5-version;</title>
-
-  <indexterm zone="qt5-components">
-    <primary sortas="a-Qt5-components">Qt Components</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qt5 components</title>
-
-    <para>
-      These instructions show how to build additional Qt5 components beyond
-      <xref linkend="qt5-alternate"/>.  They are not applicable if the
-      full <xref linkend="qt5"/> package has been built.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qt5 components Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt5-alternate"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended dependencies for qtimageformats</bridgehead>
-    <para role="recommended">
-      <xref linkend="jasper"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="libwebp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended dependencies for qtmultimedia</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-good"/>,
-      <xref linkend="gst10-plugins-bad"/>, and
-      <xref linkend="gst10-plugins-ugly"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qt5 components</title>
-
-    <para>
-      There are a few extra components needed for different packages in BLFS.
-      These are
-      <emphasis role="bold">qtimageformats</emphasis>,
-      <emphasis role="bold">qtlocation</emphasis>,
-      <emphasis role="bold">qtwebchannel</emphasis>,
-      <emphasis role="bold">qtdoc</emphasis>, and
-      <emphasis role="bold">qtmultimedia</emphasis>.
-      Only those components specified for a specific
-      package are needed. You only need to build the relevant component(s).
-    </para>
-
-    <para>
-      First, apply a patch to pull in the fixes curated by KDE for some of the
-      modules listed above:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
-
-    <para>
-      Next, if you are installing <emphasis role="bold">qtlocation</emphasis>,
-      fix the build with GCC-13:
-    </para>
-
-<screen><userinput>sed -e "/pragma once/a#include &lt;cstdint&gt;"                                      \
-    -i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
-       qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp   \
-       qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>
-
-    <para>
-      Install each desired component by running the following commands:
-    </para>
-
-<screen><userinput>cd <replaceable>&lt;component&gt;</replaceable>
-qmake <replaceable>&lt;component&gt;</replaceable>.pro
-make</userinput></screen>
-
-    <para>
-      As the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      command as the &root; user:
-    </para>
-
-<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-
-  </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>
-          libQt5&lt;component&gt;.so
-        </seg>
-        <seg>
-          $QT5DIR/qml/&lt;component&gt;,
-          $QT5DIR/lib/cmake/&lt;component&gt;, and
-          $QT5DIR/include/&lt;component&gt;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1356 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qt5-major "5.15">
-  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
-  <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "15 GB (264 MB installed)">
-  <!ENTITY qt5-time          "16 SBU (using parallelism=4)">
-]>
-
-<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
-  <?dbhtml filename="qt5.html" ?>
-
-
-  <title>Qt-&qt5-version;</title>
-
-  <indexterm zone="qt5">
-    <primary sortas="a-Qt5">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt5</title>
-
-    <para>
-      <application>Qt5</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases <application>Qt5</application> is
-      classified as a widget toolkit), and also used for developing non-GUI
-      programs such as command-line tools and consoles for servers. Two of the
-      major users of <application>Qt</application> are <application>KDE
-      Frameworks 5 (KF5)</application> and <application>LXQt</application>.
-    </para>
-
-    <important>
-      <para>
-         The installation of the full Qt5 packages is now deprecated for BLFS
-         due to the release of <xref linkend="qt6"/>.  This page will probably
-         be removed soon depending on the release of new versions of packages
-         that still use Qt5.  For those packages, users should use 
-         <xref linkend="qt5-alternate"/>.
-      </para>
-    </important>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>Qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular Qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="make-ca"/>,
-      <xref linkend="cups"/>,
-      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
-      <xref linkend="double-conversion"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="mtdev"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="wayland"/> (<application>Mesa</application>
-      must be built with <application>Wayland</application> EGL
-      backend),
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="bluez"/> (for sdpscanner, and at runtime for
-      QtConnectivity module),
-      <xref linkend="gtk3"/>,
-      <xref linkend="ibus"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="mariadb"/>
-        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl2"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="vulkan-loader"/>,
-      <ulink url="https://www.assimp.org/">assimp</ulink>,
-      <ulink url="https://github.com/festvox/flite">Flite</ulink>,
-      <ulink url="https://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://freebsoft.org/speechd/">speech-dispatcher</ulink>, and
-      <ulink url="http://www.tslib.org/">tslib</ulink>
-    </para>
-
-    <!-- Many of the dependencies in the qmake/configure output do not apply
-         to Linux-based platforms. I've selected the ones that do and put
-         them in as optional dependencies. -renodr -->
-  </sect2>
-
-  <sect2 role="qt5-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>Qt5</application> in a
-      directory other than <filename class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt5</filename>.  To do this, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt5</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt5-version;</filename>. To create a
-        versioned <application>Qt5</application> directory, 
-        you may create a versioned directory and a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt5-version;
-ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt5</application>. To do that, just remove the symlink,
-        create the new versioned directory, and recreate the 
-        <filename class="directory">/opt/qt5</filename> symlink again before
-        building the new version.
-        Which version of <application>Qt5</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-    <note>
-      <para>
-        If <xref linkend="qca"/> has been installed and you are
-        reinstalling or updating this package, then
-        <application>qca</application> will need to be reinstalled.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt5</title>
-
-    <warning>
-      <para>
-        If <application>Qt5</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-Qt5 based
-        window manager. It overwrites <application>Qt5</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt5</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> line will create a complete build.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing
-        <application>Qt5</application> into the
-        <filename class="directory">/usr</filename> hierarchy because it
-        becomes difficult to find components and to update to a new version.
-        If you do want to install <application>Qt5</application> in
-        <filename class="directory">/usr</filename>, the directories need to
-        be specified explicitly.  In this case, set
-        <envar>QT5PREFIX=/usr</envar> and add the following to the configure
-        arguments below:
-      </para>
-
-<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
-            -bindir         /usr/bin                    \
-            -plugindir      /usr/lib/qt5/plugins        \
-            -importdir      /usr/lib/qt5/imports        \
-            -headerdir      /usr/include/qt5            \
-            -datadir        /usr/share/qt5              \
-            -docdir         /usr/share/doc/qt5          \
-            -translationdir /usr/share/qt5/translations \
-            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
-    </note>
-
-    <para>
-      Now apply a patch to pull in the fixes curated by kde for those
-      modules which are required by packages mentioned in this book:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
-
-    <para>
-      The patch is supposed to be used in a git repository. Otherwise some
-      files that should be modified by <command>configure</command> after
-      applying the patch are not touched. Fortunately, it is enough to create a
-      <filename class="directory">.git</filename> directory in the
-      <filename class="directory">qmake</filename> directory where the
-      <command>configure</command> script is run:
-    </para>
-
-    <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
-
-    <para>
-      Add another fix for building with GCC-13:
-    </para>
-
-<screen><userinput>sed -e "/pragma once/a#include &lt;cstdint&gt;"                                      \
-    -i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
-       qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp   \
-       qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>
-
-    <para>
-      Fix a security vulnerability in qtbase:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Qt5</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure -prefix $QT5PREFIX                        \
-            -sysconfdir /etc/xdg                      \
-            -confirm-license                          \
-            -opensource                               \
-            -dbus-linked                              \
-            -openssl-linked                           \
-            -system-harfbuzz                          \
-            -system-sqlite                            \
-            -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>
-
-    <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: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      The <envar>QT5BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT5BINDIR</envar> variable is defined in root's
-      environment and as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>QT5BINDIR=$QT5PREFIX/bin
-
-install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
-
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png &amp;&amp;
-
-install -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=$QT5BINDIR/assistant
-Icon=assistant-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=$QT5BINDIR/designer
-Icon=designer-qt5.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=$QT5BINDIR/linguist
-Icon=linguist-qt5.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT5BINDIR/qdbusviewer
-Icon=qdbusviewer-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt5 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt5
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked</parameter>
-      <parameter>-openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <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>
-
-    <para>
-      <parameter>-skip qtwebengine</parameter>: This switch disables building
-      the QtWebEngine. The BLFS editors have chosen to build <xref
-      linkend="qtwebengine"/> separately.
-    </para>
-
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt5</title>
-
-    <sect3 id="qt5-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
-        the super user as well. Execute the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT5DIR</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you installed Qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>Qt5</application> in
-        <filename class="directory">/usr</filename>, create an
-        environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/usr
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you did not install Qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>Qt5</application> in a location other
-        than <filename class="directory">/usr</filename>, you need to update the
-        following configuration files so that <application>Qt5</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt5/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt5 qt5-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/qt5.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/opt/qt5
-
-pathappend $QT5DIR/bin           PATH
-pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</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>
-          assistant, balsam, canbusutil, designer, fixqt4headers.pl, lconvert,
-          linguist, lprodump, lrelease, lrelease-pro, lupdate, lupdate-pro,
-          meshdebug, moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
-          qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc, qgltf,
-          qhelpgenerator, qlalr, qmake, qml, qmlcachegen, qmleasing,
-          qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qmltime,
-          qmltyperegistrar, qscxmlc,
-          qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
-          qtwaylandscanner, qvkgen, rcc, repc, sdpscanner, syncqt.pl, tracegen,
-          uic, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libQt53DAnimation.so, libQt53DCore.so,
-          libQt53DExtras.so, libQt53DInput.so, libQt53DLogic.so,
-          libQt53DQuick.so, libQt53DQuickAnimation.so, libQt53DQuickExtras.so,
-          libQt53DQuickInput.so, libQt53DQuickRender.so,
-          libQt53DQuickScene2D.so, libQt53DRender.so,
-          libQt5AccessibilitySupport.a, libQt5Bluetooth.so, libQt5Bodymovin.so,
-          libQt5Bootstrap.a, libQt5Charts.so, libQt5Concurrent.so,
-          libQt5Core.so, libQt5DataVisualization.so, libQt5DBus.so,
-          libQt5DesignerComponents.so, libQt5Designer.so,
-          libQt5DeviceDiscoverySupport.a, libQt5EdidSupport.a,
-          libQt5EglFSDeviceIntegration.so, libQt5EglFsKmsSupport.so,
-          libQt5EglSupport.a, libQt5EventDispatcherSupport.a, libQt5FbSupport.a,
-          libQt5FontDatabaseSupport.a, libQt5Gamepad.so, libQt5GlxSupport.a,
-          libQt5Gui.so,libQt5Help.so, libQt5InputSupport.a, libQt5KmsSupport.a,
-          libQt5LinuxAccessibilitySupport.a, libQt5Location.so,
-          libQt5Multimedia.so, libQt5MultimediaGstTools.so,
-          libQt5MultimediaQuick.so, libQt5MultimediaWidgets.so,
-          libQt5Network.so, libQt5NetworkAuth.so, libQt5Nfc.so,
-          libQt5OpenGLExtensions.a, libQt5OpenGL.so, libQt5PacketProtocol.a,
-          libQt5PlatformCompositorSupport.a, libQt5Positioning.so,
-          libQt5PositioningQuick.so, libQt5PrintSupport.so,
-          libQt5Purchasing.so, libQt5Qml.so, libQt5QmlDebug.a,
-          libQt5QmlDevTools.a, libQt5QmlModels.so, libQt5QmlWorkerScript.so,
-          libQt5Quick.so, libQt5Quick3D.so, libQt5Quick3DAssetImport.so,
-          libQt5Quick3DRender.so, libQt5Quick3DRuntimeRender.so,
-          libQt5Quick3DUtils.so, libQt5QuickControls2.so,
-          libQt5QuickParticles.so, libQt5QuickShapes.so,
-          libQt5QuickTemplates2.so, libQt5QuickTest.so, libQt5QuickWidgets.so,
-          libQt5RemoteObjects.so, libQt5Script.so, libQt5ScriptTools.so,
-          libQt5Scxml.so, libQt5Sensors.so, libQt5SerialBus.so,
-          libQt5SerialPort.so, libQt5ServiceSupport.a, libQt5Sql.so,
-          libQt5Svg.so, libQt5Test.so, libQt5TextToSpeech.so,
-          libQt5ThemeSupport.a, libQt5UiTools.a, libQt5VirtualKeyboard.so,
-          libQt5VulkanSupport.a, libQt5WaylandClient.so,
-          libQt5WaylandCompositor.so, libQt5WebChannel.so, libQt5WebSockets.so,
-          libQt5WebView.so, libQt5Widgets.so, libQt5X11Extras.so,
-          libQt5XcbQpa.so, libQt5XkbCommonSupport.a, libQt5Xml.so,
-          libQt5XmlPatterns.so,
-          and several plugins under /opt/qt5/{plugins,qml}
-        </seg>
-        <seg>
-          /usr/include/qt5,
-          /usr/lib/qt5,
-          /usr/share/doc/qt5, and
-          /usr/share/qt5
-          OR
-          /opt/qt5 and
-          /opt/qt-&qt5-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist id='qt5-descriptions' xreflabel="Qt5 Short Descriptions">
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt5">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation
-          </para>
-          <indexterm zone="qt5 assistant-qt5">
-            <primary sortas="b-assistant-qt5">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="balsam">
-        <term><command>balsam</command></term>
-        <listitem>
-          <para>
-            is a tool to convert 3D scenes from various creation tools
-            to QML format, for use by the new QtQuick 3D library
-          </para>
-          <indexterm zone="qt5 balsam">
-            <primary sortas="b-balsam">balsam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="canbusutil">
-        <term><command>canbustil</command></term>
-        <listitem>
-          <para>
-            is a tool to deal with arbitrary CAN bus frames.
-            A Controller Area Network (CAN) is a vehicle bus standard designed
-            to allow microcontrollers and devices to communicate with each other
-            in applications without a host computer
-          </para>
-          <indexterm zone="qt5 canbusutil">
-            <primary sortas="b-canbusutil">canbusutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt5">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor
-          </para>
-          <indexterm zone="qt5 designer-qt5">
-            <primary sortas="b-designer-qt5">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="fixqt4headers.pl">
-        <term><command>fixqt4headers.pl</command></term>
-        <listitem>
-          <para>
-            is a script to replace all Qt 4 style includes with Qt 5 includes
-          </para>
-          <indexterm zone="qt5 fixqt4headers.pl">
-            <primary sortas="b-fixqt4headers.pl">fixqt4headers.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt5">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt5's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files
-          </para>
-          <indexterm zone="qt5 lconvert-qt5">
-            <primary sortas="b-lconvert-qt5">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt5">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages
-          </para>
-          <indexterm zone="qt5 linguist-qt5">
-            <primary sortas="b-linguist-qt5">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt5">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads XML-based translation
-            file in TS format and produces message files used by the
-            application
-          </para>
-          <indexterm zone="qt5 lrelease-qt5">
-            <primary sortas="b-lrelease-qt5">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-pro">
-        <term><command>lrelease-pro</command></term>
-        <listitem>
-          <para>
-            extracts project information from qmake projects and passes
-            it to lrelease
-          </para>
-          <indexterm zone="qt5 lrelease-pro">
-            <primary sortas="b-lrelease-pro">lrelease-pro</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt5">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and stores the extracted messages in
-            translation files to be processed by lrelease
-          </para>
-          <indexterm zone="qt5 lupdate-qt5">
-            <primary sortas="b-lupdate-qt5">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-pro">
-        <term><command>lupdate-pro</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, an passes the collected information
-            to lupdate
-          </para>
-          <indexterm zone="qt5 lupdate-pro">
-            <primary sortas="b-lupdate-pro">lupdate-pro</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="meshdebug">
-        <term><command>meshdebug</command></term>
-        <listitem>
-          <para>
-            displays information about qtquick-3d mesh files
-          </para>
-          <indexterm zone="qt5 meshdebug">
-            <primary sortas="b-meshdebug">meshdebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc-qt5">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>
-            generates Qt meta object support code
-          </para>
-          <indexterm zone="qt5 moc-qt5">
-            <primary sortas="b-moc-qt5">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt5">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window
-          </para>
-          <indexterm zone="qt5 pixeltool-qt5">
-            <primary sortas="b-pixeltool-qt5">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcollectiongenerator-qt5">
-        <term><command>qcollectiongenerator</command></term>
-        <listitem>
-          <para>
-            processes and converts Qt help files
-          </para>
-          <indexterm zone="qt5 qcollectiongenerator-qt5">
-            <primary sortas="b-qcollectiongenerator-qt5">qcollectiongenerator-qt5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbuscpp2xml-qt5">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface
-          </para>
-          <indexterm zone="qt5 qdbuscpp2xml-qt5">
-            <primary sortas="b-qdbuscpp2xml-qt5">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt5">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus
-          </para>
-          <indexterm zone="qt5 qdbus-qt5">
-            <primary sortas="b-qdbus-qt5">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt5">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser
-          </para>
-          <indexterm zone="qt5 qdbusviewer-qt5">
-            <primary sortas="b-qdbusviewer-qt5">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt5">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt5 qdbusxml2cpp-qt5">
-            <primary sortas="b-qdbusxml2cpp-qt5">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdistancefieldgenerator-qt5">
-        <term><command>qdistancefieldgenerator</command></term>
-        <listitem>
-          <para>
-            allows a font cache to be pregenerated for Text.QtRendering to speed
-            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
-          </para>
-          <indexterm zone="qt5 qdistancefieldgenerator-qt5">
-            <primary sortas="b-qdistancefieldgenerator-qt5">qdistancefieldgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdoc-qt5">
-        <term><command>qdoc</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects
-          </para>
-          <indexterm zone="qt5 qdoc-qt5">
-            <primary sortas="b-qdoc-qt5">qdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qgltf">
-        <term><command>qgltf</command></term>
-        <listitem>
-          <para>
-            imports a variety of 3D model formats and exports into fast-to-load,
-            optimized glTF assets embedded into Qt resource files
-          </para>
-          <indexterm zone="qt5 qgltf">
-            <primary sortas="b-qgltf">qgltf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpgenerator-qt5">
-        <term><command>qhelpgenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate a <application>Qt</application>
-            compressed help file
-          </para>
-          <indexterm zone="qt5 qhelpgenerator-qt5">
-            <primary sortas="b-qhelpgenerator-qt5">qhelpgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qlalr-qt5">
-        <term><command>qlalr</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate code from grammar specifications
-          </para>
-          <indexterm zone="qt5 qlalr-qt5">
-            <primary sortas="b-qlalr-qt5">qlalr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt5">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates
-          </para>
-          <indexterm zone="qt5 qmake-qt5">
-            <primary sortas="b-qmake-qt5">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qml">
-        <term><command>qml</command></term>
-        <listitem>
-          <para>
-            executes a QML file
-          </para>
-          <indexterm zone="qt5 qml">
-            <primary sortas="b-qml">qml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlcachegen">
-        <term><command>qmlcachegen</command></term>
-        <listitem>
-          <para>
-            supports the creation of cache files at build time
-          </para>
-          <indexterm zone="qt5 qmlcachegen">
-            <primary sortas="b-qmlcachegen">qmlcachegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmleasing-qt5">
-        <term><command>qmleasing</command></term>
-        <listitem>
-          <para>
-            is a tool used to define the easing curves using an
-            interactive curve editor
-          </para>
-          <indexterm zone="qt5 qmleasing-qt5">
-            <primary sortas="b-qmleasing-qt5">qmleasing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlformat-qt5">
-        <term><command>qmlformat</command></term>
-        <listitem>
-          <para>
-            formats QML files according to the QML coding conventions
-          </para>
-          <indexterm zone="qt5 qmlformat-qt5">
-            <primary sortas="b-qmlformat-qt5">qmlformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlimportscanner-qt5">
-        <term><command>qmlimportscanner</command></term>
-        <listitem>
-          <para>
-            is a tool used to import QML files from a directory
-          </para>
-          <indexterm zone="qt5 qmlimportscanner-qt5">
-            <primary sortas="b-qmlimportscanner-qt5">qmlimportscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmllint-qt5">
-        <term><command>qmllint</command></term>
-        <listitem>
-          <para>
-            is a syntax checker for QML files
-          </para>
-          <indexterm zone="qt5 qmllint-qt5">
-            <primary sortas="b-qmllint-qt5">qmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlmin-qt5">
-        <term><command>qmlmin</command></term>
-        <listitem>
-          <para>
-            removes comments and layout characters from a QML file
-          </para>
-          <indexterm zone="qt5 qmlmin-qt5">
-            <primary sortas="b-qmlmin-qt5">qmlmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt5">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file
-          </para>
-          <indexterm zone="qt5 qmlplugindump-qt5">
-            <primary sortas="b-qmlplugindump-qt5">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlpreview-qt5">
-        <term><command>qmlpreview</command></term>
-        <listitem>
-          <para>
-            is a tool used to analyze QML applications
-          </para>
-          <indexterm zone="qt5 qmlpreview-qt5">
-            <primary sortas="b-qmlpreviewr-qt5">qmlpreview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlprofiler-qt5">
-        <term><command>qmlprofiler</command></term>
-        <listitem>
-          <para>
-            is a tool which watches QML and JavaScript files on disk and
-            updates the application live with any changes
-          </para>
-          <indexterm zone="qt5 qmlprofiler-qt5">
-            <primary sortas="b-qmlprofiler-qt5">qmlprofiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlscene-qt5">
-        <term><command>qmlscene</command></term>
-        <listitem>
-          <para>
-            is a utility that loads and displays QML documents even before
-            the application is complete
-          </para>
-          <indexterm zone="qt5 qmlscene-qt5">
-            <primary sortas="b-qmlscene-qt5">qmlscene</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmltestrunner-qt5">
-        <term><command>qmltestrunner</command></term>
-        <listitem>
-          <para>
-            is a tool used to make tests
-          </para>
-          <indexterm zone="qt5 qmltestrunner-qt5">
-            <primary sortas="b-qmltestrunner-qt5">qmltestrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qscxmlc-qt5">
-        <term><command>qscxml</command></term>
-        <listitem>
-          <para>
-            converts an input.scxml file to a header and cpp file
-          </para>
-          <indexterm zone="qt5 qscxmlc-qt5">
-            <primary sortas="b-qscxmlc-qt5">qscxmlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtattributionsscanner-qt5">
-        <term><command>qtattributionsscanner</command></term>
-        <listitem>
-          <para>
-            processes qt_attribution.json files in Qt sources
-          </para>
-          <indexterm zone="qt5 qtattributionsscanner-qt5">
-            <primary sortas="b-qtattributionsscanner-qt5">qtattributionsscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdiag-qt5">
-        <term><command>qtdiag</command></term>
-        <listitem>
-          <para>
-            is a tool for reporting diagnostic information about Qt and its
-            environment
-          </para>
-          <indexterm zone="qt5 qtdiag-qt5">
-            <primary sortas="b-qtdiag-qt5">qtdiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtpaths-qt5">
-        <term><command>qtpaths</command></term>
-        <listitem>
-          <para>
-            is a tool to query Qt path information
-          </para>
-          <indexterm zone="qt5 qtpaths-qt5">
-            <primary sortas="b-qtpaths-qt5">qtpaths</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtplugininfo">
-        <term><command>qtplugininfo</command></term>
-        <listitem>
-          <para>
-            dumps meta-data about Qt plugins in JSON format
-          </para>
-          <indexterm zone="qt5 qtplugininfo">
-            <primary sortas="b-qtplugininfo">qtplugininfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtwaylandscanner">
-        <term><command>qtwaylandscanner</command></term>
-        <listitem>
-          <para>
-            converts Wayland specfiles to C++ headers and code needed for
-            QtWayland
-          </para>
-          <indexterm zone="qt5 qtwaylandscanner">
-            <primary sortas="b-qtwaylandscanner">qtwaylandscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qvkgen">
-        <term><command>qvkgen</command></term>
-        <listitem>
-          <para>
-            converts Vulkan specfiles to C++ headers and code
-          </para>
-          <indexterm zone="qt5 qvkgen">
-            <primary sortas="b-qvkgen">qvkgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcc-qt5">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>
-            is a resource compiler used in conjunction with designer
-          </para>
-          <indexterm zone="qt5 rcc-qt5">
-            <primary sortas="b-rcc-qt5">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="repc">
-        <term><command>repc</command></term>
-        <listitem>
-          <para>
-            is the Replica Compiler, which generates QObject header files based
-            on an API definition file
-          </para>
-          <indexterm zone="qt5 repc">
-            <primary sortas="b-repc">repc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sdpscanner-qt5">
-        <term><command>sdpscanner</command></term>
-        <listitem>
-          <para>
-            performs a Session Description Protocol scan on a remote device,
-            using the SDP server represented by the local Bluetooth device
-          </para>
-          <indexterm zone="qt5 sdpscanner-qt5">
-            <primary sortas="b-sdpscanner-qt5">sdpscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="syncqt.pl-qt5">
-        <term><command>syncqt.pl</command></term>
-        <listitem>
-          <para>
-            is a script to create the forwarding headers in the include
-            directories. It is an internal development tool
-          </para>
-          <indexterm zone="qt5 syncqt.pl-qt5">
-            <primary sortas="b-syncqt.pl-qt5">syncqt.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracegen">
-        <term><command>tracegen</command></term>
-        <listitem>
-          <para>
-            is a trace generator for LTTng or ETW
-          </para>
-          <indexterm zone="qt5 tracegen">
-            <primary sortas="b-tracegen">tracegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic-qt5">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>
-            is a Qt user interface compiler
-          </para>
-          <indexterm zone="qt5 uic-qt5">
-            <primary sortas="b-uic-qt5">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatterns-qt5">
-        <term><command>xmlpatterns</command></term>
-        <listitem>
-          <para>
-            provides support for XPath, XQuery, XSLT, and XML Schema
-            validation
-          </para>
-          <indexterm zone="qt5 xmlpatterns-qt5">
-            <primary sortas="b-xmlpatterns-qt5">xmlpatterns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="xmlpatternsvalidator-qt5">
-        <term><command>xmlpatternsvalidator</command></term>
-        <listitem>
-          <para>
-            is a tool used to validate XML documents
-          </para>
-          <indexterm zone="qt5 xmlpatternsvalidator-qt5">
-            <primary sortas="b-xmlpatternsvalidator-qt5">xmlpatternsvalidator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/qt6.xml
===================================================================
--- x/lib/qt6.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,1180 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qt6-major "6.7">
-  <!ENTITY qt6-url   "https://download.qt.io/archive/qt/&qt6-major;/&qt6-version;/single">
-
-  <!ENTITY qt6-download-http "&qt6-url;/qt-everywhere-src-&qt6-version;.tar.xz">
-  <!ENTITY qt6-download-ftp  " ">
-  <!ENTITY qt6-md5sum        "4468b457adb3a96294947e601fc877ca">
-  <!ENTITY qt6-size          "891 MB">
-  <!ENTITY qt6-buildsize     "35 GB (358 MB installed)">
-  <!ENTITY qt6-time          "17 SBU (using parallelism=8)">
-]>
-
-<sect1 id="qt6" xreflabel="Qt-&qt6-version;">
-  <?dbhtml filename="qt6.html" ?>
-
-
-  <title>Qt-&qt6-version;</title>
-
-  <indexterm zone="qt6">
-    <primary sortas="a-Qt6">Qt6</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt6</title>
-
-    <para>
-      <application>Qt6</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases <application>Qt6</application> is
-      classified as a widget toolkit), and also used for developing non-GUI
-      programs such as command-line tools and consoles for servers. <!--Two of the
-      major users of <application>Qt</application> are <application>KDE
-      Frameworks 5 (KF5)</application> and <application>LXQt</application>.-->
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt6-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt6-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt6-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt6-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt6-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt6-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>Qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular Qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt6-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Qt6 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="make-ca"/>,
-      <xref linkend="cups"/>,
-      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
-      <xref linkend="double-conversion"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="mtdev"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="wayland"/> (<application>Mesa</application>
-      must be built with <application>Wayland</application> EGL
-      backend),
-      <xref linkend="xcb-util-cursor"/>,
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="bluez"/> (for sdpscanner, and at runtime for
-      QtConnectivity module),
-      <xref linkend="gtk3"/>,
-      <xref linkend="ibus"/>,
-      <xref linkend="mariadb"/>
-        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl2"/>,
-      <xref linkend="unixodbc"/>,
-      <ulink url="https://www.assimp.org/">assimp</ulink>,
-      <ulink url="https://github.com/festvox/flite">Flite</ulink>,
-      <ulink url="https://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://freebsoft.org/speechd/">speech-dispatcher</ulink>, and
-      <ulink url="http://www.tslib.org/">tslib</ulink>
-      <!--<ulink url="https://vulkan.lunarg.com/sdk/home/">Vulkan</ulink>-->
-    </para>
-
-    <!-- Many of the dependencies in the qmake/configure output do not apply
-         to Linux-based platforms. I've selected the ones that do and put
-         them in as optional dependencies. Not checked yet for Qt6 -->
-
-  </sect2>
-
-  <sect2 role="qt6-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt6</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>Qt6</application> in a
-      directory other than <filename class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt6</filename>.  This is needed
-      to avoid conflicts with Qt5. To do this, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT6PREFIX=/opt/qt6</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt6</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt6-version;</filename>. To create a
-        versioned <application>Qt6</application> directory,
-        you may rename the directory and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt6-version;
-ln -sfnv qt-&qt6-version; /opt/qt6</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt6</application>. To do that, just remove the symlink,
-        create the new versioned directory, and recreate the
-        <filename class="directory">/opt/qt6</filename> symlink again before
-        building the new version.
-        Which version of <application>Qt6</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-<!-- Not sure about this for Qt6
-    <note>
-      <para>
-        If <xref linkend="qca"/> has been installed and you are
-        reinstalling or updating this package, then
-        <application>qca</application> will need to be reinstalled.
-      </para>
-    </note>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt6</title>
-
-    <warning>
-      <para>
-        If <application>Qt6</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        &root;, such as
-        <command>make install</command>, from a console or non-Qt6 based
-        window manager. It overwrites <application>Qt6</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt6</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> line will create additional resources..
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing <application>Qt6</application>
-        into the /usr hierarchy because it becomes difficult to find
-        components and to update to a new version.  There are also some programs
-        that conflict with those installed by Qt5.
-        <!--If you do want to install
-        <application>Qt5</application> in /usr, the directories need to
-        be specified explicitly.  In this case, set QT5PREFIX=/usr and add
-        the following to the configure arguments below:
-      </para>
-
-<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt6                \
-            -bindir         /usr/bin                    \
-            -plugindir      /usr/lib/qt6/plugins        \
-            -importdir      /usr/lib/qt6/imports        \
-            -headerdir      /usr/include/qt6            \
-            -datadir        /usr/share/qt6              \
-            -docdir         /usr/share/doc/qt6          \
-            -translationdir /usr/share/qt6/translations \
-            -examplesdir    /usr/share/doc/qt6/examples</userinput></screen>-->
-      </para>
-    </note>
-
-    <para>
-      First make a correction identified upstream:
-    </para>
-
-<screen><userinput>sed -i '/if __cpp_lib_span/s/if/ifdef/' qtbase/src/corelib/tools/qspan.h</userinput></screen>
-
-    <para>
-      Install <application>Qt6</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure -prefix $QT6PREFIX      \
-            -sysconfdir /etc/xdg    \
-            -dbus-linked            \
-            -openssl-linked         \
-            -system-sqlite          \
-            -nomake examples        \
-            -no-rpath               \
-            -syslog                 \
-            -skip qt3d              \
-            -skip qtquick3dphysics  \
-            -skip qtwebengine       \
-            -Wno-dev                &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure -prefix $QT6PREFIX      \
-            -sysconfdir /etc/xdg    \
-            -dbus-linked            \
-            -openssl-linked         \
-            -system-sqlite          \
-            -nomake examples        \
-            -no-rpath               \
-            -journald               \
-            -skip qt3d              \
-            -skip qtquick3dphysics  \
-            -skip qtwebengine       \
-            -Wno-dev                &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) <!--and profile include (pri)--> files by running the following
-      command as the &root; user:
-    </para>
-
-<screen role="root"><userinput>find $QT6PREFIX/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      <!--The <envar>QT6BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT5BINDIR</envar> variable is defined in root's
-      environment and as the &root; user:-->
-      Again as the &root; user:
-    </para>
-
-<screen role="root"><userinput>pushd qttools/src &amp;&amp;
-
-install -v -Dm644 assistant/assistant/images/assistant-128.png       \
-                  /usr/share/pixmaps/assistant-qt6.png               &amp;&amp;
-
-install -v -Dm644 designer/src/designer/images/designer.png          \
-                  /usr/share/pixmaps/designer-qt6.png                &amp;&amp;
-
-install -v -Dm644 linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt6.png                &amp;&amp;
-
-install -v -Dm644 qdbus/qdbusviewer/images/qdbusviewer-128.png       \
-                  /usr/share/pixmaps/qdbusviewer-qt6.png             &amp;&amp;
-popd &amp;&amp;
-
-
-cat &gt; /usr/share/applications/assistant-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 Assistant
-Comment=Shows Qt6 documentation and examples
-Exec=$QT6PREFIX/bin/assistant
-Icon=assistant-qt6.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt6 applications
-Exec=$QT6PREFIX/bin/designer
-Icon=designer-qt6.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 Linguist
-Comment=Add translations to Qt6 applications
-Exec=$QT6PREFIX/bin/linguist
-Icon=linguist-qt6.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT6PREFIX/bin/qdbusviewer
-Icon=qdbusviewer-qt6.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-<!--
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt6 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt6
-done</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <!--
-    <para>
-      <command>sed ...</command>: Allows using
-      <application>Python 3</application> instead of <application>Python
-      2</application>. This command destroys the build for QtWebEngine, so do
-      not use it if you remove the <parameter>-skip qtwebengine</parameter>
-      switch.
-    </para>
-
-    Ignored
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    Ignored
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt</application>.
-    </para>
-    -->
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-skip qt3d</parameter>: This switch
-      disables building qt3d support. There is a problem 
-      building these files without an external library
-      and no packages in BLFS use qt3d.
-    </para>
-<!-- Auto: not for me [pierre 2023/11/20]-->
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked</parameter>
-      <parameter>-openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt6</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>
-
-    <para>
-      <parameter>-skip qtwebengine</parameter>: This switch disables building
-      the QtWebEngine. The BLFS editors have chosen to build <xref
-      linkend="qtwebengine"/> separately.
-    </para>
-
-    <para>
-      <parameter>-skip qtquick3dphysics</parameter>: This switch disables
-      building the Qt Quick 3D Physics submodule. On 32-bit systems, this will
-      cause the build process to fail with an inlining error in Qt6's bundled
-      copy of the PhysX SDK.
-    </para>
-
-<!-- Auto
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt6</title>
-
-    <sect3 id="qt6-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If <xref linkend="sudo"/> is installed, QT6DIR should be available to
-        the super user as well. Execute the following commands as the
-        &root; user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT6DIR</literal>
-EOF</userinput></screen>
-<!--
-      <bridgehead renderas="sect4">If you installed Qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>Qt5</application> in
-        <filename class="directory">/usr</filename>, create an
-        environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt6.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt6.sh
-
-QT5DIR=/usr
-export QT5DIR
-
-# End /etc/profile.d/qt6.sh</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you did not install Qt5 in /usr</bridgehead>
-i-->
-      <para>
-        You now need to update the
-        following configuration files so that <application>Qt6</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the &root; user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt6/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt6 qt6-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the &root; user, create
-        the <filename>/etc/profile.d/qt6.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt6.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt6.sh
-
-QT6DIR=/opt/qt6
-
-pathappend $QT6DIR/bin           PATH
-pathappend $QT6DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT6DIR
-
-# End /etc/profile.d/qt6.sh</literal>
-EOF</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>
-          androiddeployqt (hard link to androiddeployqt6),
-          androiddeployqt6,
-          androidtestrunner,
-          assistant,
-          balsam,
-          balsamui,
-          canbusutil,
-          cooker,
-          designer,
-          instancer,
-          lconvert,
-          linguist,
-          lrelease,
-          lupdate,
-          materialeditor,
-          meshdebug,
-          pixeltool,
-          qdbus,
-          qdbuscpp2xml,
-          qdbusviewer,
-          qdbusxml2cpp,
-          qdistancefieldgenerator,
-          qdoc,
-          qmake (hard link to qmake6),
-          qmake6,
-          qml,
-          qmldom,
-          qmleasing,
-          qmlformat,
-          qmllint,
-          qmlls,
-          qmlplugindump,
-          qmlpreview,
-          qmlprofiler,
-          qmlscene,
-          qmltc,
-          qmltestrunner,
-          qmltime,
-          qqem,
-          qsb,
-          qtdiag (hard link to qtdiag6),
-          qtdiag6,
-          qtpaths (hard link to qtpaths6),
-          qtpaths6,
-          qtplugininfo,
-          qt-cmake,
-          qt-cmake-create,
-          qt-configure-module,
-          shadergen, and
-          shapegen
-
-        </seg>
-        <seg>
-          libQt6Bluetooth.so,
-          libQt6Bodymovin.so,
-          libQt6BundledEmbree.a,
-          libQt6BundledPhysX.a,
-          libQt6BundledResonanceAudio.a,
-          libQt6Charts.so,
-          libQt6ChartsQml.so,
-          libQt6Coap.so,
-          libQt6Concurrent.so,
-          libQt6Core.so,
-          libQt6Core5Compat.so,
-          libQt6DBus.so,
-          libQt6DataVisualization.so,
-          libQt6DataVisualizationQml.so,
-          libQt6DeclarativeOpcua.so,
-          libQt6Designer.so,
-          libQt6DesignerComponents.so,
-          libQt6DeviceDiscoverySupport.a,
-          libQt6EglFSDeviceIntegration.so,
-          libQt6EglFsKmsGbmSupport.so,
-          libQt6EglFsKmsSupport.so,
-          libQt6ExampleIcons.a,
-          libQt6FbSupport.a,
-          libQt6Graphs.so,
-          libQt6Grpc.so,
-          libQt6Gui.so,
-          libQt6Help.so,
-          libQt6HttpServer.so,
-          libQt6InputSupport.a,
-          libQt6JsonRpc.so,
-          libQt6KmsSupport.a,
-          libQt6LabsAnimation.so,
-          libQt6LabsFolderListModel.so,
-          libQt6LabsQmlModels.so,
-          libQt6LabsSettings.so,
-          libQt6LabsSharedImage.so,
-          libQt6LabsWavefrontMesh.so,
-          libQt6LanguageServer.so,
-          libQt6Location.so,
-          libQt6Mqtt.so,
-          libQt6Multimedia.so,
-          libQt6MultimediaQuick.so,
-          libQt6MultimediaWidgets.so,
-          libQt6Network.so,
-          libQt6NetworkAuth.so,
-          libQt6Nfc.so,
-          libQt6OpcUa.so,
-          libQt6OpenGL.so,
-          libQt6OpenGLWidgets.so,
-          libQt6PacketProtocol.a,
-          libQt6Positioning.so,
-          libQt6PositioningQuick.so,
-          libQt6PrintSupport.so,
-          libQt6Protobuf.so,
-          libQt6Qml.so,
-          libQt6QmlCompiler.so,
-          libQt6QmlCore.so,
-          libQt6QmlDebug.a,
-          libQt6QmlDom.a,
-          libQt6QmlLocalStorage.so,
-          libQt6QmlLS.a,
-          libQt6QmlModels.so,
-          libQt6QmlToolingSettings.a,
-          libQt6QmlTypeRegistrar.a,
-          libQt6QmlWorkerScript.so,
-          libQt6QmlXmlListModel.so,
-          libQt6Quick.so,
-          libQt6Quick3D.so,
-          libQt6Quick3DAssetImport.so,
-          libQt6Quick3DAssetUtils.so,
-          libQt6Quick3DEffects.so,
-          libQt6Quick3DGlslParser.so,
-          libQt6Quick3DHelpers.so,
-          libQt6Quick3DHelpersImpl.so,
-          libQt6Quick3DIblBaker.so,
-          libQt6Quick3DParticleEffects.so,
-          libQt6Quick3DParticles.so,
-          libQt6Quick3DPhysics.so,
-          libQt6Quick3DPhysicsHelpers.so,
-          libQt6Quick3DRuntimeRender.so,
-          libQt6Quick3DSpatialAudio.so,
-          libQt6Quick3DUtils.so,
-          libQt6QuickControls2.so,
-          libQt6QuickControls2Impl.so,
-          libQt6QuickControlsTestUtils.a,
-          libQt6QuickDialogs2.so,
-          libQt6QuickDialogs2QuickImpl.so,
-          libQt6QuickDialogs2Utils.so,
-          libQt6QuickEffects.so,
-          libQt6QuickLayouts.so,
-          libQt6QuickParticles.so,
-          libQt6QuickShapes.so,
-          libQt6QuickTemplates2.so,
-          libQt6QuickTest.so,
-          libQt6QuickTestUtils.a,
-          libQt6QuickTimeline.so,
-          libQt6QuickWidgets.so,
-          libQt6RemoteObjects.so,
-          libQt6RemoteObjectsQml.so,
-          libQt6Scxml.so,
-          libQt6ScxmlQml.so,
-          libQt6Sensors.so,
-          libQt6SensorsQuick.so,
-          libQt6SerialBus.so,
-          libQt6SerialPort.so,
-          libQt6ShaderTools.so,
-          libQt6SpatialAudio.so,
-          libQt6Sql.so,
-          libQt6StateMachine.so,
-          libQt6StateMachineQml.so,
-          libQt6Svg.so,
-          libQt6SvgWidgets.so,
-          libQt6TextToSpeech.so,
-          libQt6UiTools.so,
-          libQt6VirtualKeyboard.so,
-          libQt6WaylandClient.so,
-          libQt6WaylandCompositor.so,
-          libQt6WaylandEglClientHwIntegration.so,
-          libQt6WaylandEglCompositorHwIntegration.so,
-          libQt6WebChannel.so,
-          libQt6WebChannelQuick.so,
-          libQt6WebSockets.so,
-          libQt6WebView.so,
-          libQt6WebViewQuick.so,
-          libQt6Widgets.so,
-          libQt6WlShellIntegration.so,
-          libQt6XcbQpa.so, and
-          libQt6Xml.so
-        </seg>
-        <seg>
-          <!--/usr/include/qt6,
-          /usr/lib/qt6,
-          /usr/share/doc/qt6, and
-          /usr/share/qt6
-          OR-->
-          /opt/qt6 and
-          /opt/qt-&qt6-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist id='qt6-descriptions' xreflabel="Qt6 Short Descriptions">
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt6">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation
-          </para>
-          <indexterm zone="qt6 assistant-qt6">
-            <primary sortas="b-assistant-qt6">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="balsam-qt6">
-        <term><command>balsam</command></term>
-        <listitem>
-          <para>
-            is a tool to convert 3D scenes from various creation tools
-            to QML format, for use by the new QtQuick 3D library
-          </para>
-          <indexterm zone="qt6 balsam-qt6">
-            <primary sortas="b-balsam-qt6">balsam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="canbusutil-qt6">
-        <term><command>canbustil</command></term>
-        <listitem>
-          <para>
-            is a tool to deal with arbitrary CAN bus frames.
-            A Controller Area Network (CAN) is a vehicle bus standard designed
-            to allow microcontrollers and devices to communicate with each other
-            in applications without a host computer
-          </para>
-          <indexterm zone="qt6 canbusutil-qt6">
-            <primary sortas="b-canbusutil-qt6">canbusutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt6">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor
-          </para>
-          <indexterm zone="qt6 designer-qt6">
-            <primary sortas="b-designer-qt6">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt6">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt6's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files
-          </para>
-          <indexterm zone="qt6 lconvert-qt6">
-            <primary sortas="b-lconvert-qt6">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt6">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages
-          </para>
-          <indexterm zone="qt6 linguist-qt6">
-            <primary sortas="b-linguist-qt6">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt6">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads XML-based translation
-            file in TS format and produces message files used by the
-            application
-          </para>
-          <indexterm zone="qt6 lrelease-qt6">
-            <primary sortas="b-lrelease-qt6">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt6">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and stores the extracted messages in
-            translation files to be processed by lrelease
-          </para>
-          <indexterm zone="qt6 lupdate-qt6">
-            <primary sortas="b-lupdate-qt6">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="meshdebug-qt6">
-        <term><command>meshdebug</command></term>
-        <listitem>
-          <para>
-            displays information about qtquick-3d mesh files
-          </para>
-          <indexterm zone="qt6 meshdebug-qt6">
-            <primary sortas="b-meshdebug-qt6">meshdebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt6">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window
-          </para>
-          <indexterm zone="qt6 pixeltool-qt6">
-            <primary sortas="b-pixeltool-qt6">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt6">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus
-          </para>
-          <indexterm zone="qt6 qdbus-qt6">
-            <primary sortas="b-qdbus-qt6">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbuscpp2xml-qt6">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface
-          </para>
-          <indexterm zone="qt6 qdbuscpp2xml-qt6">
-            <primary sortas="b-qdbuscpp2xml-qt6">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt6">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser
-          </para>
-          <indexterm zone="qt6 qdbusviewer-qt6">
-            <primary sortas="b-qdbusviewer-qt6">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt6">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt6 qdbusxml2cpp-qt6">
-            <primary sortas="b-qdbusxml2cpp-qt6">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdistancefieldgenerator-qt6">
-        <term><command>qdistancefieldgenerator</command></term>
-        <listitem>
-          <para>
-            allows a font cache to be pregenerated for Text.QtRendering to speed
-            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
-          </para>
-          <indexterm zone="qt6 qdistancefieldgenerator-qt6">
-            <primary sortas="b-qdistancefieldgenerator-qt6">qdistancefieldgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdoc-qt6">
-        <term><command>qdoc</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects
-          </para>
-          <indexterm zone="qt6 qdoc-qt6">
-            <primary sortas="b-qdoc-qt6">qdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt6">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates
-          </para>
-          <indexterm zone="qt6 qmake-qt6">
-            <primary sortas="b-qmake-qt6">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qml-qt6">
-        <term><command>qml</command></term>
-        <listitem>
-          <para>
-            executes a QML file
-          </para>
-          <indexterm zone="qt6 qml-qt6">
-            <primary sortas="b-qml-qt6">qml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmleasing-qt6">
-        <term><command>qmleasing</command></term>
-        <listitem>
-          <para>
-            is a tool used to define the easing curves using an
-            interactive curve editor
-          </para>
-          <indexterm zone="qt6 qmleasing-qt6">
-            <primary sortas="b-qmleasing-qt6">qmleasing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlformat-qt6">
-        <term><command>qmlformat</command></term>
-        <listitem>
-          <para>
-            formats QML files according to the QML coding conventions
-          </para>
-          <indexterm zone="qt6 qmlformat-qt6">
-            <primary sortas="b-qmlformat-qt6">qmlformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmllint-qt6">
-        <term><command>qmllint</command></term>
-        <listitem>
-          <para>
-            is a syntax checker for QML files
-          </para>
-          <indexterm zone="qt6 qmllint-qt6">
-            <primary sortas="b-qmllint-qt6">qmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt6">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file
-          </para>
-          <indexterm zone="qt6 qmlplugindump-qt6">
-            <primary sortas="b-qmlplugindump-qt6">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlpreview-qt6">
-        <term><command>qmlpreview</command></term>
-        <listitem>
-          <para>
-            is a tool used to analyze QML applications
-          </para>
-          <indexterm zone="qt6 qmlpreview-qt6">
-            <primary sortas="b-qmlpreviewr-qt6">qmlpreview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlprofiler-qt6">
-        <term><command>qmlprofiler</command></term>
-        <listitem>
-          <para>
-            is a tool which watches QML and JavaScript files on disk and
-            updates the application live with any changes
-          </para>
-          <indexterm zone="qt6 qmlprofiler-qt6">
-            <primary sortas="b-qmlprofiler-qt6">qmlprofiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlscene-qt6">
-        <term><command>qmlscene</command></term>
-        <listitem>
-          <para>
-            is a utility that loads and displays QML documents even before
-            the application is complete
-          </para>
-          <indexterm zone="qt6 qmlscene-qt6">
-            <primary sortas="b-qmlscene-qt6">qmlscene</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmltestrunner-qt6">
-        <term><command>qmltestrunner</command></term>
-        <listitem>
-          <para>
-            is a tool used to make tests
-          </para>
-          <indexterm zone="qt6 qmltestrunner-qt6">
-            <primary sortas="b-qmltestrunner-qt6">qmltestrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdiag-qt6">
-        <term><command>qtdiag</command></term>
-        <listitem>
-          <para>
-            is a tool for reporting diagnostic information about Qt and its
-            environment
-          </para>
-          <indexterm zone="qt6 qtdiag-qt6">
-            <primary sortas="b-qtdiag-qt6">qtdiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtpaths-qt6">
-        <term><command>qtpaths</command></term>
-        <listitem>
-          <para>
-            is a tool to query Qt path information
-          </para>
-          <indexterm zone="qt6 qtpaths-qt6">
-            <primary sortas="b-qtpaths-qt6">qtpaths</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtplugininfo-qt6">
-        <term><command>qtplugininfo</command></term>
-        <listitem>
-          <para>
-            dumps meta-data about Qt plugins in JSON format
-          </para>
-          <indexterm zone="qt6 qtplugininfo-qt6">
-            <primary sortas="b-qtplugininfo-qt6">qtplugininfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/qtwebengine-kernel.xml
===================================================================
--- x/lib/qtwebengine-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    # Enable or disable *both* of them:
-    [ /*] <emphasis role='blue'>U</emphasis>ser namespace                                               [USER_NS]
-    [ /*] <emphasis role='blue'>P</emphasis>ID Namespaces                                                [PID_NS]</screen>
Index: lib/qtwebengine.xml
===================================================================
--- x/lib/qtwebengine.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,457 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-download-http "https://download.qt.io/official_releases/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
-  <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "d2a509bd4dc6bbf1272217292546cfce">
-  <!ENTITY qtwebengine-size          "525 MB">
-  <!ENTITY qtwebengine-buildsize     "8.5 GB (319 MB installed)">
-  <!ENTITY qtwebengine-time          "60 SBU (Using parallelism=8)">
-]>
-
-<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
-  <?dbhtml filename="qtwebengine.html"?>
-
-  <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>
-
-    <warning>
-      <para>
-        QtWebEngine uses a forked copy of chromium, and is therefore vulnerable
-        to many issues found there. The Qt developers seem to fork a newer
-        version for minor Qt versions, but because chromium moves to newer
-        versions very often, by the time the Qt developers get a forked version
-        to pass their extended tests it is always an old version and security
-        fixes from chromium (some of which have a CVE number) can take several
-        months to appear in a QtWebengine release, even if the severity has been
-        rated as Critical.
-      </para>
-
-      <para>
-        Therefore, you should be wary of using QtWebEngine in a sensitive
-        context and should always update to the next release as soon as it
-        appears in this book, even if is not flagged as a Security Update.
-        Identifying which vulnerabilities have been fixed in a particular
-        release requires pulling the appropriate 'based-NNN' branch just before
-        the previous and current releases and is often impractical. Reports of
-        fixed QTBUG items do not seem to be available and there is not any
-        documentation in the tarball for changes after the qt-5 versions.
-      </para>
-    </warning>
-
-    &lfs121_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 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>
-
-    <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;-5.15.7-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch"/>
-        </para>
-      </listitem>
-  
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-icu_73-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-
-    <para role="required">
-      <xref linkend="html5lib"/>,
-      <xref linkend="nodejs"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="pciutils"/>, and
-      <xref linkend='qt6'/> 
-    </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"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="opus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libevent"/>,
-      <xref linkend="mitkrb"/>,
-      <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="https://google.github.io/snappy/">snappy</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtwebengine</title>
-    <para>
-      Install <application>qtwebengine</application> by running the following
-      commands:
-    </para>
-
-
-<!-- Note to whoever is updating this next, test to see if it FTBFS/Runtime Errors with 
-system FFMpeg, I can't get it to work on 6.7.0 and FFMpeg 7.0 [rahul] -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_MESSAGE_LOG_LEVEL=STATUS             \
-      -D QT_FEATURE_webengine_system_ffmpeg=OFF      \
-      -D QT_FEATURE_webengine_system_icu=ON         \
-      -D QT_FEATURE_webengine_system_libevent=ON    \
-      -D QT_FEATURE_webengine_proprietary_codecs=ON \
-      -D QT_FEATURE_webengine_webrtc_pipewire=ON    \
-      -D QT_BUILD_EXAMPLES_BY_DEFAULT=OFF           \
-      -G Ninja .. &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>
-
-    <!-- EDITORS NOTE: If you are updating this package, use INSTALL_ROOT=
-         instead of DESTDIR=    Not sure this is valid any more with version 6.6.2 -->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>CMAKE_MESSAGE_LOG_LEVEL=STATUS</parameter>: Output
-      interesting messages that project users might be interested in.
-      Ideally these should be concise, no more than a single line, 
-      but still informative.
-    </para>
-
-    <para>
-      <parameter>QT_FEATURE_webengine_system_*</parameter>: Specify what
-      external packages the system should use.
-    </para>
-
-    <para>
-      <parameter>QT_BUILD_EXAMPLES_BY_DEFAULT=OFF</parameter>: Do not build
-      examples by default.
-    </para>
-
-    <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 python and node
-            jobs run).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            On a machine with only 4 CPUs online, the default of scheduling
-            N+2 jobs 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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="qtwebengine-kernel.xml"/>
-
-    <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 (both in $QT6DIR/libexec)
-        </seg>
-        <seg>
-          libQt6Pdf.so,
-          libQt6PdfQuick.so,
-          libQt6PdfWidgets.so,
-          libQt6WebEngineCore.so,
-          libQt6WebEngineiQuick.so,
-          libQt6WebEngineQuickDelegatesQml.so, and
-          libQt6WebEngineWidgets.so
-        </seg>
-        <seg>
-          $QT6DIR/include/QtPdf,
-          $QT6DIR/include/QtPdfQuick,
-          $QT6DIR/include/QtPdfWidgets,
-          $QT6DIR/include/QtWebEngineCore,
-          $QT6DIR/include/QtWebEngineQuick,
-          $QT6DIR/include/QtWebEngineWidgets,
-          $QT6DIR/qml/QtWebEngine, and
-          $QT6DIR/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: lib/startup-notification.xml
===================================================================
--- x/lib/startup-notification.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 startup-notification-download-http "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-&startup-notification-version;.tar.gz">
-  <!ENTITY startup-notification-download-ftp  " ">
-  <!ENTITY startup-notification-md5sum        "2cd77326d4dcaed9a5a23a1232fb38e9">
-  <!ENTITY startup-notification-size          "347 KB">
-  <!ENTITY startup-notification-buildsize     "4 MB">
-  <!ENTITY startup-notification-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="startup-notification"
-xreflabel="startup-notification-&startup-notification-version;">
-  <?dbhtml filename="startup-notification.html"?>
-
-
-  <title>startup-notification-&startup-notification-version;</title>
-
-  <indexterm zone="startup-notification">
-    <primary sortas="a-startup-notification">startup-notification</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to startup-notification</title>
-
-    <para>
-      The <application>startup-notification</application> package
-      contains <filename class="libraryfile">startup-notification</filename>
-      libraries. These are useful for building a consistent manner to notify
-      the user through the cursor that the application is loading.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&startup-notification-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&startup-notification-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &startup-notification-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &startup-notification-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &startup-notification-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &startup-notification-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">startup-notification Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/> and
-      <xref linkend="xcb-util"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of startup-notification</title>
-
-    <para>
-      Install <application>startup-notification</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D doc/startup-notification.txt \
-    /usr/share/doc/startup-notification-&startup-notification-version;/startup-notification.txt</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libstartup-notification-1.so</seg>
-        <seg>/usr/include/startup-notification-1.0 and
-        /usr/share/doc/startup-notification-&startup-notification-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libstartup-notification-1">
-        <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
-          </para>
-          <indexterm zone="startup-notification libstartup-notification-1">
-            <primary sortas="c-libstartup-notification-1">libstartup-notification-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/tepl.xml
===================================================================
--- x/lib/tepl.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tepl-download-http "&gnome-download-http;/tepl/6.9/tepl-&tepl-version;.tar.xz">
-  <!ENTITY tepl-download-ftp  " ">
-  <!ENTITY tepl-md5sum        "4d98792c8c338a107114a61a806e5d47">
-  <!ENTITY tepl-size          "168 KB">
-  <!ENTITY tepl-buildsize     "9.7 MB (with tests)">
-  <!ENTITY tepl-time          "0.3 SBU (with tests)">
-
-]>
-
-<sect1 id="tepl" xreflabel="tepl-&tepl-version;">
-  <?dbhtml filename="tepl.html"?>
-
-
-  <title>Tepl-&tepl-version;</title>
-
-  <indexterm zone="tepl">
-    <primary sortas="a-tepl">tepl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tepl</title>
-
-    <para>
-      The <application>Tepl</application> package contains a library that eases
-      the development of GtkSourceView-based text editors and IDEs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tepl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tepl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tepl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tepl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tepl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tepl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tepl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libgedit-amtk"/>,
-      <xref linkend="libgedit"/>, 
-      <xref linkend="libhandy1"/>, and
-      <xref linkend="uchardet"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation) and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tepl</title>
-
-    <para>
-      Install <application>Tepl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir tepl-build &amp;&amp;
-cd    tepl-build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            .. &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Disables building the API
-      documentation. Remove if you have <xref linkend="gtk-doc"/> installed
-      and wish to build the API documentation.
-    </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>
-          libtepl-6.so
-        </seg>
-        <seg>
-          /usr/include/tepl-6 and
-          /usr/share/gtk-doc/html/tepl-6.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtepl-6">
-        <term><filename class="libraryfile">libtepl-6.so</filename></term>
-        <listitem>
-          <para>
-            contains convenience functions for GtkSourceView4-based programs
-          </para>
-          <indexterm zone="tepl libtepl-6">
-            <primary sortas="c-libtepl-6">libtepl-6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: lib/vulkan-headers.xml
===================================================================
--- x/lib/vulkan-headers.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vulkan-headers-download-http "https://github.com/KhronosGroup/Vulkan-Headers/archive/v&vulkan-headers-version;/Vulkan-Headers-&vulkan-headers-version;.tar.gz">
-  <!ENTITY vulkan-headers-download-ftp  " ">
-  <!ENTITY vulkan-headers-md5sum        "8e440ad4f2befff383f1b363bedbd3fd">
-  <!ENTITY vulkan-headers-size          "2.2 MB">
-  <!ENTITY vulkan-headers-buildsize     "27 MB">
-  <!ENTITY vulkan-headers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="vulkan-headers" xreflabel="Vulkan-Headers-&vulkan-headers-version;">
-  <?dbhtml filename="vulkan-headers.html"?>
-
-  <title>Vulkan-Headers-&vulkan-headers-version;</title>
-
-  <indexterm zone="vulkan-headers">
-    <primary sortas="a-vulkan-headers">Vulkan-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vulkan-headers</title>
-
-    <para>
-      The <application>Vulkan-Headers</application> package contains a set of
-      header files necessary to build and link applications against the Vulkan
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vulkan-headers-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vulkan-headers-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vulkan-headers-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vulkan-headers-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vulkan-headers-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vulkan-headers-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vulkan-Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vulkan-Headers</title>
-
-    <para>
-      Install <application>Vulkan-Headers</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -G Ninja .. &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/vk_video,
-          /usr/include/vulkan,
-          /usr/share/cmake/VulkanHeaders, and
-          /usr/share/vulkan
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: lib/vulkan-loader.xml
===================================================================
--- x/lib/vulkan-loader.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vulkan-loader-download-http "https://github.com/KhronosGroup/Vulkan-Loader/archive/v&vulkan-loader-version;/Vulkan-Loader-&vulkan-loader-version;.tar.gz">
-  <!ENTITY vulkan-loader-download-ftp  " ">
-  <!ENTITY vulkan-loader-md5sum        "b33487f0426dbfffbdc0b2118e3b3e6c">
-  <!ENTITY vulkan-loader-size          "1.6 MB">
-  <!ENTITY vulkan-loader-buildsize     "9.7 MB">
-  <!ENTITY vulkan-loader-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="vulkan-loader" xreflabel="Vulkan-Loader-&vulkan-loader-version;">
-  <?dbhtml filename="vulkan-loader.html"?>
-
-  <title>Vulkan-Loader-&vulkan-loader-version;</title>
-
-  <indexterm zone="vulkan-loader">
-    <primary sortas="a-vulkan-loader">Vulkan-Loader</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vulkan-Loader</title>
-
-    <para>
-      The <application>Vulkan-Loader</application> package contains a library
-      which provides the Vulkan API and provides core support for graphics
-      drivers for Vulkan.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vulkan-loader-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vulkan-loader-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vulkan-loader-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vulkan-loader-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vulkan-loader-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vulkan-loader-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vulkan-loader Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="vulkan-headers"/>,
-      <xref linkend="wayland"/>, and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="runtime">
-      <xref linkend="mesa"/> (for Vulkan drivers)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vulkan-Loader</title>
-
-    <note>
-      <para>
-        If this package is being installed on a system where Mesa has already
-        been installed previously, please rebuild <xref linkend="mesa"/> after
-        this package to install Vulkan graphics drivers.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Vulkan-Loader</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        \
-      -DCMAKE_SKIP_RPATH=TRUE           \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-      <!-- To run the tests, we need to follow a complex process to download a
-      customized copy of googletest.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libvulkan.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/VulkanLoader
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvulkan">
-        <term><filename class="libraryfile">libvulkan.so</filename></term>
-        <listitem>
-          <para>
-            provides the Vulkan API and core support for graphics drivers
-          </para>
-          <indexterm zone="vulkan-loader libvulkan">
-            <primary sortas="c-libvulkan">libvulkan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,519 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
-  <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "b3a4504892162b30a774d3afde4707f7">
-  <!ENTITY webkitgtk-size          "35 MB">
-  <!ENTITY webkitgtk-buildsize     "1.2 GB (156 MB installed, add 151 MB for GTK-4)">
-  <!ENTITY webkitgtk-time          "25 SBU (for GTK-3, using parallelism=8, add 25 SBU for GTK-4)">
-
-  <!ENTITY libbacktrace
-    "<ulink url='https://github.com/ianlancetaylor/libbacktrace'>libbacktrace</ulink>">
-]>
-
-<sect1 id="webkitgtk" xreflabel="WebKitGTK-&webkitgtk-version;">
-  <?dbhtml filename="webkitgtk.html"?>
-
-
-  <title>WebKitGTK-&webkitgtk-version;</title>
-
-  <indexterm zone="webkitgtk">
-    <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
-      portable web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> and <application>GTK 4</application>
-      platforms.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libsoup3"/>,
-      <xref linkend="libtasn1"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unifdef"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bubblewrap"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue2"/>,
-      &gobject-introspection;,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="libavif"/>,
-      <xref linkend="libjxl"/>,
-      <xref linkend="libseccomp"/>, and
-      <xref linkend="xdg-dbus-proxy"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <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>,
-      &libbacktrace;, and
-      <!--<ulink url="https://github.com/libjxl/libjxl">libjxl</ulink>, and-->
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK</title>
-
-    <bridgehead renderas="sect3">Installation of
-    <application>WebKitGTK</application></bridgehead>
-
-    <important>
-      <para>
-        This package allows building with either GTK-3 or GTK-4, but not both
-        in the same build. The GTK-4 version is needed for packages such as
-        <xref linkend="epiphany"/>. Other packages, such as
-        <xref linkend="balsa"/> or <xref linkend="evolution"/>, require the
-        GTK-3 version. Both versions can be installed side by side on the
-        same system. We give build instructions for both cases below, but
-        the only difference is the setting of <command>-DUSE_GTK4</command>
-      </para>
-    </important>
-
-    <para>
-      If you want to install the GTK+-3 version of
-      <application>WebKitGTK</application>, run the following commands:
-    </para>
-
-<screen revision="systemd"><userinput>mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DENABLE_WEBDRIVER=OFF      \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=OFF              \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DENABLE_WEBDRIVER=OFF      \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=OFF              \
-      -DENABLE_JOURNALD_LOG=OFF   \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not have a working test suite. However, there is a
-      usable basic graphical web browser in the build directory,
-      <application>build/bin/MiniBrowser</application>. If launching it fails,
-      there is a problem with the build.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you want to install the GTK4 version of
-      <application>WebKitGTK</application>, run the following commands:
-    </para>
-
-<screen revision="systemd"><userinput>rm -rf * .[^.]* &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=ON               \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>rm -rf * .[^.]* &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=ON               \
-      -DENABLE_JOURNALD_LOG=OFF   \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      As the <option>-DENABLE_DOCUMENTATION=OFF</option> option is used,
-      the documentation is not rebuilt nor installed now.  If you need the
-      documentation, you can either install <xref linkend='gi-docgen'/>
-      and remove this option from the <command>cmake</command> command,
-      or install the pre-built documentation (only for the GTK-4 version)
-      instead:
-    </para>
-
-<screen role='root'><userinput>install -vdm755 /usr/share/gtk-doc/html &amp;&amp;
-cp -rv ../Documentation/* /usr/share/gtk-doc/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--    <para>
-      <command>sed ... TextCheckerEnchant.cpp</command>: This command
-      is needed to allow the build to complete with enchant-2.x.
-    </para> -->
-
-    <para>
-      <parameter>-DUSE_LIBBACKTRACE=OFF</parameter>: This switch disables
-      the use of libbacktrace for dumping a stack trace when a crash
-      happens.  You need to install &libbacktrace; if you wish to enable it
-      (replacing OFF with ON or just removing the switch).
-    </para>
-
-    <para>
-      <parameter>-DUSE_LIBHYPHEN=OFF</parameter>: This switch disables the
-      default automatic hyphenation implementation. You need to install
-      <ulink
-      url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>
-      if you wish to enable it (replacing OFF with ON or just removing
-      the switch).
-    </para>
-
-    <para>
-      <parameter>-DENABLE_DOCUMENTATION=OFF</parameter>: This switch disables
-      regenerating the documentation. Remove this switch if you have
-      <xref linkend="gi-docgen"/>
-      installed and wish to regenerate the documentation.
-    </para>
-
-    <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.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_WEBDRIVER=OFF</parameter>: This switch disables
-      compiling and installing <command>WebKitWebDriver</command>.  We use
-      it for the GTK-3 build because the <command>WebKitWebDriver</command>
-      from the GTK-3 build will be overwritten by the GTK-4 build anyway.
-      Remove this option if you don't plan to build this package with
-      GTK-4.
-    </para>
-
-<!--
-    <para>
-      <parameter>-DUSE_JPEGXL=OFF</parameter>: This switch turns off support
-      for JPEG-XL images. Remove it if you have the optional package
-      <ulink url="https://github.com/libjxl/libjxl">libjxl</ulink> installed.
-    </para>
--->
-    <para>
-      <parameter>-DENABLE_BUBBLEWRAP_SANDBOX=ON</parameter>: This switch
-      enables the Bubblewrap sandbox, which helps mitigate the impact of most
-      security vulnerabilities in this package. Change this switch to OFF if
-      you do not want to install <xref linkend="bubblewrap" role="nodep"/>,
-      <xref linkend='libseccomp' role="nodep"/>, or
-      <xref linkend="xdg-dbus-proxy" role="nodep"/>, but note that this may
-      put you at risk.
-      <!-- Note: This works well on both i686 and x86_64. -renodr -->
-    </para>
-
-    <para revision="sysv">
-      <parameter>-DENABLE_JOURNALD_LOG=OFF</parameter>: This switch disables using the
-      systemd journal for logging errors and debugging information since it
-      is not available on SysV systems.
-    </para>
-
-    <para>
-      <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
-      against the system installed <application>malloc</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_GEOLOCATION=OFF</option>: Use this switch if you don't
-      want to install <xref linkend="geoclue2"/>.
-    </para>
-
-    <para>
-      <option>-DUSE_AVIF=OFF</option>: Use this switch if you don't want to
-      install <xref linkend="libavif"/>. Note that you will not have support
-      for AVIF images if you do this.
-    </para>
-
-    <para>
-      <option>-DUSE_WOFF2=ON</option>: Use this switch if the optional
-      package <xref linkend="woff2"/> is installed. This adds additional
-      support for fonts.
-    </para>
-
-    <para>
-      <option>-DUSE_JPEGXL=OFF</option>: Use this switch if the recommended
-      package <xref linkend="libjxl"/> is not installed. Note that you will not
-      have support for JPEG XL images if this option is passed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-<!-- Moved to /usr/libexec/webkit2gtk-4.0, so shouldn't appear here
-          jsc,
-          MiniBrowser, and -->
-          WebKitWebDriver
-        </seg>
-        <seg>
-          libjavascriptcoregtk-4.1.so,
-          libjavascriptcoregtk-6.0.so,
-          libwebkit2gtk-4.1.so, and
-          libwebkitgtk-6.0.so
-        </seg>
-        <seg>
-          /usr/include/webkitgtk-4.1,
-          /usr/include/webkitgtk-6.0,
-          /usr/lib{,exec}/webkit2gtk-4.1,
-          /usr/lib{,exec}/webkitgtk-6.0,
-          /usr/share/gtk-doc/html/{jsc-glib,webkit2gtk{,-web-extension}}-4.1
-          (optional), and
-          /usr/share/gtk-doc/html/{jsc-glib,webkit2gtk{,-web-process-extension}}-6.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--
-      <varlistentry id="jsc">
-        <term><command>jsc</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk jsc">
-            <primary sortas="b-jsc">jsc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="MiniBrowser">
-        <term><command>MiniBrowser</command></term>
-        <listitem>
-          <para>
-            is a very simple graphical browser.
-          </para>
-          <indexterm zone="webkitgtk MiniBrowser">
-            <primary sortas="b-MiniBrowser">MiniBrowser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="WebKitWebDriver">
-        <term><command>WebKitWebDriver</command></term>
-        <listitem>
-          <para>
-            allows debugging and automation of web pages and browsers
-          </para>
-          <indexterm zone="webkitgtk WebKitWebDriver">
-            <primary sortas="b-WebKitWebDriver">WebKitWebDriver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-4.1">
-        <term>
-          <filename class="libraryfile">libjavascriptcoregtk-4.1.so</filename>
-        </term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc</command> and
-            <filename class="libraryfile">libwebkit2gtk-4.1</filename>
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-4.1">
-            <primary sortas="c-libjavascriptcoregtk-4.1">libjavascriptcoregtk-4.1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-6.0">
-        <term><filename class="libraryfile">libjavascriptcoregtk-6.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc</command> and
-            <filename class="libraryfile">libwebkitgtk-6.0</filename>
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-6.0">
-            <primary sortas="c-libjavascriptcoregtk-6.0">libjavascriptcoregtk-6.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-4">
-        <term><filename class="libraryfile">libwebkit2gtk-4.1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions
-          </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-4">
-            <primary sortas="c-libwebkit2gtk-4">libwebkit2gtk-4.1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-6">
-        <term><filename class="libraryfile">libwebkitgtk-6.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit</application> API functions for
-            GTK-4 applications
-          </para>
-          <indexterm zone="webkitgtk libwebkitgtk-6">
-            <primary sortas="c-libwebkitgtk-6">libwebkitgtk-6.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/xdg-desktop-portal-gtk.xml
===================================================================
--- x/lib/xdg-desktop-portal-gtk.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-desktop-portal-gtk-download-http "https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/&xdg-desktop-portal-gtk-version;/xdg-desktop-portal-gtk-&xdg-desktop-portal-gtk-version;.tar.xz">
-  <!ENTITY xdg-desktop-portal-gtk-download-ftp  " ">
-  <!ENTITY xdg-desktop-portal-gtk-md5sum        "9c7836b1fe09bc914ea4c06b9c58231f">
-  <!ENTITY xdg-desktop-portal-gtk-size          "89 KB">
-  <!ENTITY xdg-desktop-portal-gtk-buildsize     "9.7 MB">
-  <!ENTITY xdg-desktop-portal-gtk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-desktop-portal-gtk" xreflabel="xdg-desktop-portal-gtk-&xdg-desktop-portal-gtk-version;">
-  <?dbhtml filename="xdg-desktop-portal-gtk.html"?>
-
-  <title>xdg-desktop-portal-gtk-&xdg-desktop-portal-gtk-version;</title>
-
-  <indexterm zone="xdg-desktop-portal-gtk">
-    <primary sortas="a-xdg-desktop-portal-gtk">xdg-desktop-portal-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-desktop-portal-gtk</title>
-
-    <para>
-      <application>xdg-desktop-portal-gtk</application> is a backend for
-      <application>xdg-desktop-portal</application>, that is using GTK and
-      various pieces of GNOME infrastructure.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-desktop-portal-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-desktop-portal-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-desktop-portal-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-desktop-portal-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-desktop-portal-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-desktop-portal-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-desktop-portal-gtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="xdg-desktop-portal"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnome-desktop"/> (for compiling more portal interfaces)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-desktop-portal-gtk</title>
-
-    <para>
-      Install <application>xdg-desktop-portal-gtk</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para revision="sysv">
-      Remove systemd files that are useless (as the &root; user):
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rvf /usr/lib/systemd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          one daemon in /usr/libexec
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xdg-desktop-portal (if no other
-          <application>xdg-desktop-portal</application> backend is installed)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: lib/xdg-desktop-portal.xml
===================================================================
--- x/lib/xdg-desktop-portal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,225 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-desktop-portal-download-http "https://github.com/flatpak/xdg-desktop-portal/releases/download/&xdg-desktop-portal-version;/xdg-desktop-portal-&xdg-desktop-portal-version;.tar.xz">
-  <!ENTITY xdg-desktop-portal-download-ftp  " ">
-  <!ENTITY xdg-desktop-portal-md5sum        "20e0b28c1528e57b13cc236ba7840e03">
-  <!ENTITY xdg-desktop-portal-size          "683 KB">
-  <!ENTITY xdg-desktop-portal-buildsize     "51 MB (with tests)">
-  <!ENTITY xdg-desktop-portal-time          "0.1 SBU (add 0.4 SBU for tests; with parallelism=4)">
-]>
-
-<sect1 id="xdg-desktop-portal" xreflabel="xdg-desktop-portal-&xdg-desktop-portal-version;">
-  <?dbhtml filename="xdg-desktop-portal.html"?>
-
-  <title>xdg-desktop-portal-&xdg-desktop-portal-version;</title>
-
-  <indexterm zone="xdg-desktop-portal">
-    <primary sortas="a-xdg-desktop-portal">xdg-desktop-portal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-desktop-portal</title>
-
-    <para>
-      <application>xdg-desktop-portal</application> is a D-Bus service that
-      allows applications to interact with the desktop in a safe way. Several
-      aspects of desktop interaction, like file chooser, desktop style, etc
-      are implemented in different D-Bus APIs, known as
-      <emphasis>portals</emphasis>. Sandboxed
-      applications benefit the most from this service since they don't need
-      special permissions to use the portal APIs, but any application can use
-      it. <application>xdg-desktop-portal</application> safeguards many
-      resources and features with a user-controlled permission system. This
-      service needs a backend implementing desktop-specific portal interfaces.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-desktop-portal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-desktop-portal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-desktop-portal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-desktop-portal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-desktop-portal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-desktop-portal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-desktop-portal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fuse3"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="pipewire"/>, and
-      <xref role="runtime" linkend="dbus"/> (at runtime).
-      Furthermore, a backend is needed at runtime for this package to be of
-      any use, either
-      <xref role="runtime" linkend="xdg-desktop-portal-gtk"/> or
-      <xref role="nodep" linkend="xdg-desktop-portal-gnome"/> or
-      <xref role="nodep" linkend="xdg-desktop-portal-lxqt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bubblewrap"/> and
-      <xref linkend="docutils"/> (for building the manual pages)
-    </para>
-
-    <note>
-      <para>
-        Although there is an option to build the package
-        without <application>bubblewrap</application>, upstream
-        developers and LFS editors alike highly recommend to not
-        use this possibility, that would create a big security
-        hole.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="geoclue2"/> (for the <quote>location</quote> portal), and
-      <xref linkend="pytest"/> with
-      <xref linkend="libportal"/> and
-      <xref linkend="python-dbusmock"/> (for running tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for building
-      the documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx"/> with
-      <ulink url="https://pypi.org/project/sphinxext-opengraph/">sphinxext.opengraph</ulink>,
-      <ulink url="https://pypi.org/project/sphinx-copybutton/">sphinx_copybutton</ulink>,
-      <ulink url="https://pypi.org/project/furo/">furo</ulink>, and
-      <ulink url="https://github.com/flatpak/flatpak">flatpak</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-desktop-portal</title>
-
-    <para>
-      Install <application>xdg-desktop-portal</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have installed the needed dependencies, you can test the results
-      by running <command>ninja test</command>.<phrase revision="systemd">
-      Six tests are known to fail if you are not using
-      <xref linkend="gnome-terminal"/> and are in GNOME.</phrase>
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para revision="sysv">
-      Remove systemd files that are useless (as the &root; user):
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rvf /usr/lib/systemd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xdg-desktop-portal</title>
-
-    <sect3 id="xdg-desktop-portal-config">
-      <title>Config Files</title>
-      <para>
-        The main configuration files are
-        <filename>~/.config/xdg-desktop-portal/portals.conf</filename>,
-        <filename>/etc/xdg-desktop-portal/portals.conf</filename>, and
-        <filename>/usr/share/xdg-desktop-portal/portals.conf</filename>.
-        Several other locations can be searched for configuration files. See
-        <ulink role='man' url='&man;portals.conf.5'>portals.conf(5)</ulink>.
-      </para>
-
-      <indexterm zone="xdg-desktop-portal xdg-desktop-portal-config">
-        <primary sortas="e-AA.config-xdg-desktop-portal-portals.conf">~/.config/xdg-desktop-portal/portals.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-desktop-portal xdg-desktop-portal-config">
-        <primary
-        sortas="e-etc-xdg-desktop-portal-portals.conf">/etc/xdg-desktop-portal/portals.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-desktop-portal xdg-desktop-portal-config">
-        <primary
-        sortas="e-usr-share-xdg-desktop-portal-portals.conf">/usr/share/xdg-desktop-portal/portals.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The various configuration files are used to choose the backend
-        depending of various conditions. See
-        <ulink role='man' url='&man;portals.conf.5'>portals.conf(5)</ulink>
-        for details.
-      </para>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <seglistitem>
-        <seg>
-          several daemons in /usr/libexec
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: x/wm/enlightenment.xml
===================================================================
--- x/wm/enlightenment.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/wm/enlightenment.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="enlightenment" xreflabel="enlightenment">
+<?dbhtml filename="enlightenment.html" dir="x"?>
+<title>enlightenment</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: x/wm/enlightenment/enlightenment.ent
===================================================================
--- x/wm/enlightenment/enlightenment.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/wm/enlightenment/enlightenment.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY enlightenment SYSTEM "../enlightenment.xml">
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/wm/fluxbox.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,376 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="fluxbox" xreflabel="fluxbox">
+<?dbhtml filename="fluxbox.html" dir="x"?>
+<title>fluxbox</title>
 
-  <!ENTITY fluxbox-download-http "&sourceforge-dl;/fluxbox/fluxbox-&fluxbox-version;.tar.xz">
-  <!ENTITY fluxbox-download-ftp  " ">
-  <!ENTITY fluxbox-md5sum        "b44afd10ee1e64624c23115aa51dcd55">
-  <!ENTITY fluxbox-size          "772 KB">
-  <!ENTITY fluxbox-buildsize     "101 MB">
-  <!ENTITY fluxbox-time          "0.9 SBU">
-]>
-
-<sect1 id="fluxbox" xreflabel="Fluxbox-&fluxbox-version;">
-  <?dbhtml filename="fluxbox.html" ?>
-
-
-  <title>Fluxbox-&fluxbox-version;</title>
-
-  <indexterm zone="fluxbox">
-    <primary sortas="a-Fluxbox">Fluxbox</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fluxbox</title>
-
-    <para>
-      The <application>Fluxbox</application> package contains a window
-      manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fluxbox-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fluxbox-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fluxbox-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fluxbox-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fluxbox-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fluxbox-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Fluxbox Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="dbus"/> (runtime),
-      <xref linkend="fribidi"/>, and
-      <xref linkend="imlib2"/> (if you wish to use other image formats in
-      addition to XPM)
-    </para>
-
-   </sect2>
-
-  <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>
-      Install <application>Fluxbox</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working 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="configuration">
-    <title>Configuring Fluxbox</title>
-
-    <sect3 id="fluxbox-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.fluxbox/init</filename>,
-        <filename>~/.fluxbox/keys</filename>, and
-        <filename>~/.fluxbox/menu</filename>
-      </para>
-
-      <indexterm zone="fluxbox fluxbox-config">
-        <primary sortas="e-AA.fluxbox-init">~/.fluxbox/init</primary>
-      </indexterm>
-
-      <indexterm zone="fluxbox fluxbox-config">
-        <primary sortas="e-AA.fluxbox-keys">~/.fluxbox/keys</primary>
-      </indexterm>
-
-      <indexterm zone="fluxbox fluxbox-config">
-        <primary sortas="e-AA.fluxbox-menu">~/.fluxbox/menu</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        If <application>Fluxbox</application> is the only Window Manager
-        you want to use, you can start it with an <filename>.xinitrc</filename>
-        file in your home folder. Be sure to backup your
-        current <filename>.xinitrc</filename> before proceeding.
-      </para>
-
-      <indexterm zone="fluxbox fluxbox-config">
-        <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-      </indexterm>
-
-<screen><userinput>echo startfluxbox &gt; ~/.xinitrc</userinput></screen>
-
-      <para>
-        Or alternatively, if you use a login manager like
-        <xref linkend="gdm"/> or <xref linkend="lightdm"/>,
-        and would like to be able to choose <application>Fluxbox</application>
-        at the login prompt, create a <filename>fluxbox.desktop</filename>
-        file. As <systemitem class="username">root</systemitem>:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/xsessions &amp;&amp;
-cat &gt; /usr/share/xsessions/fluxbox.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=Fluxbox
-Comment=This session logs you into Fluxbox
-Exec=startfluxbox
-Type=Application</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you didn't install <xref linkend="gdm"/> or <xref
-        linkend="lightdm"/> in <filename class='directory'>/usr</filename>,
-        then change that command to fit the prefix you chose.
-      </para>
-
-      <para>
-        Now create the <application>Fluxbox</application> configuration files:
-      </para>
-
-<screen><userinput>mkdir -v ~/.fluxbox &amp;&amp;
-cp -v /usr/share/fluxbox/init ~/.fluxbox/init &amp;&amp;
-cp -v /usr/share/fluxbox/keys ~/.fluxbox/keys</userinput></screen>
-
-      <para>
-        To generate the application menu, first you may wish to run
-        <command>fluxbox-generate_menu -h</command>, in order to choose any
-        <replaceable>&lt;user_options&gt;</replaceable>, then issue:
-      </para>
-
-<screen role="nodump"><userinput>cd ~/.fluxbox &amp;&amp;
-fluxbox-generate_menu <replaceable>&lt;user_options&gt;</replaceable></userinput></screen>
-
-      <para>
-        Alternately, copy a pregenerated menu:
-      </para>
-
-<screen><userinput>cp -v /usr/share/fluxbox/menu ~/.fluxbox/menu</userinput></screen>
-
-      <para>
-        Menu items are added by editing <filename>~/.fluxbox/menu</filename>.
-        The syntax is explained on the <command>fluxbox</command> man page.
-      </para>
-
-      <para>
-        If you want to use an image as your desktop background, copy the
-        theme you like into <filename class='directory'>~/.fluxbox</filename>.
-        Then add a line to make it use the correct image. In the following
-        command, change <replaceable>&lt;theme&gt;</replaceable> for the name
-        of the theme you want and change
-        <replaceable>&lt;/path/to/nice/image.ext&gt;</replaceable> to point to
-        the actual image you want to use, where <replaceable>ext</replaceable>
-        must be <quote>xpm</quote>, if <xref linkend="imlib2"/> is not installed
-        to allow other image formats.
-      </para>
-
-<screen role="nodump"><userinput>cp -r /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
-
-sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' ~/.fluxbox/init &amp;&amp;
-
-[ -f ~/.fluxbox/theme ] &amp;&amp;
-echo "background.pixmap: &lt;/path/to/nice/image.ext&gt;" >> ~/.fluxbox/theme ||
-[ -d ~/.fluxbox/theme ] &amp;&amp;
-echo "background.pixmap: &lt;/path/to/nice/image.ext&gt;" >> ~/.fluxbox/theme/theme.cfg</userinput></screen>
-
-      <para>
-        In some locales the font specified in the theme may not contain the
-        needed characters. This results in menus with blank items. You can fix
-        this by editing <filename>~/.fluxbox/theme</filename> with a text
-        editor and altering it so that it names a suitable font.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>fluxbox, fbsetbg, fbsetroot, fluxbox-generate_menu, startfluxbox,
-        fbrun, fluxbox-remote, and fluxbox-update_configs</seg>
-        <seg>None</seg>
-        <seg>/usr/share/fluxbox and ~/.fluxbox</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fluxbox-prog">
-        <term><command>fluxbox</command></term>
-        <listitem>
-          <para>
-            is a window manager for <application>X11</application> based
-            on <application>Blackbox</application> 0.61.0
-          </para>
-          <indexterm zone="fluxbox fluxbox-prog">
-            <primary sortas="b-fluxbox">fluxbox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fbsetbg">
-        <term><command>fbsetbg</command></term>
-        <listitem>
-          <para>
-            is a utility that sets the background image. It requires one
-            of the following at runtime:
-            <command>Esetroot</command>, <command>wmsetbg</command>,
-            <xref linkend="feh-prog"/>, <command>hsetroot</command>,
-            <command>chbg</command>, <xref linkend="display"/>,
-            <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
-          </para>
-          <indexterm zone="fluxbox fbsetbg">
-            <primary sortas="b-fbsetbg">fbsetbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fbsetroot">
-        <term><command>fbsetroot</command></term>
-        <listitem>
-          <para>
-            is a utility to change root window appearance based on the
-            <application>Blackbox</application> application bsetroot
-          </para>
-          <indexterm zone="fluxbox fbsetroot">
-            <primary sortas="b-fbsetroot">fbsetroot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fluxbox-generate_menu">
-        <term><command>fluxbox-generate_menu</command></term>
-        <listitem>
-          <para>
-            is a utility that generates a menu by scanning your
-            <envar>PATH</envar>
-          </para>
-          <indexterm zone="fluxbox fluxbox-generate_menu">
-            <primary sortas="b-fluxbox-generate_menu">fluxbox-generate_menu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="startfluxbox">
-        <term><command>startfluxbox</command></term>
-        <listitem>
-          <para>
-            is a session startup script that allows for command
-            executions prior to <command>fluxbox</command> starting
-          </para>
-          <indexterm zone="fluxbox startfluxbox">
-            <primary sortas="b-startfluxbox">startfluxbox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fbrun">
-        <term><command>fbrun</command></term>
-        <listitem>
-          <para>
-            displays a run dialog window
-          </para>
-          <indexterm zone="fluxbox fbrun">
-            <primary sortas="b-fbrun">fbrun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fluxbox-remote">
-        <term><command>fluxbox-remote</command></term>
-        <listitem>
-          <para>
-            provides command line access to key commands for
-            <application>Fluxbox</application>
-          </para>
-          <indexterm zone="fluxbox fluxbox-remote">
-            <primary sortas="b-fluxbox-remote">fluxbox-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="fluxbox-update_configs">
-        <term><command>fluxbox-update_configs</command></term>
-        <listitem>
-          <para>
-            use to manage config files (reload, update, test)
-          </para>
-          <indexterm zone="fluxbox fluxbox-update_configs">
-            <primary sortas="b-fluxbox-update_configs">fluxbox-update_configs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: x/wm/fluxbox/fluxbox.ent
===================================================================
--- x/wm/fluxbox/fluxbox.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/wm/fluxbox/fluxbox.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY fluxbox SYSTEM "../fluxbox.xml">
Index: wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,530 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 icewm-download-http "https://github.com/ice-wm/icewm/archive/&icewm-version;/icewm-&icewm-version;.tar.gz">
-  <!ENTITY icewm-download-ftp  " ">
-  <!ENTITY icewm-md5sum        "5d9d5f9225b9a98fd9409b5463f0cd64">
-  <!ENTITY icewm-size          "2.4 MB">
-  <!ENTITY icewm-buildsize     "47 MB">
-  <!ENTITY icewm-time          "0.4 SBU">
-]>
-
-<sect1 id="icewm" xreflabel="IceWM-&icewm-version;">
-  <?dbhtml filename="icewm.html" ?>
-
-
-  <title>IceWM-&icewm-version;</title>
-
-  <indexterm zone="icewm">
-    <primary sortas="a-icewm">icewm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IceWM</title>
-
-    <para>
-      <application>IceWM</application> is a window manager with the goals of
-      speed, simplicity, and not getting in the user&apos;s way.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&icewm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&icewm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &icewm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &icewm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &icewm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &icewm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">IceWM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="imlib2"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <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="librsvg"/>,
-      <xref linkend="libao"/>,
-      <xref linkend="libsndfile"/>,
-      <xref linkend="alsa-lib"/> (for the experimental icesound program),
-      and <ulink url='https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib'>
-        gdk-pixbuf-xlib</ulink>
-    </para>
-
-   </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IceWM</title>
-<!--
-    <note>
-      <para>
-        The tarball is compressed with <command>lzip</command>, and cannot be
-        processed with the <command>tar</command> program. It can be unpacked
-        with the <command>bsdtar</command> program from the libarchive
-        package.
-      </para>
-    </note>
--->
-    <para>
-      Install <application>IceWM</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  \
-      -DCFGDIR=/etc               \
-      -DENABLE_LTO=ON             \
-      -DDOCDIR=/usr/share/doc/icewm-&icewm-version;  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-<!--
-<screen role="root"><userinput>cp ../lib/IceWM.jpg lib &amp;&amp;
-make install         &amp;&amp;
-rm /usr/share/xsessions/icewm.desktop</userinput></screen>
--->
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      This package creates two <filename>.desktop</filename> files in the
-      <filename class="directory">/usr/share/xsessions/</filename> directory.
-      Both are not needed in a BLFS system, so prevent the extra file showing
-      up as an option in a display manager.  As the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -v /usr/share/xsessions/icewm.desktop</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DENABLE_LTO=ON</parameter>: This option enables Link
-      Time Optimization and is required for this package.
-    </para>
-<!--
-    <para>
-      <command>rm /usr/share/xsessions/icewm.desktop</command>: The package
-      ships with both icewm.desktop and icewm-xsession.desktop. The former has
-      apparently been used in the past, but it will hang if used with a modern
-      desktop-manager<phrase revision='sysv'> such as
-      <xref linkend="lightdm"/></phrase>.
-    </para>
-
-    <para>
-      <command>cp ../lib/IceWM.jpg lib</command>: This instruction fixes an
-      install problem.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring IceWM</title>
-
-    <sect3 id="icewm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.icewm/keys</filename>,
-        <filename>~/.icewm/menu</filename>, and
-        <filename>~/.icewm/preferences</filename>, and
-        <filename>~/.icewm/toolbar</filename>, and
-        <filename>~/.icewm/winoptions</filename>. The default versions are
-        installed in <filename class="directory">/usr/share/icewm/</filename>
-        and will be used if you have not copied them to <filename
-        class="directory">~/.icewm</filename>.
-      </para>
-
-
-      <indexterm zone="icewm icewm-config">
-        <primary sortas="e-AA.icewm-keys">~/.icewm/keys</primary>
-      </indexterm>
-
-      <indexterm zone="icewm icewm-config">
-        <primary sortas="e-AA.icewm-menu">~/.icewm/menu</primary>
-      </indexterm>
-
-      <indexterm zone="icewm icewm-config">
-        <primary sortas="e-AA.icewm-preferences">~/.icewm/preferences</primary>
-      </indexterm>
-
-      <indexterm zone="icewm icewm-config">
-        <primary sortas="e-AA.icewm-toolbar">~/.icewm/toolbar</primary>
-      </indexterm>
-
-      <indexterm zone="icewm icewm-config">
-        <primary sortas="e-AA.icewm-winoptions">~/.icewm/winoptions</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        If <application>IceWM</application> is the only Window Manager you
-        want to use, you can start it with an <filename>.xinitrc</filename> file
-        in your home folder. Be sure to backup your current
-        <filename>.xinitrc</filename> before proceeding.
-      </para>
-
-      <indexterm zone="icewm icewm-config">
-        <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-      </indexterm>
-
-<screen><userinput>echo icewm-session &gt; ~/.xinitrc</userinput></screen>
-
-      <para>
-        Now create the <application>IceWM</application> configuration files:
-      </para>
-
-<screen><userinput>mkdir -pv ~/.icewm                                      &amp;&amp;
-cp -v /usr/share/icewm/keys ~/.icewm/keys               &amp;&amp;
-cp -v /usr/share/icewm/menu ~/.icewm/menu               &amp;&amp;
-cp -v /usr/share/icewm/preferences ~/.icewm/preferences &amp;&amp;
-cp -v /usr/share/icewm/toolbar ~/.icewm/toolbar         &amp;&amp;
-cp -v /usr/share/icewm/winoptions ~/.icewm/winoptions</userinput></screen>
-
-      <para>
-        You can now edit these files to meet your requirements. In particular,
-        review the <filename>preferences</filename> file. You can use
-        <command>Logout -> Restart-IceWM</command> on the main menu to load
-        your changed preferences, but changes to the background only take
-        effect when <application>IceWM</application> is started.
-      </para>
-
-      <para>
-        At this point you can <emphasis>either</emphasis> modify the
-        traditional menu files to suit your requirements,
-        <emphasis>or</emphasis> use the newer
-        <command>icewm-menu-fdo</command> described later.
-      </para>
-
-      <para>
-        The syntax of the menus is explained in the help files, which you can
-        access by running <command>help</command> from the menu, but some of
-        the detail is out of date and the default selections in the menus (a
-        few old applications on the main menu, everything else on the
-        <command>Programs</command> menu) will benefit from being updated to
-        meet your needs. The following examples are  provided to encourage you
-        to think about how you wish to organise your menus. Please note the
-        following:
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            If a program listed in the menu has not been installed, it will
-            not appear when the menu is displayed. Similarly, if the program
-            exists but the specified icon does not, no icon will be displayed
-            in the menu.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The icons can be either <filename>.xpm</filename> or
-            <filename>.png</filename> files, and there is no need to specify
-            the extension. If the icon is located in the &quot;library&quot;
-            (<filename class="directory">/usr/share/icewm/icons</filename>)
-            there is no need to specify the path.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Most programs are in sub-menus, and the main menu will always
-            append entries for
-            <literal>windows, help, settings, logout</literal>
-            at the bottom.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            An icon for <application>firefox</application> was copied to
-            the library directory and given a meaningful name. The icon for
-            <application>xine</application> is <filename>xine.xpm</filename>
-            which was installed to a pixmap directory.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The default toolbar is not altered.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        If you wish to use this traditional method, there are more examples in
-        previous releases of this book (e.g. BLFS-7.8).
-      </para>
-
-      <para>
-        <emphasis>Alternatively</emphasis>, you can create a menu which
-        conforms to the FDO Desktop Menu Specifications, where programs can be
-        found because they have a .desktop file in the XDG_DATA_HOME or
-        XDG_DATA_DIR directories.  Unlike most windowmanagers,
-        <application>icewm</application> does not search for programs when the
-        menu is invoked, so if you take this route you will need to rerun the
-        following command after installing or removing programs:
-      </para>
-
-<screen><userinput>icewm-menu-fdo >~/.icewm/menu</userinput></screen>
-
-      <para>
-        If you wish to put icons on your desktop, you will need to install a
-        program such as <xref linkend="rox-filer"/> which provides a pinboard.
-        If you do that you will no longer be able to access the menu by
-        right-clicking on the desktop, you will have to use the
-        <application>IceWM</application> button. To ensure that the
-        <application>rox</application> pinboard is running, the following
-        commands will put it in the startup file:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.icewm/startup &lt;&lt; "EOF"
-<literal>rox -p Default &amp;
-EOF &amp;&amp;
-chmod +x ~/.icewm/startup</literal></userinput></screen>
-
-     <tip>
-       <para>
-         There are a number of keyboard shortcuts in
-         <application>IceWM</application>:
-       </para>
-       <itemizedlist>
-         <listitem>
-           <para>
-             Ctrl + Alt + F<replaceable>N</replaceable> : go to
-             <filename>tty<replaceable>N</replaceable></filename>.
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-             Ctrl + Alt + <replaceable>N</replaceable> : go to desktop
-             number <replaceable>N</replaceable>
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-             Ctrl + Alt + Space : open a box on the taskbar where you can
-             key in the name of an application and run it.
-           </para>
-         </listitem>
-       </itemizedlist>
-     </tip>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>icehelp, icesh, icesound, icewm, icewm-menu-fdo, icewm-menu-xrandr,
-        icewm-session, icewm-set-gnomewm, icewmbg, and icewmhint
-        <!-- icewmtray--></seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/icewm-&icewm-version;, /usr/share/icewm and ~/.icewm</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="icehelp">
-        <term><command>icehelp</command></term>
-        <listitem>
-          <para>
-            is used to display the html manual
-          </para>
-          <indexterm zone="icewm icehelp">
-            <primary sortas="b-icehelp">icehelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icesh">
-        <term><command>icesh</command></term>
-        <listitem>
-          <para>
-            is a command-line window manager which can be used in
-            <filename>~/.icewm/startup</filename>
-          </para>
-          <indexterm zone="icewm icesh">
-            <primary sortas="b-icesh">icesh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icesound">
-        <term><command>icesound</command></term>
-        <listitem>
-          <para>
-            plays audio files on GUI events raised by IceWM
-          </para>
-          <indexterm zone="icewm icesound">
-            <primary sortas="b-icesound">icesound</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewm-prog">
-        <term><command>icewm</command></term>
-        <listitem>
-          <para>
-            is the window manager
-          </para>
-          <indexterm zone="icewm icewm-prog">
-            <primary sortas="b-icewm">icewm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewm-menu-fdo">
-        <term><command>icewm-menu-fdo</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="icewm icewm-menu-fdo">
-            <primary sortas="b-icewm-menu-fdo">icewm-menu-fdo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewm-menu-xrandr">
-        <term><command>icewm-menu-xrandr</command></term>
-        <listitem>
-          <para>
-            is a helper program used to manage multi-screen configurations
-          </para>
-          <indexterm zone="icewm icewm-menu-xrandr">
-            <primary sortas="b-icewm-menu-xrandr">icewm-menu-xrandr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewm-session">
-        <term><command>icewm-session</command></term>
-        <listitem>
-          <para>
-            runs icewmbg, icewm, icewmtray, startup, shutdown (i.e. startup
-            and shutdown scripts are run if installed)
-          </para>
-          <indexterm zone="icewm icewm-session">
-            <primary sortas="b-icewm-session">icewm-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewm-set-gnomewm">
-        <term><command>icewm-set-gnomewm</command></term>
-        <listitem>
-          <para>
-            is a script to set the <application>GNOME</application> window
-            manager to <application>icewm</application> using
-            <application>gconftool</application>
-          </para>
-          <indexterm zone="icewm icewm-set-gnomewm">
-            <primary sortas="b-icewm-set-gnomewm">icewm-set-gnomewm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewmbg">
-        <term><command>icewmbg</command></term>
-        <listitem>
-          <para>
-            is used to set the background, according to the various
-            <literal>DesktopBackground</literal> settings in the preferences
-          </para>
-          <indexterm zone="icewm icewmbg">
-            <primary sortas="b-icewmbg">icewmbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icewmhint">
-        <term><command>icewmhint</command></term>
-        <listitem>
-          <para>
-            is used internally to provide hints to the user
-          </para>
-          <indexterm zone="icewm icewmhint">
-            <primary sortas="b-icewmhint">icewmhint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="icewmtray">
-        <term><command>icewmtray</command></term>
-        <listitem>
-          <para>
-            provides the tray
-          </para>
-          <indexterm zone="icewm icewmtray">
-            <primary sortas="b-icewmtray">icewmtray</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,455 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 openbox-download-http
-  "http://openbox.org/dist/openbox/openbox-&openbox-version;.tar.gz">
-  <!ENTITY openbox-download-ftp  " ">
-  <!ENTITY openbox-md5sum        "b72794996c6a3ad94634727b95f9d204">
-  <!ENTITY openbox-size          "944 KB">
-  <!ENTITY openbox-buildsize     "21 MB">
-  <!ENTITY openbox-time          "0.3 SBU">
-]>
-
-<sect1 id="openbox" xreflabel="openbox-&openbox-version;">
-  <?dbhtml filename="openbox.html"?>
-
-
-  <title>openbox-&openbox-version;</title>
-
-  <indexterm zone="openbox">
-    <primary sortas="a-openbox">Openbox</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to openbox</title>
-
-    <para>
-      <application>Openbox</application> is a highly configurable desktop
-      window manager with extensive standards support. It allows you to control
-      almost every aspect of how you interact with your desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openbox-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openbox-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openbox-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openbox-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openbox-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Openbox Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="x-window-system"/> and
-      <xref linkend="pango"/> (compiled with support for libXft)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="dbus"/> (runtime),
-      <xref linkend="imlib2"/> (to enable icons in the right click menu),
-      <xref linkend="imagemagick"/> (to show desktop backgrounds as seen in the
-      Configuration Information section below),
-      <xref linkend="pyxdg"/>, <!-- used for openbox-xdg-autostart -->
-      <xref linkend="startup-notification"/>, and
-      <xref linkend="librsvg"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Openbox</title>
-
-    <note>
-      <para>
-        If XORG_PREFIX is not <filename class='directory'>/usr</filename>,
-        tell <command>gcc</command> about it:
-      </para>
-
-<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
-
-    </note>
-
-    <para>
-      If you only installed the Python 3 PyXDG module convert one of the
-      scripts to Python 3:
-    </para>
-
-<screen><userinput>2to3-&python3-majorver; -w data/autostart/openbox-xdg-autostart &amp;&amp;
-sed 's/python/python3/' -i data/autostart/openbox-xdg-autostart</userinput></screen>
-
-    <para>
-      Install <application>Openbox</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  \
-            --docdir=/usr/share/doc/openbox-&openbox-version; &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>
-
-    <para>
-      This package creates three <filename>.desktop</filename> files in the
-      <filename class="directory">/usr/share/xsessions/</filename> directory.
-      Two of these are not appropriate in a BLFS system, so prevent the extra
-      files showing up as options in a display manager.  As the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -v /usr/share/xsessions/openbox-{gnome,kde}.desktop</userinput></screen>
-
-</sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This option puts
-      <application>Openbox</application>'s configuration files in
-      /etc/xdg/openbox instead of /usr/etc/xdg/openbox.
-    </para>
-
-    <para>
-      <parameter>--docdir=/usr/share/doc/openbox-&openbox-version;</parameter>:
-      this puts a few files in a versioned directory in
-      <filename class="directory">/usr/share/doc</filename>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Openbox</title>
-
-    <sect3 id="openbox-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xdg/openbox/autostart</filename>,
-        <filename>/etc/xdg/openbox/menu.xml</filename>,
-        <filename>/etc/xdg/openbox/rc.xml</filename>,
-        <filename>~/.config/openbox/autostart</filename>,
-        <filename>~/.config/openbox/menu.xml</filename> and
-        <filename>~/.config/openbox/rc.xml</filename>
-      </para>
-
-      <indexterm zone="openbox openbox-config">
-        <primary sortas="e-AA.autostart">~/.config/openbox/autostart</primary>
-      </indexterm>
-
-      <indexterm zone="openbox openbox-config">
-        <primary sortas="e-AA.menu">~/.config/openbox/menu.xml</primary>
-      </indexterm>
-
-      <indexterm zone="openbox openbox-config">
-        <primary sortas="e-AA.rc">~/.config/openbox/rc.xml</primary>
-      </indexterm>
-
-      <indexterm zone="openbox openbox-config">
-        <primary sortas="e-etc-path-autostart">/etc/xdg/openbox/autostart</primary>
-      </indexterm>
-
-      <indexterm zone="openbox openbox-config">
-        <primary sortas="e-etc-path-menu">/etc/xdg/openbox/menu.xml</primary>
-      </indexterm>
-
-      <indexterm zone="openbox openbox-config">
-        <primary sortas="e-etc-path-rc">/etc/xdg/openbox/rc.xml</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>Openbox</application>'s right click menu can be used to
-        launch programs. The menu itself is configured with 2 files,
-        <filename>/etc/xdg/openbox/menu.xml</filename> and
-        <filename>~/.config/openbox/menu.xml</filename>. To make changes to the
-        menu, copy /etc/xdg/openbox/menu.xml to ~/.config/openbox/menu.xml and
-        edit it:
-      </para>
-
-<screen><userinput>cp -rf /etc/xdg/openbox ~/.config</userinput></screen>
-      <para>
-
-        <filename>~/.config/openbox/menu.xml</filename> can be edited with a
-        text editor or you can install
-        <ulink url="https://obmenu.sourceforge.net/">Obmenu</ulink> (requires
-        <ulink url="https://pyxml.sourceforge.net/topics/">pyxml</ulink>
-        and <xref linkend="pygtk"/>).
-      </para>
-
-      <para>
-        To have icons in your right click menu requires installing
-        <xref linkend="imlib2"/> before you install
-        <application>Openbox</application>. To set an icon for an entry in the
-        menu edit <filename>~/.config/openbox/menu.xml</filename> and add an
-        icon to the  &lt;item&gt; tag like this:
-      </para>
-
-<screen>&lt;item label="Mplayer" icon="/usr/share/pixmaps/mplayer.png"&gt;</screen>
-
-      <para>
-        Many other aspects of <application>Openbox</application>'s behavior are
-        configured with <filename>~/.config/openbox/rc.xml</filename> such as
-        what keybindings are used to launch programs or which mouse button
-        launches the main menu.
-      </para>
-
-      <para>
-        Details of the theme that <application>Openbox</application> applies to
-        window decorations are configured in
-        <filename>~/.config/openbox/rc.xml</filename>. You can get a list of the
-        available themes with the command:
-      </para>
-
-<screen role="nodump"><userinput>ls -d /usr/share/themes/*/openbox-3 | sed 's#.*es/##;s#/o.*##'</userinput></screen>
-    </sect3>
-
-    <sect3  id="openbox-init">
-      <title>Starting Openbox</title>
-
-      <para>
-        To automatically start <command>openbox</command> when you start
-        <application>Xorg</application>:
-      </para>
-
-<screen><userinput>echo openbox &gt; ~/.xinitrc</userinput></screen>
-
-      <para>
-        If you want to set a background image to your desktop you can use
-        <xref linkend="display"/> and launch it from ~/.xinitrc just before
-        openbox:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>display -backdrop -window root /path/to/beautiful/picture.jpeg
-exec openbox</literal>
-EOF</userinput></screen>
-
-      <para>
-        Or if you like a bit of variety, put a selection of images in a folder
-        (in this example, the directory ~/.config/backgrounds) and choose one at
-        random each time you <command>xinit</command>:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># make an array which lists the pictures:
-picture_list=(~/.config/backgrounds/*)
-# create a random integer between 0 and the number of pictures:
-random_number=$(( ${RANDOM} % ${#picture_list[@]} ))
-# display the chosen picture:
-display -backdrop -window root "${picture_list[${random_number}]}"
-exec openbox</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you like to have the numlock key set when you start Xorg, install
-        <!-- 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">
-        Numlockx</ulink> and add that to your xinitrc. Another useful
-        application is <xref linkend="dbus"/>:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>. /etc/profile
-picture_list=(~/.config/backgrounds/*)
-random_number=$(( ${RANDOM} % ${#picture_list[*]} ))
-display -backdrop -window root "${picture_list[${random_number}]}"
-numlockx
-eval $(dbus-launch --auto-syntax --exit-with-session)
-lxpanel &amp;
-exec openbox</literal>
-EOF</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>
-          gdm-control, gnome-panel-control, obxprop, openbox,
-          openbox-gnome-session, openbox-kde-session and openbox-session
-        </seg>
-        <seg>
-          libobrender.so and libobt.so
-        </seg>
-        <seg>
-          /etc/xdg/openbox, /usr/include/openbox,
-          /usr/share/doc/openbox-&openbox-version; and /usr/share/themes.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdm-control">
-        <term><command>gdm-control</command></term>
-        <listitem>
-          <para>
-            is a command line tool to send signals to
-            <application>GDM</application>
-          </para>
-          <indexterm zone="openbox gdm-control">
-            <primary sortas="b-gdm-control">gdm-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-panel-control">
-        <term><command>gnome-panel-control</command></term>
-        <listitem>
-          <para>
-            is a command line utility to invoke the <application>Gnome
-            Panel</application> run dialog/menu
-          </para>
-          <indexterm zone="openbox gnome-panel-control">
-            <primary sortas="b-gnome-panel-control">gnome-panel-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="obxprop">
-        <term><command>obxprop</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="openbox obxprop">
-            <primary sortas="b-obxprop">obxprop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openbox-prog">
-        <term><command>openbox</command></term>
-        <listitem>
-          <para>
-            is a standards compliant, highly configurable, window manager
-          </para>
-          <indexterm zone="openbox openbox">
-            <primary sortas="b-openbox">openbox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openbox-gnome-session">
-        <term><command>openbox-gnome-session</command></term>
-        <listitem>
-          <para>
-            is a script to launch an <application>Gnome</application> session
-            with <application>Openbox</application> as your window manager from
-            your <filename>~/.xinitrc</filename>
-          </para>
-          <indexterm zone="openbox openbox-gnome-session">
-            <primary sortas="b-openbox-gnome-session">openbox-gnome-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openbox-kde-session">
-        <term><command>openbox-kde-session</command></term>
-        <listitem>
-          <para>
-            is a script to launch an <application>KDE</application> session with
-            <application>Openbox</application> as your window manager from your
-            <filename>~/.xinitrc</filename>
-          </para>
-          <indexterm zone="openbox openbox-kde-session">
-            <primary sortas="b-openbox-kde-session">openbox-kde-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openbox-session">
-        <term><command>openbox-session</command></term>
-        <listitem>
-          <para>
-            is a script to launch an <application>Openbox</application> session
-            from your <filename>~/.xinitrc</filename>
-          </para>
-          <indexterm zone="openbox openbox-session">
-            <primary sortas="b-openbox-session">openbox-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libobrender">
-        <term><filename class="libraryfile">libobrender.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions used by <application>Openbox</application>
-            for theme rendering
-          </para>
-          <indexterm zone="openbox libobrender">
-            <primary sortas="c-libobrender">libobrender.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libobt">
-        <term><filename class="libraryfile">libobt.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Openbox</application> toolkit library
-          </para>
-          <indexterm zone="openbox libobt">
-            <primary sortas="c-libobt">libobt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/wm/sawfish.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="sawfish" xreflabel="sawfish">
+<?dbhtml filename="sawfish.html" dir="x"?>
+<title>sawfish</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: x/wm/sawfish/sawfish.ent
===================================================================
--- x/wm/sawfish/sawfish.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/wm/sawfish/sawfish.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY sawfish SYSTEM "../sawfish.xml">
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/wm/wm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,61 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="x-wm">
+<?dbhtml filename="wm.html" dir="x"?>
+<title>Window Managers</title>
 
-<chapter id="x-wm">
-  <?dbhtml filename="wm.html" ?>
+<para>Window Mangers and Desktop Environments are the primary user
+interfaces into the X Windows System.  A window manager is a program 
+that controls the appearance of windows and provides the means by which 
+the user can interact with them.  A Desktop Environment provides a more 
+complete interface to the operating system, and provides a range of 
+integrated utilities and applications.</para>
 
-  <title>Window Managers</title>
+<para>There are many Window Mangers available.  Some of the more well
+known ones include fvwm2, Window Maker, AfterStep, Enlightenment, Sawfish, 
+and Blackbox.</para>
 
-  <para>
-    Window Managers and Desktop Environments are the primary user
-    interfaces into the <application>X</application> Window System. A window
-    manager is a program that controls the appearance of windows and provides
-    the means by which the user can interact with them. A Desktop Environment
-    provides a more complete interface to the operating system, and provides a
-    range of integrated utilities and applications.
-  </para>
+<para>The Desktop Environments available for Linux are GNOME, KDE, and
+XFce.</para>
 
-  <para>
-    There are many Window Managers available. Some of the more well
-    known ones include <application>fvwm2</application>, <application>Window
-    Maker</application>, <application>AfterStep</application>,
-    <application>Enlightenment</application>,
-    <application>Sawfish</application>,
-    and <application>Blackbox</application>.
-  </para>
+<para>Choosing a Window Manager or Desktop Environment is highly 
+subjective.  The choice depends on the look and feel of the packages, the 
+resources (RAM, disk space) required, and the utilities included.  One web 
+site that provides a very good summary of what is available, screenshots, 
+and their respective features is <ulink 
+url="http://www.plig.org/xwinman/">Window Managers for X</ulink>.</para>
 
-  <para>
-    The Desktop Environments available for Linux are
-    <application>GNOME</application>, <application>KDE</application>, and
-    <application>XFce</application>.
-  </para>
+<para>In this chapter, the installation instructions of
+several Window Managers are presented.  Later in the book, both KDE and
+Gnome have their own Parts.</para>
 
-  <para>
-    Choosing a Window Manager or Desktop Environment is highly
-    subjective. The choice depends on the look and feel of the packages, the
-    resources (RAM, disk space) required, and the utilities included.  One web
-    site that provides a very good summary of what is available, screenshots,
-    and their respective features is
-    <ulink url="https://xteddy.org/xwinman/index.html">
-      Window Managers for X
-    </ulink>.
-  </para>
-
-  <para>
-    In this chapter, the installation instructions of several Window
-    Managers and one lightweight Desktop Environment are presented. Later in
-    the book, both <application>KDE</application> and
-    <application>GNOME</application> have their own sections.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fluxbox.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icewm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openbox.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sawfish.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-wms.xml"/>-->
+&sawfish;
+&enlightenment;
+&fluxbox;
 
 </chapter>
Index: x/x.ent
===================================================================
--- x/x.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/x.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<!ENTITY x SYSTEM "x.xml">
+
+<!-- Installing X -->
+<!ENTITY x-installing SYSTEM "installing/installing.xml">
+<!ENTITY x-installing-truetype SYSTEM "installing/truetype.xml">
+<!ENTITY x-installing-dri SYSTEM "installing/dri.xml">
+<!ENTITY % xfree86 SYSTEM "installing/xfree86/xfree86.ent">
+%xfree86;
+
+<!-- X Libraries -->
+<!ENTITY x-lib SYSTEM "lib/lib.xml">
+<!ENTITY % lesstif SYSTEM "lib/lesstif/lesstif.ent">
+<!ENTITY % qt SYSTEM "lib/qt/qt.ent">
+<!ENTITY % glib SYSTEM "lib/glib/glib.ent">
+<!ENTITY % gtk SYSTEM "lib/gtk/gtk.ent">
+<!ENTITY % atk SYSTEM "lib/atk/atk.ent">
+<!ENTITY % pango SYSTEM "lib/pango/pango.ent">
+%lesstif;
+%qt;
+%glib;
+%gtk;
+%atk;
+%pango;
+
+<!-- Window Managers -->
+<!ENTITY x-wm SYSTEM "wm/wm.xml">
+<!ENTITY % sawfish SYSTEM "wm/sawfish/sawfish.ent">
+<!ENTITY % enlightenment SYSTEM "wm/enlightenment/enlightenment.ent">
+<!ENTITY % fluxbox SYSTEM "wm/fluxbox/fluxbox.ent">
+%sawfish;
+%enlightenment;
+%fluxbox;
Index: x/x.xml
===================================================================
--- x/x.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ x/x.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="x" xreflabel="X + Window Managers">
+<?dbhtml filename="x.html" dir="x"?>
+<title>X + Window Managers</title>
 
-<part id="x" xreflabel="Graphical Components">
-  <?dbhtml filename="x.html" dir="x"?>
-
-  <title>Graphical Components</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing/installing.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lib/lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dm/dm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wm/wm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icons/icons.xml"/>
+&x-installing;
+&x-lib;
+&x-wm;
 
 </part>
Index: ce/apps/apps.xml
===================================================================
--- xfce/apps/apps.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="xfce-apps">
-  <?dbhtml filename="xfce-apps.html" ?>
-
-  <title>Xfce Applications</title>
-
-  <para>
-    This is a small collection of optional applications that add extra
-    capabilities to your <application>Xfce</application> desktop.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parole.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-terminal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfburn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ristretto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-dev-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-notifyd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-pulseaudio-plugin.xml"/>
-
-</chapter>
Index: ce/apps/parole.xml
===================================================================
--- xfce/apps/parole.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 parole-download-http
-           "https://archive.xfce.org/src/apps/parole/&xfce4-version;/parole-&parole-version;.tar.bz2">
-  <!ENTITY parole-download-ftp  " ">
-  <!ENTITY parole-md5sum        "29a409b4b22c2d91f210679e5708a19d">
-  <!ENTITY parole-size          "916 KB">
-  <!ENTITY parole-buildsize     "19 MB">
-  <!ENTITY parole-time          "0.2 SBU">
-]>
-
-<sect1 id="parole" xreflabel="Parole-&parole-version;">
-  <?dbhtml filename="parole.html"?>
-
-
-  <title>Parole-&parole-version;</title>
-
-  <indexterm zone="parole">
-    <primary sortas="a-Parole">Parole</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Parole</title>
-
-    <para>
-      <application>Parole</application> is a DVD/CD/music player for
-      <application>Xfce</application> that uses
-      <application>GStreamer</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        Although this version of parole works with most files, it
-        is unable to play DVDs, reporting an error in the gstreamer
-        backend.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&parole-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&parole-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &parole-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &parole-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &parole-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &parole-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Parole Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gst10-plugins-good"/>, and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/> and
-      <xref linkend="taglib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Parole</title>
-
-    <para>
-      Install <application>Parole</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>
-
-<!-- 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
-      the <xref linkend='gstreamer10'/> and the deprecated gstreamer-0.x
-      packages are installed.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="using">
-    <title>Using Parole</title>
-
-    <para>
-      If you have installed Gstreamer Plugins Ugly with support for libdvdnav
-      and libdvdread and would like to use Parole to play a DVD, click Media&gt;
-      Open location and enter dvd:// into the box.
-    </para>
-
-    <para>
-      Similarly, to play a CD, click Media&gt; Open location and enter cdda://
-      into the box.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          parole
-        </seg>
-        <seg>
-          Two libraries under /usr/lib/parole-0/
-        </seg>
-        <seg>
-          /usr/include/parole,
-          /usr/lib/parole-0 and
-          /usr/share/parole
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="parole-prog">
-        <term><command>parole</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> media player that
-            uses <application>GStreamer</application>
-          </para>
-          <indexterm zone="parole parole-prog">
-            <primary sortas="b-parole">parole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/apps/ristretto.xml
===================================================================
--- xfce/apps/ristretto.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ristretto-download-http
-           "https://archive.xfce.org/src/apps/ristretto/0.13/ristretto-&ristretto-version;.tar.bz2">
-  <!ENTITY ristretto-download-ftp  " ">
-  <!ENTITY ristretto-md5sum        "f3b1706a991a34f9866b0b2c27c6d0e1">
-  <!ENTITY ristretto-size          "823 KB">
-  <!ENTITY ristretto-buildsize     "9.9 MB">
-  <!ENTITY ristretto-time          "0.1 SBU">
-]>
-
-<sect1 id="ristretto" xreflabel="Ristretto-&ristretto-version;">
-  <?dbhtml filename="ristretto.html"?>
-
-
-  <title>Ristretto-&ristretto-version;</title>
-
-  <indexterm zone="ristretto">
-    <primary sortas="a-Ristretto">Ristretto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ristretto</title>
-
-    <para>
-      <application>Ristretto</application> is a fast and lightweight
-      image viewer for the <application>Xfce</application> desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ristretto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ristretto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ristretto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ristretto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ristretto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ristretto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ristretto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libexif"/> and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="tumbler"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ristretto</title>
-
-    <para>
-      Install <application>Ristretto</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>
-          ristretto
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ristretto-prog">
-        <term><command>ristretto</command></term>
-        <listitem>
-          <para>
-            is a fast and lightweight image viewer
-          </para>
-          <indexterm zone="ristretto ristretto-prog">
-            <primary sortas="b-ristretto">ristretto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/apps/xfburn.xml
===================================================================
--- xfce/apps/xfburn.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xfburn-download-http
-           "https://archive.xfce.org/src/apps/xfburn/0.7/xfburn-&xfburn-version;.tar.bz2">
-  <!ENTITY xfburn-download-ftp  " ">
-  <!ENTITY xfburn-md5sum        "38d1e73e53c0fc4bb1bd286df1d91839">
-  <!ENTITY xfburn-size          "904 KB">
-  <!ENTITY xfburn-buildsize     "20 MB">
-  <!ENTITY xfburn-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfburn" xreflabel="Xfburn-&xfburn-version;">
-  <?dbhtml filename="xfburn.html"?>
-
-
-  <title>Xfburn-&xfburn-version;</title>
-
-  <indexterm zone="xfburn">
-    <primary sortas="a-Xfburn">Xfburn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfburn</title>
-
-    <para>
-      <application>Xfburn</application> is a <application>GTK+ 3</application>
-      GUI frontend for <application>Libisoburn</application>. This is useful for
-      creating CDs and DVDs from files on your computer or ISO images downloaded
-      from elsewhere.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfburn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfburn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfburn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfburn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfburn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfburn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfburn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/>,
-      <xref linkend="libburn"/>,
-      <xref linkend="libisofs"/>, and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gst10-plugins-base"/> and
-      <xref role="runtime" linkend="cdrdao"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfburn</title>
-
-    <para>
-      Install <application>Xfburn</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfburn
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xfburn
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfburn-prog">
-        <term><command>xfburn</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> application for
-            creating CDs and DVDs
-          </para>
-          <indexterm zone="xfburn xfburn-prog">
-            <primary sortas="b-xfburn">xfburn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/apps/xfce4-dev-tools.xml
===================================================================
--- xfce/apps/xfce4-dev-tools.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/&xfce4-version;/xfce4-dev-tools-&xfce4-dev-tools-version;.tar.bz2">
-  <!ENTITY xfce4-dev-tools-download-ftp  " ">
-  <!ENTITY xfce4-dev-tools-md5sum        "69b4cd255a0b8f12bbdc9b10c433b223">
-  <!ENTITY xfce4-dev-tools-size          "356 KB">
-  <!ENTITY xfce4-dev-tools-buildsize     "2.6 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"?>
-
-
-  <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 applications.
-    </para>
-
-    &lfs121_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"/>
-    </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>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdt-autogen and
-          xdt-csource <!-- and some others not required for blfs pkgs -->
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="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: ce/apps/xfce4-notifyd.xml
===================================================================
--- xfce/apps/xfce4-notifyd.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-notifyd-download-http
-           "https://archive.xfce.org/src/apps/xfce4-notifyd/0.9/xfce4-notifyd-&xfce4-notifyd-version;.tar.bz2">
-  <!ENTITY xfce4-notifyd-download-ftp  " ">
-  <!ENTITY xfce4-notifyd-md5sum        "17ac99e99e82ae6c9fbefc77ecc7208b">
-  <!ENTITY xfce4-notifyd-size          "715 KB">
-  <!ENTITY xfce4-notifyd-buildsize     "12 MB">
-  <!ENTITY xfce4-notifyd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfce4-notifyd" xreflabel="xfce4-notifyd-&xfce4-notifyd-version;">
-  <?dbhtml filename="xfce4-notifyd.html"?>
-
-
-  <title>xfce4-notifyd-&xfce4-notifyd-version;</title>
-
-  <indexterm zone="xfce4-notifyd">
-    <primary sortas="a-xfce4-notifyd">xfce4-notifyd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Xfce4 Notification Daemon</title>
-
-    <para>
-      The <application>Xfce4 Notification Daemon</application> is a small
-      program that implements the "server-side" portion of the Freedesktop
-      desktop notifications specification. Applications that wish to pop up a
-      notification bubble in a standard way can use
-      <application>Xfce4-Notifyd</application> to do so by sending standard
-      messages over <application>D-Bus</application> using the
-      org.freedesktop.Notifications interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-notifyd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-notifyd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-notifyd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-notifyd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-notifyd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-notifyd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">The Xfce4 Notification Daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnotify"/>,
-      <xref linkend="libxfce4ui"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="xfce4-dev-tools"/><!-- for build only -->, and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Xfce4 Notification Daemon</title>
-
-    <para>
-      Install the <application>Xfce4 Notification Daemon</application> by
-      running the following commands:
-    </para>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-systemd &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>
-
-    <para>
-      You can test the notification daemon with the command
-      <command>notify-send</command>, to be run in a graphical
-      environment:
-    </para>
-
-<screen><userinput>notify-send -i info Information "Hi ${USER}, This is a Test"</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-notifyd-config
-        </seg>
-        <seg>
-          libnotification-plugin.so
-        </seg>
-        <seg>
-          /usr/share/themes/Bright/xfce-notify-4.0,
-          /usr/share/themes/Default/xfce-notify-4.0,
-          /usr/share/themes/Retro/xfce-notify-4.0,
-          /usr/share/themes/Smoke/xfce-notify-4.0 and
-          /usr/share/themes/ZOMG-PONIES!/xfce-notify-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-notifyd-config">
-        <term><command>xfce4-notifyd-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-notifyd xfce4-notifyd-config">
-            <primary sortas="b-xfce4-notifyd-config">xfce4-notifyd-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/apps/xfce4-pulseaudio-plugin.xml
===================================================================
--- xfce/apps/xfce4-pulseaudio-plugin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Shorten the url here a bit -->
-  <!ENTITY pap "xfce4-pulseaudio-plugin">
-  <!ENTITY papv "&pap;-&xfce4-pulseaudio-plugin-version;">
-
-  <!ENTITY xfce4-pulseaudio-plugin-download-http "https://archive.xfce.org/src/panel-plugins/&pap;/0.4/&papv;.tar.bz2">
-  <!ENTITY xfce4-pulseaudio-plugin-download-ftp  " ">
-  <!ENTITY xfce4-pulseaudio-plugin-md5sum        "83317e672e843e0b14d0da24ed301b3b">
-  <!ENTITY xfce4-pulseaudio-plugin-size          "428 KB">
-  <!ENTITY xfce4-pulseaudio-plugin-buildsize     "6.4 MB">
-  <!ENTITY xfce4-pulseaudio-plugin-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfce4-pulseaudio-plugin" xreflabel="&papv;">
-  <?dbhtml filename="xfce4-pulseaudio-plugin.html"?>
-
-
-  <title>&papv;</title>
-
-  <indexterm zone="xfce4-pulseaudio-plugin">
-    <primary sortas="a-xfce4-pulseaudio-plugin">xfce4-pulseaudio-plugin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Xfce4 Pulseaudio Plugin</title>
-
-    <para>
-      The <application>Xfce4 Pulseaudio Plugin</application> is a plugin for
-      the Xfce panel which provides a convenient way to adjust the audio volume
-      of the PulseAudio sound system and to an auto mixer tool like
-      pavucontrol. It can optionally handle multimedia keys for controlling the
-      audio volume.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-pulseaudio-plugin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-pulseaudio-plugin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-pulseaudio-plugin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-pulseaudio-plugin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-pulseaudio-plugin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-pulseaudio-plugin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Pulseaudio Plugin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="pulseaudio"/>, and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="keybinder3"/> and
-      <xref linkend="pavucontrol"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Xfce4 Pulseaudio Plugin</title>
-
-    <para>
-      Install the <application>Xfce4 Pulseaudio Plugin</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>
-          None
-        </seg>
-        <seg>
-          libpulseaudio-plugin.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ce/apps/xfce4-terminal.xml
===================================================================
--- xfce/apps/xfce4-terminal.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-terminal-download-http
-           "https://archive.xfce.org/src/apps/xfce4-terminal/&xfce4-terminal-minor;/xfce4-terminal-&xfce4-terminal-version;.tar.bz2">
-  <!ENTITY xfce4-terminal-download-ftp  " ">
-  <!ENTITY xfce4-terminal-md5sum        "8c986841d70c7480e8bd928466b8cdc2">
-  <!ENTITY xfce4-terminal-size          "1.0 MB">
-  <!ENTITY xfce4-terminal-buildsize     "15 MB">
-  <!ENTITY xfce4-terminal-time          "0.1 SBU">
-]>
-
-<sect1 id="xfce4-terminal" xreflabel="xfce4-terminal-&xfce4-terminal-version;">
-  <?dbhtml filename="xfce4-terminal.html"?>
-
-
-  <title>xfce4-terminal-&xfce4-terminal-version;</title>
-
-  <indexterm zone="xfce4-terminal">
-    <primary sortas="a-xfce4-terminal">xfce4-terminal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Terminal</title>
-
-    <para>
-      <application>Xfce4 Terminal</application> is a <application>GTK+3</application>
-      terminal emulator. This is useful for running commands or programs in the
-      comfort of an Xorg window; you can drag and drop files into the
-      <application>Xfce4 Terminal</application> or copy and paste text with your mouse.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-terminal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-terminal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-terminal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-terminal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-terminal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-terminal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Terminal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxfce4ui"/> and
-      <xref linkend="vte"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Terminal</title>
-
-    <para>
-      Install <application>Xfce4 Terminal</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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-terminal
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xfce4/terminal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-terminal-prog">
-        <term><command>xfce4-terminal</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> terminal emulator
-          </para>
-          <indexterm zone="xfce4-terminal xfce4-terminal-prog">
-            <primary sortas="b-xfce4-terminal">xfce4-terminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/core.xml
===================================================================
--- xfce/core/core.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="xfce-core">
-  <?dbhtml filename="xfce-core.html" ?>
-
-  <title>Xfce Desktop</title>
-
-  <para>
-    Xfce is a desktop environment that aims to be fast and low on system
-    resources, while still being visually appealing and user friendly.
-  </para>
-
-  <para>
-    Xfce embodies the traditional UNIX philosophy of modularity and
-    re-usability. It consists of a number of components that provide the full
-    functionality one can expect of a modern desktop environment. They are
-    packaged separately and you can pick among the available packages to create
-    the optimal personal working environment.
-  </para>
-
-  <para>
-    Build Xfce core packages in the order presented in the book for the
-    easiest resolution of dependencies.
-  </para>
-
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxfce4util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxfce4ui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="garcon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tumbler.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-appfinder.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-power-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-settings.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfdesktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfwm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session.xml"/>
-
-</chapter>
Index: ce/core/exo.xml
===================================================================
--- xfce/core/exo.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 exo-download-http
-           "https://archive.xfce.org/src/xfce/exo/&xfce4-version;/exo-&exo-version;.tar.bz2">
-  <!ENTITY exo-download-ftp  " ">
-  <!ENTITY exo-md5sum        "9d0be4e885eaf991e12dbc14d3fc628d">
-  <!ENTITY exo-size          "876 KB">
-  <!ENTITY exo-buildsize     "14 MB (with tests)">
-  <!ENTITY exo-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="exo" xreflabel="Exo-&exo-version;">
-  <?dbhtml filename="exo.html"?>
-
-
-  <title>Exo-&exo-version;</title>
-
-  <indexterm zone="exo">
-    <primary sortas="a-Exo">Exo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exo</title>
-
-    <para>
-      <application>Exo</application> is a support library used in the
-      <application>Xfce</application> desktop. It also has some helper
-      applications that are used throughout <application>Xfce</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libxfce4ui"/>, and
-      <xref linkend="libxfce4util"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exo</title>
-
-    <para>
-      Install <application>Exo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          exo-desktop-item-edit and
-          exo-open
-        </seg>
-        <seg>
-          libexo-2.so
-        </seg>
-        <seg>
-          /usr/include/exo-2 and
-          /usr/share/gtk-doc/html/exo-2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exo-desktop-item-edit">
-        <term><command>exo-desktop-item-edit</command></term>
-        <listitem>
-          <para>
-            is a command line utility to create or edit icons on the desktop
-          </para>
-          <indexterm zone="exo exo-desktop-item-edit">
-            <primary sortas="b-exo-desktop-item-edit">exo-desktop-item-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exo-open">
-        <term><command>exo-open</command></term>
-        <listitem>
-          <para>
-            is a command line frontend to the <application>Xfce</application>
-            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
-          </para>
-          <indexterm zone="exo exo-open">
-            <primary sortas="b-exo-open">exo-open</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexo-2">
-        <term><filename class="libraryfile">libexo-2.so</filename></term>
-        <listitem>
-          <para>
-            contains additional widgets, a framework for editable toolbars,
-            light-weight session management support and functions to
-            automatically synchronise object properties (based on GObject
-            Binding Properties)
-          </para>
-          <indexterm zone="exo libexo-2">
-            <primary sortas="c-libexo-2">libexo-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/garcon.xml
===================================================================
--- xfce/core/garcon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 garcon-download-http
-           "https://archive.xfce.org/src/xfce/garcon/&garcon-minor;/garcon-&garcon-version;.tar.bz2">
-  <!ENTITY garcon-download-ftp  " ">
-  <!ENTITY garcon-md5sum        "153813ff2736f44fa7b6fa96068538d0">
-  <!ENTITY garcon-size          "566 KB">
-  <!ENTITY garcon-buildsize     "8.4 MB">
-  <!ENTITY garcon-time          "0.1 SBU">
-]>
-
-<sect1 id="garcon" xreflabel="Garcon-&garcon-version;">
-  <?dbhtml filename="garcon.html"?>
-
-
-  <title>Garcon-&garcon-version;</title>
-
-  <indexterm zone="garcon">
-    <primary sortas="a-Garcon">Garcon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Garcon</title>
-
-    <para>
-      The <application>Garcon</application> package contains a freedesktop.org
-      compliant menu implementation based on <application>GLib</application> and
-      <application>GIO</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&garcon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&garcon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &garcon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &garcon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &garcon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &garcon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Garcon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxfce4ui"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Garcon</title>
-
-    <para>
-      Install <application>Garcon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgarcon-1.so and
-          libgarcon-gtk3-1.so
-        </seg>
-        <seg>
-          /usr/include/garcon-1,
-          /usr/include/garcon-gtk3-1, and
-          /usr/share/gtk-doc/html/garcon
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgarcon-1">
-        <term><filename class="libraryfile">libgarcon-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a freedesktop.org compliant menu
-            implementation based on <application>GLib</application> and
-            <application>GIO</application>
-          </para>
-          <indexterm zone="garcon libgarcon-1">
-            <primary sortas="c-libgarcon-1">libgarcon-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/libwnck.xml
===================================================================
--- xfce/core/libwnck.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libwnck-download-http "&gnome-download-http;/libwnck/&gnome-43;/libwnck-&libwnck-version;.tar.xz">
-  <!ENTITY libwnck-download-ftp  " ">
-  <!ENTITY libwnck-md5sum        "cd21ef743a1e9286554401c5b28d5ec6">
-  <!ENTITY libwnck-size          "448 KB">
-  <!ENTITY libwnck-buildsize     "13 MB">
-  <!ENTITY libwnck-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libwnck" xreflabel="libwnck-&libwnck-version;">
-  <?dbhtml filename="libwnck.html"?>
-
-
-  <title>libwnck-&libwnck-version;</title>
-
-  <indexterm zone="libwnck">
-    <primary sortas="a-libwnck-3">libwnck 3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwnck</title>
-
-    <para>
-      The <application>libwnck</application> package contains the
-      Window Navigator Construction Kit.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwnck-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwnck-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwnck-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwnck-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwnck-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwnck-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwnck Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwnck</title>
-
-    <para>
-      Install <application>libwnck</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --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"/>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this option
-      to build the API reference manual.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wnckprop and wnck-urgency-monitor
-        </seg>
-        <seg>
-          libwnck-3.so
-        </seg>
-        <seg>
-          /usr/include/libwnck-3.0 and
-          /usr/share/gtk-doc/html/libwnck-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wnckprop">
-        <term><command>wnckprop</command></term>
-        <listitem>
-          <para>
-            is used to print or modify the properties of a screen/workspace/window,
-            or to interact with it
-          </para>
-          <indexterm zone="libwnck wnckprop">
-            <primary sortas="b-wnckprop">wnckprop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwnck-3">
-        <term><filename class="libraryfile">libwnck-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for writing pagers and task lists
-          </para>
-          <indexterm zone="libwnck libwnck-3">
-            <primary sortas="c-libwnck-3">libwnck-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/libxfce4ui.xml
===================================================================
--- xfce/core/libxfce4ui.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxfce4ui-download-http
-           "https://archive.xfce.org/src/xfce/libxfce4ui/&xfce4-version;/libxfce4ui-&libxfce4ui-version;.tar.bz2">
-  <!ENTITY libxfce4ui-download-ftp  " ">
-  <!ENTITY libxfce4ui-md5sum        "5da8e2ce2a154c9b3557e9b317c28ddb">
-  <!ENTITY libxfce4ui-size          "885 KB">
-  <!ENTITY libxfce4ui-buildsize     "14 MB">
-  <!ENTITY libxfce4ui-time          "0.1 SBU">
-]>
-
-<sect1 id="libxfce4ui" xreflabel="libxfce4ui-&libxfce4ui-version;">
-  <?dbhtml filename="libxfce4ui.html"?>
-
-
-  <title>libxfce4ui-&libxfce4ui-version;</title>
-
-  <indexterm zone="libxfce4ui">
-    <primary sortas="a-libxfce4ui">libxfce4ui</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxfce4ui</title>
-
-    <para>
-      The <application>libxfce4ui</application> package contains
-      <application>GTK+ 3</application> widgets that are used by other
-      <application>Xfce</application> applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxfce4ui-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxfce4ui-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxfce4ui-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxfce4ui-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxfce4ui-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxfce4ui-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxfce4ui Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="xfconf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libgtop"/>,
-      <xref linkend="libgudev"/>, and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxfce4ui</title>
-
-    <para>
-      Install <application>libxfce4ui</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libxfce4kbd-private-{2,3}.so and
-          libxfce4ui-{1,2}.so
-        </seg>
-        <seg>
-          /etc/xdg/xfce4,
-          /usr/include/xfce4/libxfce4kbd-private-2,
-          /usr/include/xfce4/libxfce4ui-{1,2}, and
-          /usr/share/gtk-doc/html/libxfce4ui
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxfce4kbd-private-2">
-        <term><filename class="libraryfile">libxfce4kbd-private-2.so</filename></term>
-        <listitem>
-          <para>
-            is a private <application>Xfce</application> library for sharing
-            code between <application>Xfwm4</application> and
-            <application>Xfce4 Settings</application>
-          </para>
-          <indexterm zone="libxfce4ui libxfce4kbd-private-2">
-            <primary sortas="c-libxfce4kbd-private-2">libxfce4kbd-private-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxfce4ui-1">
-        <term><filename class="libraryfile">libxfce4ui-1.so</filename></term>
-        <listitem>
-          <para>
-            contains widgets that are used by other
-            <application>Xfce</application> applications
-          </para>
-          <indexterm zone="libxfce4ui libxfce4ui-1">
-            <primary sortas="c-libxfce4ui-1">libxfce4ui-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/libxfce4util.xml
===================================================================
--- xfce/core/libxfce4util.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxfce4util-download-http
-           "https://archive.xfce.org/src/xfce/libxfce4util/&xfce4-version;/libxfce4util-&libxfce4util-version;.tar.bz2">
-  <!ENTITY libxfce4util-download-ftp  " ">
-  <!ENTITY libxfce4util-md5sum        "9089e8974a581c5f39f610f2727c38ba">
-  <!ENTITY libxfce4util-size          "502 KB">
-  <!ENTITY libxfce4util-buildsize     "5.9 MB">
-  <!ENTITY libxfce4util-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libxfce4util" xreflabel="libxfce4util-&libxfce4util-version;">
-  <?dbhtml filename="libxfce4util.html"?>
-
-
-  <title>libxfce4util-&libxfce4util-version;</title>
-
-  <indexterm zone="libxfce4util">
-    <primary sortas="a-libxfce4util">libxfce4util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxfce4util</title>
-
-    <para>
-      The <application>libxfce4util</application> package is a basic utility
-      library for the <application>Xfce</application> desktop environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxfce4util-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxfce4util-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxfce4util-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxfce4util-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxfce4util-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxfce4util-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxfce4util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxfce4util</title>
-
-    <para>
-      Install <application>libxfce4util</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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-kiosk-query
-        </seg>
-        <seg>
-          libxfce4util.so
-        </seg>
-        <seg>
-          /usr/include/xfce4 and
-          /usr/share/gtk-doc/html/libxfce4util
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-kiosk-query">
-        <term><command>xfce4-kiosk-query</command></term>
-        <listitem>
-          <para>
-            Queries the given capabilities of &lt;module&gt; for the current
-            user and reports whether the user has the capabilities or not. This
-            tool is mainly meant for system administrators to test their Kiosk
-            setup
-          </para>
-          <indexterm zone="libxfce4util xfce4-kiosk-query">
-            <primary sortas="b-xfce4-kiosk-query">xfce4-kiosk-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxfce4util-lib">
-        <term><filename class="libraryfile">libxfce4util.so</filename></term>
-        <listitem>
-          <para>
-            contains basic utility functions for the
-            <application>Xfce</application> desktop environment
-          </para>
-          <indexterm zone="libxfce4util libxfce4util-lib">
-            <primary sortas="c-libxfce4util">libxfce4util.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 thunar-volman-download-http
-           "https://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        "a0965931e78fe662ad134e63b1ab33b9">
-  <!ENTITY thunar-volman-size          "499 KB">
-  <!ENTITY thunar-volman-buildsize     "7.0 MB">
-  <!ENTITY thunar-volman-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="thunar-volman" xreflabel="thunar-volman-&thunar-volman-version;">
-  <?dbhtml filename="thunar-volman.html"?>
-
-
-  <title>thunar-volman-&thunar-volman-version;</title>
-
-  <indexterm zone="thunar-volman">
-    <primary sortas="a-thunar-volman">thunar-volman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Thunar Volume Manager</title>
-
-    <para>
-      The <application>Thunar Volume Manager</application> is an extension for
-      the <application>Thunar</application> file manager, which enables
-      automatic management of removable drives and media.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunar-volman-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunar-volman-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunar-volman-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunar-volman-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunar-volman-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunar-volman-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Thunar Volume Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/> and
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="gvfs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Thunar Volume Manager</title>
-
-    <para>
-      Install the <application>Thunar Volume Manager</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          thunar-volman and
-          thunar-volman-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="thunar-volman-prog">
-        <term><command>thunar-volman</command></term>
-        <listitem>
-          <para>
-            is the <application>Thunar</application> Volume Manager, a command
-            line utility to automatically mount or unmount removable media
-          </para>
-          <indexterm zone="thunar-volman thunar-volman-prog">
-            <primary sortas="b-thunar-volman">thunar-volman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-volman-settings">
-        <term><command>thunar-volman-settings</command></term>
-        <listitem>
-          <para>
-            is a small <application>GTK+ 3</application> application for changing
-            <application>Thunar Volume Manager</application> settings
-          </para>
-          <indexterm zone="thunar-volman thunar-volman-settings">
-            <primary sortas="b-thunar-volman-settings">thunar-volman-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 thunar-download-http
-           "https://archive.xfce.org/src/xfce/thunar/&xfce4-version;/thunar-&thunar-version;.tar.bz2">
-  <!ENTITY thunar-download-ftp  " ">
-  <!ENTITY thunar-md5sum        "5cec04a1c41df73cd146d027fd513ef2">
-  <!ENTITY thunar-size          "2.7 MB">
-  <!ENTITY thunar-buildsize     "67 MB">
-  <!ENTITY thunar-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="thunar" xreflabel="thunar-&thunar-version;">
-  <?dbhtml filename="thunar.html"?>
-
-
-  <title>thunar-&thunar-version;</title>
-
-  <indexterm zone="thunar">
-    <primary sortas="a-thunar">Thunar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to thunar</title>
-
-    <para>
-      <application>Thunar</application> is the <application>Xfce</application>
-      file manager, a <application>GTK+ 3</application> GUI to organise the files
-      on your computer.
-    </para>
-
-    <!-- Thunar seems to implement functionality for Wallpaper support in XFCE,
-    As well as the Trash Can and other essential functionality. Similar to
-    PCManFM in LXDE, it seems to be more than just a file manager (unlike
-    Nautilus).-->
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Thunar Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgudev"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation),
-      <xref linkend="gvfs"/> (for remote browsing and automounting),
-      <xref linkend="libexif"/> and
-      <xref role="runtime" linkend="tumbler"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Thunar</title>
-
-    <para revision="sysv">
-      First prevent the installation of an unneeded systemd file:
-    </para>
-
-<screen revision="sysv"><userinput>sed -i 's/\tinstall-systemd_userDATA/\t/' Makefile.in
-</userinput></screen>
-
-    <para>
-      Install <application>Thunar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/thunar-&thunar-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          Thunar (symlink to thunar),
-          thunar, and
-          thunar-settings
-        </seg>
-        <seg>
-          libthunarx-3.so<!--,
-Those shouldn't be listed as libraries, since they are not accessible
-by "-l something"
-          thunar-apr.so,
-          thunar-sbr.so,
-          thunar-uca.so,
-          thunar-wallpaper-plugin.so, and
-          libthunar-tpa.so-->
-        </seg>
-        <seg>
-          /etc/xdg/Thunar,
-          /usr/include/thunarx-3,
-          /usr/lib/Thunar,
-          /usr/lib/thunarx-3,
-<!-- installed earlier (by xfconf presumably) /usr/lib/xfce4, -->
-          /usr/share/Thunar,
-          /usr/share/doc/thunar-&thunar-version;, and
-          /usr/share/gtk-doc/html/thunarx<!--,
-installed by libxfce4util          /usr/share/xfce4-->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="thunar-prog">
-        <term><command>thunar</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> file manager
-          </para>
-          <indexterm zone="thunar thunar-prog">
-            <primary sortas="b-thunar">thunar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-settings">
-        <term><command>thunar-settings</command></term>
-        <listitem>
-          <para>
-            is a shell script that launches a dialog box to allow you to alter
-            the behavior of <application>Thunar</application>
-          </para>
-          <indexterm zone="thunar thunar-settings">
-            <primary sortas="b-thunar-settings">thunar-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libthunarx-3">
-        <term><filename class="libraryfile">libthunarx-3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Thunar</application> extension library
-            which permits adding new features to the
-            <application>Thunar</application> file manager
-          </para>
-          <indexterm zone="thunar libthunarx-3">
-            <primary sortas="c-libthunarx-3">libthunarx-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/tumbler.xml
===================================================================
--- xfce/core/tumbler.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tumbler-download-http
-           "https://archive.xfce.org/src/xfce/tumbler/&xfce4-version;/tumbler-&tumbler-version;.tar.bz2">
-  <!ENTITY tumbler-download-ftp  " ">
-  <!ENTITY tumbler-md5sum        "576ff73eb77530b001e36d565544a7f6">
-  <!ENTITY tumbler-size          "608 KB">
-  <!ENTITY tumbler-buildsize     "13 MB">
-  <!ENTITY tumbler-time          "0.1 SBU">
-]>
-
-<sect1 id="tumbler" xreflabel="tumbler-&tumbler-version;">
-  <?dbhtml filename="tumbler.html"?>
-
-
-  <title>tumbler-&tumbler-version;</title>
-
-  <indexterm zone="tumbler">
-    <primary sortas="a-tumbler">Tumbler</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to tumbler</title>
-
-    <para>
-      The <application>Tumbler</application> package contains a
-      <application>D-Bus</application> thumbnailing service based on the
-      thumbnail management <application>D-Bus</application> specification.
-      This is useful for generating thumbnail images of files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tumbler-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tumbler-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tumbler-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tumbler-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tumbler-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tumbler-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tumbler Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libgsf"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="poppler"/>,
-      <ulink url="https://github.com/dirkvdb/ffmpegthumbnailer">FFmpegThumbnailer</ulink>,
-      <ulink url="&gnome-download-http;/libgepub/">libgepub</ulink>, and
-      <ulink url="https://libopenraw.freedesktop.org/">libopenraw</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tumbler</title>
-
-    <para>
-      Install <application>Tumbler</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
-
-    <para revision="sysv">
-      Finally, remove a systemd unit which is useless on a SysV system:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -fv /usr/lib/systemd/user/tumblerd.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          tumblerd
-        </seg>
-        <seg>
-          libtumbler-1.so and
-          several under /usr/lib/tumbler-1/plugins/
-        </seg>
-        <seg>
-          /etc/xdg/tumbler,
-          /usr/include/tumbler-1,
-          /usr/lib/tumbler-1 and
-          /usr/share/gtk-doc/html/tumbler
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tumblerd">
-        <term><command>tumblerd</command></term>
-        <listitem>
-          <para>
-            is a D-Bus service for applications such as Thunar and
-            Ristretto to use thumbnail images
-          </para>
-          <indexterm zone="tumbler tumblerd">
-            <primary sortas="b-tumblerd">tumblerd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtumbler-1">
-        <term><filename class="libraryfile">libtumbler-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that the <application>Tumbler</application>
-            daemon uses to create thumbnail images
-          </para>
-          <indexterm zone="tumbler libtumbler-1">
-            <primary sortas="c-libtumbler-1">libtumbler-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfce4-appfinder.xml
===================================================================
--- xfce/core/xfce4-appfinder.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-appfinder-download-http
-           "https://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        "621d811f93b3edaac4a0205bc18ef5c5">
-  <!ENTITY xfce4-appfinder-size          "552 KB">
-  <!ENTITY xfce4-appfinder-buildsize     "7.1 MB">
-  <!ENTITY xfce4-appfinder-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfce4-appfinder" xreflabel="xfce4-appfinder-&xfce4-appfinder-version;">
-  <?dbhtml filename="xfce4-appfinder.html"?>
-
-
-  <title>xfce4-appfinder-&xfce4-appfinder-version;</title>
-
-  <indexterm zone="xfce4-appfinder">
-    <primary sortas="a-xfce4-appfinder">xfce4-appfinder</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Appfinder</title>
-
-    <para>
-      <application>Xfce4 Appfinder</application> is a tool to find and launch
-      installed applications by searching the .desktop files installed on your
-      system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-appfinder-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-appfinder-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-appfinder-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-appfinder-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-appfinder-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-appfinder-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Appfinder Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="garcon"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Appfinder</title>
-
-    <para>
-      Install <application>Xfce4 Appfinder</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-appfinder and xfrun4 (symlink)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-appfinder-prog">
-        <term><command>xfce4-appfinder</command></term>
-        <listitem>
-          <para>
-            Is a <application>GTK+ 3</application> application that enables you
-            to quickly search through the .desktop files installed on your
-            system looking for an application
-          </para>
-          <indexterm zone="xfce4-appfinder xfce4-appfinder-prog">
-            <primary sortas="b-xfce4-appfinder">xfce4-appfinder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfce4-panel.xml
===================================================================
--- xfce/core/xfce4-panel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-panel-download-http
-           "https://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        "caddd05c820f0fbae9d2acc5218fc7ed">
-  <!ENTITY xfce4-panel-size          "1.6 MB">
-  <!ENTITY xfce4-panel-buildsize     "38 MB">
-  <!ENTITY xfce4-panel-time          "0.3 SBU">
-]>
-
-<sect1 id="xfce4-panel" xreflabel="xfce4-panel-&xfce4-panel-version;">
-  <?dbhtml filename="xfce4-panel.html"?>
-
-
-  <title>xfce4-panel-&xfce4-panel-version;</title>
-
-  <indexterm zone="xfce4-panel">
-    <primary sortas="a-xfce4-panel">xfce4-panel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Panel</title>
-
-    <para>
-      The <application>Xfce4 Panel</application> package contains the
-      <application>Xfce4</application> Panel.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-panel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-panel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-panel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-panel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-panel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-panel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Panel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="exo"/>,
-      <xref linkend="garcon"/>, and
-      <xref linkend="libwnck"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://launchpad.net/libdbusmenu">libdbusmenu</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/xfce4-panel"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Panel</title>
-
-    <para>
-      Install <application>Xfce4 Panel</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-panel,
-          xfce4-popup-applicationsmenu,
-          xfce4-popup-directorymenu, and
-          xfce4-popup-windowmenu
-        </seg>
-        <seg>
-          libxfce4panel-2.0.so
-        </seg>
-        <seg>
-          /etc/xdg/xfce4/panel,
-          /usr/include/xfce4/libxfce4panel-1.0,
-          /usr/lib/xfce4/panel,
-          /usr/share/gtk-doc/html/libxfce4panel-1.0 and
-          /usr/share/xfce4/panel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-panel-prog">
-        <term><command>xfce4-panel</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> panel
-          </para>
-          <indexterm zone="xfce4-panel xfce4-panel-prog">
-            <primary sortas="b-xfce4-panel">xfce4-panel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-popup-applicationsmenu">
-        <term><command>xfce4-popup-applicationsmenu</command></term>
-        <listitem>
-          <para>
-            is a shell script that uses <application>D-Bus</application> and
-            <application>Xfce Panel</application> to display a popup menu of the
-            installed applications
-          </para>
-          <indexterm zone="xfce4-panel xfce4-popup-applicationsmenu">
-            <primary sortas="b-xfce4-popup-applicationsmenu">xfce4-popup-applicationsmenu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-popup-directorymenu">
-        <term><command>xfce4-popup-directorymenu</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="xfce4-panel xfce4-popup-directorymenu">
-            <primary sortas="b-xfce4-popup-directorymenu">xfce4-popup-directorymenu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-popup-windowmenu">
-        <term><command>xfce4-popup-windowmenu</command></term>
-        <listitem>
-          <para>
-            is a shell script that uses <application>DBus</application> to
-            display the <application>Xfwm4</application> a popup menu
-          </para>
-          <indexterm zone="xfce4-panel xfce4-popup-windowmenu">
-            <primary sortas="b-xfce4-popup-windowmenu">xfce4-popup-windowmenu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxfce4panel-2.0">
-        <term><filename class="libraryfile">libxfce4panel-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Xfce Panel</application> API functions
-          </para>
-          <indexterm zone="xfce4-panel libxfce4panel-2.0">
-            <primary sortas="c-libxfce4panel-2.0">libxfce4panel-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfce4-power-manager.xml
===================================================================
--- xfce/core/xfce4-power-manager.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-power-manager-download-http
-           "https://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        "077f9af98f1f6a76af120f27005341ae">
-  <!ENTITY xfce4-power-manager-size          "1.2 MB">
-  <!ENTITY xfce4-power-manager-buildsize     "19 MB">
-  <!ENTITY xfce4-power-manager-time          "0.1 SBU">
-]>
-
-<sect1 id="xfce4-power-manager" xreflabel="xfce4-power-manager-&xfce4-power-manager-version;">
-  <?dbhtml filename="xfce4-power-manager.html"?>
-
-
-  <title>xfce4-power-manager-&xfce4-power-manager-version;</title>
-
-  <indexterm zone="xfce4-power-manager">
-    <primary sortas="a-xfce4-power-manager">xfce4-power-manager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Power Manager</title>
-
-    <para>
-      The <application>Xfce4 Power Manager</application> is a power manager for
-      the <application>Xfce</application> desktop, <application>Xfce power
-      manager</application> manages the power sources on the computer and the
-      devices that can be controlled to reduce their power consumption (such as
-      LCD brightness level or monitor sleep). In addition,
-      <application>Xfce4 Power Manager</application> provides a set of
-      freedesktop-compliant <application>DBus</application> interfaces to
-      inform other applications about current power level so that they can
-      adjust their power consumption.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-power-manager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-power-manager-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-power-manager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-power-manager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-power-manager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-power-manager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Power Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnotify"/>,
-      <xref linkend="upower"/>, and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="polkit"/>
-      (runtime, required for laptop backlight control)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="NetworkManager"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Power Manager</title>
-
-    <para>
-      Install <application>Xfce4 Power Manager</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-power-manager,
-          xfce4-power-manager-settings,
-          xfce4-pm-helper, and
-          xfpm-power-backlight-helper
-        </seg>
-        <seg>
-          libxfce4powermanager.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-pm-helper">
-        <term><command>xfce4-pm-helper</command></term>
-        <listitem>
-          <para>
-            is a helper program for the suspend and hibernate functions of
-            <command>xfce4-power-manager</command>
-          </para>
-          <indexterm zone="xfce4-power-manager xfce4-pm-helper">
-            <primary sortas="b-xfce4-pm-helper">xfce4-pm-helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-power-manager-prog">
-        <term><command>xfce4-power-manager</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> Power Manager
-          </para>
-          <indexterm zone="xfce4-power-manager xfce4-power-manager-prog">
-            <primary sortas="b-xfce4-power-manager">xfce4-power-manager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-power-manager-settings">
-        <term><command>xfce4-power-manager-settings</command></term>
-        <listitem>
-          <para>
-            is a utility that comes with the <application>Xfce</application>
-            Power Manager to access/change its configuration
-          </para>
-          <indexterm zone="xfce4-power-manager xfce4-power-manager-settings">
-            <primary sortas="b-xfce4-power-manager-settings">xfce4-power-manager-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfpm-power-backlight-helper">
-        <term><command>xfpm-power-backlight-helper</command></term>
-        <listitem>
-          <para>
-            is a command line utility to get or set the brightness of your
-            screen
-          </para>
-          <indexterm zone="xfce4-power-manager xfpm-power-backlight-helper">
-            <primary sortas="b-xfpm-power-backlight-helper">xfpm-power-backlight-helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,307 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-session-download-http
-           "https://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        "dfdcb697a2315168e2e56a70f17a19b7">
-  <!ENTITY xfce4-session-size          "856 KB">
-  <!ENTITY xfce4-session-buildsize     "16 MB">
-  <!ENTITY xfce4-session-time          "0.1 SBU">
-]>
-
-<sect1 id="xfce4-session" xreflabel="xfce4-session-&xfce4-session-version;">
-  <?dbhtml filename="xfce4-session.html"?>
-
-
-  <title>xfce4-session-&xfce4-session-version;</title>
-
-  <indexterm zone="xfce4-session">
-    <primary sortas="a-xfce4-session">xfce4-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Session</title>
-
-    <para>
-      <application>Xfce4 Session</application> is a session manager for
-      <application>Xfce</application>. Its task is to save the state of your
-      desktop (opened applications and their location) and restore it during a
-      next startup. You can create several different sessions and choose one of
-      them on startup.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libwnck"/> and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <ulink url="https://docs.xfce.org/apps/screensaver/start">xfce4-screensaver</ulink>  or <xref linkend="xscreensaver"/>,
-      <xref linkend="shared-mime-info"/> and
-      <xref linkend="polkit-gnome"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required Runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="xfdesktop"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Session</title>
-
-    <para>
-      Install <application>Xfce4 Session</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-legacy-sm &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-legacy-sm</parameter>: This switch disables
-      legacy session management which isn't necessary on modern
-      system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xfce4 Session</title>
-
-    <para>
-      There are several optional run time dependencies for
-      <application>Xfce4</application>:
-      <xref linkend="dbus"/>,
-      <xref linkend="gnupg2"/>,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="openssh"/>, and
-      <xref linkend="xinit"/>
-    </para>
-
-    <para>
-      When building an <application>Xfce4</application> package, some
-      configuration files are installed in <filename class="directory">
-      /usr/share/applications</filename>, <filename class="directory">
-      /usr/share/icons</filename>, and <filename class="directory">
-      /usr/share/mime</filename>. In order to use those files in your
-      <application>Xfce4</application> session, you need to update various
-      databases. Do that by running, as the <systemitem class="username">
-      root</systemitem> user (you need to have the recommended dependencies
-      installed):
-   </para>
-
-<screen role="root"><userinput>update-desktop-database &amp;&amp;
-update-mime-database /usr/share/mime</userinput></screen>
-  </sect2>
-
-  <sect2 role="starting">
-    <title>Starting Xfce4</title>
-
-    <para revision="sysv">
-      You can start <application>Xfce4</application> from runlevel 3, using
-      <xref linkend="xinit"/>, or from runlevel 5, using a Display Manager,
-      such as <xref linkend="lightdm"/>.
-    </para>
-
-    <para revision="systemd">
-      You can start <application>Xfce4</application> from a TTY using
-      <xref linkend="xinit"/>, or from a graphical display manager, such as
-      <xref linkend="lightdm"/>.
-    </para>
-
-    <para>
-      To start <application>Xfce4</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-    <!-- TODO: A plain "startxfce4" command works for me on Systemd.
-         But maybe it does not work on SysV.  Need more investigate.  -->
-
-<screen role="nodump"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal>dbus-launch --exit-with-x11 startxfce4</literal>
-EOF
-
-startx</userinput></screen>
-
-    <para>
-      The X session starts on the first unused virtual terminal, normally vt7.
-      You can switch to another vt<emphasis>n</emphasis> simultaneously
-      pressing the keys Ctrl-Alt-F<emphasis>n</emphasis>
-      (<emphasis>n</emphasis>=1, 2, ...).  To switch back to the X session,
-      normally started at vt7, use Ctrl-Alt-F7. The vt where the command
-      <command>startx</command> was executed will display many messages,
-      including X starting messages, applications automatically started with
-      the session, and eventually, some warning and error messages. You may
-      prefer to redirect those messages to a log file, which not only will keep
-      the initial vt uncluttered, but can also be used for debugging purposes. This
-      can be done starting X with:
-    </para>
-
-    <screen role="nodump"><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-    <note revision="sysv">
-      <para>
-        You may wish to drop dbus-launch, e.g., just using
-        startxfce4 in ~/.xinitrc. However some capabilities such as mounting or
-        umounting file systems from a file manager will not be possible, or the
-        reboot option will be absent or inoperative, among other problems.
-      </para>
-    </note>
-
-    <para>
-      When shutting down or rebooting, the shutdown messages appear on the vt
-      where X was running. If you wish to see those messages, simultaneously
-      press keys Alt-F7 (assuming that X was running on vt7).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          startxfce4,
-          xfce4-session,
-          xfce4-session-logout,
-          xfce4-session-settings, and
-          xflock4
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/xfce4/session
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="startxfce4">
-        <term><command>startxfce4</command></term>
-        <listitem>
-          <para>
-            is a script responsible for starting an
-            <application>Xfce</application> session.
-          </para>
-          <indexterm zone="xfce4-session startxfce4">
-            <primary sortas="b-startxfce4">startxfce4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-prog">
-        <term><command>xfce4-session</command></term>
-        <listitem>
-          <para>
-            starts up the <application>Xfce</application> Desktop Environment
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-prog">
-            <primary sortas="b-xfce4-session">xfce4-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-logout">
-        <term><command>xfce4-session-logout</command></term>
-        <listitem>
-          <para>
-            logs out from <application>Xfce</application>
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-logout">
-            <primary sortas="b-xfce4-session-logout">xfce4-session-logout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-settings">
-        <term><command>xfce4-session-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI which allows you to alter
-            your preferences for your <application>Xfce Session</application>
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-settings">
-            <primary sortas="b-xfce4-session-settings">xfce4-session-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfce4-settings.xml
===================================================================
--- xfce/core/xfce4-settings.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,295 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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-settings-download-http
-           "https://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        "d872008413cb52254a4818ec0c4d43b5">
-  <!ENTITY xfce4-settings-size          "1.5 MB">
-  <!ENTITY xfce4-settings-buildsize     "30 MB">
-  <!ENTITY xfce4-settings-time          "0.2 SBU">
-]>
-
-<sect1 id="xfce4-settings" xreflabel="xfce4-settings-&xfce4-settings-version;">
-  <?dbhtml filename="xfce4-settings.html"?>
-
-
-  <title>xfce4-settings-&xfce4-settings-version;</title>
-
-  <indexterm zone="xfce4-settings">
-    <primary sortas="a-xfce4-settings">xfce4-settings</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Settings</title>
-
-    <para>
-      The <application>Xfce4 Settings</application> package contains a
-      collection of programs that are useful for adjusting your
-       <application>Xfce</application> preferences.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-settings-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-settings-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-settings-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-settings-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-settings-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-settings-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Settings Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/> and
-      <xref linkend="garcon"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="gnome-icon-theme"/> or
-      <xref role="runtime" linkend="lxde-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libnotify"/> and
-      <xref linkend="libxklavier"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="libinput"/>, and
-      <xref linkend="upower"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Settings</title>
-
-    <para>
-      Install <application>Xfce4 Settings</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-sound-settings</option>: Use this switch to
-      enable sound settings in GUI.
-    </para>
-
-    <para>
-      <option>--enable-pluggable-dialogs</option>: Use this switch to
-      enable support for embedded settings dialogs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-accessibility-settings,
-          xfce4-appearance-settings,
-          xfce4-color-settings,
-          xfce4-display-settings,
-          xfce4-find-cursor,
-          xfce4-keyboard-settings,
-          xfce4-mime-helper,
-          xfce4-mime-settings,
-          xfce4-mouse-settings,
-          xfce4-settings-editor,
-          xfce4-settings-manager and
-          xfsettingsd
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-accessibility-settings">
-        <term><command>xfce4-accessibility-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your keyboard and mouse preferences
-          </para>
-          <indexterm zone="xfce4-settings xfce4-accessibility-settings">
-            <primary sortas="b-xfce4-accessibility-settings">xfce4-accessibility-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-appearance-settings">
-        <term><command>xfce4-appearance-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your theme, icon and font preferences
-          </para>
-          <indexterm zone="xfce4-settings xfce4-appearance-settings">
-            <primary sortas="b-xfce4-appearance-settings">xfce4-appearance-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-display-settings">
-        <term><command>xfce4-display-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your screen preferences
-          </para>
-          <indexterm zone="xfce4-settings xfce4-display-settings">
-            <primary sortas="b-xfce4-display-settings">xfce4-display-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-keyboard-settings">
-        <term><command>xfce4-keyboard-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your keyboard preferences
-          </para>
-          <indexterm zone="xfce4-settings xfce4-keyboard-settings">
-            <primary sortas="b-xfce4-keyboard-settings">xfce4-keyboard-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-mime-settings">
-        <term><command>xfce4-mime-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            which applications are used to handle different mime types
-          </para>
-          <indexterm zone="xfce4-settings xfce4-mime-settings">
-            <primary sortas="b-xfce4-mime-settings">xfce4-mime-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-mouse-settings">
-        <term><command>xfce4-mouse-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            some of your mouse preferences
-          </para>
-          <indexterm zone="xfce4-settings xfce4-mouse-settings">
-            <primary sortas="b-xfce4-mouse-settings">xfce4-mouse-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-settings-editor">
-        <term><command>xfce4-settings-editor</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            your preferences stored in <application>Xfconf</application>
-          </para>
-          <indexterm zone="xfce4-settings xfce4-settings-editor">
-            <primary sortas="b-xfce4-settings-editor">xfce4-settings-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-settings-manager">
-        <term><command>xfce4-settings-manager</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> GUI to allow you to change
-            many of your <application>Xfce</application> preferences
-          </para>
-          <indexterm zone="xfce4-settings xfce4-settings-manager">
-            <primary sortas="b-xfce4-settings-manager">xfce4-settings-manager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfsettingsd">
-        <term><command>xfsettingsd</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> settings daemon
-          </para>
-          <indexterm zone="xfce4-settings xfsettingsd">
-            <primary sortas="b-xfsettingsd">xfsettingsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfconf.xml
===================================================================
--- xfce/core/xfconf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xfconf-download-http
-           "https://archive.xfce.org/src/xfce/xfconf/&xfce4-version;/xfconf-&xfconf-version;.tar.bz2">
-  <!ENTITY xfconf-download-ftp  " ">
-  <!ENTITY xfconf-md5sum        "f807ed0a1b88af479ec70b28c1f78dcc">
-  <!ENTITY xfconf-size          "636 KB">
-  <!ENTITY xfconf-buildsize     "9.8 MB">
-  <!ENTITY xfconf-time          "0.1 SBU">
-]>
-
-<sect1 id="xfconf" xreflabel="Xfconf-&xfconf-version;">
-  <?dbhtml filename="xfconf.html"?>
-
-
-  <title>Xfconf-&xfconf-version;</title>
-
-  <indexterm zone="xfconf">
-    <primary sortas="a-Xfconf">Xfconf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfconf</title>
-
-    <para>
-      <application>Xfconf</application> is the configuration storage system for
-      <application>Xfce</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfconf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfconf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfconf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfconf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfconf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfconf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfconf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxfce4util"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfconf</title>
-
-    <para>
-      Install <application>Xfconf</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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfconf-query
-        </seg>
-        <seg>
-          libxfconf-0.so
-        </seg>
-        <seg>
-          /usr/include/xfce4/xfconf-0,
-          /usr/lib/xfce4/xfconf, and
-          /usr/share/gtk-doc/html/xfconf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfconf-query">
-        <term><command>xfconf-query</command></term>
-        <listitem>
-          <para>
-            is a commandline utility to view or change any setting stored in
-            <application>Xfconf</application>
-          </para>
-          <indexterm zone="xfconf xfconf-query">
-            <primary sortas="b-xfconf-query">xfconf-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxfconf">
-        <term><filename class="libraryfile">libxfconf-0.so</filename></term>
-        <listitem>
-          <para>
-            contains basic functions for <application>Xfce</application>
-            configuration
-          </para>
-          <indexterm zone="xfconf libxfconf">
-            <primary sortas="c-libxfconf">libxfconf-0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfdesktop.xml
===================================================================
--- xfce/core/xfdesktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xfdesktop-download-http
-           "https://archive.xfce.org/src/xfce/xfdesktop/&xfce4-version;/xfdesktop-&xfdesktop-version;.tar.bz2">
-  <!ENTITY xfdesktop-download-ftp  " ">
-  <!ENTITY xfdesktop-md5sum        "e675c2989436dc724fef402d1db0125d">
-  <!ENTITY xfdesktop-size          "2.1 MB">
-  <!ENTITY xfdesktop-buildsize     "21 MB">
-  <!ENTITY xfdesktop-time          "0.1 SBU">
-]>
-
-<sect1 id="xfdesktop" xreflabel="Xfdesktop-&xfdesktop-version;">
-  <?dbhtml filename="xfdesktop.html"?>
-
-
-  <title>Xfdesktop-&xfdesktop-version;</title>
-
-  <indexterm zone="xfdesktop">
-    <primary sortas="a-Xfdesktop">Xfdesktop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfdesktop</title>
-
-    <para>
-      <application>Xfdesktop</application> is a desktop manager for the
-      <application>Xfce</application> Desktop Environment.
-      <application>Xfdesktop</application> sets the background image / color,
-      creates the right click menu and window list and displays the file icons
-      on the desktop using <application>Thunar</application> libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfdesktop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfdesktop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfdesktop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfdesktop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfdesktop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfdesktop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfdesktop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/> and
-      <xref linkend="libwnck"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/>,
-      <xref linkend="startup-notification"/> and
-      <xref linkend="thunar"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfdesktop</title>
-
-    <para>
-      Install <application>Xfdesktop</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfdesktop and
-          xfdesktop-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/backgrounds/xfce and
-          /usr/share/pixmaps/xfdesktop
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfdesktop-prog">
-        <term><command>xfdesktop</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> Desktop Environment's desktop
-            manager
-          </para>
-          <indexterm zone="xfdesktop xfdesktop-prog">
-            <primary sortas="b-xfdesktop">xfdesktop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfdesktop-settings">
-        <term><command>xfdesktop-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</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
-          </para>
-          <indexterm zone="xfdesktop xfdesktop-settings">
-            <primary sortas="b-xfdesktop-settings">xfdesktop-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfwm4.xml
===================================================================
--- xfce/core/xfwm4.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xfwm4-download-http "https://archive.xfce.org/src/xfce/xfwm4/&xfce4-version;/xfwm4-&xfwm4-version;.tar.bz2">
-  <!ENTITY xfwm4-download-ftp  " ">
-  <!ENTITY xfwm4-md5sum        "181415e457c86124fa5f8aa5d715b967">
-  <!ENTITY xfwm4-size          "1.2 MB">
-  <!ENTITY xfwm4-buildsize     "27 MB">
-  <!ENTITY xfwm4-time          "0.2 SBU">
-]>
-
-<sect1 id="xfwm4" xreflabel="Xfwm4-&xfwm4-version;">
-  <?dbhtml filename="xfwm4.html"?>
-
-
-  <title>Xfwm4-&xfwm4-version;</title>
-
-  <indexterm zone="xfwm4">
-    <primary sortas="a-Xfwm4">Xfwm4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfwm4</title>
-
-    <para>
-      <application>Xfwm4</application> is the window manager for
-      <application>Xfce</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfwm4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfwm4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfwm4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfwm4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfwm4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfwm4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfwm4 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libwnck"/> and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/xfwm4"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfwm4</title>
-
-    <para>
-      Install <application>Xfwm4</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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>- -disable-compositor</parameter>: This switch disables
-      a function that causes failures when xorg-xerver-1.20.0 and later are
-      installed.
-    </para>
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfwm4,
-          xfwm4-settings,
-          xfwm4-tweaks-settings and
-          xfwm4-workspace-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/xfce4/xfwm4,
-          /usr/share/themes/{Daloa,Default{,-hdpi,-xhdpi},Kokodi,Moheli}, and
-          /usr/share/xfwm4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfwm4-prog">
-        <term><command>xfwm4</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> window manager
-          </para>
-          <indexterm zone="xfwm4 xfwm4-prog">
-            <primary sortas="b-xfwm4">xfwm4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfwm4-settings">
-        <term><command>xfwm4-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> application that allows
-            setting some preferences such as your theme, keyboard shortcuts and
-            mouse focus behavior
-          </para>
-          <indexterm zone="xfwm4 xfwm4-settings">
-            <primary sortas="b-xfwm4-settings">xfwm4-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfwm4-tweaks-settings">
-        <term><command>xfwm4-tweaks-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> application that allows
-            setting some more preferences for <application>Xfwm4</application>
-          </para>
-          <indexterm zone="xfwm4 xfwm4-tweaks-settings">
-            <primary sortas="b-xfwm4-tweaks-settings">xfwm4-tweaks-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfwm4-workspace-settings">
-        <term><command>xfwm4-workspace-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 3</application> application that allows
-            setting your workspace preferences
-          </para>
-          <indexterm zone="xfwm4 xfwm4-workspace-settings">
-            <primary sortas="b-xfwm4-workspace-settings">xfwm4-workspace-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/xfce.xml
===================================================================
--- xfce/xfce.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
-
-<part id="xfce" xreflabel="Xfce">
-  <?dbhtml filename="xfce.html" dir="xfce"?>
-
-  <title>Xfce</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
-
-</part>
Index: ncludes/SIOCGSTAMP.xml
===================================================================
--- xincludes/SIOCGSTAMP.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <para>
-      <parameter>sed -i ... SIOCGSTAMP ...</parameter>: In linux-5.2 the
-      definitions of SIOCGSTAMP and SIOCGSTAMPNS were moved from
-      &lt;sys/socket.h&gt; which packages have traditionally included to
-      get them. The sed(s) to hard-code the values enable the package to
-      compile correctly.
-    </para>
Index: ncludes/gsettings-destdir.xml
===================================================================
--- xincludes/gsettings-destdir.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-    <note>
-      <para>
-        If you installed the package to your system using a
-        <quote>DESTDIR</quote> method,
-        <filename>/usr/share/glib-2.0/schemas/gschemas.compiled</filename>
-        was not updated/created. Create (or update) the file using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>glib-compile-schemas /usr/share/glib-2.0/schemas</userinput></screen>
-    </note>
Index: ncludes/gst10-objc-error.xml
===================================================================
--- xincludes/gst10-objc-error.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <!-- As part of their move to Meson, the GStreamer developers included a
-         check for an ObjC compiler, since their primary user other than Linux
-         is macOS. -->
-    <note><para>If you do not have an Objective-C compiler installed, the
-    build system for this package will emit a warning about a failed sanity
-    check. This is harmless, and it is safe to continue.</para></note>
Index: ncludes/gst10-plugins.xml
===================================================================
--- xincludes/gst10-plugins.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <!-- Since this is referenced in every GStreamer Plugins page, simplify
-    the pages by adding an XInclude. -->
-
-    <note><para>If you need a plugin for a given dependency, that dependency
-    needs to be installed before this package.</para></note>
Index: ncludes/gtk-doc-rebuild-problem.xml
===================================================================
--- xincludes/gtk-doc-rebuild-problem.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <para><option>--enable-gtk-doc</option>: This parameter is normally
-    used if <application>GTK-Doc</application> is installed and you wish
-    to rebuild and install the API documentation. It is broken for
-    this package due to the use of a long deprecated gtk-doc program
-    that is no longer available.</para>
Index: ncludes/gtk-doc-rebuild.xml
===================================================================
--- xincludes/gtk-doc-rebuild.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-    <para><option>--enable-gtk-doc</option>: Use this parameter if
-    <application>GTK-Doc</application> is installed and you wish to rebuild
-    and install the API documentation.</para>
Index: ncludes/gtk-update-icon-cache.xml
===================================================================
--- xincludes/gtk-update-icon-cache.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-    <note>
-      <para>
-        This package installs icon files into the <filename
-        class="directory">/usr/share/icons/hicolor</filename> hierarchy and you
-        can improve system performance and memory usage by updating
-        <filename>/usr/share/icons/hicolor/index.theme</filename>. To perform
-        the update you must have <xref linkend="gtk3"/> installed and issue the
-        following command as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="nodump"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor</userinput></screen>
-    </note>
Index: ncludes/lib-config.xml
===================================================================
--- xincludes/lib-config.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para>As with most libraries, there is no configuration to do, save that the
-library directory, i.e., <filename class="directory">/opt/lib</filename> or
-<filename class="directory">/usr/local/lib</filename> should appear in
-<filename>/etc/ld.so.conf</filename> so that <command>ldd</command> can find
-the shared libraries.  After checking that this is the case,
-<command>/sbin/ldconfig</command> should be run while logged in as
-<systemitem class="username">root</systemitem>.</para>
Index: ncludes/meson-buildtype-release.xml
===================================================================
--- xincludes/meson-buildtype-release.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para 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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para 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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para 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 using 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: ncludes/mozshm.xml
===================================================================
--- xincludes/mozshm.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para 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;]>
-
-
-    <!-- to go inside a NOTE on mozilla packages which need shm
-         mounted when configured or similar in chroot.
-         Unfortunately, the DTD says an xinclude can only include
-         one paragraph.
-
-         We now have exactly one paragraph, git blame this line for
-         details.                                             -->
-
-    <para>
-      If you are compiling this package in chroot you must
-      ensure that <filename>/dev/shm</filename> is mounted. If you do not
-      do this, the <application>Python</application> configuration will fail
-      with a traceback report referencing
-      <filename>/usr/lib/pythonN.N/multiprocessing/synchronize.py</filename>.
-      As the &root; user, run:
-
-<screen role="nodump"><userinput>mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm</userinput></screen>
-
-    </para>
Index: ncludes/perl-build-install.xml
===================================================================
--- xincludes/perl-build-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <para>
-      This module is built using <filename>Build.PL</filename>:
-
-<screen><userinput>perl Build.PL &amp;&amp;
-./Build       &amp;&amp;
-./Build test</userinput></screen>
-
-      Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>./Build install</userinput></screen>
-
-    </para>
Index: ncludes/perl-standard-install.xml
===================================================================
--- xincludes/perl-standard-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <para>
-      This module uses the standard build and installation instructions:
-
-<screen><userinput>perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-      Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </para>
Index: ncludes/perl-unsafe-install.xml
===================================================================
--- xincludes/perl-unsafe-install.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <!-- typically, these modules fail to reference inc::Module::Install
-     when perl Makefile.PL is run, AND they are OLD, so any update is
-     likely to change them to using the standard install -->
-    <para>
-      This module uses the 'unsafe' build and installation instructions
-      (In <application>perl-5.26.0</application> the use of the current
-      directory in <literal>@INC</literal> was removed for security
-      reasons and this module has not been updated) :
-
-<screen><userinput>PERL_USE_UNSAFE_INC=1 perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-      Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </para>
Index: ncludes/pip3-cmd-explain.xml
===================================================================
--- xincludes/pip3-cmd-explain.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 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;
-  ]>
-
-  <sect3 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-w dist</parameter>: builds the appropriate
-      "wheel" for this module in the directory
-      <filename class="directory">dist</filename>.
-    </para>
-
-    <para>
-      <parameter>--no-build-isolation</parameter>: tells pip3 to run the
-      build in the system environment instead of creating a temporary
-      build environment.
-    </para>
-
-    <para>
-      <parameter>--no-deps</parameter>: prevents pip3 from building wheels for
-      the project's dependencies.
-    </para>
-
-    <para>
-      <parameter>--no-index</parameter>: ignores the package index
-      (only looking at --find-links URLs instead).
-    </para>
-
-    <para>
-      <parameter>--find-links dist</parameter>: looks for links to archives
-      such as wheel (.whl) files in the directory
-      <filename class="directory">dist</filename>.
-    </para>
-
-    <para>
-      <parameter>--no-cache-dir</parameter>: disables the cache to prevent
-      a warning when installing as the &root; user.
-    </para>
-
-    <para>
-      <parameter>--no-user</parameter>: Prevent mistakenly running the
-      install command as a non-root user.
-    </para>
-
-    <para>
-      <option>--upgrade</option>: Upgrade the package to the newest
-       available version.  This option is used with the install command
-       if a version of the package is already installed.
-    </para>
-
-    <para>
-      <option>--force-reinstall</option>: Reinstall the package even if
-      it is up-to-date. This option is used with the install command
-      if reinstalling the package or reverting to an earlier version
-      of the package.
-    </para>
-
-    <para>
-      <option>--no-deps</option>: Do not install package dependencies.
-      This option may be needed with the --upgrade or --force-reinstall
-      options.
-    </para>
-
-  </sect3>
-
Index: ncludes/rm-la-file-referring-icu.xml
===================================================================
--- xincludes/rm-la-file-referring-icu.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para 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;]>
-    <para>
-      The libtool archive file from this package is referring to the
-      libraries from <xref linkend='icu'/>.  Such a reference may cause
-      packages depending on this package to be unnecessary linked against
-      the ICU libraries and increase the burden to rebuild packages if
-      ICU is updated to a new major version.  As we've explained in
-      <xref linkend='la-files'/>, these libtool archive files are unneeded
-      anyway.  So as the &root; user, remove the libtool archive file now:
-    </para>
Index: ncludes/static-libraries.xml
===================================================================
--- xincludes/static-libraries.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-    <para>
-      <parameter>--disable-static</parameter>: This switch prevents
-      installation of static versions of the libraries.
-    </para>
Index: ncludes/tex-lib.xml
===================================================================
--- xincludes/tex-lib.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para>
-  <parameter>--includedir=</parameter>
-  <parameter>--libdir=</parameter> : these switches ensure
-  that the libraries and include files will be within the directories for this
-  year's texlive.
-</para>
Index: ncludes/tex-prefix.xml
===================================================================
--- xincludes/tex-prefix.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para>
-  <parameter>--prefix=</parameter>,
-  <parameter>--bindir=</parameter>,
-  <parameter>--datarootdir=</parameter>,
-  and other <quote>dir</quote> switches: these switches ensure that the files
-  installed from source
-  will overwrite any corresponding files previously installed by
-  <application>install-tl-unx</application> so that the alternative methods of
-  installing <application>texlive</application> are consistent.
-</para>
Index: ncludes/tex-shared.xml
===================================================================
--- xincludes/tex-shared.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para>
-  <parameter>--enable-shared</parameter>: Use shared versions of
-  <filename class="libraryfile">libkpathsea</filename>,
-  <filename class="libraryfile">libptexenc</filename>,
-  <filename class="libraryfile">libsynctex</filename>,
-  <filename class="libraryfile">libtexlua52</filename> and
-  <filename class="libraryfile">libtexluajit</filename>.
-</para>
Index: ncludes/tex-system.xml
===================================================================
--- xincludes/tex-system.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para>
-  <parameter>--with-system-</parameter>...: Unless this parameter is used,
-  the included versions of these libraries  will be statically compiled
-  into the programs which need them.  If you decided not to install a
-  recommended library, omit the corresponding switch.
-</para>
Index: ncludes/tex-xpdf.xml
===================================================================
--- xincludes/tex-xpdf.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para>
-  <parameter>--with-system-xpdf</parameter>: Uniquely, this parameter has
-  a non-standard meaning, it tells <command>configure</command> to use the
-  system-installed <application>poppler</application> headers and library.
-  Again, omit this if you have not installed
-  <application>poppler</application>.
-</para>
Index: ncludes/texoptional.xml
===================================================================
--- xincludes/texoptional.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para role="optional">
-  The source ships with its own versions of several libraries which are either
-  not under active development, or only used for limited functionality.  If
-  you install these, as with some other optional dependencies in this book you
-  will need to tell <command>configure</command> to use the system versions.
-  <ulink url="https://libgd.github.io/">GD</ulink>,
-  <ulink url="https://www.t1lib.org/">t1lib</ulink>,
-  <ulink url="https://github.com/gdraheim/zziplib/">ZZIPlib</ulink>,
-  <ulink url="https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>
-</para>
Index: ncludes/texprogs.xml
===================================================================
--- xincludes/texprogs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para 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;
-]>
-
-
-          <para>The programs included in <application>TeX</application>
-          are too numerous to individually list. Please refer to the individual
-          program HTML and PDF pages in the
-          <!-- the html and pdf here refer to file extensions, not abbreviations,
-           so they are in lowercase -->
-          various html, man, or pdf files within the subdirectories of
-          <filename class="directory">&texlive-year;/texmf-dist/</filename>.
-          Using <command>texdoc pdflatex</command> ( replace
-          <emphasis>pdflatex</emphasis> with the command name ) may also be
-          useful
-          </para>
Index: ncludes/texrecommendlibs.xml
===================================================================
--- xincludes/texrecommendlibs.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,20 +1,0 @@
-
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para role="recommended">
-  The source ships with its own versions of <emphasis>many</emphasis>
-  libraries, and will use them unless it is forced to use the system
-  versions.  The following are recommended so that the system version
-  will be used:
-  <xref linkend="cairo"/>,
-  <xref linkend="fontconfig"/>,
-  <xref linkend="freetype2"/>,
-  <xref linkend="gc"/>,
-  <xref linkend="graphite2"/>,
-  <xref linkend="harfbuzz"/> (built with graphite2 enabled),
-  <xref linkend="icu"/>,
-  <xref linkend="libpaper"/> (used by at least context and xelatex),
-   and <xref linkend="libpng"/>
-</para>
Index: ncludes/texruntime.xml
===================================================================
--- xincludes/texruntime.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<para role="recommended">
-  <xref role="runtime" linkend="python2"/> is used by the unmaintained
-  ebong CTAN module (intended for writing Bengali in Rapid Roman Format).
-  <filename>/usr/bin/python</filename> is also in the shebang line for the
-  latex-papersize and lilyglyphs scripts, and documentation at CTAN says both
-  modules have been updated to work with python3. In pythontex there are
-  scripts to invoke python3 or python2 according to the system's version of
-  <command>python</command>. <xref role="runtime" linkend="ruby"/> is used by
-  two scripts, one is for pTex (Japanese vertical writing) and the other is
-  match_parens which might be generally useful. The perl module <ulink
-  url="https://cpan.metacpan.org/authors/id/S/SR/SREZIC/Tk-804.036.tar.gz">Tk</ulink>,
-  which needs to be run from an X11 session to run the tests and
-  requires <xref role="runtime" linkend="tk"/> is used by one of the scripts
-  for ptex
-  and is needed for texdoctk (a GUI interface for finding documentation files
-  and opening them with the appropriate viewer).
-  <command>ps2pdf</command>, from <xref role='runtime' linkend='gs'/>, is
-  used by some utilities and scripts.
-</para>
Index: ncludes/update-desktop-database.xml
===================================================================
--- xincludes/update-desktop-database.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <note>
-      <para>
-        This package installs desktop files into the
-        <filename class="directory">/usr/share/applications</filename>
-        hierarchy and you can improve system performance and memory usage by
-        updating <filename>/usr/share/applications/mimeinfo.cache</filename>.
-        To perform the update you must have
-        <xref linkend="desktop-file-utils"/> installed and issue the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>update-desktop-database -q</userinput></screen>
-    </note>
Index: ncludes/update-icons-and-desktop.xml
===================================================================
--- xincludes/update-icons-and-desktop.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-    <note>
-      <para>
-        This package installs icon files into the <filename
-        class="directory">/usr/share/icons/hicolor</filename> hierarchy and
-        desktop files into the <filename
-        class="directory">/usr/share/applications</filename> hierarchy. You can
-        improve system performance and memory usage by updating
-        <filename>/usr/share/icons/hicolor/index.theme</filename> and
-        <filename>/usr/share/applications/mimeinfo.cache</filename>. To perform
-        the update you must have <xref linkend="gtk3"/> installed (for the icon
-        cache) and <xref linkend="desktop-file-utils"/> (for the desktop cache)
-        and issue the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor &amp;&amp;
-update-desktop-database -q</userinput></screen>
-    </note>
Index: ncludes/use-unzip.xml
===================================================================
--- xincludes/use-unzip.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-
-<note>
-  <para>The package source is distributed in <filename>zip</filename>
-  format and requires <command>unzip</command> (or
-  <command>bsdunzip</command> from <application>libarchive</application>).
-  You should create a directory and change to that directory before
-  unzipping the file to ease the removal of the source files after the
-  package has been installed.</para>
-</note>
Index: oft/graphweb/epiphany.xml
===================================================================
--- xsoft/graphweb/epiphany.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 epiphany-download-http
-           "&gnome-download-http;/epiphany/&gnome-46;/epiphany-&epiphany-version;.tar.xz">
-  <!ENTITY epiphany-download-ftp  " ">
-  <!ENTITY epiphany-md5sum        "c284bbbad1c08e218c6aae0068906b6f">
-  <!ENTITY epiphany-size          "3.8 MB">
-  <!ENTITY epiphany-buildsize     "59 MB (with tests)">
-  <!ENTITY epiphany-time          "0.3 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="epiphany" xreflabel="Epiphany-&epiphany-version;">
-  <?dbhtml filename="epiphany.html"?>
-
-
-  <title>Epiphany-&epiphany-version;</title>
-
-  <indexterm zone="epiphany">
-    <primary sortas="a-Epiphany">Epiphany</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Epiphany</title>
-
-    <para>
-      <application>Epiphany</application> is a simple yet powerful
-      <application>GNOME</application> web browser targeted at non-technical
-      users. Its principles are simplicity and standards compliance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&epiphany-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&epiphany-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &epiphany-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &epiphany-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &epiphany-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &epiphany-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Epiphany Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gcr4"/>,
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libportal"/>,
-      <xref linkend="nettle"/>, and
-      <xref linkend="webkitgtk"/> (built with GTK-4)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&appstream-glib-url;">Appstream-Glib</ulink> and
-      <ulink url="https://github.com/elementary/granite">Granite</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="gnome-keyring"/> (for storing passwords) and
-      <xref role="runtime" linkend="seahorse"/> (for managing stored passwords)
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/epiphany"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Epiphany</title>
-
-    <para>
-      Install <application>Epiphany</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                href="../../xincludes/gsettings-destdir.xml"/>
-
-    <para>
-      One test would fail if this package is not installed,
-      so it's better to run the test suite after installation.
-      To test the results, issue <command>ninja test</command>.
-      The tests must be run from a graphical session.
-    </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>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          epiphany
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/{lib,libexec,share,share/help/*}/epiphany
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="epiphany-prog">
-        <term><command>epiphany</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> web browser based on
-            the <application>WebKit2</application> rendering engine
-          </para>
-          <indexterm zone="epiphany epiphany-prog">
-            <primary sortas="b-epiphany">epiphany</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/graphweb/falkon.xml
===================================================================
--- xsoft/graphweb/falkon.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 falkon-download-http "&kf6apps-download-http;/falkon-&kf6apps-version;.tar.xz">
-  <!ENTITY falkon-download-ftp  " ">
-  <!ENTITY falkon-md5sum        "679f33b2b67ff0ca54bd80dcc6686115">
-  <!ENTITY falkon-size          "2.5 MB">
-  <!ENTITY falkon-buildsize     "146 MB">
-  <!ENTITY falkon-time          "2.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
-]>
-
-<sect1 id="falkon" xreflabel="falkon-&kf6apps-version;">
-  <?dbhtml filename="falkon.html"?>
-
-
-  <title>Falkon-&kf6apps-version;</title>
-
-  <indexterm zone="falkon">
-    <primary sortas="a-falkon">falkon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to falkon</title>
-
-    <para>
-      <application>Falkon</application> is a KDE web browser using the QtWebEngine
-      rendering engine. It was previously known as <application>QupZilla</application>.
-      It aims to be a lightweight web browser available through all major platforms.
-    </para>
-
-    <para>
-      Although <application>falkon</application> is now part of KDE, it can be
-      installed without KDE (with the loss of <application>kwallet</application>
-      functionality).
-    </para>
-
-    <para>
-      Falkon relies on QtWebEngine. Please read the warning on that page.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&falkon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&falkon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &falkon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &falkon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &falkon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &falkon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">falkon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="extra-cmake-modules"/>,
-      <xref linkend="kf6-frameworks"/> (for karchive), and
-      <xref linkend="qtwebengine"/>
-    </para>
-
-    <note>
-      <para>
-        Strictly speaking, only karchive is required to build falkon, but
-        several other packages in <xref linkend="kf6-frameworks"/> can be used
-        if they are present. To build only karchive, download that package from
-        the directory specified in <xref linkend="kf6-frameworks"/> and use the
-        build instructions on that page changing the $KF6_PREFIX to /usr.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnome-keyring"/>,
-      <ulink url="https://pypi.org/project/PySide2/">PySide2</ulink>, and
-      <ulink url="https://pypi.org/project/shiboken2/">Shiboken2</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/falkon"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of falkon</title>
-
-    <para>
-      Install <application>falkon</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  \
-      .. &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      Tests should be run after installation.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ldconfig</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>. All
-      tests should pass. If any fail, the full results will be in
-      <filename>Testing/Temporary/LastTest.log</filename>.
-    </para>
-
-    <note>
-      <para>
-        When upgrading this package, it is possible that the contents
-        of the application will remain empty even though everything else
-        appears to be working properly.  In this case try removing
-        <filename>~/.cache/falkon</filename> and restarting the program.
-      </para>
-    </note>
-
-    <para>
-      If you have installed <application>Pyside2</application> you will want to
-      examine <command>hellopython.py</command> which is in the <filename
-      class="directory">scripts/</filename> directory, and perhaps copy it to
-      your home directory.
-    </para>
-
-    <note>
-      <para>
-        If you are on a non-x86_64 architecture and run into problems with
-        missing text, you may wish to export
-        <envar>QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox"</envar> prior to
-        running Falkon.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TESTING=OFF</option>: This will save a little time and space by
-      not building the test programs, use this if you do not wish to run the test.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          falkon
-        </seg>
-        <seg>
-          libFalkonPrivate.so.3
-        </seg>
-        <seg>
-          /usr/share/falkon
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="falkon-prog">
-        <term><command>falkon</command></term>
-        <listitem>
-          <para>
-            is a web browser which uses qtwebengine
-          </para>
-          <indexterm zone="falkon falkon-prog">
-            <primary sortas="b-falkon">falkon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libFalkonPrivate.so.3">
-        <term><filename class="libraryfile">libFalkonPrivate.so.3</filename></term>
-        <listitem>
-          <para>
-            contains functions used by falkon
-          </para>
-          <indexterm zone="falkon libFalkonPrivate.so.3">
-            <primary sortas="c-libFalkonPrivate.so.3">libFalkonPrivate.so.3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: oft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,674 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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/&firefox-version;esr/source/firefox-&firefox-version;esr.source.tar.xz">
-  <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "150ac3fe6200f01879148ef32c5dd16f">
-  <!ENTITY firefox-size          "484 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.7 GB (199 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          "12 SBU using -j8, without tests">
-]>
-
-<sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
-  <?dbhtml filename="firefox.html" ?>
-
-
-<!-- indicate this is the ESR variant,
-  The point is that the stable release differs slightly.
-  <title>Firefox-&firefox-version;</title>-->
-  <title>Firefox-&firefox-version;esr</title>
-
-  <indexterm zone="firefox">
-    <primary sortas="a-Firefox">Firefox</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Firefox</title>
-
-    <para>
-      <application>Firefox</application> is a stand-alone browser based on the
-      <application>Mozilla</application> codebase.
-    </para>
-
-    &lfs121_checked;
-
-    <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;-consolidated-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch for new <xref linkend="ffmpeg"/> API:
-          <ulink url="&patch-root;/firefox-&firefox-version;-ffmpeg_6-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <note>
-      <para>
-        The directory name is firefox-&firefox-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="cbindgen"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libnotify"/>,
-      <xref linkend="llvm"/> (with clang, used for bindgen even if using gcc),
-      <xref linkend="nodejs"/>,
-      <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,
-      <xref linkend="python311"/> (built after installing <xref linkend="sqlite"/>),
-      <!--<xref linkend="six"/>,-->
-      <xref linkend="startup-notification"/>, and
-      <xref linkend="unzip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>,
-      <xref linkend="libevent"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="nasm"/>, and
-      <xref linkend="nss"/>
-    </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),
-      <xref linkend="liboauth"/>,
-      <xref role="runtime" linkend="pciutils"/> (runtime),
-      <xref linkend="valgrind"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>,
-      <xref linkend="yasm"/>,
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/firefox"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Firefox</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 -- --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
-
-# Uncomment the following line if you wish to use Google's Geolocation 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 and
-# want to use alsa instead
-#ac_add_options --enable-audio-backends=alsa
-
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --with-system-icu
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-webp
-
-# Unlike with thunderbird, although using the gold linker can
-# save four megabytes in the installed file it does not make
-# the build faster.
-
-# The libdav1d library (av1 decoder) requires nasm. Uncomment this
-# if nasm has not been installed. Do not uncomment this if you have
-# ffmpeg 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.
-ac_add_options --disable-debug-symbols
-<!-- With Firefox ESR 128 we'd replace the following part with
-"- -enable-elf-hack=relr", or remove it if relr becomes the default. -->
-# 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.  With recent Binutils releases the linker already
-# supports a much safer and generic way for this.
-ac_add_options --disable-elf-hack
-export LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs"
-
-# 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
-
-# This enables SIMD optimization in the shipped encoding_rs crate.
-ac_add_options --enable-rust-simd
-
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# Sandboxing works well on x86_64 but might cause issues on other
-# platforms. If not on x86_64, e.g. i686, it is recommended to
-# uncomment the following switch.
-#ac_add_options --disable-sandbox
-
-# Using sandboxed wasm libraries has been moved to all builds instead
-# of only mozilla automation builds. It requires extra llvm packages
-# and was reported to seriously slow the build. Disable it.
-ac_add_options --without-wasm-sandboxed-libraries
-
-# 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>
-
-    <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=1859752
-         https://hg.mozilla.org/try/rev/d5f3b0c4f08a -->
-    <para>
-      If building with system ICU, adapt the line break mapping for ICU
-      74 or later.  This construct adds five entries to a c++ array.
-    </para>
-
-<screen><userinput>for i in {43..47}; do
-   sed -i '/ZWJ/s/}/,CLASS_CHARACTER&amp;/' intl/lwbrk/LineBreaker.cpp 
-done</userinput></screen>
-
-    <para>
-      Compile <application>Firefox</application> by issuing the following
-      commands:
-    </para>
-<!-- Not needed with clang. Upstream bug at
-     https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
-    <para>
-      If building on a 32 bit machine, the following sed works around
-      an issue with an incompatible <quote>double</quote> type in one
-      header file:
-    </para>
-
-<screen><userinput>case "$(uname -m)" in
-    i?86) sed -e '/typedef[ ]*double/s/double/long double/' \
-              -i modules/fdlibm/src/math_private.h ;;
-esac</userinput></screen>
--->
-    <para>
-      If the geolocation APIs are needed:
-    </para>
-
-    <note>
-      <para>
-        <!-- Taken from Arch Linux - an immensely helpful link - Thanks -->
-        The Google API Key below is 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 key following the instructions located at
-        <ulink url="https://www.chromium.org/developers/how-tos/api-keys"/>.
-        <!-- 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</userinput></screen>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozshm.xml"/>
-    </note>
-
-<!--<para>
-      Fix building Firefox with Clang 16 or C++ headers from GCC 13.
-      And, work around a build failure with Rustc-1.70.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../firefox-&firefox-version;-consolidated-1.patch</userinput></screen>
-
-    <para>
-      Apply the following patch so that firefox is able to play H.264 videos:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../firefox-&firefox-version;-ffmpeg_6-1.patch</userinput></screen>-->
-
-    <!-- https://github.com/rust-lang/rust-bindgen/pull/2689 -->
-    <para>
-      Adapt the shipped <application>rust-bindgen</application> copy for
-      LLVM-18 and later, and tell <command>cargo</command> we've modified
-      the code of <application>rust-bindgen</application> so the checksum
-      verification of this crate should be skipped:
-    </para>
-
-    <screen><userinput>sed -e "/match cursor.kind()/a                                    \
-        CXCursor_LinkageSpec => return Err(ParseError::Recurse)," \
-    -i third_party/rust/bindgen/ir/item.rs                        &amp;&amp;
-
-cat &gt;&gt; Cargo.toml &lt;&lt; EOF &amp;&amp;
-<literal>[patch.crates-io.bindgen_0_64_0]
-package = "bindgen"
-version = "0.64.0"
-path = "third_party/rust/bindgen"</literal>
-EOF
-
-sed -r '/name = "bindgen"/,+5 s/^source|^checksum/#&amp;/' \
-    -i Cargo.lock</userinput></screen>
-
-    <!-- https://hg.mozilla.org/mozilla-central/rev/ba6abbd36b49 -->
-    <para>
-      Adapt the WebRTC code to use 64-bit timestamp to fix a build
-      failure with Clang-18 and later:
-    </para>
-
-    <screen><userinput>sed 's/uint32_t timestamp/uint64_t timestamp/'                \
-    -i dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp    \
-       dom/media/gtest/TestGMPRemoveAndDelete.cpp             \
-       dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp &amp;&amp;
-
-sed '/mInputImageMap/s/uint32_t/uint64_t/' \
-    -i dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h</userinput></screen>
-
-    <para>
-      Now invoke the Python <command>mach</command> script to compile the package.
-    </para>
-
-<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export MOZBUILD_STATE_PATH=${PWD}/mozbuild          &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./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>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./mach install</userinput></screen>
-
-    <para>
-      Empty the environment variables which were set above:
-    </para>
-
-<screen><userinput>unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE
-unset MOZBUILD_STATE_PATH
-unset PYTHON311</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>export MOZBUILD_STATE_PATH=${PWD}/mozbuild</command>: The build
-      tells 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 directory within the build directory and deleting it after the
-      installation prevents it being used.
-    </para>
-
-    <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
-      system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels and without using the system python modules.
-      This prevents version mismatches between system modules and bundled ones.
-    </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
-      since 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>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Set these environment variables
-      <emphasis>before you run the configure script</emphasis>
-      if you wish to continue to use gcc, g++. Building
-      with GCC on i?86 is currently broken.
-    </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 want to create a
-      <filename>firefox.desktop</filename> file so that
-      <application>Firefox</application> appears in the panel's menus.
-      As the &root; 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+="application/xhtml+xml;application/vnd.mozilla.xul+xml;" &amp;&amp;
-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 terminal 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 terminal 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
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="firefox-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 firefox-prog">
-            <primary sortas="b-firefox">firefox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/graphweb/galeon.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="galeon" xreflabel="galeon">
+<?dbhtml filename="galeon.html" dir="xsoft"?>
+<title>galeon</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: xsoft/graphweb/galeon/galeon.ent
===================================================================
--- xsoft/graphweb/galeon/galeon.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/graphweb/galeon/galeon.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY galeon SYSTEM "../galeon.xml">
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/graphweb/graphweb.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,29 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="xsoft-graphweb">
+<?dbhtml filename="graphweb.html" dir="xsoft"?>
+<title>Graphical Web Browsers</title>
 
-<chapter id="xsoft-graphweb">
-  <?dbhtml filename="graphweb.html" ?>
-
-  <title>Graphical Web Browsers</title>
-
-  <para>
-    This chapter contains a wonderful selection of browsers. We hope
-    you can find one you enjoy using or give them each a trial run.
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chromium.xml"/>-->
-  <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"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seamonkey.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="galeon.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konq.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dillo.xml"/> -->
+&mozilla;
+&galeon;
+&xsoft-graphweb-konq;
 
 </chapter>
Index: xsoft/graphweb/konq.xml
===================================================================
--- xsoft/graphweb/konq.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/graphweb/konq.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="konq" xreflabel="konq">
+<?dbhtml filename="konq.html" dir="xsoft"?>
+<title>konqueror</title>
+
+<para>Point back to the KDE section.</para>
+
+</sect1>
+
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/graphweb/mozilla.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="mozilla" xreflabel="mozilla">
+<?dbhtml filename="mozilla.html" dir="xsoft"?>
+<title>mozilla</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: xsoft/graphweb/mozilla/mozilla.ent
===================================================================
--- xsoft/graphweb/mozilla/mozilla.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/graphweb/mozilla/mozilla.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY mozilla SYSTEM "../mozilla.xml">
Index: oft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,487 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 seamonkey-download-http "https://archive.seamonkey-project.org/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.xz">
-  <!ENTITY seamonkey-download-ftp  " ">
-  <!ENTITY seamonkey-md5sum        "266a86651348e21934707a7ccb3abef3">
-  <!ENTITY seamonkey-size          "241 MB">
-  <!ENTITY seamonkey-buildsize     "3.0 GB (148 MB installed)">
-  <!ENTITY seamonkey-time          "3.5 SBU (with parallelism=8)">
-]>
-
-<sect1 id="seamonkey" xreflabel="seamonkey-&seamonkey-version;">
-  <?dbhtml filename="seamonkey.html" ?>
-
-
-  <title>Seamonkey-&seamonkey-version;</title>
-
-  <indexterm zone="seamonkey">
-    <primary sortas="a-seamonkey">seamonkey</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Seamonkey</title>
-
-    <para>
-      <application>Seamonkey</application> is a browser suite, a descendant
-      of <application>Netscape</application>. It includes the browser,
-      composer, mail and news clients, and an IRC client.
-    </para>
-
-    <para>
-      It is the community-driven follow-on to the Mozilla Application Suite,
-      created after Mozilla decided to focus on separate applications for
-      browsing and e-mail. Those applications are
-      <xref linkend="firefox"/> and <xref linkend="thunderbird"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&seamonkey-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&seamonkey-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &seamonkey-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &seamonkey-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &seamonkey-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &seamonkey-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/seamonkey-&seamonkey-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required Python module:
-          <ulink url="&pymodules-dl;/s/setuptools/setuptools-&setuptools-version;.tar.gz"/>
-        </para>
-        <para>
-          This module has already been installed in LFS, but now we need
-          to rebuild its wheel package for the SeaMonkey build system.
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <note>
-      <para>
-        The tarball
-        <emphasis>seamonkey-&seamonkey-version;.source.tar.xz</emphasis> will
-        untar to <emphasis>seamonkey-&seamonkey-version;</emphasis> directory.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Seamonkey Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!--xref linkend="autoconf213"/-->
-      <xref linkend="cbindgen"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="nodejs"/>,
-      <xref linkend="python311"/>,
-      <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="libvpx"/>, Causes build failures similar to Firefox -->
-      <xref linkend="libwebp"/>,
-      <xref linkend="llvm"/> (with clang),
-      <xref linkend="nasm"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="nss"/>, and
-      <xref linkend="pulseaudio"/>
-      <!-- <xref linkend="sqlite"/> system version no longer supported -->
-    </para>
-<!--
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sqlite"/> (not recommended due to potential
-      security concerns)
-    </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="alsa-lib"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>,
-      <ulink url="https://hunspell.sourceforge.net/">Hunspell</ulink>,
-      <ulink url="https://gitlab.gnome.org/Archive/gconf">Gconf</ulink>, and
-      <ulink url="https://facebook.github.io/watchman/">Watchman</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Seamonkey</title>
-
-    <para>
-      The configuration of <application>Seamonkey</application> is accomplished
-      by creating a <filename>mozconfig</filename> file containing the desired
-      configuration options. A default <filename>mozconfig</filename> file is
-      created below. To see the entire list of available configuration options
-      (and an abbreviated description of each one), issue
-      <command>./configure --help</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><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, all cores will be used
-
-# If you have installed DBus-Glib comment out this line:
-ac_add_options --disable-dbus
-
-# If you have installed dbus-glib, and 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
-
-# Uncomment these lines if you have installed optional dependencies:
-#ac_add_options --enable-system-hunspell
-#ac_add_options --enable-startup-notification
-
-# Uncomment the following option if you have not installed PulseAudio
-#ac_add_options --disable-pulseaudio
-# and uncomment this if you installed alsa-lib instead of PulseAudio
-#ac_add_options --enable-alsa
-
-# Comment out the following option if you have gconf installed
-ac_add_options --disable-gconf
-
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --with-system-icu
-ac_add_options --with-system-libevent
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-webp
-
-# Disabling debug symbols makes the build much smaller and a little
-# faster. Comment this if you need to run a debugger.
-ac_add_options --disable-debug-symbols
-<!-- With Firefox ESR 128 we'd replace the following part with
-"- -enable-elf-hack=relr", or remove it if relr becomes the default.
-But I've no idea if SeaMonkey will have this change backported.  -->
-# 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.  With recent Binutils releases the linker already
-# supports a much safer and generic way for this.
-ac_add_options --disable-elf-hack
-ac_add_options --enable-linker=bfd
-export LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs"
-
-# 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 --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-
-# This enables SIMD optimization in the shipped encoding_rs crate.
-ac_add_options --enable-rust-simd
-
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-
-# You cannot distribute the binary if you do this.
-ac_add_options --enable-official-branding
-
-# The option to use system cairo was removed in 2.53.9.
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-export CC=clang CXX=clang++</literal>
-EOF</userinput></screen>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozshm.xml"/>
-    </note>
-
-<!-- Restore when no longer using Python 3.11. We may want to restore the patch
-     at that point as well, which includes the 'distro' and 'ICU' changes. -renodr
-    <para>
-      First, fix several problems that occur with Python-3.12 and ICU-74.
-      If you are not using ICU-74 and Python-3.12, do not apply this patch.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../seamonkey-&seamonkey-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, if you are using Python-3.12, reinstall the setuptools package for
-      Seamonkey, and update it's vendored copy of pip:
-    </para>
-
-<screen><userinput>ln -sv /usr/lib/python&python3-majorver;/ensurepip/_bundled/pip-*.whl \
-       third_party/python/virtualenv/virtualenv_support &amp;&amp;
-
-tar xf ../setuptools-&setuptools-version;.tar.gz                             &amp;&amp;
-pip3 wheel - -no-build-isolation - -no-deps - -no-cache-dir       \
-           $PWD/setuptools-&setuptools-version;                              \
-           -w third_party/python/virtualenv/virtualenv_support</userinput></screen>
--->
-
-    <para>
-      First, if you are building with system ICU, adapt the line break mapping
-      for ICU-74 and later:
-    </para>
-
-<screen><userinput remap="pre">(for i in {43..47}; do
-   sed '/ZWJ/s/$/,CLASS_CHARACTER/' -i intl/lwbrk/LineBreaker.cpp || exit $?
-done)</userinput></screen>
-
-    <para>
-      Next, fix a problem with the bundled 'distro' python module:
-    </para>
-
-<screen><userinput remap="pre">sed -e '1012 s/stderr=devnull/stderr=subprocess.DEVNULL/' \
-    -e '1013 s/OSError/(OSError, subprocess.CalledProcessError)/' \
-    -i third_party/python/distro/distro.py</userinput></screen>
-
-    <para>
-      Compile <application>Seamonkey</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export PATH_PY311=/opt/python3.11/bin:$PATH &amp;&amp;
-PATH=$PATH_PY311 AUTOCONF=true ./mach build</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Install <application>Seamonkey</application> by issuing the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <note>
-      <para>
-        If <command>sudo</command> or <command>su</command> is invoked for
-        opening a shell running as the &root; user, ensure
-        <envar>PATH_PY311</envar> is correctly passed or the
-        following command will fail.  For <command>sudo</command>, use the
-        <option>--preserve-env=PATH_PY311</option> option.
-        For <command>su</command>, do <emphasis>not</emphasis> use the
-        <option>-</option> or <option>--login</option> options.
-      </para>
-    </note>
-
-<screen role="root"><userinput>PATH=$PATH_PY311 ./mach install &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>
-
-    <para>
-      Finally, unset the <envar>PATH_PY311</envar> variable:
-    </para>
-
-<screen><userinput>unset $PATH_PY311</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>export CC=clang CXX=clang++</command>:
-      With the introduction of <application>gcc-12</application>, many
-      more warnings are generated when compiling mozilla applications
-      and that results in a much slower, and larger, build. Furthermore,
-      building with GCC on i?86 is currently broken.
-      Although upstream mozilla code defaults to using
-      <application>llvm</application> unless overridden, the older configure
-      code in <application>Seamonkey</application> defaults to gcc.
-    </para>
-
-<!--
-    <para>
-      <command>AUTOCONF=true ./mach configure</command>: This validates
-      the supplied dependencies and the <filename>mozconfig</filename>.
-      The building system always checks for an old version (2.13) of
-      autoconf, but it's not really needed because the necessary
-      <command>configure</command> scripts are already shipped in the
-      tarball and we've not modified the <filename>configure.in</filename>
-      files.  So we pass <envar>AUTOCONF=true</envar> so the building system
-      will skip the checking for autoconf-2.13 and allow building this
-      package without autoconf-2.13 installed.
-    </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>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Seamonkey</title>
-
-    <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>.
-    </para>
-
-    <para>
-      Along with using the <quote>Preferences</quote> menu to configure
-      <application>Seamonkey</application>'s options and preferences to suit
-      individual tastes, finer grain control of many options is only available
-      using a tool not available from the general menu system. To access this
-      tool, you'll need to open a browser window and enter
-      <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
-      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
-      (True/False), simply double-click on the preference to toggle the value
-      and two, for other preferences simply right-click on the desired line,
-      choose <quote>Modify</quote> from the menu and change the value. Creating
-      new preference items is accomplished in the same way, except choose
-      <quote>New</quote> from the menu and provide the desired data into the
-      fields when prompted.
-    </para>
-
-    <para>
-      If you use a desktop environment like <application>Gnome</application> or
-      <application>KDE</application> you may wish to create a
-      <filename>seamonkey.desktop</filename> file so that
-      <application>Seamonkey</application> appears in the panel's menus. If you
-      didn't enable <application>Startup-Notification</application> 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,pixmaps}              &amp;&amp;
-
-cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Seamonkey
-Comment=The Mozilla Suite
-Icon=seamonkey
-Exec=seamonkey
-Categories=Network;GTK;Application;Email;Browser;WebBrowser;News;
-StartupNotify=true
-Terminal=false</literal>
-EOF
-
-ln -sfv /usr/lib/seamonkey/chrome/icons/default/default128.png \
-        /usr/share/pixmaps/seamonkey.png</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>seamonkey</seg>
-        <seg>
-          Numerous libraries, browser, and email/newsgroup components, plugins,
-          extensions, and helper modules installed in
-          <filename class="directory">/usr/lib/seamonkey</filename>
-        </seg>
-        <seg>
-          /usr/lib/seamonkey
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="seamonkey-prog">
-        <term><command>seamonkey</command></term>
-        <listitem>
-          <para>
-            is the Mozilla browser/email/newsgroup/chat client suite
-          </para>
-          <indexterm zone="seamonkey seamonkey-prog">
-            <primary sortas="b-seamonkey">seamonkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/office/abiword.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,380 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="abiword" xreflabel="abiword">
+<?dbhtml filename="abiword.html" dir="xsoft"?>
+<title>abiword</title>
 
-  <!ENTITY AbiWord-minor-version "3.0">
-  <!ENTITY AbiWord-docs-version "3.0.2">
-
-  <!ENTITY AbiWord-download-http
-           "&sources-anduin-http;/abiword/abiword-&AbiWord-version;.tar.gz">
-  <!ENTITY AbiWord-download-ftp  " ">
-  <!ENTITY AbiWord-md5sum        "a8f218b711450e4ccae43a0522e0e806">
-  <!ENTITY AbiWord-size          "11 MB">
-
-  <!ENTITY AbiWordDocs-download-http
-           "&sources-anduin-http;/abiword/abiword-docs-&AbiWord-docs-version;.tar.gz">
-  <!ENTITY AbiWordDocs-md5sum        "c92c0e1e2081db20757231a53d80c338">
-  <!ENTITY AbiWordDocs-size          "1.5 MB">
-
-  <!ENTITY AbiWord-buildsize     "690 MB, with docs (76 MB installed)">
-  <!ENTITY AbiWord-time          "2.4 SBU (Using parallelism=4, with docs)">
-]>
-
-<sect1 id="abiword" xreflabel="AbiWord-&AbiWord-version;">
-  <?dbhtml filename="AbiWord.html" ?>
-
-
-  <title>AbiWord-&AbiWord-version;</title>
-
-  <indexterm zone="abiword">
-    <primary sortas="a-AbiWord">AbiWord</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AbiWord</title>
-
-    <para>
-      <application>AbiWord</application> is a word processor which is useful for
-      writing reports, letters and other formatted documents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&AbiWord-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&AbiWord-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &AbiWord-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &AbiWord-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &AbiWord-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &AbiWord-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          AbiWord Docs: <ulink url="&AbiWordDocs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          AbiWord Docs MD5 sum: &AbiWordDocs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          AbiWord Docs size: &AbiWordDocs-size;
-        </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>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="fribidi"/>,
-      <xref linkend="goffice010"/>, and
-      <xref linkend="wv"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="evolution-data-server"/>,
-      &gobject-introspection;,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libical"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="redland"/>,
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="valgrind"/>.
-      <ulink url="https://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
-      <ulink url="https://github.com/AbiWord/gtkmathview">GtkMathView</ulink>,
-      <ulink url="https://gitlab.gnome.org/GNOME/libchamplain/">libchamplain</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="https://github.com/opencog/link-grammar">
-      Link Grammar Parser</ulink>,
-      <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink>,
-      <ulink url="https://packages.ubuntu.com/focal/libots-dev">OTS</ulink>, and
-      <ulink url="https://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>
-    </para>
-
-    <note>
-      <para>
-        To enable many of the optional dependencies, review the information
-        from <command>./configure --help</command> for the necessary switches
-        you must pass to the <command>configure</command> script.
-      </para>
-    </note>
-
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/abiword"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AbiWord</title>
-
-    <para>
-      First, fix a build failure when using libxml-2.12.x:
-    </para>
-
-<screen><userinput>sed -e '/libxml/a #include &lt;libxml/xmlmemory.h&gt;' \
-    -i src/af/util/xp/ut_stringbuf.cpp</userinput></screen>
-
-    <para>
-      Install <application>AbiWord</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e "s/free_suggestions/free_string_list/" \
-    -e "s/_to_personal//"                     \
-    -e "s/in_session/added/"                  \
-    -i src/af/xap/xp/enchant_checker.cpp      &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This program does not come with a functional test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note>
-      <para>
-        In order to install the local help files,
-        a graphics session is recommended.
-      </para>
-    </note>
-
-    <para>
-      If you wish to install the local help files, untar and build them first:
-    </para>
-
-    <note>
-      <para>
-        The current version of the docs expands to abiword-docs-3.0.1
-        and not the expected abiword-docs-3.0.2.
-      </para>
-    </note>
-
-<!-- I had to hardcode the docs version here, as it doesn't decompress to
-     abiword-docs-3.0.2. -->
-<screen><userinput>tar -xf ../abiword-docs-&AbiWord-docs-version;.tar.gz &amp;&amp;
-cd abiword-docs-3.0.1                &amp;&amp;
-./configure --prefix=/usr            &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      and then, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: This command corrects the source for
-      changes in the dependency <xref linkend="enchant"/>.
-    </para>
-<!--
-    <para>
-      <parameter>- -without-evolution-data-server</parameter>: This switch
-      disables <application>AbiWord</application>
-      <application>Evolution Data Server</application> support which is known
-      to fail when using recent versions of
-      <application>Evolution Data Server</application>.
-    </para>
--->
-    <para>
-      <option>--enable-plugins="collab openxml goffice grammar"</option>: Build
-      some or all plugins. The openxml plugin enables
-      <application>Abiword</application> to open some .docx files.
-      The grammar plugin requires
-      <ulink url="https://github.com/opencog/link-grammar">Link Grammar
-      Parser</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring AbiWord</title>
-
-    <sect3 id="abiword-config">
-      <title>Config File</title>
-
-      <para>
-        <filename>~/.AbiSuite/templates/normal.awt</filename>
-      </para>
-
-      <indexterm zone="abiword abiword-config">
-        <primary sortas="e-AA.AbiSuite-templates-normal">~/.AbiSuite/templates/normal.awt</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Choose the right template for your language and locale from the list
-        produced by the following command:
-      </para>
-
-<screen><userinput>ls /usr/share/abiword-&AbiWord-minor-version;/templates</userinput></screen>
-
-      <para>
-        Create the folder
-        <filename class='directory'>~/.AbiSuite/templates</filename> then copy
-        the <filename>normal.awt</filename> you want into it:
-      </para>
-
-<screen><userinput>install -v -m750 -d ~/.AbiSuite/templates &amp;&amp;
-install -v -m640    /usr/share/abiword-&AbiWord-minor-version;/templates/normal.awt-<replaceable>&lt;lang&gt;</replaceable> \
-                    ~/.AbiSuite/templates/normal.awt</userinput></screen>
-
-      <para>
-        Change <replaceable>&lt;lang&gt;</replaceable> by the above command to
-        fit the name of the file you want.
-      </para>
-
-      <para>
-        If you are using multiple languages, you may need to edit the template
-        to use a font with greater coverage (e.g. one of the
-        <xref linkend="dejavu-fonts"/>,
-    <!--
-        <ulink url="https://dejavu.sourceforge.net/">DejaVu fonts</ulink>), -->
-        because <application>Abiword</application> does not use
-        <application>fontconfig</application> and can only display glyphs that
-        are provided in the chosen font.
-      </para>
-
-      <para>
-        If you have <xref linkend="desktop-file-utils"/> installed, you should
-        run the <command>update-desktop-database</command> command to update the
-        mimeinfo cache and allow the Help system to work.
-      </para>
-
-      <para>
-        If you have <xref linkend="xdg-utils"/> installed, you should
-        run the <command>xdg-icon-resource forceupdate --theme hicolor</command>
-        command, for the installed icon to be displayed in the menu item.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          abiword
-        </seg>
-        <seg>
-          libabiword-&AbiWord-minor-version;.so
-        </seg>
-        <seg>
-          /usr/include/abiword-&AbiWord-minor-version;,
-          /usr/lib/abiword-&AbiWord-minor-version;, and
-          /usr/share/abiword-&AbiWord-minor-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="abiword-prog">
-        <term><command>abiword</command></term>
-        <listitem>
-          <para>
-            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>
-          </para>
-          <indexterm zone="abiword abiword-prog">
-            <primary sortas="b-abiword">abiword</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libabiword">
-        <term><filename class="libraryfile">libabiword-&AbiWord-minor-version;.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to access MS Word documents
-          </para>
-          <indexterm zone="abiword libabiword">
-            <primary sortas="c-libabiword">libabiword-&AbiWord-minor-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: xsoft/office/abiword/abiword.ent
===================================================================
--- xsoft/office/abiword/abiword.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/abiword/abiword.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY abiword SYSTEM "../abiword.xml">
Index: xsoft/office/gimp.xml
===================================================================
--- xsoft/office/gimp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/gimp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="gimp" xreflabel="gimp">
+<?dbhtml filename="gimp.html" dir="xsoft"?>
+<title>gimp</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: xsoft/office/gimp/gimp.ent
===================================================================
--- xsoft/office/gimp/gimp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/gimp/gimp.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY gimp SYSTEM "../gimp.xml">
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/gnucash.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="gnucash" xreflabel="gnucash">
+<?dbhtml filename="gnucash.html" dir="xsoft"?>
+<title>gnucash</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: xsoft/office/gnucash/gnucash.ent
===================================================================
--- xsoft/office/gnucash/gnucash.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/gnucash/gnucash.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY gnucash SYSTEM "../gnucash.xml">
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/office/gnumeric.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,275 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="gnumeric" xreflabel="gnumeric">
+<?dbhtml filename="gnumeric.html" dir="xsoft"?>
+<title>gnumeric</title>
 
-  <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
-  <!ENTITY gnumeric-download-ftp  " ">
-  <!ENTITY gnumeric-md5sum        "237ce4f6c43661892e802bf81dbff1b2">
-  <!ENTITY gnumeric-size          "17 MB">
-  <!ENTITY gnumeric-buildsize     "244 MB (add 4 MB for tests)">
-  <!ENTITY gnumeric-time          "0.8 SBU (add 1.7 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="gnumeric" xreflabel="Gnumeric-&gnumeric-version;">
-  <?dbhtml filename="gnumeric.html"?>
-
-
-  <title>Gnumeric-&gnumeric-version;</title>
-
-  <indexterm zone="gnumeric">
-    <primary sortas="a-Gnumeric">Gnumeric</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gnumeric</title>
-
-    <para>
-      The <application>Gnumeric</application> package contains a
-      spreadsheet program which is useful for mathematical analysis.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnumeric-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnumeric-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnumeric-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnumeric-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnumeric-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnumeric-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gnumeric Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="goffice010"/> and
-      <xref linkend="itstool"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended Runtime</bridgehead>
-    <para role="recommended">
-      an icon theme such as
-      <xref role="runtime" linkend="adwaita-icon-theme"/>,
-      <xref role="nodep" linkend="oxygen-icons"/>, or
-      <xref role="runtime" linkend="gnome-icon-theme"/>,
-      <xref role="runtime" linkend="x-window-system"/>, and
-      <xref role="runtime" linkend="yelp"/> for the built-in help functionality
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dconf"/> (to prevent some test failures),
-      &gobject-introspection;,
-      <xref linkend="pygobject3"/>,
-      <xref linkend="valgrind"/> (for some tests),
-<!--  <xref linkend="guile"/>, Developer: support unmaintained-->
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink> (for PDF docs),
-      <ulink url="https://www.gnome-db.org/">libgda</ulink>,
-      <ulink url="https://www.mono-project.com/">Mono</ulink>,
-      <ulink url="https://pxlib.sourceforge.net/">pxlib</ulink>, and
-      <ulink url="https://frodo.looijaard.name/project/psiconv">Psiconv</ulink>
-    </para>
-
-<!--  Now in "recommendended runtime deps". Keeping as a comment because it
-      is easier to revert
-   <note>
-      <para>
-        Though only a run-time dependency, if you don't install the
-        <xref linkend="yelp"/> package, the built-in help functionality in
-        <application>Gnumeric</application> will not be available.
-      </para>
-    </note>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gnumeric</title>
-
-    <para>
-      Install <application>Gnumeric</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package must be installed before the test suite is run.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-
-    <para>
-      To run the tests, issue <command>make check</command>.  Tests should be
-      run from an active X session, and <xref linkend="dconf"/> should be
-      installed to prevent some failures.  Two tests are known to fail.
-      Additional failures may occur if valgrind is installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-pdfdocs</option>: Use this switch if you have
-      installed dblatex and wish to create PDF docs.
-    </para>
-
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnumeric (symlink), gnumeric-&gnumeric-version;, ssconvert,
-          ssdiff, ssgrep, and ssindex
-        </seg>
-        <seg>
-          libspreadsheet.so
-        </seg>
-        <seg>
-          /usr/include/libspreadsheet-1.12,
-          /usr/lib/gnumeric,
-          /usr/lib/goffice/0.10/plugins/gnumeric,
-          /usr/share/gnumeric, and
-          /usr/share/help/{C,cs,de,es}/gnumeric
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnumeric-prog">
-        <term><command>gnumeric</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>gnumeric-&gnumeric-version;</command>
-          </para>
-          <indexterm zone="gnumeric gnumeric-prog">
-            <primary sortas="b-gnumeric">gnumeric</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnumeric-1">
-        <term><command>gnumeric-&gnumeric-version;</command></term>
-        <listitem>
-          <para>
-            is <application>GNOME</application>'s spreadsheet application
-          </para>
-          <indexterm zone="gnumeric gnumeric-1">
-            <primary sortas="b-gnumeric-&gnumeric-version;">gnumeric-&gnumeric-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssconvert">
-        <term><command>ssconvert</command></term>
-        <listitem>
-          <para>
-            is a command line utility to convert spreadsheet files
-            between various spreadsheet file formats
-          </para>
-          <indexterm zone="gnumeric ssconvert">
-            <primary sortas="b-ssconvert">ssconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssdiff">
-        <term><command>ssdiff</command></term>
-        <listitem>
-          <para>
-            is a command line utility to compare two spreadsheets
-          </para>
-          <indexterm zone="gnumeric ssdiff">
-            <primary sortas="b-ssdiff">ssdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssgrep">
-        <term><command>ssgrep</command></term>
-        <listitem>
-          <para>
-            is a command line utility to search spreadsheets for strings
-          </para>
-          <indexterm zone="gnumeric ssgrep">
-            <primary sortas="b-ssgrep">ssindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ssindex">
-        <term><command>ssindex</command></term>
-        <listitem>
-          <para>
-            is a command line utility to generate index data for
-            spreadsheet files
-          </para>
-          <indexterm zone="gnumeric ssindex">
-            <primary sortas="b-ssindex">ssindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libspreadsheet">
-        <term><filename class="libraryfile">libspreadsheet.so</filename></term>
-        <listitem>
-          <para>
-            contains the gnumeric API functions
-          </para>
-          <indexterm zone="gnumeric libspreadsheet">
-            <primary sortas="c-libspreadsheet">libspreadsheet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: xsoft/office/gnumeric/gnumeric.ent
===================================================================
--- xsoft/office/gnumeric/gnumeric.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/gnumeric/gnumeric.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY gnumeric SYSTEM "../gnumeric.xml">
Index: oft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,995 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libreoffice-dl "https://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
-
-  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "72d05d00734c6921a47c369b8d7ef8cf">
-  <!ENTITY libreoffice-core-size          "268 MB">
-
-  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "7091a370829bdcddd30e73b877bbc404">
-  <!ENTITY libreoffice-dict-size          "52 MB">
-
-  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "4dc03b31faaa008574e33ef0720ac6e2">
-  <!ENTITY libreoffice-help-size          "160 MB">
-
-  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "7093673b5953a410e9c0297a3302fd36">
-  <!ENTITY libreoffice-translations-size          "211 MB">
-
-  <!-- full size remeasured for 7.0.0.3 -->
-
-  <!ENTITY libreoffice-buildsize  "8 GB including the additional files if downloaded during the build (729 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
-      somebody is able to provide a patch or sed.  In these cases, please mark
-      the dependency as currently broken and move the \-\-with-system-poppler
-      line to a comment. Also please switch poppler between recommended and
-      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
-      A problem with 7.3.1.3 and poppler-21.05.0, Arch had a patch.  - bdubbs
-
-  -->
-
-  <!-- for 6.1.2.1 I allowed 2 SBU for downloads, my total was
-       64.76 SBU with fast downloads
-       for 6.1.4.2 I and 7.0.0.3 just used the total time - bdubbs
-
-       For 6.4.0.3 downloading everything including dictionaries,
-       help, translations took less than 2 minutes (1.1 SBU) with
-       a good domestic internet connection.  Total time was 60 SBU - ken
-
-       60 SBU not including download of translations, help and dictionary
-       for 6.4.6.2 - pierre
-
-       56 SBU for 7.0.3.1 not including download of translations, help, and
-       dictionaries. -renodr
-
-       For 7.2.5.2, It was 58 SBU including DL time.
-
-       For 7.5.4.2, I increased the parallelism to 8.  -bdubbs
-  -->
-  <!ENTITY libreoffice-time "41 SBU with parallelism=8 (will vary due to download time)">
-
-]>
-
-<sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-dlversion;">
-  <?dbhtml filename="libreoffice.html"?>
-
-
-  <title>LibreOffice-&libreoffice-version;</title>
-
-  <indexterm zone="libreoffice">
-    <primary sortas="a-LibreOffice">LibreOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LibreOffice</title>
-
-    <para>
-      <application>LibreOffice</application> is a full-featured office suite.
-      It is largely compatible with <application>Microsoft Office</application>
-      and is descended from <application>OpenOffice.org</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Core Download: <ulink url="&libreoffice-core-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Core Download MD5 sum: &libreoffice-core-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Core Download size: &libreoffice-core-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libreoffice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libreoffice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <note>
-      <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 is about 3 minutes on a fiber connection
-        and probably not much more than 10 minutes on an ADSL connection.
-        If you have not installed one or more of the following dependencies,
-        they will also be downloaded during the build.
-      </para>
-    </note>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Dictionaries: <ulink url="&libreoffice-dict-download-http;"/>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Dictionaries MD5 sum: &libreoffice-dict-md5sum;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Dictionaries size: &libreoffice-dict-size;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Help Files: <ulink url="&libreoffice-help-download-http;"/>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Help Files MD5 sum: &libreoffice-help-md5sum;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Help Files size: &libreoffice-help-size;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Translations: <ulink url="&libreoffice-translations-download-http;"/>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Translations MD5 sum: &libreoffice-translations-md5sum;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Translations size: &libreoffice-translations-size;
-        </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 <xref linkend="poppler"/>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler_22_09_fixes-1.patch"/>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Required patch to fix building with libxml2-2.12.x:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-    <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="perl-archive-zip"/>,
-      <xref linkend="unzip"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="which"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    &build-use-internet;
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <note>
-      <para>
-        Most of these packages are recommended because if they're not installed,
-        the build process will compile and install its own (often older)
-        version, with the side effect of increasing both build and installed disk
-        space along with increasing build time.
-      </para>
-    </note>
-
-    <para role="recommended">
-      <xref linkend="apache-ant"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="clucene"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libepoxy"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="llvm"/> (clang is preferred for rendering with skia),
-      <xref linkend="glm"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="graphite2"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libatomic_ops"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="libxslt"/>,
-      <xref linkend="lxml"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="openldap"/> (if connecting to an LDAP server),
-      <xref linkend="poppler"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="redland"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="abseil-cpp"/>,
-      <xref linkend="avahi"/>,
-      <xref linkend="bluez"/>,
-      <xref linkend="dconf"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="doxygen"/> (not relevant if using --disable-odk),
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gdb"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="kf6-frameworks"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="nasm"/>,
-      <xref linkend="qt6"/>,
-      <xref linkend="sane"/>,
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="vlc"/>,
-      <ulink url="https://commons.apache.org/proper/commons-codec/">Apache Commons Codec</ulink>,
-      <ulink url="https://hc.apache.org/httpcomponents-client-ga/index.html">Apache Commons HttpClient</ulink>,
-      <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="https://projects.coin-or.org/CoinMP/">CoinMP</ulink>,
-      <ulink url='https://freedesktop.org/wiki/Software/cppunit/'>Cppunit</ulink>,
-      <ulink url="https://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="https://github.com/behdad/glyphy">glyphy</ulink>,
-      <ulink url="&gnome-download-http;/gnome-vfs/">Gnome VFS</ulink>,
-      <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="https://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="https://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="https://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="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="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
-      <ulink url="https://libwpd.sourceforge.net/">libwpd</ulink>,
-      <ulink url="https://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="https://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="https://github.com/KhronosGroup/OpenCOLLADA/">OpenCOLLADA</ulink>,
-      <ulink url="https://gitlab.com/orcus/orcus">Orcus</ulink>,
-      <ulink url="https://sourceware.org/systemtap/">SystemTap</ulink>, and
-      <ulink url="https://ukoethe.github.io/vigra/">VIGRA</ulink>
-    </para>
-
-    <para>
-      There are many optional dependencies not listed here. They can be
-      found in the <filename>download.lst</filename> file in the sources
-      directory.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/libreoffice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LibreOffice</title>
-    <!-- since there is no "." in the "tar -t" listing, I cannot see
-    how no-overwrite-dir would be needed...
-    <important>
-      <para>
-        Unlike the other packages, we assume that you have not yet unpacked the
-        package. This is because the <option>- -no-overwrite-dir</option>
-        switch is needed in case you unpack as the <systemitem
-        class="username">root</systemitem> user.
-      </para>
-    </important>
-
-<screen role="nodump"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz - -no-overwrite-dir &amp;&amp;
-cd libreoffice-&libreoffice-dlversion;</userinput></screen>
--->
-
-<!-- keep a commented instruction if no patches are currently required -->
-<!--
-    <para>
-     First, fix build failures introduced by the latest poppler version:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_22_09_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      First, fix a bug with linking to zlib:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/icuuc \\/a zlib\\' writerperfect/Library_wpftdraw.mk</userinput></screen>
-
-    <para>
-      Next, fix a build failure with ICU-74+:
-    </para>
-
-<screen><userinput>sed -e /LBCM/d -i i18npool/source/breakiterator/data/line.txt</userinput></screen>
-
-    <para>
-      If you have downloaded the dictionaries, help and translations tarballs,
-      create symlinks to them from the source directory so they won't get
-      downloaded again:
-    </para>
-
-<screen><userinput>install -dm755 external/tarballs &amp;&amp;
-ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
-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 the build system 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>
-      <para>
-        During the build process, some packages will be downloaded (including
-        the ones listed as recommended and optional dependencies) if they are
-        not present on the system. Because of this, build time may vary from the
-        published time more than usual.
-      </para>
-    </note>
-
-    <para>
-      Due to the large size of the package, you may prefer to install it in
-      <filename class="directory">/opt</filename>, instead of
-      <filename class="directory">/usr</filename>. Depending on your choice,
-      replace <replaceable>&lt;PREFIX&gt;</replaceable> by
-      <filename class="directory">/usr</filename> or by
-      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>:
-    </para>
-
-<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
-
-    <para>
-      Locales "fr" and "en-GB", you will find below, are just examples; you
-      should change them to suit your needs - you might want to read the
-      "Command Explanations", further below, before proceeding.
-    </para>
-
-    <note>
-      <para>
-        If you set the ACLOCAL environment variable to support installing
-        Xorg in /opt, you will need to unset it for this package.
-      </para>
-    </note>
-
-    <para>
-      If you are building on a 32 bit machine, <envar>CFLAGS</envar> is set to
-      <command>-Os</command>, which breaks the build. Prevent this
-      by issuing:
-    </para>
-
-<screen><userinput>case $(uname -m) in
-   i?86) sed /-Os/d -i solenv/gbuild/platform/LINUX_INTEL_GCC.mk ;;
-esac</userinput></screen>
-
-    <para>
-      Prepare <application>LibreOffice</application> for compilation by running
-      the following commands:
-    </para>
-
-    <!--Editors: if it happens you need to remove some "with-system-xxx"
-    instruction because libreoffice temporarily cannot use the current
-    system version, please keep it around commented out, so that it can be
-    remembered to test it with higher versions of libreoffice. -->
-
-<screen><userinput>sed -e "/gzip -f/d"   \
-    -e "s|.1.gz|.1|g" \
-    -i bin/distro-install-desktop-integration &amp;&amp;
-
-sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
-
-./autogen.sh --prefix=$LO_PREFIX         \
-             --sysconfdir=/etc           \
-             --with-vendor=BLFS          \
-             --with-lang='fr en-GB'      \
-             --with-help                 \
-             --with-myspell-dicts        \
-             --without-junit             \
-             --without-system-dicts      \
-             --disable-dconf             \
-             --disable-odk               \
-             --enable-release-build=yes  \
-             --enable-python=system      \
-             --with-jdk-home=/opt/jdk    \
-             --with-system-boost         \
-             --with-system-clucene       \
-             --with-system-curl          \
-             --with-system-epoxy         \
-             --with-system-expat         \
-             --with-system-glm           \
-             --with-system-gpgmepp       \
-             --with-system-graphite      \
-             --with-system-harfbuzz      \
-             --with-system-icu           \
-             --with-system-jpeg          \
-             --with-system-lcms2         \
-             --with-system-libatomic_ops \
-             --with-system-libpng        \
-             --with-system-libxml        \
-             --with-system-nss           \
-             --with-system-odbc          \
-             --with-system-openldap      \
-             --with-system-openssl       \
-             --with-system-poppler       \
-             --with-system-postgresql    \
-             --with-system-redland       \
-             --with-system-libtiff       \
-             --with-system-libwebp       \
-             --with-system-zlib</userinput></screen>
-
-<!-- this one might be to be removed with one of the next
-     releases of LO (after 24.2.1.2) as it seems the issue
-     is known by upstream:
-     https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg336884.html
--->
-    <para>
-      Fix a misconfiguration when installing on 32-bit machines:
-    </para>
-<screen><userinput>if [ "$(uname -m)" == "i686" ]; then
-    sed -e "s/LFS_CFLAGS=$/&amp;-D_FILE_OFFSET_BITS=64/" -i config_host.mk
-fi</userinput></screen>
-
-<!--
-    <para>
-      The instructions below will only build the package without running
-      any unit tests. If you prefer to run the unit tests, replace
-      <command>make build-nocheck</command> with <command>make build</command>
-      or (as a regular user only) just <command>make</command>, but do not be
-      surprised if a unit test fails right at the end of the build and
-      breaks it.
-    </para>
--->
-    <para>
-      Build the package:
-    </para>
-
-<screen><userinput>make build</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make distro-pack-install</userinput></screen>
-
-    <para>
-       If installed in <filename
-       class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-       some additional steps are necessary. Issue the following commands as the
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>if [ "$LO_PREFIX" != "/usr" ]; then
-
-  # This symlink is necessary for the desktop menu entries
-  ln -svf $LO_PREFIX/lib/libreoffice/program/soffice /usr/bin/libreoffice &amp;&amp;
-
-  # Set up a generic location independent of version number
-  ln -sfv $LO_PREFIX /opt/libreoffice
-
-  # Icons
-  mkdir -vp /usr/share/pixmaps
-  for i in $LO_PREFIX/share/icons/hicolor/32x32/apps/*; do
-    ln -svf $i /usr/share/pixmaps
-  done &amp;&amp;
-
-  # Desktop menu entries
-  for i in $LO_PREFIX/lib/libreoffice/share/xdg/*; do
-    ln -svf $i /usr/share/applications/libreoffice-$(basename $i)
-  done &amp;&amp;
-
-  # Man pages
-  for i in $LO_PREFIX/share/man/man1/*; do
-    ln -svf $i /usr/share/man/man1/
-  done
-
-  unset i
-fi</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="desktop-file-utils"/>, and you wish
-      to update the MIME database, issue, as the <systemitem class="username">
-      root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>update-desktop-database</userinput></screen>
-
-    <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
-      --<replaceable>&lt;module&gt;</replaceable></command> command,
-      respectively, where <replaceable>&lt;module&gt;</replaceable> is one of
-      base, calc, draw, impress, math, web, or writer. Modules cannot be started
-      using their shell starting script names (see "Installed Programs", below),
-      if LO_PREFIX is other than <filename class='directory'>/usr</filename>,
-      unless the <filename class='directory'>$LO_PREFIX/bin</filename> directory
-      is appended to the PATH.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages and the second one prevents the install from failing.
-    </para>
-
-    <para>
-      <parameter>--with-vendor=BLFS</parameter>: This switch sets BLFS as
-      the vendor which is mentioned when you click "About" from the Help menu
-      on the toolbar.
-    </para>
-
-    <para>
-      <parameter>--with-lang='fr en-GB'</parameter>: This switch sets
-      what languages to support. To list several languages, separate them with
-      a space. For all languages, use
-      <option>--with-lang=ALL</option>. Note that the translations file
-      is not needed and won't be downloaded if using only en-US as a language.
-    </para>
-
-    <note>
-      <para>
-        For a list of the available languages, look in
-        <filename>solenv/inc/langlist.mk</filename>.
-      </para>
-    </note>
-
-    <para>
-      <parameter>--with-help</parameter>: Without this switch, the help files
-      are not built.
-    </para>
-
-    <para>
-      <parameter>--with-jdk-home=/opt/jdk</parameter>: This parameter will silence
-      a warning that the configure script attempted to find JAVA_HOME
-      automatically (even though that is passed in the environment). Omit this if
-      you disabled java.
-    </para>
-
-    <para>
-      <parameter>--with-myspell-dicts</parameter>: This switch adds myspell
-      dictionaries to the <application>LibreOffice</application> installation
-      set.
-    </para>
-
-    <para>
-      <parameter>--with-system-boost</parameter>: This switch enables using
-      system boost. From time to time, recent versions of boost break
-      the build of libreoffice. In this case, it is possible to use the
-      bundled copy of boost by removing this flag.
-    </para>
-
-    <para>
-      <parameter>--disable-dconf</parameter>: This switch disables compiling
-      <application>LibreOffice</application> with the
-      <application>GNOME DConf</application> configuration system support.
-    </para>
-
-    <para>
-      <parameter>--without-junit</parameter>: This switch disables the tests
-      for the deprecated HSQLDB driver which is written in Java.
-      <!-- If you wish
-      to build this driver replace this switch with the set of switches
-      described below after '- -without-java'.-->
-    </para>
-
-    <para>
-      <parameter>--without-system-dicts</parameter>: This switch disables the
-      use of dictionaries from system paths so that the ones installed by this
-      package are used.
-    </para>
-
-    <para>
-      <parameter>--disable-odk</parameter>: This switch disables installing the
-      office development kit. Remove if you want to develop a
-      <application>LibreOffice</application> based application.
-    </para>
-
-    <para>
-      <parameter>--enable-release-build=yes</parameter>: This switch enables a
-      Release Build.  <application>LibreOffice</application> can be built as a
-      Release Build or as a Developer Build, because their default installation
-      paths and user profile paths are different. Developer Build displays the
-      words "Dev" and "Beta" in several places (e.g, menu and splash screen).
-    </para>
-
-    <para>
-      <parameter>--enable-python=system</parameter>: This switch tells
-      <application>LibreOffice</application> to use the system installed
-      <application>Python 3</application> instead of
-      the bundled one.
-    </para>
-
-    <para>
-      <parameter>--with-system-*</parameter>: These switches prevent
-      <application>LibreOffice</application> from trying to compile its own
-      versions of these dependencies. If you've not installed some of the
-      dependencies, remove the corresponding switches.
-    </para>
-
-<!--
-    <para>
-      <command>CPPFLAGS='-DU_USING_ICU_NAMESPACE=1' make ...</command>: <xref
-      linkend="icu"/> has removed an implicit namespace <quote>using</quote>
-      from its headers files. Setting <envar>U_USING_ICU_NAMESPACE</envar> to
-      1 allows to restore the former behavior, which is required for building
-      <application>libreoffice</application>.
-    </para>
--->
-    <para>
-      <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
-      distributions which want to break the package into parts.
-    </para>
-
-    <para>
-      <option>--with-parallelism=&lt;count&gt;</option>: This switch
-      tells <application>LibreOffice</application> to use &lt;count&gt; CPU
-      cores to compile in parallel.  (Do not include literal angle brackets.)
-      The default is to use all available cores on the system.
-    </para>
-
-    <para>
-      <option>--disable-cups</option>: Use this switch if you don't need
-      printing support.
-    </para>
-
-    <para>
-      <option>--disable-dbus</option>: Use this switch if you've not installed
-      D-Bus-1.8.0 or later. It also disables Bluetooth support and font install
-      via PackageKit.
-    </para>
-
-    <para>
-      <option>--disable-firebird-sdbc</option>: By default, the ability to
-      connect to a <application>firebird</application> database is enabled.
-      Add this switch if you do not need that feature.
-    </para>
-
-    <para>
-      <option>--disable-gstreamer-1-0</option>: Use this switch if you have not
-      installed <xref linkend="gst10-plugins-base"/>.
-    </para>
-
-    <para>
-      <option>--disable-postgresql-sdbc</option>: This switch disables compiling
-      <application>LibreOffice</application> with the ability to connect to a
-      <application>PostgreSQL</application> database. Use it if you have not
-      installed <application>PostgreSQL</application> and you do not want
-      <application>LibreOffice</application> to compile its bundled copy.
-    </para>
-
-    <para>
-      <option>--disable-skia</option>: Use <xref linkend="cairo"/> for rendering
-      instead of skia.
-    </para>
-
-    <para>
-      <option>--enable-gtk3-kde5</option>: This switch allows the Visual Class
-      Library, which is responsible for widgets, to be built with KF5 file
-      dialogs if GTK+-3, Qt5 and Plasma are all available.
-    </para>
-
-    <para>
-      <option>--enable-lto</option>: This switch will enable Link Time
-      Optimization, which results in slightly smaller libraries (about 40 MB).
-      This is said to make <application>LibreOffice</application> programs
-      load faster (and possibly run faster, e.g. when recalculating a
-      spreadsheet). On an 8-core machine with 16GB of memory, the difference
-      in compile times was minimal, but an extra 2GB was used for the work
-      files. On machines with fewer processors or a lack of memory, the compile
-      might be much slower.
-    </para>
-
-    <para>
-      <option>--without-java</option>: This switch disables
-      <application>Java</application> support in
-      <application>LibreOffice</application>. Java is needed for the
-      deprecated HSQLDB driver, which allows reading databases created by
-      other programs or in earlier versions of libreoffice
-      <application>base</application>. It is also needed for some optional
-      user interface components.
-    </para>
-
-    <para>
-      <option>--without-fonts</option>: <application>LibreOffice</application>
-      includes a number of third-party TrueType fonts. If you have already
-      installed some or all of the same fonts, you may prefer to use the system
-      versions.
-    </para>
-
-    <para>
-      <!-- Brings in - -enable-qt5 as well. -->
-      <option>--enable-kf5</option>: Builds with KDE/Plasma integration. If
-      &qt5-deps; and/or <xref linkend="kf6-frameworks"/> are not
-      installed in <filename class="directory">/usr</filename>, the include
-      and library directories must be specified in <envar>QT5INC</envar>,
-      <envar>QT5LIB</envar>, <envar>KF5INC</envar>, and <envar>KF5LIB</envar>,
-      respectively.
-    </para>
-
-    <para>
-      <option>--enable-evolution2</option>: Enables support for Evolution
-      address books through Evolution Data Server. Note that Evolution Data
-      Server must be installed for this feature to function.
-    </para>
-
-    <para>
-      <option>--enable-qt5</option>: This switch enables support for integration
-      with Qt5 and the Qt5 theming engine. If &qt5-deps; is not installed in
-      <filename class="directory">/usr</filename>, the include and library
-      directories must be specified in the <envar>QT5INC</envar> and
-      <envar>QT5LIB</envar> environment variables.
-    </para>
-
-    <para>
-      <option>--enable-qt6</option>: This switch enables support for integration
-      with Qt6 and the Qt6 theming engine. If <xref linkend="qt6"/> is not
-      installed in <filename class="directory">/usr</filename>, the include and
-      library directories must be specified in the <envar>QT6INC</envar> and
-      <envar>QT6LIB</envar> environment variables.
-    </para>
-
-    <para>
-      <option>--with-system-abseil</option>: This switch enables using a system
-      version of the Abseil C++ libraries instead of the bundled copy. Add this
-      switch if <xref linkend="abseil-cpp"/> is installed and you wish to use
-      it instead of the bundled copy.
-    </para>
-
-    <!-- For when we add KDE 6 to the book next cycle.
-    <para>
-      <!- - Brings in - -enable-qt5 as well. - ->
-      <option>- -enable-kf6</option>: Builds with KDE/Plasma integration. If
-      <xref linkend="qt6"/> and/or <xref linkend="kf6-frameworks"/> are not
-      installed in <filename class="directory">/usr</filename>, the include
-      and library directories must be specified in <envar>QT6INC</envar>,
-      <envar>QT6LIB</envar>, <envar>KF6INC</envar>, and <envar>KF6LIB</envar>,
-      respectively.
-    </para>
-    -->
-
-    <!--
-    <para>
-      Currently broken by ICU68 (TRUE and FALSE need to be true and false) on
-      libe-book and perhaps elsewhere - commented explanation retained.  ken
-      <option>- -with-system-icu</option>: This command would use the system
-      version of <xref linkend="icu"/> which is normally considered to be a good
-      thing to do. However, one of the very minor packages pulled in by
-      <application>LibreOffice</application>, libfreehand-0.1.2, does not compile
-      with ICU-65.1 because of a missing semi-colon at the end of one line in one
-      of its files. Do not use this option unless you have separately installed a
-      patched or newer version of
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand">libfreehand</ulink>.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
-          loimpress, lomath, loweb, lowriter, soffice and unopkg;
-          several programs under
-          $LO_PREFIX/lib/libreoffice/program
-        </seg>
-        <seg>
-          several libraries under
-          $LO_PREFIX/lib/libreoffice/program
-        </seg>
-        <seg>
-          $LO_PREFIX/lib/libreoffice
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libreoffice-suite">
-        <term><command>libreoffice (or soffice)</command></term>
-        <listitem>
-          <para>
-            is the main libreofice suite (symlink to
-            $LO_PREFIX/lib/libreoffice/program/soffice)
-          </para>
-          <indexterm zone="libreoffice libreoffice-suite">
-            <primary sortas="b-libreoffice-suite">libreoffice-suite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lobase">
-        <term><command>lobase</command></term>
-        <listitem>
-          <para>
-            is the database manager module shell starting script
-          </para>
-          <indexterm zone="libreoffice lobase">
-            <primary sortas="b-lobase">lobase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localc">
-        <term><command>localc</command></term>
-        <listitem>
-          <para>
-            is the spreadsheet module shell starting script
-          </para>
-          <indexterm zone="libreoffice localc">
-            <primary sortas="b-localc">localc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lodraw">
-        <term><command>lodraw</command></term>
-        <listitem>
-          <para>
-            is the vector graphics editor and diagramming tool module shell
-            starting script
-          </para>
-          <indexterm zone="libreoffice lodraw">
-            <primary sortas="b-lodraw">lodraw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loimpress">
-        <term><command>loimpress</command></term>
-        <listitem>
-          <para>
-            is the (PowerPoint) presentations editor and displayer
-            module shell starting script
-          </para>
-          <indexterm zone="libreoffice loimpress">
-            <primary sortas="b-loimpress">loimpress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lomath">
-        <term><command>lomath</command></term>
-        <listitem>
-          <para>
-            is the mathematical formula editor module shell starting script
-          </para>
-          <indexterm zone="libreoffice lomath">
-            <primary sortas="b-lomath">lomath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loweb">
-        <term><command>loweb</command></term>
-        <listitem>
-          <para>
-            is the HTML editor module shell starting script
-          </para>
-          <indexterm zone="libreoffice loweb">
-            <primary sortas="b-loweb">loweb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lowriter">
-        <term><command>lowriter</command></term>
-        <listitem>
-          <para>
-            is the word processor module shell starting script
-          </para>
-          <indexterm zone="libreoffice lowriter">
-            <primary sortas="b-lowriter">lowriter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unopkg">
-        <term><command>unopkg</command></term>
-        <listitem>
-          <para>
-            is a tool to manage <application>LibreOffice</application>
-            extensions from the command line
-          </para>
-          <indexterm zone="libreoffice unopkg">
-            <primary sortas="b-unopkg">unopkg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/office/magicpoint.xml
===================================================================
--- xsoft/office/magicpoint.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/magicpoint.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="magicpoint" xreflabel="magicpoint">
+<?dbhtml filename="magicpoint.html" dir="xsoft"?>
+<title>magicpoint</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: xsoft/office/magicpoint/magicpoint.ent
===================================================================
--- xsoft/office/magicpoint/magicpoint.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/office/magicpoint/magicpoint.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY magicpoint SYSTEM "../magicpoint.xml">
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/office/office.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="xsoft-office">
+<?dbhtml filename="office.html" dir="xsoft"?>
+<title>Individual Office Programs</title>
 
-<chapter id="xsoft-office">
-  <?dbhtml filename="office.html" ?>
+&abiword;
+&gnumeric;
+&gnucash;
+&magicpoint;
+&gimp;
 
-  <title>Office Programs</title>
-
-  <para>
-    This chapter is a collection of programs that are useful for viewing
-    or editing office documents. Some specialise in doing one thing (such as
-    word processing or manipulating a spreadsheet).
-    <application>LibreOffice</application> is a suite of programs that can
-    manipulate many different formats including powerpoint presentations.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
-<!-- Hopefully gnucash will come back when updated
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnucash.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice.xml"/>
 </chapter>
Index: oft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,298 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 balsa-download-http "https://pawsa.fedorapeople.org/balsa/balsa-&balsa-version;.tar.xz">
-  <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "bebd22cb6bac87ee05255c48ee1d28dd">
-  <!ENTITY balsa-size          "3.5 MB">
-  <!ENTITY balsa-buildsize     "66 MB">
-  <!ENTITY balsa-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="balsa" xreflabel="Balsa-&balsa-version;">
-  <?dbhtml filename="balsa.html" ?>
-
-
-  <title>Balsa-&balsa-version;</title>
-
-  <indexterm zone="balsa">
-    <primary sortas="a-Balsa">Balsa</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Balsa</title>
-
-    <para>
-      The <application>Balsa</application> package contains a
-      <application>GNOME</application>-2 based mail client.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&balsa-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&balsa-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &balsa-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &balsa-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &balsa-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &balsa-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/balsa-&balsa-version;-upstream_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Balsa Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="gmime3"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libnotify"/>
-      <!--<xref linkend="rarian"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="compface"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="gtksourceview"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="procmail"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="webkitgtk"/>,
-      <ulink url="https://pypi.python.org/pypi/html2text/">html2text</ulink>,
-      <ulink url="https://osmo-pim.sourceforge.net/">osmo</ulink>,
-      <ulink url="https://sourceforge.net/projects/rubrica.berlios/">rubrica</ulink>,
-      <ulink url="&gnome-download-http;/yelp-tools/">yelp-tools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Balsa</title>
-
-    <para>
-      First, fix build issues when configuring without WebKitGTK, or when
-      using WebKitGTK-2.38 or later.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../balsa-&balsa-version;-upstream_fixes-2.patch</userinput></screen>
-
-    <para>
-      Install <application>Balsa</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --localstatedir=/var/lib \
-            --without-html-widget    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- Support has been added for this, but the option is still unrecognized.
-    <para>
-      <parameter>- -with-rubrica</parameter>: This parameter is used
-      to provide Rubrica2 address book support.
-    </para>
-    -->
-
-    <!-- configure says this is an invalid option with 2.5.11
-    <para>
-      <option>- -enable-smime</option>: Use this option to enable S/MIME
-      support if <application>GnuPG-2.x.x</application> is installed.
-    </para>
-    -->
-
-    <para>
-      <parameter>--without-html-widget</parameter>: This option disables
-      building the HTML renderer. If you want the HTML renderer to be built,
-      verify that you have <xref linkend="webkitgtk"/> installed, and then
-      remove this option.
-    </para>
-
-    <para>
-      <option>--with-canberra</option>: Enable libcanberra support.
-    </para>
-
-    <para>
-      <option>--with-compface</option>: Enable compface support.
-    </para>
-
-    <para>
-      <option>--with-gcr</option>: Use libgcr for TLS support.
-    </para>
-
-    <para>
-      <option>--with-gss</option>: Enable GSSAPI support.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: Use this option to enable LDAP address
-      book support if <application>OpenLDAP</application> is installed.
-    </para>
-
-    <para>
-      <option>--with-libsecret</option>: Enable strong password
-      support and support for gnome-keyring to store passwords.
-    </para>
-
-    <!-- configure says this is an invalid option with 2.5.11
-    <para>
-      <option>- -with-gpgme</option>: Use this option to enable GPG support
-      if <quote><application>GnuPG</application> Made Easy</quote>
-      (<application>GPGME</application>) is installed.
-    </para>
-    -->
-
-    <para>
-      <option>--with-sqlite</option>: Use this option to enable SQLite
-      address book support if <application>SQLite</application> is
-      installed.
-    </para>
-
-  </sect2>
-
-<!-- All of this information is invalid. These options no longer exist since
-     Balsa was ported to GTK3.
-  <sect2 role="configuration">
-    <title>Configuring Balsa</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        All configuration of <application>Balsa</application> is done
-        through the <application>Balsa</application> menu system, with mailbox
-        configuration done with the Settings&mdash;&gt;Preferences menu.
-      </para>
-
-      <para>
-        If you are unable to connect to your ISP, they probably don't
-        support APOP.  Disable it in Settings/Preferences/POP3/advanced.
-      </para>
-
-      <para>
-        If you enable filters for your incoming POP3 mail, you must have
-        <xref linkend="procmail"/> installed, as the incoming mail will be
-        handed off to <command>procmail</command> for processing.
-      </para>
-
-    </sect3>
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>balsa and balsa-ab</seg>
-        <seg>None</seg>
-        <seg>/etc/sounds/events,
-             /usr/share/balsa,
-             and /usr/share/sounds/balsa</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="balsa-prog">
-        <term><command>balsa</command></term>
-        <listitem>
-          <para>
-            is a glib based mail client
-          </para>
-          <indexterm zone="balsa balsa-prog">
-            <primary sortas="b-balsa">balsa</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="balsa-ab">
-        <term><command>balsa-ab</command></term>
-        <listitem>
-          <para>
-            is the address-book application used by <command>balsa</command>
-          </para>
-          <indexterm zone="balsa balsa-ab">
-            <primary sortas="b-balsa">balsa-ab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/feh.xml
===================================================================
--- xsoft/other/feh.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 feh-download-http "https://feh.finalrewind.org/feh-&feh-version;.tar.bz2">
-  <!ENTITY feh-download-ftp  " ">
-  <!ENTITY feh-md5sum        "0a780bf321c0653d03e3e18410f4d1ba">
-  <!ENTITY feh-size          "2.1 MB">
-  <!ENTITY feh-buildsize     "6.9 MB (with tests)">
-  <!ENTITY feh-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="feh" xreflabel="feh-&feh-version;">
-  <?dbhtml filename="feh.html"?>
-
-
-  <title>feh-&feh-version;</title>
-
-  <indexterm zone="feh">
-    <primary sortas="a-feh">feh</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to feh</title>
-
-    <para>
-      <application>feh</application> is a fast, lightweight image viewer which
-      uses Imlib2. It is commandline-driven and supports multiple images
-      through slideshows, thumbnail browsing or multiple windows, and montages
-      or index prints (using TrueType fonts to display file info). Advanced
-      features include fast dynamic zooming, progressive loading, loading via
-      HTTP (with reload support for watching webcams), recursive file opening
-      (slideshow of a directory hierarchy), and mouse wheel/keyboard control.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-
-<!--  Seems to work OK now
-    <note>
-      <para>
-        For some reason, using a browser, the link will not download the
-        package as a tarball, but instead, as a page. Therefore, you will need
-        to use <quote>Save link as</quote> or the <command>wget</command> or
-        another similar command, in the command line.
-      </para>
-    </note>
--->
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&feh-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&feh-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &feh-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &feh-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &feh-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &feh-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- I don't think this is needed as of 2.17. -renodr -->
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch, for the test suite:
-          <ulink
-            url="&patch-root;/feh-&feh-version;-disable_some_tests-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">feh Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/> and
-      <xref linkend="imlib2"/> (built with
-      <xref linkend="giflib"/> support, for the tests)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libexif"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="libjpeg"/> (for lossless image rotation) and
-      <xref role="runtime" linkend="imagemagick"/> (to load unsupported formats)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (test suite)</bridgehead>
-    <para role="optional">
-      <xref linkend="perl-test-command"/> (required) and
-      <xref linkend="mandoc"/> (optional)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of feh</title>
-
-<!--
-    <para>
-      Due to well-known problems when <application>feh</application> try to
-      load gif images (sometimes <application>imlib2</application> being blamed
-      for that), some tests fail. To avoid that, apply the following patch, if
-      you intend to run the test suite:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../feh-&feh-version;-disable_some_tests-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>feh</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i "s:doc/feh:&amp;-&feh-version;:" config.mk &amp;&amp;
-make PREFIX=/usr</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "s:doc/feh:&amp;-&feh-version;:" config.mk</command>: This
-      sed fixes the doc directory to a versioned one, as used in BLFS.
-   </para>
-
-    <para>
-      <option>curl=0</option>: Use this make flag if you don't have the cURL
-      package installed.
-    </para>
-
-    <para>
-      <option>exif=1</option>: This make flag enables builtin Exif tag display
-      support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          feh
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/feh-&feh-version; and
-          /usr/share/feh
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="feh-prog">
-        <term><command>feh</command></term>
-        <listitem>
-          <para>
-            is an image viewer and cataloguer
-          </para>
-          <indexterm zone="feh feh-prog">
-            <primary sortas="b-feh">feh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-dist-&fontforge-version;.tar.xz">
--->
- <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.xz">
-
-  <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "7043f25368ed25bcd75d168564919fb7">
-  <!ENTITY fontforge-size          "13 MB">
-  <!ENTITY fontforge-buildsize     "102 MB (add 52 MB for the tests)">
-  <!ENTITY fontforge-time          "0.4 SBU (with parallelism=4, add 0.1 SBU for the tests)">
-]>
-
-<sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
-  <?dbhtml filename="fontforge.html"?>
-
-
-  <title>FontForge-&fontforge-version;</title>
-
-  <indexterm zone="fontforge">
-    <primary sortas="a-FontForge">FontForge</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FontForge</title>
-
-    <para>
-      The <application>FontForge</application> package contains an
-      outline font editor that lets you create your own postscript,
-      truetype, opentype, cid-keyed, multi-master, cff, svg and
-      bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fontforge-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fontforge-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fontforge-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fontforge-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fontforge-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fontforge-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fontforge-&fontforge-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libspiro"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <!-- not mentioned:
-      glib is required for gtk3
-      pango is required for gtk3
-      cairo is recommended for pango
-      xorg libs pulled in by gtk3 via libepoxy.
-      -->
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <!-- the following references in the source appear not to be used:
-      curl is mentioned in appveyor.yml for msys2 (integration tests, I think)
-      wget is referenced in Unicode/charset/generate.sh which will fail if
-      wget is not on the PATH, and in Unicode/dump.c - with wget moved off the
-      PATH, no problems, i.e. they are never run and never built.
-
-      Some of the others are at a minimum pulled in for recommended deps -
-       libpng from freetype from fontconfig from xorg libs.
-       harfbuzz is the same
-
-      Also, adding or removing optional deps other than Sphinx doesn't seem
-      to materially alter the build time or size.
-      -->
-      <xref linkend="giflib"/>,
-      <xref linkend="git"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="sphinx"/> (to build html documentation), and
-      <xref linkend="woff2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FontForge</title>
-
-    <para>
-      First, fix two security vulnerabilities in the Splinefont functionality:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../fontforge-&fontforge-version;-security_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, fix a problem with old translations exposed by gettext-0.22:
-    </para>
-
-<screen><userinput>sed -i.orig 's/\(%[^%[:space:]]*\)hs/\1s/g' \
- fontforgeexe/searchview.c po/de.po po/ca.po \
- po/hr.po po/it.po po/pl.po po/uk.po po/en_GB.po \
- po/fr.po po/vi.po po/ko.po po/ja.po</userinput></screen>
-
-    <para>
-      Install <application>FontForge</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;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have installed <command>sphinx-build</command>, HTML documentation
-      was built and installed in
-      <filename class="directory">/usr/share/doc/fontforge</filename>.
-      To be able to access it as a versioned directory, create a
-      symlink as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>ln -sv fontforge /usr/share/doc/fontforge-&fontforge-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      create an optimized release without debug information.
-    </para>
-
-    <para>
-      <parameter>-Wno-dev</parameter>: This switch is used to suppress warnings
-      intended for the package's developers.
-    </para>
-
-    <para>
-      <option>-DENABLE_X11=ON</option>: use an X11 backend instead of GDK3
-      (gtk+-3) for basic Xorg graphics.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fontforge, fontimage, fontlint and sfddiff
-        </seg>
-        <seg>
-          libfontforge.so and
-          /usr/lib/python&python3-version;/site-packages/{fontforge,psMat}.so
-        </seg>
-        <seg>
-          /usr/share/fontforge and optionally
-          /usr/share/doc/fontforge{,-&fontforge-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fontforge-prog">
-        <term><command>fontforge</command></term>
-        <listitem>
-          <para>
-            is a program that allows you to create and
-            modify font files
-          </para>
-          <indexterm zone="fontforge fontforge-prog">
-            <primary sortas="b-fontforge">fontforge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontimage">
-        <term><command>fontimage</command></term>
-        <listitem>
-          <para>
-            is a program that produces an image showing
-            representative glyphs of the font
-          </para>
-          <indexterm zone="fontforge fontimage">
-            <primary sortas="b-fontimage">fontimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontlint">
-        <term><command>fontlint</command></term>
-        <listitem>
-          <para>
-            is a program that checks the font for certain
-            common errors
-          </para>
-          <indexterm zone="fontforge fontlint">
-            <primary sortas="b-fontlint">fontlint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfddiff">
-        <term><command>sfddiff</command></term>
-        <listitem>
-          <para>
-            is a program that compares two font files
-          </para>
-          <indexterm zone="fontforge sfddiff">
-            <primary sortas="b-sfddiff">sfddiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,569 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gimp-download-http "https://download.gimp.org/pub/gimp/v2.10/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-download-ftp  " ">
-  <!ENTITY gimp-md5sum        "e44e1c91b09db8fcdc9ef5797ce11b77">
-  <!ENTITY gimp-size          "30 MB">
-  <!ENTITY gimp-buildsize     "882 MB (197 MB installed, add 835 MB for tests)">
-  <!ENTITY gimp-time          "2.3 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
-  git archive - -format=tar - -prefix=${DIRNAME}/ HEAD | xz >../${DIRNAME}.tar.xz -->
-
-  <!-- renodr: I generated the git tarball using the following instructions:
-       cd /tmp &&
-       mkdir gimp-help &&
-       cd gimp-help &&
-       git clone https://gitlab.gnome.org/GNOME/gimp-help.git &&
-       cd gimp-help &&
-       git checkout gimp-help-2-10 &&
-       cd .. &&
-       rm -rv gimp-help/.git &&
-       mv -v gimp-help gimp-help-<DATE>
-       tar -cJvf gimp-help-<DATE>.tar.xz gimp-help-<DATE>
-
-       After you've completed this, run a test build, and upload the tarball to
-       anduin.-->
-
-  <!ENTITY gimp-help-version    "&gimp-version;">
-<!--  <!ENTITY gimp-help-download   "&sources-anduin-http;/gimp/gimp-help-&gimp-help-version;.tar.xz"> -->
-  <!ENTITY gimp-help-download   "https://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
-  <!ENTITY gimp-help-md5sum     "5e393d61c802e73ffe6c550759ed0853">
-  <!ENTITY gimp-help-size       "158 MB">
-  <!ENTITY gimp-help-buildsize  "From 412 MB (en only) to 1.8 GB (for all
-                                 languages)">
-  <!ENTITY gimp-help-time       "2.1 SBU (en only), 13 SBU, with parallelism=4,
-                                 for all languages">
-]>
-
-<sect1 id="gimp" xreflabel="Gimp-&gimp-version;">
-  <?dbhtml filename="gimp.html" ?>
-
-
-  <title>Gimp-&gimp-version;</title>
-
-  <indexterm zone="gimp">
-    <primary sortas="a-Gimp">Gimp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gimp</title>
-
-    <para>
-      The <application>Gimp</application> package contains
-      the GNU Image Manipulation Program which is useful for
-      photo retouching, image composition and image authoring.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gimp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gimp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gimp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gimp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gimp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gimp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-<!--
-    <note>
-      <para>
-       The creation of local html files with recent versions of the necessary
-       packages is somewhat broken (some png images are not sourced by the
-       generated HTML, only their captions are visible).
-      </para>
-    </note>
--->
-    <note>
-      <para>
-        The help files English version is complete, but large
-        parts of the text for many other languages are not yet translated.
-      </para>
-    </note>
-
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gimp-help-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gimp-help-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gimp-help-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gimp-help-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gimp-help-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gimp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gegl"/>,
-      <xref linkend="gexiv2"/>,
-      <xref linkend="glib-networking"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="harfbuzz"/>.
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmypaint"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <!-- en can be built without this -->
-      <xref linkend="libxml2"/> (to build the translated help files),
-      <xref linkend="lcms2"/>,
-      <xref linkend="mypaint-brushes"/>,
-      <xref linkend="poppler"/> (including poppler-data) and
-      <!-- some parts of Xorg appear to be required, as are deps it pulls in -->
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="gs"/> (with libgs installed),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="pygtk"/> (including the gtk, pango and pangocairo modules) and
-      <xref linkend="xdg-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gvfs"/> (to access the online help),
-      <xref linkend="libmng"/>,
-      <xref linkend="libunwind"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> program),
-      <xref linkend="gtk-doc"/>,
-      <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://wvware.sourceforge.net/libwmf.html">libwmf</ulink>, and
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
-    </para>
-
-    <para>
-      When you have run configure, you will see that WebKit is not found -
-      that dependency is for the legacy webkit-1.0 which should never be used
-      on a modern system exposed to the internet.
-    </para>
-
-    <bridgehead renderas="sect4">Optional, for building the help system</bridgehead>
-    <para role="optional">
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink> (for PDF docs),
-      <ulink url="https://pngnq.sourceforge.net/">pngnq</ulink> and
-      <ulink url="https://pmt.sourceforge.net/pngcrush/">pngcrush</ulink>
-      to optimize the png files, but see the note on the help download above
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/gimp"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gimp</title>
-
-    <para>
-      Install <application>Gimp</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results (requires an X-Windowed terminal) issue:
-      <command>make check</command>.
-      <!-- km: in 2.10.16 no failures, 2 tests were skipped -->
-
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gimp-Help</title>
-
-    <para>
-      The <filename>gimp-help</filename> tarball contains images and English
-      text help for help files, together with translations. <!--
-      The documentation generated by gimp-help-2.10.34 and online help have
-      the same contents, so I comment this out. [pierre Nov. 2023]
-      Because of the
-      issues mentioned in the note above, you are recommended to use the online
-      help, either by building against <xref linkend="gvfs"/> so that 'help'
-      can open the latest XML files in your browser, or else you can manually
-      open the html in your browser by going to <ulink
-      url="https://docs.gimp.org/2.10/en/">https://docs.gimp.org/2.10/en</ulink>
-     (change the language code if desired).-->
-    </para>
-
-    <para>
-      <!--     If you nevertheless wish to install local copies of the help files to read
-      offline, u-->Unpack the <filename>gimp-help</filename> tarball
-      and change into the root of the newly created source tree. Prepare for
-      the build with the following command:
-    </para>
-
-<screen><userinput>ALL_LINGUAS=&quot;ca cs da de en en_GB es fa fr hr ko lt nl nn pt pt_BR ro sl sv uk zh_CN&quot; \
-./configure --prefix=/usr</userinput></screen>
-
-    <para>
-      Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
-      you do not wish to install. Alternatively, remove the line starting with
-      <envar>ALL_LINGUAS</envar>, if you wish to build all languages.
-    </para>
-
-    <para>
-      Now build the help files:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user to install the help
-      files:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands" id="gimp-cmd-explanations">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>ALL_LINGUAS=&quot;ca cs da de en en_GB es fa...&quot;</envar>: by
-      default, the help files will be rendered in all the available languages.
-      Remove the codes of any languages you do not wish to build.
-    </para>
-
-    <para>
-      <option>--disable-python</option>: This option is necessary if
-      you have not installed <application>PyGTK</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring The Gimp</title>
-
-    <sect3 id="gimp-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gimp/2.0/*</filename> and
-        <filename>~/.gimp-2.8/gimprc</filename>
-      </para>
-
-      <indexterm zone="gimp gimp-config">
-        <primary sortas="e-AA.gimp-2.0/gimprc">~/.g/GIMP/2.10/*</primary>
-      </indexterm>
-
-      <indexterm zone="gimp gimp-config">
-        <primary sortas="e-etc-gimp-2.0-star">/etc/gimp/2.0/*</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gimp (symlink), gimp-2.10,
-          gimp-console (symlink), gimp-console-2.10,
-          gimp-test-clipboard-2.0, and
-          gimptool-2.0
-        </seg>
-        <seg>
-          libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
-          libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
-          libgimpthumb-2.0.so, libgimpui-2.0.so, and libgimpwidgets-2.0.so
-        </seg>
-        <seg>
-          /etc/gimp,
-          /usr/include/gimp-2.0,
-          /usr/{lib,share}/gimp,
-          /usr/share/gtk-doc/html/libgimp{,base,color,config}, and
-          /usr/share/gtk-doc/html/libgimp{math,module,thumb,widgets}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gimp-prog">
-        <term><command>gimp</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>gimp-2.10</command>
-          </para>
-          <indexterm zone="gimp gimp-prog">
-            <primary sortas="b-gimp">gimp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-2.10">
-        <term><command>gimp-2.10</command></term>
-        <listitem>
-          <para>
-            is the Gnu Image Manipulation Program. It works with a variety
-            of image formats and provides a large selection of tools
-          </para>
-          <indexterm zone="gimp gimp-2.10">
-            <primary sortas="b-gimp-2.10">gimp-2.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-console">
-        <term><command>gimp-console</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>gimp-console-2.10</command>
-          </para>
-          <indexterm zone="gimp gimp-console">
-            <primary sortas="b-gimp-console">gimp-console</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-console-2.10">
-        <term><command>gimp-console-2.10</command></term>
-        <listitem>
-          <para>
-            is a console program that behaves as if The
-            <application>Gimp</application> was called with the
-            <option>--no-interface</option> command-line option
-          </para>
-          <indexterm zone="gimp gimp-console-2.10">
-            <primary sortas="b-gimp-console-2.10">gimp-console-2.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimptool-2.0">
-        <term><command>gimptool-2.0</command></term>
-        <listitem>
-          <para>
-            is a tool that can build plug-ins or scripts and install them
-            if they are distributed in one source file.
-            <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
-          </para>
-          <indexterm zone="gimp gimptool-2.0">
-            <primary sortas="b-gimptool-2.0">gimptool-2.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimp-2.0">
-        <term><filename class="libraryfile">libgimp-2.0.so</filename></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="gimp libgimp-2.0">
-            <primary sortas="c-libgimp-2.0">libgimp-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpbase-2.0">
-        <term><filename class="libraryfile">libgimpbase-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions for basic
-            <application>Gimp</application> functionality such as determining
-            enumeration data types, gettext translation, determining The
-            <application>Gimp</application>'s version number and capabilities,
-            handling data files and accessing the environment
-          </para>
-          <indexterm zone="gimp libgimpbase-2.0">
-            <primary sortas="c-libgimpbase-2.0">libgimpbase-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpcolor-2.0">
-        <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
-          </para>
-          <indexterm zone="gimp libgimpcolor-2.0">
-            <primary sortas="c-libgimpcolor-2.0">libgimpcolor-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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
-          </para>
-          <indexterm zone="gimp libgimpconfig-2.0">
-            <primary sortas="c-libgimpconfig-2.0">libgimpconfig-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpmath-2.0">
-        <term><filename class="libraryfile">libgimpmath-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains C functions which provide mathematical definitions and
-            macros, manipulate 3x3 transformation matrices, set up and manipulate
-            vectors and the MD5 message-digest algorithm
-          </para>
-          <indexterm zone="gimp libgimpmath-2.0">
-            <primary sortas="c-libgimpmath-2.0">libgimpmath-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpmodule-2.0">
-        <term><filename class="libraryfile">libgimpmodule-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions which implement module loading using
-            GModule and supports keeping a list of GimpModule's found in a given
-            searchpath
-          </para>
-          <indexterm zone="gimp libgimpmodule-2.0">
-            <primary sortas="c-libgimpmodule-2.0">libgimpmodule-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpthumb-2.0">
-        <term><filename class="libraryfile">libgimpthumb-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions for handling The
-            <application>Gimp</application>'s thumbnail objects
-          </para>
-          <indexterm zone="gimp libgimpthumb-2.0">
-            <primary sortas="c-libgimpthumb-2.0">libgimpthumb-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpui-2.0">
-        <term><filename class="libraryfile">libgimpui-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains The <application>Gimp</application>'s common user
-            interface functions
-          </para>
-          <indexterm zone="gimp libgimpui-2.0">
-            <primary sortas="c-libgimpui-2.0">libgimpui-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpwidgets-2.0">
-        <term><filename class="libraryfile">libgimpwidgets-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains The <application>Gimp</application>
-            and <application>GTK</application>'s widget creation and
-            manipulation functions
-          </para>
-          <indexterm zone="gimp libgimpwidgets-2.0">
-            <primary sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,323 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gparted-download-http "&sourceforge-dl;/gparted/gparted-&gparted-version;.tar.gz">
-  <!ENTITY gparted-download-ftp  " ">
-  <!ENTITY gparted-md5sum        "b2006a0a3f35853e7d7dc34c87db11f2">
-  <!ENTITY gparted-size          "5.2 MB">
-  <!ENTITY gparted-buildsize     "72 MB (add 70 MB for tests)">
-  <!ENTITY gparted-time          "0.3 SBU (using parallelism=4; add 0.3 SBU for tests)">
-]>
-
-<sect1 id="gparted" xreflabel="Gparted-&gparted-version;">
-  <?dbhtml filename="gparted.html"?>
-
-
-  <title>Gparted-&gparted-version;</title>
-
-  <indexterm zone="gparted">
-    <primary sortas="a-Gparted">Gparted</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gparted</title>
-
-    <para>
-      Gparted is the Gnome Partition Editor, a Gtk 3 GUI for other command line
-      tools that can create, reorganise or delete disk partitions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gparted-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gparted-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gparted-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gparted-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gparted-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gparted-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gparted Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- GTKMM2 is no longer used since 1.0.0, see #12110 -->
-      <xref linkend="gtkmm3"/> and
-      <xref linkend="parted"/>
-    </para>
-
-    <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
-      <ulink url="https://github.com/pali/udftools">udftools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gparted</title>
-
-    <para>
-      Install <application>Gparted</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-doc    \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-doc</parameter>: This switch disables building of
-      the optional documentation. Remove it if you have installed
-      <application>GNOME Doc Utils</application>.
-    </para>
-
-<!-- this is an option, not a parameter, but is it still necessary for
-     wayland? -->
-    <para>
-      <option>--enable-xhost-root</option>: This switch  provides an
-      interim workaround to allow GParted to run under Wayland by using xhost
-      to grant and revoke root access to the X11 display.
-    </para>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using Gparted</title>
-
-    <para>
-      To manipulate file systems Gparted has a run time dependency on various
-      file system tools (you only need to install the tools for file systems you
-      actually use):
-      <xref linkend="hdparm"/>
-      (required for optionally displaying serial number device information),
-      <xref linkend="btrfs-progs"/>,
-      <xref role="runtime" linkend="dosfstools"/>,
-      e2fsprogs (installed as part of LFS),
-      <xref linkend="jfsutils"/>,
-      <!--<xref linkend="ntfs-3g"/>,-->
-      <!--<xref linkend="reiserfs"/>,-->
-      <xref linkend="xfsprogs"/>,
-      <ulink url="https://ftp.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="https://nilfs.sourceforge.io/en/">nilfs-utils</ulink>,
-      <ulink url="https://reiser4.wiki.kernel.org/index.php/Reiser4progs">
-      Reiser4progs</ulink>, and
-      <ulink
-        url='https://mirrors.edge.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/'>
-        reiserfsprogs</ulink>.
-    </para>
-
-    <para>
-      Root privileges are required to run Gparted. If you wish to run the
-      application from the menu, further applications and configurations are
-      necessary. Examples of applications that may be used:
-      <ulink url="https://people.debian.org/~kov/gksu/">gksu</ulink>,
-      <ulink url="https://launchpad.net/kdesudo">kdesudo</ulink>, or
-      <ulink url="https://github.com/tarakbumba/xdg-su">xdg-su</ulink>.
-      <!--Another solution is to use <application>pkexec</application>, from
-      <xref linkend="polkit"/>, but some configuration is necessary.-->
-      Another simple solution is <xref linkend="ssh-askpass"/>. <!--Below, we
-      describe these two alternatives: "ssh-askpass" and "pkexec".-->
-    </para>
-
-    <sect3 role="ssh-askpass">
-      <title>ssh-askpass</title>
-        <para>
-          To optionally use <xref linkend="ssh-askpass"/> if it is installed in
-          your system, run the following commands as the
-          <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="root"><userinput>cp -v /usr/share/applications/gparted.desktop /usr/share/applications/gparted.desktop.back &amp;&amp;
-sed -i 's/Exec=/Exec=sudo -A /'               /usr/share/applications/gparted.desktop</userinput></screen>
-
-        <para>
-         Now, clicking on the menu item for Gparted, a dialog appears on the
-         screen, asking for the administrator password.</para>
-
-    </sect3>
-<!--
-    <sect3 role="pkexec" revision="sysv">
-      <title>pkexec</title>
-        <para>
-          To optionally use <application>pkexec</application>, you need <xref
-          linkend="polkit-gnome"/><!- - or <xref linkend="lxpolkit"/>- ->, and
-          <xref linkend="consolekit"/> installed with support to <xref
-          linkend="linux-pam"/> and <xref linkend="polkit"/>. As the
-          <systemitem class="username">root</systemitem> user, configure <xref
-          linkend="gparted"/> and <xref linkend="polkit"/> with the following
-          commands:
-        </para>
-
-<screen role="root"><userinput>cp -v /usr/share/applications/gparted.desktop \
-                                     /usr/share/applications/gparted.desktop.back &amp;&amp;
-sed -i 's:/usr/bin/gparted:/usr/bin/gparted_polkit:' \
-                                   /usr/share/applications/gparted.desktop      &amp;&amp;
-
-cat &gt; /usr/bin/gparted_polkit &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/bash
-
-pkexec /usr/bin/gparted $@</literal>
-EOF
-chmod -v 0755 /usr/bin/gparted_polkit</userinput></screen>
-
-        <para>
-          Still as the <systemitem class="username">root</systemitem> user,
-          configure <xref linkend="polkit"/> and <xref linkend="gparted"/> to
-          use <application>pkexec</application>:
-        </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/polkit-1/actions/org.gnome.gparted.policy &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"&gt;
-&lt;policyconfig&gt;
-
-  &lt;action id="org.freedesktop.policykit.pkexec.run-gparted"&gt;
-    &lt;description&gt;Run GParted&lt;/description&gt;
-    &lt;message&gt;Authentication is required to run GParted&lt;/message&gt;
-    &lt;defaults&gt;
-      &lt;allow_any&gt;no&lt;/allow_any&gt;
-      &lt;allow_inactive&gt;no&lt;/allow_inactive&gt;
-      &lt;allow_active&gt;auth_admin_keep&lt;/allow_active&gt;
-    &lt;/defaults&gt;
-    &lt;annotate key="org.freedesktop.policykit.exec.path"&gt;/usr/bin/gparted&lt;/annotate&gt;
-    &lt;annotate key="org.freedesktop.policykit.exec.allow_gui"&gt;true&lt;/annotate&gt;
-  &lt;/action&gt;
-
-&lt;/policyconfig&gt;</literal>
-EOF
-chmod -v 0644 /usr/share/polkit-1/actions/org.gnome.gparted.policy</userinput></screen>
-
-        <para>
-         Now, clicking in the menu item for Gparted, a dialog appears in the
-         screen, asking for the administrator password.</para>
-
-    </sect3>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gparted<!--, gpartedbin--> and gparted_polkit (optional)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gparted-prog">
-        <term><command>gparted</command></term>
-        <listitem>
-          <para>
-            is a shell script which sets up the environment before calling
-            <command>gpartedbin</command>
-          </para>
-          <indexterm zone="gparted gparted-prog">
-            <primary sortas="b-gparted">gparted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="gpartedbin">
-        <term><command>gpartedbin</command></term>
-        <listitem>
-          <para>
-            is the Gparted binary
-          </para>
-          <indexterm zone="gparted gpartedbin">
-            <primary sortas="b-gpartedbin">gpartedbin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="gparted_polkit">
-        <term><command>gparted_polkit</command></term>
-        <listitem>
-          <para>
-            is an optional script which can be used to run gparted with polkit,
-            from a menu
-          </para>
-          <indexterm zone="gparted gparted_polkit">
-            <primary sortas="b-gparted_polkit">gparted_polkit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- For the next version, remove the -repack -->
-  <!ENTITY hexchat-download-http "https://github.com/hexchat/hexchat/releases/download/v&hexchat-version;/hexchat-&hexchat-version;.tar.xz">
-  <!ENTITY hexchat-download-ftp  " ">
-  <!ENTITY hexchat-md5sum        "6970b1eef39db56c9f5380efd81e55bf">
-  <!ENTITY hexchat-size          "1.3 MB">
-  <!ENTITY hexchat-buildsize     "22 MB">
-  <!ENTITY hexchat-time          "0.2 SBU">
-]>
-
-<sect1 id="hexchat" xreflabel="HexChat-&hexchat-version;">
-  <?dbhtml filename="hexchat.html"?>
-
-
-  <title>HexChat-&hexchat-version;</title>
-
-  <indexterm zone="hexchat">
-    <primary sortas="a-HexChat">HexChat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to HexChat</title>
-
-    <para>
-      <application>HexChat</application> is an IRC chat program.  It allows
-      you to join multiple IRC channels (chat rooms) at the same time, talk
-      publicly, have private one-on-one conversations, etc.  File transfers are
-      also possible.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hexchat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hexchat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hexchat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hexchat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hexchat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hexchat-time;
-        </para>
-      </listitem>
-    </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"/>
-    </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.-->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="iso-codes"/>,
- <!-- <xref linkend="libcanberra"/>, -->
-      <xref linkend="libnotify"/>,
-      <xref linkend="pciutils"/>,
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>,
-      <ulink url="https://luajit.org/">luajit</ulink>,
-      if python is enabled
-      <ulink url="https://cffi.readthedocs.io/en/latest/">cffi</ulink> and
-      <ulink url="https://github.com/eliben/pycparser">pycparser</ulink>.
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of HexChat</title>
-
-<!-- Since 2.16.0 its not longer required, even when python is enabled
-    <para>
-      First, fix the python plugin:
-    </para>
--->
-<!-- Since 2.16.0 its added and default:
-<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:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..              \
-      --prefix=/usr         \
-      --buildtype=release   \
-      -Dwith-lua=false      \
-      -Dwith-python=false   &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>
-
-    <!--
-    <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>
-
-    <para>
-      <parameter>-Dwith-python=false</parameter>: If the Python interface
-      should be enabled, remove this switch or set it to <literal>true</literal>.
-      When enabling Python, two additional modules (cffi and pycparser)
-      needs to be installed prior to installation of <application>Hexchat</application>.
-    </para>
-
-    <para>
-      <option>-Dwith-libcanberra=false</option>: Use this switch if you have
-      libcanberra not installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>hexchat</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/hexchat</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hexchat-prog">
-        <term><command>hexchat</command></term>
-        <listitem>
-          <para>
-            is a graphical Internet Relay Chat (IRC) client
-          </para>
-          <indexterm zone="hexchat hexchat-prog">
-            <primary sortas="b-hexchat">hexchat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,313 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 inkscape-download-http "https://inkscape.org/gallery/item/44615/inkscape-&inkscape-minor-version;.tar.xz">
-
-  <!-- When updating, remember to change the numeric part of the URL -->
-
-  <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "76ed1f4b13065e80de8b2d77b6427b83">
-  <!ENTITY inkscape-size          "43 MB">
-  <!ENTITY inkscape-buildsize     "817 MB (189 MB installed)">
-  <!ENTITY inkscape-time          "4.6 SBU (with parallelism=8)">
-
-  <!-- To find newer tarballs, look here:
-       https://inkscape.org/release/all/source/archive/?pre=0
-  -->
-]>
-
-<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-minor-version;">
-  <?dbhtml filename="inkscape.html"?>
-
-
-  <title>Inkscape-&inkscape-minor-version;</title>
-
-  <indexterm zone="inkscape">
-    <primary sortas="a-Inkscape">Inkscape</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Inkscape</title>
-
-    <para>
-      <application>Inkscape</application> is a what you see is what you get
-      Scalable Vector Graphics editor. It is useful for creating, viewing and
-      changing SVG images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&inkscape-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&inkscape-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &inkscape-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &inkscape-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &inkscape-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &inkscape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-minor-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The tarball <filename>inkscape-&inkscape-minor-version;.tar.xz</filename>
-        will extract to the directory <filename
-        class="directory">inkscape-&inkscape-version;/</filename>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="double-conversion"/>,
-      <xref linkend="gc"/>,
-      <xref linkend="gsl"/>,
-      <xref linkend="gtkmm3"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="poppler"/>,
-      <xref linkend="popt"/> and
-      <xref linkend="wget"/> (to download the test dependencies)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- Imagemagick is used for two different purposes:
-           For raster extensions and image import resolution, Imagemagick
-           libraries are needed but this requires Imagemagick 6:
-           https://gitlab.com/inkscape/inkscape/-/issues/1294
-           TODO: add Imagemagick 6 back or add GraphicsMagick, or port
-                 inkscape to Imagemagick 7 API.
-           For WebSlicer export to JPG or GIF, Imagemagick program
-           "convert" is needed and this is only a runtime dependency.  -->
-      <xref role="runtime" linkend="imagemagick"/> (runtime),
-      <xref linkend="lcms2"/>,
-      <xref linkend="libcanberra"/> (to eliminate plugin warnings),
-      <xref linkend="potrace"/> (for the bucket-fill tool), also
-      various Python modules at runtime for the core extensions:
-      <!-- there might be others, or other needed dependencies:
-       needs someone who knows how to use *all" the core extensions -->
-      <xref role="runtime" linkend="cachecontrol"/>,
-      <xref role="runtime" linkend="cssselect"/>,
-      <xref role="runtime" linkend="lxml"/>,
-      <xref role="runtime" linkend="numpy"/>,
-      <xref role="runtime" linkend="pyserial"/>, and
-      <xref role="runtime" linkend="scour"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="dbus"/> (to run inkscape from scripts),
-      <xref linkend="doxygen"/>,
-      <xref linkend="gspell"/>,
-
-      <!-- these document foundation links work from firefox's address bar, or
-      from google (pages telling you how to get it from git), but when I link
-      them here I get "There is currently no text in this page...". Ken or
-      developer: wiki.documentfoundation.org pages don't like trailing / -->
-      <!--<ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,-->
-      <!--<ulink url="https://gtkspell.sourceforge.net">gtkspell</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/graphicsmagick">GraphicsMagick</ulink>,
-      <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
-      <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
-      <ulink url="https://libwpg.sourceforge.net/">libwpg</ulink> (or
-      <ulink url="https://libwpd.sourceforge.net/">libwpd</ulink>)
-    </para>
-
-<!-- no trace of this perl module in the core extensions for 1.2.2
-    <bridgehead renderas="sect4">Optional Runtime Dependencies
-    (for some of the Inkscape extensions)</bridgehead>
-    <para role="optional">
-      <ulink role="runtime"
-             url="https://metacpan.org/pod/release/TJMATHER/XML-XQL-0.68/lib/XML/XQL.pm">XML::XQL</ulink>
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Inkscape</title>
-
-    <para>
-      First, fix Inkscape to build with poppler-24.03.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-minor-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      First, fix a build failure caused by libxml2-2.12.0:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/uri.h/a #include &lt;libxml/xmlmemory.h&gt;' src/object/uri.h</userinput></screen>
-
-    <para>
-      Install <application>Inkscape</application> by running the following
-      commands:
-    </para>
-<!--
-<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_21.11.0-1.patch &amp;&amp;
--->
-<screen><userinput>mkdir build                       &amp;&amp;
-cd    build                       &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      ..                          &amp;&amp;
-make</userinput></screen>
-
-<!-- A race condition has been observed with inkscape-1.2.2, cmake-3.25.1,
-     and make-4.4. Reported by "Dragan" on the blfs-dev list -->
-&parallel_issues;
-
-<!--
-    <para>
-      To test the results, issue: <command>make check</command>.<!- - Ken or
-      other devs, there is no test suite in this package. -renodr
-      A small test suite is built if you download the necessary programs
-      with the command above (bash download-gtest.sh) -pierre
-      This package does not come with a test suite. - ->
-
-      At the moment, the test suite does not function with the
-      "bash download-gtest.sh". CMake is unable to find gtest.
-    </para>
--->
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      build the release library without any debug `assert` in the code.
-    </para>
-
-    <para>
-      <option>-DWITH_DBUS=ON</option>: use this if you wish to use
-      <command>inkscape</command> in interactive scripts which manipulate
-      images.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          inkscape and inkview
-        </seg>
-        <seg>
-          <!--lib2geom.so and-->
-          libinkscape_base.so (in /usr/lib/inkscape)
-        </seg>
-        <seg>
-          <!--/usr/include/2geom-&lib2geom-version;,-->
-          /usr/lib/inkscape, and
-          /usr/share/inkscape
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="inkscape-prog">
-        <term><command>inkscape</command></term>
-        <listitem>
-          <para>
-            is a SVG (Scalable Vector Graphics) editing program
-          </para>
-          <indexterm zone="inkscape inkscape-prog">
-            <primary sortas="b-inkscape">inkscape</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="inkview">
-        <term><command>inkview</command></term>
-        <listitem>
-          <para>
-            is a simple program for displaying SVG files
-          </para>
-          <indexterm zone="inkscape inkview">
-            <primary sortas="b-inkview">inkview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libinkscape_base">
-        <term><filename class="libraryfile">libinkscape_base.so</filename></term>
-        <listitem>
-          <para>
-            provides the routines used by inkscape and inkview
-          </para>
-          <indexterm zone="inkscape libinkscape_base">
-            <primary sortas="c-libinkscape_base">libinkscape_base.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,36 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="xsoft-other">
+<?dbhtml filename="other.html" dir="xsoft"?>
+<title>Other X-based Internet Programs</title>
 
-<chapter id="xsoft-other">
-  <?dbhtml filename="other.html" ?>
-
-  <title>Other X-based Programs</title>
-
-  <para>
-    These programs use the X Window System and don't fit easily into any
-    of the other chapters.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="feh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hexchat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rox-filer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rxvt-unicode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunderbird.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tigervnc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transmission.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xarchiver.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xscreensaver.xml"/>
+<para>Other X software packages go here.</para>
 
 </chapter>
Index: oft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,405 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pidgin-download-http "&sourceforge-dl;/pidgin/pidgin-&pidgin-version;.tar.bz2">
-  <!ENTITY pidgin-download-ftp  " ">
-  <!ENTITY pidgin-md5sum        "7fa88c8734d22c96ef298b25cd0db0c4">
-  <!ENTITY pidgin-size          "7.9 MB">
-  <!ENTITY pidgin-buildsize     "202 MB (with tests and docs)">
-  <!ENTITY pidgin-time          "0.5 SBU (using parallelism=4; with tests and docs)">
-]>
-
-<sect1 id="pidgin" xreflabel="Pidgin-&pidgin-version;">
-  <?dbhtml filename="pidgin.html"?>
-
-
-  <title>Pidgin-&pidgin-version;</title>
-
-  <indexterm zone="pidgin">
-    <primary sortas="a-Pidgin">Pidgin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pidgin</title>
-
-    <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>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pidgin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pidgin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pidgin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pidgin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pidgin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pidgin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pidgin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="gstreamer10"/> (required for audio support), and
-      <xref linkend="gnutls"/> or
-      <xref role="nodep" linkend="nss"/>
-    </para>
-
-    <!--
-    <para>
-      SSL support is required for the MSN Messenger, Yahoo!, Novel Groupwise and
-      Google Talk protocol plugins. <application>GnuTLS</application> is the
-      preferred method (the Mozilla NSS API is more likely to change and this
-      can cause problems).
-    </para>
-    -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (required for the Bonjour plugin),
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="evolution-data-server"/>,
-      <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
-      plugin),
-      <xref linkend="startup-notification"/>,
-      <!-- <xref linkend="tcl"/>, -->
-      <xref linkend="tk"/>,
-      <ulink url="https://www.freedesktop.org/wiki/Software/Farstream">
-      Farstream</ulink>
-      (required for video and voice support),
-      <ulink url="https://gtkspell.sourceforge.net/">Gtkspell</ulink>,
-      <ulink url="https://libgadu.net/">libgadu</ulink>,
-      <ulink url="https://keep.imfreedom.org/libgnt/libgnt">libgnt</ulink>,
-      <ulink url="https://meanwhile.sourceforge.net/">Meanwhile</ulink>
-      (required for Sametime protocol support),
-      <ulink url="https://www.mono-project.com/">Mono</ulink>,
-      <ulink url="http://silcnet.org/client.html">SILC Client</ulink>,
-      <ulink url="http://silcnet.org/client.html">SILC Toolkit</ulink>,
-      <ulink url="https://packages.debian.org/stable/source/zephyr">Zephyr</ulink>, and
-      <xref linkend="mitkrb"/> (required for Kerberos support in the Zephyr
-      module)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="xdg-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pidgin</title>
-<!-- Seems to pass now (version 2.4.19)
-    <para>
-      First, fix a test that fails:
-    </para>
-
-<screen><userinput>sed '/09-13/s@^@//@' -i libpurple/tests/test_util.c</userinput></screen>
--->
-    <para>
-      Compile <application>Pidgin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --with-gstreamer=1.0 \
-            --disable-avahi      \
-            --disable-gtkspell   \
-            --disable-meanwhile  \
-            --disable-idn        \
-            --disable-nm         \
-            --disable-tk         \
-            --disable-vv         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed
-      (<xref linkend="graphviz"/> can be used also) and you wish to create the
-      API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mkdir -pv /usr/share/doc/pidgin-&pidgin-version; &amp;&amp;
-cp -v README doc/gtkrc-2.0 /usr/share/doc/pidgin-&pidgin-version;</userinput></screen>
-
-    <para>
-      If you created the API documentation, install it using the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>mkdir -pv /usr/share/doc/pidgin-&pidgin-version;/api &amp;&amp;
-cp -rv doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gstreamer=1.0</parameter>: Remove this switch
-      and add <option>--disable-gstreamer</option>
-      if you've not installed <xref linkend="gstreamer10"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-avahi</parameter>: Remove this switch if you've
-      installed <xref linkend="avahi"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-gtkspell</parameter>: Remove this
-      switch if you've installed
-      <ulink url="https://gtkspell.sourceforge.net/">Gtkspell</ulink> and wish
-      to enable spellchecking support.
-    </para>
-
-    <para>
-      <parameter>--disable-meanwhile</parameter>: Remove this switch if you've
-      installed <ulink url="https://meanwhile.sourceforge.net/">Meanwhile</ulink>.
-    </para>
-
-    <para>
-      <parameter>--disable-idn</parameter>: Remove this switch if you've
-      installed <xref linkend="libidn"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-tk</parameter>: Remove this switch if you've
-      installed <xref linkend="tk"/> and you wish to use the TCL bindings.
-    </para>
-
-    <para>
-      <parameter>--disable-nm</parameter>: Remove this switch if you've
-      installed <xref linkend="NetworkManager"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-vv</parameter>: Remove this
-      switch if you've installed
-      <ulink url="https://www.freedesktop.org/wiki/Software/Farstream">
-      Farstream</ulink> and wish to enable voice and video
-      communication support. You should also remove the --disable-gstreamer
-      flag.
-    </para>
-
-    <para>
-      <option>--enable-cyrus-sasl</option>: Use this switch if you've installed
-      <xref linkend="cyrus-sasl"/> and wish to build
-      <application>Pidgin</application> with SASL support.
-    </para>
-
-    <para>
-      <option>--disable-gnutls</option>: Use this switch if you've got both
-      <xref linkend="gnutls"/> and <xref linkend="nss"/> installed, but want
-      to use <xref linkend="nss"/> for the SSL support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Pidgin</title>
-
-    <sect3 id="pidgin-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.purple/*</filename> and
-        <filename>~/.gtkrc-2.0</filename>
-      </para>
-
-      <indexterm zone="pidgin pidgin-config">
-        <primary sortas="e-AA.purple-*">~/.purple/*</primary>
-      </indexterm>
-
-      <indexterm zone="pidgin pidgin-config">
-        <primary sortas="e-AA.gtkrc-20">~/.gtkrc-2.0</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Most configuration can be accomplished by using the various preference
-        settings inside the programs. Additionally, you can create a
-        <filename>~/.gtkrc-2.0</filename> file which can store gtk+-2 theme
-        settings that affect <application>Pidgin</application> and other Gtk+ 2
-        applications. Note that an example <filename>gtkrc-2.0</filename> file
-        was installed during the package installation and can be used as a
-        starting point or reference.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pidgin, purple-client-example,
-          purple-remote, purple-send, purple-send-async, and
-          purple-url-handler
-        </seg>
-        <seg>
-          libpurple.so, and libpurple-client.so
-        </seg>
-        <seg>
-          /usr/include/libpurple,
-          /usr/include/pidgin,
-          /usr/lib/pidgin,
-          /usr/lib/purple-2,
-          /usr/share/doc/pidgin-&pidgin-version;,
-          /usr/share/pixmaps/pidgin,
-          /usr/share/purple, and
-          /usr/share/sounds/purple
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pidgin-prog">
-        <term><command>pidgin</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> 2 instant messaging client
-          </para>
-          <indexterm zone="pidgin pidgin-prog">
-            <primary sortas="b-pidgin">pidgin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-client-example">
-        <term><command>purple-client-example</command></term>
-        <listitem>
-          <para>
-            is an example that demonstrates how to use the libpurple-client
-            library to communicate with purple
-          </para>
-          <indexterm zone="pidgin purple-client-example">
-            <primary sortas="b-purple-client-example">purple-client-example</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-remote">
-        <term><command>purple-remote</command></term>
-        <listitem>
-          <para>
-            sends remote commands to Pidgin/Finch
-          </para>
-          <indexterm zone="pidgin purple-remote">
-            <primary sortas="b-purple-remote">purple-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-send">
-        <term><command>purple-send</command></term>
-        <listitem>
-          <para>
-            calls purple API functions using DBus and prints the return value
-          </para>
-          <indexterm zone="pidgin purple-send">
-            <primary sortas="b-purple-send">purple-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-send-async">
-        <term><command>purple-send-async</command></term>
-        <listitem>
-          <para>
-            calls purple API functions using DBus. As opposed to
-            <command>purple-send</command>, it does not print the return value
-          </para>
-          <indexterm zone="pidgin purple-send-async">
-            <primary sortas="b-purple-send-async">purple-send-async</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-url-handler">
-        <term><command>purple-url-handler</command></term>
-        <listitem>
-          <para>
-            is a python script to handle URLs with purple
-          </para>
-          <indexterm zone="pidgin purple-url-handler">
-            <primary sortas="b-purple-url-handler">purple-url-handler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/rox-filer-kernel.xml
===================================================================
--- xsoft/other/rox-filer-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] <emphasis role='blue'>D</emphasis>notify support                                                  [DNOTIFY]</screen>
Index: oft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,300 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rox-filer-download-http "&sourceforge-dl;/rox/rox-filer-&rox-filer-version;.tar.bz2">
-  <!ENTITY rox-filer-download-ftp  " ">
-  <!ENTITY rox-filer-md5sum        "0eebf05a67f7932367750ebf9faf215d">
-  <!ENTITY rox-filer-size          "1.8 MB">
-  <!ENTITY rox-filer-buildsize     "19 MB">
-  <!ENTITY rox-filer-time          "0.3 SBU">
-]>
-
-<sect1 id="rox-filer" xreflabel="Rox-Filer-&rox-filer-version;">
-  <?dbhtml filename="rox-filer.html"?>
-
-
-  <title>Rox-Filer-&rox-filer-version;</title>
-
-  <indexterm zone="rox-filer">
-    <primary sortas="a-rox-filer">rox-filer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rox-Filer</title>
-
-    <para>
-      <application>rox-filer</application> is a fast, lightweight, gtk2 file
-      manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rox-filer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rox-filer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rox-filer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rox-filer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rox-filer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rox-filer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rox-filer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libglade"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="rox-filer-kernel">
-    <title>Kernel Configuration</title>
-
-      <para>
-        If you want <application>rox-filer</application> to be able to update
-        the contents of a directory when changes are made to the files by other
-        applications (eg, if a script is running) you will need to enable
-        dnotify support in your kernel. In <command>make menuconfig</command>:
-      </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="rox-filer-kernel.xml"/>
-
-    <para>
-      Save the new <filename>.config</filename> and then compile the kernel.
-    </para>
-
-    <indexterm zone="rox-filer rox-filer-kernel">
-      <primary sortas="d-rox-filer">rox-filer</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rox-Filer</title>
-
-    <para>
-      Compile <application>rox-filer</application> with the following commands:
-    </para>
-
-<screen><userinput>cd ROX-Filer                                                        &amp;&amp;
-sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &amp;&amp;
-sed -i 's/gboolean/extern &amp;/' src/session.h                     &amp;&amp;
-
-mkdir build                        &amp;&amp;
-pushd build                        &amp;&amp;
-  ../src/configure LIBS="-lm -ldl" &amp;&amp;
-  make                             &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      Now install it as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/rox                              &amp;&amp;
-cp -av Help Messages Options.xml ROX images style.css .DirIcon /usr/share/rox &amp;&amp;
-
-cp -av ../rox.1 /usr/share/man/man1                  &amp;&amp;
-cp -v  ROX-Filer /usr/bin/rox                        &amp;&amp;
-chown -Rv root:root /usr/bin/rox /usr/share/rox      &amp;&amp;
-
-cd /usr/share/rox/ROX/MIME                           &amp;&amp;
-ln -sv text-x-{diff,patch}.png                       &amp;&amp;
-ln -sv application-x-font-{afm,type1}.png            &amp;&amp;
-ln -sv application-xml{,-dtd}.png                    &amp;&amp;
-ln -sv application-xml{,-external-parsed-entity}.png &amp;&amp;
-ln -sv application-{,rdf+}xml.png                    &amp;&amp;
-ln -sv application-x{ml,-xbel}.png                   &amp;&amp;
-ln -sv application-{x-shell,java}script.png          &amp;&amp;
-ln -sv application-x-{bzip,xz}-compressed-tar.png    &amp;&amp;
-ln -sv application-x-{bzip,lzma}-compressed-tar.png  &amp;&amp;
-ln -sv application-x-{bzip-compressed-tar,lzo}.png   &amp;&amp;
-ln -sv application-x-{bzip,xz}.png                   &amp;&amp;
-ln -sv application-x-{gzip,lzma}.png                 &amp;&amp;
-ln -sv application-{msword,rtf}.png</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":'
-      src/main.c</command>: This command hard codes /usr/share/rox as the
-      directory for <application>rox-filer</application>'s private files.
-      Without this sed rox needs the environment variable ${APP_DIR} to be set.
-    </para>
-
-    <para>
-      <command>sed -i 's/gboolean/extern &amp;/' src/session.h</command>:
-      This command fixes a multiple definition flagged as an error
-      by GCC 10 and higher.
-    </para>
-
-    <para>
-      <command>ln -sv application-...</command>: These commands duplicate the
-      icons for some common mime types. Without these links
-      <application>rox-filer</application> would just display the default
-      "unknown binary blob" icon.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring RoxFiler</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Most of the configuration of <application>rox-filer</application> is
-        achieved by right clicking on a <application>rox-filer</application>
-        window and choosing "Options" from the menu. It stores its settings in
-        <filename class="directory">~/.config/rox.sourceforge.net</filename>.
-      </para>
-
-      <para>
-        A <application>rox-filer</application> feature is that if there is an
-        executable file called <filename>AppRun</filename> in a directory
-        <application>rox-filer</application> will first run
-        <command>AppRun</command> before it opens the folder.
-      </para>
-
-      <para>
-        As an example of how this may be used, if you have ssh access to another
-        computer (perhaps another computer on your local network) with ssh
-        configured for passwordless logins and you have
-        <xref linkend="sshfs"/> installed you can use AppRun to mount the
-        remote computer in a local folder using <command>sshfs</command>. For
-        this example AppRun script to work the folder must have the same name as
-        the hostname of the remote computer:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /path/to/hostname/AppRun &lt;&lt; "HERE_DOC"
-#!/bin/bash
-
-MOUNT_PATH="${0%/*}"
-HOST=${MOUNT_PATH##*/}
-export MOUNT_PATH HOST
-sshfs -o nonempty ${HOST}:/ ${MOUNT_PATH}
-rox -x ${MOUNT_PATH}
-HERE_DOC
-
-chmod 755 /path/to/hostname/AppRun</userinput></screen>
-
-      <para>
-        That works fine for mounting, but to unmount it the
-        command <command>fusermount -u ${MOUNTPOINT}</command> is ran. You could set
-        that as your default umount command in your rox preferences, but you
-        would then be unable to unmount any normal mountpoints (that need
-        umount). A script is needed that will unmount a Fuse mountpoint
-        with <command>fusermount -u ${MOUNTPOINT}</command> and everything else
-        with <command>umount</command>. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/myumount &lt;&lt; "HERE_DOC" &amp;&amp;
-#!/bin/bash
-sync
-if mount | grep "${@}" | grep -q fuse
-then fusermount -u "${@}"
-else umount "${@}"
-fi
-HERE_DOC
-
-chmod 755 /usr/bin/myumount</userinput></screen>
-
-      <para>
-        Now, to make Rox use this simple script, open a Rox window, right click
-        on it and choose Options from the menu. In the left hand list choose
-        "Action windows" and then on the right hand side, where it says
-        "Unmount command" change <command>umount</command> to
-        <command>myumount</command>.
-      </para>
-
-      <para>
-        If you use a desktop environment like
-        <application>Gnome</application> or <application>KDE</application> you
-        may like to create a <filename>rox.desktop</filename> file so that
-        <application>rox-filer</application> appears in the panel's menus. As
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -s ../rox/.DirIcon /usr/share/pixmaps/rox.png &amp;&amp;
-mkdir -p /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/rox.desktop &lt;&lt; "HERE_DOC"
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Rox
-Comment=The Rox File Manager
-Icon=rox
-Exec=rox
-Categories=GTK;Utility;Application;System;Core;
-StartupNotify=true
-Terminal=false
-HERE_DOC</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>rox</seg>
-        <seg>None</seg>
-        <seg>/usr/share/rox</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rox-filer-prog">
-        <term><command>rox</command></term>
-        <listitem>
-          <para>
-            is the rox file manager
-          </para>
-          <indexterm zone="rox-filer rox-filer-prog">
-            <primary sortas="b-rox-filer">rox-filer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: oft/other/rxvt-unicode.xml
===================================================================
--- xsoft/other/rxvt-unicode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,322 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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        "3d0ec83705c9b9ff301a4b9965b3cd9f">
-  <!ENTITY rxvt-unicode-size          "860 KB">
-  <!ENTITY rxvt-unicode-buildsize     "22 MB">
-  <!ENTITY rxvt-unicode-time          "0.2 SBU">
-]>
-
-<sect1 id="rxvt-unicode" xreflabel="rxvt-unicode-&rxvt-unicode-version;">
-  <?dbhtml filename="rxvt-unicode.html"?>
-
-
-  <title>rxvt-unicode-&rxvt-unicode-version;</title>
-
-  <indexterm zone="rxvt-unicode">
-    <primary sortas="a-rxvt-unicode">rxvt-unicode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rxvt-unicode</title>
-
-    <para>
-      <application>rxvt-unicode</application> is a clone of the terminal
-      emulator <application>rxvt</application>, an X Window System terminal
-      emulator which includes support for XFT and Unicode.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        <!-- https://github.com/Perl/perl5/issues/12349 -->
-        Please be aware that <application>rxvt-unicode</application> is
-        affected by an issue in <application>perl</application> where
-        the SIGFPE handler is set to SIG_IGN (i.e. the signal is ignored).
-        If you are building an LFS system from within <command>urxvt</command>
-        and running the test suites, tests in <application>bash</application> and
-        <application>check</application> which test raising this signal will fail.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rxvt-unicode-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rxvt-unicode-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rxvt-unicode-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rxvt-unicode-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rxvt-unicode-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rxvt-unicode-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rxvt-unicode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libptytty"/> and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdk-pixbuf"/> (for background images) and
-      <xref linkend="startup-notification"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rxvt-unicode</title>
-
-    <para>
-      Install <application>rxvt-unicode</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-everything &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-everything</parameter>: Add support for all
-      non-multichoice options. Details about the different options can be
-      found in the file <filename>README.configure</filename>.
-    </para>
-
-    <para>
-      <option>--disable-xft</option>: Remove support for Xft fonts.
-    </para>
-
-    <para>
-      <option>--disable-perl</option>: Disable the embedded
-      <application>Perl</application> interpreter.
-    </para>
-
-    <para>
-      <option>--disable-afterimage</option>: Remove support for
-      libAfterImage.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rxvt-unicode</title>
-
-    <para>
-      The <application>rxvt-unicode</application> terminal emulator uses the
-      resource class <classname>URxvt</classname> and the resource name
-      <classname>urxvt</classname>. You can add X resource definitions to a
-      user's <filename>~/.Xresources</filename> or
-      <filename>~/.Xdefaults</filename> files or to the system-wide
-      <filename>/etc/X11/app-defaults/URxvt</filename> file. The following
-      example will load the <classname>matcher</classname>
-      <application>Perl</application> extension (assuming
-      <application>Perl</application> support wasn't disabled), which enables
-      a left button click to open an underlined URL in the specified browser,
-      sets a background and foreground color and loads an Xft font (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/URxvt &lt;&lt; "EOF"
-<literal>! Use the specified colour as the windows background colour [default white]
-URxvt*background: black
-
-! Use the specified colour as the windows foreground colour [default black]
-URxvt*foreground: yellow
-
-! Select the fonts to be used. This is a comma separated list of font names
-URxvt*font: xft:Monospace:pixelsize=18
-
-! Comma-separated list(s) of perl extension scripts (default: "default")
-URxvt*perl-ext: matcher
-
-! Specifies the program to be started with a URL argument. Used by
-URxvt*url-launcher: firefox
-
-! When clicked with the mouse button specified in the "matcher.button" resource
-! (default 2, or middle), the program specified in the "matcher.launcher"
-! resource (default, the "url-launcher" resource, "sensible-browser") will be
-! started with the matched text as first argument.
-! Below, default modified to mouse left button.
-URxvt*matcher.button:     1</literal>
-EOF</userinput></screen>
-
-    <para>
-      In order to view the defined X resources, issue:
-    </para>
-
-<screen role="nodump"><userinput>xrdb -query</userinput></screen>
-
-    <para>
-      In order to add the modifications of the new user configuration file,
-      keeping previously X configurations (of course, unless you are changing
-      any on previously define), issue:
-    </para>
-
-<screen role="nodump"><userinput>xrdb -merge ~/.Xresources</userinput></screen>
-
-    <para>
-      The <application>rxvt-unicode</application> application can also run
-      in a daemon mode, which makes it possible to open multiple terminal
-      windows within the same process. The <command>urxvtc</command> client
-      then connects to the <command>urxvtd</command> daemon and requests a
-      new terminal window.  Use this option with caution. If the daemon
-      crashes, all the running processes in the terminal windows are
-      terminated.
-    </para>
-
-    <para>
-      You can start the <command>urxvtd</command> daemon in the system or
-      personal startup <command>X</command> session script (e.g.,
-      <filename>~/.xinitrc</filename>) by adding the following lines near the
-      top of the script:
-    </para>
-
-<screen role="nodump"><userinput><literal># Start the urxvtd daemon
-urxvtd -q -f -o &amp;</literal></userinput></screen>
-
-    <para>
-      For more information, examine the <command>urxvt</command>,
-      <command>urxvtd</command>, <command>urxvtc</command>, and
-      <filename>urxvtperl</filename> man pages.
-    </para>
-
-    <para>
-      If you use a Desktop Environment, a menu entry can be included,
-      issuing, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/applications/urxvt.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=Rxvt-Unicode Terminal
-Comment=Use the command line
-GenericName=Terminal
-Exec=urxvt
-Terminal=false
-Type=Application
-Icon=utilities-terminal
-Categories=GTK;Utility;TerminalEmulator;
-#StartupNotify=true
-Keywords=console;command line;execute;</literal>
-EOF
-
-update-desktop-database -q</userinput></screen>
-
-    <para>
-      For that, you need <xref linkend="desktop-file-utils"/> and at least
-      one of <xref linkend="gnome-icon-theme"/>, <xref linkend="oxygen-icons"/>
-      and <xref linkend="lxde-icon-theme"/>. Uncomment the line with
-      <quote>StartupNotify=true</quote> if <xref
-      linkend="startup-notification"/> is installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>urxvt, urxvtd, and urxvtc</seg>
-        <seg>Many <application>Perl</application> extensions located under
-        <filename class="directory">/usr/lib/urxvt/perl</filename></seg>
-        <seg>/usr/lib/urxvt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="urxvt-bin">
-        <term><command>urxvt</command></term>
-        <listitem>
-          <para>
-            is a terminal emulator for the X Window System
-          </para>
-          <indexterm zone="rxvt-unicode urxvt-bin">
-            <primary sortas="b-urxvt-bin">urxvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="urxvtd">
-        <term><command>urxvtd</command></term>
-        <listitem>
-          <para>
-            is the <command>urxvt</command> terminal daemon
-          </para>
-          <indexterm zone="rxvt-unicode urxvtd">
-            <primary sortas="b-urxvtd">urxvtd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="urxvtc">
-        <term><command>urxvtc</command></term>
-        <listitem>
-          <para>
-            controls the <command>urxvtd</command> daemon
-          </para>
-          <indexterm zone="rxvt-unicode urxvtc">
-            <primary sortas="b-urxvtc">urxvtc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,486 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
-  <!ENTITY thunderbird-download-ftp  " ">
-  <!ENTITY thunderbird-md5sum        "27a4fa01ed76c106afda4aa59d94eca3">
-  <!ENTITY thunderbird-size          "508 MB">
-  <!ENTITY thunderbird-buildsize     "6.5 GB (229 MB installed)">
-  <!ENTITY thunderbird-time          "12 SBU (on a 8-core machine)">
-  <!-- Removed the -j1 time because python and rust do not obey it, although
-       the C/C++ code appears to obey it.
-
-       Version 102.3.3: I disabled all but 4 cores.  SBU was 20 (2019 seconds)
-       -->
-]>
-
-<sect1 id="thunderbird" xreflabel="Thunderbird-&thunderbird-version;">
-  <?dbhtml filename="thunderbird.html" ?>
-
-
-  <title>Thunderbird-&thunderbird-version;</title>
-
-  <indexterm zone="thunderbird">
-    <primary sortas="a-Thunderbird">Thunderbird</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Thunderbird</title>
-
-    <para>
-      <application>Thunderbird</application> is a stand-alone mail/news client
-      based on the <application>Mozilla</application> codebase. It uses the
-      Gecko rendering engine to enable it to display and compose HTML emails.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunderbird-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunderbird-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunderbird-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunderbird-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunderbird-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunderbird-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cbindgen"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="llvm"/> including clang, <!-- used by default if found -->
-      <xref linkend="nodejs"/>,
-      <xref linkend="pulseaudio"/> (or <xref linkend="alsa-lib"/> if you edit
-      the mozconfig; although it is now deprecated by mozilla),
-      <xref linkend="python311"/> (rebuilt with the sqlite module),
-      <xref linkend="startup-notification"/>, and
-      <xref linkend="unzip"/>
-      <!--<xref linkend="yasm"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- When using system ICU, a problem occurs where the calendar and mail
-           functions do not render correctly and it causes other strange
-           behavior to occur. See Ticket #18323 for more details, as well as
-           https://lore.kernel.org/distributions/075a20b1-869b-78f3-9ace-e106a4d43ac4@linuxlounge.net/T/#u -->
-      <!--<xref linkend="icu"/>,-->
-      <xref linkend="libevent"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="nasm"/>,
-      <xref linkend="nspr"/>, and
-      <xref linkend="nss"/>
-    </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 role="runtime" linkend="pciutils"/> (runtime),
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
-      <ulink url="https://facebook.github.io/watchman/">watchman</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Thunderbird</title>
-
-    <note>
-      <para>
-        The build process for Thunderbird can use 8GB+ of RAM when linking.
-        Make sure that you have adequate swap or RAM before continuing.
-      </para>
-    </note>
-
- <!-- Restore after Python 3.12 is usable for this package again
-    <para>
-      The building system ships several internal copies of the Python 3
-      modules <application>setuptools</application> and
-      <filename>six.py</filename>.  The shipped copies are too old
-      to work well with Python 3.12 or later.  Replace them with the
-      symlinks to the LFS <application>setuptools</application> package and
-      <xref linkend='six'/> already installed on the system, and adapt the
-      building system for these updated Python modules.  We also need to
-      rewrite the code based on the <filename>imp</filename> module removed
-      in Python 3.12 and later using the <filename>importlib</filename>
-      module:
-    </para>
-
-<screen><userinput>(for i in $(find -name six.py); do
-   ln -sfv /usr/lib/python&python3-majorver;/site-packages/six.py $i
-   [ $? = 0 ] || exit $?
- done) &amp;&amp;
-
-sed '/ConfigParser/s/Safe//'                          \
-    -i testing/mozbase/mozprofile/mozprofile/prefs.py &amp;&amp;
-
-(for i in setuptools distutils-precedence.pth  \
-          pkg_resources _distutils_hack; do
-   rm -rf third_party/python/setuptools/$i     &amp;&amp;
-   ln -sv /usr/lib/python&python3-majorver;/site-packages/$i \
-          third_party/python/setuptools
-   [ $? = 0 ] || exit $?
- done) &amp;&amp;
-
-sed 's/distutils/setuptools._&amp;/'            \
-    -i python/mozbuild/mozbuild/nodeutil.py &amp;&amp;
-
-sed -e '/^import/s/imp$/importlib.util/'             \
-    -e 's/imp.new_module/__import__/'                \
-    -e "s/imp.load_source\(.*\)/spec =               \
-        importlib.util.spec_from_file_location\1;    \
-        mod = importlib.util.module_from_spec(spec); \
-        spec.loader.exec_module(mod)/" -i python/mach/mach/main.py &amp;&amp;
-sed '/import imp/d' -i netwerk/dns/prepare_tlds.py
-</userinput></screen>
--->
-
-    <para>
-      The configuration of <application>Thunderbird</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 a brief description of each),
-      issue <command>./mach configure -- --help | less</command>. Create the file with
-      the following command:
-    </para>
-
-<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, all cores will be used.
-
-# If you have installed wireless-tools comment out this line:
-ac_add_options --disable-necko-wifi
-
-# Uncomment the following option if you have not installed PulseAudio
-#ac_add_options --enable-audio-backends=alsa
-
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-webp
-<!-- With Thunderbird ESR 128 we'd replace the following part with
-"- -enable-elf-hack=relr", or remove it if relr becomes the default. -->
-# on some machines. It is supposed to improve startup time and it shrinks
-# libxul.so by a few MB.  With recent Binutils releases the linker already
-# supports a much safer and generic way for this.
-ac_add_options --disable-elf-hack
-export LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs"
-
-# The BLFS editors recommend not changing anything below this line:
-ac_add_options --prefix=/usr
-ac_add_options --enable-application=comm/mail
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-tests
-
-# This enables SIMD optimization in the shipped encoding_rs crate.
-ac_add_options --enable-rust-simd
-
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-
-# You cannot distribute the binary if you do this.
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# Using sandboxed wasm libraries has been moved to all builds instead
-# of only mozilla automation builds. It requires extra llvm packages
-# and was reported to seriously slow the build. Disable it.
-ac_add_options --without-wasm-sandboxed-libraries</literal>
-EOF</userinput></screen>
-
-    <!-- https://github.com/rust-lang/rust-bindgen/pull/2689 -->
-    <para>
-      Adapt the shipped <application>rust-bindgen</application> copy for
-      LLVM-18 and later, and tell <command>cargo</command> we've modified
-      the code of <application>rust-bindgen</application> so the checksum
-      verification of this crate should be skipped:
-    </para>
-
-    <screen><userinput>sed -e "/match cursor.kind()/a                                    \
-        CXCursor_LinkageSpec => return Err(ParseError::Recurse)," \
-    -i third_party/rust/bindgen/ir/item.rs                        &amp;&amp;
-
-cat &gt;&gt; Cargo.toml &lt;&lt; EOF &amp;&amp;
-<literal>[patch.crates-io.bindgen_0_64_0]
-package = "bindgen"
-version = "0.64.0"
-path = "third_party/rust/bindgen"</literal>
-EOF
-
-sed -r '/name = "bindgen"/,+5 s/^source|^checksum/#&amp;/' \
-    -i Cargo.lock</userinput></screen>
-
-    <!-- https://hg.mozilla.org/mozilla-central/rev/ba6abbd36b49 -->
-    <para>
-      Adapt the WebRTC code to use 64-bit timestamp to fix a build
-      failure with Clang-18 and later:
-    </para>
-
-    <screen><userinput>sed 's/uint32_t timestamp/uint64_t timestamp/'                \
-    -i dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp    \
-       dom/media/gtest/TestGMPRemoveAndDelete.cpp             \
-       dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp &amp;&amp;
-
-sed '/mInputImageMap/s/uint32_t/uint64_t/' \
-    -i dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h</userinput></screen>
-
-    <para>
-      Now invoke the Python <command>mach</command> script to compile
-      <application>Thunderbird</application>:
-    </para>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozshm.xml"/>
-    </note>
-
-<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export MOZBUILD_STATE_PATH=./mozbuild               &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./mach build</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Install <application>Thunderbird</application> by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $PYTHON311 ./mach install</userinput></screen>
-<!-- devs: For DESTDIR install, prepend DESTDIR=<dest> to the above -->
-
-    <para>
-      Empty the environment variables which were set above:
-    </para>
-
-<screen><userinput>unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE &amp;&amp;
-unset MOZBUILD_STATE_PATH                     &amp;&amp;
-unset PYTHON311</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
-      system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels nor using the system python modules.
-      This prevent version mismatches between system modules and bundled ones.
-    </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.
-    </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>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Set these environment variables
-      <emphasis>before you run the configure script</emphasis>
-      if you wish to continue to use gcc, g++. Building
-      with GCC on i?86 is currently broken.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Thunderbird</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        If your Window Manager or Desktop Environment does not allow you to
-        configure a default browser, you can add a configuration parameter to
-        <application>Thunderbird</application> so that a browser will start when
-        you click on an Internet/intranet/local URL. The procedure to check
-        or modify any of the configuration parameters is quite simple and the
-        instructions here can be used to view or modify any of the parameters.
-      </para>
-
-      <para>
-        First, open the configuration dialog by opening the <quote>Edit</quote>
-        drop-down menu. Choose <quote>Preferences</quote> and then scroll down
-        to the bottom of the page. Then, click the <quote>Config Editor</quote>
-        button. Click on the <quote>I accept the risk!</quote> button.
-        This will display a list of the configuration preferences and
-        information 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 (True/False), simply double-click on the preference to
-        toggle the value and two, for other preferences simply right-click on
-        the desired line, choose <quote>Modify</quote> from the menu and change
-        the value. Creating new preference items is accomplished in the same
-        way, except choose <quote>New</quote> from the menu and provide the
-        desired data into the fields when prompted.
-      </para>
-
-      <para>
-        The configuration preference item you need to check so that
-        <application>Thunderbird</application> uses a specified browser is the
-        <parameter>network.protocol-handler.app.http</parameter> which should be
-        set to the path of the desired browser, e.g.
-        <option>/usr/bin/firefox</option>.
-      </para>
-<!--  Bad URL
-      <tip>
-        <para>
-          There is a multitude of configuration parameters you can tweak to
-          customize <application>Thunderbird</application>. A very extensive,
-          but not so up-to-date list of these parameters can be found at
-          <ulink url="http://preferential.mozdev.org/preferences.html"/>.
-        </para>
-      </tip>
--->
-    <para>
-
-      If you use a desktop environment such as <application>GNOME</application>
-      or <application>KDE</application>, a desktop file
-      <filename>thunderbird.desktop</filename> may be created, in order to
-      include a <quote><application>Thunderbird</application></quote> entry in
-      the menu. <!--If you didn't enable
-      <application>startup-notification</application> in your mozconfig, then
-      change the StartupNotify line to false.--> Run the following commands as the
-      <systemitem class="username">root</systemitem> user:
-
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
-
-cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Name=Thunderbird Mail
-Comment=Send and receive mail with Thunderbird
-GenericName=Mail Client
-Exec=thunderbird %u
-Terminal=false
-Type=Application
-Icon=thunderbird
-Categories=Network;Email;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
-StartupNotify=true</literal>
-EOF
-
-ln -sfv /usr/lib/thunderbird/chrome/icons/default/default256.png \
-        /usr/share/pixmaps/thunderbird.png</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          thunderbird
-        </seg>
-        <seg>
-          Numerous libraries and modules in the /usr/lib/thunderbird directory
-        </seg>
-        <seg>
-          /usr/lib/thunderbird
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="thunderbird-prog">
-        <term><command>thunderbird</command></term>
-        <listitem>
-          <para>
-            is <application>Mozilla</application>'s email and newsgroup client
-          </para>
-          <indexterm zone="thunderbird thunderbird-prog">
-            <primary sortas="b-thunderbird">thunderbird</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,522 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tigervnc-download-http "https://github.com/TigerVNC/tigervnc/archive/v&tigervnc-version;/tigervnc-&tigervnc-version;.tar.gz">
-  <!ENTITY tigervnc-download-ftp  " ">
-  <!ENTITY tigervnc-md5sum        "3a794e3a063443e07250de8e99e2e05a">
-  <!ENTITY tigervnc-size          "1.8 MB">
-  <!ENTITY tigervnc-buildsize     "97 MB">
-  <!ENTITY tigervnc-time          "0.4 SBU (Using parallelism=4)">
-  <!--<!ENTITY tigervnc-xorg-version  "21.1.12">-->
-]>
-
-<sect1 id="tigervnc" xreflabel="tigervnc-&tigervnc-version;">
-  <?dbhtml filename="tigervnc.html"?>
-
-
-  <title>Tigervnc-&tigervnc-version;</title>
-
-  <indexterm zone="tigervnc">
-    <primary sortas="a-tigervnc">tigervnc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tigervnc</title>
-
-    <para>
-      <application>Tigervnc</application> is an advanced VNC (Virtual
-      Network Computing) implementation.  It allows creation of an Xorg server
-      not tied to a physical console and also provides a client for
-      viewing of the remote graphical desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tigervnc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tigervnc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tigervnc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tigervnc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tigervnc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tigervnc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required file:
-          <ulink url="&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Commented out since we're tracking the same xorg-server right now
-    <note>
-      <para>
-        The version of <application>Xorg</application> may eventually be a few
-        versions out of date, but is required for the customizations needed
-        for this package.
-      </para>
-    </note>
--->
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/tigervnc-&tigervnc-version;-configuration_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem revision='sysv'>
-        <para>
-          Optional file to start the server without a display manager:
-          <ulink url="&sources-anduin-http;/tigervnc/vncserver"/>
-        </para>
-      </listitem>
-      <listitem revision='sysv'>
-        <para>
-          Optional manual page:
-          <ulink url="&sources-anduin-http;/tigervnc/vncserver.1"/>
-        </para>
-      </listitem>
-      <listitem revision='systemd'>
-        <para>
-          Optional file to start the server without a display manager:
-          <ulink url="&sources-anduin-http;/tigervnc/Xsession"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tigervnc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="fltk"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libjpeg"/>,
-      <phrase revision='sysv'><xref linkend="linux-pam"/>,</phrase>
-      <xref linkend="pixman"/>,
-      <phrase revision='systemd'><xref linkend="systemd"/>
-        (with <xref linkend="linux-pam"/>),</phrase>
-      <xref linkend="xorg7-app"/>,
-      <xref linkend="xinit"/>, and
-      <xref linkend="xorg7-legacy"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="imagemagick"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tigervnc</title>
-
-    <para>
-      First, make adjustments to the configuration files to make them
-      compatible with LFS systems:
-      <!-- Replaces an incompatible PAM file and disables SELinux support
-           in systemd units. Also modifies the search path for
-           /usr/libexec/vncserver to include /etc/X11/tigervnc -->
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../tigervnc-&tigervnc-version;-configuration_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>tigervnc</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput># Put code in place
-mkdir -p unix/xserver &amp;&amp;
-tar -xf ../xorg-server-&xorg-server-version;.tar.xz \
-    --strip-components=1              \
-    -C unix/xserver                   &amp;&amp;
-( cd unix/xserver &amp;&amp;
-  patch -Np1 -i ../xserver21.1.1.patch ) &amp;&amp;
-
-# Build viewer
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DINSTALL_SYSTEMD_UNITS=OFF \
-      -Wno-dev . &amp;&amp;
-make &amp;&amp;
-
-# Build server
-pushd unix/xserver &amp;&amp;
-  autoreconf -fiv  &amp;&amp;
-
-  CPPFLAGS="-I/usr/include/drm"       \
-  ./configure $XORG_CONFIG            \
-      --disable-xwayland    --disable-dri        --disable-dmx         \
-      --disable-xorg        --disable-xnest      --disable-xvfb        \
-      --disable-xwin        --disable-xephyr     --disable-kdrive      \
-      --disable-devel-docs  --disable-config-hal --disable-config-udev \
-      --disable-unit-tests  --disable-selective-werror                 \
-      --disable-static      --enable-dri3                              \
-      --without-dtrace      --enable-dri2        --enable-glx          \
-      --with-pic &amp;&amp;
-  make  &amp;&amp;
-popd</userinput></screen>
-
-<screen revision="systemd"><userinput># Put code in place
-mkdir -p unix/xserver &amp;&amp;
-tar -xf ../xorg-server-&xorg-server-version;.tar.xz \
-    --strip-components=1              \
-    -C unix/xserver                   &amp;&amp;
-( cd unix/xserver &amp;&amp;
-  patch -Np1 -i ../xserver21.1.1.patch ) &amp;&amp;
-
-# Build viewer
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev . &amp;&amp;
-make &amp;&amp;
-
-# Build server
-pushd unix/xserver &amp;&amp;
-  autoreconf -fiv  &amp;&amp;
-
-  CPPFLAGS="-I/usr/include/drm"       \
-  ./configure $XORG_CONFIG            \
-      --disable-xwayland    --disable-dri        --disable-dmx         \
-      --disable-xorg        --disable-xnest      --disable-xvfb        \
-      --disable-xwin        --disable-xephyr     --disable-kdrive      \
-      --disable-devel-docs  --disable-config-hal --disable-config-udev \
-      --disable-unit-tests  --disable-selective-werror                 \
-      --disable-static      --enable-dri3                              \
-      --without-dtrace      --enable-dri2        --enable-glx          \
-      --with-pic &amp;&amp;
-  make  &amp;&amp;
-popd</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>#Install viewer
-make install &amp;&amp;
-
-#Install server
-( cd unix/xserver/hw/vnc &amp;&amp; make install ) &amp;&amp;
-
-[ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
-
-   <para revision="sysv">
-     Finally, modify the PAM file to be compatible with elogind:
-   </para>
-
-<screen role="root" revision="sysv"><userinput>sed -i 's/pam_systemd.so/pam_elogind.so/' /etc/pam.d/tigervnc</userinput></screen>
-
-<!-- These are installed as part of 'make install' for the client.
-    <para>
-      Finally, create a menu entry.  As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/applications/vncviewer.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Type=Application
-Name=TigerVNC Viewer
-Comment=VNC client
-Exec=/usr/bin/vncviewer
-Icon=tigervnc
-Terminal=false
-StartupNotify=false
-Categories=Network;RemoteAccess;</literal>
-EOF
-
-install -vm644 media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
-ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>tar -xf .. xorg-server...</command>: This command extracts the
-      standard Xorg package into the tree in a location needed for modification.
-    </para>
-
-    <para>
-      <parameter>--disable ...</parameter>: Most options that are usually
-      needed for the standard Xorg server are not needed for the Xvnc
-      instance being built.
-    </para>
-
-    <para>
-      <command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server
-      is not installed in the <filename class='directory'>/usr/bin</filename>
-      directory, then create a link so the <command>vncserver</command> script
-      can find it.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tigervnc</title>
-
-    <para revision='sysv'>
-      The default installation of this package makes some changes in the way it
-      is used.  The vncserver perl script is placed in /usr/bin/libexec and the
-      server is designed to be run via a systemd style .service file or the
-      vncsession script as the root user.  The man page for vncserver is placed
-      in section 8 of the man pages.  The new procedures require a display
-      manager to be installed.
-    </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="root" revision='sysv'><userinput>install -m755 --owner=root ../vncserver /usr/bin &amp;&amp;
-cp ../vncserver.1 /usr/share/man/man1</userinput></screen>
-
-    <para revision='sysv'>
-      Using the previous procedures, the user specific configuration files of
-      vncserver reside in the <filename class='directory'>.vnc</filename>
-      directory in the user's home directory.  The
-      <filename>xstartup</filename> file in that directory is a script
-      specifying what commands to run when a VNC desktop is started.  If no
-      <filename>xstartup</filename> file exists, <command>vncserver</command>
-      will try to start an xterm in a twm session.  An example
-      <filename>xstartup</filename> would be:
-    </para>
-
-<screen revision='sysv'>#!/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'>
-      The <filename>xstartup</filename> file must be executable for the
-      commands in it to be executed, so run <command>chmod a+x
-      ~/.vnc/xstartup</command>.
-    </para>
-
-    <para revision='sysv'>
-      Set up the vnc passwd with <command>vncpasswd</command>. The
-      server can then be started with the <command>vncserver</command>
-      command.
-      See the man pages in section 1 for the vncserver for the server
-      system and vncviewer for the remote system.
-    </para>
-
-    <bridgehead renderas="sect3" revision="systemd">Server Configuration</bridgehead>
-
-    <!--
-    <note revision="systemd">
-      <para>
-        This section is optional and is only useful if you want to have VNC
-        sessions launch on system startup. Both configuration methods can
-        coexist on the same system.
-      </para>
-    </note>
-    -->
-    <para revision="systemd">
-      On systemd systems, another method of configuration is available.
-      This configuration provides the added benefit of making tigervnc
-      systemd aware for VNC sessions and allows desktop environments like
-      <application>GNOME</application> to autostart services once the VNC
-      session is started. This configuration also gives the added benefit
-      of starting VNC Sessions on system startup. To set up the VNC server
-      in this fashion, follow these instructions.
-    </para>
-
-    <para revision="systemd">
-       First, install a rudimentary Xsession file so that the VNC server
-       can initialize X sessions properly:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -vdm755 /etc/X11/tigervnc &amp;&amp;
-install -v -m755 ../Xsession /etc/X11/tigervnc</userinput></screen>
-
-    <para revision="systemd">
-      Next, set up a user mapping in
-      <filename>/etc/tigervnc/vncserver.users</filename>. This tells the VNC
-      Server which session is allocated to a user.
-      <!-- For example: :1=renodr will assign 'renodr' to :1 -->
-    </para>
-
-<screen role="root" revision="systemd"><userinput>echo ":1=$(whoami)" >> /etc/tigervnc/vncserver.users</userinput></screen>
-
-    <para revision="systemd">
-      Next, set up a configuration file to tell
-      <application>vncserver</application> which desktop environment should be
-      used and what display geometry should be used. There are several other
-      options that can be defined in this file, but they are outside the scope
-      of BLFS.
-    </para>
-
-<screen revision="systemd"><userinput>install -vdm 755 ~/.vnc &amp;&amp;
-cat &gt; ~/.vnc/config &lt;&lt; EOF
-<literal># Begin ~/.vnc/config
-# The session must match one listed in /usr/share/xsessions.
-# Ensure that there are no spaces at the end of the lines.
-
-session=lxqt
-geometry=1024x768
-
-# End ~/.vnc/config</literal>
-EOF</userinput></screen>
-
-    <para revision="systemd">
-      To start the VNC Server, run the following command:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl start vncserver@:1</userinput></screen>
-
-    <para revision="systemd">
-      To start the VNC Server when the system boots, run the following command:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable vncserver@:1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Xvnc,
-             vncconfig,
-             vncpasswd,
-             vncserver,
-             vncviewer, and
-             x0vncserver</seg>
-
-        <seg>libvnc.so</seg>
-        <seg>/usr/share/doc/tigervnc-&tigervnc-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xvnc">
-        <term><command>Xvnc</command></term>
-        <listitem>
-          <para>
-            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
-          </para>
-          <indexterm zone="tigervnc xvnc">
-            <primary sortas="b-xvnc">Xvnc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncconfig">
-        <term><command>vncconfig</command></term>
-        <listitem>
-          <para>
-            is a program to configure and control a VNC server
-          </para>
-          <indexterm zone="tigervnc vncconfig">
-            <primary sortas="b-vncconfig">vncconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncpasswd">
-        <term><command>vncpasswd</command></term>
-        <listitem>
-          <para>
-            allows you to set the password used to access VNC desktops
-          </para>
-          <indexterm zone="tigervnc vncpasswd">
-            <primary sortas="b-vncpasswd">vncpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncserver">
-        <term><command>vncserver</command></term>
-        <listitem>
-          <para>
-            is a perl script used to start or stop a VNC server
-          </para>
-          <indexterm zone="tigervnc vncserver">
-            <primary sortas="b-vncserver">vncserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncviewer">
-        <term><command>vncviewer</command></term>
-        <listitem>
-          <para>
-            is a client used to connect to VNC desktops
-          </para>
-          <indexterm zone="tigervnc vncviewer">
-            <primary sortas="b-vncviewer">vncviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="x0vncserver">
-        <term><command>x0vncserver</command></term>
-        <listitem>
-          <para>
-            is a program to make an X display on a physical
-            terminal accessible via TigerVNC or compatible viewers
-          </para>
-          <indexterm zone="tigervnc x0vncserver">
-            <primary sortas="b-x0vncserver">x0vncserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 transmission-download-http "https://github.com/transmission/transmission/releases/download/&transmission-version;/transmission-&transmission-version;.tar.xz">
-  <!ENTITY transmission-download-ftp  " ">
-  <!ENTITY transmission-md5sum        "d3cda868215246644c429b18a30f7e47">
-  <!ENTITY transmission-size          "9.2 MB">
-  <!ENTITY transmission-buildsize     "229 MB (with both GUI interfaces)">
-  <!ENTITY transmission-time          "2.3 SBU (with both GUI interfaces; using parallelism=4)">
-]>
-
-<sect1 id="transmission" xreflabel="Transmission-&transmission-version;">
-  <?dbhtml filename="transmission.html"?>
-
-
-  <title>Transmission-&transmission-version;</title>
-
-  <indexterm zone="transmission">
-    <primary sortas="a-Transmission">Transmission</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Transmission</title>
-
-    <para>
-      <application>Transmission</application> is a cross-platform, open source
-      BitTorrent client. This is useful for downloading large files (such as
-      Linux ISOs) and reduces the need for the distributors to provide server
-      bandwidth.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&transmission-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&transmission-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &transmission-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &transmission-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &transmission-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &transmission-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libevent"/> and
-      <xref linkend="libpsl"/>
-      (to use system libraries instead of bundled ones)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtkmm4"/> or
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nodejs"/> (for building the web client, not needed at run time),
-      <ulink url="https://github.com/ubuntu/gnome-shell-extension-appindicator">appindicator</ulink>,
-      <ulink url="https://github.com/jech/dht">dht</ulink>,
-      <ulink url="https://github.com/libb64/libb64">libb64</ulink>,
-      <ulink url="https://github.com/ebiggers/libdeflate">libdeflate</ulink>,
-      <ulink url="https://github.com/miniupnp/libnatpmp">libnatpmp</ulink>,
-      <ulink url="https://github.com/bittorrent/libutp">libutp</ulink>, and
-      <ulink url="https://github.com/miniupnp/miniupnp">miniupnp</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/transmission"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Transmission</title>
-
-    <para>
-      Install <application>Transmission</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  \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/transmission-&transmission-version; \
-      .. &amp;&amp;
-
-make</userinput></screen>
-
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Next, create transmission.png from the SVG file:
-    </para>
-
-<screen role="root"><userinput>rsvg-convert                                               \
-   /usr/share/icons/hicolor/scalable/apps/transmission.svg \
-   -o /usr/share/pixmaps/transmission.png</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DENABLE_QT=OFF</option>: This switch disables building
-      the <application>Qt</application> interface. The default is to build it
-      if &qt5-deps; or <xref linkend="qt6"/> is installed.
-    </para>
-
-    <para>
-      <option>-DENABLE_GTK=OFF</option>: This switch disables building
-      the GTK-4 interface. The default is to build it if
-      <xref linkend="gtkmm4"/> is installed.
-    </para>
-
-    <para>
-      <option>-DENABLE_WEB=OFF</option>: This switch disables building
-      the web client. The default is to build it if <xref linkend="nodejs"/>
-      is installed.
-    </para>
-
-    <para>
-      <option>-DREBUILD_WEB=ON</option>: This switch forces rebuilding
-      the web client. This option needs <xref linkend="nodejs"/> to be
-      installed as well as an internet connection. The default is to not
-      rebuild the client.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          <!--transmission-cli,-->
-          transmission-create,
-          transmission-daemon,
-          transmission-edit,
-          transmission-gtk,
-          transmission-qt,
-          transmission-remote, and
-          transmission-show
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/transmission (contains the web client) and
-          /usr/share/doc/transmission-&transmission-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!-- Not seen in 4.0.4 or 4.0.5
-      <varlistentry id="transmission-cli">
-        <term><command>transmission-cli</command></term>
-        <listitem>
-          <para>
-            is a lightweight, command line BitTorrent client with scripting
-            capabilities
-          </para>
-          <indexterm zone="transmission transmission-cli">
-            <primary sortas="b-transmission-cli">transmission-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="transmission-create">
-        <term><command>transmission-create</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to create .torrent files
-          </para>
-          <indexterm zone="transmission transmission-create">
-            <primary sortas="b-transmission-create">transmission-create</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-daemon">
-        <term><command>transmission-daemon</command></term>
-        <listitem>
-          <para>
-            is a daemon-based Transmission session that can be controlled via
-            RPC commands from Transmission's web interface or
-            <command>transmission-remote</command>
-          </para>
-          <indexterm zone="transmission transmission-daemon">
-            <primary sortas="b-transmission-daemon">transmission-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-edit">
-        <term><command>transmission-edit</command></term>
-        <listitem>
-          <para>
-            is a command line tool to modify .torrent files' announce URLs
-          </para>
-          <indexterm zone="transmission transmission-edit">
-            <primary sortas="b-transmission-edit">transmission-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-gtk">
-        <term><command>transmission-gtk</command></term>
-        <listitem>
-          <para>
-            is a GTK+ bittorrent client
-          </para>
-          <indexterm zone="transmission transmission-gtk">
-            <primary sortas="b-transmission-gtk">transmission-gtk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-qt">
-        <term><command>transmission-qt</command></term>
-        <listitem>
-          <para>
-            is a Qt-based bittorrent client
-          </para>
-          <indexterm zone="transmission transmission-qt">
-            <primary sortas="b-transmission-qt">transmission-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-remote">
-        <term><command>transmission-remote</command></term>
-        <listitem>
-          <para>
-            is a remote control utility for transmission-daemon and transmission
-          </para>
-          <indexterm zone="transmission transmission-remote">
-            <primary sortas="b-transmission-remote">transmission-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-show">
-        <term><command>transmission-show</command></term>
-        <listitem>
-          <para>
-            is a command line tool to display bittorrent .torrent file metadata
-          </para>
-          <indexterm zone="transmission transmission-show">
-            <primary sortas="b-transmission-show">transmission-show</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xarchiver-download-http  "https://github.com/ib/xarchiver/archive/&xarchiver-version;/xarchiver-&xarchiver-version;.tar.gz">
-  <!ENTITY xarchiver-download-ftp  " ">
-  <!ENTITY xarchiver-md5sum        "bfdace2b113417e1bc77ef304280d103">
-  <!ENTITY xarchiver-size          "1.1 MB">
-  <!ENTITY xarchiver-buildsize     "11 MB">
-  <!ENTITY xarchiver-time          "0.1 SBU">
-]>
-
-<sect1 id="xarchiver" xreflabel="xarchiver-&xarchiver-version;">
-  <?dbhtml filename="xarchiver.html"?>
-
-
-  <title>xarchiver-&xarchiver-version;</title>
-
-  <indexterm zone="xarchiver">
-    <primary sortas="a-xarchiver">xarchiver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xarchiver</title>
-
-    <para>
-      <application>XArchiver</application> is a <application>GTK+</application>
-      archive manager with support for tar, xz, bzip2, gzip, zip, 7z, rar, lzo
-      and many other archive formats.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        <application>xarchiver</application> is only a command line or graphical
-        interface to archiving utilities such as <application>tar</application>
-        and <application>zip</application>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xarchiver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xarchiver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xarchiver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xarchiver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xarchiver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xarchiver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/xarchiver-&xarchiver-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">xarchiver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="cpio"/>,
-      <xref role="runtime" linkend="lzo"/>,
-      <xref role="runtime" linkend="p7zip"/>,
-      <xref role="runtime" linkend="unrar"/>,
-      <xref role="runtime" linkend="unzip"/>, and
-      <xref role="runtime" linkend="zip"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xarchiver</title>
-
-    <para>
-      Install <application>xarchiver</application> by running the
-      following commands:
-    </para>
-
-<!-- Previously there was a command here to run ./autogen.sh.
-     With 0.5.4.15, the download that I had included the
-     configure script and the rest of the build machinery with it. -->
-<screen><userinput>./configure  --prefix=/usr               \
-             --libexecdir=/usr/lib/xfce4 \
-             --docdir=/usr/share/doc/xarchiver-&xarchiver-version; &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/xfce4</parameter>: This switch fixes the
-      location for the thunar-archive-plugin, so it will work if
-      <xref linkend="thunar"/> is installed.
-    </para>
-
-<!--
-    <para>
-      <option>- -disable-gtk3</option>: This switch allows building
-      against GTK+2 or use <option>- -disable-gtk2</option> to force
-      building against GTK+3 when GTK+2 is installed.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xarchiver
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/xfce4/thunar-archive-plugin,
-          /usr/share/doc/xarchiver-&xarchiver-version;, and
-          /usr/share/pixmaps/xarchiver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xarchiver-prog">
-        <term><command>xarchiver</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> archive manager
-          </para>
-          <indexterm zone="xarchiver xarchiver-prog">
-            <primary sortas="b-xarchiver">xarchiver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/xdg-utils.xml
===================================================================
--- xsoft/other/xdg-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,251 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-utils-download-http "http://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-&xdg-utils-version;.tar.gz">-->
-  <!ENTITY xdg-utils-download-http "https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v&xdg-utils-version;/xdg-utils-v&xdg-utils-version;.tar.gz">
-  <!ENTITY xdg-utils-download-ftp  " ">
-  <!ENTITY xdg-utils-md5sum        "4c72585a98ba8f775cb9e72b066cc0df">
-  <!ENTITY xdg-utils-size          "304 KB">
-  <!ENTITY xdg-utils-buildsize     "3.3 MB (with tests)">
-  <!ENTITY xdg-utils-time          "2.5 SBU (with tests)">
-]>
-
-<sect1 id="xdg-utils" xreflabel="xdg-utils-&xdg-utils-version;">
-  <?dbhtml filename="xdg-utils.html"?>
-
-
-  <title>xdg-utils-&xdg-utils-version;</title>
-
-  <indexterm zone="xdg-utils">
-    <primary sortas="a-xdg-utils">xdg-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-utils</title>
-
-    <para>
-      <application>xdg-utils</application> is a set of command line
-      tools that assist applications with a variety of desktop integration tasks.
-      It is required for Linux Standards Base (LSB) conformance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xmlto"/> with one of
-      <xref linkend="lynx"/>,
-      <xref role="nodep" linkend="Links"/>, or
-      <ulink url="&w3m-url;">W3m</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="xorg7-app"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="dbus"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-utils</title>
-
-    <para>
-      Compile <application>xdg-utils</application> with the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <caution>
-      <para>
-        The tests for the scripts must be made from an X-Window
-        based session.  There are several run-time requirements to run
-        the tests including a browser and an MTA.
-        Running the tests as <systemitem class="username">root</systemitem>
-        user is not recommended.
-      </para>
-    </caution>
-
-    <para>
-      To run the tests, issue: <command>make -k test</command>.
-    </para>
-
-    <para>
-      Now install it as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>xdg-desktop-menu, xdg-desktop-icon, xdg-mime, xdg-icon-resource,
-        xdg-open, xdg-email, xdg-screensaver, xdg-settings</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdg-desktop-menu">
-        <term><command>xdg-desktop-menu</command></term>
-        <listitem>
-          <para>
-            is a command line tool for (un)installing desktop menu items
-          </para>
-          <indexterm zone="xdg-utils xdg-desktop-menu">
-            <primary sortas="b-xdg-desktop-menu">xdg-desktop-menu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-desktop-icon">
-        <term><command>xdg-desktop-icon</command></term>
-        <listitem>
-          <para>
-            is a command line tool for (un)installing icons to the desktop
-          </para>
-          <indexterm zone="xdg-utils xdg-desktop-icon">
-            <primary sortas="b-xdg-desktop-icon">xdg-desktop-icon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-mime">
-        <term><command>xdg-mime</command></term>
-        <listitem>
-          <para>
-            is a command line tool for querying information about file
-            type handling and adding descriptions for new file types
-          </para>
-          <indexterm zone="xdg-utils xdg-mime">
-            <primary sortas="b-xdg-mime">xdg-mime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-icon-resource">
-        <term><command>xdg-icon-resource</command></term>
-        <listitem>
-          <para>
-            is a command line tool for (un)installing icon resources
-          </para>
-          <indexterm zone="xdg-utils xdg-icon-resource">
-            <primary sortas="b-xdg-icon-resource">xdg-icon-resource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-open">
-        <term><command>xdg-open</command></term>
-        <listitem>
-          <para>
-            opens a file or URL in the user's preferred application
-          </para>
-          <indexterm zone="xdg-utils xdg-open">
-            <primary sortas="b-xdg-open">xdg-open</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-email">
-        <term><command>xdg-email</command></term>
-        <listitem>
-          <para>
-            opens the user's preferred e-mail composer in order to send a mail
-            message
-          </para>
-          <indexterm zone="xdg-utils xdg-email">
-            <primary sortas="b-xdg-email">xdg-email</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-screensaver">
-        <term><command>xdg-screensaver</command></term>
-        <listitem>
-          <para>
-            is a command line tool for controlling the screensaver
-          </para>
-          <indexterm zone="xdg-utils xdg-screensaver">
-            <primary sortas="b-xdg-screensaver">xdg-screensaver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-settings">
-        <term><command>xdg-settings</command></term>
-        <listitem>
-          <para>
-            is a command line tool for managing various settings from
-            the desktop environment
-          </para>
-          <indexterm zone="xdg-utils xdg-settings">
-            <primary sortas="b-xdg-settings">xdg-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: oft/other/xscreensaver.xml
===================================================================
--- xsoft/other/xscreensaver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xscreensaver-download-http "https://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
-  <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "d64f3fdb8881c735fff4601ec5d88e1f">
-  <!ENTITY xscreensaver-size          "19 MB">
-  <!ENTITY xscreensaver-buildsize     "250 MB">
-  <!ENTITY xscreensaver-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="xscreensaver" xreflabel="XScreenSaver-&xscreensaver-version;">
-  <?dbhtml filename="xscreensaver.html"?>
-
-
-  <title>XScreenSaver-&xscreensaver-version;</title>
-
-  <indexterm zone="xscreensaver">
-    <primary sortas="a-XScreenSaver">XScreenSaver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XScreenSaver</title>
-
-    <para>
-      The <application>XScreenSaver</application> package is a modular screen
-      saver and locker for the X Window System. It is highly customizable and
-      allows the use of any program that can draw on the root window as a
-      display mode. The purpose of <application>XScreenSaver</application> is
-      to display pretty pictures on your screen when it is not in use, in
-      keeping with the philosophy that unattended monitors should always be
-      doing something interesting, just like they do in the movies. However,
-      <application>XScreenSaver</application> can also be used as a screen
-      locker, to prevent others from using your terminal while you are away.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xscreensaver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xscreensaver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xscreensaver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xscreensaver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xscreensaver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xscreensaver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XScreenSaver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="xorg7-app"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glu"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdm"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>, and
-      <ulink url="https://linas.org/gle/">GLE</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XScreenSaver</title>
-
-    <para revision="sysv">
-      Change a hardcoded library name, which prevents using the settings found
-      by <command>configure</command>:
-    </para>
-
-<screen revision="sysv"><userinput>sed -i 's/-lsystemd/-lelogind/' driver/Makefile.in</userinput></screen>
-
-    <para>
-      Install <application>XScreenSaver</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>
-
-    <!-- EDITORS NOTE: Use install_prefix instead of DESTDIR -->
-    <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>
-      <option>--with-setuid-hacks</option>: This switch allows some demos
-      to be installed setuid <systemitem class="username">root</systemitem>
-      which is needed in order to ping other hosts.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring XScreenSaver</title>
-
-    <sect3 id="xscreensaver-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/X11/app-defaults/XScreenSaver</filename> and
-        <filename>~/.xscreensaver</filename>
-      </para>
-
-      <indexterm zone="xscreensaver xscreensaver-config">
-        <primary sortas="e-etc-X11-app-defaults-XScreenSaver">/etc/X11/app-defaults/XScreenSaver</primary>
-      </indexterm>
-      <indexterm zone="xscreensaver xscreensaver-config">
-        <primary sortas="e-AA.xscreensaver">~/.xscreensaver</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>XScreenSaver</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file, to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following commands as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/xscreensaver &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/xscreensaver
-
-auth    include system-auth
-account include system-account
-
-# End /etc/pam.d/xscreensaver</literal>
-EOF</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>
-          xscreensaver, xscreensaver-command, xscreensaver-demo, and
-          xscreensaver-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/libexec/xscreensaver and
-          /usr/share/xscreensaver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xscreensaver-prog">
-        <term><command>xscreensaver</command></term>
-        <listitem>
-          <para>
-            is a screen saver and locker daemon
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-prog">
-            <primary sortas="b-xscreensaver">xscreensaver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscreensaver-command">
-        <term><command>xscreensaver-command</command></term>
-        <listitem>
-          <para>
-            controls a running <command>xscreensaver</command>
-            process by sending it client messages
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-command">
-            <primary sortas="b-xscreensaver-command">xscreensaver-command</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscreensaver-demo">
-        <term><command>xscreensaver-demo</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>xscreensaver-settings</command>
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-demo">
-            <primary sortas="b-xscreensaver-demo">xscreensaver-demo</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>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/suites/koffice.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,59 @@
+<sect1 id="koffice">
+<?dbhtml filename="koffice.html" dir="xsoft"?>
+<title>Installation of KOffice</title>
+
+<para>KOffice is the integrated office suite for KDE.</para>
+
+<para>
+<screen>Download location:     <ulink url="&koffice-download;"/>
+Version used:          &koffice-version;
+Package size:          &koffice-size;
+Estimated build time:  51m (667 MHz)  </screen>
+</para>
+
+<para>There is also an error in the kspread program that causes a 
+compile error.  To fix this, download:
+<screen><ulink url="ftp://beyond.linuxfromscratch.org/blfs-patches/koffice-1.1.1.patch"/></screen>
+</para>
+
+<para>KOffice also has many internationalization packages in the form of:
+<screen>koffice-i18n-xx-&koffice-version;.tar.bz2</screen>
+where the xx is a two to five letter code for the country covered. The sizes of these
+files range from about 289 KB to 408 KB.</para>
+
+<para><screen>Estimated build disk space:  91 MB
+Estimated installed space:   26 MB
+Estimated build time:        51 min (667 MHz)</screen></para>
+
+<para>Install koffice with:
+<screen><userinput>patch -Np1 -i ../koffice-1.1.1.patch &amp;&amp;
+./configure --prefix=&kde-dir; --enable-objprelink --disable-debug &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+     
+<sect2><title>koffice Installation Commmand explanations</title>
+<para>The options are the same as for aRts and are not repeated here.</para>
+</sect2>
+      
+<sect2><title>Configuring koffoce</title>
+<para>There is no explicit configuration for the koffice package.
+</para>
+</sect2>
+       
+<sect2>
+<title>Contents</title>
+<para>The KOffice package provides:</para>
+<itemizedlist>
+<listitem><para>KWord - Framemaker-like word processing and desktop publishing program</para></listitem>
+<listitem><para>KSpread - Spreadsheet program (scriptable)</para></listitem>
+<listitem><para>KPresenter - Presentation builder/display program</para></listitem>
+<listitem><para>Kivio - Flowchart program</para></listitem>
+<listitem><para>Kontour - Vector drawing program</para></listitem>
+<listitem><para>Krita - Painting and image editing program</para></listitem>
+<listitem><para>Kugar - A tool for creating reports</para></listitem>
+<listitem><para>KPlato - Project management application (early stages of development)</para></listitem>
+<listitem><para>KChart - Chart drawing application</para></listitem>
+<listitem><para>KFormula - Formula editor</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
Index: xsoft/suites/koffice/koffice.ent
===================================================================
--- xsoft/suites/koffice/koffice.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/suites/koffice/koffice.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,5 @@
+<!ENTITY koffice SYSTEM "../koffice.xml">
+<!ENTITY koffice-version "1.1.1">
+<!ENTITY koffice-download "ftp://ftp.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src">
+<!ENTITY koffice-size "8.4 MB">
+<!ENTITY koffice-buildsize "TBD MB">
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/suites/openoffice.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="openoffice" xreflabel="openoffice">
+<?dbhtml filename="openoffice.html" dir="xsoft"?>
+<title>openoffice</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: xsoft/suites/openoffice/openoffice.ent
===================================================================
--- xsoft/suites/openoffice/openoffice.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/suites/openoffice/openoffice.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY openoffice SYSTEM "../openoffice.xml">
Index: xsoft/suites/suites.xml
===================================================================
--- xsoft/suites/suites.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/suites/suites.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<chapter id="xsoft-suites">
+<?dbhtml filename="suites.html" dir="xsoft"?>
+<title>Office Suites</title>
+
+&koffice;
+&openoffice;
+
+</chapter>
Index: xsoft/xsoft.ent
===================================================================
--- xsoft/xsoft.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ xsoft/xsoft.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,32 @@
+<!ENTITY xsoft SYSTEM "xsoft.xml">
+
+<!-- Individual Office Programs -->
+<!ENTITY xsoft-office SYSTEM "office/office.xml">
+<!ENTITY % abiword SYSTEM "office/abiword/abiword.ent">
+<!ENTITY % gnumeric SYSTEM "office/gnumeric/gnumeric.ent">
+<!ENTITY % gnucash SYSTEM "office/gnucash/gnucash.ent">
+<!ENTITY % magicpoint SYSTEM "office/magicpoint/magicpoint.ent">
+<!ENTITY % gimp SYSTEM "office/gimp/gimp.ent">
+%abiword;
+%gnumeric;
+%gnucash;
+%magicpoint;
+%gimp;
+
+<!-- Office Suites -->
+<!ENTITY xsoft-suites SYSTEM "suites/suites.xml">
+<!ENTITY % koffice SYSTEM "suites/koffice/koffice.ent">
+<!ENTITY % openoffice SYSTEM "suites/openoffice/openoffice.ent">
+%koffice;
+%openoffice;
+
+<!-- Graphical Web Browsers -->
+<!ENTITY xsoft-graphweb SYSTEM "graphweb/graphweb.xml">
+<!ENTITY xsoft-graphweb-konq SYSTEM "graphweb/konq.xml">
+<!ENTITY % mozilla SYSTEM "graphweb/mozilla/mozilla.ent">
+<!ENTITY % galeon SYSTEM "graphweb/galeon/galeon.ent">
+%mozilla;
+%galeon;
+
+<!-- Other -->
+<!ENTITY xsoft-other SYSTEM "other/other.xml">
Index: xsoft/xsoft.xml
===================================================================
--- xsoft/xsoft.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/xsoft.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,17 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part 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;
-]>
+<part id="xsoft" xreflabel="xsoft">
+<?dbhtml filename="xsoft.html" dir="xsoft"?>
+<title>X Software</title>
 
-<part id="xsoft" xreflabel="X Software">
-  <?dbhtml filename="xsoft.html" dir="xsoft"?>
-
-  <title>X Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="office/office.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphweb/graphweb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other/other.xml"/>
+&xsoft-office;
+&xsoft-suites;
+&xsoft-graphweb;
+&xsoft-other;
 
 </part>
